From ba83bdadb115029b839a7751b4f894408ee152e2 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 26 Apr 2019 07:53:53 +0200 Subject: [PATCH 01/67] [DomCrawler] fix HTML5 parser integration --- src/Symfony/Component/DomCrawler/Crawler.php | 23 +++++++------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php index 4efbbf9b2d880..70a4b607dcdca 100644 --- a/src/Symfony/Component/DomCrawler/Crawler.php +++ b/src/Symfony/Component/DomCrawler/Crawler.php @@ -69,6 +69,7 @@ public function __construct($node = null, string $uri = null, string $baseHref = { $this->uri = $uri; $this->baseHref = $baseHref ?: $uri; + $this->html5Parser = class_exists(HTML5::class) ? new HTML5(['disable_html_ns' => true]) : null; $this->add($node); } @@ -190,13 +191,7 @@ public function addContent($content, $type = null) public function addHtmlContent($content, $charset = 'UTF-8') { // Use HTML5 parser if the content is HTML5 and the library is available - if (!$this->html5Parser - && class_exists(HTML5::class) - && '' === strtolower(substr(ltrim($content), 0, 15))) { - $this->html5Parser = new HTML5(['disable_html_ns' => true]); - } - - $dom = null !== $this->html5Parser ? $this->parseHtml5($content, $charset) : $this->parseXhtml($content, $charset); + $dom = null !== $this->html5Parser && strspn($content, " \t\r\n") === stripos($content, '') ? $this->parseHtml5($content, $charset) : $this->parseXhtml($content, $charset); $this->addDocument($dom); $base = $this->filterRelativeXPath('descendant-or-self::base')->extract(['href']); @@ -599,18 +594,16 @@ public function html(/* $default = null */) throw new \InvalidArgumentException('The current node list is empty.'); } - if (null !== $this->html5Parser) { - $html = ''; - foreach ($this->getNode(0)->childNodes as $child) { - $html .= $this->html5Parser->saveHTML($child); - } + $node = $this->getNode(0); + $owner = $node->ownerDocument; - return $html; + if (null !== $this->html5Parser && '' === $owner->saveXML($owner->childNodes[0])) { + $owner = $this->html5Parser; } $html = ''; - foreach ($this->getNode(0)->childNodes as $child) { - $html .= $child->ownerDocument->saveHTML($child); + foreach ($node->childNodes as $child) { + $html .= $owner->saveHTML($child); } return $html; From 40273745cecaf98651870bae3793abf7905c4165 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Wed, 8 May 2019 11:57:35 +0200 Subject: [PATCH 02/67] clarify the possible class/interface of the cache When the fallback cache pool is returned (on PHP 5.6, HHVM, or when Opcache is disabled), the configured service can be any implementation of the CacheItemPoolInterface. --- .../Bundle/FrameworkBundle/Resources/config/serializer.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml index b1918047f7178..fe93664854826 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml @@ -82,7 +82,7 @@ - + %serializer.mapping.cache.file% From ae7ee464651d166d3a2cb9cc19dce7f63a0c3d27 Mon Sep 17 00:00:00 2001 From: Amrouche Hamza Date: Fri, 26 Apr 2019 09:17:50 +0200 Subject: [PATCH 03/67] [Console] Commands with an alias should not be recognized as ambiguous --- src/Symfony/Component/Console/Application.php | 9 ++++++ .../Console/Tests/ApplicationTest.php | 31 ++++++++++++++++--- ...hp => TestAmbiguousCommandRegistering.php} | 8 ++--- ...p => TestAmbiguousCommandRegistering2.php} | 8 ++--- 4 files changed, 43 insertions(+), 13 deletions(-) rename src/Symfony/Component/Console/Tests/Fixtures/{TestToto.php => TestAmbiguousCommandRegistering.php} (65%) rename src/Symfony/Component/Console/Tests/Fixtures/{TestTiti.php => TestAmbiguousCommandRegistering2.php} (62%) diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index 6cc5f5c580ecf..4d10c31699731 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -596,6 +596,15 @@ public function find($name) $this->init(); $aliases = []; + + foreach ($this->commands as $command) { + foreach ($command->getAliases() as $alias) { + if (!$this->has($alias)) { + $this->commands[$alias] = $command; + } + } + } + $allCommands = $this->commandLoader ? array_merge($this->commandLoader->getNames(), array_keys($this->commands)) : array_keys($this->commands); $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { return preg_quote($matches[1]).'[^:]*'; }, $name); $commands = preg_grep('{^'.$expr.'}', $allCommands); diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php index 200568f0701d7..b920d211aaa8f 100644 --- a/src/Symfony/Component/Console/Tests/ApplicationTest.php +++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php @@ -72,8 +72,8 @@ public static function setUpBeforeClass() require_once self::$fixturesPath.'/BarBucCommand.php'; require_once self::$fixturesPath.'/FooSubnamespaced1Command.php'; require_once self::$fixturesPath.'/FooSubnamespaced2Command.php'; - require_once self::$fixturesPath.'/TestTiti.php'; - require_once self::$fixturesPath.'/TestToto.php'; + require_once self::$fixturesPath.'/TestAmbiguousCommandRegistering.php'; + require_once self::$fixturesPath.'/TestAmbiguousCommandRegistering2.php'; } protected function normalizeLineBreaks($text) @@ -164,6 +164,27 @@ public function testRegister() $this->assertEquals('foo', $command->getName(), '->register() registers a new command'); } + public function testRegisterAmbiguous() + { + $code = function (InputInterface $input, OutputInterface $output) { + $output->writeln('It works!'); + }; + + $application = new Application(); + $application + ->register('test-foo') + ->setAliases(['test']) + ->setCode($code); + + $application + ->register('test-bar') + ->setCode($code); + + $tester = new ApplicationTester($application); + $tester->run(['test']); + $this->assertContains('It works!', $tester->getDisplay(true)); + } + public function testAdd() { $application = new Application(); @@ -303,9 +324,9 @@ public function testFindAmbiguousNamespace() public function testFindNonAmbiguous() { $application = new Application(); - $application->add(new \TestTiti()); - $application->add(new \TestToto()); - $this->assertEquals('test-toto', $application->find('test')->getName()); + $application->add(new \TestAmbiguousCommandRegistering()); + $application->add(new \TestAmbiguousCommandRegistering2()); + $this->assertEquals('test-ambiguous', $application->find('test')->getName()); } /** diff --git a/src/Symfony/Component/Console/Tests/Fixtures/TestToto.php b/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering.php similarity index 65% rename from src/Symfony/Component/Console/Tests/Fixtures/TestToto.php rename to src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering.php index 2e6a8195938bb..bece09fcdde82 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/TestToto.php +++ b/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering.php @@ -4,19 +4,19 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -class TestToto extends Command +class TestAmbiguousCommandRegistering extends Command { protected function configure() { $this - ->setName('test-toto') - ->setDescription('The test-toto command') + ->setName('test-ambiguous') + ->setDescription('The test-ambiguous command') ->setAliases(['test']) ; } protected function execute(InputInterface $input, OutputInterface $output) { - $output->write('test-toto'); + $output->write('test-ambiguous'); } } diff --git a/src/Symfony/Component/Console/Tests/Fixtures/TestTiti.php b/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php similarity index 62% rename from src/Symfony/Component/Console/Tests/Fixtures/TestTiti.php rename to src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php index 72e29d2a0a2dc..9dde48624546d 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/TestTiti.php +++ b/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php @@ -4,18 +4,18 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -class TestTiti extends Command +class TestAmbiguousCommandRegistering2 extends Command { protected function configure() { $this - ->setName('test-titi') - ->setDescription('The test:titi command') + ->setName('test-ambiguous2') + ->setDescription('The test-ambiguous2 command') ; } protected function execute(InputInterface $input, OutputInterface $output) { - $output->write('test-titi'); + $output->write('test-ambiguous2'); } } From 36ddfd58b926d29256dba85532ca94283f27b38e Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Wed, 8 May 2019 20:13:28 +0200 Subject: [PATCH 04/67] [Intl] Add FallbackTrait for data generation --- .../Intl/Data/Generator/FallbackTrait.php | 73 +++++++++++++++++ .../Data/Generator/LocaleDataGenerator.php | 82 +++++++------------ 2 files changed, 102 insertions(+), 53 deletions(-) create mode 100644 src/Symfony/Component/Intl/Data/Generator/FallbackTrait.php diff --git a/src/Symfony/Component/Intl/Data/Generator/FallbackTrait.php b/src/Symfony/Component/Intl/Data/Generator/FallbackTrait.php new file mode 100644 index 0000000000000..25e177abfac07 --- /dev/null +++ b/src/Symfony/Component/Intl/Data/Generator/FallbackTrait.php @@ -0,0 +1,73 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Intl\Data\Generator; + +use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface; +use Symfony\Component\Intl\Locale; + +/** + * @author Roland Franssen + * + * @internal + */ +trait FallbackTrait +{ + private $fallbackCache = []; + private $generatingFallback = false; + + /** + * @param string $tempDir + * @param string $displayLocale + * + * @return array|null + * + * @see AbstractDataGenerator::generateDataForLocale() + */ + abstract protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale); + + /** + * @param string $tempDir + * + * @return array|null + * + * @see AbstractDataGenerator::generateDataForRoot() + */ + abstract protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir); + + /** + * @param string $tempDir + * @param string $displayLocale + * + * @return array + */ + private function generateFallbackData(BundleEntryReaderInterface $reader, $tempDir, $displayLocale) + { + if (null === $fallback = Locale::getFallback($displayLocale)) { + return []; + } + + if (isset($this->fallbackCache[$fallback])) { + return $this->fallbackCache[$fallback]; + } + + $prevGeneratingFallback = $this->generatingFallback; + $this->generatingFallback = true; + + try { + $data = 'root' === $fallback ? $this->generateDataForRoot($reader, $tempDir) : $this->generateDataForLocale($reader, $tempDir, $fallback); + } finally { + $this->generatingFallback = $prevGeneratingFallback; + } + + return $this->fallbackCache[$fallback] = $data ?: []; + } +} diff --git a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php index d4f6ab4acccfc..7fb0096e04b81 100644 --- a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php @@ -16,7 +16,6 @@ use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface; use Symfony\Component\Intl\Data\Util\LocaleScanner; use Symfony\Component\Intl\Exception\MissingResourceException; -use Symfony\Component\Intl\Locale; /** * The rule for compiling the locale bundle. @@ -28,10 +27,10 @@ */ class LocaleDataGenerator extends AbstractDataGenerator { - private $locales; - private $localeAliases; - private $fallbackMapping; - private $fallbackCache = []; + use FallbackTrait; + + private $locales = []; + private $localeAliases = []; /** * {@inheritdoc} @@ -40,7 +39,6 @@ protected function scanLocales(LocaleScanner $scanner, $sourceDir) { $this->locales = $scanner->scanLocales($sourceDir.'/locales'); $this->localeAliases = $scanner->scanAliases($sourceDir.'/locales'); - $this->fallbackMapping = $this->generateFallbackMapping(array_diff($this->locales, array_keys($this->localeAliases)), $this->localeAliases); return $this->locales; } @@ -64,7 +62,6 @@ protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $s */ protected function preGenerate() { - $this->fallbackCache = []; } /** @@ -73,7 +70,8 @@ protected function preGenerate() protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale) { // Don't generate aliases, as they are resolved during runtime - if (isset($this->localeAliases[$displayLocale])) { + // Unless an alias is needed as fallback for de-duplication purposes + if (isset($this->localeAliases[$displayLocale]) && !$this->generatingFallback) { return; } @@ -85,7 +83,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te $localeNames = []; foreach ($this->locales as $locale) { // Ensure a normalized list of pure locales - if (isset($this->localeAliases[$displayLocale]) || \Locale::getAllVariants($locale)) { + if (\Locale::getAllVariants($locale)) { continue; } @@ -102,21 +100,27 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te } } - // Process again to de-duplicate locales and their fallback locales - // Only keep the differences - $fallback = $displayLocale; - while (isset($this->fallbackMapping[$fallback])) { - if (!isset($this->fallbackCache[$fallback = $this->fallbackMapping[$fallback]])) { - $this->fallbackCache[$fallback] = $this->generateDataForLocale($reader, $tempDir, $fallback) ?: []; - } - if (isset($this->fallbackCache[$fallback]['Names'])) { - $localeNames = array_diff($localeNames, $this->fallbackCache[$fallback]['Names']); - } + $data = [ + 'Names' => $localeNames, + ]; + + // Don't de-duplicate a fallback locale + // Ensures the display locale can be de-duplicated on itself + if ($this->generatingFallback) { + return $data; } - if ($localeNames) { - return ['Names' => $localeNames]; + // Process again to de-duplicate locale and its fallback locales + // Only keep the differences + $fallbackData = $this->generateFallbackData($reader, $tempDir, $displayLocale); + if (isset($fallbackData['Names'])) { + $data['Names'] = array_diff($data['Names'], $fallbackData['Names']); + } + if (!$data['Names']) { + return; } + + return $data; } /** @@ -131,12 +135,10 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, $temp */ protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir) { - if ($this->locales || $this->localeAliases) { - return [ - 'Locales' => $this->locales, - 'Aliases' => $this->localeAliases, - ]; - } + return [ + 'Locales' => $this->locales, + 'Aliases' => $this->localeAliases, + ]; } /** @@ -175,30 +177,4 @@ private function generateLocaleName(BundleEntryReaderInterface $reader, $tempDir return $name; } - - private function generateFallbackMapping(array $displayLocales, array $aliases) - { - $displayLocales = array_flip($displayLocales); - $mapping = []; - - foreach ($displayLocales as $displayLocale => $_) { - $mapping[$displayLocale] = null; - $fallback = $displayLocale; - - // Recursively search for a fallback locale until one is found - while (null !== ($fallback = Locale::getFallback($fallback))) { - // Currently, no locale has an alias as fallback locale. - // If this starts to be the case, we need to add code here. - \assert(!isset($aliases[$fallback])); - - // Check whether the fallback exists - if (isset($displayLocales[$fallback])) { - $mapping[$displayLocale] = $fallback; - break; - } - } - } - - return $mapping; - } } From 8a49eb86601b3b47ded31aa28c2b386701809620 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Mon, 6 May 2019 20:56:51 -0400 Subject: [PATCH 05/67] Simplifying SyncTransport and fixing bug with handlers transport --- .../Resources/config/messenger.xml | 1 + src/Symfony/Component/Messenger/CHANGELOG.md | 3 +-- .../Middleware/SendMessageMiddleware.php | 7 ----- .../Stamp/ForceCallHandlersStamp.php | 27 ------------------- .../Middleware/SendMessageMiddlewareTest.php | 18 ------------- .../Sync/SyncTransportFactoryTest.php | 4 ++- .../Transport/Sync/SyncTransportTest.php | 17 +++++++++--- .../Transport/Sync/SyncTransport.php | 21 ++++++++++++--- .../Transport/Sync/SyncTransportFactory.php | 10 ++++++- 9 files changed, 46 insertions(+), 62 deletions(-) delete mode 100644 src/Symfony/Component/Messenger/Stamp/ForceCallHandlersStamp.php diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml index 1671810d395a4..14ffd4d3827a2 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml @@ -73,6 +73,7 @@ + diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md index 5bbe46a84e077..e6aad77bf10b4 100644 --- a/src/Symfony/Component/Messenger/CHANGELOG.md +++ b/src/Symfony/Component/Messenger/CHANGELOG.md @@ -24,8 +24,7 @@ CHANGELOG to stop all `messenger:consume` workers. * [BC BREAK] The `TransportFactoryInterface::createTransport()` signature changed: a required 3rd `SerializerInterface` argument was added. - * Added a new `SyncTransport` along with `ForceCallHandlersStamp` to - explicitly handle messages synchronously. + * Added a new `SyncTransport` to explicitly handle messages synchronously. * Added `AmqpStamp` allowing to provide a routing key, flags and attributes on message publishing. * [BC BREAK] Removed publishing with a `routing_key` option from queue configuration, for AMQP. Use exchange `default_publish_routing_key` or `AmqpStamp` instead. diff --git a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php index bc22da6b47f10..3e87a160673e4 100644 --- a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php @@ -15,7 +15,6 @@ use Psr\Log\NullLogger; use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Event\SendMessageToTransportsEvent; -use Symfony\Component\Messenger\Stamp\ForceCallHandlersStamp; use Symfony\Component\Messenger\Stamp\ReceivedStamp; use Symfony\Component\Messenger\Stamp\RedeliveryStamp; use Symfony\Component\Messenger\Stamp\SentStamp; @@ -78,12 +77,6 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope $envelope = $sender->send($envelope->with(new SentStamp(\get_class($sender), \is_string($alias) ? $alias : null))); } - // if the message was marked (usually by SyncTransport) that it handlers - // MUST be called, mark them to be handled. - if (null !== $envelope->last(ForceCallHandlersStamp::class)) { - $handle = true; - } - // on a redelivery, only send back to queue: never call local handlers if (null !== $redeliveryStamp) { $handle = false; diff --git a/src/Symfony/Component/Messenger/Stamp/ForceCallHandlersStamp.php b/src/Symfony/Component/Messenger/Stamp/ForceCallHandlersStamp.php deleted file mode 100644 index 5c9eb3a6d96dd..0000000000000 --- a/src/Symfony/Component/Messenger/Stamp/ForceCallHandlersStamp.php +++ /dev/null @@ -1,27 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Messenger\Stamp; - -/** - * Stamp marks that the handlers *should* be called immediately. - * - * This is used by the SyncTransport to indicate to the - * SendMessageMiddleware that handlers *should* be called - * immediately, even though a transport was set. - * - * @experimental in 4.3 - * - * @author Ryan Weaver - */ -class ForceCallHandlersStamp implements StampInterface -{ -} diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/SendMessageMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/SendMessageMiddlewareTest.php index 2df828ddccd31..66eb53ca714c4 100644 --- a/src/Symfony/Component/Messenger/Tests/Middleware/SendMessageMiddlewareTest.php +++ b/src/Symfony/Component/Messenger/Tests/Middleware/SendMessageMiddlewareTest.php @@ -15,7 +15,6 @@ use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Event\SendMessageToTransportsEvent; use Symfony\Component\Messenger\Middleware\SendMessageMiddleware; -use Symfony\Component\Messenger\Stamp\ForceCallHandlersStamp; use Symfony\Component\Messenger\Stamp\ReceivedStamp; use Symfony\Component\Messenger\Stamp\RedeliveryStamp; use Symfony\Component\Messenger\Stamp\SentStamp; @@ -88,8 +87,6 @@ public function testItSendsTheMessageToMultipleSenders() public function testItSendsToOnlyOneSenderOnRedelivery() { $envelope = new Envelope(new DummyMessage('Hey'), [new RedeliveryStamp(5, 'bar')]); - // even with a ForceCallHandlersStamp, the next middleware won't be called - $envelope = $envelope->with(new ForceCallHandlersStamp()); $sender = $this->getMockBuilder(SenderInterface::class)->getMock(); $sender2 = $this->getMockBuilder(SenderInterface::class)->getMock(); @@ -270,21 +267,6 @@ public function testItDoesNotDispatchOnRedeliver() $middleware->handle($envelope, $this->getStackMock(false)); } - public function testItHandlesWithForceCallHandlersStamp() - { - $envelope = new Envelope(new DummyMessage('original envelope')); - $envelope = $envelope->with(new ForceCallHandlersStamp()); - - $sender = $this->getMockBuilder(SenderInterface::class)->getMock(); - $sender->expects($this->once())->method('send')->willReturn($envelope); - - $sendersLocator = $this->createSendersLocator([DummyMessage::class => ['foo']], ['foo' => $sender]); - $middleware = new SendMessageMiddleware($sendersLocator); - - // next handler *should* be called - $middleware->handle($envelope, $this->getStackMock(true)); - } - private function createSendersLocator(array $sendersMap, array $senders, array $sendAndHandle = []) { $container = $this->createMock(ContainerInterface::class); diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Sync/SyncTransportFactoryTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Sync/SyncTransportFactoryTest.php index 1bef09b2d126d..021c7ae9706a4 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/Sync/SyncTransportFactoryTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/Sync/SyncTransportFactoryTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Messenger\Tests\Transport\AmqpExt; use PHPUnit\Framework\TestCase; +use Symfony\Component\Messenger\MessageBusInterface; use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface; use Symfony\Component\Messenger\Transport\Sync\SyncTransport; use Symfony\Component\Messenger\Transport\Sync\SyncTransportFactory; @@ -21,7 +22,8 @@ class SyncTransportFactoryTest extends TestCase public function testCreateTransport() { $serializer = $this->createMock(SerializerInterface::class); - $factory = new SyncTransportFactory(); + $bus = $this->createMock(MessageBusInterface::class); + $factory = new SyncTransportFactory($bus); $transport = $factory->createTransport('sync://', [], $serializer); $this->assertInstanceOf(SyncTransport::class, $transport); } diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Sync/SyncTransportTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Sync/SyncTransportTest.php index 25bc6290d6dff..13549e27582a1 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/Sync/SyncTransportTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/Sync/SyncTransportTest.php @@ -13,18 +13,29 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\Messenger\Envelope; -use Symfony\Component\Messenger\Stamp\ForceCallHandlersStamp; +use Symfony\Component\Messenger\MessageBusInterface; +use Symfony\Component\Messenger\Stamp\ReceivedStamp; use Symfony\Component\Messenger\Transport\Sync\SyncTransport; class SyncTransportTest extends TestCase { public function testSend() { + $bus = $this->createMock(MessageBusInterface::class); + $bus->expects($this->once()) + ->method('dispatch') + ->with($this->callback(function ($arg) { + $this->assertInstanceOf(Envelope::class, $arg); + + return true; + })) + ->willReturnArgument(0); $message = new \stdClass(); $envelope = new Envelope($message); - $transport = new SyncTransport(); + $transport = new SyncTransport($bus); $envelope = $transport->send($envelope); + $this->assertSame($message, $envelope->getMessage()); - $this->assertNotNull($envelope->last(ForceCallHandlersStamp::class)); + $this->assertNotNull($envelope->last(ReceivedStamp::class)); } } diff --git a/src/Symfony/Component/Messenger/Transport/Sync/SyncTransport.php b/src/Symfony/Component/Messenger/Transport/Sync/SyncTransport.php index 47efd0182c746..0553f839393e9 100644 --- a/src/Symfony/Component/Messenger/Transport/Sync/SyncTransport.php +++ b/src/Symfony/Component/Messenger/Transport/Sync/SyncTransport.php @@ -13,11 +13,13 @@ use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Exception\InvalidArgumentException; -use Symfony\Component\Messenger\Stamp\ForceCallHandlersStamp; +use Symfony\Component\Messenger\MessageBusInterface; +use Symfony\Component\Messenger\Stamp\ReceivedStamp; +use Symfony\Component\Messenger\Stamp\SentStamp; use Symfony\Component\Messenger\Transport\TransportInterface; /** - * A "fake" transport that marks messages to be handled immediately. + * Transport that immediately marks messages as received and dispatches for handling. * * @experimental in 4.3 * @@ -25,6 +27,13 @@ */ class SyncTransport implements TransportInterface { + private $messageBus; + + public function __construct(MessageBusInterface $messageBus) + { + $this->messageBus = $messageBus; + } + public function get(): iterable { throw new InvalidArgumentException('You cannot receive messages from the Messenger SyncTransport.'); @@ -47,6 +56,12 @@ public function reject(Envelope $envelope): void public function send(Envelope $envelope): Envelope { - return $envelope->with(new ForceCallHandlersStamp()); + /** @var SentStamp|null $sentStamp */ + $sentStamp = $envelope->last(SentStamp::class); + $alias = null === $sentStamp ? 'sync' : $sentStamp->getSenderAlias() ?: $sentStamp->getSenderClass(); + + $envelope = $envelope->with(new ReceivedStamp($alias)); + + return $this->messageBus->dispatch($envelope); } } diff --git a/src/Symfony/Component/Messenger/Transport/Sync/SyncTransportFactory.php b/src/Symfony/Component/Messenger/Transport/Sync/SyncTransportFactory.php index d3a3459e9eb56..3c66512f48985 100644 --- a/src/Symfony/Component/Messenger/Transport/Sync/SyncTransportFactory.php +++ b/src/Symfony/Component/Messenger/Transport/Sync/SyncTransportFactory.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Messenger\Transport\Sync; +use Symfony\Component\Messenger\MessageBusInterface; use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface; use Symfony\Component\Messenger\Transport\TransportFactoryInterface; use Symfony\Component\Messenger\Transport\TransportInterface; @@ -22,9 +23,16 @@ */ class SyncTransportFactory implements TransportFactoryInterface { + private $messageBus; + + public function __construct(MessageBusInterface $messageBus) + { + $this->messageBus = $messageBus; + } + public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface { - return new SyncTransport(); + return new SyncTransport($this->messageBus); } public function supports(string $dsn, array $options): bool From 6852c84e823db5b5a94b4d02ef6c10bce2e4dfa2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 9 May 2019 08:21:48 +0200 Subject: [PATCH 06/67] bumped Symfony version to 4.3.0 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 1d75e8ecffb3c..0dcdc717d9b22 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -73,12 +73,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private $requestStackSize = 0; private $resetServices = false; - const VERSION = '4.3.0-BETA1'; + const VERSION = '4.3.0-DEV'; const VERSION_ID = 40300; const MAJOR_VERSION = 4; const MINOR_VERSION = 3; const RELEASE_VERSION = 0; - const EXTRA_VERSION = 'BETA1'; + const EXTRA_VERSION = 'DEV'; const END_OF_MAINTENANCE = '01/2020'; const END_OF_LIFE = '07/2020'; From 1532077e9111f48ceb55025b84582b9d2ac59b2f Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 9 May 2019 09:24:55 +0200 Subject: [PATCH 07/67] Update PR template for 4.3 --- .github/PULL_REQUEST_TEMPLATE.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ac82d7063d015..426b55def0001 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,20 +1,21 @@ | Q | A | ------------- | --- -| Branch? | master for features / 3.4 up to 4.2 for bug fixes +| Branch? | master for features / 3.4, 4.2 or 4.3 for bug fixes | Bug fix? | yes/no -| New feature? | yes/no +| New feature? | yes/no | BC breaks? | no -| Deprecations? | yes/no +| Deprecations? | yes/no | Tests pass? | yes | Fixed tickets | #... | License | MIT | Doc PR | symfony/symfony-docs#... From 7d51da36a77c3ec812967511e583a58e571baf8e Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 9 May 2019 09:39:53 +0200 Subject: [PATCH 08/67] [Contracts] Simplify implementation declarations --- src/Symfony/Component/Cache/composer.json | 2 +- src/Symfony/Component/DependencyInjection/composer.json | 2 +- src/Symfony/Component/Translation/composer.json | 2 +- src/Symfony/Contracts/README.md | 4 ++-- src/Symfony/Contracts/composer.json | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json index 8f9e669a33222..eb1110c0aa946 100644 --- a/src/Symfony/Component/Cache/composer.json +++ b/src/Symfony/Component/Cache/composer.json @@ -18,7 +18,7 @@ "provide": { "psr/cache-implementation": "1.0", "psr/simple-cache-implementation": "1.0", - "symfony/cache-contracts-implementation": "1.0" + "symfony/cache-implementation": "1.0" }, "require": { "php": "^7.1.3", diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index 32f52797e4345..6777ffed21fd2 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -40,7 +40,7 @@ }, "provide": { "psr/container-implementation": "1.0", - "symfony/service-contracts-implementation": "1.0" + "symfony/service-implementation": "1.0" }, "autoload": { "psr-4": { "Symfony\\Component\\DependencyInjection\\": "" }, diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index 809625b5ad2f1..f8cd3f2d58696 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -37,7 +37,7 @@ "symfony/yaml": "<3.4" }, "provide": { - "symfony/translation-contracts-implementation": "1.0" + "symfony/translation-implementation": "1.0" }, "suggest": { "symfony/config": "", diff --git a/src/Symfony/Contracts/README.md b/src/Symfony/Contracts/README.md index 9cb73af23f1dd..6725488e9d006 100644 --- a/src/Symfony/Contracts/README.md +++ b/src/Symfony/Contracts/README.md @@ -16,8 +16,8 @@ Design Principles * they must be backward compatible with existing Symfony components. Packages that implement specific contracts should list them in the "provide" -section of their "composer.json" file, using the `symfony/*-contracts-implementation` -convention (e.g. `"provide": { "symfony/cache-contracts-implementation": "1.0" }`). +section of their "composer.json" file, using the `symfony/*-implementation` +convention (e.g. `"provide": { "symfony/cache-implementation": "1.0" }`). FAQ --- diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/composer.json index 2f198a0c3b330..9701f4b253592 100644 --- a/src/Symfony/Contracts/composer.json +++ b/src/Symfony/Contracts/composer.json @@ -25,9 +25,9 @@ "suggest": { "psr/cache": "When using the Cache contracts", "psr/container": "When using the Service contracts", - "symfony/cache-contracts-implementation": "", - "symfony/service-contracts-implementation": "", - "symfony/translation-contracts-implementation": "" + "symfony/cache-implementation": "", + "symfony/service-implementation": "", + "symfony/translation-implementation": "" }, "autoload": { "psr-4": { "Symfony\\Contracts\\": "" }, From 0da4b8319700645fa4057b444c6524bd01d79643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Sch=C3=A4dlich?= Date: Fri, 3 May 2019 10:56:32 +0200 Subject: [PATCH 09/67] [DI] Removes number of elements information in debug mode --- .../FrameworkBundle/Command/ContainerDebugCommand.php | 1 + .../FrameworkBundle/Console/Descriptor/TextDescriptor.php | 7 ++++++- .../Tests/Console/Descriptor/AbstractDescriptorTest.php | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php index 62adea0e55f8c..eb4f8e4f6dc47 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php @@ -137,6 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $options['show_arguments'] = $input->getOption('show-arguments'); $options['raw_text'] = $input->getOption('raw'); $options['output'] = $io; + $options['is_debug'] = $this->getApplication()->getKernel()->isDebug(); $helper->describe($io, $object, $options); if (!$input->getArgument('name') && !$input->getOption('tag') && !$input->getOption('parameter') && $input->isInteractive()) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php index 90c7602604e2e..911e60c08be5b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php @@ -17,6 +17,7 @@ use Symfony\Component\DependencyInjection\Alias; use Symfony\Component\DependencyInjection\Argument\IteratorArgument; use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument; +use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; @@ -339,7 +340,11 @@ protected function describeContainerDefinition(Definition $definition, array $op if ($argument instanceof Reference) { $argumentsInformation[] = sprintf('Service(%s)', (string) $argument); } elseif ($argument instanceof IteratorArgument) { - $argumentsInformation[] = sprintf('Iterator (%d element(s))', \count($argument->getValues())); + if ($argument instanceof TaggedIteratorArgument) { + $argumentsInformation[] = sprintf('Tagged Iterator for "%s"%s', $argument->getTag(), $options['is_debug'] ? '' : sprintf(' (%d element(s))', \count($argument->getValues()))); + } else { + $argumentsInformation[] = sprintf('Iterator (%d element(s))', \count($argument->getValues())); + } } elseif ($argument instanceof Definition) { $argumentsInformation[] = 'Inlined Service'; } else { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php index 9bc05e538c76e..248b5396dfdc3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php @@ -182,6 +182,7 @@ abstract protected function getFormat(); private function assertDescription($expectedDescription, $describedObject, array $options = []) { + $options['is_debug'] = false; $options['raw_output'] = true; $options['raw_text'] = true; $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true); From aa71a42a492f0e85a16a04edbdb76bfc0846f9c4 Mon Sep 17 00:00:00 2001 From: Yonel Ceruto Date: Tue, 23 Apr 2019 09:36:06 -0400 Subject: [PATCH 10/67] [Routing] Fixed unexpected 404 NoConfigurationException --- .../Matcher/Dumper/PhpMatcherTrait.php | 22 ++++++++----------- .../Component/Routing/Matcher/UrlMatcher.php | 20 +++++------------ .../Routing/Tests/Matcher/UrlMatcherTest.php | 1 + 3 files changed, 16 insertions(+), 27 deletions(-) diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherTrait.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherTrait.php index 42cd41a9153c0..18b1018773b1c 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherTrait.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherTrait.php @@ -42,7 +42,7 @@ public function match($pathinfo) throw new MethodNotAllowedException(array_keys($allow)); } if (!$this instanceof RedirectableUrlMatcherInterface) { - throw new ResourceNotFoundException(); + throw new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo)); } if (!\in_array($this->context->getMethod(), ['HEAD', 'GET'], true)) { // no-op @@ -67,7 +67,7 @@ public function match($pathinfo) } } - throw new ResourceNotFoundException(); + throw new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo)); } private function doMatch(string $pathinfo, array &$allow = [], array &$allowSchemes = []): array @@ -110,10 +110,8 @@ private function doMatch(string $pathinfo, array &$allow = [], array &$allowSche } $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]); - if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) { - if ($hasRequiredScheme) { - $allow += $requiredMethods; - } + if ($hasRequiredScheme && $requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) { + $allow += $requiredMethods; continue; } @@ -157,15 +155,13 @@ private function doMatch(string $pathinfo, array &$allow = [], array &$allowSche } } - $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]); - if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) { - if ($hasRequiredScheme) { - $allow += $requiredMethods; - } + if ($requiredSchemes && !isset($requiredSchemes[$context->getScheme()])) { + $allowSchemes += $requiredSchemes; continue; } - if (!$hasRequiredScheme) { - $allowSchemes += $requiredSchemes; + + if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) { + $allow += $requiredMethods; continue; } diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php index 7b2662a2a392e..dca1d6366fa02 100644 --- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php +++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php @@ -89,7 +89,7 @@ public function match($pathinfo) return $ret; } - if ('/' === $pathinfo && !$this->allow) { + if ('/' === $pathinfo && !$this->allow && !$this->allowSchemes) { throw new NoConfigurationException(); } @@ -182,24 +182,16 @@ protected function matchCollection($pathinfo, RouteCollection $routes) if ($supportsTrailingSlash && (!$requiredMethods || \in_array('GET', $requiredMethods))) { return $this->allow = $this->allowSchemes = []; } - continue; } - $hasRequiredScheme = !$route->getSchemes() || $route->hasScheme($this->context->getScheme()); - if ($requiredMethods) { - if (!\in_array($method, $requiredMethods)) { - if ($hasRequiredScheme) { - $this->allow = array_merge($this->allow, $requiredMethods); - } - - continue; - } - } - - if (!$hasRequiredScheme) { + if ($route->getSchemes() && !$route->hasScheme($this->context->getScheme())) { $this->allowSchemes = array_merge($this->allowSchemes, $route->getSchemes()); + continue; + } + if ($requiredMethods && !\in_array($method, $requiredMethods)) { + $this->allow = array_merge($this->allow, $requiredMethods); continue; } diff --git a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php index 8f99f7b8e9988..823441159a87b 100644 --- a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php +++ b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php @@ -727,6 +727,7 @@ public function testNestedCollections() /** * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException + * @expectedExceptionMessage No routes found for "/". */ public function testSchemeAndMethodMismatch() { From bfdb4ed49242a184bcd1d818c1c25bd4d620d1de Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Wed, 8 May 2019 08:50:35 +0200 Subject: [PATCH 11/67] [Intl] Revise timezone name generation --- .../Data/Generator/TimezoneDataGenerator.php | 207 +++-- .../Intl/Resources/data/timezones/af.json | 24 +- .../Intl/Resources/data/timezones/am.json | 22 +- .../Intl/Resources/data/timezones/ar.json | 22 +- .../Intl/Resources/data/timezones/as.json | 30 +- .../Intl/Resources/data/timezones/az.json | 28 +- .../Intl/Resources/data/timezones/be.json | 29 +- .../Intl/Resources/data/timezones/bg.json | 6 +- .../Intl/Resources/data/timezones/bn.json | 22 +- .../Intl/Resources/data/timezones/bo.json | 14 +- .../Intl/Resources/data/timezones/br.json | 215 +++-- .../Intl/Resources/data/timezones/bs.json | 5 +- .../Resources/data/timezones/bs_Cyrl.json | 14 +- .../Intl/Resources/data/timezones/ca.json | 24 +- .../Intl/Resources/data/timezones/ce.json | 9 +- .../Intl/Resources/data/timezones/cs.json | 19 +- .../Intl/Resources/data/timezones/cy.json | 28 +- .../Intl/Resources/data/timezones/da.json | 7 +- .../Intl/Resources/data/timezones/de.json | 20 +- .../Intl/Resources/data/timezones/dz.json | 175 ++-- .../Intl/Resources/data/timezones/ee.json | 28 +- .../Intl/Resources/data/timezones/el.json | 24 +- .../Intl/Resources/data/timezones/en.json | 20 +- .../Intl/Resources/data/timezones/es.json | 20 +- .../Intl/Resources/data/timezones/es_MX.json | 2 +- .../Intl/Resources/data/timezones/es_US.json | 4 +- .../Intl/Resources/data/timezones/et.json | 17 +- .../Intl/Resources/data/timezones/eu.json | 24 +- .../Intl/Resources/data/timezones/fa.json | 22 +- .../Intl/Resources/data/timezones/fi.json | 18 +- .../Intl/Resources/data/timezones/fo.json | 30 +- .../Intl/Resources/data/timezones/fr.json | 17 +- .../Intl/Resources/data/timezones/fr_CA.json | 1 - .../Intl/Resources/data/timezones/fy.json | 31 +- .../Intl/Resources/data/timezones/ga.json | 6 +- .../Intl/Resources/data/timezones/gd.json | 8 +- .../Intl/Resources/data/timezones/gl.json | 24 +- .../Intl/Resources/data/timezones/gu.json | 20 +- .../Intl/Resources/data/timezones/ha.json | 438 +++++---- .../Intl/Resources/data/timezones/he.json | 22 +- .../Intl/Resources/data/timezones/hi.json | 24 +- .../Intl/Resources/data/timezones/hr.json | 6 +- .../Intl/Resources/data/timezones/hu.json | 20 +- .../Intl/Resources/data/timezones/hy.json | 8 +- .../Intl/Resources/data/timezones/ia.json | 348 ++++---- .../Intl/Resources/data/timezones/id.json | 19 +- .../Intl/Resources/data/timezones/ig.json | 122 ++- .../Intl/Resources/data/timezones/ii.json | 14 +- .../Intl/Resources/data/timezones/in.json | 446 ---------- .../Intl/Resources/data/timezones/is.json | 8 +- .../Intl/Resources/data/timezones/it.json | 24 +- .../Intl/Resources/data/timezones/iw.json | 446 ---------- .../Intl/Resources/data/timezones/ja.json | 20 +- .../Intl/Resources/data/timezones/jv.json | 30 +- .../Intl/Resources/data/timezones/ka.json | 30 +- .../Intl/Resources/data/timezones/kk.json | 30 +- .../Intl/Resources/data/timezones/km.json | 28 +- .../Intl/Resources/data/timezones/kn.json | 24 +- .../Intl/Resources/data/timezones/ko.json | 20 +- .../Intl/Resources/data/timezones/ks.json | 9 +- .../Intl/Resources/data/timezones/ky.json | 30 +- .../Intl/Resources/data/timezones/lb.json | 23 +- .../Intl/Resources/data/timezones/ln.json | 830 +++++++++--------- .../Intl/Resources/data/timezones/lo.json | 26 +- .../Intl/Resources/data/timezones/lt.json | 18 +- .../Intl/Resources/data/timezones/lv.json | 24 +- .../Intl/Resources/data/timezones/mi.json | 8 +- .../Intl/Resources/data/timezones/mk.json | 22 +- .../Intl/Resources/data/timezones/ml.json | 18 +- .../Intl/Resources/data/timezones/mn.json | 30 +- .../Intl/Resources/data/timezones/mo.json | 446 ---------- .../Intl/Resources/data/timezones/mr.json | 18 +- .../Intl/Resources/data/timezones/ms.json | 24 +- .../Intl/Resources/data/timezones/mt.json | 798 +++++++++-------- .../Intl/Resources/data/timezones/my.json | 30 +- .../Intl/Resources/data/timezones/nb.json | 20 +- .../Intl/Resources/data/timezones/ne.json | 30 +- .../Intl/Resources/data/timezones/nl.json | 20 +- .../Intl/Resources/data/timezones/nn.json | 30 +- .../Intl/Resources/data/timezones/no.json | 446 ---------- .../Intl/Resources/data/timezones/om.json | 14 +- .../Intl/Resources/data/timezones/or.json | 30 +- .../Intl/Resources/data/timezones/os.json | 153 ++-- .../Intl/Resources/data/timezones/pa.json | 30 +- .../Intl/Resources/data/timezones/pl.json | 24 +- .../Intl/Resources/data/timezones/ps.json | 76 +- .../Intl/Resources/data/timezones/ps_PK.json | 2 + .../Intl/Resources/data/timezones/pt.json | 20 +- .../Intl/Resources/data/timezones/pt_PT.json | 7 +- .../Intl/Resources/data/timezones/qu.json | 14 +- .../Intl/Resources/data/timezones/rm.json | 14 +- .../Intl/Resources/data/timezones/ro.json | 20 +- .../Intl/Resources/data/timezones/root.json | 8 + .../Intl/Resources/data/timezones/ru.json | 8 +- .../Intl/Resources/data/timezones/rw.json | 14 +- .../Intl/Resources/data/timezones/sd.json | 30 +- .../Intl/Resources/data/timezones/se.json | 672 +++++++------- .../Intl/Resources/data/timezones/se_FI.json | 31 +- .../Intl/Resources/data/timezones/sh.json | 446 ---------- .../Intl/Resources/data/timezones/si.json | 28 +- .../Intl/Resources/data/timezones/sk.json | 20 +- .../Intl/Resources/data/timezones/sl.json | 23 +- .../Intl/Resources/data/timezones/so.json | 30 +- .../Intl/Resources/data/timezones/sq.json | 20 +- .../Intl/Resources/data/timezones/sr.json | 8 +- .../Resources/data/timezones/sr_Latn.json | 1 + .../Intl/Resources/data/timezones/sv.json | 18 +- .../Intl/Resources/data/timezones/sw.json | 22 +- .../Intl/Resources/data/timezones/ta.json | 20 +- .../Intl/Resources/data/timezones/te.json | 20 +- .../Intl/Resources/data/timezones/tg.json | 8 +- .../Intl/Resources/data/timezones/th.json | 20 +- .../Intl/Resources/data/timezones/ti.json | 14 +- .../Intl/Resources/data/timezones/tk.json | 30 +- .../Intl/Resources/data/timezones/tl.json | 446 ---------- .../Intl/Resources/data/timezones/to.json | 21 +- .../Intl/Resources/data/timezones/tr.json | 20 +- .../Intl/Resources/data/timezones/tt.json | 500 ++++++----- .../Intl/Resources/data/timezones/ug.json | 23 +- .../Intl/Resources/data/timezones/uk.json | 20 +- .../Intl/Resources/data/timezones/ur.json | 22 +- .../Intl/Resources/data/timezones/uz.json | 8 +- .../Resources/data/timezones/uz_Cyrl.json | 11 + .../Intl/Resources/data/timezones/vi.json | 20 +- .../Intl/Resources/data/timezones/wo.json | 8 +- .../Intl/Resources/data/timezones/yi.json | 14 +- .../Intl/Resources/data/timezones/yo.json | 470 +++++----- .../Intl/Resources/data/timezones/yo_BJ.json | 234 ++++- .../Intl/Resources/data/timezones/zh.json | 20 +- .../Intl/Resources/data/timezones/zh_HK.json | 202 ----- .../Resources/data/timezones/zh_Hans_SG.json | 435 ++++++++- .../Resources/data/timezones/zh_Hant.json | 9 +- .../Resources/data/timezones/zh_Hant_HK.json | 4 +- .../Intl/Resources/data/timezones/zh_SG.json | 7 - .../Intl/Resources/data/timezones/zu.json | 24 +- src/Symfony/Component/Intl/Timezones.php | 2 +- 136 files changed, 3900 insertions(+), 6778 deletions(-) delete mode 100644 src/Symfony/Component/Intl/Resources/data/timezones/in.json delete mode 100644 src/Symfony/Component/Intl/Resources/data/timezones/iw.json delete mode 100644 src/Symfony/Component/Intl/Resources/data/timezones/mo.json delete mode 100644 src/Symfony/Component/Intl/Resources/data/timezones/no.json create mode 100644 src/Symfony/Component/Intl/Resources/data/timezones/root.json delete mode 100644 src/Symfony/Component/Intl/Resources/data/timezones/sh.json delete mode 100644 src/Symfony/Component/Intl/Resources/data/timezones/tl.json delete mode 100644 src/Symfony/Component/Intl/Resources/data/timezones/zh_HK.json delete mode 100644 src/Symfony/Component/Intl/Resources/data/timezones/zh_SG.json diff --git a/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php index 321a1744a3404..8ed517fe42431 100644 --- a/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php @@ -28,18 +28,24 @@ */ class TimezoneDataGenerator extends AbstractDataGenerator { + use FallbackTrait; + /** * Collects all available zone IDs. * * @var string[] */ private $zoneIds = []; + private $zoneToCountryMapping = []; + private $localeAliases = []; /** * {@inheritdoc} */ protected function scanLocales(LocaleScanner $scanner, $sourceDir) { + $this->localeAliases = $scanner->scanAliases($sourceDir.'/locales'); + return $scanner->scanLocales($sourceDir.'/zone'); } @@ -63,6 +69,7 @@ protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $s protected function preGenerate() { $this->zoneIds = []; + $this->zoneToCountryMapping = []; } /** @@ -70,36 +77,50 @@ protected function preGenerate() */ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale) { - $localeBundle = $reader->read($tempDir, $displayLocale); + if (!$this->zoneToCountryMapping) { + $this->zoneToCountryMapping = self::generateZoneToCountryMapping($reader->read($tempDir, 'windowsZones')); + } - if (isset($localeBundle['zoneStrings']) && null !== $localeBundle['zoneStrings']) { - $localeBundles = [$localeBundle]; - $fallback = $displayLocale; - while (null !== ($fallback = Locale::getFallback($fallback))) { - $localeBundles[] = $reader->read($tempDir, $fallback); - } - $metadata = []; - $data = [ - 'Version' => $localeBundle['Version'], - 'Names' => $this->generateZones( - $reader, - $tempDir, - $displayLocale, - $localeBundles, - $metadata - ), - ]; - - if (!$data['Names'] && !$metadata) { - return; - } + // Don't generate aliases, as they are resolved during runtime + // Unless an alias is needed as fallback for de-duplication purposes + if (isset($this->localeAliases[$displayLocale]) && !$this->generatingFallback) { + return; + } - $data['Meta'] = $metadata; + $localeBundle = $reader->read($tempDir, $displayLocale); + + if (!isset($localeBundle['zoneStrings']) || null === $localeBundle['zoneStrings']) { + return; + } - $this->zoneIds = array_merge($this->zoneIds, array_keys($data['Names'])); + $data = [ + 'Version' => $localeBundle['Version'], + 'Names' => $this->generateZones($reader, $tempDir, $displayLocale), + 'Meta' => self::generateZoneMetadata($localeBundle), + ]; + // Don't de-duplicate a fallback locale + // Ensures the display locale can be de-duplicated on itself + if ($this->generatingFallback) { return $data; } + + // Process again to de-duplicate locales and their fallback locales + // Only keep the differences + $fallback = $this->generateFallbackData($reader, $tempDir, $displayLocale); + if (isset($fallback['Names'])) { + $data['Names'] = array_diff($data['Names'], $fallback['Names']); + } + if (isset($fallback['Meta'])) { + $data['Meta'] = array_diff($data['Meta'], $fallback['Meta']); + } + if (!$data['Names'] && !$data['Meta']) { + return; + } + + $this->zoneIds = array_merge($this->zoneIds, array_keys($data['Names'])); + + return $data; } /** @@ -107,6 +128,12 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te */ protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir) { + $rootBundle = $reader->read($tempDir, 'root'); + + return [ + 'Version' => $rootBundle['Version'], + 'Meta' => self::generateZoneMetadata($rootBundle), + ]; } /** @@ -119,66 +146,21 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, $temp $this->zoneIds = array_unique($this->zoneIds); sort($this->zoneIds); + ksort($this->zoneToCountryMapping); $data = [ 'Version' => $rootBundle['Version'], 'Zones' => $this->zoneIds, - 'ZoneToCountry' => self::generateZoneToCountryMapping($reader->read($tempDir, 'windowsZones')), + 'ZoneToCountry' => $this->zoneToCountryMapping, + 'CountryToZone' => self::generateCountryToZoneMapping($this->zoneToCountryMapping), ]; - $data['CountryToZone'] = self::generateCountryToZoneMapping($data['ZoneToCountry']); - return $data; } - /** - * @param ArrayAccessibleResourceBundle[] $localeBundles - */ - private function generateZones(BundleEntryReaderInterface $reader, string $tempDir, string $locale, array $localeBundles, array &$metadata = []): array + private function generateZones(BundleEntryReaderInterface $reader, string $tempDir, string $locale): array { $typeBundle = $reader->read($tempDir, 'timezoneTypes'); - $metaBundle = $reader->read($tempDir, 'metaZones'); - $windowsZonesBundle = $reader->read($tempDir, 'windowsZones'); - $accessor = static function (ArrayAccessibleResourceBundle $resourceBundle, array $indices) { - $result = $resourceBundle; - foreach ($indices as $indice) { - $result = $result[$indice] ?? null; - } - - return $result; - }; - $accessor = static function (array $indices, &$inherited = false) use ($localeBundles, $accessor) { - $inherited = false; - foreach ($localeBundles as $i => $localeBundle) { - $nextLocaleBundle = $localeBundles[$i + 1] ?? null; - $result = $accessor($localeBundle, $indices); - if (null !== $result && (null === $nextLocaleBundle || $result !== $accessor($nextLocaleBundle, $indices))) { - $inherited = 0 !== $i; - - return $result; - } - } - - return null; - }; - $regionFormat = $reader->readEntry($tempDir, $locale, ['zoneStrings', 'regionFormat']); - $fallbackFormat = $reader->readEntry($tempDir, $locale, ['zoneStrings', 'fallbackFormat']); - $zoneToCountry = self::generateZoneToCountryMapping($windowsZonesBundle); - $resolveName = function (string $id, string $city = null) use ($reader, $tempDir, $locale, $regionFormat, $fallbackFormat, $zoneToCountry): ?string { - if (isset($zoneToCountry[$id])) { - try { - $country = $reader->readEntry($tempDir.'/region', $locale, ['Countries', $zoneToCountry[$id]]); - } catch (MissingResourceException $e) { - return null; - } - - return null === $city ? str_replace('{0}', $country, $regionFormat) : str_replace(['{0}', '{1}'], [$city, $country], $fallbackFormat); - } elseif (null !== $city) { - return str_replace('{0}', $city, $regionFormat); - } else { - return str_replace(['/', '_'], ' ', 0 === strrpos($id, 'Etc/') ? substr($id, 4) : $id); - } - }; $available = []; foreach ($typeBundle['typeMap']['timezone'] as $zone => $_) { if ('Etc:Unknown' === $zone || preg_match('~^Etc:GMT[-+]\d+$~', $zone)) { @@ -188,6 +170,7 @@ private function generateZones(BundleEntryReaderInterface $reader, string $tempD $available[$zone] = true; } + $metaBundle = $reader->read($tempDir, 'metaZones'); $metazones = []; foreach ($metaBundle['metazoneInfo'] as $zone => $info) { foreach ($info as $metazone) { @@ -195,57 +178,89 @@ private function generateZones(BundleEntryReaderInterface $reader, string $tempD } } - $isBase = false === strpos($locale, '_'); + $regionFormat = $reader->readEntry($tempDir, $locale, ['zoneStrings', 'regionFormat']); + $fallbackFormat = $reader->readEntry($tempDir, $locale, ['zoneStrings', 'fallbackFormat']); + $resolveName = function (string $id, string $city = null) use ($reader, $tempDir, $locale, $regionFormat, $fallbackFormat): ?string { + // Resolve default name as described per http://cldr.unicode.org/translation/timezones + if (isset($this->zoneToCountryMapping[$id])) { + try { + $country = $reader->readEntry($tempDir.'/region', $locale, ['Countries', $this->zoneToCountryMapping[$id]]); + } catch (MissingResourceException $e) { + return null; + } + + $name = str_replace('{0}', $country, $regionFormat); + + return null === $city ? $name : str_replace(['{0}', '{1}'], [$city, $name], $fallbackFormat); + } + if (null !== $city) { + return str_replace('{0}', $city, $regionFormat); + } + + return null; + }; + $accessor = static function (array $indices, array ...$fallbackIndices) use ($locale, $reader, $tempDir) { + foreach (\func_get_args() as $indices) { + try { + return $reader->readEntry($tempDir, $locale, $indices); + } catch (MissingResourceException $e) { + } + } + + return null; + }; $zones = []; foreach (array_keys($available) as $zone) { // lg: long generic, e.g. "Central European Time" // ls: long specific (not DST), e.g. "Central European Standard Time" // ld: long DST, e.g. "Central European Summer Time" // ec: example city, e.g. "Amsterdam" - $name = $accessor(['zoneStrings', $zone, 'lg'], $nameInherited) ?? $accessor(['zoneStrings', $zone, 'ls'], $nameInherited); - $city = $accessor(['zoneStrings', $zone, 'ec'], $cityInherited); + $name = $accessor(['zoneStrings', $zone, 'lg'], ['zoneStrings', $zone, 'ls']); + $city = $accessor(['zoneStrings', $zone, 'ec']); $id = str_replace(':', '/', $zone); if (null === $name && isset($metazones[$zone])) { $meta = 'meta:'.$metazones[$zone]; - $name = $accessor(['zoneStrings', $meta, 'lg'], $nameInherited) ?? $accessor(['zoneStrings', $meta, 'ls'], $nameInherited); + $name = $accessor(['zoneStrings', $meta, 'lg'], ['zoneStrings', $meta, 'ls']); } + + // Infer a default English named city for all locales + // Ensures each timezone ID has a distinctive name if (null === $city && 0 !== strrpos($zone, 'Etc:') && false !== $i = strrpos($zone, ':')) { $city = str_replace('_', ' ', substr($zone, $i + 1)); - $cityInherited = !$isBase; } - if ($isBase && null === $name) { + if (null === $name) { $name = $resolveName($id, $city); $city = null; } - if ( - ($nameInherited && $cityInherited) - || (null === $name && null === $city) - || ($nameInherited && null === $city) - || ($cityInherited && null === $name) - ) { + if (null === $name) { continue; } - if (null === $name) { - $name = $resolveName($id, $city); - } elseif (null !== $city && false === mb_stripos(str_replace('-', ' ', $name), str_replace('-', ' ', $city))) { + + // Ensure no duplicated content is generated + if (null !== $city && false === mb_stripos(str_replace('-', ' ', $name), str_replace('-', ' ', $city))) { $name = str_replace(['{0}', '{1}'], [$city, $name], $fallbackFormat); } $zones[$id] = $name; } - $gmtFormat = $accessor(['zoneStrings', 'gmtFormat'], $gmtFormatInherited) ?? 'GMT{0}'; - if (!$gmtFormatInherited || $isBase) { - $metadata['GmtFormat'] = str_replace('{0}', '%s', $gmtFormat); - } + return $zones; + } - $hourFormat = $accessor(['zoneStrings', 'hourFormat'], $hourFormatInherited) ?? '+HH:mm;-HH:mm'; - if (!$hourFormatInherited || $isBase) { - $metadata['HourFormat'] = explode(';', str_replace(['HH', 'mm', 'H', 'm'], ['%02d', '%02d', '%d', '%d'], $hourFormat), 2); + private static function generateZoneMetadata(ArrayAccessibleResourceBundle $localeBundle): array + { + $metadata = []; + if (isset($localeBundle['zoneStrings']['gmtFormat'])) { + $metadata['GmtFormat'] = str_replace('{0}', '%s', $localeBundle['zoneStrings']['gmtFormat']); + } + if (isset($localeBundle['zoneStrings']['hourFormat'])) { + $hourFormat = explode(';', str_replace(['HH', 'mm', 'H', 'm'], ['%02d', '%02d', '%d', '%d'], $localeBundle['zoneStrings']['hourFormat']), 2); + $metadata['HourFormatPos'] = $hourFormat[0]; + $metadata['HourFormatNeg'] = $hourFormat[1]; } - return $zones; + return $metadata; } private static function generateZoneToCountryMapping(ArrayAccessibleResourceBundle $windowsZoneBundle): array diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/af.json b/src/Symfony/Component/Intl/Resources/data/timezones/af.json index 184c6922ab3fe..9dc6b3b5313b5 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/af.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/af.json @@ -99,7 +99,7 @@ "America\/Detroit": "Noord-Amerikaanse oostelike tyd (Detroit)", "America\/Dominica": "Atlantiese tyd (Dominica)", "America\/Edmonton": "Noord-Amerikaanse bergtyd (Edmonton)", - "America\/Eirunepe": "Brasilië (Eirunepe)", + "America\/Eirunepe": "Brasilië-tyd (Eirunepe)", "America\/El_Salvador": "Noord-Amerikaanse sentrale tyd (El Salvador)", "America\/Fort_Nelson": "Noord-Amerikaanse bergtyd (Fort Nelson)", "America\/Fortaleza": "Brasilia-tyd (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Atlantiese tyd (Moncton)", "America\/Monterrey": "Noord-Amerikaanse sentrale tyd (Monterrey)", "America\/Montevideo": "Uruguay-tyd (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Kanada-tyd (Montreal)", "America\/Montserrat": "Atlantiese tyd (Montserrat)", "America\/Nassau": "Noord-Amerikaanse oostelike tyd (Nassau)", "America\/New_York": "Noord-Amerikaanse oostelike tyd (New York)", @@ -176,7 +176,7 @@ "America\/Recife": "Brasilia-tyd (Recife)", "America\/Regina": "Noord-Amerikaanse sentrale tyd (Regina)", "America\/Resolute": "Noord-Amerikaanse sentrale tyd (Resolute)", - "America\/Rio_Branco": "Brasilië (Rio Branco)", + "America\/Rio_Branco": "Brasilië-tyd (Rio Branco)", "America\/Santa_Isabel": "Noordwes-Meksiko-tyd (Santa Isabel)", "America\/Santarem": "Brasilia-tyd (Santarem)", "America\/Santiago": "Chili-tyd (Santiago)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Arabiese tyd (Bahrein)", "Asia\/Baku": "Aserbeidjan-tyd (Bakoe)", "Asia\/Bangkok": "Indosjina-tyd (Bangkok)", - "Asia\/Barnaul": "Rusland (Barnaul)", + "Asia\/Barnaul": "Rusland-tyd (Barnaul)", "Asia\/Beirut": "Oos-Europese tyd (Beiroet)", "Asia\/Bishkek": "Kirgistan-tyd (Bisjkek)", "Asia\/Brunei": "Broenei Darussalam-tyd", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Iran-tyd (Tehran)", "Asia\/Thimphu": "Bhoetan-tyd (Thimphu)", "Asia\/Tokyo": "Japan-tyd (Tokio)", - "Asia\/Tomsk": "Rusland (Tomsk)", + "Asia\/Tomsk": "Rusland-tyd (Tomsk)", "Asia\/Ulaanbaatar": "Ulaanbaatar-tyd", - "Asia\/Urumqi": "Sjina (Urumqi)", + "Asia\/Urumqi": "Sjina-tyd (Urumqi)", "Asia\/Ust-Nera": "Wladiwostok-tyd (Ust-Nera)", "Asia\/Vientiane": "Indosjina-tyd (Vientiane)", "Asia\/Vladivostok": "Wladiwostok-tyd", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwich-tyd (Guernsey)", "Europe\/Helsinki": "Oos-Europese tyd (Helsinki)", "Europe\/Isle_of_Man": "Greenwich-tyd (Eiland Man)", - "Europe\/Istanbul": "Turkye (Istanbul)", + "Europe\/Istanbul": "Turkye-tyd (Istanbul)", "Europe\/Jersey": "Greenwich-tyd (Jersey)", "Europe\/Kaliningrad": "Oos-Europese tyd (Kaliningrad)", "Europe\/Kiev": "Oos-Europese tyd (Kiëf)", - "Europe\/Kirov": "Rusland (Kirov)", + "Europe\/Kirov": "Rusland-tyd (Kirov)", "Europe\/Lisbon": "Wes-Europese tyd (Lissabon)", "Europe\/Ljubljana": "Sentraal-Europese tyd (Ljubljana)", "Europe\/London": "Greenwich-tyd (Londen)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Wake-eiland-tyd", "Pacific\/Wallis": "Wallis en Futuna-tyd (Mata-Utu)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/am.json b/src/Symfony/Component/Intl/Resources/data/timezones/am.json index d45da2178d4c5..0714846f01f4a 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/am.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/am.json @@ -99,7 +99,7 @@ "America\/Detroit": "ምስራቃዊ ሰዓት አቆጣጠር (ዲትሮይት)", "America\/Dominica": "የአትላንቲክ የሰዓት አቆጣጠር (ዶሜኒካ)", "America\/Edmonton": "የተራራ የሰዓት አቆጣጠር (ኤድመንተን)", - "America\/Eirunepe": "ብራዚል (ኢሩኔፕ)", + "America\/Eirunepe": "ብራዚል ጊዜ (ኢሩኔፕ)", "America\/El_Salvador": "የሰሜን አሜሪካ የመካከለኛ ሰዓት አቆጣጠር (ኤልሳልቫዶር)", "America\/Fort_Nelson": "የተራራ የሰዓት አቆጣጠር (ፎርት ኔልሰን)", "America\/Fortaleza": "የብራዚላዊ ሰዓት አቆጣጠር (ፎርታሌዛ)", @@ -151,7 +151,7 @@ "America\/Moncton": "የአትላንቲክ የሰዓት አቆጣጠር (ሞንክቶን)", "America\/Monterrey": "የሰሜን አሜሪካ የመካከለኛ ሰዓት አቆጣጠር (ሞንተርሬይ)", "America\/Montevideo": "የኡራጓይ ሰዓት (ሞንቴቪድዮ)", - "America\/Montreal": "ካናዳ (Montreal)", + "America\/Montreal": "ካናዳ ጊዜ (Montreal)", "America\/Montserrat": "የአትላንቲክ የሰዓት አቆጣጠር (ሞንትሴራት)", "America\/Nassau": "ምስራቃዊ ሰዓት አቆጣጠር (ናሳው)", "America\/New_York": "ምስራቃዊ ሰዓት አቆጣጠር (ኒውዮርክ)", @@ -176,7 +176,7 @@ "America\/Recife": "የብራዚላዊ ሰዓት አቆጣጠር (ረሲፍ)", "America\/Regina": "የሰሜን አሜሪካ የመካከለኛ ሰዓት አቆጣጠር (ረጂና)", "America\/Resolute": "የሰሜን አሜሪካ የመካከለኛ ሰዓት አቆጣጠር (ሪዞሊዩት)", - "America\/Rio_Branco": "ብራዚል (ሪዮ ብራንኮ)", + "America\/Rio_Branco": "ብራዚል ጊዜ (ሪዮ ብራንኮ)", "America\/Santa_Isabel": "ሰሜናዊ ምእራብ የሜክሲኮ ሰዓት አቆጣጠር (ሳንታ ኢዛቤል)", "America\/Santarem": "የብራዚላዊ ሰዓት አቆጣጠር (ሳንታሬም)", "America\/Santiago": "የቺሊ ሰዓት (ሳንቲያጎ)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "የዓረቢያ ሰዓት (ባህሬን)", "Asia\/Baku": "የአዘርባጃን ሰዓት (ባኩ)", "Asia\/Bangkok": "የኢንዶቻይና ሰዓት (ባንኮክ)", - "Asia\/Barnaul": "ሩስያ (ባርናኡል)", + "Asia\/Barnaul": "ሩስያ ጊዜ (ባርናኡል)", "Asia\/Beirut": "የምስራቃዊ አውሮፓ ሰዓት (ቤሩት)", "Asia\/Bishkek": "የኪርጊስታን ሰዓት (ቢሽኬክ)", "Asia\/Brunei": "የብሩኔይ ዳሩሳላም ሰዓት (ብሩናይ)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "የኢራን ሰዓት (ቴህራን)", "Asia\/Thimphu": "የቡታን ሰዓት (ቲምፉ)", "Asia\/Tokyo": "የጃፓን ሰዓት (ቶኪዮ)", - "Asia\/Tomsk": "ሩስያ (ቶምስክ)", + "Asia\/Tomsk": "ሩስያ ጊዜ (ቶምስክ)", "Asia\/Ulaanbaatar": "የኡላን ባቶር ጊዜ (ኡላአንባአታር)", - "Asia\/Urumqi": "ቻይና (ኡሩምኪ)", + "Asia\/Urumqi": "ቻይና ጊዜ (ኡሩምኪ)", "Asia\/Ust-Nera": "የቭላዲቮስቶክ የሰዓት አቆጣጠር (ኡስት-ኔራ)", "Asia\/Vientiane": "የኢንዶቻይና ሰዓት (ቬንቲአን)", "Asia\/Vladivostok": "የቭላዲቮስቶክ የሰዓት አቆጣጠር", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "ግሪንዊች ማዕከላዊ ሰዓት (ጉርነሲ)", "Europe\/Helsinki": "የምስራቃዊ አውሮፓ ሰዓት (ሄልሲንኪ)", "Europe\/Isle_of_Man": "ግሪንዊች ማዕከላዊ ሰዓት (አይስል ኦፍ ማን)", - "Europe\/Istanbul": "ቱርክ (ኢስታንቡል)", + "Europe\/Istanbul": "ቱርክ ጊዜ (ኢስታንቡል)", "Europe\/Jersey": "ግሪንዊች ማዕከላዊ ሰዓት (ጀርሲ)", "Europe\/Kaliningrad": "የምስራቃዊ አውሮፓ ሰዓት (ካሊኒንግራድ)", "Europe\/Kiev": "የምስራቃዊ አውሮፓ ሰዓት (ኪየቭ)", - "Europe\/Kirov": "ሩስያ (ኪሮቭ)", + "Europe\/Kirov": "ሩስያ ጊዜ (ኪሮቭ)", "Europe\/Lisbon": "የምዕራባዊ አውሮፓ ሰዓት (ሊዝበን)", "Europe\/Ljubljana": "የመካከለኛው አውሮፓ ሰዓት (ልጁብልጃና)", "Europe\/London": "ግሪንዊች ማዕከላዊ ሰዓት (ለንደን)", @@ -438,9 +438,7 @@ }, "Meta": { "GmtFormat": "ጂ ኤም ቲ%s", - "HourFormat": [ - "+%02d%02d", - "-%02d%02d" - ] + "HourFormatPos": "+%02d%02d", + "HourFormatNeg": "-%02d%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ar.json b/src/Symfony/Component/Intl/Resources/data/timezones/ar.json index 4d26c234783bc..cf8ea90144881 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ar.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ar.json @@ -99,7 +99,7 @@ "America\/Detroit": "التوقيت الشرقي لأمريكا الشمالية (ديترويت)", "America\/Dominica": "توقيت الأطلسي (دومينيكا)", "America\/Edmonton": "التوقيت الجبلي لأمريكا الشمالية (ايدمونتون)", - "America\/Eirunepe": "البرازيل (ايرونبي)", + "America\/Eirunepe": "توقيت البرازيل (ايرونبي)", "America\/El_Salvador": "التوقيت المركزي لأمريكا الشمالية (السلفادور)", "America\/Fort_Nelson": "التوقيت الجبلي لأمريكا الشمالية (فورت نيلسون)", "America\/Fortaleza": "توقيت برازيليا (فورتاليزا)", @@ -151,7 +151,7 @@ "America\/Moncton": "توقيت الأطلسي (وينكتون)", "America\/Monterrey": "التوقيت المركزي لأمريكا الشمالية (مونتيري)", "America\/Montevideo": "توقيت أوروغواي (مونتفيديو)", - "America\/Montreal": "كندا (Montreal)", + "America\/Montreal": "توقيت كندا (Montreal)", "America\/Montserrat": "توقيت الأطلسي (مونتسيرات)", "America\/Nassau": "التوقيت الشرقي لأمريكا الشمالية (ناسو)", "America\/New_York": "التوقيت الشرقي لأمريكا الشمالية (نيويورك)", @@ -176,7 +176,7 @@ "America\/Recife": "توقيت برازيليا (ريسيف)", "America\/Regina": "التوقيت المركزي لأمريكا الشمالية (ريجينا)", "America\/Resolute": "التوقيت المركزي لأمريكا الشمالية (ريزولوت)", - "America\/Rio_Branco": "البرازيل (ريوبرانكو)", + "America\/Rio_Branco": "توقيت البرازيل (ريوبرانكو)", "America\/Santa_Isabel": "توقيت شمال غرب المكسيك (سانتا إيزابيل)", "America\/Santarem": "توقيت برازيليا (سانتاريم)", "America\/Santiago": "توقيت تشيلي (سانتياغو)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "التوقيت العربي (البحرين)", "Asia\/Baku": "توقيت أذربيجان (باكو)", "Asia\/Bangkok": "توقيت الهند الصينية (بانكوك)", - "Asia\/Barnaul": "روسيا (بارناول)", + "Asia\/Barnaul": "توقيت روسيا (بارناول)", "Asia\/Beirut": "توقيت شرق أوروبا (بيروت)", "Asia\/Bishkek": "توقيت قيرغيزستان (بشكيك)", "Asia\/Brunei": "توقيت بروناي", @@ -288,9 +288,9 @@ "Asia\/Tehran": "توقيت إيران (طهران)", "Asia\/Thimphu": "توقيت بوتان (تيمفو)", "Asia\/Tokyo": "توقيت اليابان (طوكيو)", - "Asia\/Tomsk": "روسيا (تومسك)", + "Asia\/Tomsk": "توقيت روسيا (تومسك)", "Asia\/Ulaanbaatar": "توقيت أولان باتور (آلانباتار)", - "Asia\/Urumqi": "الصين (أرومكي)", + "Asia\/Urumqi": "توقيت الصين (أرومكي)", "Asia\/Ust-Nera": "توقيت فلاديفوستوك (أوست نيرا)", "Asia\/Vientiane": "توقيت الهند الصينية (فيانتيان)", "Asia\/Vladivostok": "توقيت فلاديفوستوك (فلاديفوستك)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "توقيت غرينتش (غيرنزي)", "Europe\/Helsinki": "توقيت شرق أوروبا (هلسنكي)", "Europe\/Isle_of_Man": "توقيت غرينتش (جزيرة مان)", - "Europe\/Istanbul": "تركيا (إسطنبول)", + "Europe\/Istanbul": "توقيت تركيا (إسطنبول)", "Europe\/Jersey": "توقيت غرينتش (جيرسي)", "Europe\/Kaliningrad": "توقيت شرق أوروبا (كالينجراد)", "Europe\/Kiev": "توقيت شرق أوروبا (كييف)", - "Europe\/Kirov": "روسيا (كيروف)", + "Europe\/Kirov": "توقيت روسيا (كيروف)", "Europe\/Lisbon": "توقيت غرب أوروبا (لشبونة)", "Europe\/Ljubljana": "توقيت وسط أوروبا (ليوبليانا)", "Europe\/London": "توقيت غرينتش (لندن)", @@ -437,10 +437,6 @@ "Pacific\/Wallis": "توقيت واليس و فوتونا" }, "Meta": { - "GmtFormat": "غرينتش%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] + "GmtFormat": "غرينتش%s" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/as.json b/src/Symfony/Component/Intl/Resources/data/timezones/as.json index f390ea5aa9945..36198c8ba52a0 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/as.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/as.json @@ -99,7 +99,7 @@ "America\/Detroit": "উত্তৰ আমেৰিকাৰ প্ৰাচ্য সময় (ডেট্ৰোইট)", "America\/Dominica": "আটলাণ্টিক সময় (ডমিনিকা)", "America\/Edmonton": "উত্তৰ আমেৰিকাৰ পৰ্ব্বতীয় সময় (এডমণ্টন)", - "America\/Eirunepe": "ব্ৰাজিল (ইৰুনেপে)", + "America\/Eirunepe": "ব্ৰাজিল সময় (ইৰুনেপে)", "America\/El_Salvador": "উত্তৰ আমেৰিকাৰ কেন্দ্ৰীয় সময় (এল ছেলভেড’ৰ)", "America\/Fort_Nelson": "উত্তৰ আমেৰিকাৰ পৰ্ব্বতীয় সময় (ফ’ৰ্ট নেলছন)", "America\/Fortaleza": "ব্ৰাজিলিয়াৰ সময় (ফোৰ্টালেজা)", @@ -151,7 +151,7 @@ "America\/Moncton": "আটলাণ্টিক সময় (মন্‌কটন)", "America\/Monterrey": "উত্তৰ আমেৰিকাৰ কেন্দ্ৰীয় সময় (মণ্টেৰেৰী)", "America\/Montevideo": "উৰুগুৱেৰ সময় (মণ্টেভিডিঅ’)", - "America\/Montreal": "কানাডা (Montreal)", + "America\/Montreal": "কানাডা সময় (Montreal)", "America\/Montserrat": "আটলাণ্টিক সময় (মণ্টছেৰাট)", "America\/Nassau": "উত্তৰ আমেৰিকাৰ প্ৰাচ্য সময় (নাছাউ)", "America\/New_York": "উত্তৰ আমেৰিকাৰ প্ৰাচ্য সময় (নিউ ইয়ৰ্ক)", @@ -176,7 +176,7 @@ "America\/Recife": "ব্ৰাজিলিয়াৰ সময় (ৰেচাইফ)", "America\/Regina": "উত্তৰ আমেৰিকাৰ কেন্দ্ৰীয় সময় (ৰেজিনা)", "America\/Resolute": "উত্তৰ আমেৰিকাৰ কেন্দ্ৰীয় সময় (ৰিজ’লিউট)", - "America\/Rio_Branco": "ব্ৰাজিল (ৰিঅ’ ব্ৰাংকো)", + "America\/Rio_Branco": "ব্ৰাজিল সময় (ৰিঅ’ ব্ৰাংকো)", "America\/Santa_Isabel": "উত্তৰ-পশ্চিম মেক্সিকোৰ সময় (Santa Isabel)", "America\/Santarem": "ব্ৰাজিলিয়াৰ সময় (ছেণ্টাৰেম)", "America\/Santiago": "চিলিৰ সময় (ছেণ্টিয়াগো)", @@ -217,7 +217,7 @@ "Asia\/Aden": "আৰবীয় সময় (আদেন)", "Asia\/Almaty": "পূব কাজাখস্তানৰ সময় (আলমাটি)", "Asia\/Amman": "প্ৰাচ্য ইউৰোপীয় সময় (আম্মান)", - "Asia\/Anadyr": "ৰাছিয়া (আনাডিৰ)", + "Asia\/Anadyr": "ৰাছিয়া সময় (আনাডিৰ)", "Asia\/Aqtau": "পশ্চিম কাজাখস্তানৰ সময় (এক্যোট্যাও)", "Asia\/Aqtobe": "পশ্চিম কাজাখস্তানৰ সময় (এক্যোটব)", "Asia\/Ashgabat": "তুৰ্কমেনিস্তানৰ সময় (আশ্ব্গা‌বাট)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "আৰবীয় সময় (বাহৰেইন)", "Asia\/Baku": "আজেৰবাইজানৰ সময় (বাকু)", "Asia\/Bangkok": "ইণ্ডোচাইনাৰ সময় (বেংকক)", - "Asia\/Barnaul": "ৰাছিয়া (বাৰ্নুল)", + "Asia\/Barnaul": "ৰাছিয়া সময় (বাৰ্নুল)", "Asia\/Beirut": "প্ৰাচ্য ইউৰোপীয় সময় (বেইৰুট)", "Asia\/Bishkek": "কিৰ্গিজস্তানৰ সময় (বিশ্ব্‌কেক)", "Asia\/Brunei": "ব্ৰুনেই ডাৰুছালেমৰ সময়", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "প্ৰাচ্য ইণ্ডোনেচিয়াৰ সময় (জায়াপুৰা)", "Asia\/Jerusalem": "ইজৰাইলৰ সময় (জেৰুজালেম)", "Asia\/Kabul": "আফগানিস্তানৰ সময় (কাবুল)", - "Asia\/Kamchatka": "ৰাছিয়া (কামচত্কা)", + "Asia\/Kamchatka": "ৰাছিয়া সময় (কামচত্কা)", "Asia\/Karachi": "পাকিস্তানৰ সময় (কৰাচী)", "Asia\/Katmandu": "নেপালৰ সময় (কাঠমাণ্ডু)", "Asia\/Khandyga": "য়াকুত্স্কৰ সময় (খাণ্ডিগা)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ইৰানৰ সময় (তেহৰান)", "Asia\/Thimphu": "ভুটানৰ সময় (থিম্ফু)", "Asia\/Tokyo": "জাপানৰ সময় (টকিঅ’)", - "Asia\/Tomsk": "ৰাছিয়া (তোম্‌স্ক)", + "Asia\/Tomsk": "ৰাছিয়া সময় (তোম্‌স্ক)", "Asia\/Ulaanbaatar": "উলানবাটাৰৰ সময়", - "Asia\/Urumqi": "চীন (উৰুম্‌কি)", + "Asia\/Urumqi": "চীন সময় (উৰুম্‌কি)", "Asia\/Ust-Nera": "ভ্লাডিভোষ্টোকৰ সময় (উষ্ট-নেৰা)", "Asia\/Vientiane": "ইণ্ডোচাইনাৰ সময় (ভিয়েণ্টিয়ান)", "Asia\/Vladivostok": "ভ্লাডিভোষ্টোকৰ সময় (ভ্লাডিভোষ্টক)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "গ্ৰীণউইচ মান সময় (গোৰেনচি)", "Europe\/Helsinki": "প্ৰাচ্য ইউৰোপীয় সময় (হেলছিংকি)", "Europe\/Isle_of_Man": "গ্ৰীণউইচ মান সময় (আইল অফ মেন)", - "Europe\/Istanbul": "তুৰ্কি (ইস্তানবুল)", + "Europe\/Istanbul": "তুৰ্কি সময় (ইস্তানবুল)", "Europe\/Jersey": "গ্ৰীণউইচ মান সময় (জাৰ্চি)", "Europe\/Kaliningrad": "প্ৰাচ্য ইউৰোপীয় সময় (কালিনিনগ্ৰাড)", "Europe\/Kiev": "প্ৰাচ্য ইউৰোপীয় সময় (কিভ)", - "Europe\/Kirov": "ৰাছিয়া (কিৰোভ)", + "Europe\/Kirov": "ৰাছিয়া সময় (কিৰোভ)", "Europe\/Lisbon": "পাশ্চাত্য ইউৰোপীয় সময় (লিছবন)", "Europe\/Ljubljana": "মধ্য ইউৰোপীয় সময় (ল্যুবেলজানা)", "Europe\/London": "গ্ৰীণউইচ মান সময় (লণ্ডন)", @@ -362,7 +362,7 @@ "Europe\/Prague": "মধ্য ইউৰোপীয় সময় (প্ৰাগ)", "Europe\/Riga": "প্ৰাচ্য ইউৰোপীয় সময় (ৰিগা)", "Europe\/Rome": "মধ্য ইউৰোপীয় সময় (ৰোম)", - "Europe\/Samara": "ৰাছিয়া (ছামাৰা)", + "Europe\/Samara": "ৰাছিয়া সময় (ছামাৰা)", "Europe\/San_Marino": "মধ্য ইউৰোপীয় সময় (চান মাৰিনো)", "Europe\/Sarajevo": "মধ্য ইউৰোপীয় সময় (ছাৰাজেভো)", "Europe\/Saratov": "মস্কোৰ সময় (ছাৰাটোভ)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "ৱেক দ্বীপৰ সময়", "Pacific\/Wallis": "ৱালিছ আৰু ফুটুনাৰ সময়" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/az.json b/src/Symfony/Component/Intl/Resources/data/timezones/az.json index c20b12bc2eca6..ab1483d02474e 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/az.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/az.json @@ -99,7 +99,7 @@ "America\/Detroit": "Şimali Şərqi Amerika Vaxtı (Detroyt)", "America\/Dominica": "Atlantik Vaxt (Dominika)", "America\/Edmonton": "Şimali Dağlıq Amerika Vaxtı (Edmondton)", - "America\/Eirunepe": "Braziliya (İrunepe)", + "America\/Eirunepe": "Braziliya Vaxtı (İrunepe)", "America\/El_Salvador": "Şimali Mərkəzi Amerika Vaxtı (Salvador)", "America\/Fort_Nelson": "Şimali Dağlıq Amerika Vaxtı (Fort Nelson)", "America\/Fortaleza": "Braziliya Vaxtı (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Atlantik Vaxt (Monkton)", "America\/Monterrey": "Şimali Mərkəzi Amerika Vaxtı (Monterey)", "America\/Montevideo": "Uruqvay Vaxtı (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Kanada Vaxtı (Montreal)", "America\/Montserrat": "Atlantik Vaxt (Monserat)", "America\/Nassau": "Şimali Şərqi Amerika Vaxtı (Nassau)", "America\/New_York": "Şimali Şərqi Amerika Vaxtı (Nyu York)", @@ -176,7 +176,7 @@ "America\/Recife": "Braziliya Vaxtı (Resif)", "America\/Regina": "Şimali Mərkəzi Amerika Vaxtı (Recina)", "America\/Resolute": "Şimali Mərkəzi Amerika Vaxtı (Rezolyut)", - "America\/Rio_Branco": "Braziliya (Rio Branko)", + "America\/Rio_Branco": "Braziliya Vaxtı (Rio Branko)", "America\/Santa_Isabel": "Şimal-Qərbi Meksika Vaxtı (Santa Isabel)", "America\/Santarem": "Braziliya Vaxtı (Santarem)", "America\/Santiago": "Çili Vaxtı (Santyaqo)", @@ -217,7 +217,7 @@ "Asia\/Aden": "Ərəbistan Vaxtı (Aden)", "Asia\/Almaty": "Şərqi Qazaxıstan Vaxtı (Almatı)", "Asia\/Amman": "Şərqi Avropa Vaxtı (Amman)", - "Asia\/Anadyr": "Rusiya (Anadır)", + "Asia\/Anadyr": "Rusiya Vaxtı (Anadır)", "Asia\/Aqtau": "Qərbi Qazaxıstan Vaxtı (Aktau)", "Asia\/Aqtobe": "Qərbi Qazaxıstan Vaxtı (Aqtobe)", "Asia\/Ashgabat": "Türkmənistan Vaxtı (Aşqabat)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Ərəbistan Vaxtı (Bəhreyn)", "Asia\/Baku": "Azərbaycan Vaxtı (Bakı)", "Asia\/Bangkok": "Hindçin Vaxtı (Banqkok)", - "Asia\/Barnaul": "Rusiya (Barnaul)", + "Asia\/Barnaul": "Rusiya Vaxtı (Barnaul)", "Asia\/Beirut": "Şərqi Avropa Vaxtı (Beyrut)", "Asia\/Bishkek": "Qırğızıstan Vaxtı (Bişkek)", "Asia\/Brunei": "Brunei Darussalam vaxtı", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "Şərqi İndoneziya Vaxtı (Cayapura)", "Asia\/Jerusalem": "İsrail Vaxtı (Yerusəlim)", "Asia\/Kabul": "Əfqanıstan Vaxtı (Kabil)", - "Asia\/Kamchatka": "Rusiya (Kamçatka)", + "Asia\/Kamchatka": "Rusiya Vaxtı (Kamçatka)", "Asia\/Karachi": "Pakistan Vaxtı (Karaçi)", "Asia\/Katmandu": "Nepal vaxtı (Katmandu)", "Asia\/Khandyga": "Yakutsk Vaxtı (Xandıqa)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "İran Vaxtı (Tehran)", "Asia\/Thimphu": "Butan Vaxtı (Thimphu)", "Asia\/Tokyo": "Yaponiya Vaxtı (Tokyo)", - "Asia\/Tomsk": "Rusiya (Tomsk)", + "Asia\/Tomsk": "Rusiya Vaxtı (Tomsk)", "Asia\/Ulaanbaatar": "Ulanbator Vaxtı", - "Asia\/Urumqi": "Çin (Urumçi)", + "Asia\/Urumqi": "Çin Vaxtı (Urumçi)", "Asia\/Ust-Nera": "Vladivostok Vaxtı (Ust-Nera)", "Asia\/Vientiane": "Hindçin Vaxtı (Vyentyan)", "Asia\/Vladivostok": "Vladivostok Vaxtı", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Qrinviç Orta Vaxtı (Gernzey)", "Europe\/Helsinki": "Şərqi Avropa Vaxtı (Helsinki)", "Europe\/Isle_of_Man": "Qrinviç Orta Vaxtı (Men Adası)", - "Europe\/Istanbul": "Türkiyə (İstanbul)", + "Europe\/Istanbul": "Türkiyə Vaxtı (İstanbul)", "Europe\/Jersey": "Qrinviç Orta Vaxtı (Cersi)", "Europe\/Kaliningrad": "Şərqi Avropa Vaxtı (Kalininqrad)", "Europe\/Kiev": "Şərqi Avropa Vaxtı (Kiyev)", - "Europe\/Kirov": "Rusiya (Kirov)", + "Europe\/Kirov": "Rusiya Vaxtı (Kirov)", "Europe\/Lisbon": "Qərbi Avropa Vaxtı (Lissabon)", "Europe\/Ljubljana": "Mərkəzi Avropa Vaxtı (Lyublyana)", "Europe\/London": "Qrinviç Orta Vaxtı (London)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Ueyk Vaxtı (Veyk)", "Pacific\/Wallis": "Uollis və Futuna Vaxtı" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/be.json b/src/Symfony/Component/Intl/Resources/data/timezones/be.json index ef38162b57094..d23587708e343 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/be.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/be.json @@ -99,7 +99,7 @@ "America\/Detroit": "Паўночнаамерыканскі ўсходні час (Дэтройт)", "America\/Dominica": "Атлантычны час (Дамініка)", "America\/Edmonton": "Паўночнаамерыканскі горны час (Эдмантан)", - "America\/Eirunepe": "Бразілія (Эйрунэпе)", + "America\/Eirunepe": "Час: Бразілія (Эйрунэпе)", "America\/El_Salvador": "Паўночнаамерыканскі цэнтральны час (Сальвадор)", "America\/Fort_Nelson": "Паўночнаамерыканскі горны час (Форт-Нельсан)", "America\/Fortaleza": "Бразільскі час (Фарталеза)", @@ -151,7 +151,7 @@ "America\/Moncton": "Атлантычны час (Манктан)", "America\/Monterrey": "Паўночнаамерыканскі цэнтральны час (Мантэрэй)", "America\/Montevideo": "Уругвайскі час (Мантэвідэа)", - "America\/Montreal": "Канада (Montreal)", + "America\/Montreal": "Час: Канада (Montreal)", "America\/Montserrat": "Атлантычны час (Мантсерат)", "America\/Nassau": "Паўночнаамерыканскі ўсходні час (Насаў)", "America\/New_York": "Паўночнаамерыканскі ўсходні час (Нью-Ёрк)", @@ -176,7 +176,7 @@ "America\/Recife": "Бразільскі час (Рэсіфі)", "America\/Regina": "Паўночнаамерыканскі цэнтральны час (Рэджайна)", "America\/Resolute": "Паўночнаамерыканскі цэнтральны час (Рэзальют)", - "America\/Rio_Branco": "Бразілія (Рыу-Бранку)", + "America\/Rio_Branco": "Час: Бразілія (Рыу-Бранку)", "America\/Santa_Isabel": "Паўночна-заходні мексіканскі час (Санта-Ісабель)", "America\/Santarem": "Бразільскі час (Сантарэн)", "America\/Santiago": "Чылійскі час (Сант’яга)", @@ -217,7 +217,7 @@ "Asia\/Aden": "Час Саудаўскай Аравіі (Адэн)", "Asia\/Almaty": "Усходнеказахстанскі час (Алматы)", "Asia\/Amman": "Усходнееўрапейскі час (Аман (горад))", - "Asia\/Anadyr": "Расія (Анадыр)", + "Asia\/Anadyr": "Час: Расія (Анадыр)", "Asia\/Aqtau": "Заходнеказахстанскі час (Актау)", "Asia\/Aqtobe": "Заходнеказахстанскі час (Актабэ)", "Asia\/Ashgabat": "Час Туркменістана (Ашгабад)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Час Саудаўскай Аравіі (Бахрэйн)", "Asia\/Baku": "Час Азербайджана (Баку)", "Asia\/Bangkok": "Індакітайскі час (Бангкок)", - "Asia\/Barnaul": "Расія (Барнаул)", + "Asia\/Barnaul": "Час: Расія (Барнаул)", "Asia\/Beirut": "Усходнееўрапейскі час (Бейрут)", "Asia\/Bishkek": "Час Кыргызстана (Бішкек)", "Asia\/Brunei": "Час Брунея (Бруней)", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "Усходнеінданезійскі час (Джаяпура)", "Asia\/Jerusalem": "Ізраільскі час (Іерусалім)", "Asia\/Kabul": "Афганістанскі час (Кабул)", - "Asia\/Kamchatka": "Расія (Камчатка)", + "Asia\/Kamchatka": "Час: Расія (Камчатка)", "Asia\/Karachi": "Пакістанскі час (Карачы)", "Asia\/Katmandu": "Непальскі час (Катманду)", "Asia\/Khandyga": "Якуцкі час (Хандыга)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Іранскі час (Тэгеран)", "Asia\/Thimphu": "Час Бутана (Тхімпху)", "Asia\/Tokyo": "Час Японіі (Токіа)", - "Asia\/Tomsk": "Расія (Томск)", + "Asia\/Tomsk": "Час: Расія (Томск)", "Asia\/Ulaanbaatar": "Час Улан-Батара", - "Asia\/Urumqi": "Кітай (Урумчы)", + "Asia\/Urumqi": "Час: Кітай (Урумчы)", "Asia\/Ust-Nera": "Уладзівастоцкі час (Вусць-Нера)", "Asia\/Vientiane": "Індакітайскі час (В’енцьян)", "Asia\/Vladivostok": "Уладзівастоцкі час (Уладзівасток)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Час па Грынвічы (Гернсі)", "Europe\/Helsinki": "Усходнееўрапейскі час (Хельсінкі)", "Europe\/Isle_of_Man": "Час па Грынвічы (Востраў Мэн)", - "Europe\/Istanbul": "Турцыя (Стамбул)", + "Europe\/Istanbul": "Час: Турцыя (Стамбул)", "Europe\/Jersey": "Час па Грынвічы (Джэрсі)", "Europe\/Kaliningrad": "Усходнееўрапейскі час (Калінінград)", "Europe\/Kiev": "Усходнееўрапейскі час (Кіеў)", - "Europe\/Kirov": "Расія (Кіраў)", + "Europe\/Kirov": "Час: Расія (Кіраў)", "Europe\/Lisbon": "Заходнееўрапейскі час (Лісабон)", "Europe\/Ljubljana": "Цэнтральнаеўрапейскі час (Любляна)", "Europe\/London": "Час па Грынвічы (Лондан)", @@ -362,7 +362,7 @@ "Europe\/Prague": "Цэнтральнаеўрапейскі час (Прага)", "Europe\/Riga": "Усходнееўрапейскі час (Рыга)", "Europe\/Rome": "Цэнтральнаеўрапейскі час (Рым)", - "Europe\/Samara": "Расія (Самара)", + "Europe\/Samara": "Час: Расія (Самара)", "Europe\/San_Marino": "Цэнтральнаеўрапейскі час (Сан-Марына)", "Europe\/Sarajevo": "Цэнтральнаеўрапейскі час (Сараева)", "Europe\/Saratov": "Маскоўскі час (Саратаў)", @@ -437,10 +437,7 @@ "Pacific\/Wallis": "Час астравоў Уоліс і Футуна" }, "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d.%02d", - "-%02d.%02d" - ] + "HourFormatPos": "+%02d.%02d", + "HourFormatNeg": "-%02d.%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/bg.json b/src/Symfony/Component/Intl/Resources/data/timezones/bg.json index 400d4d21e37df..1c13c9596915d 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/bg.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/bg.json @@ -437,10 +437,6 @@ "Pacific\/Wallis": "Уолис и Футуна" }, "Meta": { - "GmtFormat": "Гринуич%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] + "GmtFormat": "Гринуич%s" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/bn.json b/src/Symfony/Component/Intl/Resources/data/timezones/bn.json index cfa065d9c8cb2..eaa8b493a0f0a 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/bn.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/bn.json @@ -99,7 +99,7 @@ "America\/Detroit": "পূর্বাঞ্চলীয় সময় (ডেট্রোইট)", "America\/Dominica": "অতলান্তিকের সময় (ডোমিনিকা)", "America\/Edmonton": "পার্বত্য অঞ্চলের সময় (এডমন্টোন)", - "America\/Eirunepe": "ব্রাজিল (আইরুনেপে)", + "America\/Eirunepe": "ব্রাজিল সময় (আইরুনেপে)", "America\/El_Salvador": "কেন্দ্রীয় সময় (এল সালভাদোর)", "America\/Fort_Nelson": "পার্বত্য অঞ্চলের সময় (ফোর্ট নেলসন)", "America\/Fortaleza": "ব্রাসিলিয়া সময় (ফোর্টালেজা)", @@ -151,7 +151,7 @@ "America\/Moncton": "অতলান্তিকের সময় (মঙ্কটোন)", "America\/Monterrey": "কেন্দ্রীয় সময় (মন্টেরি)", "America\/Montevideo": "উরুগুয়ে সময় (মন্টেভিডিও)", - "America\/Montreal": "কানাডা (Montreal)", + "America\/Montreal": "কানাডা সময় (Montreal)", "America\/Montserrat": "অতলান্তিকের সময় (মন্তসেরাত)", "America\/Nassau": "পূর্বাঞ্চলীয় সময় (নাসাউ)", "America\/New_York": "পূর্বাঞ্চলীয় সময় (নিউইয়র্ক)", @@ -176,7 +176,7 @@ "America\/Recife": "ব্রাসিলিয়া সময় (রেসিফে)", "America\/Regina": "কেন্দ্রীয় সময় (রেজিনা)", "America\/Resolute": "কেন্দ্রীয় সময় (রেসোলুট)", - "America\/Rio_Branco": "ব্রাজিল (রিও ব্রাঙ্কো)", + "America\/Rio_Branco": "ব্রাজিল সময় (রিও ব্রাঙ্কো)", "America\/Santa_Isabel": "উত্তরপশ্চিম মেক্সিকোর সময় (সান্তা ইসাবেল)", "America\/Santarem": "ব্রাসিলিয়া সময় (সেনটুরেম)", "America\/Santiago": "চিলি সময় (সান্টিয়াগো)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "আরবি সময় (বাহারিন)", "Asia\/Baku": "আজারবাইজান সময় (বাকু)", "Asia\/Bangkok": "ইন্দোচীন সময় (ব্যাংকক)", - "Asia\/Barnaul": "রাশিয়া (বার্নৌল)", + "Asia\/Barnaul": "রাশিয়া সময় (বার্নৌল)", "Asia\/Beirut": "পূর্ব ইউরোপীয় সময় (বেইরুট)", "Asia\/Bishkek": "কিরগিস্তান সময় (বিশকেক)", "Asia\/Brunei": "ব্রুনেই দারুসসালাম সময়", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ইরান সময় (তেহেরান)", "Asia\/Thimphu": "ভুটান সময় (থিম্ফু)", "Asia\/Tokyo": "জাপান সময় (টোকিও)", - "Asia\/Tomsk": "রাশিয়া (তোমস্ক)", + "Asia\/Tomsk": "রাশিয়া সময় (তোমস্ক)", "Asia\/Ulaanbaatar": "উলান বাতোর সময় (উলানবাতার)", - "Asia\/Urumqi": "চীন (উরুমকি)", + "Asia\/Urumqi": "চীন সময় (উরুমকি)", "Asia\/Ust-Nera": "ভ্লাদিভস্তক সময় (উস্ত- নেরা)", "Asia\/Vientiane": "ইন্দোচীন সময় (ভিয়েনতায়েন)", "Asia\/Vladivostok": "ভ্লাদিভস্তক সময় (ভ্লাদিভস্তোক)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "গ্রীনিচ মিন টাইম (গুয়ার্নসি)", "Europe\/Helsinki": "পূর্ব ইউরোপীয় সময় (হেলসিঙ্কি)", "Europe\/Isle_of_Man": "গ্রীনিচ মিন টাইম (আইল অফ ম্যান)", - "Europe\/Istanbul": "তুরস্ক (ইস্তানবুল)", + "Europe\/Istanbul": "তুরস্ক সময় (ইস্তানবুল)", "Europe\/Jersey": "গ্রীনিচ মিন টাইম (জার্সি)", "Europe\/Kaliningrad": "পূর্ব ইউরোপীয় সময় (কালিনিঙগ্রাড)", "Europe\/Kiev": "পূর্ব ইউরোপীয় সময় (কিয়েভ)", - "Europe\/Kirov": "রাশিয়া (কিরোভ)", + "Europe\/Kirov": "রাশিয়া সময় (কিরোভ)", "Europe\/Lisbon": "পশ্চিম ইউরোপীয় সময় (লিসবন)", "Europe\/Ljubljana": "মধ্য ইউরোপীয় সময় (লুবলিয়ানা)", "Europe\/London": "গ্রীনিচ মিন টাইম (লন্ডন)", @@ -437,10 +437,6 @@ "Pacific\/Wallis": "ওয়ালিস এবং ফুটুনা সময় (ওলিস)" }, "Meta": { - "GmtFormat": "GMT %s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] + "GmtFormat": "GMT %s" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/bo.json b/src/Symfony/Component/Intl/Resources/data/timezones/bo.json index 2edb736280131..6019c328b8a39 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/bo.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/bo.json @@ -54,10 +54,6 @@ "Asia\/Vladivostok": "ཨུ་རུ་སུ་ (Vladivostok)", "Asia\/Yakutsk": "ཨུ་རུ་སུ་ (Yakutsk)", "Asia\/Yekaterinburg": "ཨུ་རུ་སུ་ (Yekaterinburg)", - "CST6CDT": "CST6CDT", - "EST5EDT": "EST5EDT", - "Etc\/GMT": "GMT", - "Etc\/UTC": "UTC", "Europe\/Astrakhan": "ཨུ་རུ་སུ་ (Astrakhan)", "Europe\/Berlin": "འཇར་མན་ (Berlin)", "Europe\/Busingen": "འཇར་མན་ (Busingen)", @@ -70,15 +66,7 @@ "Europe\/Saratov": "ཨུ་རུ་སུ་ (Saratov)", "Europe\/Ulyanovsk": "ཨུ་རུ་སུ་ (Ulyanovsk)", "Europe\/Volgograd": "ཨུ་རུ་སུ་ (Volgograd)", - "MST7MDT": "MST7MDT", - "PST8PDT": "PST8PDT", "Pacific\/Honolulu": "ཨ་མེ་རི་ཀ། (Honolulu)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/br.json b/src/Symfony/Component/Intl/Resources/data/timezones/br.json index 4f5c4ceeb8fe6..b8ef3d945b718 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/br.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/br.json @@ -53,10 +53,10 @@ "Africa\/Tripoli": "eur Europa ar Reter (Tarabulus (Tripoli))", "Africa\/Tunis": "eur Kreizeuropa (Tuniz)", "Africa\/Windhoek": "eur Kreizafrika (Windhoek)", - "America\/Adak": "Stadoù-Unanet (Adak)", + "America\/Adak": "eur Stadoù-Unanet (Adak)", "America\/Anchorage": "eur Alaska (Anchorage)", - "America\/Anguilla": "Anguilla (Anguilla)", - "America\/Antigua": "Antigua ha Barbuda (Antigua)", + "America\/Anguilla": "eur Anguilla (Anguilla)", + "America\/Antigua": "eur Antigua ha Barbuda (Antigua)", "America\/Araguaina": "eur Brasília (Araguaina)", "America\/Argentina\/La_Rioja": "eur Arcʼhantina (La Rioja)", "America\/Argentina\/Rio_Gallegos": "eur Arcʼhantina (Rio Gallegos)", @@ -65,14 +65,14 @@ "America\/Argentina\/San_Luis": "eur Arcʼhantina ar Cʼhornôg (San Luis)", "America\/Argentina\/Tucuman": "eur Arcʼhantina (Tucuman)", "America\/Argentina\/Ushuaia": "eur Arcʼhantina (Ushuaia)", - "America\/Aruba": "Aruba (Aruba)", + "America\/Aruba": "eur Aruba (Aruba)", "America\/Asuncion": "eur Paraguay (Asunción)", "America\/Bahia": "eur Brasília (Bahia)", - "America\/Bahia_Banderas": "Mecʼhiko (Bahia Banderas)", - "America\/Barbados": "Barbados (Barbados)", + "America\/Bahia_Banderas": "eur Mecʼhiko (Bahia Banderas)", + "America\/Barbados": "eur Barbados (Barbados)", "America\/Belem": "eur Brasília (Belém)", - "America\/Belize": "Belize (Belize)", - "America\/Blanc-Sablon": "Kanada (Blanc-Sablon)", + "America\/Belize": "eur Belize (Belize)", + "America\/Blanc-Sablon": "eur Kanada (Blanc-Sablon)", "America\/Boa_Vista": "eur an Amazon (Boa Vista)", "America\/Bogota": "eur Kolombia (Bogotá)", "America\/Boise": "eur ar Menezioù (Boise)", @@ -84,41 +84,41 @@ "America\/Catamarca": "eur Arcʼhantina (Catamarca)", "America\/Cayenne": "eur Gwiana cʼhall (Cayenne)", "America\/Cayman": "eur ar Reter (Cayman)", - "America\/Chicago": "Stadoù-Unanet (Chicago)", - "America\/Chihuahua": "Mecʼhiko (Chihuahua)", + "America\/Chicago": "eur Stadoù-Unanet (Chicago)", + "America\/Chihuahua": "eur Mecʼhiko (Chihuahua)", "America\/Coral_Harbour": "eur ar Reter (Atikokan)", "America\/Cordoba": "eur Arcʼhantina (Cordoba)", - "America\/Costa_Rica": "Costa Rica (Costa Rica)", + "America\/Costa_Rica": "eur Costa Rica (Costa Rica)", "America\/Creston": "eur ar Menezioù (Creston)", "America\/Cuiaba": "eur an Amazon (Cuiaba)", - "America\/Curacao": "Curaçao (Curacao)", + "America\/Curacao": "eur Curaçao (Curacao)", "America\/Danmarkshavn": "Amzer keitat Greenwich (AKG) (Danmarkshavn)", - "America\/Dawson": "Kanada (Dawson)", + "America\/Dawson": "eur Kanada (Dawson)", "America\/Dawson_Creek": "eur ar Menezioù (Dawson Creek)", "America\/Denver": "eur ar Menezioù (Denver)", "America\/Detroit": "eur ar Reter (Detroit)", - "America\/Dominica": "Dominica (Dominica)", + "America\/Dominica": "eur Dominica (Dominica)", "America\/Edmonton": "eur ar Menezioù (Edmonton)", - "America\/Eirunepe": "Brazil (Eirunepe)", - "America\/El_Salvador": "Salvador (Salvador)", + "America\/Eirunepe": "eur Brazil (Eirunepe)", + "America\/El_Salvador": "eur Salvador (Salvador)", "America\/Fort_Nelson": "eur ar Menezioù (Fort Nelson)", "America\/Fortaleza": "eur Brasília (Fortaleza)", - "America\/Glace_Bay": "Kanada (Glace Bay)", + "America\/Glace_Bay": "eur Kanada (Glace Bay)", "America\/Godthab": "eur Greunland ar Cʼhornôg (Nuuk (Godthåb))", - "America\/Goose_Bay": "Kanada (Goose Bay)", + "America\/Goose_Bay": "eur Kanada (Goose Bay)", "America\/Grand_Turk": "eur ar Reter (Grand Turk)", - "America\/Grenada": "Grenada (Grenada)", - "America\/Guadeloupe": "Gwadeloup (Gwadeloup)", - "America\/Guatemala": "Guatemala (Guatemala)", + "America\/Grenada": "eur Grenada (Grenada)", + "America\/Guadeloupe": "eur Gwadeloup (Gwadeloup)", + "America\/Guatemala": "eur Guatemala (Guatemala)", "America\/Guayaquil": "eur Ecuador (Guayaquil)", "America\/Guyana": "eur Guyana", - "America\/Halifax": "Kanada (Halifax)", + "America\/Halifax": "eur Kanada (Halifax)", "America\/Havana": "eur Kuba (La Habana)", - "America\/Hermosillo": "Mecʼhiko (Hermosillo)", - "America\/Indiana\/Knox": "Stadoù-Unanet (Knox, Indiana)", + "America\/Hermosillo": "eur Mecʼhiko (Hermosillo)", + "America\/Indiana\/Knox": "eur Stadoù-Unanet (Knox, Indiana)", "America\/Indiana\/Marengo": "eur ar Reter (Marengo, Indiana)", "America\/Indiana\/Petersburg": "eur ar Reter (Petersburg, Indiana)", - "America\/Indiana\/Tell_City": "Stadoù-Unanet (Tell City, Indiana)", + "America\/Indiana\/Tell_City": "eur Stadoù-Unanet (Tell City, Indiana)", "America\/Indiana\/Vevay": "eur ar Reter (Vevay, Indiana)", "America\/Indiana\/Vincennes": "eur ar Reter (Vincennes, Indiana)", "America\/Indiana\/Winamac": "eur ar Reter (Winamac, Indiana)", @@ -129,90 +129,90 @@ "America\/Jujuy": "eur Arcʼhantina (Jujuy)", "America\/Juneau": "eur Alaska (Juneau)", "America\/Kentucky\/Monticello": "eur ar Reter (Monticello, Kentucky)", - "America\/Kralendijk": "Karib Nederlandat (Kralendijk)", + "America\/Kralendijk": "eur Karib Nederlandat (Kralendijk)", "America\/La_Paz": "eur Bolivia (La Paz)", "America\/Lima": "eur Perou (Lima)", - "America\/Los_Angeles": "Stadoù-Unanet (Los Angeles)", + "America\/Los_Angeles": "eur Stadoù-Unanet (Los Angeles)", "America\/Louisville": "eur ar Reter (Louisville)", - "America\/Lower_Princes": "Sint Maarten (Lower Prince’s Quarter)", + "America\/Lower_Princes": "eur Sint Maarten (Lower Prince’s Quarter)", "America\/Maceio": "eur Brasília (Maceio)", - "America\/Managua": "Nicaragua (Managua)", + "America\/Managua": "eur Nicaragua (Managua)", "America\/Manaus": "eur an Amazon (Manaus)", - "America\/Marigot": "Saint Martin (Marigot)", - "America\/Martinique": "Martinik (Martinik)", - "America\/Matamoros": "Mecʼhiko (Matamoros)", - "America\/Mazatlan": "Mecʼhiko (Mazatlan)", + "America\/Marigot": "eur Saint Martin (Marigot)", + "America\/Martinique": "eur Martinik (Martinik)", + "America\/Matamoros": "eur Mecʼhiko (Matamoros)", + "America\/Mazatlan": "eur Mecʼhiko (Mazatlan)", "America\/Mendoza": "eur Arcʼhantina (Mendoza)", - "America\/Menominee": "Stadoù-Unanet (Menominee)", - "America\/Merida": "Mecʼhiko (Merida)", + "America\/Menominee": "eur Stadoù-Unanet (Menominee)", + "America\/Merida": "eur Mecʼhiko (Merida)", "America\/Metlakatla": "eur Alaska (Metlakatla)", - "America\/Mexico_City": "Mecʼhiko (Kêr Vecʼhiko)", + "America\/Mexico_City": "eur Mecʼhiko (Kêr Vecʼhiko)", "America\/Miquelon": "eur Sant-Pêr-ha-Mikelon", - "America\/Moncton": "Kanada (Moncton)", - "America\/Monterrey": "Mecʼhiko (Monterrey)", + "America\/Moncton": "eur Kanada (Moncton)", + "America\/Monterrey": "eur Mecʼhiko (Monterrey)", "America\/Montevideo": "eur Uruguay (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", - "America\/Montserrat": "Montserrat (Montserrat)", + "America\/Montreal": "eur Kanada (Montreal)", + "America\/Montserrat": "eur Montserrat (Montserrat)", "America\/Nassau": "eur ar Reter (Nassau)", "America\/New_York": "eur ar Reter (New York)", "America\/Nipigon": "eur ar Reter (Nipigon)", "America\/Nome": "eur Alaska (Nome)", - "America\/Noronha": "Brazil (Noronha)", - "America\/North_Dakota\/Beulah": "Stadoù-Unanet (Beulah, North Dakota)", - "America\/North_Dakota\/Center": "Stadoù-Unanet (Center, North Dakota)", - "America\/North_Dakota\/New_Salem": "Stadoù-Unanet (New Salem, North Dakota)", + "America\/Noronha": "eur Brazil (Noronha)", + "America\/North_Dakota\/Beulah": "eur Stadoù-Unanet (Beulah, North Dakota)", + "America\/North_Dakota\/Center": "eur Stadoù-Unanet (Center, North Dakota)", + "America\/North_Dakota\/New_Salem": "eur Stadoù-Unanet (New Salem, North Dakota)", "America\/Ojinaga": "eur ar Menezioù (Ojinaga)", "America\/Panama": "eur ar Reter (Panamá)", "America\/Pangnirtung": "eur ar Reter (Pangnirtung)", "America\/Paramaribo": "eur Surinam (Paramaribo)", "America\/Phoenix": "eur ar Menezioù (Phoenix)", "America\/Port-au-Prince": "eur ar Reter (Port-au-Prince)", - "America\/Port_of_Spain": "Trinidad ha Tobago (Port of Spain)", + "America\/Port_of_Spain": "eur Trinidad ha Tobago (Port of Spain)", "America\/Porto_Velho": "eur an Amazon (Porto Velho)", - "America\/Puerto_Rico": "Puerto Rico (Puerto Rico)", + "America\/Puerto_Rico": "eur Puerto Rico (Puerto Rico)", "America\/Punta_Arenas": "eur Chile (Punta Arenas)", - "America\/Rainy_River": "Kanada (Rainy River)", - "America\/Rankin_Inlet": "Kanada (Rankin Inlet)", + "America\/Rainy_River": "eur Kanada (Rainy River)", + "America\/Rankin_Inlet": "eur Kanada (Rankin Inlet)", "America\/Recife": "eur Brasília (Recife)", - "America\/Regina": "Kanada (Regina)", - "America\/Resolute": "Kanada (Resolute)", - "America\/Rio_Branco": "Brazil (Rio Branco)", + "America\/Regina": "eur Kanada (Regina)", + "America\/Resolute": "eur Kanada (Resolute)", + "America\/Rio_Branco": "eur Brazil (Rio Branco)", "America\/Santa_Isabel": "eur Gwalarn Mecʼhiko (Santa Isabel)", "America\/Santarem": "eur Brasília (Santarem)", "America\/Santiago": "eur Chile (Santiago)", - "America\/Santo_Domingo": "Republik Dominikan (Santo Domingo)", + "America\/Santo_Domingo": "eur Republik Dominikan (Santo Domingo)", "America\/Sao_Paulo": "eur Brasília (São Paulo)", "America\/Scoresbysund": "eur Greunland ar Reter (Ittoqqortoormiit)", "America\/Sitka": "eur Alaska (Sitka)", - "America\/St_Barthelemy": "Saint Barthélemy (Saint Barthélemy)", + "America\/St_Barthelemy": "eur Saint Barthélemy (Saint Barthélemy)", "America\/St_Johns": "eur Newfoundland (Saint Johnʼs)", - "America\/St_Kitts": "Saint Kitts ha Nevis (Saint Kitts)", - "America\/St_Lucia": "Saint Lucia (Saint Lucia)", - "America\/St_Thomas": "Inizi Gwercʼh ar Stadoù-Unanet (St. Thomas)", - "America\/St_Vincent": "Sant Visant hag ar Grenadinez (Sant Visant)", - "America\/Swift_Current": "Kanada (Swift Current)", - "America\/Tegucigalpa": "Honduras (Tegucigalpa)", - "America\/Thule": "Greunland (Qânâq)", + "America\/St_Kitts": "eur Saint Kitts ha Nevis (Saint Kitts)", + "America\/St_Lucia": "eur Saint Lucia (Saint Lucia)", + "America\/St_Thomas": "eur Inizi Gwercʼh ar Stadoù-Unanet (St. Thomas)", + "America\/St_Vincent": "eur Sant Visant hag ar Grenadinez (Sant Visant)", + "America\/Swift_Current": "eur Kanada (Swift Current)", + "America\/Tegucigalpa": "eur Honduras (Tegucigalpa)", + "America\/Thule": "eur Greunland (Qânâq)", "America\/Thunder_Bay": "eur ar Reter (Thunder Bay)", - "America\/Tijuana": "Mecʼhiko (Tijuana)", + "America\/Tijuana": "eur Mecʼhiko (Tijuana)", "America\/Toronto": "eur ar Reter (Toronto)", - "America\/Tortola": "Inizi Gwercʼh Breizh-Veur (Tortola)", - "America\/Vancouver": "Kanada (Vancouver)", - "America\/Whitehorse": "Kanada (Whitehorse)", - "America\/Winnipeg": "Kanada (Winnipeg)", + "America\/Tortola": "eur Inizi Gwercʼh Breizh-Veur (Tortola)", + "America\/Vancouver": "eur Kanada (Vancouver)", + "America\/Whitehorse": "eur Kanada (Whitehorse)", + "America\/Winnipeg": "eur Kanada (Winnipeg)", "America\/Yakutat": "eur Alaska (Yakutat)", "America\/Yellowknife": "eur ar Menezioù (Yellowknife)", "Antarctica\/Casey": "eur Aostralia ar Cʼhornôg (Casey)", - "Antarctica\/Davis": "Antarktika (Davis)", - "Antarctica\/DumontDUrville": "Antarktika (Dumont d’Urville)", + "Antarctica\/Davis": "eur Antarktika (Davis)", + "Antarctica\/DumontDUrville": "eur Antarktika (Dumont d’Urville)", "Antarctica\/Macquarie": "eur Enez Macquarie", - "Antarctica\/Mawson": "Antarktika (Mawson)", + "Antarctica\/Mawson": "eur Antarktika (Mawson)", "Antarctica\/McMurdo": "eur Zeland-Nevez (McMurdo)", "Antarctica\/Palmer": "eur Chile (Palmer)", - "Antarctica\/Rothera": "Antarktika (Rothera)", - "Antarctica\/Syowa": "Antarktika (Syowa)", + "Antarctica\/Rothera": "eur Antarktika (Rothera)", + "Antarctica\/Syowa": "eur Antarktika (Syowa)", "Antarctica\/Troll": "Amzer keitat Greenwich (AKG) (Troll)", - "Antarctica\/Vostok": "Antarktika (Vostok)", + "Antarctica\/Vostok": "eur Antarktika (Vostok)", "Arctic\/Longyearbyen": "eur Kreizeuropa (Longyearbyen)", "Asia\/Aden": "eur Arabia (Aden)", "Asia\/Almaty": "eur Kazakstan ar Reter (Almaty)", @@ -226,13 +226,13 @@ "Asia\/Bahrain": "eur Arabia (Bahrein)", "Asia\/Baku": "eur Azerbaidjan (Bakou)", "Asia\/Bangkok": "eur Indez-Sina (Bangkok)", - "Asia\/Barnaul": "Rusia (Barnaul)", + "Asia\/Barnaul": "eur Rusia (Barnaul)", "Asia\/Beirut": "eur Europa ar Reter (Bayrut)", "Asia\/Bishkek": "eur Kyrgyzstan (Bishkek)", "Asia\/Brunei": "eur Brunei Darussalam", "Asia\/Calcutta": "eur cʼhoañv India (Calcutta)", "Asia\/Chita": "eur Yakutsk (Chita)", - "Asia\/Choibalsan": "Mongolia (Choibalsan)", + "Asia\/Choibalsan": "eur Mongolia (Choibalsan)", "Asia\/Colombo": "eur cʼhoañv India (Kolamba)", "Asia\/Damascus": "eur Europa ar Reter (Damask)", "Asia\/Dhaka": "eur Bangladesh (Dhaka)", @@ -243,29 +243,29 @@ "Asia\/Gaza": "eur Europa ar Reter (Gaza)", "Asia\/Hebron": "eur Europa ar Reter (Hebron)", "Asia\/Hong_Kong": "eur Hong Kong", - "Asia\/Hovd": "Mongolia (Hovd)", + "Asia\/Hovd": "eur Mongolia (Hovd)", "Asia\/Irkutsk": "eur Irkutsk", "Asia\/Jakarta": "eur Indonezia ar Cʼhornôg (Jakarta)", "Asia\/Jayapura": "eur Indonezia ar Reter (Jayapura)", "Asia\/Jerusalem": "eur Israel (Jeruzalem)", "Asia\/Kabul": "eur Afghanistan (Kaboul)", - "Asia\/Kamchatka": "Rusia (Kamchatka)", + "Asia\/Kamchatka": "eur Rusia (Kamchatka)", "Asia\/Karachi": "eur Pakistan (Karachi)", "Asia\/Katmandu": "eur Nepal (Kathmandu)", "Asia\/Khandyga": "eur Yakutsk (Khandyga)", - "Asia\/Krasnoyarsk": "Rusia (Krasnoyarsk)", + "Asia\/Krasnoyarsk": "eur Rusia (Krasnoyarsk)", "Asia\/Kuala_Lumpur": "eur Malaysia (Kuala Lumpur)", "Asia\/Kuching": "eur Malaysia (Kuching)", "Asia\/Kuwait": "eur Arabia (Koweit)", "Asia\/Macau": "eur Sina (Macau)", - "Asia\/Magadan": "Rusia (Magadan)", - "Asia\/Makassar": "Indonezia (Makassar)", + "Asia\/Magadan": "eur Rusia (Magadan)", + "Asia\/Makassar": "eur Indonezia (Makassar)", "Asia\/Manila": "eur ar Filipinez (Manila)", "Asia\/Muscat": "eur cʼhoañv ar Pleg-mor Arab-ha-Pers (Masqat)", "Asia\/Nicosia": "eur Europa ar Reter (Levkosía)", - "Asia\/Novokuznetsk": "Rusia (Novokuznetsk)", + "Asia\/Novokuznetsk": "eur Rusia (Novokuznetsk)", "Asia\/Novosibirsk": "eur Novosibirsk", - "Asia\/Omsk": "Rusia (Omsk)", + "Asia\/Omsk": "eur Rusia (Omsk)", "Asia\/Oral": "eur Kazakstan ar Cʼhornôg (Oral)", "Asia\/Phnom_Penh": "eur Indez-Sina (Phnum Pénh)", "Asia\/Pontianak": "eur Indonezia ar Cʼhornôg (Pontianak)", @@ -281,16 +281,16 @@ "Asia\/Seoul": "eur Korea (Seoul)", "Asia\/Shanghai": "eur Sina (Shanghai)", "Asia\/Singapore": "eur cʼhoañv Singapour", - "Asia\/Srednekolymsk": "Rusia (Srednekolymsk)", + "Asia\/Srednekolymsk": "eur Rusia (Srednekolymsk)", "Asia\/Taipei": "eur Taipei", "Asia\/Tashkent": "eur Ouzbekistan (Toshkent)", "Asia\/Tbilisi": "eur Jorjia (Tbilisi)", "Asia\/Tehran": "eur Iran (Tehran)", "Asia\/Thimphu": "eur Bhoutan (Thimphu)", "Asia\/Tokyo": "eur Japan (Tokyo)", - "Asia\/Tomsk": "Rusia (Tomsk)", + "Asia\/Tomsk": "eur Rusia (Tomsk)", "Asia\/Ulaanbaatar": "eur Ulaanbaatar", - "Asia\/Urumqi": "Sina (Ürümqi)", + "Asia\/Urumqi": "eur Sina (Ürümqi)", "Asia\/Ust-Nera": "eur Vladivostok (Ust-Nera)", "Asia\/Vientiane": "eur Indez-Sina (Viangchan)", "Asia\/Vladivostok": "eur Vladivostok", @@ -298,7 +298,7 @@ "Asia\/Yekaterinburg": "eur Yekaterinbourg", "Asia\/Yerevan": "eur Armenia (Yerevan)", "Atlantic\/Azores": "eur an Azorez", - "Atlantic\/Bermuda": "Bermuda (Bermudez)", + "Atlantic\/Bermuda": "eur Bermuda (Bermudez)", "Atlantic\/Canary": "eur Europa ar Cʼhornôg (Kanariez)", "Atlantic\/Cape_Verde": "eur ar Cʼhab-Glas (Kab Glas)", "Atlantic\/Faeroe": "eur Europa ar Cʼhornôg (Faero)", @@ -315,14 +315,12 @@ "Australia\/Eucla": "eur Kreizaostralia ar Cʼhornôg (Eucla)", "Australia\/Hobart": "eur Aostralia ar Reter (Hobart)", "Australia\/Lindeman": "eur Aostralia ar Reter (Lindeman)", - "Australia\/Lord_Howe": "Aostralia (Lord Howe)", + "Australia\/Lord_Howe": "eur Aostralia (Lord Howe)", "Australia\/Melbourne": "eur Aostralia ar Reter (Melbourne)", "Australia\/Perth": "eur Aostralia ar Cʼhornôg (Perth)", "Australia\/Sydney": "eur Aostralia ar Reter (Sydney)", - "CST6CDT": "CST6CDT", "EST5EDT": "eur ar Reter", "Etc\/GMT": "Amzer keitat Greenwich (AKG)", - "Etc\/UTC": "UTC", "Europe\/Amsterdam": "eur Kreizeuropa (Amsterdam)", "Europe\/Andorra": "eur Kreizeuropa (Andorra)", "Europe\/Astrakhan": "eur Moskov (Astrakhan)", @@ -341,11 +339,11 @@ "Europe\/Guernsey": "Amzer keitat Greenwich (AKG) (Gwernenez)", "Europe\/Helsinki": "eur Europa ar Reter (Helsinki)", "Europe\/Isle_of_Man": "Amzer keitat Greenwich (AKG) (Manav)", - "Europe\/Istanbul": "Turkia (Istanbul)", + "Europe\/Istanbul": "eur Turkia (Istanbul)", "Europe\/Jersey": "Amzer keitat Greenwich (AKG) (Jerzenez)", "Europe\/Kaliningrad": "eur Europa ar Reter (Kaliningrad)", "Europe\/Kiev": "eur Europa ar Reter (Kiev)", - "Europe\/Kirov": "Rusia (Kirov)", + "Europe\/Kirov": "eur Rusia (Kirov)", "Europe\/Lisbon": "eur Europa ar Cʼhornôg (Lisboa)", "Europe\/Ljubljana": "eur Kreizeuropa (Ljubljana)", "Europe\/London": "Amzer keitat Greenwich (AKG) (Londrez)", @@ -362,7 +360,7 @@ "Europe\/Prague": "eur Kreizeuropa (Praha)", "Europe\/Riga": "eur Europa ar Reter (Riga)", "Europe\/Rome": "eur Kreizeuropa (Roma)", - "Europe\/Samara": "Rusia (Samara)", + "Europe\/Samara": "eur Rusia (Samara)", "Europe\/San_Marino": "eur Kreizeuropa (San Marino)", "Europe\/Sarajevo": "eur Kreizeuropa (Sarajevo)", "Europe\/Saratov": "eur Moskov (Saratov)", @@ -384,7 +382,7 @@ "Europe\/Zaporozhye": "eur Europa ar Reter (Zaporozhye)", "Europe\/Zurich": "eur Kreizeuropa (Zurich)", "Indian\/Antananarivo": "eur Afrika ar Reter (Antananarivo)", - "Indian\/Chagos": "Tiriad breizhveurat Meurvor Indez (Chagos)", + "Indian\/Chagos": "eur Tiriad breizhveurat Meurvor Indez (Chagos)", "Indian\/Christmas": "eur Enez Christmas", "Indian\/Cocos": "eur Inizi Kokoz", "Indian\/Comoro": "eur Afrika ar Reter (Komorez)", @@ -395,25 +393,24 @@ "Indian\/Mayotte": "eur Afrika ar Reter (Mayotte)", "Indian\/Reunion": "eur ar Reünion", "MST7MDT": "eur ar Menezioù", - "PST8PDT": "PST8PDT", "Pacific\/Apia": "eur Apia", "Pacific\/Auckland": "eur Zeland-Nevez (Auckland)", - "Pacific\/Bougainville": "Papoua Ginea-Nevez (Bougainville)", + "Pacific\/Bougainville": "eur Papoua Ginea-Nevez (Bougainville)", "Pacific\/Chatham": "eur Chatham", "Pacific\/Easter": "eur Enez Pask", "Pacific\/Efate": "eur Vanuatu (Efate)", - "Pacific\/Enderbury": "Kiribati (Enderbury)", + "Pacific\/Enderbury": "eur Kiribati (Enderbury)", "Pacific\/Fakaofo": "eur Tokelau (Fakaofo)", "Pacific\/Fiji": "eur Fidji", "Pacific\/Funafuti": "eur Tuvalu (Funafuti)", "Pacific\/Galapagos": "eur Inizi Galápagos", "Pacific\/Gambier": "eur Gambier", "Pacific\/Guadalcanal": "eur Inizi Salomon (Guadalcanal)", - "Pacific\/Guam": "Guam (Guam)", - "Pacific\/Honolulu": "Stadoù-Unanet (Honolulu)", - "Pacific\/Johnston": "Inizi diabell ar Stadoù-Unanet (Johnston)", - "Pacific\/Kiritimati": "Kiribati (Kiritimati)", - "Pacific\/Kosrae": "Mikronezia (Kosrae)", + "Pacific\/Guam": "eur Guam (Guam)", + "Pacific\/Honolulu": "eur Stadoù-Unanet (Honolulu)", + "Pacific\/Johnston": "eur Inizi diabell ar Stadoù-Unanet (Johnston)", + "Pacific\/Kiritimati": "eur Kiribati (Kiritimati)", + "Pacific\/Kosrae": "eur Mikronezia (Kosrae)", "Pacific\/Kwajalein": "eur Inizi Marshall (Kwajalein)", "Pacific\/Majuro": "eur Inizi Marshall (Majuro)", "Pacific\/Marquesas": "eur Inizi Markiz", @@ -425,22 +422,16 @@ "Pacific\/Pago_Pago": "eur Samoa (Pago Pago)", "Pacific\/Palau": "eur Palau", "Pacific\/Pitcairn": "eur Pitcairn", - "Pacific\/Ponape": "Mikronezia (Pohnpei)", - "Pacific\/Port_Moresby": "Papoua Ginea-Nevez (Port Moresby)", + "Pacific\/Ponape": "eur Mikronezia (Pohnpei)", + "Pacific\/Port_Moresby": "eur Papoua Ginea-Nevez (Port Moresby)", "Pacific\/Rarotonga": "eur Inizi Cook (Rarotonga)", - "Pacific\/Saipan": "Inizi Mariana an Norzh (Saipan)", + "Pacific\/Saipan": "eur Inizi Mariana an Norzh (Saipan)", "Pacific\/Tahiti": "eur Tahiti", - "Pacific\/Tarawa": "Kiribati (Tarawa)", + "Pacific\/Tarawa": "eur Kiribati (Tarawa)", "Pacific\/Tongatapu": "eur Tonga (Tongatapu)", - "Pacific\/Truk": "Mikronezia (Chuuk)", - "Pacific\/Wake": "Inizi diabell ar Stadoù-Unanet (Wake)", + "Pacific\/Truk": "eur Mikronezia (Chuuk)", + "Pacific\/Wake": "eur Inizi diabell ar Stadoù-Unanet (Wake)", "Pacific\/Wallis": "eur Wallis ha Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/bs.json b/src/Symfony/Component/Intl/Resources/data/timezones/bs.json index 936b29be33332..c23c34de91c83 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/bs.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/bs.json @@ -438,9 +438,6 @@ }, "Meta": { "GmtFormat": "GMT %s", - "HourFormat": [ - "+%02d:%02d", - " -%02d:%02d" - ] + "HourFormatNeg": " -%02d:%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/bs_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/timezones/bs_Cyrl.json index 8d155a1b1e435..65d560697296d 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/bs_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/bs_Cyrl.json @@ -151,6 +151,7 @@ "America\/Moncton": "Атланско време (Монктон)", "America\/Monterrey": "Централно време (Монтереј)", "America\/Montevideo": "Уругвај време (Монтевидео)", + "America\/Montreal": "Време у земљи: Канада (Montreal)", "America\/Montserrat": "Атланско време (Монтсерат)", "America\/Nassau": "Источно време (Насау)", "America\/New_York": "Источно време (Њујорк)", @@ -224,6 +225,7 @@ "Asia\/Bahrain": "Арабијско време (Бахреин)", "Asia\/Baku": "Азербејџан време (Баку)", "Asia\/Bangkok": "Индокина време (Банкок)", + "Asia\/Barnaul": "Време у земљи: Русија (Barnaul)", "Asia\/Beirut": "Источноевропско време (Бејрут)", "Asia\/Bishkek": "Киргизстан време (Бишкек)", "Asia\/Brunei": "Брунеј Дарусалум време (Брунеји)", @@ -285,8 +287,9 @@ "Asia\/Tehran": "Иран време (Техеран)", "Asia\/Thimphu": "Бутан време (Тимпу)", "Asia\/Tokyo": "Јапанско време (Токио)", + "Asia\/Tomsk": "Време у земљи: Русија (Tomsk)", "Asia\/Ulaanbaatar": "Улан Батор време", - "Asia\/Urumqi": "Кина (Урумкви)", + "Asia\/Urumqi": "Време у земљи: Кина (Урумкви)", "Asia\/Ust-Nera": "Владивосток време (Ust-Nera)", "Asia\/Vientiane": "Индокина време (Вијентијан)", "Asia\/Vladivostok": "Владивосток време", @@ -336,10 +339,11 @@ "Europe\/Guernsey": "Гринвич средње време (Гернзи)", "Europe\/Helsinki": "Источноевропско време (Хелсинки)", "Europe\/Isle_of_Man": "Гринвич средње време (Острво Ман)", - "Europe\/Istanbul": "Турска (Истанбул)", + "Europe\/Istanbul": "Време у земљи: Турска (Истанбул)", "Europe\/Jersey": "Гринвич средње време (Џерси)", "Europe\/Kaliningrad": "Источноевропско време (Калининград)", "Europe\/Kiev": "Источноевропско време (Кијев)", + "Europe\/Kirov": "Време у земљи: Русија (Kirov)", "Europe\/Lisbon": "Западноевропско време (Лисабон)", "Europe\/Ljubljana": "Средњеевропско време (Љубљана)", "Europe\/London": "Гринвич средње време (Лондон)", @@ -432,9 +436,7 @@ }, "Meta": { "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d%02d", - "-%02d%02d" - ] + "HourFormatPos": "+%02d%02d", + "HourFormatNeg": "-%02d%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ca.json b/src/Symfony/Component/Intl/Resources/data/timezones/ca.json index 453eb086efdc6..251ca616ad551 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ca.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ca.json @@ -99,7 +99,7 @@ "America\/Detroit": "Hora oriental d’Amèrica del Nord (Detroit)", "America\/Dominica": "Hora de l’Atlàntic (Dominica)", "America\/Edmonton": "Hora de muntanya d’Amèrica del Nord (Edmonton)", - "America\/Eirunepe": "Brasil (Eirunepé)", + "America\/Eirunepe": "Hora de: Brasil (Eirunepé)", "America\/El_Salvador": "Hora central d’Amèrica del Nord (El Salvador)", "America\/Fort_Nelson": "Hora de muntanya d’Amèrica del Nord (Fort Nelson)", "America\/Fortaleza": "Hora de Brasília (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Hora de l’Atlàntic (Moncton)", "America\/Monterrey": "Hora central d’Amèrica del Nord (Monterrey)", "America\/Montevideo": "Hora de l’Uruguai (Montevideo)", - "America\/Montreal": "Canadà (Montreal)", + "America\/Montreal": "Hora de: Canadà (Montreal)", "America\/Montserrat": "Hora de l’Atlàntic (Montserrat)", "America\/Nassau": "Hora oriental d’Amèrica del Nord (Nassau)", "America\/New_York": "Hora oriental d’Amèrica del Nord (Nova York)", @@ -176,7 +176,7 @@ "America\/Recife": "Hora de Brasília (Recife)", "America\/Regina": "Hora central d’Amèrica del Nord (Regina)", "America\/Resolute": "Hora central d’Amèrica del Nord (Resolute)", - "America\/Rio_Branco": "Brasil (Río Branco)", + "America\/Rio_Branco": "Hora de: Brasil (Río Branco)", "America\/Santa_Isabel": "Hora del nord-oest de Mèxic (Santa Isabel)", "America\/Santarem": "Hora de Brasília (Santarém)", "America\/Santiago": "Hora de Xile (Santiago)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Hora àrab (Bahrain)", "Asia\/Baku": "Hora d’Azerbaidjan (Bakú)", "Asia\/Bangkok": "Hora d’Indoxina (Bangkok)", - "Asia\/Barnaul": "Rússia (Barnaul)", + "Asia\/Barnaul": "Hora de: Rússia (Barnaul)", "Asia\/Beirut": "Hora de l’Est d’Europa (Beirut)", "Asia\/Bishkek": "Hora del Kirguizistan (Bixkek)", "Asia\/Brunei": "Hora de Brunei Darussalam", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Hora d’Iran (Teheran)", "Asia\/Thimphu": "Hora de Bhutan (Thimbu)", "Asia\/Tokyo": "Hora del Japó (Tòquio)", - "Asia\/Tomsk": "Rússia (Tomsk)", + "Asia\/Tomsk": "Hora de: Rússia (Tomsk)", "Asia\/Ulaanbaatar": "Hora d’Ulan Bator", - "Asia\/Urumqi": "Xina (Urumchi)", + "Asia\/Urumqi": "Hora de: Xina (Urumchi)", "Asia\/Ust-Nera": "Hora de Vladivostok (Ust’-Nera)", "Asia\/Vientiane": "Hora d’Indoxina (Vientiane)", "Asia\/Vladivostok": "Hora de Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Hora del Meridià de Greenwich (Guernsey)", "Europe\/Helsinki": "Hora de l’Est d’Europa (Hèlsinki)", "Europe\/Isle_of_Man": "Hora del Meridià de Greenwich (Man)", - "Europe\/Istanbul": "Turquia (Istanbul)", + "Europe\/Istanbul": "Hora de: Turquia (Istanbul)", "Europe\/Jersey": "Hora del Meridià de Greenwich (Jersey)", "Europe\/Kaliningrad": "Hora de l’Est d’Europa (Kaliningrad)", "Europe\/Kiev": "Hora de l’Est d’Europa (Kíev)", - "Europe\/Kirov": "Rússia (Kirov)", + "Europe\/Kirov": "Hora de: Rússia (Kirov)", "Europe\/Lisbon": "Hora de l’Oest d’Europa (Lisboa)", "Europe\/Ljubljana": "Hora del Centre d’Europa (Ljubljana)", "Europe\/London": "Hora del Meridià de Greenwich (Londres)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Hora de Wake", "Pacific\/Wallis": "Hora de Wallis i Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ce.json b/src/Symfony/Component/Intl/Resources/data/timezones/ce.json index b457f03cb8bfe..478e098bce0ba 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ce.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ce.json @@ -322,7 +322,6 @@ "CST6CDT": "Юккъера Америка", "EST5EDT": "Малхбален Америка", "Etc\/GMT": "Гринвичица юкъара хан", - "Etc\/UTC": "UTC", "Europe\/Amsterdam": "Юккъера Европа (Амстердам)", "Europe\/Andorra": "Юккъера Европа (Андорра)", "Europe\/Astrakhan": "Москва (Аштаркхне)", @@ -436,11 +435,5 @@ "Pacific\/Wake": "Уэйк, гӀ-е", "Pacific\/Wallis": "Уоллис а, Футуна а" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/cs.json b/src/Symfony/Component/Intl/Resources/data/timezones/cs.json index bb4da80fa5be1..5d577743f815a 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/cs.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/cs.json @@ -151,7 +151,7 @@ "America\/Moncton": "Atlantický čas (Moncton)", "America\/Monterrey": "Severoamerický centrální čas (Monterrey)", "America\/Montevideo": "Uruguayský čas (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Časové pásmo Kanada (Montreal)", "America\/Montserrat": "Atlantický čas (Montserrat)", "America\/Nassau": "Severoamerický východní čas (Nassau)", "America\/New_York": "Severoamerický východní čas (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Arabský čas (Bahrajn)", "Asia\/Baku": "Ázerbájdžánský čas (Baku)", "Asia\/Bangkok": "Indočínský čas (Bangkok)", - "Asia\/Barnaul": "Rusko (Barnaul)", + "Asia\/Barnaul": "Časové pásmo Rusko (Barnaul)", "Asia\/Beirut": "Východoevropský čas (Bejrút)", "Asia\/Bishkek": "Kyrgyzský čas (Biškek)", "Asia\/Brunei": "Brunejský čas", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Íránský čas (Teherán)", "Asia\/Thimphu": "Bhútánský čas (Thimbú)", "Asia\/Tokyo": "Japonský čas (Tokio)", - "Asia\/Tomsk": "Rusko (Tomsk)", + "Asia\/Tomsk": "Časové pásmo Rusko (Tomsk)", "Asia\/Ulaanbaatar": "Ulánbátarský čas", - "Asia\/Urumqi": "Čína (Urumči)", + "Asia\/Urumqi": "Časové pásmo Čína (Urumči)", "Asia\/Ust-Nera": "Vladivostocký čas (Ust-Nera)", "Asia\/Vientiane": "Indočínský čas (Vientiane)", "Asia\/Vladivostok": "Vladivostocký čas (Vladivostok)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwichský střední čas (Guernsey)", "Europe\/Helsinki": "Východoevropský čas (Helsinky)", "Europe\/Isle_of_Man": "Greenwichský střední čas (Ostrov Man)", - "Europe\/Istanbul": "Turecko (Istanbul)", + "Europe\/Istanbul": "Časové pásmo Turecko (Istanbul)", "Europe\/Jersey": "Greenwichský střední čas (Jersey)", "Europe\/Kaliningrad": "Východoevropský čas (Kaliningrad)", "Europe\/Kiev": "Východoevropský čas (Kyjev)", - "Europe\/Kirov": "Rusko (Kirov)", + "Europe\/Kirov": "Časové pásmo Rusko (Kirov)", "Europe\/Lisbon": "Západoevropský čas (Lisabon)", "Europe\/Ljubljana": "Středoevropský čas (Lublaň)", "Europe\/London": "Greenwichský střední čas (Londýn)", @@ -437,10 +437,7 @@ "Pacific\/Wallis": "Čas ostrovů Wallis a Futuna" }, "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%d:%02d", - "-%d:%02d" - ] + "HourFormatPos": "+%d:%02d", + "HourFormatNeg": "-%d:%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/cy.json b/src/Symfony/Component/Intl/Resources/data/timezones/cy.json index a7d44a000fdd6..317a5d510fa91 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/cy.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/cy.json @@ -99,7 +99,7 @@ "America\/Detroit": "Amser Dwyrain Gogledd America (Detroit)", "America\/Dominica": "Amser Cefnfor yr Iwerydd (Dominica)", "America\/Edmonton": "Amser Mynyddoedd Gogledd America (Edmonton)", - "America\/Eirunepe": "Brasil (Eirunepé)", + "America\/Eirunepe": "Amser Brasil (Eirunepé)", "America\/El_Salvador": "Amser Canolbarth Gogledd America (El Salvador)", "America\/Fort_Nelson": "Amser Mynyddoedd Gogledd America (Fort Nelson)", "America\/Fortaleza": "Amser Brasília (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Amser Cefnfor yr Iwerydd (Moncton)", "America\/Monterrey": "Amser Canolbarth Gogledd America (Monterrey)", "America\/Montevideo": "Amser Uruguay (Montevideo)", - "America\/Montreal": "Canada (Montreal)", + "America\/Montreal": "Amser Canada (Montreal)", "America\/Montserrat": "Amser Cefnfor yr Iwerydd (Montserrat)", "America\/Nassau": "Amser Dwyrain Gogledd America (Nassau)", "America\/New_York": "Amser Dwyrain Gogledd America (Efrog Newydd)", @@ -176,7 +176,7 @@ "America\/Recife": "Amser Brasília (Recife)", "America\/Regina": "Amser Canolbarth Gogledd America (Regina)", "America\/Resolute": "Amser Canolbarth Gogledd America (Resolute)", - "America\/Rio_Branco": "Brasil (Rio Branco)", + "America\/Rio_Branco": "Amser Brasil (Rio Branco)", "America\/Santa_Isabel": "Amser Gogledd Orllewin Mecsico (Santa Isabel)", "America\/Santarem": "Amser Brasília (Santarem)", "America\/Santiago": "Amser Chile (Santiago)", @@ -217,7 +217,7 @@ "Asia\/Aden": "Amser Arabaidd (Aden)", "Asia\/Almaty": "Amser Dwyrain Kazakhstan (Almaty)", "Asia\/Amman": "Amser Dwyrain Ewrop (Amman)", - "Asia\/Anadyr": "Rwsia (Anadyr)", + "Asia\/Anadyr": "Amser Rwsia (Anadyr)", "Asia\/Aqtau": "Amser Gorllewin Casachstan (Aqtau)", "Asia\/Aqtobe": "Amser Gorllewin Casachstan (Aqtobe)", "Asia\/Ashgabat": "Amser Tyrcmenistan (Ashgabat)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Amser Arabaidd (Bahrain)", "Asia\/Baku": "Amser Aserbaijan (Baku)", "Asia\/Bangkok": "Amser Indo-Tsieina (Bangkok)", - "Asia\/Barnaul": "Rwsia (Barnaul)", + "Asia\/Barnaul": "Amser Rwsia (Barnaul)", "Asia\/Beirut": "Amser Dwyrain Ewrop (Beirut)", "Asia\/Bishkek": "Amser Kyrgyzstan (Bishkek)", "Asia\/Brunei": "Amser Brunei Darussalam", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "Amser Dwyrain Indonesia (Jayapura)", "Asia\/Jerusalem": "Amser Israel (Jerwsalem)", "Asia\/Kabul": "Amser Afghanistan (Kabul)", - "Asia\/Kamchatka": "Rwsia (Kamchatka)", + "Asia\/Kamchatka": "Amser Rwsia (Kamchatka)", "Asia\/Karachi": "Amser Pakistan (Karachi)", "Asia\/Katmandu": "Amser Nepal (Kathmandu)", "Asia\/Khandyga": "Amser Yakutsk (Khandyga)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Amser Iran (Tehran)", "Asia\/Thimphu": "Amser Bhutan (Thimphu)", "Asia\/Tokyo": "Amser Siapan (Tokyo)", - "Asia\/Tomsk": "Rwsia (Tomsk)", + "Asia\/Tomsk": "Amser Rwsia (Tomsk)", "Asia\/Ulaanbaatar": "Amser Ulan Bator", - "Asia\/Urumqi": "Tsieina (Urumqi)", + "Asia\/Urumqi": "Amser Tsieina (Urumqi)", "Asia\/Ust-Nera": "Amser Vladivostok (Ust-Nera)", "Asia\/Vientiane": "Amser Indo-Tsieina (Vientiane)", "Asia\/Vladivostok": "Amser Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Amser Safonol Greenwich (Ynys y Garn)", "Europe\/Helsinki": "Amser Dwyrain Ewrop (Helsinki)", "Europe\/Isle_of_Man": "Amser Safonol Greenwich (Ynys Manaw)", - "Europe\/Istanbul": "Twrci (Caergystennin)", + "Europe\/Istanbul": "Amser Twrci (Caergystennin)", "Europe\/Jersey": "Amser Safonol Greenwich (Jersey)", "Europe\/Kaliningrad": "Amser Dwyrain Ewrop (Kaliningrad)", "Europe\/Kiev": "Amser Dwyrain Ewrop (Kiev)", - "Europe\/Kirov": "Rwsia (Kirov)", + "Europe\/Kirov": "Amser Rwsia (Kirov)", "Europe\/Lisbon": "Amser Gorllewin Ewrop (Lisbon)", "Europe\/Ljubljana": "Amser Canolbarth Ewrop (Ljubljana)", "Europe\/London": "Amser Safonol Greenwich (Llundain)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Amser Ynys Wake", "Pacific\/Wallis": "Amser Wallis a Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/da.json b/src/Symfony/Component/Intl/Resources/data/timezones/da.json index b89112cf48cda..63be3c1fb6c88 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/da.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/da.json @@ -437,10 +437,7 @@ "Pacific\/Wallis": "Wallis og Futuna-tid" }, "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d.%02d", - "-%02d.%02d" - ] + "HourFormatPos": "+%02d.%02d", + "HourFormatNeg": "-%02d.%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/de.json b/src/Symfony/Component/Intl/Resources/data/timezones/de.json index 580cec674bb8f..5a92ece487b98 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/de.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/de.json @@ -151,7 +151,7 @@ "America\/Moncton": "Atlantik-Zeit (Moncton)", "America\/Monterrey": "Nordamerikanische Inlandzeit (Monterrey)", "America\/Montevideo": "Uruguayanische Zeit (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Kanada Zeit (Montreal)", "America\/Montserrat": "Atlantik-Zeit (Montserrat)", "America\/Nassau": "Nordamerikanische Ostküstenzeit (Nassau)", "America\/New_York": "Nordamerikanische Ostküstenzeit (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Arabische Zeit (Bahrain)", "Asia\/Baku": "Aserbaidschanische Zeit (Baku)", "Asia\/Bangkok": "Indochina-Zeit (Bangkok)", - "Asia\/Barnaul": "Russland (Barnaul)", + "Asia\/Barnaul": "Russland Zeit (Barnaul)", "Asia\/Beirut": "Osteuropäische Zeit (Beirut)", "Asia\/Bishkek": "Kirgisistan-Zeit (Bischkek)", "Asia\/Brunei": "Brunei-Darussalam-Zeit", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Iranische Zeit (Teheran)", "Asia\/Thimphu": "Bhutan-Zeit (Thimphu)", "Asia\/Tokyo": "Japanische Zeit (Tokio)", - "Asia\/Tomsk": "Russland (Tomsk)", + "Asia\/Tomsk": "Russland Zeit (Tomsk)", "Asia\/Ulaanbaatar": "Ulaanbaatar-Zeit", - "Asia\/Urumqi": "China (Ürümqi)", + "Asia\/Urumqi": "China Zeit (Ürümqi)", "Asia\/Ust-Nera": "Wladiwostok-Zeit (Ust-Nera)", "Asia\/Vientiane": "Indochina-Zeit (Vientiane)", "Asia\/Vladivostok": "Wladiwostok-Zeit", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Mittlere Greenwich-Zeit (Guernsey)", "Europe\/Helsinki": "Osteuropäische Zeit (Helsinki)", "Europe\/Isle_of_Man": "Mittlere Greenwich-Zeit (Isle of Man)", - "Europe\/Istanbul": "Türkei (Istanbul)", + "Europe\/Istanbul": "Türkei Zeit (Istanbul)", "Europe\/Jersey": "Mittlere Greenwich-Zeit (Jersey)", "Europe\/Kaliningrad": "Osteuropäische Zeit (Kaliningrad)", "Europe\/Kiev": "Osteuropäische Zeit (Kiew)", - "Europe\/Kirov": "Russland (Kirow)", + "Europe\/Kirov": "Russland Zeit (Kirow)", "Europe\/Lisbon": "Westeuropäische Zeit (Lissabon)", "Europe\/Ljubljana": "Mitteleuropäische Zeit (Ljubljana)", "Europe\/London": "Mittlere Greenwich-Zeit (London)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Wake-Insel-Zeit", "Pacific\/Wallis": "Wallis-und-Futuna-Zeit" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/dz.json b/src/Symfony/Component/Intl/Resources/data/timezones/dz.json index 1d8545e74b47e..ff3fb273c36a7 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/dz.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/dz.json @@ -85,7 +85,7 @@ "America\/Cayenne": "ཕིརེནཅ་གི་ཡ་ན་ཆུ་ཚོད། (Cayenne་)", "America\/Cayman": "བྱང་ཨ་མི་རི་ཀ་ཤར་ཕྱོགས་ཆུ་ཚོད། (Cayman་)", "America\/Chicago": "བྱང་ཨ་མི་རི་ཀ་དབུས་ཕྱོགས་ཆུ་ཚོད། (ཅི་ཀཱ་གོ་)", - "America\/Chihuahua": "མེཀ་སི་ཀོ། (Chihuahua་)", + "America\/Chihuahua": "མེཀ་སི་ཀོ་ཆུ་ཚོད།། (Chihuahua་)", "America\/Coral_Harbour": "བྱང་ཨ་མི་རི་ཀ་ཤར་ཕྱོགས་ཆུ་ཚོད། (ཨ་ཏི་ཀོ་ཀཱན་)", "America\/Cordoba": "ཨར་ཇེན་ཊི་ན་ཆུ་ཚོད། (Cordoba་)", "America\/Costa_Rica": "བྱང་ཨ་མི་རི་ཀ་དབུས་ཕྱོགས་ཆུ་ཚོད། (ཀོས་ཊ་རི་ཀ་)", @@ -99,7 +99,7 @@ "America\/Detroit": "བྱང་ཨ་མི་རི་ཀ་ཤར་ཕྱོགས་ཆུ་ཚོད། (Detroit་)", "America\/Dominica": "ཨེཊ་ལེན་ཊིཀ་ཆུ་ཚོད། (ཌོ་མི་ནི་ཀ་)", "America\/Edmonton": "བྱང་ཨ་མི་རི་ཀ་མའུ་ཊེན་ཆུ་ཚོད། (ཨེཌ་མཱོན་ཊོན་)", - "America\/Eirunepe": "བྲ་ཛིལ། (Eirunepe་)", + "America\/Eirunepe": "བྲ་ཛིལ་ཆུ་ཚོད།། (Eirunepe་)", "America\/El_Salvador": "བྱང་ཨ་མི་རི་ཀ་དབུས་ཕྱོགས་ཆུ་ཚོད། (ཨེལ་ སཱལ་བ་ཌོ་)", "America\/Fort_Nelson": "བྱང་ཨ་མི་རི་ཀ་མའུ་ཊེན་ཆུ་ཚོད། (Fort Nelson་)", "America\/Fortaleza": "བྲ་ཛི་ལི་ཡ་ཆུ་ཚོད། (Fortaleza་)", @@ -114,7 +114,7 @@ "America\/Guyana": "གུ་ཡ་ན་ཆུ་ཚོད། (Guyana་)", "America\/Halifax": "ཨེཊ་ལེན་ཊིཀ་ཆུ་ཚོད། (ཧ་ལི་ཕེགསི་)", "America\/Havana": "ཀིའུ་བྷ་ཆུ་ཚོད། (Havana་)", - "America\/Hermosillo": "མེཀ་སི་ཀོ། (Hermosillo་)", + "America\/Hermosillo": "མེཀ་སི་ཀོ་ཆུ་ཚོད།། (Hermosillo་)", "America\/Indiana\/Knox": "བྱང་ཨ་མི་རི་ཀ་དབུས་ཕྱོགས་ཆུ་ཚོད། (Knox, Indiana་)", "America\/Indiana\/Marengo": "བྱང་ཨ་མི་རི་ཀ་ཤར་ཕྱོགས་ཆུ་ཚོད། (Marengo, Indiana་)", "America\/Indiana\/Petersburg": "བྱང་ཨ་མི་རི་ཀ་ཤར་ཕྱོགས་ཆུ་ཚོད། (Petersburg, Indiana་)", @@ -141,7 +141,7 @@ "America\/Marigot": "ཨེཊ་ལེན་ཊིཀ་ཆུ་ཚོད། (Marigot་)", "America\/Martinique": "ཨེཊ་ལེན་ཊིཀ་ཆུ་ཚོད། (Martinique་)", "America\/Matamoros": "བྱང་ཨ་མི་རི་ཀ་དབུས་ཕྱོགས་ཆུ་ཚོད། (Matamoros་)", - "America\/Mazatlan": "མེཀ་སི་ཀོ། (Mazatlan་)", + "America\/Mazatlan": "མེཀ་སི་ཀོ་ཆུ་ཚོད།། (Mazatlan་)", "America\/Mendoza": "ཨར་ཇེན་ཊི་ན་ཆུ་ཚོད། (Mendoza་)", "America\/Menominee": "བྱང་ཨ་མི་རི་ཀ་དབུས་ཕྱོགས་ཆུ་ཚོད། (Menominee་)", "America\/Merida": "བྱང་ཨ་མི་རི་ཀ་དབུས་ཕྱོགས་ཆུ་ཚོད། (Merida་)", @@ -151,7 +151,7 @@ "America\/Moncton": "ཨེཊ་ལེན་ཊིཀ་ཆུ་ཚོད། (མཱོངཀ་ཊོན་)", "America\/Monterrey": "བྱང་ཨ་མི་རི་ཀ་དབུས་ཕྱོགས་ཆུ་ཚོད། (Monterrey་)", "America\/Montevideo": "ཡུ་རུ་གུ་ཝཱའི་ཆུ་ཚོད། (Montevideo་)", - "America\/Montreal": "ཀེ་ན་ཌ། (Montreal་)", + "America\/Montreal": "ཀེ་ན་ཌ་ཆུ་ཚོད།། (Montreal་)", "America\/Montserrat": "ཨེཊ་ལེན་ཊིཀ་ཆུ་ཚོད། (Montserrat་)", "America\/Nassau": "བྱང་ཨ་མི་རི་ཀ་ཤར་ཕྱོགས་ཆུ་ཚོད། (Nassau་)", "America\/New_York": "བྱང་ཨ་མི་རི་ཀ་ཤར་ཕྱོགས་ཆུ་ཚོད། (New York་)", @@ -176,8 +176,8 @@ "America\/Recife": "བྲ་ཛི་ལི་ཡ་ཆུ་ཚོད། (Recife་)", "America\/Regina": "བྱང་ཨ་མི་རི་ཀ་དབུས་ཕྱོགས་ཆུ་ཚོད། (རི་ཇི་ན་)", "America\/Resolute": "བྱང་ཨ་མི་རི་ཀ་དབུས་ཕྱོགས་ཆུ་ཚོད། (རི་སོ་ལིའུཊ་)", - "America\/Rio_Branco": "བྲ་ཛིལ། (Rio Branco་)", - "America\/Santa_Isabel": "མེཀ་སི་ཀོ། (Santa Isabel་)", + "America\/Rio_Branco": "བྲ་ཛིལ་ཆུ་ཚོད།། (Rio Branco་)", + "America\/Santa_Isabel": "མེཀ་སི་ཀོ་ཆུ་ཚོད།། (Santa Isabel་)", "America\/Santarem": "བྲ་ཛི་ལི་ཡ་ཆུ་ཚོད། (Santarem་)", "America\/Santiago": "ཅི་ལི་ཆུ་ཚོད། (སཱན་ཊི་ཡ་གྷོ་)", "America\/Santo_Domingo": "ཨེཊ་ལེན་ཊིཀ་ཆུ་ཚོད། (སཱན་ཊོ་ ཌོ་མིང་གྷོ་)", @@ -203,94 +203,94 @@ "America\/Yakutat": "ཨ་ལསི་ཀ་ཆུ་ཚོད། (ཡ་ཀུ་ཏཏ་)", "America\/Yellowknife": "བྱང་ཨ་མི་རི་ཀ་མའུ་ཊེན་ཆུ་ཚོད། (Yellowknife་)", "Antarctica\/Casey": "ནུབ་ཕྱོགས་ཨཱོས་ཊྲེལ་ལི་ཡ་ཆུ་ཚོད། (Casey་)", - "Antarctica\/Davis": "འཛམ་གླིང་ལྷོ་མཐའི་ཁྱགས་གླིང། (ཌེ་ཝིས།་)", - "Antarctica\/DumontDUrville": "འཛམ་གླིང་ལྷོ་མཐའི་ཁྱགས་གླིང། (Dumont d’Urville་)", - "Antarctica\/Macquarie": "ཨཱོས་ཊྲེལ་ལི་ཡ། (Macquarie་)", - "Antarctica\/Mawson": "འཛམ་གླིང་ལྷོ་མཐའི་ཁྱགས་གླིང། (མའུ་སཱོན་)", + "Antarctica\/Davis": "འཛམ་གླིང་ལྷོ་མཐའི་ཁྱགས་གླིང་ཆུ་ཚོད།། (ཌེ་ཝིས།་)", + "Antarctica\/DumontDUrville": "འཛམ་གླིང་ལྷོ་མཐའི་ཁྱགས་གླིང་ཆུ་ཚོད།། (Dumont d’Urville་)", + "Antarctica\/Macquarie": "ཨཱོས་ཊྲེལ་ལི་ཡ་ཆུ་ཚོད།། (Macquarie་)", + "Antarctica\/Mawson": "འཛམ་གླིང་ལྷོ་མཐའི་ཁྱགས་གླིང་ཆུ་ཚོད།། (མའུ་སཱོན་)", "Antarctica\/McMurdo": "ནིའུ་ཛི་ལེནཌ་ཆུ་ཚོད། (McMurdo་)", "Antarctica\/Palmer": "ཅི་ལི་ཆུ་ཚོད། (Palmer་)", - "Antarctica\/Rothera": "འཛམ་གླིང་ལྷོ་མཐའི་ཁྱགས་གླིང། (Rothera་)", - "Antarctica\/Syowa": "འཛམ་གླིང་ལྷོ་མཐའི་ཁྱགས་གླིང། (Syowa་)", + "Antarctica\/Rothera": "འཛམ་གླིང་ལྷོ་མཐའི་ཁྱགས་གླིང་ཆུ་ཚོད།། (Rothera་)", + "Antarctica\/Syowa": "འཛམ་གླིང་ལྷོ་མཐའི་ཁྱགས་གླིང་ཆུ་ཚོད།། (Syowa་)", "Antarctica\/Troll": "གིརིན་ཝིཆ་ལུ་ཡོད་པའི་ཆུ་ཚོད། (Troll་)", - "Antarctica\/Vostok": "འཛམ་གླིང་ལྷོ་མཐའི་ཁྱགས་གླིང། (Vostok་)", + "Antarctica\/Vostok": "འཛམ་གླིང་ལྷོ་མཐའི་ཁྱགས་གླིང་ཆུ་ཚོད།། (Vostok་)", "Arctic\/Longyearbyen": "དབུས་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Longyearbyen་)", "Asia\/Aden": "ཨ་རེ་བྷི་ཡན་ཆུ་ཚོད། (Aden་)", - "Asia\/Almaty": "ཀ་ཛགས་སཏཱན། (Almaty་)", + "Asia\/Almaty": "ཀ་ཛགས་སཏཱན་ཆུ་ཚོད།། (Almaty་)", "Asia\/Amman": "ཤར་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Amman་)", - "Asia\/Anadyr": "ཨུ་རུ་སུ། (Anadyr་)", - "Asia\/Aqtau": "ཀ་ཛགས་སཏཱན། (Aqtau་)", - "Asia\/Aqtobe": "ཀ་ཛགས་སཏཱན། (Aqtobe་)", - "Asia\/Ashgabat": "ཊཱརཀ་མེནའི་སཏཱན། (Ashgabat་)", - "Asia\/Atyrau": "ཀ་ཛགས་སཏཱན། (Atyrau་)", + "Asia\/Anadyr": "ཨུ་རུ་སུ་ཆུ་ཚོད།། (Anadyr་)", + "Asia\/Aqtau": "ཀ་ཛགས་སཏཱན་ཆུ་ཚོད།། (Aqtau་)", + "Asia\/Aqtobe": "ཀ་ཛགས་སཏཱན་ཆུ་ཚོད།། (Aqtobe་)", + "Asia\/Ashgabat": "ཊཱརཀ་མེནའི་སཏཱན་ཆུ་ཚོད།། (Ashgabat་)", + "Asia\/Atyrau": "ཀ་ཛགས་སཏཱན་ཆུ་ཚོད།། (Atyrau་)", "Asia\/Baghdad": "ཨ་རེ་བྷི་ཡན་ཆུ་ཚོད། (Baghdad་)", "Asia\/Bahrain": "ཨ་རེ་བྷི་ཡན་ཆུ་ཚོད། (བྷ་རེན་་)", "Asia\/Baku": "ཨ་ཛར་བྷའི་ཇཱན་ཆུ་ཚོད། (Baku་)", "Asia\/Bangkok": "ཨིན་ཌོ་ཅཱའི་ན་ཆུ་ཚོད། (Bangkok་)", - "Asia\/Barnaul": "ཨུ་རུ་སུ། (Barnaul་)", + "Asia\/Barnaul": "ཨུ་རུ་སུ་ཆུ་ཚོད།། (Barnaul་)", "Asia\/Beirut": "ཤར་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Beirut་)", - "Asia\/Bishkek": "ཀིར་གིས་སཏཱན། (Bishkek་)", - "Asia\/Brunei": "བྷྲུ་ནའི། (Brunei་)", + "Asia\/Bishkek": "ཀིར་གིས་སཏཱན་ཆུ་ཚོད།། (Bishkek་)", + "Asia\/Brunei": "བྷྲུ་ནའི་ཆུ་ཚོད།། (Brunei་)", "Asia\/Calcutta": "རྒྱ་གར་ཆུ་ཚོད། (Kolkata་)", "Asia\/Chita": "ཡ་ཀུཙིཀི་ཆུ་ཚོད། (Chita་)", - "Asia\/Choibalsan": "སོག་པོ་ཡུལ། (Choibalsan་)", + "Asia\/Choibalsan": "སོག་པོ་ཡུལ་ཆུ་ཚོད།། (Choibalsan་)", "Asia\/Colombo": "རྒྱ་གར་ཆུ་ཚོད། (Colombo་)", "Asia\/Damascus": "ཤར་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Damascus་)", "Asia\/Dhaka": "བངྒ་ལ་དེཤ་ཆུ་ཚོད། (Dhaka་)", - "Asia\/Dili": "ཏི་་མོར་ལེ་ཨེསཊ། (Dili་)", + "Asia\/Dili": "ཏི་་མོར་ལེ་ཨེསཊ་ཆུ་ཚོད།། (Dili་)", "Asia\/Dubai": "གཱལཕི་ཆུ་ཚོད། (Dubai་)", - "Asia\/Dushanbe": "ཏ་ཇིག་གི་སཏཱན། (Dushanbe་)", + "Asia\/Dushanbe": "ཏ་ཇིག་གི་སཏཱན་ཆུ་ཚོད།། (Dushanbe་)", "Asia\/Famagusta": "ཤར་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Famagusta་)", "Asia\/Gaza": "ཤར་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Gaza་)", "Asia\/Hebron": "ཤར་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Hebron་)", - "Asia\/Hong_Kong": "ཧོང་ཀོང་ཅཱའི་ན། (Hong Kong་)", - "Asia\/Hovd": "སོག་པོ་ཡུལ། (Hovd་)", + "Asia\/Hong_Kong": "ཧོང་ཀོང་ཅཱའི་ན་ཆུ་ཚོད།། (Hong Kong་)", + "Asia\/Hovd": "སོག་པོ་ཡུལ་ཆུ་ཚོད།། (Hovd་)", "Asia\/Irkutsk": "ཨར་ཀུཙི་ཆུ་ཚོད། (Irkutsk་)", "Asia\/Jakarta": "ནུབ་ཕྱོགས་ཨིན་ཌོ་ནེ་ཤི་ཡ་ཆུ་ཚོད། (Jakarta་)", "Asia\/Jayapura": "ཤར་ཕྱོགས་ཨིན་ཌོ་ནེ་ཤི་ཡ་ཆུ་ཚོད། (Jayapura་)", "Asia\/Jerusalem": "ཨིས་རེལ་ཆུ་ཚོད། (Jerusalem་)", "Asia\/Kabul": "ཨཕ་ག་ནི་ས྄ཏཱནཆུ་ཚོད། (Kabul་)", - "Asia\/Kamchatka": "ཨུ་རུ་སུ། (Kamchatka་)", + "Asia\/Kamchatka": "ཨུ་རུ་སུ་ཆུ་ཚོད།། (Kamchatka་)", "Asia\/Karachi": "པ་ཀི་ས྄ཏཱན་ཆུ་ཚོད། (Karachi་)", "Asia\/Katmandu": "ནེ་པཱལ་ཆུ་ཚོད། (Kathmandu་)", "Asia\/Khandyga": "ཡ་ཀུཙིཀི་ཆུ་ཚོད། (Khandyga་)", "Asia\/Krasnoyarsk": "ཀརསི་ནོ་ཡརསཀི་ཆུ་ཚོད། (Krasnoyarsk་)", - "Asia\/Kuala_Lumpur": "མ་ལེ་ཤི་ཡ། (Kuala Lumpur་)", - "Asia\/Kuching": "མ་ལེ་ཤི་ཡ། (Kuching་)", + "Asia\/Kuala_Lumpur": "མ་ལེ་ཤི་ཡ་ཆུ་ཚོད།། (Kuala Lumpur་)", + "Asia\/Kuching": "མ་ལེ་ཤི་ཡ་ཆུ་ཚོད།། (Kuching་)", "Asia\/Kuwait": "ཨ་རེ་བྷི་ཡན་ཆུ་ཚོད། (Kuwait་)", "Asia\/Macau": "རྒྱ་ནག་ཆུ་ཚོད། (Macao་)", "Asia\/Magadan": "མ་གྷ་དཱན་ཆུ་ཚོད། (Magadan་)", "Asia\/Makassar": "དབུས་ཕྱོགས་ཨིན་ཌོ་ནེ་ཤི་ཡ་ཆུ་ཚོད། (Makassar་)", - "Asia\/Manila": "ཕི་ལི་པིནས། (Manila་)", + "Asia\/Manila": "ཕི་ལི་པིནས་ཆུ་ཚོད།། (Manila་)", "Asia\/Muscat": "གཱལཕི་ཆུ་ཚོད། (Muscat་)", "Asia\/Nicosia": "ཤར་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Nicosia་)", "Asia\/Novokuznetsk": "ཀརསི་ནོ་ཡརསཀི་ཆུ་ཚོད། (Novokuznetsk་)", "Asia\/Novosibirsk": "ནོ་བོ་སི་བིརསཀི་ཆུ་ཚོད། (Novosibirsk་)", "Asia\/Omsk": "ཨོམསཀི་ཆུ་ཚོད། (Omsk་)", - "Asia\/Oral": "ཀ་ཛགས་སཏཱན། (Oral་)", + "Asia\/Oral": "ཀ་ཛགས་སཏཱན་ཆུ་ཚོད།། (Oral་)", "Asia\/Phnom_Penh": "ཨིན་ཌོ་ཅཱའི་ན་ཆུ་ཚོད། (Phnom Penh་)", "Asia\/Pontianak": "ནུབ་ཕྱོགས་ཨིན་ཌོ་ནེ་ཤི་ཡ་ཆུ་ཚོད། (Pontianak་)", "Asia\/Pyongyang": "ཀོ་རི་ཡ་ཆུ་ཚོད། (Pyongyang་)", "Asia\/Qatar": "ཨ་རེ་བྷི་ཡན་ཆུ་ཚོད། (Qatar་)", - "Asia\/Qostanay": "ཀ་ཛགས་སཏཱན། (Qostanay་)", - "Asia\/Qyzylorda": "ཀ་ཛགས་སཏཱན། (Qyzylorda་)", - "Asia\/Rangoon": "མི་ཡཱན་མར་ (བྷར་མ)། (Yangon་)", + "Asia\/Qostanay": "ཀ་ཛགས་སཏཱན་ཆུ་ཚོད།། (Qostanay་)", + "Asia\/Qyzylorda": "ཀ་ཛགས་སཏཱན་ཆུ་ཚོད།། (Qyzylorda་)", + "Asia\/Rangoon": "མི་ཡཱན་མར་ (བྷར་མ)་ཆུ་ཚོད།། (Yangon་)", "Asia\/Riyadh": "ཨ་རེ་བྷི་ཡན་ཆུ་ཚོད། (Riyadh་)", "Asia\/Saigon": "ཨིན་ཌོ་ཅཱའི་ན་ཆུ་ཚོད། (Ho Chi Minh་)", "Asia\/Sakhalin": "ས་ཁ་ལིན་ཆུ་ཚོད། (Sakhalin་)", - "Asia\/Samarkand": "ཨུས་བེག་གི་སཏཱན། (Samarkand་)", + "Asia\/Samarkand": "ཨུས་བེག་གི་སཏཱན་ཆུ་ཚོད།། (Samarkand་)", "Asia\/Seoul": "ཀོ་རི་ཡ་ཆུ་ཚོད། (Seoul་)", "Asia\/Shanghai": "རྒྱ་ནག་ཆུ་ཚོད། (Shanghai་)", - "Asia\/Singapore": "སིང་ག་པོར། (Singapore་)", + "Asia\/Singapore": "སིང་ག་པོར་ཆུ་ཚོད།། (Singapore་)", "Asia\/Srednekolymsk": "མ་གྷ་དཱན་ཆུ་ཚོད། (Srednekolymsk་)", - "Asia\/Taipei": "ཊཱའི་ཝཱན། (Taipei་)", - "Asia\/Tashkent": "ཨུས་བེག་གི་སཏཱན། (Tashkent་)", + "Asia\/Taipei": "ཊཱའི་ཝཱན་ཆུ་ཚོད།། (Taipei་)", + "Asia\/Tashkent": "ཨུས་བེག་གི་སཏཱན་ཆུ་ཚོད།། (Tashkent་)", "Asia\/Tbilisi": "ཇཽ་ཇཱ་ཆུ་ཚོད། (Tbilisi་)", "Asia\/Tehran": "ཨི་རཱན་ཆུ་ཚོད། (Tehran་)", "Asia\/Thimphu": "འབྲུག་ཡུལ་ཆུ་ཚོད། (ཐིམ་ཕུག་)", "Asia\/Tokyo": "ཇ་པཱན་ཆུ་ཚོད། (Tokyo་)", - "Asia\/Tomsk": "ཨུ་རུ་སུ། (Tomsk་)", - "Asia\/Ulaanbaatar": "སོག་པོ་ཡུལ། (Ulaanbaatar་)", - "Asia\/Urumqi": "རྒྱ་ནག། (Urumqi་)", + "Asia\/Tomsk": "ཨུ་རུ་སུ་ཆུ་ཚོད།། (Tomsk་)", + "Asia\/Ulaanbaatar": "སོག་པོ་ཡུལ་ཆུ་ཚོད།། (Ulaanbaatar་)", + "Asia\/Urumqi": "རྒྱ་ནག་ཆུ་ཚོད།། (Urumqi་)", "Asia\/Ust-Nera": "བ་ལ་ཌི་བོསི་ཏོཀ་ཆུ་ཚོད། (Ust-Nera་)", "Asia\/Vientiane": "ཨིན་ཌོ་ཅཱའི་ན་ཆུ་ཚོད། (Vientiane་)", "Asia\/Vladivostok": "བ་ལ་ཌི་བོསི་ཏོཀ་ཆུ་ཚོད། (Vladivostok་)", @@ -304,7 +304,7 @@ "Atlantic\/Faeroe": "ནུབ་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (ཕཱའེ་རོ་་)", "Atlantic\/Madeira": "ནུབ་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Madeira་)", "Atlantic\/Reykjavik": "གིརིན་ཝིཆ་ལུ་ཡོད་པའི་ཆུ་ཚོད། (Reykjavik་)", - "Atlantic\/South_Georgia": "སཱའུཐ་ཇཽར་ཇཱ་ དང་ སཱའུཐ་སེནཌ྄་ཝིཅ་གླིང་ཚོམ། (South Georgia་)", + "Atlantic\/South_Georgia": "སཱའུཐ་ཇཽར་ཇཱ་ དང་ སཱའུཐ་སེནཌ྄་ཝིཅ་གླིང་ཚོམ་ཆུ་ཚོད།། (South Georgia་)", "Atlantic\/St_Helena": "གིརིན་ཝིཆ་ལུ་ཡོད་པའི་ཆུ་ཚོད། (St. Helena་)", "Atlantic\/Stanley": "ཕལཀ་ལེནཌ་ཨཱའི་ལེནཌས་ཆུ་ཚོད། (Stanley་)", "Australia\/Adelaide": "དབུས་ཕྱོགས་ཨཱོས་ཊྲེལ་ལི་ཡ་ཆུ་ཚོད། (Adelaide་)", @@ -315,14 +315,13 @@ "Australia\/Eucla": "བུས་ནུབ་ཕྱོགས་ཨཱོས་ཊྲེལ་ལི་ཡ་ཆུ་ཚོད། (Eucla་)", "Australia\/Hobart": "ཤར་ཕྱོགས་ཕྱོགས་ཨཱོས་ཊྲེལ་ལི་ཡ་ཆུ་ཚོད། (Hobart་)", "Australia\/Lindeman": "ཤར་ཕྱོགས་ཕྱོགས་ཨཱོས་ཊྲེལ་ལི་ཡ་ཆུ་ཚོད། (Lindeman་)", - "Australia\/Lord_Howe": "ཨཱོས་ཊྲེལ་ལི་ཡ། (Lord Howe་)", + "Australia\/Lord_Howe": "ཨཱོས་ཊྲེལ་ལི་ཡ་ཆུ་ཚོད།། (Lord Howe་)", "Australia\/Melbourne": "ཤར་ཕྱོགས་ཕྱོགས་ཨཱོས་ཊྲེལ་ལི་ཡ་ཆུ་ཚོད། (Melbourne་)", "Australia\/Perth": "ནུབ་ཕྱོགས་ཨཱོས་ཊྲེལ་ལི་ཡ་ཆུ་ཚོད། (Perth་)", "Australia\/Sydney": "ཤར་ཕྱོགས་ཕྱོགས་ཨཱོས་ཊྲེལ་ལི་ཡ་ཆུ་ཚོད། (Sydney་)", "CST6CDT": "བྱང་ཨ་མི་རི་ཀ་དབུས་ཕྱོགས་ཆུ་ཚོད", "EST5EDT": "བྱང་ཨ་མི་རི་ཀ་ཤར་ཕྱོགས་ཆུ་ཚོད", "Etc\/GMT": "གིརིན་ཝིཆ་ལུ་ཡོད་པའི་ཆུ་ཚོད", - "Etc\/UTC": "UTC", "Europe\/Amsterdam": "དབུས་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Amsterdam་)", "Europe\/Andorra": "དབུས་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Andorra་)", "Europe\/Astrakhan": "མཽས་ཀོ་ཆུ་ཚོད། (Astrakhan་)", @@ -341,11 +340,11 @@ "Europe\/Guernsey": "གིརིན་ཝིཆ་ལུ་ཡོད་པའི་ཆུ་ཚོད། (Guernsey་)", "Europe\/Helsinki": "ཤར་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (ཧེལ་སིང་ཀི་)", "Europe\/Isle_of_Man": "གིརིན་ཝིཆ་ལུ་ཡོད་པའི་ཆུ་ཚོད། (Isle of Man་)", - "Europe\/Istanbul": "ཊཱར་ཀི། (Istanbul་)", + "Europe\/Istanbul": "ཊཱར་ཀི་ཆུ་ཚོད།། (Istanbul་)", "Europe\/Jersey": "གིརིན་ཝིཆ་ལུ་ཡོད་པའི་ཆུ་ཚོད། (Jersey་)", "Europe\/Kaliningrad": "ཤར་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Kaliningrad་)", "Europe\/Kiev": "ཤར་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Kiev་)", - "Europe\/Kirov": "ཨུ་རུ་སུ། (Kirov་)", + "Europe\/Kirov": "ཨུ་རུ་སུ་ཆུ་ཚོད།། (Kirov་)", "Europe\/Lisbon": "ནུབ་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Lisbon་)", "Europe\/Ljubljana": "དབུས་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Ljubljana་)", "Europe\/London": "གིརིན་ཝིཆ་ལུ་ཡོད་པའི་ཆུ་ཚོད། (London་)", @@ -362,7 +361,7 @@ "Europe\/Prague": "དབུས་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Prague་)", "Europe\/Riga": "ཤར་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Riga་)", "Europe\/Rome": "དབུས་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Rome་)", - "Europe\/Samara": "ཨུ་རུ་སུ། (Samara་)", + "Europe\/Samara": "ཨུ་རུ་སུ་ཆུ་ཚོད།། (Samara་)", "Europe\/San_Marino": "དབུས་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (San Marino་)", "Europe\/Sarajevo": "དབུས་ཕྱོགས་ཡུ་རོ་པེན་ཆུ་ཚོད། (Sarajevo་)", "Europe\/Saratov": "མཽས་ཀོ་ཆུ་ཚོད། (Saratov་)", @@ -386,9 +385,9 @@ "Indian\/Antananarivo": "ཤར་ཕྱོགས་ཨཕ་རི་ཀཱ་ཆུ་ཚོད། (Antananarivo་)", "Indian\/Chagos": "རྒྱ་གར་གྱི་རྒྱ་མཚོ་ཆུ་ཚོད། (Chagos་)", "Indian\/Christmas": "ཁི་རིསྟ་མེས་མཚོ་གླིང་ཆུ་ཚོད། (Christmas་)", - "Indian\/Cocos": "ཀོ་ཀོས་གླིང་ཚོམ། (Cocos་)", + "Indian\/Cocos": "ཀོ་ཀོས་གླིང་ཚོམ་ཆུ་ཚོད།། (Cocos་)", "Indian\/Comoro": "ཤར་ཕྱོགས་ཨཕ་རི་ཀཱ་ཆུ་ཚོད། (Comoro་)", - "Indian\/Kerguelen": "ཕྲནཅ་གི་ལྷོ་ཕྱོགས་མངའ་ཁོངས། (Kerguelen་)", + "Indian\/Kerguelen": "ཕྲནཅ་གི་ལྷོ་ཕྱོགས་མངའ་ཁོངས་ཆུ་ཚོད།། (Kerguelen་)", "Indian\/Mahe": "སེ་ཤཱལས་ཆུ་ཚོད། (Mahe་)", "Indian\/Maldives": "མཱལ་དིབས་ཆུ་ཚོད། (Maldives་)", "Indian\/Mauritius": "མོ་རི་ཤཱས་ཆུ་ཚོད། (Mauritius་)", @@ -396,51 +395,47 @@ "Indian\/Reunion": "རི་ཡུ་ནི་ཡཱན་ཆུ་ཚོད། (Reunion་)", "MST7MDT": "བྱང་ཨ་མི་རི་ཀ་མའུ་ཊེན་ཆུ་ཚོད", "PST8PDT": "བྱང་ཨ་མི་རི་ཀ་པེ་སི་ཕིག་ཆུ་ཚོད", - "Pacific\/Apia": "ས་མོ་ཨ། (ཨ་པི་ཡ་)", + "Pacific\/Apia": "ས་མོ་ཨ་ཆུ་ཚོད།། (ཨ་པི་ཡ་)", "Pacific\/Auckland": "ནིའུ་ཛི་ལེནཌ་ཆུ་ཚོད། (Auckland་)", - "Pacific\/Bougainville": "པ་པུ་ ནིའུ་གི་ནི། (Bougainville་)", - "Pacific\/Chatham": "ནིའུ་ཛི་ལེནཌ། (Chatham་)", + "Pacific\/Bougainville": "པ་པུ་ ནིའུ་གི་ནི་ཆུ་ཚོད།། (Bougainville་)", + "Pacific\/Chatham": "ནིའུ་ཛི་ལེནཌ་ཆུ་ཚོད།། (Chatham་)", "Pacific\/Easter": "ཨིསི་ཊར་ཨཱའི་ལེནཌ་ཆུ་ཚོད། (Easter་)", - "Pacific\/Efate": "ཝ་ནུ་ཨ་ཏུ། (Efate་)", - "Pacific\/Enderbury": "ཀི་རི་བ་ཏི་མཚོ་གླིང། (Enderbury་)", - "Pacific\/Fakaofo": "ཏོ་ཀེ་ལའུ་ མཚོ་གླིང། (Fakaofo་)", - "Pacific\/Fiji": "ཕི་ཇི། (Fiji་)", - "Pacific\/Funafuti": "ཏུ་ཝ་ལུ། (Funafuti་)", + "Pacific\/Efate": "ཝ་ནུ་ཨ་ཏུ་ཆུ་ཚོད།། (Efate་)", + "Pacific\/Enderbury": "ཀི་རི་བ་ཏི་མཚོ་གླིང་ཆུ་ཚོད།། (Enderbury་)", + "Pacific\/Fakaofo": "ཏོ་ཀེ་ལའུ་ མཚོ་གླིང་ཆུ་ཚོད།། (Fakaofo་)", + "Pacific\/Fiji": "ཕི་ཇི་ཆུ་ཚོད།། (Fiji་)", + "Pacific\/Funafuti": "ཏུ་ཝ་ལུ་ཆུ་ཚོད།། (Funafuti་)", "Pacific\/Galapagos": "ག་ལ་པ་གོསི་ཆུ་ཚོད། (Galapagos་)", - "Pacific\/Gambier": "ཕྲཱནས྄་ཀྱི་པོ་ལི་ནི་ཤི་ཡ། (Gambier་)", - "Pacific\/Guadalcanal": "སོ་ལོ་མོན་ གླིང་ཚོམ། (Guadalcanal་)", - "Pacific\/Guam": "གུ་འམ་ མཚོ་གླིང། (Guam་)", + "Pacific\/Gambier": "ཕྲཱནས྄་ཀྱི་པོ་ལི་ནི་ཤི་ཡ་ཆུ་ཚོད།། (Gambier་)", + "Pacific\/Guadalcanal": "སོ་ལོ་མོན་ གླིང་ཚོམ་ཆུ་ཚོད།། (Guadalcanal་)", + "Pacific\/Guam": "གུ་འམ་ མཚོ་གླིང་ཆུ་ཚོད།། (Guam་)", "Pacific\/Honolulu": "ཧ་ཝའི་-ཨེ་ལིའུ་ཤེན་ཆུ་ཚོད། (Honolulu་)", "Pacific\/Johnston": "ཧ་ཝའི་-ཨེ་ལིའུ་ཤེན་ཆུ་ཚོད། (Johnston་)", - "Pacific\/Kiritimati": "ཀི་རི་བ་ཏི་མཚོ་གླིང། (Kiritimati་)", - "Pacific\/Kosrae": "མའི་ཀྲོ་ནི་ཤི་ཡ། (Kosrae་)", - "Pacific\/Kwajalein": "མར་ཤེལ་གླིང་ཚོམ། (Kwajalein་)", - "Pacific\/Majuro": "མར་ཤེལ་གླིང་ཚོམ། (Majuro་)", - "Pacific\/Marquesas": "ཕྲཱནས྄་ཀྱི་པོ་ལི་ནི་ཤི་ཡ། (Marquesas་)", - "Pacific\/Midway": "ཡུ་ཨེས་གྱི་མཐའ་མཚམས་མཚོ་གླིང་། (Midway་)", - "Pacific\/Nauru": "ནའུ་རུ་། (Nauru་)", - "Pacific\/Niue": "ནི་ཨུ་ཨཻ། (Niue་)", - "Pacific\/Norfolk": "ནོར་ཕོལཀ་མཚོ་གླིང༌། (Norfolk་)", - "Pacific\/Noumea": "ནིའུ་ཀ་ལི་དོ་ནི་ཡ། (Noumea་)", - "Pacific\/Pago_Pago": "ས་མོ་ཨ་ཡུ་ཨེས་ཨེ་མངའ་ཁོངས། (Pago Pago་)", - "Pacific\/Palau": "པ་ལའུ། (Palau་)", - "Pacific\/Pitcairn": "པིཊ་ཀེ་ཡེརན་གླིང་ཚོམ། (Pitcairn་)", - "Pacific\/Ponape": "མའི་ཀྲོ་ནི་ཤི་ཡ། (Pohnpei་)", - "Pacific\/Port_Moresby": "པ་པུ་ ནིའུ་གི་ནི། (Port Moresby་)", - "Pacific\/Rarotonga": "ཀུག་གླིང་ཚོམ། (Rarotonga་)", - "Pacific\/Saipan": "བྱང་ཕྱོགས་ཀྱི་མ་ར་ཡ་ན་གླིང་ཚོམ། (Saipan་)", - "Pacific\/Tahiti": "ཕྲཱནས྄་ཀྱི་པོ་ལི་ནི་ཤི་ཡ། (Tahiti་)", - "Pacific\/Tarawa": "ཀི་རི་བ་ཏི་མཚོ་གླིང། (Tarawa་)", - "Pacific\/Tongatapu": "ཊོང་གྷ། (Tongatapu་)", - "Pacific\/Truk": "མའི་ཀྲོ་ནི་ཤི་ཡ། (Chuuk་)", - "Pacific\/Wake": "ཡུ་ཨེས་གྱི་མཐའ་མཚམས་མཚོ་གླིང་། (Wake་)", - "Pacific\/Wallis": "ཝལ་ལིས྄་ ཨེནཌ་ ཕུ་ཏུ་ན་། (Wallis་)" + "Pacific\/Kiritimati": "ཀི་རི་བ་ཏི་མཚོ་གླིང་ཆུ་ཚོད།། (Kiritimati་)", + "Pacific\/Kosrae": "མའི་ཀྲོ་ནི་ཤི་ཡ་ཆུ་ཚོད།། (Kosrae་)", + "Pacific\/Kwajalein": "མར་ཤེལ་གླིང་ཚོམ་ཆུ་ཚོད།། (Kwajalein་)", + "Pacific\/Majuro": "མར་ཤེལ་གླིང་ཚོམ་ཆུ་ཚོད།། (Majuro་)", + "Pacific\/Marquesas": "ཕྲཱནས྄་ཀྱི་པོ་ལི་ནི་ཤི་ཡ་ཆུ་ཚོད།། (Marquesas་)", + "Pacific\/Midway": "ཡུ་ཨེས་གྱི་མཐའ་མཚམས་མཚོ་གླིང་་ཆུ་ཚོད།། (Midway་)", + "Pacific\/Nauru": "ནའུ་རུ་་ཆུ་ཚོད།། (Nauru་)", + "Pacific\/Niue": "ནི་ཨུ་ཨཻ་ཆུ་ཚོད།། (Niue་)", + "Pacific\/Norfolk": "ནོར་ཕོལཀ་མཚོ་གླིང༌་ཆུ་ཚོད།། (Norfolk་)", + "Pacific\/Noumea": "ནིའུ་ཀ་ལི་དོ་ནི་ཡ་ཆུ་ཚོད།། (Noumea་)", + "Pacific\/Pago_Pago": "ས་མོ་ཨ་ཡུ་ཨེས་ཨེ་མངའ་ཁོངས་ཆུ་ཚོད།། (Pago Pago་)", + "Pacific\/Palau": "པ་ལའུ་ཆུ་ཚོད།། (Palau་)", + "Pacific\/Pitcairn": "པིཊ་ཀེ་ཡེརན་གླིང་ཚོམ་ཆུ་ཚོད།། (Pitcairn་)", + "Pacific\/Ponape": "མའི་ཀྲོ་ནི་ཤི་ཡ་ཆུ་ཚོད།། (Pohnpei་)", + "Pacific\/Port_Moresby": "པ་པུ་ ནིའུ་གི་ནི་ཆུ་ཚོད།། (Port Moresby་)", + "Pacific\/Rarotonga": "ཀུག་གླིང་ཚོམ་ཆུ་ཚོད།། (Rarotonga་)", + "Pacific\/Saipan": "བྱང་ཕྱོགས་ཀྱི་མ་ར་ཡ་ན་གླིང་ཚོམ་ཆུ་ཚོད།། (Saipan་)", + "Pacific\/Tahiti": "ཕྲཱནས྄་ཀྱི་པོ་ལི་ནི་ཤི་ཡ་ཆུ་ཚོད།། (Tahiti་)", + "Pacific\/Tarawa": "ཀི་རི་བ་ཏི་མཚོ་གླིང་ཆུ་ཚོད།། (Tarawa་)", + "Pacific\/Tongatapu": "ཊོང་གྷ་ཆུ་ཚོད།། (Tongatapu་)", + "Pacific\/Truk": "མའི་ཀྲོ་ནི་ཤི་ཡ་ཆུ་ཚོད།། (Chuuk་)", + "Pacific\/Wake": "ཡུ་ཨེས་གྱི་མཐའ་མཚམས་མཚོ་གླིང་་ཆུ་ཚོད།། (Wake་)", + "Pacific\/Wallis": "ཝལ་ལིས྄་ ཨེནཌ་ ཕུ་ཏུ་ན་་ཆུ་ཚོད།། (Wallis་)" }, "Meta": { - "GmtFormat": "ཇི་ཨེམ་ཏི་%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] + "GmtFormat": "ཇི་ཨེམ་ཏི་%s" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ee.json b/src/Symfony/Component/Intl/Resources/data/timezones/ee.json index 5199825836953..a9fa588c80bc3 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ee.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ee.json @@ -99,7 +99,7 @@ "America\/Detroit": "Eastern America gaƒoƒo me (Detroit)", "America\/Dominica": "Atlantic gaƒoƒome (Dominica)", "America\/Edmonton": "Mountain gaƒoƒo me (Edmonton)", - "America\/Eirunepe": "Brazil nutome (Eirunepe)", + "America\/Eirunepe": "Brazil nutome gaƒoƒo me (Eirunepe)", "America\/El_Salvador": "Titina America gaƒoƒome (El Salvador)", "America\/Fort_Nelson": "Mountain gaƒoƒo me (Fort Nelson)", "America\/Fortaleza": "Brasilia gaƒoƒo me (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Atlantic gaƒoƒome (Moncton)", "America\/Monterrey": "Titina America gaƒoƒome (Monterrey)", "America\/Montevideo": "Uruguay gaƒoƒo me (Montevideo)", - "America\/Montreal": "Canada nutome (Montreal)", + "America\/Montreal": "Canada nutome gaƒoƒo me (Montreal)", "America\/Montserrat": "Atlantic gaƒoƒome (Montserrat)", "America\/Nassau": "Eastern America gaƒoƒo me (Nassau)", "America\/New_York": "Eastern America gaƒoƒo me (New York)", @@ -176,7 +176,7 @@ "America\/Recife": "Brasilia gaƒoƒo me (Recife)", "America\/Regina": "Titina America gaƒoƒome (Regina)", "America\/Resolute": "Titina America gaƒoƒome (Resolute)", - "America\/Rio_Branco": "Brazil nutome (Rio Branco)", + "America\/Rio_Branco": "Brazil nutome gaƒoƒo me (Rio Branco)", "America\/Santa_Isabel": "Northwest Mexico gaƒoƒo me (Santa Isabel)", "America\/Santarem": "Brasilia gaƒoƒo me (Santarem)", "America\/Santiago": "Chile gaƒoƒo me (Santiago)", @@ -217,7 +217,7 @@ "Asia\/Aden": "Arabia gaƒoƒo me (Aden)", "Asia\/Almaty": "East Kazakhstan gaƒoƒo me (Almaty)", "Asia\/Amman": "Ɣedzeƒe Europe gaƒoƒome (Amman)", - "Asia\/Anadyr": "Russia nutome (Anadyr)", + "Asia\/Anadyr": "Russia nutome gaƒoƒo me (Anadyr)", "Asia\/Aqtau": "West Kazakhstan gaƒoƒo me (Aqtau)", "Asia\/Aqtobe": "West Kazakhstan gaƒoƒo me (Aqtobe)", "Asia\/Ashgabat": "Turkmenistan gaƒoƒo me (Ashgabat)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Arabia gaƒoƒo me (Bahrain)", "Asia\/Baku": "Azerbaijan gaƒoƒo me (Baku)", "Asia\/Bangkok": "Indonesia gaƒoƒo me (Bangkok)", - "Asia\/Barnaul": "Russia nutome (Barnaul)", + "Asia\/Barnaul": "Russia nutome gaƒoƒo me (Barnaul)", "Asia\/Beirut": "Ɣedzeƒe Europe gaƒoƒome (Beirut)", "Asia\/Bishkek": "Kyrgystan gaƒoƒo me (Bishkek)", "Asia\/Brunei": "Brunei Darussalam gaƒoƒo me", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "Eastern Indonesia gaƒoƒo me (Jayapura)", "Asia\/Jerusalem": "Israel gaƒoƒo me (Jerusalem)", "Asia\/Kabul": "Afghanistan gaƒoƒo me (Kabul)", - "Asia\/Kamchatka": "Russia nutome (Kamchatka)", + "Asia\/Kamchatka": "Russia nutome gaƒoƒo me (Kamchatka)", "Asia\/Karachi": "Pakistan gaƒoƒo me (Karachi)", "Asia\/Katmandu": "Nepal gaƒoƒo me (Kathmandu nutomegaƒoƒome)", "Asia\/Khandyga": "Yakutsk gaƒoƒo me (Khandyga)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Iran gaƒoƒo me (Tehran)", "Asia\/Thimphu": "Bhutan gaƒoƒo me (Thimphu)", "Asia\/Tokyo": "Japan gaƒoƒo me (Tokyo)", - "Asia\/Tomsk": "Russia nutome (Tomsk)", + "Asia\/Tomsk": "Russia nutome gaƒoƒo me (Tomsk)", "Asia\/Ulaanbaatar": "Ulan Bator gaƒoƒo me (Ulaanbaatar)", - "Asia\/Urumqi": "Tsaina nutome (Urumqi)", + "Asia\/Urumqi": "Tsaina nutome gaƒoƒo me (Urumqi)", "Asia\/Ust-Nera": "Vladivostok gaƒoƒo me (Ust-Nera)", "Asia\/Vientiane": "Indonesia gaƒoƒo me (Vientiane)", "Asia\/Vladivostok": "Vladivostok gaƒoƒo me", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwich gaƒoƒo me (Guernsey)", "Europe\/Helsinki": "Ɣedzeƒe Europe gaƒoƒome (Helsinki)", "Europe\/Isle_of_Man": "Greenwich gaƒoƒo me (Isle of Man)", - "Europe\/Istanbul": "Tɛki nutome (Istanbul)", + "Europe\/Istanbul": "Tɛki nutome gaƒoƒo me (Istanbul)", "Europe\/Jersey": "Greenwich gaƒoƒo me (Jersey)", "Europe\/Kaliningrad": "Ɣedzeƒe Europe gaƒoƒome (Kaliningrad)", "Europe\/Kiev": "Ɣedzeƒe Europe gaƒoƒome (Kiev)", - "Europe\/Kirov": "Russia nutome (Kirov)", + "Europe\/Kirov": "Russia nutome gaƒoƒo me (Kirov)", "Europe\/Lisbon": "Western Europe gaƒoƒo me (Lisbon)", "Europe\/Ljubljana": "Central Europe gaƒoƒo me (Ljubljana)", "Europe\/London": "Greenwich gaƒoƒo me (London)", @@ -362,7 +362,7 @@ "Europe\/Prague": "Central Europe gaƒoƒo me (Prague)", "Europe\/Riga": "Ɣedzeƒe Europe gaƒoƒome (Riga)", "Europe\/Rome": "Central Europe gaƒoƒo me (Rome)", - "Europe\/Samara": "Russia nutome (Samara)", + "Europe\/Samara": "Russia nutome gaƒoƒo me (Samara)", "Europe\/San_Marino": "Central Europe gaƒoƒo me (San Marino)", "Europe\/Sarajevo": "Central Europe gaƒoƒo me (Sarajevo)", "Europe\/Saratov": "Moscow gaƒoƒo me (Saratov)", @@ -437,10 +437,6 @@ "Pacific\/Wallis": "Wallis & Futuna gaƒoƒo me" }, "Meta": { - "GmtFormat": "%s GMT", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] + "GmtFormat": "%s GMT" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/el.json b/src/Symfony/Component/Intl/Resources/data/timezones/el.json index 7a79ad054fe79..583a8b639d9c3 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/el.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/el.json @@ -99,7 +99,7 @@ "America\/Detroit": "[Ανατολική ώρα Βόρειας Αμερικής (Ντιτρόιτ)]", "America\/Dominica": "[Ώρα Ατλαντικού (Ντομίνικα)]", "America\/Edmonton": "[Ορεινή ώρα Βόρειας Αμερικής (Έντμοντον)]", - "America\/Eirunepe": "[Βραζιλία (Εϊρουνεπέ)]", + "America\/Eirunepe": "[Ώρα (Βραζιλία) (Εϊρουνεπέ)]", "America\/El_Salvador": "[Κεντρική ώρα Βόρειας Αμερικής (Ελ Σαλβαδόρ)]", "America\/Fort_Nelson": "[Ορεινή ώρα Βόρειας Αμερικής (Φορτ Νέλσον)]", "America\/Fortaleza": "[Ώρα Μπραζίλιας (Φορταλέζα)]", @@ -151,7 +151,7 @@ "America\/Moncton": "[Ώρα Ατλαντικού (Μόνκτον)]", "America\/Monterrey": "[Κεντρική ώρα Βόρειας Αμερικής (Μοντερέι)]", "America\/Montevideo": "[Ώρα Ουρουγουάης (Μοντεβιδέο)]", - "America\/Montreal": "[Καναδάς (Montreal)]", + "America\/Montreal": "[Ώρα (Καναδάς) (Montreal)]", "America\/Montserrat": "[Ώρα Ατλαντικού (Μονσεράτ)]", "America\/Nassau": "[Ανατολική ώρα Βόρειας Αμερικής (Νασάου)]", "America\/New_York": "[Ανατολική ώρα Βόρειας Αμερικής (Νέα Υόρκη)]", @@ -176,7 +176,7 @@ "America\/Recife": "[Ώρα Μπραζίλιας (Ρεσίφε)]", "America\/Regina": "[Κεντρική ώρα Βόρειας Αμερικής (Ρετζίνα)]", "America\/Resolute": "[Κεντρική ώρα Βόρειας Αμερικής (Ρέζολουτ)]", - "America\/Rio_Branco": "[Βραζιλία (Ρίο Μπράνκο)]", + "America\/Rio_Branco": "[Ώρα (Βραζιλία) (Ρίο Μπράνκο)]", "America\/Santa_Isabel": "[Ώρα Βορειοδυτικού Μεξικού (Σάντα Ιζαμπέλ)]", "America\/Santarem": "[Ώρα Μπραζίλιας (Σανταρέμ)]", "America\/Santiago": "[Ώρα Χιλής (Σαντιάγκο)]", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "[Αραβική ώρα (Μπαχρέιν)]", "Asia\/Baku": "[Ώρα Αζερμπαϊτζάν (Μπακού)]", "Asia\/Bangkok": "[Ώρα Ινδοκίνας (Μπανγκόκ)]", - "Asia\/Barnaul": "[Ρωσία (Μπαρναούλ)]", + "Asia\/Barnaul": "[Ώρα (Ρωσία) (Μπαρναούλ)]", "Asia\/Beirut": "[Ώρα Ανατολικής Ευρώπης (Βυρητός)]", "Asia\/Bishkek": "[Ώρα Κιργιστάν (Μπισκέκ)]", "Asia\/Brunei": "Ώρα Μπρουνέι Νταρουσαλάμ", @@ -288,9 +288,9 @@ "Asia\/Tehran": "[Ώρα Ιράν (Τεχεράνη)]", "Asia\/Thimphu": "[Ώρα Μπουτάν (Θίμφου)]", "Asia\/Tokyo": "[Ώρα Ιαπωνίας (Τόκιο)]", - "Asia\/Tomsk": "[Ρωσία (Τομσκ)]", + "Asia\/Tomsk": "[Ώρα (Ρωσία) (Τομσκ)]", "Asia\/Ulaanbaatar": "Ώρα Ουλάν Μπατόρ", - "Asia\/Urumqi": "[Κίνα (Ουρούμτσι)]", + "Asia\/Urumqi": "[Ώρα (Κίνα) (Ουρούμτσι)]", "Asia\/Ust-Nera": "[Ώρα Βλαδιβοστόκ (Ουστ-Νερά)]", "Asia\/Vientiane": "[Ώρα Ινδοκίνας (Βιεντιάν)]", "Asia\/Vladivostok": "Ώρα Βλαδιβοστόκ", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "[Μέση ώρα Γκρίνουιτς (Γκέρνζι)]", "Europe\/Helsinki": "[Ώρα Ανατολικής Ευρώπης (Ελσίνκι)]", "Europe\/Isle_of_Man": "[Μέση ώρα Γκρίνουιτς (Νήσος του Μαν)]", - "Europe\/Istanbul": "[Τουρκία (Κωνσταντινούπολη)]", + "Europe\/Istanbul": "[Ώρα (Τουρκία) (Κωνσταντινούπολη)]", "Europe\/Jersey": "[Μέση ώρα Γκρίνουιτς (Τζέρσεϊ)]", "Europe\/Kaliningrad": "[Ώρα Ανατολικής Ευρώπης (Καλίνινγκραντ)]", "Europe\/Kiev": "[Ώρα Ανατολικής Ευρώπης (Κίεβο)]", - "Europe\/Kirov": "[Ρωσία (Κίροφ)]", + "Europe\/Kirov": "[Ώρα (Ρωσία) (Κίροφ)]", "Europe\/Lisbon": "[Ώρα Δυτικής Ευρώπης (Λισαβόνα)]", "Europe\/Ljubljana": "[Ώρα Κεντρικής Ευρώπης (Λιουμπλιάνα)]", "Europe\/London": "[Μέση ώρα Γκρίνουιτς (Λονδίνο)]", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Ώρα Νήσου Γουέικ", "Pacific\/Wallis": "[Ώρα Ουάλις και Φουτούνα (Γουάλις)]" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/en.json b/src/Symfony/Component/Intl/Resources/data/timezones/en.json index 2505ce6999862..3162ce140e6a3 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/en.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/en.json @@ -151,7 +151,7 @@ "America\/Moncton": "Atlantic Time (Moncton)", "America\/Monterrey": "Central Time (Monterrey)", "America\/Montevideo": "Uruguay Time (Montevideo)", - "America\/Montreal": "Canada (Montreal)", + "America\/Montreal": "Canada Time (Montreal)", "America\/Montserrat": "Atlantic Time (Montserrat)", "America\/Nassau": "Eastern Time (Nassau)", "America\/New_York": "Eastern Time (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Arabian Time (Bahrain)", "Asia\/Baku": "Azerbaijan Time (Baku)", "Asia\/Bangkok": "Indochina Time (Bangkok)", - "Asia\/Barnaul": "Russia (Barnaul)", + "Asia\/Barnaul": "Russia Time (Barnaul)", "Asia\/Beirut": "Eastern European Time (Beirut)", "Asia\/Bishkek": "Kyrgyzstan Time (Bishkek)", "Asia\/Brunei": "Brunei Darussalam Time", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Iran Time (Tehran)", "Asia\/Thimphu": "Bhutan Time (Thimphu)", "Asia\/Tokyo": "Japan Time (Tokyo)", - "Asia\/Tomsk": "Russia (Tomsk)", + "Asia\/Tomsk": "Russia Time (Tomsk)", "Asia\/Ulaanbaatar": "Ulaanbaatar Time", - "Asia\/Urumqi": "China (Urumqi)", + "Asia\/Urumqi": "China Time (Urumqi)", "Asia\/Ust-Nera": "Vladivostok Time (Ust-Nera)", "Asia\/Vientiane": "Indochina Time (Vientiane)", "Asia\/Vladivostok": "Vladivostok Time", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwich Mean Time (Guernsey)", "Europe\/Helsinki": "Eastern European Time (Helsinki)", "Europe\/Isle_of_Man": "Greenwich Mean Time (Isle of Man)", - "Europe\/Istanbul": "Turkey (Istanbul)", + "Europe\/Istanbul": "Turkey Time (Istanbul)", "Europe\/Jersey": "Greenwich Mean Time (Jersey)", "Europe\/Kaliningrad": "Eastern European Time (Kaliningrad)", "Europe\/Kiev": "Eastern European Time (Kiev)", - "Europe\/Kirov": "Russia (Kirov)", + "Europe\/Kirov": "Russia Time (Kirov)", "Europe\/Lisbon": "Western European Time (Lisbon)", "Europe\/Ljubljana": "Central European Time (Ljubljana)", "Europe\/London": "Greenwich Mean Time (London)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Wake Island Time", "Pacific\/Wallis": "Wallis & Futuna Time" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/es.json b/src/Symfony/Component/Intl/Resources/data/timezones/es.json index 2a5effed173c0..92afc713f0a18 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/es.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/es.json @@ -151,7 +151,7 @@ "America\/Moncton": "hora del Atlántico (Moncton)", "America\/Monterrey": "hora central (Monterrey)", "America\/Montevideo": "hora de Uruguay (Montevideo)", - "America\/Montreal": "Canadá (Montreal)", + "America\/Montreal": "hora de Canadá (Montreal)", "America\/Montserrat": "hora del Atlántico (Montserrat)", "America\/Nassau": "hora oriental (Nassau)", "America\/New_York": "hora oriental (Nueva York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "hora de Arabia (Baréin)", "Asia\/Baku": "hora de Azerbaiyán (Bakú)", "Asia\/Bangkok": "hora de Indochina (Bangkok)", - "Asia\/Barnaul": "Rusia (Barnaúl)", + "Asia\/Barnaul": "hora de Rusia (Barnaúl)", "Asia\/Beirut": "hora de Europa oriental (Beirut)", "Asia\/Bishkek": "hora de Kirguistán (Bishkek)", "Asia\/Brunei": "hora de Brunéi", @@ -288,9 +288,9 @@ "Asia\/Tehran": "hora de Irán (Teherán)", "Asia\/Thimphu": "hora de Bután (Timbu)", "Asia\/Tokyo": "hora de Japón (Tokio)", - "Asia\/Tomsk": "Rusia (Tomsk)", + "Asia\/Tomsk": "hora de Rusia (Tomsk)", "Asia\/Ulaanbaatar": "hora de Ulán Bator", - "Asia\/Urumqi": "China (Ürümqi)", + "Asia\/Urumqi": "hora de China (Ürümqi)", "Asia\/Ust-Nera": "hora de Vladivostok (Ust-Nera)", "Asia\/Vientiane": "hora de Indochina (Vientián)", "Asia\/Vladivostok": "hora de Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "hora del meridiano de Greenwich (Guernsey)", "Europe\/Helsinki": "hora de Europa oriental (Helsinki)", "Europe\/Isle_of_Man": "hora del meridiano de Greenwich (Isla de Man)", - "Europe\/Istanbul": "Turquía (Estambul)", + "Europe\/Istanbul": "hora de Turquía (Estambul)", "Europe\/Jersey": "hora del meridiano de Greenwich (Jersey)", "Europe\/Kaliningrad": "hora de Europa oriental (Kaliningrado)", "Europe\/Kiev": "hora de Europa oriental (Kiev)", - "Europe\/Kirov": "Rusia (Kírov)", + "Europe\/Kirov": "hora de Rusia (Kírov)", "Europe\/Lisbon": "hora de Europa occidental (Lisboa)", "Europe\/Ljubljana": "hora de Europa central (Liubliana)", "Europe\/London": "hora del meridiano de Greenwich (Londres)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "hora de la isla Wake", "Pacific\/Wallis": "hora de Wallis y Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/es_MX.json b/src/Symfony/Component/Intl/Resources/data/timezones/es_MX.json index 7a4f716fbed50..aea5146474e4f 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/es_MX.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/es_MX.json @@ -13,7 +13,7 @@ "Asia\/Qatar": "hora de Arabia (Qatar)", "Atlantic\/Stanley": "hora de Islas Malvinas (Stanley)", "Etc\/UTC": "Tiempo Universal Coordinado", - "Europe\/Kirov": "Rusia (Kirov)", + "Europe\/Kirov": "hora de Rusia (Kirov)", "Indian\/Christmas": "hora de la isla de Navidad", "Pacific\/Easter": "hora de Isla de Pascua", "Pacific\/Honolulu": "hora de Hawái-Aleutianas (Honolulu)", diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/es_US.json b/src/Symfony/Component/Intl/Resources/data/timezones/es_US.json index 1588c8d770b7b..3ccd883f3ead3 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/es_US.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/es_US.json @@ -1,10 +1,10 @@ { "Version": "2.1.47.86", "Names": { - "Asia\/Barnaul": "Rusia (Barnaul)", + "Asia\/Barnaul": "hora de Rusia (Barnaul)", "Etc\/UTC": "hora universal coordinada", "Europe\/Astrakhan": "hora de Moscú (Astrakhan)", - "Europe\/Kirov": "Rusia (Kirov)", + "Europe\/Kirov": "hora de Rusia (Kirov)", "Europe\/Ulyanovsk": "hora de Moscú (Ulyanovsk)", "Indian\/Chagos": "hora del Océano Índico (Chagos)", "Pacific\/Enderbury": "hora de las islas Fénix (Enderbury)", diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/et.json b/src/Symfony/Component/Intl/Resources/data/timezones/et.json index 18867775ed6eb..645ea770c2dea 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/et.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/et.json @@ -151,7 +151,7 @@ "America\/Moncton": "Atlandi aeg (Moncton)", "America\/Monterrey": "Kesk-Ameerika aeg (Monterrey)", "America\/Montevideo": "Uruguay aeg (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "(Kanada) (Montreal)", "America\/Montserrat": "Atlandi aeg (Montserrat)", "America\/Nassau": "Idaranniku aeg (Nassau)", "America\/New_York": "Idaranniku aeg (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Araabia aeg (Bahrein)", "Asia\/Baku": "Aserbaidžaani aeg (Bakuu)", "Asia\/Bangkok": "Indohiina aeg (Bangkok)", - "Asia\/Barnaul": "Venemaa (Barnaul)", + "Asia\/Barnaul": "(Venemaa) (Barnaul)", "Asia\/Beirut": "Ida-Euroopa aeg (Beirut)", "Asia\/Bishkek": "Kõrgõzstani aeg (Biškek)", "Asia\/Brunei": "Brunei aeg", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Iraani aeg (Teheran)", "Asia\/Thimphu": "Bhutani aeg (Thimphu)", "Asia\/Tokyo": "Jaapani aeg (Tōkyō)", - "Asia\/Tomsk": "Venemaa (Tomsk)", + "Asia\/Tomsk": "(Venemaa) (Tomsk)", "Asia\/Ulaanbaatar": "Ulaanbaatari aeg", - "Asia\/Urumqi": "Hiina (Ürümqi)", + "Asia\/Urumqi": "(Hiina) (Ürümqi)", "Asia\/Ust-Nera": "Vladivostoki aeg (Ust-Nera)", "Asia\/Vientiane": "Indohiina aeg (Vientiane)", "Asia\/Vladivostok": "Vladivostoki aeg", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwichi aeg (Guernsey)", "Europe\/Helsinki": "Ida-Euroopa aeg (Helsingi)", "Europe\/Isle_of_Man": "Greenwichi aeg (Mani saar)", - "Europe\/Istanbul": "Türgi (İstanbul)", + "Europe\/Istanbul": "(Türgi) (İstanbul)", "Europe\/Jersey": "Greenwichi aeg (Jersey)", "Europe\/Kaliningrad": "Ida-Euroopa aeg (Kaliningrad)", "Europe\/Kiev": "Ida-Euroopa aeg (Kiiev)", - "Europe\/Kirov": "Venemaa (Kirov)", + "Europe\/Kirov": "(Venemaa) (Kirov)", "Europe\/Lisbon": "Lääne-Euroopa aeg (Lissabon)", "Europe\/Ljubljana": "Kesk-Euroopa aeg (Ljubljana)", "Europe\/London": "Greenwichi aeg (London)", @@ -438,9 +438,6 @@ }, "Meta": { "GmtFormat": "GMT %s", - "HourFormat": [ - "+%02d:%02d", - "−%02d:%02d" - ] + "HourFormatNeg": "−%02d:%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/eu.json b/src/Symfony/Component/Intl/Resources/data/timezones/eu.json index 721d3d8590e57..fbe39458dbcdd 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/eu.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/eu.json @@ -99,7 +99,7 @@ "America\/Detroit": "Ipar Amerikako ekialdeko ordua (Detroit)", "America\/Dominica": "Ipar Amerikako Atlantikoko ordua (Dominika)", "America\/Edmonton": "Ipar Amerikako mendialdeko ordua (Edmonton)", - "America\/Eirunepe": "Brasil (Eirunepé)", + "America\/Eirunepe": "Brasil aldeko ordua (Eirunepé)", "America\/El_Salvador": "Ipar Amerikako erdialdeko ordua (El Salvador)", "America\/Fort_Nelson": "Ipar Amerikako mendialdeko ordua (Fort Nelson)", "America\/Fortaleza": "Brasiliako ordua (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Ipar Amerikako Atlantikoko ordua (Moncton)", "America\/Monterrey": "Ipar Amerikako erdialdeko ordua (Monterrey)", "America\/Montevideo": "Uruguaiko ordua (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Kanada aldeko ordua (Montreal)", "America\/Montserrat": "Ipar Amerikako Atlantikoko ordua (Montserrat)", "America\/Nassau": "Ipar Amerikako ekialdeko ordua (Nassau)", "America\/New_York": "Ipar Amerikako ekialdeko ordua (New York)", @@ -176,7 +176,7 @@ "America\/Recife": "Brasiliako ordua (Recife)", "America\/Regina": "Ipar Amerikako erdialdeko ordua (Regina)", "America\/Resolute": "Ipar Amerikako erdialdeko ordua (Resolute)", - "America\/Rio_Branco": "Brasil (Rio Branco)", + "America\/Rio_Branco": "Brasil aldeko ordua (Rio Branco)", "America\/Santa_Isabel": "Mexikoko ipar-ekialdeko ordua (Santa Isabel)", "America\/Santarem": "Brasiliako ordua (Santarém)", "America\/Santiago": "Txileko ordua (Santiago)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Arabiako ordua (Bahrain)", "Asia\/Baku": "Azerbaijango ordua (Baku)", "Asia\/Bangkok": "Indotxinako ordua (Bangkok)", - "Asia\/Barnaul": "Errusia (Barnaul)", + "Asia\/Barnaul": "Errusia aldeko ordua (Barnaul)", "Asia\/Beirut": "Europako ekialdeko ordua (Beirut)", "Asia\/Bishkek": "Kirgizistango ordua (Bixkek)", "Asia\/Brunei": "Brunei Darussalamgo ordua", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Irango ordua (Teheran)", "Asia\/Thimphu": "Bhutango ordua (Thimphu)", "Asia\/Tokyo": "Japoniako ordua (Tokio)", - "Asia\/Tomsk": "Errusia (Tomsk)", + "Asia\/Tomsk": "Errusia aldeko ordua (Tomsk)", "Asia\/Ulaanbaatar": "Ulan Batorreko ordua", - "Asia\/Urumqi": "Txina (Ürümqi)", + "Asia\/Urumqi": "Txina aldeko ordua (Ürümqi)", "Asia\/Ust-Nera": "Vladivostokeko ordua (Ust-Nera)", "Asia\/Vientiane": "Indotxinako ordua (Vientian)", "Asia\/Vladivostok": "Vladivostokeko ordua", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwichko meridianoaren ordua (Guernesey)", "Europe\/Helsinki": "Europako ekialdeko ordua (Helsinki)", "Europe\/Isle_of_Man": "Greenwichko meridianoaren ordua (Man uhartea)", - "Europe\/Istanbul": "Turkia (Istanbul)", + "Europe\/Istanbul": "Turkia aldeko ordua (Istanbul)", "Europe\/Jersey": "Greenwichko meridianoaren ordua (Jersey)", "Europe\/Kaliningrad": "Europako ekialdeko ordua (Kaliningrad)", "Europe\/Kiev": "Europako ekialdeko ordua (Kiev)", - "Europe\/Kirov": "Errusia (Kirov)", + "Europe\/Kirov": "Errusia aldeko ordua (Kirov)", "Europe\/Lisbon": "Europako mendebaldeko ordua (Lisboa)", "Europe\/Ljubljana": "Europako erdialdeko ordua (Ljubljana)", "Europe\/London": "Greenwichko meridianoaren ordua (Londres)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Wake uharteko ordua", "Pacific\/Wallis": "Wallis eta Futunako ordutegia" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/fa.json b/src/Symfony/Component/Intl/Resources/data/timezones/fa.json index 38dbba7053b48..7dd06fd54a86a 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/fa.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/fa.json @@ -99,7 +99,7 @@ "America\/Detroit": "وقت شرق امریکا (دیترویت)", "America\/Dominica": "وقت آتلانتیک (دومینیکا)", "America\/Edmonton": "وقت کوهستانی امریکا (ادمونتون)", - "America\/Eirunepe": "برزیل (ایرونپه)", + "America\/Eirunepe": "وقت برزیل (ایرونپه)", "America\/El_Salvador": "وقت مرکز امریکا (السالوادور)", "America\/Fort_Nelson": "وقت کوهستانی امریکا (فورت نلسون)", "America\/Fortaleza": "وقت برازیلیا (فورتالزا)", @@ -151,7 +151,7 @@ "America\/Moncton": "وقت آتلانتیک (مانکتون)", "America\/Monterrey": "وقت مرکز امریکا (مونتری)", "America\/Montevideo": "وقت اروگوئه (مونته‌ویدئو)", - "America\/Montreal": "کانادا (Montreal)", + "America\/Montreal": "وقت کانادا (Montreal)", "America\/Montserrat": "وقت آتلانتیک (مونتسرات)", "America\/Nassau": "وقت شرق امریکا (ناسائو)", "America\/New_York": "وقت شرق امریکا (نیویورک)", @@ -176,7 +176,7 @@ "America\/Recife": "وقت برازیلیا (ریسیفی)", "America\/Regina": "وقت مرکز امریکا (رجاینا)", "America\/Resolute": "وقت مرکز امریکا (رزولوت)", - "America\/Rio_Branco": "برزیل (ریوبرانکو)", + "America\/Rio_Branco": "وقت برزیل (ریوبرانکو)", "America\/Santa_Isabel": "وقت شمال غرب مکزیک (سانتا ایزابل)", "America\/Santarem": "وقت برازیلیا (سنتارم)", "America\/Santiago": "وقت شیلی (سانتیاگو)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "وقت عربستان (بحرین)", "Asia\/Baku": "وقت جمهوری آذربایجان (باکو)", "Asia\/Bangkok": "وقت هندوچین (بانکوک)", - "Asia\/Barnaul": "روسیه (بارنائول)", + "Asia\/Barnaul": "وقت روسیه (بارنائول)", "Asia\/Beirut": "وقت شرق اروپا (بیروت)", "Asia\/Bishkek": "وقت قرقیزستان (بیشکک)", "Asia\/Brunei": "وقت برونئی دارالسلام", @@ -288,9 +288,9 @@ "Asia\/Tehran": "وقت ایران (تهران)", "Asia\/Thimphu": "وقت بوتان (تیمفو)", "Asia\/Tokyo": "وقت ژاپن (توکیو)", - "Asia\/Tomsk": "روسیه (تومسک)", + "Asia\/Tomsk": "وقت روسیه (تومسک)", "Asia\/Ulaanbaatar": "وقت اولان‌باتور", - "Asia\/Urumqi": "چین (ارومچی)", + "Asia\/Urumqi": "وقت چین (ارومچی)", "Asia\/Ust-Nera": "وقت ولادی‌وستوک (اوست نرا)", "Asia\/Vientiane": "وقت هندوچین (وینتیان)", "Asia\/Vladivostok": "وقت ولادی‌وستوک", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "وقت گرینویچ (گرنزی)", "Europe\/Helsinki": "وقت شرق اروپا (هلسینکی)", "Europe\/Isle_of_Man": "وقت گرینویچ (جزیرهٔ من)", - "Europe\/Istanbul": "ترکیه (استانبول)", + "Europe\/Istanbul": "وقت ترکیه (استانبول)", "Europe\/Jersey": "وقت گرینویچ (جرزی)", "Europe\/Kaliningrad": "وقت شرق اروپا (کالینینگراد)", "Europe\/Kiev": "وقت شرق اروپا (کیف)", - "Europe\/Kirov": "روسیه (کیروف)", + "Europe\/Kirov": "وقت روسیه (کیروف)", "Europe\/Lisbon": "وقت غرب اروپا (لیسبون)", "Europe\/Ljubljana": "وقت مرکز اروپا (لیوبلیانا)", "Europe\/London": "وقت گرینویچ (لندن)", @@ -438,9 +438,7 @@ }, "Meta": { "GmtFormat": "%s گرینویچ", - "HourFormat": [ - "‎+%02d:%02d", - "‎−%02d:%02d" - ] + "HourFormatPos": "‎+%02d:%02d", + "HourFormatNeg": "‎−%02d:%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/fi.json b/src/Symfony/Component/Intl/Resources/data/timezones/fi.json index 84547044dbd94..56ccad7e9c294 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/fi.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/fi.json @@ -151,7 +151,7 @@ "America\/Moncton": "Kanadan Atlantin aika (Moncton)", "America\/Monterrey": "Yhdysvaltain keskinen aika (Monterrey)", "America\/Montevideo": "Uruguayn aika (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "aikavyöhyke: Kanada (Montreal)", "America\/Montserrat": "Kanadan Atlantin aika (Montserrat)", "America\/Nassau": "Yhdysvaltain itäinen aika (Nassau)", "America\/New_York": "Yhdysvaltain itäinen aika (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Saudi-Arabian aika (Bahrain)", "Asia\/Baku": "Azerbaidžanin aika (Baku)", "Asia\/Bangkok": "Indokiinan aika (Bangkok)", - "Asia\/Barnaul": "Venäjä (Barnaul)", + "Asia\/Barnaul": "aikavyöhyke: Venäjä (Barnaul)", "Asia\/Beirut": "Itä-Euroopan aika (Beirut)", "Asia\/Bishkek": "Kirgisian aika (Biškek)", "Asia\/Brunei": "Brunein aika", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Iranin aika (Teheran)", "Asia\/Thimphu": "Bhutanin aika (Thimphu)", "Asia\/Tokyo": "Japanin aika (Tokio)", - "Asia\/Tomsk": "Venäjä (Tomsk)", + "Asia\/Tomsk": "aikavyöhyke: Venäjä (Tomsk)", "Asia\/Ulaanbaatar": "Ulan Batorin aika", - "Asia\/Urumqi": "Kiina (Ürümqi)", + "Asia\/Urumqi": "aikavyöhyke: Kiina (Ürümqi)", "Asia\/Ust-Nera": "Vladivostokin aika (Ust-Nera)", "Asia\/Vientiane": "Indokiinan aika (Vientiane)", "Asia\/Vladivostok": "Vladivostokin aika", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwichin normaaliaika (Guernsey)", "Europe\/Helsinki": "Itä-Euroopan aika (Helsinki)", "Europe\/Isle_of_Man": "Greenwichin normaaliaika (Mansaari)", - "Europe\/Istanbul": "Turkki (Istanbul)", + "Europe\/Istanbul": "aikavyöhyke: Turkki (Istanbul)", "Europe\/Jersey": "Greenwichin normaaliaika (Jersey)", "Europe\/Kaliningrad": "Itä-Euroopan aika (Kaliningrad)", "Europe\/Kiev": "Itä-Euroopan aika (Kiova)", - "Europe\/Kirov": "Venäjä (Kirov)", + "Europe\/Kirov": "aikavyöhyke: Venäjä (Kirov)", "Europe\/Lisbon": "Länsi-Euroopan aika (Lissabon)", "Europe\/Ljubljana": "Keski-Euroopan aika (Ljubljana)", "Europe\/London": "Greenwichin normaaliaika (Lontoo)", @@ -438,9 +438,7 @@ }, "Meta": { "GmtFormat": "UTC%s", - "HourFormat": [ - "+%d.%02d", - "-%d.%02d" - ] + "HourFormatPos": "+%d.%02d", + "HourFormatNeg": "-%d.%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/fo.json b/src/Symfony/Component/Intl/Resources/data/timezones/fo.json index 08641fadfaf10..9e87b16c2f78f 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/fo.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/fo.json @@ -99,7 +99,7 @@ "America\/Detroit": "Eastern tíð (Detroit)", "America\/Dominica": "Atlantic tíð (Dominica)", "America\/Edmonton": "Mountain tíð (Edmonton)", - "America\/Eirunepe": "Brasil (Eirunepe)", + "America\/Eirunepe": "Brasil tíð (Eirunepe)", "America\/El_Salvador": "Central tíð (El Salvador)", "America\/Fort_Nelson": "Mountain tíð (Fort Nelson)", "America\/Fortaleza": "Brasilia tíð (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Atlantic tíð (Moncton)", "America\/Monterrey": "Central tíð (Monterrey)", "America\/Montevideo": "Uruguai tíð (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Kanada tíð (Montreal)", "America\/Montserrat": "Atlantic tíð (Montserrat)", "America\/Nassau": "Eastern tíð (Nassau)", "America\/New_York": "Eastern tíð (New York)", @@ -176,7 +176,7 @@ "America\/Recife": "Brasilia tíð (Recife)", "America\/Regina": "Central tíð (Regina)", "America\/Resolute": "Central tíð (Resolute)", - "America\/Rio_Branco": "Brasil (Rio Branco)", + "America\/Rio_Branco": "Brasil tíð (Rio Branco)", "America\/Santa_Isabel": "Northwest Mexico tíð (Santa Isabel)", "America\/Santarem": "Brasilia tíð (Santarem)", "America\/Santiago": "Kili tíð (Santiago)", @@ -217,7 +217,7 @@ "Asia\/Aden": "Arabisk tíð (Aden)", "Asia\/Almaty": "Eystur Kasakstan tíð (Almaty)", "Asia\/Amman": "Eysturevropa tíð (Amman)", - "Asia\/Anadyr": "Russland (Anadyr)", + "Asia\/Anadyr": "Russland tíð (Anadyr)", "Asia\/Aqtau": "Vestur Kasakstan tíð (Aqtau)", "Asia\/Aqtobe": "Vestur Kasakstan tíð (Aqtobe)", "Asia\/Ashgabat": "Turkmenistan tíð (Ashgabat)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Arabisk tíð (Barein)", "Asia\/Baku": "Aserbadjan tíð (Baku)", "Asia\/Bangkok": "Indokina tíð (Bangkok)", - "Asia\/Barnaul": "Russland (Barnaul)", + "Asia\/Barnaul": "Russland tíð (Barnaul)", "Asia\/Beirut": "Eysturevropa tíð (Beirut)", "Asia\/Bishkek": "Kirgisia tíð (Bishkek)", "Asia\/Brunei": "Brunei Darussalam tíð", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "Eystur Indonesia tíð (Jayapura)", "Asia\/Jerusalem": "Ísrael tíð (Jerusalem)", "Asia\/Kabul": "Afganistan tíð (Kabul)", - "Asia\/Kamchatka": "Russland (Kamchatka)", + "Asia\/Kamchatka": "Russland tíð (Kamchatka)", "Asia\/Karachi": "Pakistan tíð (Karachi)", "Asia\/Katmandu": "Nepal tíð (Kathmandu)", "Asia\/Khandyga": "Yakutsk tíð (Khandyga)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Iran tíð (Teheran)", "Asia\/Thimphu": "Butan tíð (Thimphu)", "Asia\/Tokyo": "Japan tíð (Tokyo)", - "Asia\/Tomsk": "Russland (Tomsk)", + "Asia\/Tomsk": "Russland tíð (Tomsk)", "Asia\/Ulaanbaatar": "Ulan Bator tíð (Ulaanbaatar)", - "Asia\/Urumqi": "Kina (Urumqi)", + "Asia\/Urumqi": "Kina tíð (Urumqi)", "Asia\/Ust-Nera": "Vladivostok tíð (Ust-Nera)", "Asia\/Vientiane": "Indokina tíð (Vientiane)", "Asia\/Vladivostok": "Vladivostok tíð", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwich Mean tíð (Guernsey)", "Europe\/Helsinki": "Eysturevropa tíð (Helsinki)", "Europe\/Isle_of_Man": "Greenwich Mean tíð (Isle of Man)", - "Europe\/Istanbul": "Turkaland (Istanbul)", + "Europe\/Istanbul": "Turkaland tíð (Istanbul)", "Europe\/Jersey": "Greenwich Mean tíð (Jersey)", "Europe\/Kaliningrad": "Eysturevropa tíð (Kaliningrad)", "Europe\/Kiev": "Eysturevropa tíð (Kiev)", - "Europe\/Kirov": "Russland (Kirov)", + "Europe\/Kirov": "Russland tíð (Kirov)", "Europe\/Lisbon": "Vesturevropa tíð (Lissabon)", "Europe\/Ljubljana": "Miðevropa tíð (Ljubljana)", "Europe\/London": "Greenwich Mean tíð (London)", @@ -362,7 +362,7 @@ "Europe\/Prague": "Miðevropa tíð (Prag)", "Europe\/Riga": "Eysturevropa tíð (Riga)", "Europe\/Rome": "Miðevropa tíð (Rom)", - "Europe\/Samara": "Russland (Samara)", + "Europe\/Samara": "Russland tíð (Samara)", "Europe\/San_Marino": "Miðevropa tíð (San Marino)", "Europe\/Sarajevo": "Miðevropa tíð (Sarajevo)", "Europe\/Saratov": "Moskva tíð (Saratov)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Wakeoyggj tíð", "Pacific\/Wallis": "Wallis- og Futunaoyggjar tíð" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/fr.json b/src/Symfony/Component/Intl/Resources/data/timezones/fr.json index 46e3d80e30c26..8e344c2353283 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/fr.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/fr.json @@ -151,7 +151,7 @@ "America\/Moncton": "heure de l’Atlantique (Moncton)", "America\/Monterrey": "heure du centre nord-américain (Monterrey)", "America\/Montevideo": "heure de l’Uruguay (Montevideo)", - "America\/Montreal": "Canada (Montreal)", + "America\/Montreal": "heure : Canada (Montreal)", "America\/Montserrat": "heure de l’Atlantique (Montserrat)", "America\/Nassau": "heure de l’Est nord-américain (Nassau)", "America\/New_York": "heure de l’Est nord-américain (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "heure de l’Arabie (Bahreïn)", "Asia\/Baku": "heure de l’Azerbaïdjan (Bakou)", "Asia\/Bangkok": "heure d’Indochine (Bangkok)", - "Asia\/Barnaul": "Russie (Barnaul)", + "Asia\/Barnaul": "heure : Russie (Barnaul)", "Asia\/Beirut": "heure d’Europe de l’Est (Beyrouth)", "Asia\/Bishkek": "heure du Kirghizistan (Bichkek)", "Asia\/Brunei": "heure du Brunéi (Brunei)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "heure de l’Iran (Téhéran)", "Asia\/Thimphu": "heure du Bhoutan (Thimphu)", "Asia\/Tokyo": "heure du Japon (Tokyo)", - "Asia\/Tomsk": "Russie (Tomsk)", + "Asia\/Tomsk": "heure : Russie (Tomsk)", "Asia\/Ulaanbaatar": "heure d’Oulan-Bator", - "Asia\/Urumqi": "Chine (Ürümqi)", + "Asia\/Urumqi": "heure : Chine (Ürümqi)", "Asia\/Ust-Nera": "heure de Vladivostok (Ust-Nera)", "Asia\/Vientiane": "heure d’Indochine (Vientiane)", "Asia\/Vladivostok": "heure de Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "heure moyenne de Greenwich (Guernesey)", "Europe\/Helsinki": "heure d’Europe de l’Est (Helsinki)", "Europe\/Isle_of_Man": "heure moyenne de Greenwich (Île de Man)", - "Europe\/Istanbul": "Turquie (Istanbul)", + "Europe\/Istanbul": "heure : Turquie (Istanbul)", "Europe\/Jersey": "heure moyenne de Greenwich (Jersey)", "Europe\/Kaliningrad": "heure d’Europe de l’Est (Kaliningrad)", "Europe\/Kiev": "heure d’Europe de l’Est (Kiev)", - "Europe\/Kirov": "Russie (Kirov)", + "Europe\/Kirov": "heure : Russie (Kirov)", "Europe\/Lisbon": "heure d’Europe de l’Ouest (Lisbonne)", "Europe\/Ljubljana": "heure d’Europe centrale (Ljubljana)", "Europe\/London": "heure moyenne de Greenwich (Londres)", @@ -438,9 +438,6 @@ }, "Meta": { "GmtFormat": "UTC%s", - "HourFormat": [ - "+%02d:%02d", - "−%02d:%02d" - ] + "HourFormatNeg": "−%02d:%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/fr_CA.json b/src/Symfony/Component/Intl/Resources/data/timezones/fr_CA.json index 108da3aa11d0b..67ecc7f5f7b05 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/fr_CA.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/fr_CA.json @@ -99,7 +99,6 @@ "Indian\/Mayotte": "heure d’Afrique orientale (Mayotte)", "Indian\/Reunion": "heure de la Réunion", "PST8PDT": "heure du Pacifique", - "Pacific\/Easter": "heure de l’île de Pâques", "Pacific\/Honolulu": "heure d’Hawaï-Aléoutiennes (Honolulu)", "Pacific\/Johnston": "heure d’Hawaï-Aléoutiennes (Johnston)" }, diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/fy.json b/src/Symfony/Component/Intl/Resources/data/timezones/fy.json index 62ba776307f63..4e20a72994b82 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/fy.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/fy.json @@ -85,7 +85,7 @@ "America\/Cayenne": "Frâns-Guyaanske tiid (Cayenne)", "America\/Cayman": "Eastern-tiid (Cayman)", "America\/Chicago": "Central-tiid (Chicago)", - "America\/Chihuahua": "Mexico (Chihuahua)", + "America\/Chihuahua": "Mexico-tiid (Chihuahua)", "America\/Coral_Harbour": "Eastern-tiid (Atikokan)", "America\/Cordoba": "Argentynske tiid (Córdoba)", "America\/Costa_Rica": "Central-tiid (Costa Rica)", @@ -114,7 +114,7 @@ "America\/Guyana": "Guyaanske tiid (Guyana)", "America\/Halifax": "Atlantic-tiid (Halifax)", "America\/Havana": "Kubaanske tiid (Havana)", - "America\/Hermosillo": "Mexico (Hermosillo)", + "America\/Hermosillo": "Mexico-tiid (Hermosillo)", "America\/Indiana\/Knox": "Central-tiid (Knox, Indiana)", "America\/Indiana\/Marengo": "Eastern-tiid (Marengo, Indiana)", "America\/Indiana\/Petersburg": "Eastern-tiid (Petersburg, Indiana)", @@ -141,7 +141,7 @@ "America\/Marigot": "Atlantic-tiid (Marigot)", "America\/Martinique": "Atlantic-tiid (Martinique)", "America\/Matamoros": "Central-tiid (Matamoros)", - "America\/Mazatlan": "Mexico (Mazatlán)", + "America\/Mazatlan": "Mexico-tiid (Mazatlán)", "America\/Mendoza": "Argentynske tiid (Mendoza)", "America\/Menominee": "Central-tiid (Menominee)", "America\/Merida": "Central-tiid (Mérida)", @@ -151,7 +151,7 @@ "America\/Moncton": "Atlantic-tiid (Moncton)", "America\/Monterrey": "Central-tiid (Monterrey)", "America\/Montevideo": "Uruguayaanske tiid (Montevideo)", - "America\/Montreal": "Canada (Montreal)", + "America\/Montreal": "Canada-tiid (Montreal)", "America\/Montserrat": "Atlantic-tiid (Montserrat)", "America\/Nassau": "Eastern-tiid (Nassau)", "America\/New_York": "Eastern-tiid (New York)", @@ -177,7 +177,7 @@ "America\/Regina": "Central-tiid (Regina)", "America\/Resolute": "Central-tiid (Resolute)", "America\/Rio_Branco": "Acre-tiid (Rio Branco)", - "America\/Santa_Isabel": "Mexico (Santa Isabel)", + "America\/Santa_Isabel": "Mexico-tiid (Santa Isabel)", "America\/Santarem": "Brazyljaanske tiid (Santarem)", "America\/Santiago": "Sileenske tiid (Santiago)", "America\/Santo_Domingo": "Atlantic-tiid (Santo Domingo)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Arabyske tiid (Bahrein)", "Asia\/Baku": "Azerbeidzjaanske tiid (Bakoe)", "Asia\/Bangkok": "Yndochinese tiid (Bangkok)", - "Asia\/Barnaul": "Ruslân (Barnaul)", + "Asia\/Barnaul": "Ruslân-tiid (Barnaul)", "Asia\/Beirut": "East-Europeeske tiid (Beiroet)", "Asia\/Bishkek": "Kirgizyske tiid (Bisjkek)", "Asia\/Brunei": "Bruneise tiid", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Iraanske tiid (Teheran)", "Asia\/Thimphu": "Bhutaanske tiid (Thimphu)", "Asia\/Tokyo": "Japanske tiid (Tokio)", - "Asia\/Tomsk": "Ruslân (Tomsk)", + "Asia\/Tomsk": "Ruslân-tiid (Tomsk)", "Asia\/Ulaanbaatar": "Ulaanbaatar tiid", - "Asia\/Urumqi": "Sina (Urumqi)", + "Asia\/Urumqi": "Sina-tiid (Urumqi)", "Asia\/Ust-Nera": "Vladivostok-tiid (Ust-Nera)", "Asia\/Vientiane": "Yndochinese tiid (Vientiane)", "Asia\/Vladivostok": "Vladivostok-tiid", @@ -322,7 +322,6 @@ "CST6CDT": "Central-tiid", "EST5EDT": "Eastern-tiid", "Etc\/GMT": "Greenwich Mean Time", - "Etc\/UTC": "UTC", "Europe\/Amsterdam": "Midden-Europeeske tiid (Amsterdam)", "Europe\/Andorra": "Midden-Europeeske tiid (Andorra)", "Europe\/Astrakhan": "Moskou-tiid (Astrakhan)", @@ -341,11 +340,11 @@ "Europe\/Guernsey": "Greenwich Mean Time (Guernsey)", "Europe\/Helsinki": "East-Europeeske tiid (Helsinki)", "Europe\/Isle_of_Man": "Greenwich Mean Time (Isle of Man)", - "Europe\/Istanbul": "Turkije (Istanboel)", + "Europe\/Istanbul": "Turkije-tiid (Istanboel)", "Europe\/Jersey": "Greenwich Mean Time (Jersey)", "Europe\/Kaliningrad": "East-Europeeske tiid (Kaliningrad)", "Europe\/Kiev": "East-Europeeske tiid (Kiev)", - "Europe\/Kirov": "Ruslân (Kirov)", + "Europe\/Kirov": "Ruslân-tiid (Kirov)", "Europe\/Lisbon": "West-Europeeske tiid (Lissabon)", "Europe\/Ljubljana": "Midden-Europeeske tiid (Ljubljana)", "Europe\/London": "Greenwich Mean Time (Londen)", @@ -396,7 +395,7 @@ "Indian\/Reunion": "Réunionse tiid", "MST7MDT": "Mountain-tiid", "PST8PDT": "Pasifik-tiid", - "Pacific\/Apia": "Samoa (Apia)", + "Pacific\/Apia": "Samoa-tiid (Apia)", "Pacific\/Auckland": "Nij-Seelânske tiid (Auckland)", "Pacific\/Bougainville": "Papoea-Nij-Guineeske tiid (Bougainville)", "Pacific\/Chatham": "Chatham tiid", @@ -436,11 +435,5 @@ "Pacific\/Wake": "Wake-eilânske tiid", "Pacific\/Wallis": "Wallis en Futunase tiid" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ga.json b/src/Symfony/Component/Intl/Resources/data/timezones/ga.json index 549ece6b05e5a..b59f581fd45a0 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ga.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ga.json @@ -437,10 +437,6 @@ "Pacific\/Wallis": "Am Vailís agus Futúna" }, "Meta": { - "GmtFormat": "MAG%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] + "GmtFormat": "MAG%s" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/gd.json b/src/Symfony/Component/Intl/Resources/data/timezones/gd.json index 6d0bc8bccc24d..667e77d7a5e60 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/gd.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/gd.json @@ -436,11 +436,5 @@ "Pacific\/Wake": "Àm Eilean Wake", "Pacific\/Wallis": "Àm Uallas agus Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/gl.json b/src/Symfony/Component/Intl/Resources/data/timezones/gl.json index 9f03b57a7f249..714110ed905e2 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/gl.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/gl.json @@ -99,7 +99,7 @@ "America\/Detroit": "Horario do leste, Norteamérica (Detroit)", "America\/Dominica": "Horario do Atlántico (Dominica)", "America\/Edmonton": "Horario da montaña, Norteamérica (Edmonton)", - "America\/Eirunepe": "O Brasil (Eirunepé)", + "America\/Eirunepe": "Horario de: O Brasil (Eirunepé)", "America\/El_Salvador": "Horario central, Norteamérica (O Salvador)", "America\/Fort_Nelson": "Horario da montaña, Norteamérica (Fort Nelson)", "America\/Fortaleza": "Horario de Brasilia (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Horario do Atlántico (Moncton)", "America\/Monterrey": "Horario central, Norteamérica (Monterrey)", "America\/Montevideo": "Horario do Uruguai (Montevideo)", - "America\/Montreal": "O Canadá (Montreal)", + "America\/Montreal": "Horario de: O Canadá (Montreal)", "America\/Montserrat": "Horario do Atlántico (Montserrat)", "America\/Nassau": "Horario do leste, Norteamérica (Nassau)", "America\/New_York": "Horario do leste, Norteamérica (Nova York)", @@ -176,7 +176,7 @@ "America\/Recife": "Horario de Brasilia (Recife)", "America\/Regina": "Horario central, Norteamérica (Regina)", "America\/Resolute": "Horario central, Norteamérica (Resolute)", - "America\/Rio_Branco": "O Brasil (Río Branco)", + "America\/Rio_Branco": "Horario de: O Brasil (Río Branco)", "America\/Santa_Isabel": "Horario do noroeste de México (Santa Isabel)", "America\/Santarem": "Horario de Brasilia (Santarém)", "America\/Santiago": "Horario de Chile (Santiago)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Horario árabe (Bahrain)", "Asia\/Baku": "Horario de Acerbaixán (Bacú)", "Asia\/Bangkok": "Horario de Indochina (Bangkok)", - "Asia\/Barnaul": "Rusia (Barnaul)", + "Asia\/Barnaul": "Horario de: Rusia (Barnaul)", "Asia\/Beirut": "Horario de Europa Oriental (Beirut)", "Asia\/Bishkek": "Horario de Kirguizistán (Bishkek)", "Asia\/Brunei": "Horario de Brunei Darussalam", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Horario de Irán (Teherán)", "Asia\/Thimphu": "Horario de Bután (Thimbu)", "Asia\/Tokyo": "Horario do Xapón (Tokyo)", - "Asia\/Tomsk": "Rusia (Tomsk)", + "Asia\/Tomsk": "Horario de: Rusia (Tomsk)", "Asia\/Ulaanbaatar": "Horario de Ulaanbaatar", - "Asia\/Urumqi": "A China (Urumqi)", + "Asia\/Urumqi": "Horario de: A China (Urumqi)", "Asia\/Ust-Nera": "Horario de Vladivostok (Ust-Nera)", "Asia\/Vientiane": "Horario de Indochina (Vientiane)", "Asia\/Vladivostok": "Horario de Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Horario do meridiano de Greenwich (Guernsey)", "Europe\/Helsinki": "Horario de Europa Oriental (Helsinqui)", "Europe\/Isle_of_Man": "Horario do meridiano de Greenwich (Illa de Man)", - "Europe\/Istanbul": "Turquía (Istanbul)", + "Europe\/Istanbul": "Horario de: Turquía (Istanbul)", "Europe\/Jersey": "Horario do meridiano de Greenwich (Jersey)", "Europe\/Kaliningrad": "Horario de Europa Oriental (Kaliningrado)", "Europe\/Kiev": "Horario de Europa Oriental (Kiev)", - "Europe\/Kirov": "Rusia (Kirov)", + "Europe\/Kirov": "Horario de: Rusia (Kirov)", "Europe\/Lisbon": "Horario de Europa Occidental (Lisboa)", "Europe\/Ljubljana": "Horario de Europa Central (Liubliana)", "Europe\/London": "Horario do meridiano de Greenwich (Londres)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Horario da Illa Wake", "Pacific\/Wallis": "Horario de Wallis e Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/gu.json b/src/Symfony/Component/Intl/Resources/data/timezones/gu.json index a8e7f520b4e6b..ea3e4fa3016d4 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/gu.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/gu.json @@ -151,7 +151,7 @@ "America\/Moncton": "એટલાન્ટિક સમય (મોન્કટન)", "America\/Monterrey": "ઉત્તર અમેરિકન કેન્દ્રીય સમય (મોન્તોરે)", "America\/Montevideo": "ઉરુગ્વે સમય (મૉંટેવિડિઓ)", - "America\/Montreal": "કેનેડા (Montreal)", + "America\/Montreal": "કેનેડા સમય (Montreal)", "America\/Montserrat": "એટલાન્ટિક સમય (મોંટસેરાત)", "America\/Nassau": "ઉત્તર અમેરિકન પૂર્વી સમય (નાસાઉ)", "America\/New_York": "ઉત્તર અમેરિકન પૂર્વી સમય (ન્યૂયોર્ક)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "અરેબિયન સમય (બેહરીન)", "Asia\/Baku": "અઝરબૈજાન સમય (બાકુ)", "Asia\/Bangkok": "ઇન્ડોચાઇના સમય (બેંગકોક)", - "Asia\/Barnaul": "રશિયા (બારનૌલ)", + "Asia\/Barnaul": "રશિયા સમય (બારનૌલ)", "Asia\/Beirut": "પૂર્વી યુરોપિયન સમય (બૈરુત)", "Asia\/Bishkek": "કિર્ગિઝતાન સમય (બિશકેક)", "Asia\/Brunei": "બ્રૂનેઈ દારુસલામ સમય (બ્રુનેઇ)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ઈરાન સમય (તેહરાન)", "Asia\/Thimphu": "ભૂટાન સમય (થીમ્ફુ)", "Asia\/Tokyo": "જાપાન સમય (ટોક્યો)", - "Asia\/Tomsk": "રશિયા (તોમસ્ક)", + "Asia\/Tomsk": "રશિયા સમય (તોમસ્ક)", "Asia\/Ulaanbaatar": "ઉલાન બાટોર સમય (ઉલાંબાતર)", - "Asia\/Urumqi": "ચીન (ઉરુમ્કી)", + "Asia\/Urumqi": "ચીન સમય (ઉરુમ્કી)", "Asia\/Ust-Nera": "વ્લાડિવોસ્ટોક સમય (ઉસ્ત-નેરા)", "Asia\/Vientiane": "ઇન્ડોચાઇના સમય (વિયેનટિયેન)", "Asia\/Vladivostok": "વ્લાડિવોસ્ટોક સમય (વ્લેડિવોસ્ટોક)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "ગ્રીનવિચ મધ્યમ સમય (ગર્નઝી)", "Europe\/Helsinki": "પૂર્વી યુરોપિયન સમય (હેલસિંકી)", "Europe\/Isle_of_Man": "ગ્રીનવિચ મધ્યમ સમય (આઇલ ઑફ મેન)", - "Europe\/Istanbul": "તુર્કી (ઇસ્તાંબુલ)", + "Europe\/Istanbul": "તુર્કી સમય (ઇસ્તાંબુલ)", "Europe\/Jersey": "ગ્રીનવિચ મધ્યમ સમય (જર્સી)", "Europe\/Kaliningrad": "પૂર્વી યુરોપિયન સમય (કલિનિન્ગ્રેડ)", "Europe\/Kiev": "પૂર્વી યુરોપિયન સમય (કૈવ)", - "Europe\/Kirov": "રશિયા (કીરોવ)", + "Europe\/Kirov": "રશિયા સમય (કીરોવ)", "Europe\/Lisbon": "પશ્ચિમી યુરોપિયન સમય (લિસ્બન)", "Europe\/Ljubljana": "મધ્ય યુરોપિયન સમય (લુબ્લિયાના)", "Europe\/London": "ગ્રીનવિચ મધ્યમ સમય (લંડન)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "વૅક આઇલેન્ડ સમય (વેક)", "Pacific\/Wallis": "વૉલિસ અને ફ્યુચુના સમય (વાલિસ)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ha.json b/src/Symfony/Component/Intl/Resources/data/timezones/ha.json index 7ed2cfaf5dd64..a81d51884ab16 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ha.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ha.json @@ -3,93 +3,93 @@ "Names": { "Africa\/Abidjan": "Lokacin Greenwhich a London (Abidjan)", "Africa\/Accra": "Lokacin Greenwhich a London (Accra)", - "Africa\/Addis_Ababa": "Habasha (Addis Ababa)", + "Africa\/Addis_Ababa": "Habasha Lokaci (Addis Ababa)", "Africa\/Algiers": "Tsakiyar a lokaci turai (Algiers)", - "Africa\/Asmera": "Eritireya (Asmara)", + "Africa\/Asmera": "Eritireya Lokaci (Asmara)", "Africa\/Bamako": "Lokacin Greenwhich a London (Bamako)", - "Africa\/Bangui": "Jamhuriyar Afirka Ta Tsakiya (Bangui)", + "Africa\/Bangui": "Jamhuriyar Afirka Ta Tsakiya Lokaci (Bangui)", "Africa\/Banjul": "Lokacin Greenwhich a London (Banjul)", "Africa\/Bissau": "Lokacin Greenwhich a London (Bissau)", - "Africa\/Blantyre": "Malawi (Blantyre)", - "Africa\/Brazzaville": "Kongo (Brazzaville)", - "Africa\/Bujumbura": "Burundi (Bujumbura)", + "Africa\/Blantyre": "Malawi Lokaci (Blantyre)", + "Africa\/Brazzaville": "Kongo Lokaci (Brazzaville)", + "Africa\/Bujumbura": "Burundi Lokaci (Bujumbura)", "Africa\/Cairo": "Lokaci a turai gabas (Cairo)", "Africa\/Casablanca": "Lokaci ta yammacin turai (Casablanca)", "Africa\/Ceuta": "Tsakiyar a lokaci turai (Ceuta)", "Africa\/Conakry": "Lokacin Greenwhich a London (Conakry)", "Africa\/Dakar": "Lokacin Greenwhich a London (Dakar)", - "Africa\/Dar_es_Salaam": "Tanzaniya (Dar es Salaam)", - "Africa\/Djibouti": "Jibuti (Djibouti)", - "Africa\/Douala": "Kamaru (Douala)", + "Africa\/Dar_es_Salaam": "Tanzaniya Lokaci (Dar es Salaam)", + "Africa\/Djibouti": "Jibuti Lokaci (Djibouti)", + "Africa\/Douala": "Kamaru Lokaci (Douala)", "Africa\/El_Aaiun": "Lokaci ta yammacin turai (El Aaiun)", "Africa\/Freetown": "Lokacin Greenwhich a London (Freetown)", - "Africa\/Gaborone": "Baswana (Gaborone)", - "Africa\/Harare": "Zimbabuwe (Harare)", - "Africa\/Johannesburg": "Afirka Ta Kudu (Johannesburg)", - "Africa\/Kampala": "Yuganda (Kampala)", - "Africa\/Khartoum": "Sudan (Khartoum)", - "Africa\/Kigali": "Ruwanda (Kigali)", - "Africa\/Kinshasa": "Jamhuriyar Dimokuraɗiyyar Kongo (Kinshasa)", - "Africa\/Lagos": "Najeriya (Lagos)", - "Africa\/Libreville": "Gabon (Libreville)", + "Africa\/Gaborone": "Baswana Lokaci (Gaborone)", + "Africa\/Harare": "Zimbabuwe Lokaci (Harare)", + "Africa\/Johannesburg": "Afirka Ta Kudu Lokaci (Johannesburg)", + "Africa\/Kampala": "Yuganda Lokaci (Kampala)", + "Africa\/Khartoum": "Sudan Lokaci (Khartoum)", + "Africa\/Kigali": "Ruwanda Lokaci (Kigali)", + "Africa\/Kinshasa": "Jamhuriyar Dimokuraɗiyyar Kongo Lokaci (Kinshasa)", + "Africa\/Lagos": "Najeriya Lokaci (Lagos)", + "Africa\/Libreville": "Gabon Lokaci (Libreville)", "Africa\/Lome": "Lokacin Greenwhich a London (Lome)", - "Africa\/Luanda": "Angola (Luanda)", - "Africa\/Lubumbashi": "Jamhuriyar Dimokuraɗiyyar Kongo (Lubumbashi)", - "Africa\/Lusaka": "Zambiya (Lusaka)", - "Africa\/Malabo": "Gini Ta Ikwaita (Malabo)", - "Africa\/Maputo": "Mozambik (Maputo)", - "Africa\/Maseru": "Lesoto (Maseru)", - "Africa\/Mbabane": "Suwazilan (Mbabane)", - "Africa\/Mogadishu": "Somaliya (Mogadishu)", + "Africa\/Luanda": "Angola Lokaci (Luanda)", + "Africa\/Lubumbashi": "Jamhuriyar Dimokuraɗiyyar Kongo Lokaci (Lubumbashi)", + "Africa\/Lusaka": "Zambiya Lokaci (Lusaka)", + "Africa\/Malabo": "Gini Ta Ikwaita Lokaci (Malabo)", + "Africa\/Maputo": "Mozambik Lokaci (Maputo)", + "Africa\/Maseru": "Lesoto Lokaci (Maseru)", + "Africa\/Mbabane": "Suwazilan Lokaci (Mbabane)", + "Africa\/Mogadishu": "Somaliya Lokaci (Mogadishu)", "Africa\/Monrovia": "Lokacin Greenwhich a London (Monrovia)", - "Africa\/Nairobi": "Kenya (Nairobi)", - "Africa\/Ndjamena": "Cadi (Ndjamena)", - "Africa\/Niamey": "Nijar (Niamey)", + "Africa\/Nairobi": "Kenya Lokaci (Nairobi)", + "Africa\/Ndjamena": "Cadi Lokaci (Ndjamena)", + "Africa\/Niamey": "Nijar Lokaci (Niamey)", "Africa\/Nouakchott": "Lokacin Greenwhich a London (Nouakchott)", "Africa\/Ouagadougou": "Lokacin Greenwhich a London (Ouagadougou)", - "Africa\/Porto-Novo": "Binin (Porto-Novo)", + "Africa\/Porto-Novo": "Binin Lokaci (Porto-Novo)", "Africa\/Sao_Tome": "Lokacin Greenwhich a London (Sao Tome)", "Africa\/Tripoli": "Lokaci a turai gabas (Tripoli)", "Africa\/Tunis": "Tsakiyar a lokaci turai (Tunis)", - "Africa\/Windhoek": "Namibiya (Windhoek)", + "Africa\/Windhoek": "Namibiya Lokaci (Windhoek)", "America\/Adak": "Lokaci ta Hawaii-Aleutian (Adak)", "America\/Anchorage": "Lokaci ta Alaska (Anchorage)", "America\/Anguilla": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Anguilla)", "America\/Antigua": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Antigua)", - "America\/Araguaina": "Birazil (Araguaina)", - "America\/Argentina\/La_Rioja": "Arjantiniya (La Rioja)", - "America\/Argentina\/Rio_Gallegos": "Arjantiniya (Rio Gallegos)", - "America\/Argentina\/Salta": "Arjantiniya (Salta)", - "America\/Argentina\/San_Juan": "Arjantiniya (San Juan)", - "America\/Argentina\/San_Luis": "Arjantiniya (San Luis)", - "America\/Argentina\/Tucuman": "Arjantiniya (Tucuman)", - "America\/Argentina\/Ushuaia": "Arjantiniya (Ushuaia)", + "America\/Araguaina": "Birazil Lokaci (Araguaina)", + "America\/Argentina\/La_Rioja": "Arjantiniya Lokaci (La Rioja)", + "America\/Argentina\/Rio_Gallegos": "Arjantiniya Lokaci (Rio Gallegos)", + "America\/Argentina\/Salta": "Arjantiniya Lokaci (Salta)", + "America\/Argentina\/San_Juan": "Arjantiniya Lokaci (San Juan)", + "America\/Argentina\/San_Luis": "Arjantiniya Lokaci (San Luis)", + "America\/Argentina\/Tucuman": "Arjantiniya Lokaci (Tucuman)", + "America\/Argentina\/Ushuaia": "Arjantiniya Lokaci (Ushuaia)", "America\/Aruba": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Aruba)", - "America\/Asuncion": "Paragai (Asuncion)", - "America\/Bahia": "Birazil (Bahia)", + "America\/Asuncion": "Paragai Lokaci (Asuncion)", + "America\/Bahia": "Birazil Lokaci (Bahia)", "America\/Bahia_Banderas": "Lokaci dake Amurika arewa ta tsakiyar (Bahia Banderas)", "America\/Barbados": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Barbados)", - "America\/Belem": "Birazil (Belem)", + "America\/Belem": "Birazil Lokaci (Belem)", "America\/Belize": "Lokaci dake Amurika arewa ta tsakiyar (Belize)", "America\/Blanc-Sablon": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Blanc-Sablon)", - "America\/Boa_Vista": "Birazil (Boa Vista)", - "America\/Bogota": "Kolambiya (Bogota)", + "America\/Boa_Vista": "Birazil Lokaci (Boa Vista)", + "America\/Bogota": "Kolambiya Lokaci (Bogota)", "America\/Boise": "Lokaci tsauni a arewacin da Amirka (Boise)", - "America\/Buenos_Aires": "Arjantiniya (Buenos Aires)", + "America\/Buenos_Aires": "Arjantiniya Lokaci (Buenos Aires)", "America\/Cambridge_Bay": "Lokaci tsauni a arewacin da Amirka (Cambridge Bay)", - "America\/Campo_Grande": "Birazil (Campo Grande)", + "America\/Campo_Grande": "Birazil Lokaci (Campo Grande)", "America\/Cancun": "Lokaci gabas a arewacin da Amirka (Cancun)", - "America\/Caracas": "Benezuwela (Caracas)", - "America\/Catamarca": "Arjantiniya (Catamarca)", - "America\/Cayenne": "Gini Ta Faransa (Cayenne)", + "America\/Caracas": "Benezuwela Lokaci (Caracas)", + "America\/Catamarca": "Arjantiniya Lokaci (Catamarca)", + "America\/Cayenne": "Gini Ta Faransa Lokaci (Cayenne)", "America\/Cayman": "Lokaci gabas a arewacin da Amirka (Cayman)", "America\/Chicago": "Lokaci dake Amurika arewa ta tsakiyar (Chicago)", "America\/Chihuahua": "Lokaci a lafiya ta Mesiko (Chihuahua)", "America\/Coral_Harbour": "Lokaci gabas a arewacin da Amirka (Atikokan)", - "America\/Cordoba": "Arjantiniya (Cordoba)", + "America\/Cordoba": "Arjantiniya Lokaci (Cordoba)", "America\/Costa_Rica": "Lokaci dake Amurika arewa ta tsakiyar (Costa Rica)", "America\/Creston": "Lokaci tsauni a arewacin da Amirka (Creston)", - "America\/Cuiaba": "Birazil (Cuiaba)", + "America\/Cuiaba": "Birazil Lokaci (Cuiaba)", "America\/Curacao": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Curacao)", "America\/Danmarkshavn": "Lokacin Greenwhich a London (Danmarkshavn)", "America\/Dawson": "Amurika da arewa a lokaci lafiya (Dawson)", @@ -98,10 +98,10 @@ "America\/Detroit": "Lokaci gabas a arewacin da Amirka (Detroit)", "America\/Dominica": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Dominica)", "America\/Edmonton": "Lokaci tsauni a arewacin da Amirka (Edmonton)", - "America\/Eirunepe": "Birazil (Eirunepe)", + "America\/Eirunepe": "Birazil Lokaci (Eirunepe)", "America\/El_Salvador": "Lokaci dake Amurika arewa ta tsakiyar (El Salvador)", "America\/Fort_Nelson": "Lokaci tsauni a arewacin da Amirka (Fort Nelson)", - "America\/Fortaleza": "Birazil (Fortaleza)", + "America\/Fortaleza": "Birazil Lokaci (Fortaleza)", "America\/Glace_Bay": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Glace Bay)", "America\/Godthab": "Lokaci a yammacin ta Greeland (Nuuk)", "America\/Goose_Bay": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Goose Bay)", @@ -109,8 +109,8 @@ "America\/Grenada": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Grenada)", "America\/Guadeloupe": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Guadeloupe)", "America\/Guatemala": "Lokaci dake Amurika arewa ta tsakiyar (Guatemala)", - "America\/Guayaquil": "Ekwador (Guayaquil)", - "America\/Guyana": "Guyana (Guyana)", + "America\/Guayaquil": "Ekwador Lokaci (Guayaquil)", + "America\/Guyana": "Guyana Lokaci (Guyana)", "America\/Halifax": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Halifax)", "America\/Havana": "Lokaci ta Kuba (Havana)", "America\/Hermosillo": "Lokaci a lafiya ta Mesiko (Hermosillo)", @@ -125,23 +125,23 @@ "America\/Inuvik": "Lokaci tsauni a arewacin da Amirka (Inuvik)", "America\/Iqaluit": "Lokaci gabas a arewacin da Amirka (Iqaluit)", "America\/Jamaica": "Lokaci gabas a arewacin da Amirka (Jamaica)", - "America\/Jujuy": "Arjantiniya (Jujuy)", + "America\/Jujuy": "Arjantiniya Lokaci (Jujuy)", "America\/Juneau": "Lokaci ta Alaska (Juneau)", "America\/Kentucky\/Monticello": "Lokaci gabas a arewacin da Amirka (Monticello, Kentucky)", "America\/Kralendijk": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Kralendijk)", - "America\/La_Paz": "Bolibiya (La Paz)", - "America\/Lima": "Peru (Lima)", + "America\/La_Paz": "Bolibiya Lokaci (La Paz)", + "America\/Lima": "Peru Lokaci (Lima)", "America\/Los_Angeles": "Amurika da arewa a lokaci lafiya (Los Angeles)", "America\/Louisville": "Lokaci gabas a arewacin da Amirka (Louisville)", "America\/Lower_Princes": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Lower Prince’s Quarter)", - "America\/Maceio": "Birazil (Maceio)", + "America\/Maceio": "Birazil Lokaci (Maceio)", "America\/Managua": "Lokaci dake Amurika arewa ta tsakiyar (Managua)", - "America\/Manaus": "Birazil (Manaus)", + "America\/Manaus": "Birazil Lokaci (Manaus)", "America\/Marigot": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Marigot)", "America\/Martinique": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Martinique)", "America\/Matamoros": "Lokaci dake Amurika arewa ta tsakiyar (Matamoros)", "America\/Mazatlan": "Lokaci a lafiya ta Mesiko (Mazatlan)", - "America\/Mendoza": "Arjantiniya (Mendoza)", + "America\/Mendoza": "Arjantiniya Lokaci (Mendoza)", "America\/Menominee": "Lokaci dake Amurika arewa ta tsakiyar (Menominee)", "America\/Merida": "Lokaci dake Amurika arewa ta tsakiyar (Merida)", "America\/Metlakatla": "Lokaci ta Alaska (Metlakatla)", @@ -149,38 +149,38 @@ "America\/Miquelon": "Lokaci ta St. Pierre da Miquelon", "America\/Moncton": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Moncton)", "America\/Monterrey": "Lokaci dake Amurika arewa ta tsakiyar (Monterrey)", - "America\/Montevideo": "Yurugai (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montevideo": "Yurugai Lokaci (Montevideo)", + "America\/Montreal": "Kanada Lokaci (Montreal)", "America\/Montserrat": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Montserrat)", "America\/Nassau": "Lokaci gabas a arewacin da Amirka (Nassau)", "America\/New_York": "Lokaci gabas a arewacin da Amirka (New York)", "America\/Nipigon": "Lokaci gabas a arewacin da Amirka (Nipigon)", "America\/Nome": "Lokaci ta Alaska (Nome)", - "America\/Noronha": "Birazil (Noronha)", + "America\/Noronha": "Birazil Lokaci (Noronha)", "America\/North_Dakota\/Beulah": "Lokaci dake Amurika arewa ta tsakiyar (Beulah, North Dakota)", "America\/North_Dakota\/Center": "Lokaci dake Amurika arewa ta tsakiyar (Center, North Dakota)", "America\/North_Dakota\/New_Salem": "Lokaci dake Amurika arewa ta tsakiyar (New Salem, North Dakota)", "America\/Ojinaga": "Lokaci tsauni a arewacin da Amirka (Ojinaga)", "America\/Panama": "Lokaci gabas a arewacin da Amirka (Panama)", "America\/Pangnirtung": "Lokaci gabas a arewacin da Amirka (Pangnirtung)", - "America\/Paramaribo": "Suriname (Paramaribo)", + "America\/Paramaribo": "Suriname Lokaci (Paramaribo)", "America\/Phoenix": "Lokaci tsauni a arewacin da Amirka (Phoenix)", "America\/Port-au-Prince": "Lokaci gabas a arewacin da Amirka (Port-au-Prince)", "America\/Port_of_Spain": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Port of Spain)", - "America\/Porto_Velho": "Birazil (Porto Velho)", + "America\/Porto_Velho": "Birazil Lokaci (Porto Velho)", "America\/Puerto_Rico": "Lokaci da Kanada, Puerto Rico da Virgin Islands", - "America\/Punta_Arenas": "Cayile (Punta Arenas)", + "America\/Punta_Arenas": "Cayile Lokaci (Punta Arenas)", "America\/Rainy_River": "Lokaci dake Amurika arewa ta tsakiyar (Rainy River)", "America\/Rankin_Inlet": "Lokaci dake Amurika arewa ta tsakiyar (Rankin Inlet)", - "America\/Recife": "Birazil (Recife)", + "America\/Recife": "Birazil Lokaci (Recife)", "America\/Regina": "Lokaci dake Amurika arewa ta tsakiyar (Regina)", "America\/Resolute": "Lokaci dake Amurika arewa ta tsakiyar (Resolute)", - "America\/Rio_Branco": "Birazil (Rio Branco)", + "America\/Rio_Branco": "Birazil Lokaci (Rio Branco)", "America\/Santa_Isabel": "Lokaci a arewa da yammacin ta Mesiko (Santa Isabel)", - "America\/Santarem": "Birazil (Santarem)", - "America\/Santiago": "Cayile (Santiago)", + "America\/Santarem": "Birazil Lokaci (Santarem)", + "America\/Santiago": "Cayile Lokaci (Santiago)", "America\/Santo_Domingo": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Santo Domingo)", - "America\/Sao_Paulo": "Birazil (Sao Paulo)", + "America\/Sao_Paulo": "Birazil Lokaci (Sao Paulo)", "America\/Scoresbysund": "Lokaci a gabas ta Greeland (Ittoqqortoormiit)", "America\/Sitka": "Lokaci ta Alaska (Sitka)", "America\/St_Barthelemy": "Lokaci da Kanada, Puerto Rico da Virgin Islands (St. Barthelemy)", @@ -201,118 +201,118 @@ "America\/Winnipeg": "Lokaci dake Amurika arewa ta tsakiyar (Winnipeg)", "America\/Yakutat": "Lokaci ta Alaska (Yakutat)", "America\/Yellowknife": "Lokaci tsauni a arewacin da Amirka (Yellowknife)", - "Antarctica\/Macquarie": "Ostareliya (Macquarie)", + "Antarctica\/Macquarie": "Ostareliya Lokaci (Macquarie)", "Antarctica\/Troll": "Lokacin Greenwhich a London (Troll)", "Arctic\/Longyearbyen": "Tsakiyar a lokaci turai (Longyearbyen)", - "Asia\/Aden": "Yamal (Aden)", - "Asia\/Almaty": "Kazakistan (Almaty)", + "Asia\/Aden": "Yamal Lokaci (Aden)", + "Asia\/Almaty": "Kazakistan Lokaci (Almaty)", "Asia\/Amman": "Lokaci a turai gabas (Amman)", - "Asia\/Anadyr": "Rasha (Anadyr)", - "Asia\/Aqtau": "Kazakistan (Aqtau)", - "Asia\/Aqtobe": "Kazakistan (Aqtobe)", - "Asia\/Ashgabat": "Turkumenistan (Ashgabat)", - "Asia\/Atyrau": "Kazakistan (Atyrau)", - "Asia\/Baghdad": "Iraƙi (Baghdad)", - "Asia\/Bahrain": "Baharan (Bahrain)", - "Asia\/Baku": "Azarbaijan (Baku)", - "Asia\/Bangkok": "Tailan (Bangkok)", - "Asia\/Barnaul": "Rasha (Barnaul)", + "Asia\/Anadyr": "Rasha Lokaci (Anadyr)", + "Asia\/Aqtau": "Kazakistan Lokaci (Aqtau)", + "Asia\/Aqtobe": "Kazakistan Lokaci (Aqtobe)", + "Asia\/Ashgabat": "Turkumenistan Lokaci (Ashgabat)", + "Asia\/Atyrau": "Kazakistan Lokaci (Atyrau)", + "Asia\/Baghdad": "Iraƙi Lokaci (Baghdad)", + "Asia\/Bahrain": "Baharan Lokaci (Bahrain)", + "Asia\/Baku": "Azarbaijan Lokaci (Baku)", + "Asia\/Bangkok": "Tailan Lokaci (Bangkok)", + "Asia\/Barnaul": "Rasha Lokaci (Barnaul)", "Asia\/Beirut": "Lokaci a turai gabas (Beirut)", - "Asia\/Bishkek": "Kirgizistan (Bishkek)", - "Asia\/Brunei": "Burune (Brunei)", - "Asia\/Calcutta": "Indiya (Kolkata)", - "Asia\/Chita": "Rasha (Chita)", - "Asia\/Choibalsan": "Mangoliya (Choibalsan)", - "Asia\/Colombo": "Siri Lanka (Colombo)", + "Asia\/Bishkek": "Kirgizistan Lokaci (Bishkek)", + "Asia\/Brunei": "Burune Lokaci (Brunei)", + "Asia\/Calcutta": "Indiya Lokaci (Kolkata)", + "Asia\/Chita": "Rasha Lokaci (Chita)", + "Asia\/Choibalsan": "Mangoliya Lokaci (Choibalsan)", + "Asia\/Colombo": "Siri Lanka Lokaci (Colombo)", "Asia\/Damascus": "Lokaci a turai gabas (Damascus)", - "Asia\/Dhaka": "Bangiladas (Dhaka)", - "Asia\/Dili": "Timor Ta Gabas (Dili)", - "Asia\/Dubai": "Haɗaɗɗiyar Daular Larabawa (Dubai)", - "Asia\/Dushanbe": "Tajikistan (Dushanbe)", + "Asia\/Dhaka": "Bangiladas Lokaci (Dhaka)", + "Asia\/Dili": "Timor Ta Gabas Lokaci (Dili)", + "Asia\/Dubai": "Haɗaɗɗiyar Daular Larabawa Lokaci (Dubai)", + "Asia\/Dushanbe": "Tajikistan Lokaci (Dushanbe)", "Asia\/Famagusta": "Lokaci a turai gabas (Famagusta)", "Asia\/Gaza": "Lokaci a turai gabas (Gaza)", "Asia\/Hebron": "Lokaci a turai gabas (Hebron)", - "Asia\/Hovd": "Mangoliya (Hovd)", - "Asia\/Irkutsk": "Rasha (Irkutsk)", - "Asia\/Jakarta": "Indunusiya (Jakarta)", - "Asia\/Jayapura": "Indunusiya (Jayapura)", - "Asia\/Jerusalem": "Iziraʼila (Jerusalem)", - "Asia\/Kabul": "Afaganistan (Kabul)", - "Asia\/Kamchatka": "Rasha (Kamchatka)", - "Asia\/Karachi": "Pakistan (Karachi)", - "Asia\/Katmandu": "Nefal (Kathmandu)", - "Asia\/Khandyga": "Rasha (Khandyga)", - "Asia\/Krasnoyarsk": "Rasha (Krasnoyarsk)", - "Asia\/Kuala_Lumpur": "Malaisiya (Kuala Lumpur)", - "Asia\/Kuching": "Malaisiya (Kuching)", - "Asia\/Kuwait": "Kwiyat (Kuwait)", - "Asia\/Magadan": "Rasha (Magadan)", - "Asia\/Makassar": "Indunusiya (Makassar)", - "Asia\/Manila": "Filipin (Manila)", - "Asia\/Muscat": "Oman (Muscat)", + "Asia\/Hovd": "Mangoliya Lokaci (Hovd)", + "Asia\/Irkutsk": "Rasha Lokaci (Irkutsk)", + "Asia\/Jakarta": "Indunusiya Lokaci (Jakarta)", + "Asia\/Jayapura": "Indunusiya Lokaci (Jayapura)", + "Asia\/Jerusalem": "Iziraʼila Lokaci (Jerusalem)", + "Asia\/Kabul": "Afaganistan Lokaci (Kabul)", + "Asia\/Kamchatka": "Rasha Lokaci (Kamchatka)", + "Asia\/Karachi": "Pakistan Lokaci (Karachi)", + "Asia\/Katmandu": "Nefal Lokaci (Kathmandu)", + "Asia\/Khandyga": "Rasha Lokaci (Khandyga)", + "Asia\/Krasnoyarsk": "Rasha Lokaci (Krasnoyarsk)", + "Asia\/Kuala_Lumpur": "Malaisiya Lokaci (Kuala Lumpur)", + "Asia\/Kuching": "Malaisiya Lokaci (Kuching)", + "Asia\/Kuwait": "Kwiyat Lokaci (Kuwait)", + "Asia\/Magadan": "Rasha Lokaci (Magadan)", + "Asia\/Makassar": "Indunusiya Lokaci (Makassar)", + "Asia\/Manila": "Filipin Lokaci (Manila)", + "Asia\/Muscat": "Oman Lokaci (Muscat)", "Asia\/Nicosia": "Lokaci a turai gabas (Nicosia)", - "Asia\/Novokuznetsk": "Rasha (Novokuznetsk)", - "Asia\/Novosibirsk": "Rasha (Novosibirsk)", - "Asia\/Omsk": "Rasha (Omsk)", - "Asia\/Oral": "Kazakistan (Oral)", - "Asia\/Phnom_Penh": "Kambodiya (Phnom Penh)", - "Asia\/Pontianak": "Indunusiya (Pontianak)", - "Asia\/Pyongyang": "Koreya Ta Arewa (Pyongyang)", - "Asia\/Qatar": "Kwatar (Qatar)", - "Asia\/Qostanay": "Kazakistan (Qostanay)", - "Asia\/Qyzylorda": "Kazakistan (Qyzylorda)", - "Asia\/Rangoon": "Burma, Miyamar (Yangon)", - "Asia\/Riyadh": "Ƙasar Makka (Riyadh)", - "Asia\/Saigon": "Biyetinam (Ho Chi Minh)", - "Asia\/Sakhalin": "Rasha (Sakhalin)", - "Asia\/Samarkand": "Uzubekistan (Samarkand)", - "Asia\/Seoul": "Koreya Ta Kudu (Seoul)", - "Asia\/Shanghai": "Caina, Sin (Shanghai)", - "Asia\/Singapore": "Singapur (Singapore)", - "Asia\/Srednekolymsk": "Rasha (Srednekolymsk)", - "Asia\/Taipei": "Taiwan (Taipei)", - "Asia\/Tashkent": "Uzubekistan (Tashkent)", - "Asia\/Tbilisi": "Jiwarjiya (Tbilisi)", - "Asia\/Tehran": "Iran (Tehran)", - "Asia\/Thimphu": "Butan (Thimphu)", - "Asia\/Tokyo": "Jàpân (Tokyo)", - "Asia\/Tomsk": "Rasha (Tomsk)", - "Asia\/Ulaanbaatar": "Mangoliya (Ulaanbaatar)", - "Asia\/Urumqi": "Caina, Sin (Urumqi)", - "Asia\/Ust-Nera": "Rasha (Ust-Nera)", - "Asia\/Vientiane": "Lawas (Vientiane)", - "Asia\/Vladivostok": "Rasha (Vladivostok)", - "Asia\/Yakutsk": "Rasha (Yakutsk)", - "Asia\/Yekaterinburg": "Rasha (Yekaterinburg)", - "Asia\/Yerevan": "Armeniya (Yerevan)", - "Atlantic\/Azores": "Portugal (Azores)", + "Asia\/Novokuznetsk": "Rasha Lokaci (Novokuznetsk)", + "Asia\/Novosibirsk": "Rasha Lokaci (Novosibirsk)", + "Asia\/Omsk": "Rasha Lokaci (Omsk)", + "Asia\/Oral": "Kazakistan Lokaci (Oral)", + "Asia\/Phnom_Penh": "Kambodiya Lokaci (Phnom Penh)", + "Asia\/Pontianak": "Indunusiya Lokaci (Pontianak)", + "Asia\/Pyongyang": "Koreya Ta Arewa Lokaci (Pyongyang)", + "Asia\/Qatar": "Kwatar Lokaci (Qatar)", + "Asia\/Qostanay": "Kazakistan Lokaci (Qostanay)", + "Asia\/Qyzylorda": "Kazakistan Lokaci (Qyzylorda)", + "Asia\/Rangoon": "Burma, Miyamar Lokaci (Yangon)", + "Asia\/Riyadh": "Ƙasar Makka Lokaci (Riyadh)", + "Asia\/Saigon": "Biyetinam Lokaci (Ho Chi Minh)", + "Asia\/Sakhalin": "Rasha Lokaci (Sakhalin)", + "Asia\/Samarkand": "Uzubekistan Lokaci (Samarkand)", + "Asia\/Seoul": "Koreya Ta Kudu Lokaci (Seoul)", + "Asia\/Shanghai": "Caina, Sin Lokaci (Shanghai)", + "Asia\/Singapore": "Singapur Lokaci (Singapore)", + "Asia\/Srednekolymsk": "Rasha Lokaci (Srednekolymsk)", + "Asia\/Taipei": "Taiwan Lokaci (Taipei)", + "Asia\/Tashkent": "Uzubekistan Lokaci (Tashkent)", + "Asia\/Tbilisi": "Jiwarjiya Lokaci (Tbilisi)", + "Asia\/Tehran": "Iran Lokaci (Tehran)", + "Asia\/Thimphu": "Butan Lokaci (Thimphu)", + "Asia\/Tokyo": "Jàpân Lokaci (Tokyo)", + "Asia\/Tomsk": "Rasha Lokaci (Tomsk)", + "Asia\/Ulaanbaatar": "Mangoliya Lokaci (Ulaanbaatar)", + "Asia\/Urumqi": "Caina, Sin Lokaci (Urumqi)", + "Asia\/Ust-Nera": "Rasha Lokaci (Ust-Nera)", + "Asia\/Vientiane": "Lawas Lokaci (Vientiane)", + "Asia\/Vladivostok": "Rasha Lokaci (Vladivostok)", + "Asia\/Yakutsk": "Rasha Lokaci (Yakutsk)", + "Asia\/Yekaterinburg": "Rasha Lokaci (Yekaterinburg)", + "Asia\/Yerevan": "Armeniya Lokaci (Yerevan)", + "Atlantic\/Azores": "Portugal Lokaci (Azores)", "Atlantic\/Bermuda": "Lokaci da Kanada, Puerto Rico da Virgin Islands (Bermuda)", "Atlantic\/Canary": "Lokaci ta yammacin turai (Canary)", - "Atlantic\/Cape_Verde": "Tsibiran Kap Barde (Cape Verde)", + "Atlantic\/Cape_Verde": "Tsibiran Kap Barde Lokaci (Cape Verde)", "Atlantic\/Faeroe": "Lokaci ta yammacin turai (Faroe)", "Atlantic\/Madeira": "Lokaci ta yammacin turai (Madeira)", "Atlantic\/Reykjavik": "Lokacin Greenwhich a London (Reykjavik)", "Atlantic\/St_Helena": "Lokacin Greenwhich a London (St. Helena)", - "Atlantic\/Stanley": "Tsibiran Falkilan (Stanley)", - "Australia\/Adelaide": "Ostareliya (Adelaide)", - "Australia\/Brisbane": "Ostareliya (Brisbane)", - "Australia\/Broken_Hill": "Ostareliya (Broken Hill)", - "Australia\/Currie": "Ostareliya (Currie)", - "Australia\/Darwin": "Ostareliya (Darwin)", - "Australia\/Eucla": "Ostareliya (Eucla)", - "Australia\/Hobart": "Ostareliya (Hobart)", - "Australia\/Lindeman": "Ostareliya (Lindeman)", - "Australia\/Lord_Howe": "Ostareliya (Lord Howe)", - "Australia\/Melbourne": "Ostareliya (Melbourne)", - "Australia\/Perth": "Ostareliya (Perth)", - "Australia\/Sydney": "Ostareliya (Sydney)", + "Atlantic\/Stanley": "Tsibiran Falkilan Lokaci (Stanley)", + "Australia\/Adelaide": "Ostareliya Lokaci (Adelaide)", + "Australia\/Brisbane": "Ostareliya Lokaci (Brisbane)", + "Australia\/Broken_Hill": "Ostareliya Lokaci (Broken Hill)", + "Australia\/Currie": "Ostareliya Lokaci (Currie)", + "Australia\/Darwin": "Ostareliya Lokaci (Darwin)", + "Australia\/Eucla": "Ostareliya Lokaci (Eucla)", + "Australia\/Hobart": "Ostareliya Lokaci (Hobart)", + "Australia\/Lindeman": "Ostareliya Lokaci (Lindeman)", + "Australia\/Lord_Howe": "Ostareliya Lokaci (Lord Howe)", + "Australia\/Melbourne": "Ostareliya Lokaci (Melbourne)", + "Australia\/Perth": "Ostareliya Lokaci (Perth)", + "Australia\/Sydney": "Ostareliya Lokaci (Sydney)", "CST6CDT": "Lokaci dake Amurika arewa ta tsakiyar", "EST5EDT": "Lokaci gabas a arewacin da Amirka", "Etc\/GMT": "Lokacin Greenwhich a London", "Etc\/UTC": "Hadewa duniya lokaci", "Europe\/Amsterdam": "Tsakiyar a lokaci turai (Amsterdam)", "Europe\/Andorra": "Tsakiyar a lokaci turai (Andorra)", - "Europe\/Astrakhan": "Rasha (Astrakhan)", + "Europe\/Astrakhan": "Rasha Lokaci (Astrakhan)", "Europe\/Athens": "Lokaci a turai gabas (Athens)", "Europe\/Belgrade": "Tsakiyar a lokaci turai (Belgrade)", "Europe\/Berlin": "Tsakiyar a lokaci turai (Berlin)", @@ -328,11 +328,11 @@ "Europe\/Guernsey": "Lokacin Greenwhich a London (Guernsey)", "Europe\/Helsinki": "Lokaci a turai gabas (Helsinki)", "Europe\/Isle_of_Man": "Lokacin Greenwhich a London (Isle of Man)", - "Europe\/Istanbul": "Turkiyya (Istanbul)", + "Europe\/Istanbul": "Turkiyya Lokaci (Istanbul)", "Europe\/Jersey": "Lokacin Greenwhich a London (Jersey)", "Europe\/Kaliningrad": "Lokaci a turai gabas (Kaliningrad)", "Europe\/Kiev": "Lokaci a turai gabas (Kiev)", - "Europe\/Kirov": "Rasha (Kirov)", + "Europe\/Kirov": "Rasha Lokaci (Kirov)", "Europe\/Lisbon": "Lokaci ta yammacin turai (Lisbon)", "Europe\/Ljubljana": "Tsakiyar a lokaci turai (Ljubljana)", "Europe\/London": "Lokacin Greenwhich a London", @@ -340,89 +340,83 @@ "Europe\/Madrid": "Tsakiyar a lokaci turai (Madrid)", "Europe\/Malta": "Tsakiyar a lokaci turai (Malta)", "Europe\/Mariehamn": "Lokaci a turai gabas (Mariehamn)", - "Europe\/Minsk": "Belarus (Minsk)", + "Europe\/Minsk": "Belarus Lokaci (Minsk)", "Europe\/Monaco": "Tsakiyar a lokaci turai (Monaco)", - "Europe\/Moscow": "Rasha (Moscow)", + "Europe\/Moscow": "Rasha Lokaci (Moscow)", "Europe\/Oslo": "Tsakiyar a lokaci turai (Oslo)", "Europe\/Paris": "Tsakiyar a lokaci turai (Paris)", "Europe\/Podgorica": "Tsakiyar a lokaci turai (Podgorica)", "Europe\/Prague": "Tsakiyar a lokaci turai (Prague)", "Europe\/Riga": "Lokaci a turai gabas (Riga)", "Europe\/Rome": "Tsakiyar a lokaci turai (Rome)", - "Europe\/Samara": "Rasha (Samara)", + "Europe\/Samara": "Rasha Lokaci (Samara)", "Europe\/San_Marino": "Tsakiyar a lokaci turai (San Marino)", "Europe\/Sarajevo": "Tsakiyar a lokaci turai (Sarajevo)", - "Europe\/Saratov": "Rasha (Saratov)", - "Europe\/Simferopol": "Yukaran (Simferopol)", + "Europe\/Saratov": "Rasha Lokaci (Saratov)", + "Europe\/Simferopol": "Yukaran Lokaci (Simferopol)", "Europe\/Skopje": "Tsakiyar a lokaci turai (Skopje)", "Europe\/Sofia": "Lokaci a turai gabas (Sofia)", "Europe\/Stockholm": "Tsakiyar a lokaci turai (Stockholm)", "Europe\/Tallinn": "Lokaci a turai gabas (Tallinn)", "Europe\/Tirane": "Tsakiyar a lokaci turai (Tirane)", - "Europe\/Ulyanovsk": "Rasha (Ulyanovsk)", + "Europe\/Ulyanovsk": "Rasha Lokaci (Ulyanovsk)", "Europe\/Uzhgorod": "Lokaci a turai gabas (Uzhgorod)", "Europe\/Vaduz": "Tsakiyar a lokaci turai (Vaduz)", "Europe\/Vatican": "Tsakiyar a lokaci turai (Vatican)", "Europe\/Vienna": "Tsakiyar a lokaci turai (Vienna)", "Europe\/Vilnius": "Lokaci a turai gabas (Vilnius)", - "Europe\/Volgograd": "Rasha (Volgograd)", + "Europe\/Volgograd": "Rasha Lokaci (Volgograd)", "Europe\/Warsaw": "Tsakiyar a lokaci turai (Warsaw)", "Europe\/Zagreb": "Tsakiyar a lokaci turai (Zagreb)", "Europe\/Zaporozhye": "Lokaci a turai gabas (Zaporozhye)", "Europe\/Zurich": "Tsakiyar a lokaci turai (Zurich)", - "Indian\/Antananarivo": "Madagaskar (Antananarivo)", - "Indian\/Chagos": "Yankin Birtaniya Na Tekun Indiya (Chagos)", - "Indian\/Comoro": "Kwamoras (Comoro)", - "Indian\/Mahe": "Saishal (Mahe)", - "Indian\/Maldives": "Maldibi (Maldives)", - "Indian\/Mauritius": "Moritus (Mauritius)", - "Indian\/Mayotte": "Mayoti (Mayotte)", - "Indian\/Reunion": "Rawuniyan (Reunion)", + "Indian\/Antananarivo": "Madagaskar Lokaci (Antananarivo)", + "Indian\/Chagos": "Yankin Birtaniya Na Tekun Indiya Lokaci (Chagos)", + "Indian\/Comoro": "Kwamoras Lokaci (Comoro)", + "Indian\/Mahe": "Saishal Lokaci (Mahe)", + "Indian\/Maldives": "Maldibi Lokaci (Maldives)", + "Indian\/Mauritius": "Moritus Lokaci (Mauritius)", + "Indian\/Mayotte": "Mayoti Lokaci (Mayotte)", + "Indian\/Reunion": "Rawuniyan Lokaci (Reunion)", "MST7MDT": "Lokaci tsauni a arewacin da Amirka", "PST8PDT": "Amurika da arewa a lokaci lafiya", - "Pacific\/Apia": "Samowa (Apia)", - "Pacific\/Auckland": "Nuzilan (Auckland)", - "Pacific\/Bougainville": "Papuwa Nugini (Bougainville)", - "Pacific\/Chatham": "Nuzilan (Chatham)", - "Pacific\/Easter": "Cayile (Easter)", - "Pacific\/Efate": "Banuwatu (Efate)", - "Pacific\/Enderbury": "Kiribati (Enderbury)", - "Pacific\/Fakaofo": "Takelau (Fakaofo)", - "Pacific\/Fiji": "Fiji (Fiji)", - "Pacific\/Funafuti": "Tubalu (Funafuti)", - "Pacific\/Galapagos": "Ekwador (Galapagos)", - "Pacific\/Gambier": "Folinesiya Ta Faransa (Gambier)", - "Pacific\/Guadalcanal": "Tsibiran Salaman (Guadalcanal)", - "Pacific\/Guam": "Gwam (Guam)", + "Pacific\/Apia": "Samowa Lokaci (Apia)", + "Pacific\/Auckland": "Nuzilan Lokaci (Auckland)", + "Pacific\/Bougainville": "Papuwa Nugini Lokaci (Bougainville)", + "Pacific\/Chatham": "Nuzilan Lokaci (Chatham)", + "Pacific\/Easter": "Cayile Lokaci (Easter)", + "Pacific\/Efate": "Banuwatu Lokaci (Efate)", + "Pacific\/Enderbury": "Kiribati Lokaci (Enderbury)", + "Pacific\/Fakaofo": "Takelau Lokaci (Fakaofo)", + "Pacific\/Fiji": "Fiji Lokaci (Fiji)", + "Pacific\/Funafuti": "Tubalu Lokaci (Funafuti)", + "Pacific\/Galapagos": "Ekwador Lokaci (Galapagos)", + "Pacific\/Gambier": "Folinesiya Ta Faransa Lokaci (Gambier)", + "Pacific\/Guadalcanal": "Tsibiran Salaman Lokaci (Guadalcanal)", + "Pacific\/Guam": "Gwam Lokaci (Guam)", "Pacific\/Honolulu": "Lokaci ta Hawaii-Aleutian (Honolulu)", "Pacific\/Johnston": "Lokaci ta Hawaii-Aleutian (Johnston)", - "Pacific\/Kiritimati": "Kiribati (Kiritimati)", - "Pacific\/Kosrae": "Mikuronesiya (Kosrae)", - "Pacific\/Kwajalein": "Tsibiran Marshal (Kwajalein)", - "Pacific\/Majuro": "Tsibiran Marshal (Majuro)", - "Pacific\/Marquesas": "Folinesiya Ta Faransa (Marquesas)", - "Pacific\/Nauru": "Nauru (Nauru)", - "Pacific\/Niue": "Niyu (Niue)", - "Pacific\/Norfolk": "Tsibirin Narfalk (Norfolk)", - "Pacific\/Noumea": "Kaledoniya Sabuwa (Noumea)", - "Pacific\/Pago_Pago": "Samowa Ta Amurka (Pago Pago)", - "Pacific\/Palau": "Palau (Palau)", - "Pacific\/Pitcairn": "Pitakarin (Pitcairn)", - "Pacific\/Ponape": "Mikuronesiya (Pohnpei)", - "Pacific\/Port_Moresby": "Papuwa Nugini (Port Moresby)", - "Pacific\/Rarotonga": "Tsibiran Kuku (Rarotonga)", - "Pacific\/Saipan": "Tsibiran Mariyana Na Arewa (Saipan)", - "Pacific\/Tahiti": "Folinesiya Ta Faransa (Tahiti)", - "Pacific\/Tarawa": "Kiribati (Tarawa)", - "Pacific\/Tongatapu": "Tanga (Tongatapu)", - "Pacific\/Truk": "Mikuronesiya (Chuuk)", - "Pacific\/Wallis": "Walis Da Futuna (Wallis)" + "Pacific\/Kiritimati": "Kiribati Lokaci (Kiritimati)", + "Pacific\/Kosrae": "Mikuronesiya Lokaci (Kosrae)", + "Pacific\/Kwajalein": "Tsibiran Marshal Lokaci (Kwajalein)", + "Pacific\/Majuro": "Tsibiran Marshal Lokaci (Majuro)", + "Pacific\/Marquesas": "Folinesiya Ta Faransa Lokaci (Marquesas)", + "Pacific\/Nauru": "Nauru Lokaci (Nauru)", + "Pacific\/Niue": "Niyu Lokaci (Niue)", + "Pacific\/Norfolk": "Tsibirin Narfalk Lokaci (Norfolk)", + "Pacific\/Noumea": "Kaledoniya Sabuwa Lokaci (Noumea)", + "Pacific\/Pago_Pago": "Samowa Ta Amurka Lokaci (Pago Pago)", + "Pacific\/Palau": "Palau Lokaci (Palau)", + "Pacific\/Pitcairn": "Pitakarin Lokaci (Pitcairn)", + "Pacific\/Ponape": "Mikuronesiya Lokaci (Pohnpei)", + "Pacific\/Port_Moresby": "Papuwa Nugini Lokaci (Port Moresby)", + "Pacific\/Rarotonga": "Tsibiran Kuku Lokaci (Rarotonga)", + "Pacific\/Saipan": "Tsibiran Mariyana Na Arewa Lokaci (Saipan)", + "Pacific\/Tahiti": "Folinesiya Ta Faransa Lokaci (Tahiti)", + "Pacific\/Tarawa": "Kiribati Lokaci (Tarawa)", + "Pacific\/Tongatapu": "Tanga Lokaci (Tongatapu)", + "Pacific\/Truk": "Mikuronesiya Lokaci (Chuuk)", + "Pacific\/Wallis": "Walis Da Futuna Lokaci (Wallis)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/he.json b/src/Symfony/Component/Intl/Resources/data/timezones/he.json index db4aa0858ba9a..023ec6090f321 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/he.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/he.json @@ -99,7 +99,7 @@ "America\/Detroit": "שעון החוף המזרחי (דטרויט)", "America\/Dominica": "שעון האוקיינוס האטלנטי (דומיניקה)", "America\/Edmonton": "שעון אזור ההרים בארה״ב (אדמונטון)", - "America\/Eirunepe": "ברזיל (אירונפי)", + "America\/Eirunepe": "שעון ברזיל (אירונפי)", "America\/El_Salvador": "שעון מרכז ארה״ב (אל סלבדור)", "America\/Fort_Nelson": "שעון אזור ההרים בארה״ב (פורט נלסון)", "America\/Fortaleza": "שעון ברזיליה (פורטאלזה)", @@ -151,7 +151,7 @@ "America\/Moncton": "שעון האוקיינוס האטלנטי (מונקטון)", "America\/Monterrey": "שעון מרכז ארה״ב (מונטריי)", "America\/Montevideo": "שעון אורוגוואי (מונטווידאו)", - "America\/Montreal": "קנדה (Montreal)", + "America\/Montreal": "שעון קנדה (Montreal)", "America\/Montserrat": "שעון האוקיינוס האטלנטי (מונסראט)", "America\/Nassau": "שעון החוף המזרחי (נסאו)", "America\/New_York": "שעון החוף המזרחי (ניו יורק)", @@ -176,7 +176,7 @@ "America\/Recife": "שעון ברזיליה (רסיפה)", "America\/Regina": "שעון מרכז ארה״ב (רג׳ינה)", "America\/Resolute": "שעון מרכז ארה״ב (רזולוט)", - "America\/Rio_Branco": "ברזיל (ריו ברנקו)", + "America\/Rio_Branco": "שעון ברזיל (ריו ברנקו)", "America\/Santa_Isabel": "שעון צפון-מערב מקסיקו (סנטה איזבל)", "America\/Santarem": "שעון ברזיליה (סנטרם)", "America\/Santiago": "שעון צ׳ילה (סנטיאגו)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "שעון חצי האי ערב (בחריין)", "Asia\/Baku": "שעון אזרבייג׳אן (באקו)", "Asia\/Bangkok": "שעון הודו-סין (בנגקוק)", - "Asia\/Barnaul": "רוסיה (ברנאול)", + "Asia\/Barnaul": "שעון רוסיה (ברנאול)", "Asia\/Beirut": "שעון מזרח אירופה (ביירות)", "Asia\/Bishkek": "שעון קירגיזסטן (בישקק)", "Asia\/Brunei": "שעון ברוניי דארוסלאם", @@ -288,9 +288,9 @@ "Asia\/Tehran": "שעון איראן (טהרן)", "Asia\/Thimphu": "שעון בהוטן (טהימפהו)", "Asia\/Tokyo": "שעון יפן (טוקיו)", - "Asia\/Tomsk": "רוסיה (טומסק)", + "Asia\/Tomsk": "שעון רוסיה (טומסק)", "Asia\/Ulaanbaatar": "שעון אולן בטור (אולאאנבטאר)", - "Asia\/Urumqi": "סין (אורומקי)", + "Asia\/Urumqi": "שעון סין (אורומקי)", "Asia\/Ust-Nera": "שעון ולדיווסטוק (אוסט-נרה)", "Asia\/Vientiane": "שעון הודו-סין (האנוי)", "Asia\/Vladivostok": "שעון ולדיווסטוק", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "שעון גריניץ׳‏ (גרנזי)", "Europe\/Helsinki": "שעון מזרח אירופה (הלסינקי)", "Europe\/Isle_of_Man": "שעון גריניץ׳‏ (האי מאן)", - "Europe\/Istanbul": "טורקיה (איסטנבול)", + "Europe\/Istanbul": "שעון טורקיה (איסטנבול)", "Europe\/Jersey": "שעון גריניץ׳‏ (ג׳רזי)", "Europe\/Kaliningrad": "שעון מזרח אירופה (קלינינגרד)", "Europe\/Kiev": "שעון מזרח אירופה (קייב)", - "Europe\/Kirov": "רוסיה (קירוב)", + "Europe\/Kirov": "שעון רוסיה (קירוב)", "Europe\/Lisbon": "שעון מערב אירופה (ליסבון)", "Europe\/Ljubljana": "שעון מרכז אירופה (לובליאנה)", "Europe\/London": "שעון גריניץ׳‏ (לונדון)", @@ -438,9 +438,7 @@ }, "Meta": { "GmtFormat": "GMT%s‎", - "HourFormat": [ - "‎+%02d:%02d", - "-%02d:%02d‎" - ] + "HourFormatPos": "‎+%02d:%02d", + "HourFormatNeg": "-%02d:%02d‎" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/hi.json b/src/Symfony/Component/Intl/Resources/data/timezones/hi.json index 83886f212ee2d..4f2612915e638 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/hi.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/hi.json @@ -99,7 +99,7 @@ "America\/Detroit": "उत्तरी अमेरिकी पूर्वी समय (डेट्रॉयट)", "America\/Dominica": "अटलांटिक समय (डोमिनिका)", "America\/Edmonton": "उत्तरी अमेरिकी माउंटेन समय (एडमंटन)", - "America\/Eirunepe": "ब्राज़ील (ईरुनेपे)", + "America\/Eirunepe": "ब्राज़ील समय (ईरुनेपे)", "America\/El_Salvador": "उत्तरी अमेरिकी केंद्रीय समय (अल सल्वाडोर)", "America\/Fort_Nelson": "उत्तरी अमेरिकी माउंटेन समय (फ़ोर्ट नेल्सन)", "America\/Fortaleza": "ब्राज़ीलिया समय (फ़ोर्टालेज़ा)", @@ -151,7 +151,7 @@ "America\/Moncton": "अटलांटिक समय (मोंकटन)", "America\/Monterrey": "उत्तरी अमेरिकी केंद्रीय समय (मोंटेरेरी)", "America\/Montevideo": "उरुग्वे समय (मोंटेवीडियो)", - "America\/Montreal": "कनाडा (Montreal)", + "America\/Montreal": "कनाडा समय (Montreal)", "America\/Montserrat": "अटलांटिक समय (मोंटसेरात)", "America\/Nassau": "उत्तरी अमेरिकी पूर्वी समय (नासाउ)", "America\/New_York": "उत्तरी अमेरिकी पूर्वी समय (न्यूयॉर्क)", @@ -176,7 +176,7 @@ "America\/Recife": "ब्राज़ीलिया समय (रेसाइफ़)", "America\/Regina": "उत्तरी अमेरिकी केंद्रीय समय (रेजिना)", "America\/Resolute": "उत्तरी अमेरिकी केंद्रीय समय (रिसोल्यूट)", - "America\/Rio_Branco": "ब्राज़ील (रियो ब्रांको)", + "America\/Rio_Branco": "ब्राज़ील समय (रियो ब्रांको)", "America\/Santa_Isabel": "उत्तर पश्चिमी मेक्सिको समय (सांता इसाबेल)", "America\/Santarem": "ब्राज़ीलिया समय (सैंटारेम)", "America\/Santiago": "चिली समय (सैंटियागो)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "अरब समय (बहरीन)", "Asia\/Baku": "अज़रबैजान समय (बाकु)", "Asia\/Bangkok": "इंडोचाइना समय (बैंकॉक)", - "Asia\/Barnaul": "रूस (बर्नोल)", + "Asia\/Barnaul": "रूस समय (बर्नोल)", "Asia\/Beirut": "पूर्वी यूरोपीय समय (बेरुत)", "Asia\/Bishkek": "किर्गिस्‍तान समय (बिश्केक)", "Asia\/Brunei": "ब्रूनेई दारूस्सलम समय", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ईरान समय (तेहरान)", "Asia\/Thimphu": "भूटान समय (थिंपू)", "Asia\/Tokyo": "जापान समय (टोक्यो)", - "Asia\/Tomsk": "रूस (तोम्स्क)", + "Asia\/Tomsk": "रूस समय (तोम्स्क)", "Asia\/Ulaanbaatar": "उलान बटोर समय (उलानबातर)", - "Asia\/Urumqi": "चीन (उरूम्की)", + "Asia\/Urumqi": "चीन समय (उरूम्की)", "Asia\/Ust-Nera": "व्लादिवोस्तोक समय (यूस्ट–नेरा)", "Asia\/Vientiane": "इंडोचाइना समय (विएनतियान)", "Asia\/Vladivostok": "व्लादिवोस्तोक समय", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "ग्रीनविच मीन टाइम (गर्नसी)", "Europe\/Helsinki": "पूर्वी यूरोपीय समय (हेलसिंकी)", "Europe\/Isle_of_Man": "ग्रीनविच मीन टाइम (आइल ऑफ़ मैन)", - "Europe\/Istanbul": "तुर्की (इस्तांबुल)", + "Europe\/Istanbul": "तुर्की समय (इस्तांबुल)", "Europe\/Jersey": "ग्रीनविच मीन टाइम (जर्सी)", "Europe\/Kaliningrad": "पूर्वी यूरोपीय समय (कालीनिनग्राड)", "Europe\/Kiev": "पूर्वी यूरोपीय समय (कीव)", - "Europe\/Kirov": "रूस (किरोव)", + "Europe\/Kirov": "रूस समय (किरोव)", "Europe\/Lisbon": "पश्चिमी यूरोपीय समय (लिस्बन)", "Europe\/Ljubljana": "मध्य यूरोपीय समय (ल्यूबेलजाना)", "Europe\/London": "ग्रीनविच मीन टाइम (लंदन)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "वेक द्वीप समय", "Pacific\/Wallis": "वालिस और फ़्यूचूना समय" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/hr.json b/src/Symfony/Component/Intl/Resources/data/timezones/hr.json index f554dd5a3d534..e1e673669878d 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/hr.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/hr.json @@ -437,10 +437,6 @@ "Pacific\/Wallis": "vrijeme Otoka Wallis i Futuna" }, "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - " -%02d:%02d" - ] + "HourFormatNeg": " -%02d:%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/hu.json b/src/Symfony/Component/Intl/Resources/data/timezones/hu.json index 3554d171448c1..97a23efee2a09 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/hu.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/hu.json @@ -151,7 +151,7 @@ "America\/Moncton": "atlanti-óceáni idő (Moncton)", "America\/Monterrey": "középső államokbeli idő (Monterrey)", "America\/Montevideo": "uruguayi idő (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Kanada idő (Montreal)", "America\/Montserrat": "atlanti-óceáni idő (Montserrat)", "America\/Nassau": "keleti államokbeli idő (Nassau)", "America\/New_York": "keleti államokbeli idő (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "arab idő (Bahrein)", "Asia\/Baku": "azerbajdzsáni idő (Baku)", "Asia\/Bangkok": "indokínai idő (Bangkok)", - "Asia\/Barnaul": "Oroszország (Barnaul)", + "Asia\/Barnaul": "Oroszország idő (Barnaul)", "Asia\/Beirut": "kelet-európai időzóna (Bejrút)", "Asia\/Bishkek": "kirgizisztáni idő (Biskek)", "Asia\/Brunei": "Brunei Darussalam-i idő", @@ -288,9 +288,9 @@ "Asia\/Tehran": "iráni idő (Teherán)", "Asia\/Thimphu": "butáni idő (Thimphu)", "Asia\/Tokyo": "japán idő (Tokió)", - "Asia\/Tomsk": "Oroszország (Tomszk)", + "Asia\/Tomsk": "Oroszország idő (Tomszk)", "Asia\/Ulaanbaatar": "ulánbátori idő", - "Asia\/Urumqi": "Kína (Ürümqi)", + "Asia\/Urumqi": "Kína idő (Ürümqi)", "Asia\/Ust-Nera": "vlagyivosztoki idő (Uszty-Nyera)", "Asia\/Vientiane": "indokínai idő (Vientián)", "Asia\/Vladivostok": "vlagyivosztoki idő", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "greenwichi középidő, téli idő (Guernsey)", "Europe\/Helsinki": "kelet-európai időzóna (Helsinki)", "Europe\/Isle_of_Man": "greenwichi középidő, téli idő (Man-sziget)", - "Europe\/Istanbul": "Törökország (Isztanbul)", + "Europe\/Istanbul": "Törökország idő (Isztanbul)", "Europe\/Jersey": "greenwichi középidő, téli idő (Jersey)", "Europe\/Kaliningrad": "kelet-európai időzóna (Kalinyingrád)", "Europe\/Kiev": "kelet-európai időzóna (Kijev)", - "Europe\/Kirov": "Oroszország (Kirov)", + "Europe\/Kirov": "Oroszország idő (Kirov)", "Europe\/Lisbon": "nyugat-európai időzóna (Lisszabon)", "Europe\/Ljubljana": "közép-európai időzóna (Ljubljana)", "Europe\/London": "greenwichi középidő, téli idő (London)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "wake-szigeti idő", "Pacific\/Wallis": "Wallis és Futuna-i idő" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/hy.json b/src/Symfony/Component/Intl/Resources/data/timezones/hy.json index 265deb5f68eae..dad8b77940bce 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/hy.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/hy.json @@ -436,11 +436,5 @@ "Pacific\/Wake": "Ուեյք կղզու ժամանակ (Ուեյք կղզի)", "Pacific\/Wallis": "Ուոլիս և Ֆուտունայի ժամանակ" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ia.json b/src/Symfony/Component/Intl/Resources/data/timezones/ia.json index 51ed2e4707d77..83b04537b676d 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ia.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ia.json @@ -3,90 +3,90 @@ "Names": { "Africa\/Abidjan": "hora medie de Greenwich (Abidjan)", "Africa\/Accra": "hora medie de Greenwich (Accra)", - "Africa\/Addis_Ababa": "Ethiopia (Addis Ababa)", + "Africa\/Addis_Ababa": "hora de Ethiopia (Addis Ababa)", "Africa\/Algiers": "hora de Europa central (Algiers)", - "Africa\/Asmera": "Eritrea (Asmara)", + "Africa\/Asmera": "hora de Eritrea (Asmara)", "Africa\/Bamako": "hora medie de Greenwich (Bamako)", - "Africa\/Bangui": "Republica African Central (Bangui)", + "Africa\/Bangui": "hora de Republica African Central (Bangui)", "Africa\/Banjul": "hora medie de Greenwich (Banjul)", "Africa\/Bissau": "hora medie de Greenwich (Bissau)", - "Africa\/Blantyre": "Malawi (Blantyre)", - "Africa\/Brazzaville": "Congo (Brazzaville)", - "Africa\/Bujumbura": "Burundi (Bujumbura)", + "Africa\/Blantyre": "hora de Malawi (Blantyre)", + "Africa\/Brazzaville": "hora de Congo (Brazzaville)", + "Africa\/Bujumbura": "hora de Burundi (Bujumbura)", "Africa\/Cairo": "hora de Europa oriental (Cairo)", "Africa\/Casablanca": "hora de Europa occidental (Casablanca)", "Africa\/Ceuta": "hora de Europa central (Ceuta)", "Africa\/Conakry": "hora medie de Greenwich (Conakry)", "Africa\/Dakar": "hora medie de Greenwich (Dakar)", - "Africa\/Dar_es_Salaam": "Tanzania (Dar es Salaam)", - "Africa\/Douala": "Camerun (Douala)", + "Africa\/Dar_es_Salaam": "hora de Tanzania (Dar es Salaam)", + "Africa\/Douala": "hora de Camerun (Douala)", "Africa\/El_Aaiun": "hora de Europa occidental (El Aaiun)", "Africa\/Freetown": "hora medie de Greenwich (Freetown)", - "Africa\/Gaborone": "Botswana (Gaborone)", - "Africa\/Harare": "Zimbabwe (Harare)", - "Africa\/Johannesburg": "Sudafrica (Johannesburg)", - "Africa\/Juba": "Sudan del Sud (Juba)", - "Africa\/Kampala": "Uganda (Kampala)", - "Africa\/Khartoum": "Sudan (Khartoum)", - "Africa\/Kigali": "Ruanda (Kigali)", - "Africa\/Lagos": "Nigeria (Lagos)", - "Africa\/Libreville": "Gabon (Libreville)", + "Africa\/Gaborone": "hora de Botswana (Gaborone)", + "Africa\/Harare": "hora de Zimbabwe (Harare)", + "Africa\/Johannesburg": "hora de Sudafrica (Johannesburg)", + "Africa\/Juba": "hora de Sudan del Sud (Juba)", + "Africa\/Kampala": "hora de Uganda (Kampala)", + "Africa\/Khartoum": "hora de Sudan (Khartoum)", + "Africa\/Kigali": "hora de Ruanda (Kigali)", + "Africa\/Lagos": "hora de Nigeria (Lagos)", + "Africa\/Libreville": "hora de Gabon (Libreville)", "Africa\/Lome": "hora medie de Greenwich (Lome)", - "Africa\/Luanda": "Angola (Luanda)", - "Africa\/Lusaka": "Zambia (Lusaka)", - "Africa\/Malabo": "Guinea equatorial (Malabo)", - "Africa\/Maputo": "Mozambique (Maputo)", - "Africa\/Maseru": "Lesotho (Maseru)", - "Africa\/Mbabane": "Swazilandia (Mbabane)", - "Africa\/Mogadishu": "Somalia (Mogadishu)", + "Africa\/Luanda": "hora de Angola (Luanda)", + "Africa\/Lusaka": "hora de Zambia (Lusaka)", + "Africa\/Malabo": "hora de Guinea equatorial (Malabo)", + "Africa\/Maputo": "hora de Mozambique (Maputo)", + "Africa\/Maseru": "hora de Lesotho (Maseru)", + "Africa\/Mbabane": "hora de Swazilandia (Mbabane)", + "Africa\/Mogadishu": "hora de Somalia (Mogadishu)", "Africa\/Monrovia": "hora medie de Greenwich (Monrovia)", - "Africa\/Nairobi": "Kenya (Nairobi)", - "Africa\/Niamey": "Niger (Niamey)", + "Africa\/Nairobi": "hora de Kenya (Nairobi)", + "Africa\/Niamey": "hora de Niger (Niamey)", "Africa\/Nouakchott": "hora medie de Greenwich (Nouakchott)", "Africa\/Ouagadougou": "hora medie de Greenwich (Ouagadougou)", - "Africa\/Porto-Novo": "Benin (Porto-Novo)", + "Africa\/Porto-Novo": "hora de Benin (Porto-Novo)", "Africa\/Sao_Tome": "hora medie de Greenwich (Sao Tome)", "Africa\/Tripoli": "hora de Europa oriental (Tripoli)", "Africa\/Tunis": "hora de Europa central (Tunis)", - "Africa\/Windhoek": "Namibia (Windhoek)", + "Africa\/Windhoek": "hora de Namibia (Windhoek)", "America\/Adak": "hora de Hawaii-Aleutianas (Adak)", "America\/Anchorage": "hora de Alaska (Anchorage)", "America\/Anguilla": "hora atlantic (Anguilla)", "America\/Antigua": "hora atlantic (Antigua)", - "America\/Araguaina": "Brasil (Araguaina)", - "America\/Argentina\/La_Rioja": "Argentina (La Rioja)", - "America\/Argentina\/Rio_Gallegos": "Argentina (Rio Gallegos)", - "America\/Argentina\/Salta": "Argentina (Salta)", - "America\/Argentina\/San_Juan": "Argentina (San Juan)", - "America\/Argentina\/San_Luis": "Argentina (San Luis)", - "America\/Argentina\/Tucuman": "Argentina (Tucuman)", - "America\/Argentina\/Ushuaia": "Argentina (Ushuaia)", + "America\/Araguaina": "hora de Brasil (Araguaina)", + "America\/Argentina\/La_Rioja": "hora de Argentina (La Rioja)", + "America\/Argentina\/Rio_Gallegos": "hora de Argentina (Rio Gallegos)", + "America\/Argentina\/Salta": "hora de Argentina (Salta)", + "America\/Argentina\/San_Juan": "hora de Argentina (San Juan)", + "America\/Argentina\/San_Luis": "hora de Argentina (San Luis)", + "America\/Argentina\/Tucuman": "hora de Argentina (Tucuman)", + "America\/Argentina\/Ushuaia": "hora de Argentina (Ushuaia)", "America\/Aruba": "hora atlantic (Aruba)", - "America\/Asuncion": "Paraguay (Asuncion)", - "America\/Bahia": "Brasil (Bahia)", + "America\/Asuncion": "hora de Paraguay (Asuncion)", + "America\/Bahia": "hora de Brasil (Bahia)", "America\/Bahia_Banderas": "hora central (Bahia de Banderas)", "America\/Barbados": "hora atlantic (Barbados)", - "America\/Belem": "Brasil (Belem)", + "America\/Belem": "hora de Brasil (Belem)", "America\/Belize": "hora central (Belize)", "America\/Blanc-Sablon": "hora atlantic (Blanc-Sablon)", - "America\/Boa_Vista": "Brasil (Boa Vista)", - "America\/Bogota": "Colombia (Bogota)", + "America\/Boa_Vista": "hora de Brasil (Boa Vista)", + "America\/Bogota": "hora de Colombia (Bogota)", "America\/Boise": "hora del montanias (Boise)", - "America\/Buenos_Aires": "Argentina (Buenos Aires)", + "America\/Buenos_Aires": "hora de Argentina (Buenos Aires)", "America\/Cambridge_Bay": "hora del montanias (Cambridge Bay)", - "America\/Campo_Grande": "Brasil (Campo Grande)", + "America\/Campo_Grande": "hora de Brasil (Campo Grande)", "America\/Cancun": "hora del est (Cancun)", - "America\/Caracas": "Venezuela (Caracas)", - "America\/Catamarca": "Argentina (Catamarca)", - "America\/Cayenne": "Guyana francese (Cayenne)", + "America\/Caracas": "hora de Venezuela (Caracas)", + "America\/Catamarca": "hora de Argentina (Catamarca)", + "America\/Cayenne": "hora de Guyana francese (Cayenne)", "America\/Cayman": "hora del est (Caiman)", "America\/Chicago": "hora central (Chicago)", "America\/Chihuahua": "hora del Pacifico mexican (Chihuahua)", "America\/Coral_Harbour": "hora del est (Atikokan)", - "America\/Cordoba": "Argentina (Cordoba)", + "America\/Cordoba": "hora de Argentina (Cordoba)", "America\/Costa_Rica": "hora central (Costa Rica)", "America\/Creston": "hora del montanias (Creston)", - "America\/Cuiaba": "Brasil (Cuiaba)", + "America\/Cuiaba": "hora de Brasil (Cuiaba)", "America\/Curacao": "hora atlantic (Curaçao)", "America\/Danmarkshavn": "hora medie de Greenwich (Danmarkshavn)", "America\/Dawson": "hora pacific (Dawson)", @@ -95,10 +95,10 @@ "America\/Detroit": "hora del est (Detroit)", "America\/Dominica": "hora atlantic (Dominica)", "America\/Edmonton": "hora del montanias (Edmonton)", - "America\/Eirunepe": "Brasil (Eirunepe)", + "America\/Eirunepe": "hora de Brasil (Eirunepe)", "America\/El_Salvador": "hora central (El Salvador)", "America\/Fort_Nelson": "hora del montanias (Fort Nelson)", - "America\/Fortaleza": "Brasil (Fortaleza)", + "America\/Fortaleza": "hora de Brasil (Fortaleza)", "America\/Glace_Bay": "hora atlantic (Glace Bay)", "America\/Godthab": "hora de Groenlandia occidental (Nuuk)", "America\/Goose_Bay": "hora atlantic (Goose Bay)", @@ -106,7 +106,7 @@ "America\/Grenada": "hora atlantic (Grenada)", "America\/Guadeloupe": "hora atlantic (Guadeloupe)", "America\/Guatemala": "hora central (Guatemala)", - "America\/Guayaquil": "Ecuador (Guayaquil)", + "America\/Guayaquil": "hora de Ecuador (Guayaquil)", "America\/Halifax": "hora atlantic (Halifax)", "America\/Havana": "hora de Cuba (Havana)", "America\/Hermosillo": "hora del Pacifico mexican (Hermosillo)", @@ -121,23 +121,23 @@ "America\/Inuvik": "hora del montanias (Inuvik)", "America\/Iqaluit": "hora del est (Iqaluit)", "America\/Jamaica": "hora del est (Jamaica)", - "America\/Jujuy": "Argentina (Jujuy)", + "America\/Jujuy": "hora de Argentina (Jujuy)", "America\/Juneau": "hora de Alaska (Juneau)", "America\/Kentucky\/Monticello": "hora del est (Monticello, Kentucky)", "America\/Kralendijk": "hora atlantic (Kralendijk)", - "America\/La_Paz": "Bolivia (La Paz)", - "America\/Lima": "Peru (Lima)", + "America\/La_Paz": "hora de Bolivia (La Paz)", + "America\/Lima": "hora de Peru (Lima)", "America\/Los_Angeles": "hora pacific (Los Angeles)", "America\/Louisville": "hora del est (Louisville)", "America\/Lower_Princes": "hora atlantic (Lower Prince’s Quarter)", - "America\/Maceio": "Brasil (Maceio)", + "America\/Maceio": "hora de Brasil (Maceio)", "America\/Managua": "hora central (Managua)", - "America\/Manaus": "Brasil (Manaus)", + "America\/Manaus": "hora de Brasil (Manaus)", "America\/Marigot": "hora atlantic (Marigot)", "America\/Martinique": "hora atlantic (Martinica)", "America\/Matamoros": "hora central (Matamoros)", "America\/Mazatlan": "hora del Pacifico mexican (Mazatlan)", - "America\/Mendoza": "Argentina (Mendoza)", + "America\/Mendoza": "hora de Argentina (Mendoza)", "America\/Menominee": "hora central (Menominee)", "America\/Merida": "hora central (Merida)", "America\/Metlakatla": "hora de Alaska (Metlakatla)", @@ -145,38 +145,38 @@ "America\/Miquelon": "hora de Saint-Pierre e Miquelon", "America\/Moncton": "hora atlantic (Moncton)", "America\/Monterrey": "hora central (Monterrey)", - "America\/Montevideo": "Uruguay (Montevideo)", - "America\/Montreal": "Canada (Montreal)", + "America\/Montevideo": "hora de Uruguay (Montevideo)", + "America\/Montreal": "hora de Canada (Montreal)", "America\/Montserrat": "hora atlantic (Montserrat)", "America\/Nassau": "hora del est (Nassau)", "America\/New_York": "hora del est (Nove York)", "America\/Nipigon": "hora del est (Nipigon)", "America\/Nome": "hora de Alaska (Nome)", - "America\/Noronha": "Brasil (Noronha)", + "America\/Noronha": "hora de Brasil (Noronha)", "America\/North_Dakota\/Beulah": "hora central (Beulah, Dakota del Nord)", "America\/North_Dakota\/Center": "hora central (Center, Dakota del Nord)", "America\/North_Dakota\/New_Salem": "hora central (New Salem, Dakota del Nord)", "America\/Ojinaga": "hora del montanias (Ojinaga)", "America\/Panama": "hora del est (Panama)", "America\/Pangnirtung": "hora del est (Pangnirtung)", - "America\/Paramaribo": "Suriname (Paramaribo)", + "America\/Paramaribo": "hora de Suriname (Paramaribo)", "America\/Phoenix": "hora del montanias (Phoenix)", "America\/Port-au-Prince": "hora del est (Port-au-Prince)", "America\/Port_of_Spain": "hora atlantic (Port of Spain)", - "America\/Porto_Velho": "Brasil (Porto Velho)", + "America\/Porto_Velho": "hora de Brasil (Porto Velho)", "America\/Puerto_Rico": "hora atlantic (Porto Rico)", - "America\/Punta_Arenas": "Chile (Punta Arenas)", + "America\/Punta_Arenas": "hora de Chile (Punta Arenas)", "America\/Rainy_River": "hora central (Rainy River)", "America\/Rankin_Inlet": "hora central (Rankin Inlet)", - "America\/Recife": "Brasil (Recife)", + "America\/Recife": "hora de Brasil (Recife)", "America\/Regina": "hora central (Regina)", "America\/Resolute": "hora central (Resolute)", - "America\/Rio_Branco": "Brasil (Rio Branco)", + "America\/Rio_Branco": "hora de Brasil (Rio Branco)", "America\/Santa_Isabel": "hora del nordwest de Mexico (Santa Isabel)", - "America\/Santarem": "Brasil (Santarem)", - "America\/Santiago": "Chile (Santiago)", + "America\/Santarem": "hora de Brasil (Santarem)", + "America\/Santiago": "hora de Chile (Santiago)", "America\/Santo_Domingo": "hora atlantic (Santo Domingo)", - "America\/Sao_Paulo": "Brasil (Sao Paulo)", + "America\/Sao_Paulo": "hora de Brasil (Sao Paulo)", "America\/Scoresbysund": "hora de Groenlandia oriental (Ittoqqortoormiit)", "America\/Sitka": "hora de Alaska (Sitka)", "America\/St_Barthelemy": "hora atlantic (Sancte Bartholomeo)", @@ -197,82 +197,82 @@ "America\/Winnipeg": "hora central (Winnipeg)", "America\/Yakutat": "hora de Alaska (Yakutat)", "America\/Yellowknife": "hora del montanias (Yellowknife)", - "Antarctica\/Macquarie": "Australia (Macquarie)", + "Antarctica\/Macquarie": "hora de Australia (Macquarie)", "Antarctica\/Troll": "hora medie de Greenwich (Troll)", "Arctic\/Longyearbyen": "hora de Europa central (Longyearbyen)", - "Asia\/Aden": "Yemen (Aden)", - "Asia\/Almaty": "Kazakhstan (Almaty)", + "Asia\/Aden": "hora de Yemen (Aden)", + "Asia\/Almaty": "hora de Kazakhstan (Almaty)", "Asia\/Amman": "hora de Europa oriental (Amman)", - "Asia\/Anadyr": "Russia (Anadyr)", - "Asia\/Aqtau": "Kazakhstan (Aqtau)", - "Asia\/Aqtobe": "Kazakhstan (Aqtobe)", - "Asia\/Ashgabat": "Turkmenistan (Ashgabat)", - "Asia\/Atyrau": "Kazakhstan (Atyrau)", - "Asia\/Baghdad": "Irak (Baghdad)", - "Asia\/Baku": "Azerbaidzhan (Baku)", - "Asia\/Bangkok": "Thailandia (Bangkok)", - "Asia\/Barnaul": "Russia (Barnaul)", + "Asia\/Anadyr": "hora de Russia (Anadyr)", + "Asia\/Aqtau": "hora de Kazakhstan (Aqtau)", + "Asia\/Aqtobe": "hora de Kazakhstan (Aqtobe)", + "Asia\/Ashgabat": "hora de Turkmenistan (Ashgabat)", + "Asia\/Atyrau": "hora de Kazakhstan (Atyrau)", + "Asia\/Baghdad": "hora de Irak (Baghdad)", + "Asia\/Baku": "hora de Azerbaidzhan (Baku)", + "Asia\/Bangkok": "hora de Thailandia (Bangkok)", + "Asia\/Barnaul": "hora de Russia (Barnaul)", "Asia\/Beirut": "hora de Europa oriental (Beirut)", - "Asia\/Bishkek": "Kirghizistan (Bishkek)", - "Asia\/Calcutta": "India (Kolkata)", + "Asia\/Bishkek": "hora de Kirghizistan (Bishkek)", + "Asia\/Calcutta": "hora de India (Kolkata)", "Asia\/Chita": "hora de Yakutsk (Chita)", - "Asia\/Choibalsan": "Mongolia (Choibalsan)", - "Asia\/Colombo": "Sri Lanka (Colombo)", + "Asia\/Choibalsan": "hora de Mongolia (Choibalsan)", + "Asia\/Colombo": "hora de Sri Lanka (Colombo)", "Asia\/Damascus": "hora de Europa oriental (Damascus)", - "Asia\/Dhaka": "Bangladesh (Dhaka)", - "Asia\/Dili": "Timor del Est (Dili)", - "Asia\/Dubai": "Emiratos Arabe Unite (Dubai)", - "Asia\/Dushanbe": "Tadzhikistan (Dushanbe)", + "Asia\/Dhaka": "hora de Bangladesh (Dhaka)", + "Asia\/Dili": "hora de Timor del Est (Dili)", + "Asia\/Dubai": "hora de Emiratos Arabe Unite (Dubai)", + "Asia\/Dushanbe": "hora de Tadzhikistan (Dushanbe)", "Asia\/Famagusta": "hora de Europa oriental (Famagusta)", "Asia\/Gaza": "hora de Europa oriental (Gaza)", "Asia\/Hebron": "hora de Europa oriental (Hebron)", - "Asia\/Hovd": "Mongolia (Hovd)", + "Asia\/Hovd": "hora de Mongolia (Hovd)", "Asia\/Irkutsk": "hora de Irkutsk", - "Asia\/Jakarta": "Indonesia (Jakarta)", - "Asia\/Jayapura": "Indonesia (Jayapura)", - "Asia\/Jerusalem": "Israel (Jerusalem)", - "Asia\/Kabul": "Afghanistan (Kabul)", - "Asia\/Kamchatka": "Russia (Kamchatka)", - "Asia\/Karachi": "Pakistan (Karachi)", - "Asia\/Katmandu": "Nepal (Kathmandu)", + "Asia\/Jakarta": "hora de Indonesia (Jakarta)", + "Asia\/Jayapura": "hora de Indonesia (Jayapura)", + "Asia\/Jerusalem": "hora de Israel (Jerusalem)", + "Asia\/Kabul": "hora de Afghanistan (Kabul)", + "Asia\/Kamchatka": "hora de Russia (Kamchatka)", + "Asia\/Karachi": "hora de Pakistan (Karachi)", + "Asia\/Katmandu": "hora de Nepal (Kathmandu)", "Asia\/Khandyga": "hora de Yakutsk (Chandyga)", "Asia\/Krasnoyarsk": "hora de Krasnoyarsk", - "Asia\/Kuala_Lumpur": "Malaysia (Kuala Lumpur)", - "Asia\/Kuching": "Malaysia (Kuching)", + "Asia\/Kuala_Lumpur": "hora de Malaysia (Kuala Lumpur)", + "Asia\/Kuching": "hora de Malaysia (Kuching)", "Asia\/Magadan": "hora de Magadan", - "Asia\/Makassar": "Indonesia (Makassar)", - "Asia\/Manila": "Philippinas (Manila)", - "Asia\/Muscat": "Oman (Muscat)", + "Asia\/Makassar": "hora de Indonesia (Makassar)", + "Asia\/Manila": "hora de Philippinas (Manila)", + "Asia\/Muscat": "hora de Oman (Muscat)", "Asia\/Nicosia": "hora de Europa oriental (Nicosia)", "Asia\/Novokuznetsk": "hora de Krasnoyarsk (Novokuznetsk)", "Asia\/Novosibirsk": "hora de Novosibirsk", "Asia\/Omsk": "hora de Omsk", - "Asia\/Oral": "Kazakhstan (Oral)", - "Asia\/Phnom_Penh": "Cambodgia (Phnom Penh)", - "Asia\/Pontianak": "Indonesia (Pontianak)", - "Asia\/Pyongyang": "Corea del Nord (Pyongyang)", - "Asia\/Qostanay": "Kazakhstan (Qostanay)", - "Asia\/Qyzylorda": "Kazakhstan (Qyzylorda)", - "Asia\/Riyadh": "Arabia Saudita (Riyadh)", + "Asia\/Oral": "hora de Kazakhstan (Oral)", + "Asia\/Phnom_Penh": "hora de Cambodgia (Phnom Penh)", + "Asia\/Pontianak": "hora de Indonesia (Pontianak)", + "Asia\/Pyongyang": "hora de Corea del Nord (Pyongyang)", + "Asia\/Qostanay": "hora de Kazakhstan (Qostanay)", + "Asia\/Qyzylorda": "hora de Kazakhstan (Qyzylorda)", + "Asia\/Riyadh": "hora de Arabia Saudita (Riyadh)", "Asia\/Sakhalin": "hora de Sachalin", - "Asia\/Samarkand": "Uzbekistan (Samarkand)", - "Asia\/Seoul": "Corea del Sud (Seoul)", - "Asia\/Shanghai": "China (Shanghai)", + "Asia\/Samarkand": "hora de Uzbekistan (Samarkand)", + "Asia\/Seoul": "hora de Corea del Sud (Seoul)", + "Asia\/Shanghai": "hora de China (Shanghai)", "Asia\/Srednekolymsk": "hora de Magadan (Srednekolymsk)", - "Asia\/Taipei": "Taiwan (Taipei)", - "Asia\/Tashkent": "Uzbekistan (Tashkent)", - "Asia\/Tbilisi": "Georgia (Tbilisi)", - "Asia\/Tehran": "Iran (Tehran)", - "Asia\/Thimphu": "Bhutan (Thimphu)", - "Asia\/Tokyo": "Japon (Tokyo)", - "Asia\/Tomsk": "Russia (Tomsk)", - "Asia\/Ulaanbaatar": "Mongolia (Ulaanbaatar)", - "Asia\/Urumqi": "China (Urumqi)", + "Asia\/Taipei": "hora de Taiwan (Taipei)", + "Asia\/Tashkent": "hora de Uzbekistan (Tashkent)", + "Asia\/Tbilisi": "hora de Georgia (Tbilisi)", + "Asia\/Tehran": "hora de Iran (Tehran)", + "Asia\/Thimphu": "hora de Bhutan (Thimphu)", + "Asia\/Tokyo": "hora de Japon (Tokyo)", + "Asia\/Tomsk": "hora de Russia (Tomsk)", + "Asia\/Ulaanbaatar": "hora de Mongolia (Ulaanbaatar)", + "Asia\/Urumqi": "hora de China (Urumqi)", "Asia\/Ust-Nera": "hora de Vladivostok (Ust-Nera)", "Asia\/Vladivostok": "hora de Vladivostok", "Asia\/Yakutsk": "hora de Yakutsk", "Asia\/Yekaterinburg": "hora de Ekaterinburg", - "Asia\/Yerevan": "Armenia (Yerevan)", + "Asia\/Yerevan": "hora de Armenia (Yerevan)", "Atlantic\/Azores": "hora del Azores", "Atlantic\/Bermuda": "hora atlantic (Bermuda)", "Atlantic\/Canary": "hora de Europa occidental (Canarias)", @@ -280,18 +280,18 @@ "Atlantic\/Madeira": "hora de Europa occidental (Madeira)", "Atlantic\/Reykjavik": "hora medie de Greenwich (Reykjavik)", "Atlantic\/St_Helena": "hora medie de Greenwich (St. Helena)", - "Australia\/Adelaide": "Australia (Adelaide)", - "Australia\/Brisbane": "Australia (Brisbane)", - "Australia\/Broken_Hill": "Australia (Broken Hill)", - "Australia\/Currie": "Australia (Currie)", - "Australia\/Darwin": "Australia (Darwin)", - "Australia\/Eucla": "Australia (Eucla)", - "Australia\/Hobart": "Australia (Hobart)", - "Australia\/Lindeman": "Australia (Lindeman)", - "Australia\/Lord_Howe": "Australia (Lord Howe)", - "Australia\/Melbourne": "Australia (Melbourne)", - "Australia\/Perth": "Australia (Perth)", - "Australia\/Sydney": "Australia (Sydney)", + "Australia\/Adelaide": "hora de Australia (Adelaide)", + "Australia\/Brisbane": "hora de Australia (Brisbane)", + "Australia\/Broken_Hill": "hora de Australia (Broken Hill)", + "Australia\/Currie": "hora de Australia (Currie)", + "Australia\/Darwin": "hora de Australia (Darwin)", + "Australia\/Eucla": "hora de Australia (Eucla)", + "Australia\/Hobart": "hora de Australia (Hobart)", + "Australia\/Lindeman": "hora de Australia (Lindeman)", + "Australia\/Lord_Howe": "hora de Australia (Lord Howe)", + "Australia\/Melbourne": "hora de Australia (Melbourne)", + "Australia\/Perth": "hora de Australia (Perth)", + "Australia\/Sydney": "hora de Australia (Sydney)", "CST6CDT": "hora central", "EST5EDT": "hora del est", "Etc\/GMT": "hora medie de Greenwich", @@ -314,11 +314,11 @@ "Europe\/Guernsey": "hora medie de Greenwich (Guernsey)", "Europe\/Helsinki": "hora de Europa oriental (Helsinki)", "Europe\/Isle_of_Man": "hora medie de Greenwich (Insula de Man)", - "Europe\/Istanbul": "Turchia (Istanbul)", + "Europe\/Istanbul": "hora de Turchia (Istanbul)", "Europe\/Jersey": "hora medie de Greenwich (Jersey)", "Europe\/Kaliningrad": "hora de Europa oriental (Kaliningrad)", "Europe\/Kiev": "hora de Europa oriental (Kiev)", - "Europe\/Kirov": "Russia (Kirov)", + "Europe\/Kirov": "hora de Russia (Kirov)", "Europe\/Lisbon": "hora de Europa occidental (Lisbona)", "Europe\/Ljubljana": "hora de Europa central (Ljubljana)", "Europe\/London": "hora medie de Greenwich (London)", @@ -335,7 +335,7 @@ "Europe\/Prague": "hora de Europa central (Praga)", "Europe\/Riga": "hora de Europa oriental (Riga)", "Europe\/Rome": "hora de Europa central (Roma)", - "Europe\/Samara": "Russia (Samara)", + "Europe\/Samara": "hora de Russia (Samara)", "Europe\/San_Marino": "hora de Europa central (San Marino)", "Europe\/Sarajevo": "hora de Europa central (Sarajevo)", "Europe\/Saratov": "hora de Moscova (Saratov)", @@ -356,50 +356,44 @@ "Europe\/Zagreb": "hora de Europa central (Zagreb)", "Europe\/Zaporozhye": "hora de Europa oriental (Zaporozhye)", "Europe\/Zurich": "hora de Europa central (Zurich)", - "Indian\/Antananarivo": "Madagascar (Antananarivo)", - "Indian\/Chagos": "Territorio oceanic britanno-indian (Chagos)", - "Indian\/Christmas": "Insula de Natal (Christmas)", - "Indian\/Comoro": "Comoros (Comoro)", - "Indian\/Kerguelen": "Territorios meridional francese (Kerguelen)", - "Indian\/Mahe": "Seychelles (Mahe)", + "Indian\/Antananarivo": "hora de Madagascar (Antananarivo)", + "Indian\/Chagos": "hora de Territorio oceanic britanno-indian (Chagos)", + "Indian\/Christmas": "hora de Insula de Natal (Christmas)", + "Indian\/Comoro": "hora de Comoros (Comoro)", + "Indian\/Kerguelen": "hora de Territorios meridional francese (Kerguelen)", + "Indian\/Mahe": "hora de Seychelles (Mahe)", "MST7MDT": "hora del montanias", "PST8PDT": "hora pacific", - "Pacific\/Apia": "Samoa (Apia)", - "Pacific\/Auckland": "Nove Zelanda (Auckland)", - "Pacific\/Bougainville": "Papua Nove Guinea (Bougainville)", - "Pacific\/Chatham": "Nove Zelanda (Chatham)", - "Pacific\/Easter": "Chile (Easter)", - "Pacific\/Efate": "Vanuatu (Efate)", - "Pacific\/Enderbury": "Kiribati (Enderbury)", - "Pacific\/Fakaofo": "Tokelau (Fakaofo)", - "Pacific\/Funafuti": "Tuvalu (Funafuti)", - "Pacific\/Galapagos": "Ecuador (Galapagos)", - "Pacific\/Gambier": "Polynesia francese (Gambier)", - "Pacific\/Guadalcanal": "Insulas Solomon (Guadalcanal)", + "Pacific\/Apia": "hora de Samoa (Apia)", + "Pacific\/Auckland": "hora de Nove Zelanda (Auckland)", + "Pacific\/Bougainville": "hora de Papua Nove Guinea (Bougainville)", + "Pacific\/Chatham": "hora de Nove Zelanda (Chatham)", + "Pacific\/Easter": "hora de Chile (Easter)", + "Pacific\/Efate": "hora de Vanuatu (Efate)", + "Pacific\/Enderbury": "hora de Kiribati (Enderbury)", + "Pacific\/Fakaofo": "hora de Tokelau (Fakaofo)", + "Pacific\/Funafuti": "hora de Tuvalu (Funafuti)", + "Pacific\/Galapagos": "hora de Ecuador (Galapagos)", + "Pacific\/Gambier": "hora de Polynesia francese (Gambier)", + "Pacific\/Guadalcanal": "hora de Insulas Solomon (Guadalcanal)", "Pacific\/Honolulu": "hora de Hawaii-Aleutianas (Honolulu)", "Pacific\/Johnston": "hora de Hawaii-Aleutianas (Johnston)", - "Pacific\/Kiritimati": "Kiribati (Kiritimati)", - "Pacific\/Kosrae": "Micronesia (Kosrae)", - "Pacific\/Kwajalein": "Insulas Marshall (Kwajalein)", - "Pacific\/Majuro": "Insulas Marshall (Majuro)", - "Pacific\/Marquesas": "Polynesia francese (Marquesas)", - "Pacific\/Norfolk": "Insula Norfolk (Norfolk)", - "Pacific\/Noumea": "Nove Caledonia (Noumea)", - "Pacific\/Pago_Pago": "Samoa american (Pago Pago)", - "Pacific\/Ponape": "Micronesia (Pohnpei)", - "Pacific\/Port_Moresby": "Papua Nove Guinea (Port Moresby)", - "Pacific\/Rarotonga": "Insulas Cook (Rarotonga)", - "Pacific\/Saipan": "Insulas Marianna del Nord (Saipan)", - "Pacific\/Tahiti": "Polynesia francese (Tahiti)", - "Pacific\/Tarawa": "Kiribati (Tarawa)", - "Pacific\/Tongatapu": "Tonga (Tongatapu)", - "Pacific\/Truk": "Micronesia (Chuuk)" + "Pacific\/Kiritimati": "hora de Kiribati (Kiritimati)", + "Pacific\/Kosrae": "hora de Micronesia (Kosrae)", + "Pacific\/Kwajalein": "hora de Insulas Marshall (Kwajalein)", + "Pacific\/Majuro": "hora de Insulas Marshall (Majuro)", + "Pacific\/Marquesas": "hora de Polynesia francese (Marquesas)", + "Pacific\/Norfolk": "hora de Insula Norfolk (Norfolk)", + "Pacific\/Noumea": "hora de Nove Caledonia (Noumea)", + "Pacific\/Pago_Pago": "hora de Samoa american (Pago Pago)", + "Pacific\/Ponape": "hora de Micronesia (Pohnpei)", + "Pacific\/Port_Moresby": "hora de Papua Nove Guinea (Port Moresby)", + "Pacific\/Rarotonga": "hora de Insulas Cook (Rarotonga)", + "Pacific\/Saipan": "hora de Insulas Marianna del Nord (Saipan)", + "Pacific\/Tahiti": "hora de Polynesia francese (Tahiti)", + "Pacific\/Tarawa": "hora de Kiribati (Tarawa)", + "Pacific\/Tongatapu": "hora de Tonga (Tongatapu)", + "Pacific\/Truk": "hora de Micronesia (Chuuk)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/id.json b/src/Symfony/Component/Intl/Resources/data/timezones/id.json index 5afd6bc0db1d3..69ff8773c3760 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/id.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/id.json @@ -151,7 +151,7 @@ "America\/Moncton": "Waktu Atlantik (Moncton)", "America\/Monterrey": "Waktu Tengah (Monterrey)", "America\/Montevideo": "Waktu Uruguay (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Waktu Kanada (Montreal)", "America\/Montserrat": "Waktu Atlantik (Montserrat)", "America\/Nassau": "Waktu Timur (Nassau)", "America\/New_York": "Waktu Timur (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Waktu Arab (Bahrain)", "Asia\/Baku": "Waktu Azerbaijan (Baku)", "Asia\/Bangkok": "Waktu Indochina (Bangkok)", - "Asia\/Barnaul": "Rusia (Barnaul)", + "Asia\/Barnaul": "Waktu Rusia (Barnaul)", "Asia\/Beirut": "Waktu Eropa Timur (Beirut)", "Asia\/Bishkek": "Waktu Kirghizia (Bishkek)", "Asia\/Brunei": "Waktu Brunei Darussalam", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Waktu Iran (Teheran)", "Asia\/Thimphu": "Waktu Bhutan (Thimphu)", "Asia\/Tokyo": "Waktu Jepang (Tokyo)", - "Asia\/Tomsk": "Rusia (Tomsk)", + "Asia\/Tomsk": "Waktu Rusia (Tomsk)", "Asia\/Ulaanbaatar": "Waktu Ulan Bator (Ulaanbaatar)", - "Asia\/Urumqi": "Tiongkok (Urumqi)", + "Asia\/Urumqi": "Waktu Tiongkok (Urumqi)", "Asia\/Ust-Nera": "Waktu Vladivostok (Ust-Nera)", "Asia\/Vientiane": "Waktu Indochina (Vientiane)", "Asia\/Vladivostok": "Waktu Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwich Mean Time (Guernsey)", "Europe\/Helsinki": "Waktu Eropa Timur (Helsinki)", "Europe\/Isle_of_Man": "Greenwich Mean Time (Pulau Man)", - "Europe\/Istanbul": "Turki (Istanbul)", + "Europe\/Istanbul": "Waktu Turki (Istanbul)", "Europe\/Jersey": "Greenwich Mean Time (Jersey)", "Europe\/Kaliningrad": "Waktu Eropa Timur (Kaliningrad)", "Europe\/Kiev": "Waktu Eropa Timur (Kiev)", - "Europe\/Kirov": "Rusia (Kirov)", + "Europe\/Kirov": "Waktu Rusia (Kirov)", "Europe\/Lisbon": "Waktu Eropa Barat (Lisbon)", "Europe\/Ljubljana": "Waktu Eropa Tengah (Ljubljana)", "Europe\/London": "Greenwich Mean Time (London)", @@ -437,10 +437,7 @@ "Pacific\/Wallis": "Waktu Wallis dan Futuna" }, "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d.%02d", - "-%02d.%02d" - ] + "HourFormatPos": "+%02d.%02d", + "HourFormatNeg": "-%02d.%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ig.json b/src/Symfony/Component/Intl/Resources/data/timezones/ig.json index 075f53e0a6b6a..7868d4937b205 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ig.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ig.json @@ -14,38 +14,38 @@ "Africa\/Dakar": "Oge Mpaghara Greemwich Mean (Dakar)", "Africa\/El_Aaiun": "Oge Mpaghara Ọdịda Anyanwụ Europe (El Aaiun)", "Africa\/Freetown": "Oge Mpaghara Greemwich Mean (Freetown)", - "Africa\/Lagos": "Naịjịrịa (Lagos)", + "Africa\/Lagos": "Oge Naịjịrịa (Lagos)", "Africa\/Lome": "Oge Mpaghara Greemwich Mean (Lome)", "Africa\/Monrovia": "Oge Mpaghara Greemwich Mean (Monrovia)", "Africa\/Nouakchott": "Oge Mpaghara Greemwich Mean (Nouakchott)", "Africa\/Ouagadougou": "Oge Mpaghara Greemwich Mean (Ouagadougou)", - "Africa\/Porto-Novo": "Binin (Porto-Novo)", + "Africa\/Porto-Novo": "Oge Binin (Porto-Novo)", "Africa\/Sao_Tome": "Oge Mpaghara Greemwich Mean (Sao Tome)", "Africa\/Tripoli": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Tripoli)", "Africa\/Tunis": "Oge Mpaghara Etiti Europe (Tunis)", - "America\/Adak": "Mba United States (Adak)", - "America\/Anchorage": "Mba United States (Anchorage)", + "America\/Adak": "Oge Mba United States (Adak)", + "America\/Anchorage": "Oge Mba United States (Anchorage)", "America\/Anguilla": "Oge Mpaghara Atlantic (Anguilla)", "America\/Antigua": "Oge Mpaghara Atlantic (Antigua)", - "America\/Araguaina": "Mba Brazil (Araguaina)", + "America\/Araguaina": "Oge Mba Brazil (Araguaina)", "America\/Aruba": "Oge Mpaghara Atlantic (Aruba)", - "America\/Bahia": "Mba Brazil (Bahia)", + "America\/Bahia": "Oge Mba Brazil (Bahia)", "America\/Bahia_Banderas": "Oge Mpaghara Etiti (Bahia Banderas)", "America\/Barbados": "Oge Mpaghara Atlantic (Barbados)", - "America\/Belem": "Mba Brazil (Belem)", + "America\/Belem": "Oge Mba Brazil (Belem)", "America\/Belize": "Oge Mpaghara Etiti (Belize)", "America\/Blanc-Sablon": "Oge Mpaghara Atlantic (Blanc-Sablon)", - "America\/Boa_Vista": "Mba Brazil (Boa Vista)", + "America\/Boa_Vista": "Oge Mba Brazil (Boa Vista)", "America\/Boise": "Oge Mpaghara Ugwu (Boise)", "America\/Cambridge_Bay": "Oge Mpaghara Ugwu (Cambridge Bay)", - "America\/Campo_Grande": "Mba Brazil (Campo Grande)", + "America\/Campo_Grande": "Oge Mba Brazil (Campo Grande)", "America\/Cancun": "Oge Mpaghara Ọwụwa Anyanwụ (Cancun)", "America\/Cayman": "Oge Mpaghara Ọwụwa Anyanwụ (Cayman)", "America\/Chicago": "Oge Mpaghara Etiti (Chicago)", "America\/Coral_Harbour": "Oge Mpaghara Ọwụwa Anyanwụ (Atikokan)", "America\/Costa_Rica": "Oge Mpaghara Etiti (Costa Rica)", "America\/Creston": "Oge Mpaghara Ugwu (Creston)", - "America\/Cuiaba": "Mba Brazil (Cuiaba)", + "America\/Cuiaba": "Oge Mba Brazil (Cuiaba)", "America\/Curacao": "Oge Mpaghara Atlantic (Curacao)", "America\/Danmarkshavn": "Oge Mpaghara Greemwich Mean (Danmarkshavn)", "America\/Dawson": "Oge Mpaghara Pacific (Dawson)", @@ -54,10 +54,10 @@ "America\/Detroit": "Oge Mpaghara Ọwụwa Anyanwụ (Detroit)", "America\/Dominica": "Oge Mpaghara Atlantic (Dominica)", "America\/Edmonton": "Oge Mpaghara Ugwu (Edmonton)", - "America\/Eirunepe": "Mba Brazil (Eirunepe)", + "America\/Eirunepe": "Oge Mba Brazil (Eirunepe)", "America\/El_Salvador": "Oge Mpaghara Etiti (El Salvador)", "America\/Fort_Nelson": "Oge Mpaghara Ugwu (Fort Nelson)", - "America\/Fortaleza": "Mba Brazil (Fortaleza)", + "America\/Fortaleza": "Oge Mba Brazil (Fortaleza)", "America\/Glace_Bay": "Oge Mpaghara Atlantic (Glace Bay)", "America\/Goose_Bay": "Oge Mpaghara Atlantic (Goose Bay)", "America\/Grand_Turk": "Oge Mpaghara Ọwụwa Anyanwụ (Grand Turk)", @@ -76,21 +76,21 @@ "America\/Inuvik": "Oge Mpaghara Ugwu (Inuvik)", "America\/Iqaluit": "Oge Mpaghara Ọwụwa Anyanwụ (Iqaluit)", "America\/Jamaica": "Oge Mpaghara Ọwụwa Anyanwụ (Jamaica)", - "America\/Juneau": "Mba United States (Juneau)", + "America\/Juneau": "Oge Mba United States (Juneau)", "America\/Kentucky\/Monticello": "Oge Mpaghara Ọwụwa Anyanwụ (Monticello, Kentucky)", "America\/Kralendijk": "Oge Mpaghara Atlantic (Kralendijk)", "America\/Los_Angeles": "Oge Mpaghara Pacific (Los Angeles)", "America\/Louisville": "Oge Mpaghara Ọwụwa Anyanwụ (Louisville)", "America\/Lower_Princes": "Oge Mpaghara Atlantic (Lower Prince’s Quarter)", - "America\/Maceio": "Mba Brazil (Maceio)", + "America\/Maceio": "Oge Mba Brazil (Maceio)", "America\/Managua": "Oge Mpaghara Etiti (Managua)", - "America\/Manaus": "Mba Brazil (Manaus)", + "America\/Manaus": "Oge Mba Brazil (Manaus)", "America\/Marigot": "Oge Mpaghara Atlantic (Marigot)", "America\/Martinique": "Oge Mpaghara Atlantic (Martinique)", "America\/Matamoros": "Oge Mpaghara Etiti (Matamoros)", "America\/Menominee": "Oge Mpaghara Etiti (Menominee)", "America\/Merida": "Oge Mpaghara Etiti (Merida)", - "America\/Metlakatla": "Mba United States (Metlakatla)", + "America\/Metlakatla": "Oge Mba United States (Metlakatla)", "America\/Mexico_City": "Oge Mpaghara Etiti (Mexico City)", "America\/Moncton": "Oge Mpaghara Atlantic (Moncton)", "America\/Monterrey": "Oge Mpaghara Etiti (Monterrey)", @@ -98,8 +98,8 @@ "America\/Nassau": "Oge Mpaghara Ọwụwa Anyanwụ (Nassau)", "America\/New_York": "Oge Mpaghara Ọwụwa Anyanwụ (New York)", "America\/Nipigon": "Oge Mpaghara Ọwụwa Anyanwụ (Nipigon)", - "America\/Nome": "Mba United States (Nome)", - "America\/Noronha": "Mba Brazil (Noronha)", + "America\/Nome": "Oge Mba United States (Nome)", + "America\/Noronha": "Oge Mba Brazil (Noronha)", "America\/North_Dakota\/Beulah": "Oge Mpaghara Etiti (Beulah, North Dakota)", "America\/North_Dakota\/Center": "Oge Mpaghara Etiti (Center, North Dakota)", "America\/North_Dakota\/New_Salem": "Oge Mpaghara Etiti (New Salem, North Dakota)", @@ -109,18 +109,18 @@ "America\/Phoenix": "Oge Mpaghara Ugwu (Phoenix)", "America\/Port-au-Prince": "Oge Mpaghara Ọwụwa Anyanwụ (Port-au-Prince)", "America\/Port_of_Spain": "Oge Mpaghara Atlantic (Port of Spain)", - "America\/Porto_Velho": "Mba Brazil (Porto Velho)", + "America\/Porto_Velho": "Oge Mba Brazil (Porto Velho)", "America\/Puerto_Rico": "Oge Mpaghara Atlantic (Puerto Rico)", "America\/Rainy_River": "Oge Mpaghara Etiti (Rainy River)", "America\/Rankin_Inlet": "Oge Mpaghara Etiti (Rankin Inlet)", - "America\/Recife": "Mba Brazil (Recife)", + "America\/Recife": "Oge Mba Brazil (Recife)", "America\/Regina": "Oge Mpaghara Etiti (Regina)", "America\/Resolute": "Oge Mpaghara Etiti (Resolute)", - "America\/Rio_Branco": "Mba Brazil (Rio Branco)", - "America\/Santarem": "Mba Brazil (Santarem)", + "America\/Rio_Branco": "Oge Mba Brazil (Rio Branco)", + "America\/Santarem": "Oge Mba Brazil (Santarem)", "America\/Santo_Domingo": "Oge Mpaghara Atlantic (Santo Domingo)", - "America\/Sao_Paulo": "Mba Brazil (Sao Paulo)", - "America\/Sitka": "Mba United States (Sitka)", + "America\/Sao_Paulo": "Oge Mba Brazil (Sao Paulo)", + "America\/Sitka": "Oge Mba United States (Sitka)", "America\/St_Barthelemy": "Oge Mpaghara Atlantic (St. Barthelemy)", "America\/St_Kitts": "Oge Mpaghara Atlantic (St. Kitts)", "America\/St_Lucia": "Oge Mpaghara Atlantic (St. Lucia)", @@ -136,39 +136,39 @@ "America\/Vancouver": "Oge Mpaghara Pacific (Vancouver)", "America\/Whitehorse": "Oge Mpaghara Pacific (Whitehorse)", "America\/Winnipeg": "Oge Mpaghara Etiti (Winnipeg)", - "America\/Yakutat": "Mba United States (Yakutat)", + "America\/Yakutat": "Oge Mba United States (Yakutat)", "America\/Yellowknife": "Oge Mpaghara Ugwu (Yellowknife)", "Antarctica\/Troll": "Oge Mpaghara Greemwich Mean (Troll)", "Arctic\/Longyearbyen": "Oge Mpaghara Etiti Europe (Longyearbyen)", "Asia\/Amman": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Amman)", - "Asia\/Anadyr": "Mba Russia (Anadyr)", - "Asia\/Barnaul": "Mba Russia (Barnaul)", + "Asia\/Anadyr": "Oge Mba Russia (Anadyr)", + "Asia\/Barnaul": "Oge Mba Russia (Barnaul)", "Asia\/Beirut": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Beirut)", - "Asia\/Calcutta": "Mba India (Kolkata)", - "Asia\/Chita": "Mba Russia (Chita)", + "Asia\/Calcutta": "Oge Mba India (Kolkata)", + "Asia\/Chita": "Oge Mba Russia (Chita)", "Asia\/Damascus": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Damascus)", "Asia\/Famagusta": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Famagusta)", "Asia\/Gaza": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Gaza)", "Asia\/Hebron": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Hebron)", - "Asia\/Irkutsk": "Mba Russia (Irkutsk)", - "Asia\/Kamchatka": "Mba Russia (Kamchatka)", - "Asia\/Khandyga": "Mba Russia (Khandyga)", - "Asia\/Krasnoyarsk": "Mba Russia (Krasnoyarsk)", - "Asia\/Magadan": "Mba Russia (Magadan)", + "Asia\/Irkutsk": "Oge Mba Russia (Irkutsk)", + "Asia\/Kamchatka": "Oge Mba Russia (Kamchatka)", + "Asia\/Khandyga": "Oge Mba Russia (Khandyga)", + "Asia\/Krasnoyarsk": "Oge Mba Russia (Krasnoyarsk)", + "Asia\/Magadan": "Oge Mba Russia (Magadan)", "Asia\/Nicosia": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Nicosia)", - "Asia\/Novokuznetsk": "Mba Russia (Novokuznetsk)", - "Asia\/Novosibirsk": "Mba Russia (Novosibirsk)", - "Asia\/Omsk": "Mba Russia (Omsk)", - "Asia\/Sakhalin": "Mba Russia (Sakhalin)", - "Asia\/Shanghai": "Mba China (Shanghai)", - "Asia\/Srednekolymsk": "Mba Russia (Srednekolymsk)", - "Asia\/Tokyo": "Mba Japan (Tokyo)", - "Asia\/Tomsk": "Mba Russia (Tomsk)", - "Asia\/Urumqi": "Mba China (Urumqi)", - "Asia\/Ust-Nera": "Mba Russia (Ust-Nera)", - "Asia\/Vladivostok": "Mba Russia (Vladivostok)", - "Asia\/Yakutsk": "Mba Russia (Yakutsk)", - "Asia\/Yekaterinburg": "Mba Russia (Yekaterinburg)", + "Asia\/Novokuznetsk": "Oge Mba Russia (Novokuznetsk)", + "Asia\/Novosibirsk": "Oge Mba Russia (Novosibirsk)", + "Asia\/Omsk": "Oge Mba Russia (Omsk)", + "Asia\/Sakhalin": "Oge Mba Russia (Sakhalin)", + "Asia\/Shanghai": "Oge Mba China (Shanghai)", + "Asia\/Srednekolymsk": "Oge Mba Russia (Srednekolymsk)", + "Asia\/Tokyo": "Oge Mba Japan (Tokyo)", + "Asia\/Tomsk": "Oge Mba Russia (Tomsk)", + "Asia\/Urumqi": "Oge Mba China (Urumqi)", + "Asia\/Ust-Nera": "Oge Mba Russia (Ust-Nera)", + "Asia\/Vladivostok": "Oge Mba Russia (Vladivostok)", + "Asia\/Yakutsk": "Oge Mba Russia (Yakutsk)", + "Asia\/Yekaterinburg": "Oge Mba Russia (Yekaterinburg)", "Atlantic\/Bermuda": "Oge Mpaghara Atlantic (Bermuda)", "Atlantic\/Canary": "Oge Mpaghara Ọdịda Anyanwụ Europe (Canary)", "Atlantic\/Faeroe": "Oge Mpaghara Ọdịda Anyanwụ Europe (Faroe)", @@ -181,7 +181,7 @@ "Etc\/UTC": "Nhazi Oge Ụwa Niile", "Europe\/Amsterdam": "Oge Mpaghara Etiti Europe (Amsterdam)", "Europe\/Andorra": "Oge Mpaghara Etiti Europe (Andorra)", - "Europe\/Astrakhan": "Mba Russia (Astrakhan)", + "Europe\/Astrakhan": "Oge Mba Russia (Astrakhan)", "Europe\/Athens": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Athens)", "Europe\/Belgrade": "Oge Mpaghara Etiti Europe (Belgrade)", "Europe\/Berlin": "Oge Mpaghara Etiti Europe (Berlin)", @@ -200,7 +200,7 @@ "Europe\/Jersey": "Oge Mpaghara Greemwich Mean (Jersey)", "Europe\/Kaliningrad": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Kaliningrad)", "Europe\/Kiev": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Kiev)", - "Europe\/Kirov": "Mba Russia (Kirov)", + "Europe\/Kirov": "Oge Mba Russia (Kirov)", "Europe\/Lisbon": "Oge Mpaghara Ọdịda Anyanwụ Europe (Lisbon)", "Europe\/Ljubljana": "Oge Mpaghara Etiti Europe (Ljubljana)", "Europe\/London": "Oge Mpaghara Greemwich Mean (London)", @@ -209,44 +209,38 @@ "Europe\/Malta": "Oge Mpaghara Etiti Europe (Malta)", "Europe\/Mariehamn": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Mariehamn)", "Europe\/Monaco": "Oge Mpaghara Etiti Europe (Monaco)", - "Europe\/Moscow": "Mba Russia (Moscow)", + "Europe\/Moscow": "Oge Mba Russia (Moscow)", "Europe\/Oslo": "Oge Mpaghara Etiti Europe (Oslo)", "Europe\/Paris": "Oge Mpaghara Etiti Europe (Paris)", "Europe\/Podgorica": "Oge Mpaghara Etiti Europe (Podgorica)", "Europe\/Prague": "Oge Mpaghara Etiti Europe (Prague)", "Europe\/Riga": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Riga)", "Europe\/Rome": "Oge Mpaghara Etiti Europe (Rome)", - "Europe\/Samara": "Mba Russia (Samara)", + "Europe\/Samara": "Oge Mba Russia (Samara)", "Europe\/San_Marino": "Oge Mpaghara Etiti Europe (San Marino)", "Europe\/Sarajevo": "Oge Mpaghara Etiti Europe (Sarajevo)", - "Europe\/Saratov": "Mba Russia (Saratov)", + "Europe\/Saratov": "Oge Mba Russia (Saratov)", "Europe\/Skopje": "Oge Mpaghara Etiti Europe (Skopje)", "Europe\/Sofia": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Sofia)", "Europe\/Stockholm": "Oge Mpaghara Etiti Europe (Stockholm)", "Europe\/Tallinn": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Tallinn)", "Europe\/Tirane": "Oge Mpaghara Etiti Europe (Tirane)", - "Europe\/Ulyanovsk": "Mba Russia (Ulyanovsk)", + "Europe\/Ulyanovsk": "Oge Mba Russia (Ulyanovsk)", "Europe\/Uzhgorod": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Uzhgorod)", "Europe\/Vaduz": "Oge Mpaghara Etiti Europe (Vaduz)", "Europe\/Vatican": "Oge Mpaghara Etiti Europe (Vatican)", "Europe\/Vienna": "Oge Mpaghara Etiti Europe (Vienna)", "Europe\/Vilnius": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Vilnius)", - "Europe\/Volgograd": "Mba Russia (Volgograd)", + "Europe\/Volgograd": "Oge Mba Russia (Volgograd)", "Europe\/Warsaw": "Oge Mpaghara Etiti Europe (Warsaw)", "Europe\/Zagreb": "Oge Mpaghara Etiti Europe (Zagreb)", "Europe\/Zaporozhye": "Oge Mpaghara Ọwụwa Anyanwụ Europe (Zaporozhye)", "Europe\/Zurich": "Oge Mpaghara Etiti Europe (Zurich)", - "Indian\/Comoro": "Comorosu (Comoro)", - "Indian\/Maldives": "Maldivesa (Maldives)", + "Indian\/Comoro": "Oge Comorosu (Comoro)", + "Indian\/Maldives": "Oge Maldivesa (Maldives)", "MST7MDT": "Oge Mpaghara Ugwu", "PST8PDT": "Oge Mpaghara Pacific", - "Pacific\/Honolulu": "Mba United States (Honolulu)" + "Pacific\/Honolulu": "Oge Mba United States (Honolulu)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ii.json b/src/Symfony/Component/Intl/Resources/data/timezones/ii.json index 8692c69c456da..8754c2697314d 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ii.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ii.json @@ -68,10 +68,6 @@ "Asia\/Vladivostok": "ꊉꇆꌦ (Vladivostok)", "Asia\/Yakutsk": "ꊉꇆꌦ (Yakutsk)", "Asia\/Yekaterinburg": "ꊉꇆꌦ (Yekaterinburg)", - "CST6CDT": "CST6CDT", - "EST5EDT": "EST5EDT", - "Etc\/GMT": "GMT", - "Etc\/UTC": "UTC", "Europe\/Astrakhan": "ꊉꇆꌦ (Astrakhan)", "Europe\/Berlin": "ꄓꇩ (Berlin)", "Europe\/Busingen": "ꄓꇩ (Busingen)", @@ -85,15 +81,7 @@ "Europe\/Saratov": "ꊉꇆꌦ (Saratov)", "Europe\/Ulyanovsk": "ꊉꇆꌦ (Ulyanovsk)", "Europe\/Volgograd": "ꊉꇆꌦ (Volgograd)", - "MST7MDT": "MST7MDT", - "PST8PDT": "PST8PDT", "Pacific\/Honolulu": "ꂰꇩ (Honolulu)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/in.json b/src/Symfony/Component/Intl/Resources/data/timezones/in.json deleted file mode 100644 index 5afd6bc0db1d3..0000000000000 --- a/src/Symfony/Component/Intl/Resources/data/timezones/in.json +++ /dev/null @@ -1,446 +0,0 @@ -{ - "Version": "2.1.48.42", - "Names": { - "Africa\/Abidjan": "Greenwich Mean Time (Abidjan)", - "Africa\/Accra": "Greenwich Mean Time (Accra)", - "Africa\/Addis_Ababa": "Waktu Afrika Timur (Addis Ababa)", - "Africa\/Algiers": "Waktu Eropa Tengah (Aljir)", - "Africa\/Asmera": "Waktu Afrika Timur (Asmara)", - "Africa\/Bamako": "Greenwich Mean Time (Bamako)", - "Africa\/Bangui": "Waktu Afrika Barat (Bangui)", - "Africa\/Banjul": "Greenwich Mean Time (Banjul)", - "Africa\/Bissau": "Greenwich Mean Time (Bissau)", - "Africa\/Blantyre": "Waktu Afrika Tengah (Blantyre)", - "Africa\/Brazzaville": "Waktu Afrika Barat (Brazzaville)", - "Africa\/Bujumbura": "Waktu Afrika Tengah (Bujumbura)", - "Africa\/Cairo": "Waktu Eropa Timur (Kairo)", - "Africa\/Casablanca": "Waktu Eropa Barat (Casablanca)", - "Africa\/Ceuta": "Waktu Eropa Tengah (Ceuta)", - "Africa\/Conakry": "Greenwich Mean Time (Conakry)", - "Africa\/Dakar": "Greenwich Mean Time (Dakar)", - "Africa\/Dar_es_Salaam": "Waktu Afrika Timur (Dar es Salaam)", - "Africa\/Djibouti": "Waktu Afrika Timur (Djibouti)", - "Africa\/Douala": "Waktu Afrika Barat (Douala)", - "Africa\/El_Aaiun": "Waktu Eropa Barat (El Aaiun)", - "Africa\/Freetown": "Greenwich Mean Time (Freetown)", - "Africa\/Gaborone": "Waktu Afrika Tengah (Gaborone)", - "Africa\/Harare": "Waktu Afrika Tengah (Harare)", - "Africa\/Johannesburg": "Waktu Standar Afrika Selatan (Johannesburg)", - "Africa\/Juba": "Waktu Afrika Timur (Juba)", - "Africa\/Kampala": "Waktu Afrika Timur (Kampala)", - "Africa\/Khartoum": "Waktu Afrika Tengah (Khartoum)", - "Africa\/Kigali": "Waktu Afrika Tengah (Kigali)", - "Africa\/Kinshasa": "Waktu Afrika Barat (Kinshasa)", - "Africa\/Lagos": "Waktu Afrika Barat (Lagos)", - "Africa\/Libreville": "Waktu Afrika Barat (Libreville)", - "Africa\/Lome": "Greenwich Mean Time (Lome)", - "Africa\/Luanda": "Waktu Afrika Barat (Luanda)", - "Africa\/Lubumbashi": "Waktu Afrika Tengah (Lubumbashi)", - "Africa\/Lusaka": "Waktu Afrika Tengah (Lusaka)", - "Africa\/Malabo": "Waktu Afrika Barat (Malabo)", - "Africa\/Maputo": "Waktu Afrika Tengah (Maputo)", - "Africa\/Maseru": "Waktu Standar Afrika Selatan (Maseru)", - "Africa\/Mbabane": "Waktu Standar Afrika Selatan (Mbabane)", - "Africa\/Mogadishu": "Waktu Afrika Timur (Mogadishu)", - "Africa\/Monrovia": "Greenwich Mean Time (Monrovia)", - "Africa\/Nairobi": "Waktu Afrika Timur (Nairobi)", - "Africa\/Ndjamena": "Waktu Afrika Barat (Ndjamena)", - "Africa\/Niamey": "Waktu Afrika Barat (Niamey)", - "Africa\/Nouakchott": "Greenwich Mean Time (Nouakchott)", - "Africa\/Ouagadougou": "Greenwich Mean Time (Ouagadougou)", - "Africa\/Porto-Novo": "Waktu Afrika Barat (Porto-Novo)", - "Africa\/Sao_Tome": "Greenwich Mean Time (Sao Tome)", - "Africa\/Tripoli": "Waktu Eropa Timur (Tripoli)", - "Africa\/Tunis": "Waktu Eropa Tengah (Tunis)", - "Africa\/Windhoek": "Waktu Afrika Tengah (Windhoek)", - "America\/Adak": "Waktu Hawaii-Aleutian (Adak)", - "America\/Anchorage": "Waktu Alaska (Anchorage)", - "America\/Anguilla": "Waktu Atlantik (Anguila)", - "America\/Antigua": "Waktu Atlantik (Antigua)", - "America\/Araguaina": "Waktu Brasil (Araguaina)", - "America\/Argentina\/La_Rioja": "Waktu Argentina (La Rioja)", - "America\/Argentina\/Rio_Gallegos": "Waktu Argentina (Rio Gallegos)", - "America\/Argentina\/Salta": "Waktu Argentina (Salta)", - "America\/Argentina\/San_Juan": "Waktu Argentina (San Juan)", - "America\/Argentina\/San_Luis": "Waktu Argentina Bagian Barat (San Luis)", - "America\/Argentina\/Tucuman": "Waktu Argentina (Tucuman)", - "America\/Argentina\/Ushuaia": "Waktu Argentina (Ushuaia)", - "America\/Aruba": "Waktu Atlantik (Aruba)", - "America\/Asuncion": "Waktu Paraguay (Asuncion)", - "America\/Bahia": "Waktu Brasil (Bahia)", - "America\/Bahia_Banderas": "Waktu Tengah (Bahia Banderas)", - "America\/Barbados": "Waktu Atlantik (Barbados)", - "America\/Belem": "Waktu Brasil (Belem)", - "America\/Belize": "Waktu Tengah (Belize)", - "America\/Blanc-Sablon": "Waktu Atlantik (Blanc-Sablon)", - "America\/Boa_Vista": "Waktu Amazon (Boa Vista)", - "America\/Bogota": "Waktu Kolombia (Bogota)", - "America\/Boise": "Waktu Pegunungan (Boise)", - "America\/Buenos_Aires": "Waktu Argentina (Buenos Aires)", - "America\/Cambridge_Bay": "Waktu Pegunungan (Cambridge Bay)", - "America\/Campo_Grande": "Waktu Amazon (Campo Grande)", - "America\/Cancun": "Waktu Timur (Cancun)", - "America\/Caracas": "Waktu Venezuela (Caracas)", - "America\/Catamarca": "Waktu Argentina (Catamarca)", - "America\/Cayenne": "Waktu Guyana Prancis (Cayenne)", - "America\/Cayman": "Waktu Timur (Cayman)", - "America\/Chicago": "Waktu Tengah (Chicago)", - "America\/Chihuahua": "Waktu Pasifik Meksiko (Chihuahua)", - "America\/Coral_Harbour": "Waktu Timur (Atikokan)", - "America\/Cordoba": "Waktu Argentina (Cordoba)", - "America\/Costa_Rica": "Waktu Tengah (Kosta Rika)", - "America\/Creston": "Waktu Pegunungan (Creston)", - "America\/Cuiaba": "Waktu Amazon (Cuiaba)", - "America\/Curacao": "Waktu Atlantik (Curacao)", - "America\/Danmarkshavn": "Greenwich Mean Time (Danmarkshavn)", - "America\/Dawson": "Waktu Pasifik (Dawson)", - "America\/Dawson_Creek": "Waktu Pegunungan (Dawson Creek)", - "America\/Denver": "Waktu Pegunungan (Denver)", - "America\/Detroit": "Waktu Timur (Detroit)", - "America\/Dominica": "Waktu Atlantik (Dominika)", - "America\/Edmonton": "Waktu Pegunungan (Edmonton)", - "America\/Eirunepe": "Waktu Acre (Eirunepe)", - "America\/El_Salvador": "Waktu Tengah (El Salvador)", - "America\/Fort_Nelson": "Waktu Pegunungan (Fort Nelson)", - "America\/Fortaleza": "Waktu Brasil (Fortaleza)", - "America\/Glace_Bay": "Waktu Atlantik (Glace Bay)", - "America\/Godthab": "Waktu Greenland Barat (Nuuk)", - "America\/Goose_Bay": "Waktu Atlantik (Goose Bay)", - "America\/Grand_Turk": "Waktu Timur (Grand Turk)", - "America\/Grenada": "Waktu Atlantik (Grenada)", - "America\/Guadeloupe": "Waktu Atlantik (Guadeloupe)", - "America\/Guatemala": "Waktu Tengah (Guatemala)", - "America\/Guayaquil": "Waktu Ekuador (Guayaquil)", - "America\/Guyana": "Waktu Guyana", - "America\/Halifax": "Waktu Atlantik (Halifax)", - "America\/Havana": "Waktu Kuba (Havana)", - "America\/Hermosillo": "Waktu Pasifik Meksiko (Hermosillo)", - "America\/Indiana\/Knox": "Waktu Tengah (Knox, Indiana)", - "America\/Indiana\/Marengo": "Waktu Timur (Marengo, Indiana)", - "America\/Indiana\/Petersburg": "Waktu Timur (Petersburg, Indiana)", - "America\/Indiana\/Tell_City": "Waktu Tengah (Tell City, Indiana)", - "America\/Indiana\/Vevay": "Waktu Timur (Vevay, Indiana)", - "America\/Indiana\/Vincennes": "Waktu Timur (Vincennes, Indiana)", - "America\/Indiana\/Winamac": "Waktu Timur (Winamac, Indiana)", - "America\/Indianapolis": "Waktu Timur (Indianapolis)", - "America\/Inuvik": "Waktu Pegunungan (Inuvik)", - "America\/Iqaluit": "Waktu Timur (Iqaluit)", - "America\/Jamaica": "Waktu Timur (Jamaica)", - "America\/Jujuy": "Waktu Argentina (Jujuy)", - "America\/Juneau": "Waktu Alaska (Juneau)", - "America\/Kentucky\/Monticello": "Waktu Timur (Monticello, Kentucky)", - "America\/Kralendijk": "Waktu Atlantik (Kralendijk)", - "America\/La_Paz": "Waktu Bolivia (La Paz)", - "America\/Lima": "Waktu Peru (Lima)", - "America\/Los_Angeles": "Waktu Pasifik (Los Angeles)", - "America\/Louisville": "Waktu Timur (Louisville)", - "America\/Lower_Princes": "Waktu Atlantik (Lower Prince’s Quarter)", - "America\/Maceio": "Waktu Brasil (Maceio)", - "America\/Managua": "Waktu Tengah (Managua)", - "America\/Manaus": "Waktu Amazon (Manaus)", - "America\/Marigot": "Waktu Atlantik (Marigot)", - "America\/Martinique": "Waktu Atlantik (Martinik)", - "America\/Matamoros": "Waktu Tengah (Matamoros)", - "America\/Mazatlan": "Waktu Pasifik Meksiko (Mazatlan)", - "America\/Mendoza": "Waktu Argentina (Mendoza)", - "America\/Menominee": "Waktu Tengah (Menominee)", - "America\/Merida": "Waktu Tengah (Merida)", - "America\/Metlakatla": "Waktu Alaska (Metlakatla)", - "America\/Mexico_City": "Waktu Tengah (Mexico City)", - "America\/Miquelon": "Waktu Saint Pierre dan Miquelon", - "America\/Moncton": "Waktu Atlantik (Moncton)", - "America\/Monterrey": "Waktu Tengah (Monterrey)", - "America\/Montevideo": "Waktu Uruguay (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", - "America\/Montserrat": "Waktu Atlantik (Montserrat)", - "America\/Nassau": "Waktu Timur (Nassau)", - "America\/New_York": "Waktu Timur (New York)", - "America\/Nipigon": "Waktu Timur (Nipigon)", - "America\/Nome": "Waktu Alaska (Nome)", - "America\/Noronha": "Waktu Fernando de Noronha", - "America\/North_Dakota\/Beulah": "Waktu Tengah (Beulah, Dakota Utara)", - "America\/North_Dakota\/Center": "Waktu Tengah (Center, Dakota Utara)", - "America\/North_Dakota\/New_Salem": "Waktu Tengah (New Salem, Dakota Utara)", - "America\/Ojinaga": "Waktu Pegunungan (Ojinaga)", - "America\/Panama": "Waktu Timur (Panama)", - "America\/Pangnirtung": "Waktu Timur (Pangnirtung)", - "America\/Paramaribo": "Waktu Suriname (Paramaribo)", - "America\/Phoenix": "Waktu Pegunungan (Phoenix)", - "America\/Port-au-Prince": "Waktu Timur (Port-au-Prince)", - "America\/Port_of_Spain": "Waktu Atlantik (Port of Spain)", - "America\/Porto_Velho": "Waktu Amazon (Porto Velho)", - "America\/Puerto_Rico": "Waktu Atlantik (Puerto Rico)", - "America\/Punta_Arenas": "Waktu Cile (Punta Arenas)", - "America\/Rainy_River": "Waktu Tengah (Rainy River)", - "America\/Rankin_Inlet": "Waktu Tengah (Rankin Inlet)", - "America\/Recife": "Waktu Brasil (Recife)", - "America\/Regina": "Waktu Tengah (Regina)", - "America\/Resolute": "Waktu Tengah (Resolute)", - "America\/Rio_Branco": "Waktu Acre (Rio Branco)", - "America\/Santa_Isabel": "Waktu Meksiko Barat Laut (Santa Isabel)", - "America\/Santarem": "Waktu Brasil (Santarem)", - "America\/Santiago": "Waktu Cile (Santiago)", - "America\/Santo_Domingo": "Waktu Atlantik (Santo Domingo)", - "America\/Sao_Paulo": "Waktu Brasil (Sao Paulo)", - "America\/Scoresbysund": "Waktu Greenland Timur (Ittoqqortoormiit)", - "America\/Sitka": "Waktu Alaska (Sitka)", - "America\/St_Barthelemy": "Waktu Atlantik (St. Barthelemy)", - "America\/St_Johns": "Waktu Newfoundland (St. John’s)", - "America\/St_Kitts": "Waktu Atlantik (St. Kitts)", - "America\/St_Lucia": "Waktu Atlantik (St. Lucia)", - "America\/St_Thomas": "Waktu Atlantik (St. Thomas)", - "America\/St_Vincent": "Waktu Atlantik (St. Vincent)", - "America\/Swift_Current": "Waktu Tengah (Swift Current)", - "America\/Tegucigalpa": "Waktu Tengah (Tegucigalpa)", - "America\/Thule": "Waktu Atlantik (Thule)", - "America\/Thunder_Bay": "Waktu Timur (Thunder Bay)", - "America\/Tijuana": "Waktu Pasifik (Tijuana)", - "America\/Toronto": "Waktu Timur (Toronto)", - "America\/Tortola": "Waktu Atlantik (Tortola)", - "America\/Vancouver": "Waktu Pasifik (Vancouver)", - "America\/Whitehorse": "Waktu Pasifik (Whitehorse)", - "America\/Winnipeg": "Waktu Tengah (Winnipeg)", - "America\/Yakutat": "Waktu Alaska (Yakutat)", - "America\/Yellowknife": "Waktu Pegunungan (Yellowknife)", - "Antarctica\/Casey": "Waktu Barat Australia (Casey)", - "Antarctica\/Davis": "Waktu Davis", - "Antarctica\/DumontDUrville": "Waktu Dumont-d’Urville", - "Antarctica\/Macquarie": "Waktu Kepulauan Macquarie", - "Antarctica\/Mawson": "Waktu Mawson", - "Antarctica\/McMurdo": "Waktu Selandia Baru (McMurdo)", - "Antarctica\/Palmer": "Waktu Cile (Palmer)", - "Antarctica\/Rothera": "Waktu Rothera", - "Antarctica\/Syowa": "Waktu Syowa", - "Antarctica\/Troll": "Greenwich Mean Time (Troll)", - "Antarctica\/Vostok": "Waktu Vostok", - "Arctic\/Longyearbyen": "Waktu Eropa Tengah (Longyearbyen)", - "Asia\/Aden": "Waktu Arab (Aden)", - "Asia\/Almaty": "Waktu Kazakhstan Timur (Almaty)", - "Asia\/Amman": "Waktu Eropa Timur (Amman)", - "Asia\/Anadyr": "Waktu Anadyr", - "Asia\/Aqtau": "Waktu Kazakhstan Barat (Aktau)", - "Asia\/Aqtobe": "Waktu Kazakhstan Barat (Aktobe)", - "Asia\/Ashgabat": "Waktu Turkmenistan (Ashgabat)", - "Asia\/Atyrau": "Waktu Kazakhstan Barat (Atyrau)", - "Asia\/Baghdad": "Waktu Arab (Baghdad)", - "Asia\/Bahrain": "Waktu Arab (Bahrain)", - "Asia\/Baku": "Waktu Azerbaijan (Baku)", - "Asia\/Bangkok": "Waktu Indochina (Bangkok)", - "Asia\/Barnaul": "Rusia (Barnaul)", - "Asia\/Beirut": "Waktu Eropa Timur (Beirut)", - "Asia\/Bishkek": "Waktu Kirghizia (Bishkek)", - "Asia\/Brunei": "Waktu Brunei Darussalam", - "Asia\/Calcutta": "Waktu India (Kolkata)", - "Asia\/Chita": "Waktu Yakutsk (Chita)", - "Asia\/Choibalsan": "Waktu Choibalsan", - "Asia\/Colombo": "Waktu India (Kolombo)", - "Asia\/Damascus": "Waktu Eropa Timur (Damaskus)", - "Asia\/Dhaka": "Waktu Bangladesh (Dhaka)", - "Asia\/Dili": "Waktu Timor Leste (Dili)", - "Asia\/Dubai": "Waktu Standar Teluk (Dubai)", - "Asia\/Dushanbe": "Waktu Tajikistan (Dushanbe)", - "Asia\/Famagusta": "Waktu Eropa Timur (Famagusta)", - "Asia\/Gaza": "Waktu Eropa Timur (Gaza)", - "Asia\/Hebron": "Waktu Eropa Timur (Hebron)", - "Asia\/Hong_Kong": "Waktu Hong Kong", - "Asia\/Hovd": "Waktu Hovd", - "Asia\/Irkutsk": "Waktu Irkutsk", - "Asia\/Jakarta": "Waktu Indonesia Barat (Jakarta)", - "Asia\/Jayapura": "Waktu Indonesia Timur (Jayapura)", - "Asia\/Jerusalem": "Waktu Israel (Yerusalem)", - "Asia\/Kabul": "Waktu Afganistan (Kabul)", - "Asia\/Kamchatka": "Waktu Petropavlovsk-Kamchatsky (Kamchatka)", - "Asia\/Karachi": "Waktu Pakistan (Karachi)", - "Asia\/Katmandu": "Waktu Nepal (Kathmandu)", - "Asia\/Khandyga": "Waktu Yakutsk (Khandyga)", - "Asia\/Krasnoyarsk": "Waktu Krasnoyarsk", - "Asia\/Kuala_Lumpur": "Waktu Malaysia (Kuala Lumpur)", - "Asia\/Kuching": "Waktu Malaysia (Kuching)", - "Asia\/Kuwait": "Waktu Arab (Kuwait)", - "Asia\/Macau": "Waktu Tiongkok (Makau)", - "Asia\/Magadan": "Waktu Magadan", - "Asia\/Makassar": "Waktu Indonesia Tengah (Makassar)", - "Asia\/Manila": "Waktu Filipina (Manila)", - "Asia\/Muscat": "Waktu Standar Teluk (Muskat)", - "Asia\/Nicosia": "Waktu Eropa Timur (Nikosia)", - "Asia\/Novokuznetsk": "Waktu Krasnoyarsk (Novokuznetsk)", - "Asia\/Novosibirsk": "Waktu Novosibirsk", - "Asia\/Omsk": "Waktu Omsk", - "Asia\/Oral": "Waktu Kazakhstan Barat (Oral)", - "Asia\/Phnom_Penh": "Waktu Indochina (Phnom Penh)", - "Asia\/Pontianak": "Waktu Indonesia Barat (Pontianak)", - "Asia\/Pyongyang": "Waktu Korea (Pyongyang)", - "Asia\/Qatar": "Waktu Arab (Qatar)", - "Asia\/Qostanay": "Waktu Kazakhstan Timur (Qostanay)", - "Asia\/Qyzylorda": "Waktu Kazakhstan Barat (Qyzylorda)", - "Asia\/Rangoon": "Waktu Myanmar (Rangoon)", - "Asia\/Riyadh": "Waktu Arab (Riyadh)", - "Asia\/Saigon": "Waktu Indochina (Ho Chi Minh)", - "Asia\/Sakhalin": "Waktu Sakhalin", - "Asia\/Samarkand": "Waktu Uzbekistan (Samarkand)", - "Asia\/Seoul": "Waktu Korea (Seoul)", - "Asia\/Shanghai": "Waktu Tiongkok (Shanghai)", - "Asia\/Singapore": "Waktu Standar Singapura", - "Asia\/Srednekolymsk": "Waktu Magadan (Srednekolymsk)", - "Asia\/Taipei": "Waktu Taipei", - "Asia\/Tashkent": "Waktu Uzbekistan (Tashkent)", - "Asia\/Tbilisi": "Waktu Georgia (Tbilisi)", - "Asia\/Tehran": "Waktu Iran (Teheran)", - "Asia\/Thimphu": "Waktu Bhutan (Thimphu)", - "Asia\/Tokyo": "Waktu Jepang (Tokyo)", - "Asia\/Tomsk": "Rusia (Tomsk)", - "Asia\/Ulaanbaatar": "Waktu Ulan Bator (Ulaanbaatar)", - "Asia\/Urumqi": "Tiongkok (Urumqi)", - "Asia\/Ust-Nera": "Waktu Vladivostok (Ust-Nera)", - "Asia\/Vientiane": "Waktu Indochina (Vientiane)", - "Asia\/Vladivostok": "Waktu Vladivostok", - "Asia\/Yakutsk": "Waktu Yakutsk", - "Asia\/Yekaterinburg": "Waktu Yekaterinburg", - "Asia\/Yerevan": "Waktu Armenia (Yerevan)", - "Atlantic\/Azores": "Waktu Azores", - "Atlantic\/Bermuda": "Waktu Atlantik (Bermuda)", - "Atlantic\/Canary": "Waktu Eropa Barat (Canary)", - "Atlantic\/Cape_Verde": "Waktu Tanjung Verde", - "Atlantic\/Faeroe": "Waktu Eropa Barat (Faroe)", - "Atlantic\/Madeira": "Waktu Eropa Barat (Madeira)", - "Atlantic\/Reykjavik": "Greenwich Mean Time (Reykjavik)", - "Atlantic\/South_Georgia": "Waktu Georgia Selatan", - "Atlantic\/St_Helena": "Greenwich Mean Time (St. Helena)", - "Atlantic\/Stanley": "Waktu Kepulauan Falkland (Stanley)", - "Australia\/Adelaide": "Waktu Tengah Australia (Adelaide)", - "Australia\/Brisbane": "Waktu Timur Australia (Brisbane)", - "Australia\/Broken_Hill": "Waktu Tengah Australia (Broken Hill)", - "Australia\/Currie": "Waktu Timur Australia (Currie)", - "Australia\/Darwin": "Waktu Tengah Australia (Darwin)", - "Australia\/Eucla": "Waktu Barat Tengah Australia (Eucla)", - "Australia\/Hobart": "Waktu Timur Australia (Hobart)", - "Australia\/Lindeman": "Waktu Timur Australia (Lindeman)", - "Australia\/Lord_Howe": "Waktu Lord Howe", - "Australia\/Melbourne": "Waktu Timur Australia (Melbourne)", - "Australia\/Perth": "Waktu Barat Australia (Perth)", - "Australia\/Sydney": "Waktu Timur Australia (Sydney)", - "CST6CDT": "Waktu Tengah", - "EST5EDT": "Waktu Timur", - "Etc\/GMT": "Greenwich Mean Time", - "Etc\/UTC": "Waktu Universal Terkoordinasi", - "Europe\/Amsterdam": "Waktu Eropa Tengah (Amsterdam)", - "Europe\/Andorra": "Waktu Eropa Tengah (Andorra)", - "Europe\/Astrakhan": "Waktu Moskwa (Astrakhan)", - "Europe\/Athens": "Waktu Eropa Timur (Athena)", - "Europe\/Belgrade": "Waktu Eropa Tengah (Beograd)", - "Europe\/Berlin": "Waktu Eropa Tengah (Berlin)", - "Europe\/Bratislava": "Waktu Eropa Tengah (Bratislava)", - "Europe\/Brussels": "Waktu Eropa Tengah (Brussels)", - "Europe\/Bucharest": "Waktu Eropa Timur (Bucharest)", - "Europe\/Budapest": "Waktu Eropa Tengah (Budapest)", - "Europe\/Busingen": "Waktu Eropa Tengah (Busingen)", - "Europe\/Chisinau": "Waktu Eropa Timur (Kishinev)", - "Europe\/Copenhagen": "Waktu Eropa Tengah (Kopenhagen)", - "Europe\/Dublin": "Greenwich Mean Time (Dublin)", - "Europe\/Gibraltar": "Waktu Eropa Tengah (Gibraltar)", - "Europe\/Guernsey": "Greenwich Mean Time (Guernsey)", - "Europe\/Helsinki": "Waktu Eropa Timur (Helsinki)", - "Europe\/Isle_of_Man": "Greenwich Mean Time (Pulau Man)", - "Europe\/Istanbul": "Turki (Istanbul)", - "Europe\/Jersey": "Greenwich Mean Time (Jersey)", - "Europe\/Kaliningrad": "Waktu Eropa Timur (Kaliningrad)", - "Europe\/Kiev": "Waktu Eropa Timur (Kiev)", - "Europe\/Kirov": "Rusia (Kirov)", - "Europe\/Lisbon": "Waktu Eropa Barat (Lisbon)", - "Europe\/Ljubljana": "Waktu Eropa Tengah (Ljubljana)", - "Europe\/London": "Greenwich Mean Time (London)", - "Europe\/Luxembourg": "Waktu Eropa Tengah (Luksemburg)", - "Europe\/Madrid": "Waktu Eropa Tengah (Madrid)", - "Europe\/Malta": "Waktu Eropa Tengah (Malta)", - "Europe\/Mariehamn": "Waktu Eropa Timur (Mariehamn)", - "Europe\/Minsk": "Waktu Moskwa (Minsk)", - "Europe\/Monaco": "Waktu Eropa Tengah (Monako)", - "Europe\/Moscow": "Waktu Moskwa", - "Europe\/Oslo": "Waktu Eropa Tengah (Oslo)", - "Europe\/Paris": "Waktu Eropa Tengah (Paris)", - "Europe\/Podgorica": "Waktu Eropa Tengah (Podgorica)", - "Europe\/Prague": "Waktu Eropa Tengah (Praha)", - "Europe\/Riga": "Waktu Eropa Timur (Riga)", - "Europe\/Rome": "Waktu Eropa Tengah (Roma)", - "Europe\/Samara": "Waktu Samara", - "Europe\/San_Marino": "Waktu Eropa Tengah (San Marino)", - "Europe\/Sarajevo": "Waktu Eropa Tengah (Sarajevo)", - "Europe\/Saratov": "Waktu Moskwa (Saratov)", - "Europe\/Simferopol": "Waktu Moskwa (Simferopol)", - "Europe\/Skopje": "Waktu Eropa Tengah (Skopje)", - "Europe\/Sofia": "Waktu Eropa Timur (Sofia)", - "Europe\/Stockholm": "Waktu Eropa Tengah (Stockholm)", - "Europe\/Tallinn": "Waktu Eropa Timur (Tallinn)", - "Europe\/Tirane": "Waktu Eropa Tengah (Tirane)", - "Europe\/Ulyanovsk": "Waktu Moskwa (Ulyanovsk)", - "Europe\/Uzhgorod": "Waktu Eropa Timur (Uzhhorod)", - "Europe\/Vaduz": "Waktu Eropa Tengah (Vaduz)", - "Europe\/Vatican": "Waktu Eropa Tengah (Vatikan)", - "Europe\/Vienna": "Waktu Eropa Tengah (Wina)", - "Europe\/Vilnius": "Waktu Eropa Timur (Vilnius)", - "Europe\/Volgograd": "Waktu Volgograd", - "Europe\/Warsaw": "Waktu Eropa Tengah (Warsawa)", - "Europe\/Zagreb": "Waktu Eropa Tengah (Zagreb)", - "Europe\/Zaporozhye": "Waktu Eropa Timur (Zaporizhia)", - "Europe\/Zurich": "Waktu Eropa Tengah (Zurich)", - "Indian\/Antananarivo": "Waktu Afrika Timur (Antananarivo)", - "Indian\/Chagos": "Waktu Samudera Hindia (Chagos)", - "Indian\/Christmas": "Waktu Pulau Natal (Christmas)", - "Indian\/Cocos": "Waktu Kepulauan Cocos", - "Indian\/Comoro": "Waktu Afrika Timur (Komoro)", - "Indian\/Kerguelen": "Waktu Wilayah Selatan dan Antarktika Prancis (Kerguelen)", - "Indian\/Mahe": "Waktu Seychelles (Mahe)", - "Indian\/Maldives": "Waktu Maladewa", - "Indian\/Mauritius": "Waktu Mauritius", - "Indian\/Mayotte": "Waktu Afrika Timur (Mayotte)", - "Indian\/Reunion": "Waktu Reunion", - "MST7MDT": "Waktu Pegunungan", - "PST8PDT": "Waktu Pasifik", - "Pacific\/Apia": "Waktu Apia", - "Pacific\/Auckland": "Waktu Selandia Baru (Auckland)", - "Pacific\/Bougainville": "Waktu Papua Nugini (Bougainville)", - "Pacific\/Chatham": "Waktu Chatham", - "Pacific\/Easter": "Waktu Pulau Paskah (Easter)", - "Pacific\/Efate": "Waktu Vanuatu (Efate)", - "Pacific\/Enderbury": "Waktu Kepulauan Phoenix (Enderbury)", - "Pacific\/Fakaofo": "Waktu Tokelau (Fakaofo)", - "Pacific\/Fiji": "Waktu Fiji", - "Pacific\/Funafuti": "Waktu Tuvalu (Funafuti)", - "Pacific\/Galapagos": "Waktu Galapagos", - "Pacific\/Gambier": "Waktu Gambier", - "Pacific\/Guadalcanal": "Waktu Kepulauan Solomon (Guadalkanal)", - "Pacific\/Guam": "Waktu Standar Chamorro (Guam)", - "Pacific\/Honolulu": "Waktu Hawaii-Aleutian (Honolulu)", - "Pacific\/Johnston": "Waktu Hawaii-Aleutian (Johnston)", - "Pacific\/Kiritimati": "Waktu Kep. Line (Kiritimati)", - "Pacific\/Kosrae": "Waktu Kosrae", - "Pacific\/Kwajalein": "Waktu Kep. Marshall (Kwajalein)", - "Pacific\/Majuro": "Waktu Kep. Marshall (Majuro)", - "Pacific\/Marquesas": "Waktu Marquesas", - "Pacific\/Midway": "Waktu Samoa (Midway)", - "Pacific\/Nauru": "Waktu Nauru", - "Pacific\/Niue": "Waktu Niue", - "Pacific\/Norfolk": "Waktu Kepulauan Norfolk", - "Pacific\/Noumea": "Waktu Kaledonia Baru (Noumea)", - "Pacific\/Pago_Pago": "Waktu Samoa (Pago Pago)", - "Pacific\/Palau": "Waktu Palau", - "Pacific\/Pitcairn": "Waktu Pitcairn", - "Pacific\/Ponape": "Waktu Ponape (Pohnpei)", - "Pacific\/Port_Moresby": "Waktu Papua Nugini (Port Moresby)", - "Pacific\/Rarotonga": "Waktu Kep. Cook (Rarotonga)", - "Pacific\/Saipan": "Waktu Standar Chamorro (Saipan)", - "Pacific\/Tahiti": "Waktu Tahiti", - "Pacific\/Tarawa": "Waktu Kep. Gilbert (Tarawa)", - "Pacific\/Tongatapu": "Waktu Tonga (Tongatapu)", - "Pacific\/Truk": "Waktu Chuuk", - "Pacific\/Wake": "Waktu Kepulauan Wake", - "Pacific\/Wallis": "Waktu Wallis dan Futuna" - }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d.%02d", - "-%02d.%02d" - ] - } -} diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/is.json b/src/Symfony/Component/Intl/Resources/data/timezones/is.json index d666378599b01..bbc11d64873b4 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/is.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/is.json @@ -436,11 +436,5 @@ "Pacific\/Wake": "Tími á Wake-eyju", "Pacific\/Wallis": "Tími á Wallis- og Fútúnaeyjum" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/it.json b/src/Symfony/Component/Intl/Resources/data/timezones/it.json index a6a9ba2985d4f..b7d20f290a0af 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/it.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/it.json @@ -99,7 +99,7 @@ "America\/Detroit": "Ora orientale USA (Detroit)", "America\/Dominica": "Ora dell’Atlantico (Dominica)", "America\/Edmonton": "Ora Montagne Rocciose USA (Edmonton)", - "America\/Eirunepe": "Brasile (Eirunepe)", + "America\/Eirunepe": "Ora Brasile (Eirunepe)", "America\/El_Salvador": "Ora centrale USA (El Salvador)", "America\/Fort_Nelson": "Ora Montagne Rocciose USA (Fort Nelson)", "America\/Fortaleza": "Ora di Brasilia (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Ora dell’Atlantico (Moncton)", "America\/Monterrey": "Ora centrale USA (Monterrey)", "America\/Montevideo": "Ora dell’Uruguay (Montevideo)", - "America\/Montreal": "Canada (Montreal)", + "America\/Montreal": "Ora Canada (Montreal)", "America\/Montserrat": "Ora dell’Atlantico (Montserrat)", "America\/Nassau": "Ora orientale USA (Nassau)", "America\/New_York": "Ora orientale USA (New York)", @@ -176,7 +176,7 @@ "America\/Recife": "Ora di Brasilia (Recife)", "America\/Regina": "Ora centrale USA (Regina)", "America\/Resolute": "Ora centrale USA (Resolute)", - "America\/Rio_Branco": "Brasile (Rio Branco)", + "America\/Rio_Branco": "Ora Brasile (Rio Branco)", "America\/Santa_Isabel": "Ora del Messico nord-occidentale (Santa Isabel)", "America\/Santarem": "Ora di Brasilia (Santarém)", "America\/Santiago": "Ora del Cile (Santiago)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Ora araba (Bahrein)", "Asia\/Baku": "Ora dell’Azerbaigian (Baku)", "Asia\/Bangkok": "Ora dell’Indocina (Bangkok)", - "Asia\/Barnaul": "Russia (Barnaul)", + "Asia\/Barnaul": "Ora Russia (Barnaul)", "Asia\/Beirut": "Ora dell’Europa orientale (Beirut)", "Asia\/Bishkek": "Ora del Kirghizistan (Bishkek)", "Asia\/Brunei": "Ora del Brunei Darussalam", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Ora dell’Iran (Teheran)", "Asia\/Thimphu": "Ora del Bhutan (Thimphu)", "Asia\/Tokyo": "Ora del Giappone (Tokyo)", - "Asia\/Tomsk": "Russia (Tomsk)", + "Asia\/Tomsk": "Ora Russia (Tomsk)", "Asia\/Ulaanbaatar": "Ora di Ulan Bator (Ulaanbaatar)", - "Asia\/Urumqi": "Cina (Urumqi)", + "Asia\/Urumqi": "Ora Cina (Urumqi)", "Asia\/Ust-Nera": "Ora di Vladivostok (Ust’-Nera)", "Asia\/Vientiane": "Ora dell’Indocina (Vientiane)", "Asia\/Vladivostok": "Ora di Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Ora del meridiano di Greenwich (Guernsey)", "Europe\/Helsinki": "Ora dell’Europa orientale (Helsinki)", "Europe\/Isle_of_Man": "Ora del meridiano di Greenwich (Isola di Man)", - "Europe\/Istanbul": "Turchia (Istanbul)", + "Europe\/Istanbul": "Ora Turchia (Istanbul)", "Europe\/Jersey": "Ora del meridiano di Greenwich (Jersey)", "Europe\/Kaliningrad": "Ora dell’Europa orientale (Kaliningrad)", "Europe\/Kiev": "Ora dell’Europa orientale (Kiev)", - "Europe\/Kirov": "Russia (Kirov)", + "Europe\/Kirov": "Ora Russia (Kirov)", "Europe\/Lisbon": "Ora dell’Europa occidentale (Lisbona)", "Europe\/Ljubljana": "Ora dell’Europa centrale (Lubiana)", "Europe\/London": "Ora del meridiano di Greenwich (Londra)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Ora dell’Isola di Wake", "Pacific\/Wallis": "Ora di Wallis e Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/iw.json b/src/Symfony/Component/Intl/Resources/data/timezones/iw.json deleted file mode 100644 index db4aa0858ba9a..0000000000000 --- a/src/Symfony/Component/Intl/Resources/data/timezones/iw.json +++ /dev/null @@ -1,446 +0,0 @@ -{ - "Version": "2.1.48.42", - "Names": { - "Africa\/Abidjan": "שעון גריניץ׳‏ (אביג׳אן)", - "Africa\/Accra": "שעון גריניץ׳‏ (אקרה)", - "Africa\/Addis_Ababa": "שעון מזרח אפריקה (אדיס אבבה)", - "Africa\/Algiers": "שעון מרכז אירופה (אלג׳יר)", - "Africa\/Asmera": "שעון מזרח אפריקה (אסמרה)", - "Africa\/Bamako": "שעון גריניץ׳‏ (במאקו)", - "Africa\/Bangui": "שעון מערב אפריקה (בנגואי)", - "Africa\/Banjul": "שעון גריניץ׳‏ (בנג׳ול)", - "Africa\/Bissau": "שעון גריניץ׳‏ (ביסאו)", - "Africa\/Blantyre": "שעון מרכז אפריקה (בלנטיר)", - "Africa\/Brazzaville": "שעון מערב אפריקה (ברזוויל)", - "Africa\/Bujumbura": "שעון מרכז אפריקה (בוג׳ומבורה)", - "Africa\/Cairo": "שעון מזרח אירופה (קהיר)", - "Africa\/Casablanca": "שעון מערב אירופה (קזבלנקה)", - "Africa\/Ceuta": "שעון מרכז אירופה (סאוטה)", - "Africa\/Conakry": "שעון גריניץ׳‏ (קונאקרי)", - "Africa\/Dakar": "שעון גריניץ׳‏ (דקאר)", - "Africa\/Dar_es_Salaam": "שעון מזרח אפריקה (דאר א-סלאם)", - "Africa\/Djibouti": "שעון מזרח אפריקה (ג׳יבוטי)", - "Africa\/Douala": "שעון מערב אפריקה (דואלה)", - "Africa\/El_Aaiun": "שעון מערב אירופה (אל עיון)", - "Africa\/Freetown": "שעון גריניץ׳‏ (פריטאון)", - "Africa\/Gaborone": "שעון מרכז אפריקה (גבורונה)", - "Africa\/Harare": "שעון מרכז אפריקה (הרארה)", - "Africa\/Johannesburg": "שעון דרום אפריקה (יוהנסבורג)", - "Africa\/Juba": "שעון מזרח אפריקה (ג׳ובה)", - "Africa\/Kampala": "שעון מזרח אפריקה (קמפאלה)", - "Africa\/Khartoum": "שעון מרכז אפריקה (חרטום)", - "Africa\/Kigali": "שעון מרכז אפריקה (קיגלי)", - "Africa\/Kinshasa": "שעון מערב אפריקה (קינשסה)", - "Africa\/Lagos": "שעון מערב אפריקה (לגוס)", - "Africa\/Libreville": "שעון מערב אפריקה (ליברוויל)", - "Africa\/Lome": "שעון גריניץ׳‏ (לומה)", - "Africa\/Luanda": "שעון מערב אפריקה (לואנדה)", - "Africa\/Lubumbashi": "שעון מרכז אפריקה (לובומבאשי)", - "Africa\/Lusaka": "שעון מרכז אפריקה (לוסקה)", - "Africa\/Malabo": "שעון מערב אפריקה (מלבו)", - "Africa\/Maputo": "שעון מרכז אפריקה (מאפוטו)", - "Africa\/Maseru": "שעון דרום אפריקה (מסרו)", - "Africa\/Mbabane": "שעון דרום אפריקה (מבבנה)", - "Africa\/Mogadishu": "שעון מזרח אפריקה (מוגדישו)", - "Africa\/Monrovia": "שעון גריניץ׳‏ (מונרוביה)", - "Africa\/Nairobi": "שעון מזרח אפריקה (ניירובי)", - "Africa\/Ndjamena": "שעון מערב אפריקה (נג׳מנה)", - "Africa\/Niamey": "שעון מערב אפריקה (ניאמיי)", - "Africa\/Nouakchott": "שעון גריניץ׳‏ (נואקצ׳וט)", - "Africa\/Ouagadougou": "שעון גריניץ׳‏ (וואגאדוגו)", - "Africa\/Porto-Novo": "שעון מערב אפריקה (פורטו נובו)", - "Africa\/Sao_Tome": "שעון גריניץ׳‏ (סאו טומה)", - "Africa\/Tripoli": "שעון מזרח אירופה (טריפולי)", - "Africa\/Tunis": "שעון מרכז אירופה (תוניס)", - "Africa\/Windhoek": "שעון מרכז אפריקה (וינדהוק)", - "America\/Adak": "שעון האיים האלאוטיים הוואי (אדאק)", - "America\/Anchorage": "שעון אלסקה (אנקורג׳)", - "America\/Anguilla": "שעון האוקיינוס האטלנטי (אנגווילה)", - "America\/Antigua": "שעון האוקיינוס האטלנטי (אנטיגואה)", - "America\/Araguaina": "שעון ברזיליה (אראגואינה)", - "America\/Argentina\/La_Rioja": "שעון ארגנטינה (לה ריוחה)", - "America\/Argentina\/Rio_Gallegos": "שעון ארגנטינה (ריו גאייגוס)", - "America\/Argentina\/Salta": "שעון ארגנטינה (סלטה)", - "America\/Argentina\/San_Juan": "שעון ארגנטינה (סן חואן)", - "America\/Argentina\/San_Luis": "שעון מערב ארגנטינה (סן לואיס)", - "America\/Argentina\/Tucuman": "שעון ארגנטינה (טוקומן)", - "America\/Argentina\/Ushuaia": "שעון ארגנטינה (אושוואיה)", - "America\/Aruba": "שעון האוקיינוס האטלנטי (ארובה)", - "America\/Asuncion": "שעון פרגוואי (אסונסיון)", - "America\/Bahia": "שעון ברזיליה (באהיה)", - "America\/Bahia_Banderas": "שעון מרכז ארה״ב (באהיה בנדרס)", - "America\/Barbados": "שעון האוקיינוס האטלנטי (ברבדוס)", - "America\/Belem": "שעון ברזיליה (בלם)", - "America\/Belize": "שעון מרכז ארה״ב (בליז)", - "America\/Blanc-Sablon": "שעון האוקיינוס האטלנטי (בלאן-סבלון)", - "America\/Boa_Vista": "שעון אמזונס (בואה ויסטה)", - "America\/Bogota": "שעון קולומביה (בוגוטה)", - "America\/Boise": "שעון אזור ההרים בארה״ב (בויסי)", - "America\/Buenos_Aires": "שעון ארגנטינה (בואנוס איירס)", - "America\/Cambridge_Bay": "שעון אזור ההרים בארה״ב (קיימברידג׳ ביי)", - "America\/Campo_Grande": "שעון אמזונס (קמפו גרנדה)", - "America\/Cancun": "שעון החוף המזרחי (קנקון)", - "America\/Caracas": "שעון ונצואלה (קראקס)", - "America\/Catamarca": "שעון ארגנטינה (קטמרקה)", - "America\/Cayenne": "שעון גיאנה הצרפתית (קאיין)", - "America\/Cayman": "שעון החוף המזרחי (קיימן)", - "America\/Chicago": "שעון מרכז ארה״ב (שיקגו)", - "America\/Chihuahua": "שעון מערב מקסיקו (צ׳יוואווה)", - "America\/Coral_Harbour": "שעון החוף המזרחי (אטיקוקן)", - "America\/Cordoba": "שעון ארגנטינה (קורדובה)", - "America\/Costa_Rica": "שעון מרכז ארה״ב (קוסטה ריקה)", - "America\/Creston": "שעון אזור ההרים בארה״ב (קרסטון)", - "America\/Cuiaba": "שעון אמזונס (קויאבה)", - "America\/Curacao": "שעון האוקיינוס האטלנטי (קוראסאו)", - "America\/Danmarkshavn": "שעון גריניץ׳‏ (דנמרקסהוון)", - "America\/Dawson": "שעון מערב ארה״ב (דוסון)", - "America\/Dawson_Creek": "שעון אזור ההרים בארה״ב (דוסון קריק)", - "America\/Denver": "שעון אזור ההרים בארה״ב (דנוור)", - "America\/Detroit": "שעון החוף המזרחי (דטרויט)", - "America\/Dominica": "שעון האוקיינוס האטלנטי (דומיניקה)", - "America\/Edmonton": "שעון אזור ההרים בארה״ב (אדמונטון)", - "America\/Eirunepe": "ברזיל (אירונפי)", - "America\/El_Salvador": "שעון מרכז ארה״ב (אל סלבדור)", - "America\/Fort_Nelson": "שעון אזור ההרים בארה״ב (פורט נלסון)", - "America\/Fortaleza": "שעון ברזיליה (פורטאלזה)", - "America\/Glace_Bay": "שעון האוקיינוס האטלנטי (גלייס ביי)", - "America\/Godthab": "שעון מערב גרינלנד (נואוק)", - "America\/Goose_Bay": "שעון האוקיינוס האטלנטי (גוס ביי)", - "America\/Grand_Turk": "שעון החוף המזרחי (גרנד טורק)", - "America\/Grenada": "שעון האוקיינוס האטלנטי (גרנדה)", - "America\/Guadeloupe": "שעון האוקיינוס האטלנטי (גואדלופ)", - "America\/Guatemala": "שעון מרכז ארה״ב (גואטמלה)", - "America\/Guayaquil": "שעון אקוודור (גואיאקיל)", - "America\/Guyana": "שעון גיאנה", - "America\/Halifax": "שעון האוקיינוס האטלנטי (הליפקס)", - "America\/Havana": "שעון קובה (הוואנה)", - "America\/Hermosillo": "שעון מערב מקסיקו (הרמוסיו)", - "America\/Indiana\/Knox": "שעון מרכז ארה״ב (נוקס, אינדיאנה)", - "America\/Indiana\/Marengo": "שעון החוף המזרחי (מרנגו, אינדיאנה)", - "America\/Indiana\/Petersburg": "שעון החוף המזרחי (פיטרסבורג, אינדיאנה)", - "America\/Indiana\/Tell_City": "שעון מרכז ארה״ב (טל סיטי, אינדיאנה)", - "America\/Indiana\/Vevay": "שעון החוף המזרחי (ויוואיי, אינדיאנה)", - "America\/Indiana\/Vincennes": "שעון החוף המזרחי (וינסנס, אינדיאנה)", - "America\/Indiana\/Winamac": "שעון החוף המזרחי (וינמאק, אינדיאנה)", - "America\/Indianapolis": "שעון החוף המזרחי (אינדיאנפוליס)", - "America\/Inuvik": "שעון אזור ההרים בארה״ב (אינוויק)", - "America\/Iqaluit": "שעון החוף המזרחי (איקלואיט)", - "America\/Jamaica": "שעון החוף המזרחי (ג׳מייקה)", - "America\/Jujuy": "שעון ארגנטינה (חוחוי)", - "America\/Juneau": "שעון אלסקה (ג׳ונו)", - "America\/Kentucky\/Monticello": "שעון החוף המזרחי (מונטיצ׳לו, קנטאקי)", - "America\/Kralendijk": "שעון האוקיינוס האטלנטי (קרלנדייק)", - "America\/La_Paz": "שעון בוליביה (לה פאס)", - "America\/Lima": "שעון פרו (לימה)", - "America\/Los_Angeles": "שעון מערב ארה״ב (לוס אנג׳לס)", - "America\/Louisville": "שעון החוף המזרחי (לואיוויל)", - "America\/Lower_Princes": "שעון האוקיינוס האטלנטי (לואוור פרינסס קוורטר)", - "America\/Maceio": "שעון ברזיליה (מסייאו)", - "America\/Managua": "שעון מרכז ארה״ב (מנגואה)", - "America\/Manaus": "שעון אמזונס (מנאוס)", - "America\/Marigot": "שעון האוקיינוס האטלנטי (מריגו)", - "America\/Martinique": "שעון האוקיינוס האטלנטי (מרטיניק)", - "America\/Matamoros": "שעון מרכז ארה״ב (מטמורוס)", - "America\/Mazatlan": "שעון מערב מקסיקו (מזטלן)", - "America\/Mendoza": "שעון ארגנטינה (מנדוזה)", - "America\/Menominee": "שעון מרכז ארה״ב (מנומיני)", - "America\/Merida": "שעון מרכז ארה״ב (מרידה)", - "America\/Metlakatla": "שעון אלסקה (מטלקטלה)", - "America\/Mexico_City": "שעון מרכז ארה״ב (מקסיקו סיטי)", - "America\/Miquelon": "שעון סנט פייר ומיקלון", - "America\/Moncton": "שעון האוקיינוס האטלנטי (מונקטון)", - "America\/Monterrey": "שעון מרכז ארה״ב (מונטריי)", - "America\/Montevideo": "שעון אורוגוואי (מונטווידאו)", - "America\/Montreal": "קנדה (Montreal)", - "America\/Montserrat": "שעון האוקיינוס האטלנטי (מונסראט)", - "America\/Nassau": "שעון החוף המזרחי (נסאו)", - "America\/New_York": "שעון החוף המזרחי (ניו יורק)", - "America\/Nipigon": "שעון החוף המזרחי (ניפיגון)", - "America\/Nome": "שעון אלסקה (נום)", - "America\/Noronha": "שעון פרננדו די נורוניה", - "America\/North_Dakota\/Beulah": "שעון מרכז ארה״ב (ביולה, צפון דקוטה)", - "America\/North_Dakota\/Center": "שעון מרכז ארה״ב (סנטר, צפון דקוטה)", - "America\/North_Dakota\/New_Salem": "שעון מרכז ארה״ב (ניו סיילם, צפון דקוטה)", - "America\/Ojinaga": "שעון אזור ההרים בארה״ב (אוג׳ינאגה)", - "America\/Panama": "שעון החוף המזרחי (פנמה)", - "America\/Pangnirtung": "שעון החוף המזרחי (פנגנירטונג)", - "America\/Paramaribo": "שעון סורינאם (פרמריבו)", - "America\/Phoenix": "שעון אזור ההרים בארה״ב (פיניקס)", - "America\/Port-au-Prince": "שעון החוף המזרחי (פורט או פראנס)", - "America\/Port_of_Spain": "שעון האוקיינוס האטלנטי (פורט אוף ספיין)", - "America\/Porto_Velho": "שעון אמזונס (פורטו וליו)", - "America\/Puerto_Rico": "שעון האוקיינוס האטלנטי (פוארטו ריקו)", - "America\/Punta_Arenas": "שעון צ׳ילה (פונטה ארנס)", - "America\/Rainy_River": "שעון מרכז ארה״ב (רייני ריבר)", - "America\/Rankin_Inlet": "שעון מרכז ארה״ב (רנקין אינלט)", - "America\/Recife": "שעון ברזיליה (רסיפה)", - "America\/Regina": "שעון מרכז ארה״ב (רג׳ינה)", - "America\/Resolute": "שעון מרכז ארה״ב (רזולוט)", - "America\/Rio_Branco": "ברזיל (ריו ברנקו)", - "America\/Santa_Isabel": "שעון צפון-מערב מקסיקו (סנטה איזבל)", - "America\/Santarem": "שעון ברזיליה (סנטרם)", - "America\/Santiago": "שעון צ׳ילה (סנטיאגו)", - "America\/Santo_Domingo": "שעון האוקיינוס האטלנטי (סנטו דומינגו)", - "America\/Sao_Paulo": "שעון ברזיליה (סאו פאולו)", - "America\/Scoresbysund": "שעון מזרח גרינלנד (סקורסביסונד)", - "America\/Sitka": "שעון אלסקה (סיטקה)", - "America\/St_Barthelemy": "שעון האוקיינוס האטלנטי (סנט ברתלמי)", - "America\/St_Johns": "שעון ניופאונדלנד (סנט ג׳ונס)", - "America\/St_Kitts": "שעון האוקיינוס האטלנטי (סנט קיטס)", - "America\/St_Lucia": "שעון האוקיינוס האטלנטי (סנט לוסיה)", - "America\/St_Thomas": "שעון האוקיינוס האטלנטי (סנט תומאס)", - "America\/St_Vincent": "שעון האוקיינוס האטלנטי (סנט וינסנט)", - "America\/Swift_Current": "שעון מרכז ארה״ב (סוויפט קרנט)", - "America\/Tegucigalpa": "שעון מרכז ארה״ב (טגוסיגלפה)", - "America\/Thule": "שעון האוקיינוס האטלנטי (תולה)", - "America\/Thunder_Bay": "שעון החוף המזרחי (ת׳אנדר ביי)", - "America\/Tijuana": "שעון מערב ארה״ב (טיחואנה)", - "America\/Toronto": "שעון החוף המזרחי (טורונטו)", - "America\/Tortola": "שעון האוקיינוס האטלנטי (טורטולה)", - "America\/Vancouver": "שעון מערב ארה״ב (ונקובר)", - "America\/Whitehorse": "שעון מערב ארה״ב (ווייטהורס)", - "America\/Winnipeg": "שעון מרכז ארה״ב (וויניפג)", - "America\/Yakutat": "שעון אלסקה (יקוטאט)", - "America\/Yellowknife": "שעון אזור ההרים בארה״ב (ילונייף)", - "Antarctica\/Casey": "שעון מערב אוסטרליה (קאסיי)", - "Antarctica\/Davis": "שעון דיוויס", - "Antarctica\/DumontDUrville": "שעון דומון ד׳אורוויל", - "Antarctica\/Macquarie": "שעון מקווארי (מקרי)", - "Antarctica\/Mawson": "שעון מאוסון (מוסון)", - "Antarctica\/McMurdo": "שעון ניו זילנד (מק-מרדו)", - "Antarctica\/Palmer": "שעון צ׳ילה (פאלמר)", - "Antarctica\/Rothera": "שעון רות׳רה", - "Antarctica\/Syowa": "שעון סייווה (סיוואה)", - "Antarctica\/Troll": "שעון גריניץ׳‏ (טרול)", - "Antarctica\/Vostok": "שעון ווסטוק", - "Arctic\/Longyearbyen": "שעון מרכז אירופה (לונגיירבין)", - "Asia\/Aden": "שעון חצי האי ערב (עדן)", - "Asia\/Almaty": "שעון מזרח קזחסטן (אלמאטי)", - "Asia\/Amman": "שעון מזרח אירופה (עמאן)", - "Asia\/Anadyr": "שעון אנדיר", - "Asia\/Aqtau": "שעון מערב קזחסטן (אקטאו)", - "Asia\/Aqtobe": "שעון מערב קזחסטן (אקטובה)", - "Asia\/Ashgabat": "שעון טורקמניסטן (אשגבט)", - "Asia\/Atyrau": "שעון מערב קזחסטן (אטיראו)", - "Asia\/Baghdad": "שעון חצי האי ערב (בגדד)", - "Asia\/Bahrain": "שעון חצי האי ערב (בחריין)", - "Asia\/Baku": "שעון אזרבייג׳אן (באקו)", - "Asia\/Bangkok": "שעון הודו-סין (בנגקוק)", - "Asia\/Barnaul": "רוסיה (ברנאול)", - "Asia\/Beirut": "שעון מזרח אירופה (ביירות)", - "Asia\/Bishkek": "שעון קירגיזסטן (בישקק)", - "Asia\/Brunei": "שעון ברוניי דארוסלאם", - "Asia\/Calcutta": "שעון הודו (קולקטה)", - "Asia\/Chita": "שעון יקוטסק (צ׳יטה)", - "Asia\/Choibalsan": "שעון צ׳ויבלסן", - "Asia\/Colombo": "שעון הודו (קולומבו)", - "Asia\/Damascus": "שעון מזרח אירופה (דמשק)", - "Asia\/Dhaka": "שעון בנגלדש (דאקה)", - "Asia\/Dili": "שעון מזרח טימור (דילי)", - "Asia\/Dubai": "שעון מדינות המפרץ (דובאי)", - "Asia\/Dushanbe": "שעון טג׳יקיסטן (דושנבה)", - "Asia\/Famagusta": "שעון מזרח אירופה (פמגוסטה)", - "Asia\/Gaza": "שעון מזרח אירופה (עזה)", - "Asia\/Hebron": "שעון מזרח אירופה (חברון)", - "Asia\/Hong_Kong": "שעון הונג קונג", - "Asia\/Hovd": "שעון חובד", - "Asia\/Irkutsk": "שעון אירקוטסק", - "Asia\/Jakarta": "שעון מערב אינדונזיה (ג׳קרטה)", - "Asia\/Jayapura": "שעון מזרח אינדונזיה (ג׳איאפורה)", - "Asia\/Jerusalem": "שעון ישראל (ירושלים)", - "Asia\/Kabul": "שעון אפגניסטן (קאבול)", - "Asia\/Kamchatka": "שעון פטרופבלובסק-קמצ׳טסקי (קמצ׳טקה)", - "Asia\/Karachi": "שעון פקיסטן (קראצ׳י)", - "Asia\/Katmandu": "שעון נפאל (קטמנדו)", - "Asia\/Khandyga": "שעון יקוטסק (חנדיגה)", - "Asia\/Krasnoyarsk": "שעון קרסנויארסק", - "Asia\/Kuala_Lumpur": "שעון מלזיה (קואלה לומפור)", - "Asia\/Kuching": "שעון מלזיה (קוצ׳ינג)", - "Asia\/Kuwait": "שעון חצי האי ערב (כווית)", - "Asia\/Macau": "שעון סין (מקאו)", - "Asia\/Magadan": "שעון מגדן", - "Asia\/Makassar": "שעון מרכז אינדונזיה (מאקאסאר)", - "Asia\/Manila": "שעון הפיליפינים (מנילה)", - "Asia\/Muscat": "שעון מדינות המפרץ (מוסקט)", - "Asia\/Nicosia": "שעון מזרח אירופה (ניקוסיה)", - "Asia\/Novokuznetsk": "שעון קרסנויארסק (נובוקוזנטסק)", - "Asia\/Novosibirsk": "שעון נובוסיבירסק", - "Asia\/Omsk": "שעון אומסק", - "Asia\/Oral": "שעון מערב קזחסטן (אורל)", - "Asia\/Phnom_Penh": "שעון הודו-סין (פנום פן)", - "Asia\/Pontianak": "שעון מערב אינדונזיה (פונטיאנק)", - "Asia\/Pyongyang": "שעון קוריאה (פיונגיאנג)", - "Asia\/Qatar": "שעון חצי האי ערב (קטאר)", - "Asia\/Qostanay": "שעון מזרח קזחסטן (קוסטנאי)", - "Asia\/Qyzylorda": "שעון מערב קזחסטן (קיזילורדה)", - "Asia\/Rangoon": "שעון מיאנמר (רנגון)", - "Asia\/Riyadh": "שעון חצי האי ערב (ריאד)", - "Asia\/Saigon": "שעון הודו-סין (הו צ׳י מין סיטי)", - "Asia\/Sakhalin": "שעון סחלין", - "Asia\/Samarkand": "שעון אוזבקיסטן (סמרקנד)", - "Asia\/Seoul": "שעון קוריאה (סיאול)", - "Asia\/Shanghai": "שעון סין (שנחאי)", - "Asia\/Singapore": "שעון סינגפור", - "Asia\/Srednekolymsk": "שעון מגדן (סרדנייקולימסק)", - "Asia\/Taipei": "שעון טאיפיי", - "Asia\/Tashkent": "שעון אוזבקיסטן (טשקנט)", - "Asia\/Tbilisi": "שעון גאורגיה (טביליסי)", - "Asia\/Tehran": "שעון איראן (טהרן)", - "Asia\/Thimphu": "שעון בהוטן (טהימפהו)", - "Asia\/Tokyo": "שעון יפן (טוקיו)", - "Asia\/Tomsk": "רוסיה (טומסק)", - "Asia\/Ulaanbaatar": "שעון אולן בטור (אולאאנבטאר)", - "Asia\/Urumqi": "סין (אורומקי)", - "Asia\/Ust-Nera": "שעון ולדיווסטוק (אוסט-נרה)", - "Asia\/Vientiane": "שעון הודו-סין (האנוי)", - "Asia\/Vladivostok": "שעון ולדיווסטוק", - "Asia\/Yakutsk": "שעון יקוטסק", - "Asia\/Yekaterinburg": "שעון יקטרינבורג", - "Asia\/Yerevan": "שעון ארמניה (ירוואן)", - "Atlantic\/Azores": "שעון האיים האזוריים", - "Atlantic\/Bermuda": "שעון האוקיינוס האטלנטי (ברמודה)", - "Atlantic\/Canary": "שעון מערב אירופה (האיים הקנריים)", - "Atlantic\/Cape_Verde": "שעון כף ורדה", - "Atlantic\/Faeroe": "שעון מערב אירופה (פארו)", - "Atlantic\/Madeira": "שעון מערב אירופה (מדיירה)", - "Atlantic\/Reykjavik": "שעון גריניץ׳‏ (רייקיאוויק)", - "Atlantic\/South_Georgia": "שעון דרום ג׳ורג׳יה", - "Atlantic\/St_Helena": "שעון גריניץ׳‏ (סנט הלנה)", - "Atlantic\/Stanley": "שעון איי פוקלנד (סטנלי)", - "Australia\/Adelaide": "שעון מרכז אוסטרליה (אדלייד)", - "Australia\/Brisbane": "שעון מזרח אוסטרליה (בריסביין)", - "Australia\/Broken_Hill": "שעון מרכז אוסטרליה (ברוקן היל)", - "Australia\/Currie": "שעון מזרח אוסטרליה (קרי)", - "Australia\/Darwin": "שעון מרכז אוסטרליה (דרווין)", - "Australia\/Eucla": "שעון מרכז-מערב אוסטרליה (יוקלה)", - "Australia\/Hobart": "שעון מזרח אוסטרליה (הוברט)", - "Australia\/Lindeman": "שעון מזרח אוסטרליה (לינדמן)", - "Australia\/Lord_Howe": "שעון אי הלורד האו", - "Australia\/Melbourne": "שעון מזרח אוסטרליה (מלבורן)", - "Australia\/Perth": "שעון מערב אוסטרליה (פרת׳)", - "Australia\/Sydney": "שעון מזרח אוסטרליה (סידני)", - "CST6CDT": "שעון מרכז ארה״ב", - "EST5EDT": "שעון החוף המזרחי", - "Etc\/GMT": "שעון גריניץ׳‏", - "Etc\/UTC": "זמן אוניברסלי מתואם", - "Europe\/Amsterdam": "שעון מרכז אירופה (אמסטרדם)", - "Europe\/Andorra": "שעון מרכז אירופה (אנדורה)", - "Europe\/Astrakhan": "שעון מוסקבה (אסטרחן)", - "Europe\/Athens": "שעון מזרח אירופה (אתונה)", - "Europe\/Belgrade": "שעון מרכז אירופה (בלגרד)", - "Europe\/Berlin": "שעון מרכז אירופה (ברלין)", - "Europe\/Bratislava": "שעון מרכז אירופה (ברטיסלבה)", - "Europe\/Brussels": "שעון מרכז אירופה (בריסל)", - "Europe\/Bucharest": "שעון מזרח אירופה (בוקרשט)", - "Europe\/Budapest": "שעון מרכז אירופה (בודפשט)", - "Europe\/Busingen": "שעון מרכז אירופה (ביזינגן)", - "Europe\/Chisinau": "שעון מזרח אירופה (קישינב)", - "Europe\/Copenhagen": "שעון מרכז אירופה (קופנהגן)", - "Europe\/Dublin": "שעון גריניץ׳‏ (דבלין)", - "Europe\/Gibraltar": "שעון מרכז אירופה (גיברלטר)", - "Europe\/Guernsey": "שעון גריניץ׳‏ (גרנזי)", - "Europe\/Helsinki": "שעון מזרח אירופה (הלסינקי)", - "Europe\/Isle_of_Man": "שעון גריניץ׳‏ (האי מאן)", - "Europe\/Istanbul": "טורקיה (איסטנבול)", - "Europe\/Jersey": "שעון גריניץ׳‏ (ג׳רזי)", - "Europe\/Kaliningrad": "שעון מזרח אירופה (קלינינגרד)", - "Europe\/Kiev": "שעון מזרח אירופה (קייב)", - "Europe\/Kirov": "רוסיה (קירוב)", - "Europe\/Lisbon": "שעון מערב אירופה (ליסבון)", - "Europe\/Ljubljana": "שעון מרכז אירופה (לובליאנה)", - "Europe\/London": "שעון גריניץ׳‏ (לונדון)", - "Europe\/Luxembourg": "שעון מרכז אירופה (לוקסמבורג)", - "Europe\/Madrid": "שעון מרכז אירופה (מדריד)", - "Europe\/Malta": "שעון מרכז אירופה (מלטה)", - "Europe\/Mariehamn": "שעון מזרח אירופה (מרייהאמן)", - "Europe\/Minsk": "שעון מוסקבה (מינסק)", - "Europe\/Monaco": "שעון מרכז אירופה (מונקו)", - "Europe\/Moscow": "שעון מוסקבה", - "Europe\/Oslo": "שעון מרכז אירופה (אוסלו)", - "Europe\/Paris": "שעון מרכז אירופה (פריז)", - "Europe\/Podgorica": "שעון מרכז אירופה (פודגוריצה)", - "Europe\/Prague": "שעון מרכז אירופה (פראג)", - "Europe\/Riga": "שעון מזרח אירופה (ריגה)", - "Europe\/Rome": "שעון מרכז אירופה (רומא)", - "Europe\/Samara": "שעון סמרה", - "Europe\/San_Marino": "שעון מרכז אירופה (סן מרינו)", - "Europe\/Sarajevo": "שעון מרכז אירופה (סרייבו)", - "Europe\/Saratov": "שעון מוסקבה (סראטוב)", - "Europe\/Simferopol": "שעון מוסקבה (סימפרופול)", - "Europe\/Skopje": "שעון מרכז אירופה (סקופיה)", - "Europe\/Sofia": "שעון מזרח אירופה (סופיה)", - "Europe\/Stockholm": "שעון מרכז אירופה (שטוקהולם)", - "Europe\/Tallinn": "שעון מזרח אירופה (טאלין)", - "Europe\/Tirane": "שעון מרכז אירופה (טירנה)", - "Europe\/Ulyanovsk": "שעון מוסקבה (אוליאנובסק)", - "Europe\/Uzhgorod": "שעון מזרח אירופה (אוז׳הורוד)", - "Europe\/Vaduz": "שעון מרכז אירופה (ואדוץ)", - "Europe\/Vatican": "שעון מרכז אירופה (הוותיקן)", - "Europe\/Vienna": "שעון מרכז אירופה (וינה)", - "Europe\/Vilnius": "שעון מזרח אירופה (וילנה)", - "Europe\/Volgograd": "שעון וולגוגרד", - "Europe\/Warsaw": "שעון מרכז אירופה (ורשה)", - "Europe\/Zagreb": "שעון מרכז אירופה (זאגרב)", - "Europe\/Zaporozhye": "שעון מזרח אירופה (זפורוז׳יה)", - "Europe\/Zurich": "שעון מרכז אירופה (ציריך)", - "Indian\/Antananarivo": "שעון מזרח אפריקה (אנטננריבו)", - "Indian\/Chagos": "שעון האוקיינוס ההודי (צ׳אגוס)", - "Indian\/Christmas": "שעון האי כריסטמס", - "Indian\/Cocos": "שעון איי קוקוס", - "Indian\/Comoro": "שעון מזרח אפריקה (קומורו)", - "Indian\/Kerguelen": "שעון הארצות הדרומיות והאנטארקטיות של צרפת (קרגוולן)", - "Indian\/Mahe": "שעון איי סיישל (מהא)", - "Indian\/Maldives": "שעון האיים המלדיביים", - "Indian\/Mauritius": "שעון מאוריציוס", - "Indian\/Mayotte": "שעון מזרח אפריקה (מאיוט)", - "Indian\/Reunion": "שעון ראוניון", - "MST7MDT": "שעון אזור ההרים בארה״ב", - "PST8PDT": "שעון מערב ארה״ב", - "Pacific\/Apia": "שעון אפיה", - "Pacific\/Auckland": "שעון ניו זילנד (אוקלנד)", - "Pacific\/Bougainville": "שעון פפואה גיניאה החדשה (בוגנוויל)", - "Pacific\/Chatham": "שעון צ׳טהאם (צ׳אטהאם)", - "Pacific\/Easter": "שעון אי הפסחא", - "Pacific\/Efate": "שעון ונואטו (אפטה)", - "Pacific\/Enderbury": "שעון איי פיניקס (אנדרבורי)", - "Pacific\/Fakaofo": "שעון טוקלאו (פקאופו)", - "Pacific\/Fiji": "שעון פיג׳י", - "Pacific\/Funafuti": "שעון טובאלו (פונפוטי)", - "Pacific\/Galapagos": "שעון איי גלאפגוס (גלפאגוס)", - "Pacific\/Gambier": "שעון איי גמבייה", - "Pacific\/Guadalcanal": "שעון איי שלמה (גוודלקנאל)", - "Pacific\/Guam": "שעון צ׳אמורו (גואם)", - "Pacific\/Honolulu": "שעון האיים האלאוטיים הוואי (הונולולו)", - "Pacific\/Johnston": "שעון האיים האלאוטיים הוואי (ג׳ונסטון)", - "Pacific\/Kiritimati": "שעון איי ליין (קיריטימאטי)", - "Pacific\/Kosrae": "שעון קוסראה (קוסרה)", - "Pacific\/Kwajalein": "שעון איי מרשל (קוואג׳ליין)", - "Pacific\/Majuro": "שעון איי מרשל (מאג׳ורו)", - "Pacific\/Marquesas": "שעון איי מרקיז", - "Pacific\/Midway": "שעון סמואה (מידוויי)", - "Pacific\/Nauru": "שעון נאורו", - "Pacific\/Niue": "שעון ניואה", - "Pacific\/Norfolk": "שעון האי נורפוק", - "Pacific\/Noumea": "שעון קלדוניה החדשה (נומאה)", - "Pacific\/Pago_Pago": "שעון סמואה (פאגו פאגו)", - "Pacific\/Palau": "שעון פלאו", - "Pacific\/Pitcairn": "שעון פיטקרן", - "Pacific\/Ponape": "שעון פונאפי (פונפיי)", - "Pacific\/Port_Moresby": "שעון פפואה גיניאה החדשה (פורט מורסבי)", - "Pacific\/Rarotonga": "שעון איי קוק (רארוטונגה)", - "Pacific\/Saipan": "שעון צ׳אמורו (סאיפאן)", - "Pacific\/Tahiti": "שעון טהיטי", - "Pacific\/Tarawa": "שעון איי גילברט (טאראווה)", - "Pacific\/Tongatapu": "שעון טונגה (טונגטאפו)", - "Pacific\/Truk": "שעון צ׳וק", - "Pacific\/Wake": "שעון האי וייק", - "Pacific\/Wallis": "שעון וואליס ופוטונה (ווליס)" - }, - "Meta": { - "GmtFormat": "GMT%s‎", - "HourFormat": [ - "‎+%02d:%02d", - "-%02d:%02d‎" - ] - } -} diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ja.json b/src/Symfony/Component/Intl/Resources/data/timezones/ja.json index 46f7e87ef7569..be3bde99dc9ca 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ja.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ja.json @@ -151,7 +151,7 @@ "America\/Moncton": "大西洋時間（モンクトン）", "America\/Monterrey": "アメリカ中部時間（モンテレイ）", "America\/Montevideo": "ウルグアイ時間（モンテビデオ）", - "America\/Montreal": "カナダ（Montreal）", + "America\/Montreal": "カナダ時間（Montreal）", "America\/Montserrat": "大西洋時間（モントセラト）", "America\/Nassau": "アメリカ東部時間（ナッソー）", "America\/New_York": "アメリカ東部時間（ニューヨーク）", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "アラビア時間（バーレーン）", "Asia\/Baku": "アゼルバイジャン時間（バクー）", "Asia\/Bangkok": "インドシナ時間（バンコク）", - "Asia\/Barnaul": "ロシア（バルナウル）", + "Asia\/Barnaul": "ロシア時間（バルナウル）", "Asia\/Beirut": "東ヨーロッパ時間（ベイルート）", "Asia\/Bishkek": "キルギス時間（ビシュケク）", "Asia\/Brunei": "ブルネイ・ダルサラーム時間", @@ -288,9 +288,9 @@ "Asia\/Tehran": "イラン時間（テヘラン）", "Asia\/Thimphu": "ブータン時間（ティンプー）", "Asia\/Tokyo": "日本時間（東京）", - "Asia\/Tomsk": "ロシア（トムスク）", + "Asia\/Tomsk": "ロシア時間（トムスク）", "Asia\/Ulaanbaatar": "ウランバートル時間", - "Asia\/Urumqi": "中国（ウルムチ）", + "Asia\/Urumqi": "中国時間（ウルムチ）", "Asia\/Ust-Nera": "ウラジオストク時間（ウスチネラ）", "Asia\/Vientiane": "インドシナ時間（ビエンチャン）", "Asia\/Vladivostok": "ウラジオストク時間", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "グリニッジ標準時（ガーンジー）", "Europe\/Helsinki": "東ヨーロッパ時間（ヘルシンキ）", "Europe\/Isle_of_Man": "グリニッジ標準時（マン島）", - "Europe\/Istanbul": "トルコ（イスタンブール）", + "Europe\/Istanbul": "トルコ時間（イスタンブール）", "Europe\/Jersey": "グリニッジ標準時（ジャージー）", "Europe\/Kaliningrad": "東ヨーロッパ時間（カリーニングラード）", "Europe\/Kiev": "東ヨーロッパ時間（キエフ）", - "Europe\/Kirov": "ロシア（キーロフ）", + "Europe\/Kirov": "ロシア時間（キーロフ）", "Europe\/Lisbon": "西ヨーロッパ時間（リスボン）", "Europe\/Ljubljana": "中央ヨーロッパ時間（リュブリャナ）", "Europe\/London": "グリニッジ標準時（ロンドン）", @@ -436,11 +436,5 @@ "Pacific\/Wake": "ウェーク島時間", "Pacific\/Wallis": "ウォリス・フツナ時間（ウォリス諸島）" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/jv.json b/src/Symfony/Component/Intl/Resources/data/timezones/jv.json index e6b2f55028e6c..908f815867046 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/jv.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/jv.json @@ -99,7 +99,7 @@ "America\/Detroit": "Wektu sisih Wetan (Detroit)", "America\/Dominica": "Wektu Atlantik (Dominika)", "America\/Edmonton": "Wektu Giri (Edmonton)", - "America\/Eirunepe": "Brasil (Eirunepe)", + "America\/Eirunepe": "Wektu Brasil (Eirunepe)", "America\/El_Salvador": "Wektu Tengah (El Salvador)", "America\/Fort_Nelson": "Wektu Giri (Benteng Nelson)", "America\/Fortaleza": "Wektu Brasilia (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Wektu Atlantik (Moncton)", "America\/Monterrey": "Wektu Tengah (Monterrey)", "America\/Montevideo": "Wektu Uruguay (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Wektu Kanada (Montreal)", "America\/Montserrat": "Wektu Atlantik (Montserrat)", "America\/Nassau": "Wektu sisih Wetan (Nassau)", "America\/New_York": "Wektu sisih Wetan (New York)", @@ -176,7 +176,7 @@ "America\/Recife": "Wektu Brasilia (Recife)", "America\/Regina": "Wektu Tengah (Regina)", "America\/Resolute": "Wektu Tengah (Resolute)", - "America\/Rio_Branco": "Brasil (Rio Branco)", + "America\/Rio_Branco": "Wektu Brasil (Rio Branco)", "America\/Santa_Isabel": "Wektu Meksiko Lor-Kulon (Santa Isabel)", "America\/Santarem": "Wektu Brasilia (Santarem)", "America\/Santiago": "Wektu Chili (Santiago)", @@ -217,7 +217,7 @@ "Asia\/Aden": "Wektu Arab (Aden)", "Asia\/Almaty": "Wektu Kazakhstan Wetan (Almaty)", "Asia\/Amman": "Wektu Eropa sisih Wetan (Amman)", - "Asia\/Anadyr": "Rusia (Anadyr)", + "Asia\/Anadyr": "Wektu Rusia (Anadyr)", "Asia\/Aqtau": "Wektu Kazakhstan Kulon (Aqtau)", "Asia\/Aqtobe": "Wektu Kazakhstan Kulon (Aqtobe)", "Asia\/Ashgabat": "Wektu Turkmenistan (Ashgabat)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Wektu Arab (Bahrain)", "Asia\/Baku": "Wektu Azerbaijan (Baku)", "Asia\/Bangkok": "Wektu Indocina (Bangkok)", - "Asia\/Barnaul": "Rusia (Barnaul)", + "Asia\/Barnaul": "Wektu Rusia (Barnaul)", "Asia\/Beirut": "Wektu Eropa sisih Wetan (Beirut)", "Asia\/Bishkek": "Wektu Kirgizstan (Bishkek)", "Asia\/Brunei": "Wektu Brunai Darussalam (Brunei)", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "Wektu Indonesia sisih Wetan (Jayapura)", "Asia\/Jerusalem": "Wektu Israel (Yerusalem)", "Asia\/Kabul": "Wektu Afghanistan (Kabul)", - "Asia\/Kamchatka": "Rusia (Kamchatka)", + "Asia\/Kamchatka": "Wektu Rusia (Kamchatka)", "Asia\/Karachi": "Wektu Pakistan (Karachi)", "Asia\/Katmandu": "Wektu Nepal (Kathmandu)", "Asia\/Khandyga": "Wektu Yakutsk (Khandyga)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Wektu Iran (Teheran)", "Asia\/Thimphu": "Wektu Bhutan (Thimphu)", "Asia\/Tokyo": "Wektu Jepang (Tokyo)", - "Asia\/Tomsk": "Rusia (Tomsk)", + "Asia\/Tomsk": "Wektu Rusia (Tomsk)", "Asia\/Ulaanbaatar": "Wektu Ulaanbaatar", - "Asia\/Urumqi": "Tyongkok (Urumqi)", + "Asia\/Urumqi": "Wektu Tyongkok (Urumqi)", "Asia\/Ust-Nera": "Wektu Vladivostok (Ust-Nera)", "Asia\/Vientiane": "Wektu Indocina (Vientiane)", "Asia\/Vladivostok": "Wektu Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Wektu Rerata Greenwich (Guernsey)", "Europe\/Helsinki": "Wektu Eropa sisih Wetan (Helsinki)", "Europe\/Isle_of_Man": "Wektu Rerata Greenwich (Pulo Man)", - "Europe\/Istanbul": "Turki (Istanbul)", + "Europe\/Istanbul": "Wektu Turki (Istanbul)", "Europe\/Jersey": "Wektu Rerata Greenwich (Jersey)", "Europe\/Kaliningrad": "Wektu Eropa sisih Wetan (Kaliningrad)", "Europe\/Kiev": "Wektu Eropa sisih Wetan (Kiev)", - "Europe\/Kirov": "Rusia (Kirov)", + "Europe\/Kirov": "Wektu Rusia (Kirov)", "Europe\/Lisbon": "Wektu Eropa sisih Kulon (Lisbon)", "Europe\/Ljubljana": "Wektu Eropa Tengah (Ljubljana)", "Europe\/London": "Wektu Rerata Greenwich (London)", @@ -362,7 +362,7 @@ "Europe\/Prague": "Wektu Eropa Tengah (Prague)", "Europe\/Riga": "Wektu Eropa sisih Wetan (Riga)", "Europe\/Rome": "Wektu Eropa Tengah (Roma)", - "Europe\/Samara": "Rusia (Samara)", + "Europe\/Samara": "Wektu Rusia (Samara)", "Europe\/San_Marino": "Wektu Eropa Tengah (San Marino)", "Europe\/Sarajevo": "Wektu Eropa Tengah (Sarajevo)", "Europe\/Saratov": "Wektu Moscow (Saratov)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Wektu Pulo Wake", "Pacific\/Wallis": "Wektu Wallis lan Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ka.json b/src/Symfony/Component/Intl/Resources/data/timezones/ka.json index 0b1c58a868fd8..1f34ec7ecd4fb 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ka.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ka.json @@ -99,7 +99,7 @@ "America\/Detroit": "ჩრდილოეთ ამერიკის აღმოსავლეთის დრო (დეტროიტი)", "America\/Dominica": "ატლანტიკის ოკეანის დრო (დომინიკა)", "America\/Edmonton": "ჩრდილოეთ ამერიკის მაუნთინის დრო (ედმონტონი)", - "America\/Eirunepe": "ბრაზილია (ეირუნეპე)", + "America\/Eirunepe": "დრო: ბრაზილია (ეირუნეპე)", "America\/El_Salvador": "ჩრდილოეთ ამერიკის ცენტრალური დრო (სალვადორი)", "America\/Fort_Nelson": "ჩრდილოეთ ამერიკის მაუნთინის დრო (ფორტ-ნელსონი)", "America\/Fortaleza": "ბრაზილიის დრო (ფორტალეზა)", @@ -151,7 +151,7 @@ "America\/Moncton": "ატლანტიკის ოკეანის დრო (მონქტონი)", "America\/Monterrey": "ჩრდილოეთ ამერიკის ცენტრალური დრო (მონტერეი)", "America\/Montevideo": "ურუგვაის დრო (მონტევიდეო)", - "America\/Montreal": "კანადა (Montreal)", + "America\/Montreal": "დრო: კანადა (Montreal)", "America\/Montserrat": "ატლანტიკის ოკეანის დრო (მონსერატი)", "America\/Nassau": "ჩრდილოეთ ამერიკის აღმოსავლეთის დრო (ნასაუ)", "America\/New_York": "ჩრდილოეთ ამერიკის აღმოსავლეთის დრო (ნიუ-იორკი)", @@ -176,7 +176,7 @@ "America\/Recife": "ბრაზილიის დრო (რეციფე)", "America\/Regina": "ჩრდილოეთ ამერიკის ცენტრალური დრო (რეჯინა)", "America\/Resolute": "ჩრდილოეთ ამერიკის ცენტრალური დრო (რეზოლუტე)", - "America\/Rio_Branco": "ბრაზილია (რიო ბრანკო)", + "America\/Rio_Branco": "დრო: ბრაზილია (რიო ბრანკო)", "America\/Santa_Isabel": "ჩრდილო-აღმოსავლეთ მექსიკის დრო (სანტა ისაბელი)", "America\/Santarem": "ბრაზილიის დრო (სანტარემი)", "America\/Santiago": "ჩილეს დრო (სანტიაგო)", @@ -217,7 +217,7 @@ "Asia\/Aden": "არაბეთის დრო (ადენი)", "Asia\/Almaty": "აღმოსავლეთ ყაზახეთის დრო (ალმატი)", "Asia\/Amman": "აღმოსავლეთ ევროპის დრო (ამანი)", - "Asia\/Anadyr": "რუსეთი (ანადირი)", + "Asia\/Anadyr": "დრო: რუსეთი (ანადირი)", "Asia\/Aqtau": "დასავლეთ ყაზახეთის დრო (აქტაუ)", "Asia\/Aqtobe": "დასავლეთ ყაზახეთის დრო (აქტობე)", "Asia\/Ashgabat": "თურქმენეთის დრო (აშხაბადი)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "არაბეთის დრო (ბაჰრეინი)", "Asia\/Baku": "აზერბაიჯანის დრო (ბაქო)", "Asia\/Bangkok": "ინდოჩინეთის დრო (ბანგკოკი)", - "Asia\/Barnaul": "რუსეთი (ბარნაული)", + "Asia\/Barnaul": "დრო: რუსეთი (ბარნაული)", "Asia\/Beirut": "აღმოსავლეთ ევროპის დრო (ბეირუთი)", "Asia\/Bishkek": "ყირგიზეთის დრო (ბიშკეკი)", "Asia\/Brunei": "ბრუნეი-დარუსალამის დრო", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "აღმოსავლეთ ინდონეზიის დრო (ჯაიაპურა)", "Asia\/Jerusalem": "ისრაელის დრო (იერუსალიმი)", "Asia\/Kabul": "ავღანეთის დრო (ქაბული)", - "Asia\/Kamchatka": "რუსეთი (კამჩატკა)", + "Asia\/Kamchatka": "დრო: რუსეთი (კამჩატკა)", "Asia\/Karachi": "პაკისტანის დრო (კარაჩი)", "Asia\/Katmandu": "ნეპალის დრო (კატმანდუ)", "Asia\/Khandyga": "იაკუტსკის დრო (ხანდიგა)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ირანის დრო (თეირანი)", "Asia\/Thimphu": "ბუტანის დრო (თხიმფხუ)", "Asia\/Tokyo": "იაპონიის დრო (ტოკიო)", - "Asia\/Tomsk": "რუსეთი (ტომსკი)", + "Asia\/Tomsk": "დრო: რუსეთი (ტომსკი)", "Asia\/Ulaanbaatar": "ულან-ბატორის დრო (ულანბატარი)", - "Asia\/Urumqi": "ჩინეთი (ურუმქი)", + "Asia\/Urumqi": "დრო: ჩინეთი (ურუმქი)", "Asia\/Ust-Nera": "ვლადივოსტოკის დრო (უსტ-ნერა)", "Asia\/Vientiane": "ინდოჩინეთის დრო (ვიენტიანი)", "Asia\/Vladivostok": "ვლადივოსტოკის დრო", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "გრინვიჩის საშუალო დრო (გერნსი)", "Europe\/Helsinki": "აღმოსავლეთ ევროპის დრო (ჰელსინკი)", "Europe\/Isle_of_Man": "გრინვიჩის საშუალო დრო (მენის კუნძული)", - "Europe\/Istanbul": "თურქეთი (სტამბოლი)", + "Europe\/Istanbul": "დრო: თურქეთი (სტამბოლი)", "Europe\/Jersey": "გრინვიჩის საშუალო დრო (ჯერსი)", "Europe\/Kaliningrad": "აღმოსავლეთ ევროპის დრო (კალინინგრადი)", "Europe\/Kiev": "აღმოსავლეთ ევროპის დრო (კიევი)", - "Europe\/Kirov": "რუსეთი (კიროვი)", + "Europe\/Kirov": "დრო: რუსეთი (კიროვი)", "Europe\/Lisbon": "დასავლეთ ევროპის დრო (ლისაბონი)", "Europe\/Ljubljana": "ცენტრალური ევროპის დრო (ლიუბლიანა)", "Europe\/London": "გრინვიჩის საშუალო დრო (ლონდონი)", @@ -362,7 +362,7 @@ "Europe\/Prague": "ცენტრალური ევროპის დრო (პრაღა)", "Europe\/Riga": "აღმოსავლეთ ევროპის დრო (რიგა)", "Europe\/Rome": "ცენტრალური ევროპის დრო (რომი)", - "Europe\/Samara": "რუსეთი (სამარა)", + "Europe\/Samara": "დრო: რუსეთი (სამარა)", "Europe\/San_Marino": "ცენტრალური ევროპის დრო (სან-მარინო)", "Europe\/Sarajevo": "ცენტრალური ევროპის დრო (სარაევო)", "Europe\/Saratov": "მოსკოვის დრო (სარატოვი)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "ვეიკის კუნძულის დრო (უეიკი)", "Pacific\/Wallis": "ვოლისი და ფუტუნას დრო (ვალისი)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/kk.json b/src/Symfony/Component/Intl/Resources/data/timezones/kk.json index 4c307719ce80d..1983899bf38bb 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/kk.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/kk.json @@ -99,7 +99,7 @@ "America\/Detroit": "Солтүстік Америка шығыс уақыты (Детройт)", "America\/Dominica": "Атлантика уақыты (Доминика)", "America\/Edmonton": "Солтүстік Америка тау уақыты (Эдмонтон)", - "America\/Eirunepe": "Бразилия (Эйрунепе)", + "America\/Eirunepe": "Бразилия уақыты (Эйрунепе)", "America\/El_Salvador": "Солтүстік Америка орталық уақыты (Сальвадор)", "America\/Fort_Nelson": "Солтүстік Америка тау уақыты (Форт-Нельсон)", "America\/Fortaleza": "Бразилия уақыты (Форталеза)", @@ -151,7 +151,7 @@ "America\/Moncton": "Атлантика уақыты (Монктон)", "America\/Monterrey": "Солтүстік Америка орталық уақыты (Монтеррей)", "America\/Montevideo": "Уругвай уақыты (Монтевидео)", - "America\/Montreal": "Канада (Montreal)", + "America\/Montreal": "Канада уақыты (Montreal)", "America\/Montserrat": "Атлантика уақыты (Монтсеррат)", "America\/Nassau": "Солтүстік Америка шығыс уақыты (Нассау)", "America\/New_York": "Солтүстік Америка шығыс уақыты (Нью-Йорк)", @@ -176,7 +176,7 @@ "America\/Recife": "Бразилия уақыты (Ресифи)", "America\/Regina": "Солтүстік Америка орталық уақыты (Реджайна)", "America\/Resolute": "Солтүстік Америка орталық уақыты (Резольют)", - "America\/Rio_Branco": "Бразилия (Риу-Бранку)", + "America\/Rio_Branco": "Бразилия уақыты (Риу-Бранку)", "America\/Santa_Isabel": "Солтүстік-батыс Мексика уақыты (Санта-Изабел)", "America\/Santarem": "Бразилия уақыты (Сантарен)", "America\/Santiago": "Чили уақыты (Сантьяго)", @@ -217,7 +217,7 @@ "Asia\/Aden": "Сауд Арабиясы уақыты (Аден)", "Asia\/Almaty": "Шығыс Қазақстан уақыты (Алматы)", "Asia\/Amman": "Шығыс Еуропа уақыты (Амман)", - "Asia\/Anadyr": "Ресей (Анадыр)", + "Asia\/Anadyr": "Ресей уақыты (Анадыр)", "Asia\/Aqtau": "Батыс Қазақстан уақыты (Ақтау)", "Asia\/Aqtobe": "Батыс Қазақстан уақыты (Ақтөбе)", "Asia\/Ashgabat": "Түрікменстан уақыты (Ашхабад)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Сауд Арабиясы уақыты (Бахрейн)", "Asia\/Baku": "Әзірбайжан уақыты (Баку)", "Asia\/Bangkok": "Үндіқытай уақыты (Бангкок)", - "Asia\/Barnaul": "Ресей (Барнауыл)", + "Asia\/Barnaul": "Ресей уақыты (Барнауыл)", "Asia\/Beirut": "Шығыс Еуропа уақыты (Бейрут)", "Asia\/Bishkek": "Қырғызстан уақыты (Бішкек)", "Asia\/Brunei": "Бруней-Даруссалам уақыты", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "Шығыс Индонезия уақыты (Джаяпура)", "Asia\/Jerusalem": "Израиль уақыты (Иерусалим)", "Asia\/Kabul": "Ауғанстан уақыты (Кабул)", - "Asia\/Kamchatka": "Ресей (Камчатка)", + "Asia\/Kamchatka": "Ресей уақыты (Камчатка)", "Asia\/Karachi": "Пәкістан уақыты (Карачи)", "Asia\/Katmandu": "Непал уақыты (Катманду)", "Asia\/Khandyga": "Якутск уақыты (Хандыга)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Иран уақыты (Тегеран)", "Asia\/Thimphu": "Бутан уақыты (Тхимпху)", "Asia\/Tokyo": "Жапония уақыты (Токио)", - "Asia\/Tomsk": "Ресей (Томск)", + "Asia\/Tomsk": "Ресей уақыты (Томск)", "Asia\/Ulaanbaatar": "Ұланбатыр уақыты (Улан-Батор)", - "Asia\/Urumqi": "Қытай (Үрімші)", + "Asia\/Urumqi": "Қытай уақыты (Үрімші)", "Asia\/Ust-Nera": "Владивосток уақыты (Усть-Нера)", "Asia\/Vientiane": "Үндіқытай уақыты (Вьентьян)", "Asia\/Vladivostok": "Владивосток уақыты", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Гринвич уақыты (Гернси)", "Europe\/Helsinki": "Шығыс Еуропа уақыты (Хелсинки)", "Europe\/Isle_of_Man": "Гринвич уақыты (Мэн аралы)", - "Europe\/Istanbul": "Түркия (Стамбұл)", + "Europe\/Istanbul": "Түркия уақыты (Стамбұл)", "Europe\/Jersey": "Гринвич уақыты (Джерси)", "Europe\/Kaliningrad": "Шығыс Еуропа уақыты (Калининград)", "Europe\/Kiev": "Шығыс Еуропа уақыты (Киев)", - "Europe\/Kirov": "Ресей (Киров)", + "Europe\/Kirov": "Ресей уақыты (Киров)", "Europe\/Lisbon": "Батыс Еуропа уақыты (Лиссабон)", "Europe\/Ljubljana": "Орталық Еуропа уақыты (Любляна)", "Europe\/London": "Гринвич уақыты (Лондон)", @@ -362,7 +362,7 @@ "Europe\/Prague": "Орталық Еуропа уақыты (Прага)", "Europe\/Riga": "Шығыс Еуропа уақыты (Рига)", "Europe\/Rome": "Орталық Еуропа уақыты (Рим)", - "Europe\/Samara": "Ресей (Самара)", + "Europe\/Samara": "Ресей уақыты (Самара)", "Europe\/San_Marino": "Орталық Еуропа уақыты (Сан-Марино)", "Europe\/Sarajevo": "Орталық Еуропа уақыты (Сараево)", "Europe\/Saratov": "Мәскеу уақыты (Саратов)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Уэйк аралы уақыты", "Pacific\/Wallis": "Уоллис және Футуна уақыты" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/km.json b/src/Symfony/Component/Intl/Resources/data/timezones/km.json index 769ae153a3072..e70e6dfa83fbe 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/km.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/km.json @@ -99,7 +99,7 @@ "America\/Detroit": "ម៉ោងនៅទ្វីបអាមរិកខាងជើងភាគខាងកើត (ដេត្រូអ៊ីត)", "America\/Dominica": "ម៉ោង​នៅ​អាត្លង់ទិក (ដូមីនីក)", "America\/Edmonton": "ម៉ោង​នៅតំបន់ភ្នំនៃទ្វីប​អាមេរិក​​​ខាង​ជើង (អែតម៉ុងតុង)", - "America\/Eirunepe": "ប្រេស៊ីល (អ៊ីរ៉ុយណេភី)", + "America\/Eirunepe": "ម៉ោង​នៅ​ ប្រេស៊ីល (អ៊ីរ៉ុយណេភី)", "America\/El_Salvador": "ម៉ោង​​នៅ​ទ្វីបអាមេរិក​ខាង​ជើងភាគកណ្តាល (អែលសាល់វ៉ាឌ័រ)", "America\/Fort_Nelson": "ម៉ោង​នៅតំបន់ភ្នំនៃទ្វីប​អាមេរិក​​​ខាង​ជើង (ហ្វតណេលសាន់)", "America\/Fortaleza": "ម៉ោង​នៅ​ប្រាស៊ីលីយ៉ា (ហ្វ័រតាឡេហ្សារ)", @@ -151,7 +151,7 @@ "America\/Moncton": "ម៉ោង​នៅ​អាត្លង់ទិក (ម៉ុងតុន)", "America\/Monterrey": "ម៉ោង​​នៅ​ទ្វីបអាមេរិក​ខាង​ជើងភាគកណ្តាល (ម៉ុនតេរ៉េ)", "America\/Montevideo": "ម៉ោង​នៅ​អ៊ុយរូហ្គាយ (ម៉ុងតេវីដេអូ)", - "America\/Montreal": "កាណាដា (Montreal)", + "America\/Montreal": "ម៉ោង​នៅ​ កាណាដា (Montreal)", "America\/Montserrat": "ម៉ោង​នៅ​អាត្លង់ទិក (ម៉ុងស៊ែរ៉ាត​)", "America\/Nassau": "ម៉ោងនៅទ្វីបអាមរិកខាងជើងភាគខាងកើត (ណាស្សូ)", "America\/New_York": "ម៉ោងនៅទ្វីបអាមរិកខាងជើងភាគខាងកើត (ញូវយ៉ក)", @@ -176,7 +176,7 @@ "America\/Recife": "ម៉ោង​នៅ​ប្រាស៊ីលីយ៉ា (រ៉េស៊ីហ្វី)", "America\/Regina": "ម៉ោង​​នៅ​ទ្វីបអាមេរិក​ខាង​ជើងភាគកណ្តាល (រ៉េហ្គីណា)", "America\/Resolute": "ម៉ោង​​នៅ​ទ្វីបអាមេរិក​ខាង​ជើងភាគកណ្តាល (រ៉េ​ស៊ូឡូត)", - "America\/Rio_Branco": "ប្រេស៊ីល (រីយ៉ូប្រានកូ)", + "America\/Rio_Branco": "ម៉ោង​នៅ​ ប្រេស៊ីល (រីយ៉ូប្រានកូ)", "America\/Santa_Isabel": "ម៉ោង​នៅ​ម៉ិកស៊ិកភាគពាយព្យ (សាន់តាអ៊ីសាប៊ែល)", "America\/Santarem": "ម៉ោង​នៅ​ប្រាស៊ីលីយ៉ា (សាន់តារឹម)", "America\/Santiago": "ម៉ោងនៅស៊ីលី (សាន់ទីអេហ្គោ)", @@ -217,7 +217,7 @@ "Asia\/Aden": "ម៉ោង​នៅ​អារ៉ាប់ (អាដែន)", "Asia\/Almaty": "ម៉ោង​កាហ្សាក់ស្ថាន​​ខាង​កើត (អាល់ម៉ាទី)", "Asia\/Amman": "ម៉ោង​នៅ​អឺរ៉ុប​​ខាង​កើត​ (អាម៉ាន់)", - "Asia\/Anadyr": "រុស្ស៊ី (អាណាឌី)", + "Asia\/Anadyr": "ម៉ោង​នៅ​ រុស្ស៊ី (អាណាឌី)", "Asia\/Aqtau": "ម៉ោង​នៅ​កាហ្សាក់ស្ថាន​ខាង​​​លិច (អាកទូ)", "Asia\/Aqtobe": "ម៉ោង​នៅ​កាហ្សាក់ស្ថាន​ខាង​​​លិច (អាកទូប៊ី)", "Asia\/Ashgabat": "ម៉ោង​នៅ​តួកម៉េនីស្ថាន (អាសហ្គាបាត)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "ម៉ោង​នៅ​អារ៉ាប់ (បារ៉ែន)", "Asia\/Baku": "ម៉ោង​នៅ​អាស៊ែបៃហ្សង់ (បាគូ)", "Asia\/Bangkok": "ម៉ោង​នៅ​ឥណ្ឌូចិន (បាងកក)", - "Asia\/Barnaul": "រុស្ស៊ី (បានូល)", + "Asia\/Barnaul": "ម៉ោង​នៅ​ រុស្ស៊ី (បានូល)", "Asia\/Beirut": "ម៉ោង​នៅ​អឺរ៉ុប​​ខាង​កើត​ (បេរូត)", "Asia\/Bishkek": "ម៉ោងនៅកៀហ្ស៊ីស៊ីស្ថាន (ប៊ីស្កេក)", "Asia\/Brunei": "ម៉ោងនៅព្រុយណេដារូសាឡឹម", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "ម៉ោង​នៅ​ឥណ្ឌូណេស៊ី​​ខាង​កើត (ចាយ៉ាភូរ៉ា)", "Asia\/Jerusalem": "ម៉ោង​នៅ​អ៊ីស្រាអែល (ហ្ស៊េរុយសាឡិម)", "Asia\/Kabul": "ម៉ោង​នៅ​អាហ្វហ្គានីស្ថាន (កាប៊ុល)", - "Asia\/Kamchatka": "រុស្ស៊ី (កាំឆាតកា)", + "Asia\/Kamchatka": "ម៉ោង​នៅ​ រុស្ស៊ី (កាំឆាតកា)", "Asia\/Karachi": "ម៉ោង​នៅ​ប៉ាគីស្ថាន (ការ៉ាជី)", "Asia\/Katmandu": "ម៉ោងនៅនេប៉ាល់ (កាត់ម៉ាន់ឌូ)", "Asia\/Khandyga": "ម៉ោង​នៅ​យ៉ាគុតស្កិ៍ (ខាន់ឌីហ្គា)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ម៉ោង​នៅ​អ៊ីរ៉ង់ (តេហេរ៉ង់)", "Asia\/Thimphu": "ម៉ោងនៅប៊ូតង់ (ធីមភូ)", "Asia\/Tokyo": "ម៉ោង​នៅ​ជប៉ុន (តូក្យូ)", - "Asia\/Tomsk": "រុស្ស៊ី (ថមស្កិ៍)", + "Asia\/Tomsk": "ម៉ោង​នៅ​ រុស្ស៊ី (ថមស្កិ៍)", "Asia\/Ulaanbaatar": "ម៉ោង​នៅ​អ៊ូឡាន​បាទូ (អ៊ូឡង់បាទ័រ)", - "Asia\/Urumqi": "ចិន (អ៊ូរាំហ្គី)", + "Asia\/Urumqi": "ម៉ោង​នៅ​ ចិន (អ៊ូរាំហ្គី)", "Asia\/Ust-Nera": "ម៉ោង​នៅ​វ៉្លាឌីវ៉ូស្តុក (អូស្តណេរ៉ា)", "Asia\/Vientiane": "ម៉ោង​នៅ​ឥណ្ឌូចិន (វៀងចន្ទន៍)", "Asia\/Vladivostok": "ម៉ោង​នៅ​វ៉្លាឌីវ៉ូស្តុក (វ៉្លាដីវ៉ូស្តុក)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "ម៉ោងនៅគ្រីនវិច (ហ្គេនស៊ី)", "Europe\/Helsinki": "ម៉ោង​នៅ​អឺរ៉ុប​​ខាង​កើត​ (ហែលស៊ិងគី)", "Europe\/Isle_of_Man": "ម៉ោងនៅគ្រីនវិច (អែលអុហ្វម៉ែន)", - "Europe\/Istanbul": "តួកគី (អ៊ីស្តង់ប៊ុល)", + "Europe\/Istanbul": "ម៉ោង​នៅ​ តួកគី (អ៊ីស្តង់ប៊ុល)", "Europe\/Jersey": "ម៉ោងនៅគ្រីនវិច (ជេស៊ី)", "Europe\/Kaliningrad": "ម៉ោង​នៅ​អឺរ៉ុប​​ខាង​កើត​ (កាលីនីងហ្រ្គាដ)", "Europe\/Kiev": "ម៉ោង​នៅ​អឺរ៉ុប​​ខាង​កើត​ (កៀវ)", - "Europe\/Kirov": "រុស្ស៊ី (គីរ៉ូវ)", + "Europe\/Kirov": "ម៉ោង​នៅ​ រុស្ស៊ី (គីរ៉ូវ)", "Europe\/Lisbon": "ម៉ោង​នៅ​អឺរ៉ុប​ខាង​លិច (លីសបោន)", "Europe\/Ljubljana": "ម៉ោង​នៅ​អឺរ៉ុប​កណ្ដាល (ជូបហ្សាណា)", "Europe\/London": "ម៉ោងនៅគ្រីនវិច (ឡុងដ៍)", @@ -362,7 +362,7 @@ "Europe\/Prague": "ម៉ោង​នៅ​អឺរ៉ុប​កណ្ដាល (ប្រាក)", "Europe\/Riga": "ម៉ោង​នៅ​អឺរ៉ុប​​ខាង​កើត​ (រីហ្គា)", "Europe\/Rome": "ម៉ោង​នៅ​អឺរ៉ុប​កណ្ដាល (រ៉ូម)", - "Europe\/Samara": "រុស្ស៊ី (សាម៉ារ៉ា)", + "Europe\/Samara": "ម៉ោង​នៅ​ រុស្ស៊ី (សាម៉ារ៉ា)", "Europe\/San_Marino": "ម៉ោង​នៅ​អឺរ៉ុប​កណ្ដាល (សាំងម៉ារ៉ាំង)", "Europe\/Sarajevo": "ម៉ោង​នៅ​អឺរ៉ុប​កណ្ដាល (សារ៉ាយ៉េវ៉ូ)", "Europe\/Saratov": "ម៉ោង​នៅ​មូស្គូ (សារ៉ាតាវ)", @@ -437,10 +437,6 @@ "Pacific\/Wallis": "ម៉ោង​នៅ​វ៉ាលីស និងហ្វ៊ុទូណា" }, "Meta": { - "GmtFormat": "ម៉ោង​សកល %s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] + "GmtFormat": "ម៉ោង​សកល %s" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/kn.json b/src/Symfony/Component/Intl/Resources/data/timezones/kn.json index 13c08e18f2dc9..7ccf53020bc53 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/kn.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/kn.json @@ -99,7 +99,7 @@ "America\/Detroit": "ಉತ್ತರ ಅಮೆರಿಕದ ಪೂರ್ವದ ಸಮಯ (ಡೆಟ್ರಾಯ್ಟ್)", "America\/Dominica": "ಅಟ್ಲಾಂಟಿಕ್ ಸಮಯ (ಡೊಮಿನಿಕಾ)", "America\/Edmonton": "ಉತ್ತರ ಅಮೆರಿಕದ ಪರ್ವತ ಸಮಯ (ಎಡ್ಮಂಟನ್‌)", - "America\/Eirunepe": "ಬ್ರೆಜಿಲ್ (ಇರುನಿಪೆ)", + "America\/Eirunepe": "ಬ್ರೆಜಿಲ್ ಸಮಯ (ಇರುನಿಪೆ)", "America\/El_Salvador": "ಉತ್ತರ ಅಮೆರಿಕದ ಕೇಂದ್ರ ಸಮಯ (ಎಲ್ ಸಾಲ್ವಡೋರ್)", "America\/Fort_Nelson": "ಉತ್ತರ ಅಮೆರಿಕದ ಪರ್ವತ ಸಮಯ (ಫೋರ್ಟ್ ನೆಲ್ಸನ್)", "America\/Fortaleza": "ಬ್ರೆಸಿಲಿಯಾದ ಸಮಯ (ಫೊರ್ಟಲೆಜಾ)", @@ -151,7 +151,7 @@ "America\/Moncton": "ಅಟ್ಲಾಂಟಿಕ್ ಸಮಯ (ಮಾಂಕ್ಟನ್)", "America\/Monterrey": "ಉತ್ತರ ಅಮೆರಿಕದ ಕೇಂದ್ರ ಸಮಯ (ಮಾಂಟೆರ್ರಿ)", "America\/Montevideo": "ಉರುಗ್ವೇ ಸಮಯ (ಮಾಂಟಿವೀಡಿಯೊ)", - "America\/Montreal": "ಕೆನಡಾ (Montreal)", + "America\/Montreal": "ಕೆನಡಾ ಸಮಯ (Montreal)", "America\/Montserrat": "ಅಟ್ಲಾಂಟಿಕ್ ಸಮಯ (ಮಾಂಟ್‌ಸೆರೇಟ್)", "America\/Nassau": "ಉತ್ತರ ಅಮೆರಿಕದ ಪೂರ್ವದ ಸಮಯ (ನಸ್ಸೌವ್)", "America\/New_York": "ಉತ್ತರ ಅಮೆರಿಕದ ಪೂರ್ವದ ಸಮಯ (ನ್ಯೂಯಾರ್ಕ್)", @@ -176,7 +176,7 @@ "America\/Recife": "ಬ್ರೆಸಿಲಿಯಾದ ಸಮಯ (ರೆಸಿಫಿ)", "America\/Regina": "ಉತ್ತರ ಅಮೆರಿಕದ ಕೇಂದ್ರ ಸಮಯ (ರೆಜಿನಾ)", "America\/Resolute": "ಉತ್ತರ ಅಮೆರಿಕದ ಕೇಂದ್ರ ಸಮಯ (ರೆಸೊಲ್ಯೂಟ್)", - "America\/Rio_Branco": "ಬ್ರೆಜಿಲ್ (ರಿಯೋ ಬ್ರ್ಯಾಂಕೊ)", + "America\/Rio_Branco": "ಬ್ರೆಜಿಲ್ ಸಮಯ (ರಿಯೋ ಬ್ರ್ಯಾಂಕೊ)", "America\/Santa_Isabel": "ವಾಯವ್ಯ ಮೆಕ್ಸಿಕೊ ಸಮಯ (ಸಾಂತಾ ಇಸಾಬೆಲ್)", "America\/Santarem": "ಬ್ರೆಸಿಲಿಯಾದ ಸಮಯ (ಸಾಂಟರೆಮ್)", "America\/Santiago": "ಚಿಲಿ ಸಮಯ (ಸ್ಯಾಂಟಿಯಾಗೊ)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "ಅರೇಬಿಯನ್ ಸಮಯ (ಬಹ್ರೇನ್)", "Asia\/Baku": "ಅಜರ್ಬೈಜಾನ್ ಸಮಯ (ಬಕು)", "Asia\/Bangkok": "ಇಂಡೊಚೈನಾ ಸಮಯ (ಬ್ಯಾಂಕಾಕ್)", - "Asia\/Barnaul": "ರಷ್ಯಾ (ಬಾರ್ನೌಲ್)", + "Asia\/Barnaul": "ರಷ್ಯಾ ಸಮಯ (ಬಾರ್ನೌಲ್)", "Asia\/Beirut": "ಪೂರ್ವ ಯುರೋಪಿಯನ್ ಸಮಯ (ಬೀರಟ್)", "Asia\/Bishkek": "ಕಿರ್ಗಿಸ್ತಾನ್ ಸಮಯ (ಬಿಶ್ಕೆಕ್)", "Asia\/Brunei": "ಬ್ರೂನಿ ದಾರುಸಲೆಮ್ ಸಮಯ", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ಇರಾನ್ ಸಮಯ (ತೆಹ್ರಾನ್)", "Asia\/Thimphu": "ಭೂತಾನ್ ಸಮಯ (ಥಿಂಪು)", "Asia\/Tokyo": "ಜಪಾನ್ ಸಮಯ (ಟೋಕಿಯೊ)", - "Asia\/Tomsk": "ರಷ್ಯಾ (ಟೋಮ್‌ಸ್ಕ್)", + "Asia\/Tomsk": "ರಷ್ಯಾ ಸಮಯ (ಟೋಮ್‌ಸ್ಕ್)", "Asia\/Ulaanbaatar": "ಉಲನ್ ಬ್ಯಾಟರ್ ಸಮಯ (ಉಲಾನ್‍ಬಾತರ್)", - "Asia\/Urumqi": "ಚೀನಾ (ಉರುಮ್‍ಕಿ)", + "Asia\/Urumqi": "ಚೀನಾ ಸಮಯ (ಉರುಮ್‍ಕಿ)", "Asia\/Ust-Nera": "ವ್ಲಾಡಿವೋಸ್ಟೋಕ್ ಸಮಯ (ಉಸ್ತ್-ನೆರಾ)", "Asia\/Vientiane": "ಇಂಡೊಚೈನಾ ಸಮಯ (ವಿಯೆಂಟಿಯಾನ್)", "Asia\/Vladivostok": "ವ್ಲಾಡಿವೋಸ್ಟೋಕ್ ಸಮಯ (ವ್ಲಾದಿವೊಸ್ಟಾಕ್‌)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "ಗ್ರೀನ್‌ವಿಚ್ ಸರಾಸರಿ ಕಾಲಮಾನ (ಗ್ಯುರ್ನ್‍ಸೆ)", "Europe\/Helsinki": "ಪೂರ್ವ ಯುರೋಪಿಯನ್ ಸಮಯ (ಹೆಲ್ಸಿಂಕಿ)", "Europe\/Isle_of_Man": "ಗ್ರೀನ್‌ವಿಚ್ ಸರಾಸರಿ ಕಾಲಮಾನ (ಐಲ್ ಆಫ್ ಮ್ಯಾನ್)", - "Europe\/Istanbul": "ಟರ್ಕಿ (ಇಸ್ತಾನ್‌ಬುಲ್)", + "Europe\/Istanbul": "ಟರ್ಕಿ ಸಮಯ (ಇಸ್ತಾನ್‌ಬುಲ್)", "Europe\/Jersey": "ಗ್ರೀನ್‌ವಿಚ್ ಸರಾಸರಿ ಕಾಲಮಾನ (ಜೆರ್ಸಿ)", "Europe\/Kaliningrad": "ಪೂರ್ವ ಯುರೋಪಿಯನ್ ಸಮಯ (ಕಲಿನಿನ್‌ಗ್ರಾಡ್)", "Europe\/Kiev": "ಪೂರ್ವ ಯುರೋಪಿಯನ್ ಸಮಯ (ಕಿವ್)", - "Europe\/Kirov": "ರಷ್ಯಾ (ಕಿರಾವ್)", + "Europe\/Kirov": "ರಷ್ಯಾ ಸಮಯ (ಕಿರಾವ್)", "Europe\/Lisbon": "ಪಶ್ಚಿಮ ಯುರೋಪಿಯನ್ ಸಮಯ (ಲಿಸ್ಬನ್)", "Europe\/Ljubljana": "ಮಧ್ಯ ಯುರೋಪಿಯನ್ ಸಮಯ (ಲ್ಯೂಬ್ಲ್ಯಾನಾ)", "Europe\/London": "ಗ್ರೀನ್‌ವಿಚ್ ಸರಾಸರಿ ಕಾಲಮಾನ (ಲಂಡನ್)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "ವೇಕ್ ದ್ವೀಪ ಸಮಯ", "Pacific\/Wallis": "ವ್ಯಾಲೀಸ್ ಮತ್ತು ಫ್ಯುಟುನಾ ಸಮಯ (ವ್ಯಾಲಿಸ್)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ko.json b/src/Symfony/Component/Intl/Resources/data/timezones/ko.json index f79eb547f8e0c..a83a7fa722eaf 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ko.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ko.json @@ -151,7 +151,7 @@ "America\/Moncton": "대서양 시간(몽턴)", "America\/Monterrey": "미 중부 시간(몬테레이)", "America\/Montevideo": "우루과이 시간(몬테비데오)", - "America\/Montreal": "캐나다(Montreal)", + "America\/Montreal": "캐나다 시간(Montreal)", "America\/Montserrat": "대서양 시간(몬세라트)", "America\/Nassau": "미 동부 시간(나소)", "America\/New_York": "미 동부 시간(뉴욕)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "아라비아 시간(바레인)", "Asia\/Baku": "아제르바이잔 시간(바쿠)", "Asia\/Bangkok": "인도차이나 시간(방콕)", - "Asia\/Barnaul": "러시아(바르나울)", + "Asia\/Barnaul": "러시아 시간(바르나울)", "Asia\/Beirut": "동유럽 시간(베이루트)", "Asia\/Bishkek": "키르기스스탄 시간(비슈케크)", "Asia\/Brunei": "브루나이 시간", @@ -288,9 +288,9 @@ "Asia\/Tehran": "이란 시간(테헤란)", "Asia\/Thimphu": "부탄 시간(팀부)", "Asia\/Tokyo": "일본 시간(도쿄)", - "Asia\/Tomsk": "러시아(톰스크)", + "Asia\/Tomsk": "러시아 시간(톰스크)", "Asia\/Ulaanbaatar": "울란바토르 시간", - "Asia\/Urumqi": "중국(우루무치)", + "Asia\/Urumqi": "중국 시간(우루무치)", "Asia\/Ust-Nera": "블라디보스토크 시간(우스티네라)", "Asia\/Vientiane": "인도차이나 시간(비엔티안)", "Asia\/Vladivostok": "블라디보스토크 시간", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "그리니치 표준시(건지)", "Europe\/Helsinki": "동유럽 시간(헬싱키)", "Europe\/Isle_of_Man": "그리니치 표준시(맨섬)", - "Europe\/Istanbul": "터키(이스탄불)", + "Europe\/Istanbul": "터키 시간(이스탄불)", "Europe\/Jersey": "그리니치 표준시(저지)", "Europe\/Kaliningrad": "동유럽 시간(칼리닌그라드)", "Europe\/Kiev": "동유럽 시간(키예프)", - "Europe\/Kirov": "러시아(키로프)", + "Europe\/Kirov": "러시아 시간(키로프)", "Europe\/Lisbon": "서유럽 시간(리스본)", "Europe\/Ljubljana": "중부 유럽 시간(류블랴나)", "Europe\/London": "그리니치 표준시(런던)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "웨이크섬 시간", "Pacific\/Wallis": "월리스푸투나 제도 시간" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ks.json b/src/Symfony/Component/Intl/Resources/data/timezones/ks.json index f58825b4953c9..e311d4f8c00e4 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ks.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ks.json @@ -322,7 +322,6 @@ "CST6CDT": "مرکزی ٹایِم", "EST5EDT": "مشرقی ٹایِم", "Etc\/GMT": "گریٖن وِچ میٖن ٹایِم", - "Etc\/UTC": "UTC", "Europe\/Amsterdam": "مرکزی یوٗرپی ٹایِم (ایمسٹَرڈیم)", "Europe\/Andorra": "مرکزی یوٗرپی ٹایِم (اَنڑورا)", "Europe\/Astrakhan": "ماسکَو ٹایِم (Astrakhan)", @@ -436,11 +435,5 @@ "Pacific\/Wake": "ویک ججیٖرُک ٹایِم", "Pacific\/Wallis": "والِس تہٕ فیوٗٹیوٗنا ٹایِم (ویلِس)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ky.json b/src/Symfony/Component/Intl/Resources/data/timezones/ky.json index 1f5d4285c4479..6f77cd1367138 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ky.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ky.json @@ -99,7 +99,7 @@ "America\/Detroit": "Түндүк Америка, чыгыш убактысы (Детройт)", "America\/Dominica": "Атлантика убактысы (Доминика)", "America\/Edmonton": "Түндүк Америка, тоо убактысы (Эдмонтон)", - "America\/Eirunepe": "Бразилия (Эйрунепе)", + "America\/Eirunepe": "Бразилия убактысы (Эйрунепе)", "America\/El_Salvador": "Түндүк Америка, борбордук убакыт (Эл Салвадор)", "America\/Fort_Nelson": "Түндүк Америка, тоо убактысы (Форт Нельсон)", "America\/Fortaleza": "Бразилия убактысы (Форталеза)", @@ -151,7 +151,7 @@ "America\/Moncton": "Атлантика убактысы (Монктон)", "America\/Monterrey": "Түндүк Америка, борбордук убакыт (Монтерей)", "America\/Montevideo": "Уругвай убактысы (Монтевидео)", - "America\/Montreal": "Канада (Montreal)", + "America\/Montreal": "Канада убактысы (Montreal)", "America\/Montserrat": "Атлантика убактысы (Монсерат)", "America\/Nassau": "Түндүк Америка, чыгыш убактысы (Нассау)", "America\/New_York": "Түндүк Америка, чыгыш убактысы (Нью-Йорк)", @@ -176,7 +176,7 @@ "America\/Recife": "Бразилия убактысы (Ресифи)", "America\/Regina": "Түндүк Америка, борбордук убакыт (Регина)", "America\/Resolute": "Түндүк Америка, борбордук убакыт (Резолут)", - "America\/Rio_Branco": "Бразилия (Рио Бранко)", + "America\/Rio_Branco": "Бразилия убактысы (Рио Бранко)", "America\/Santa_Isabel": "Түндүк-чыгыш Мексика убактысы (Санта Изабел)", "America\/Santarem": "Бразилия убактысы (Сантарем)", "America\/Santiago": "Чили убактысы (Сантиаго)", @@ -217,7 +217,7 @@ "Asia\/Aden": "Арабия убактысы (Аден)", "Asia\/Almaty": "Чыгыш Казакстан убактысы (Алматы)", "Asia\/Amman": "Чыгыш Европа убактысы (Амман)", - "Asia\/Anadyr": "Россия (Анадыр)", + "Asia\/Anadyr": "Россия убактысы (Анадыр)", "Asia\/Aqtau": "Батыш Казакстан убактысы (Актау)", "Asia\/Aqtobe": "Батыш Казакстан убактысы (Актобе)", "Asia\/Ashgabat": "Түркмөнстан убактысы (Ашхабад)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Арабия убактысы (Бахрейн)", "Asia\/Baku": "Азербайжан убактысы (Баку)", "Asia\/Bangkok": "Индокытай убактысы (Бангкок)", - "Asia\/Barnaul": "Россия (Барнаул)", + "Asia\/Barnaul": "Россия убактысы (Барнаул)", "Asia\/Beirut": "Чыгыш Европа убактысы (Бейрут)", "Asia\/Bishkek": "Кыргызстан убактысы (Бишкек)", "Asia\/Brunei": "Бруней Даруссалам убактысы", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "Чыгыш Индонезия убактысы (Жайапура)", "Asia\/Jerusalem": "Израиль убакыты (Иерусалим)", "Asia\/Kabul": "Афганистан убактысы (Кабул)", - "Asia\/Kamchatka": "Россия (Камчатка)", + "Asia\/Kamchatka": "Россия убактысы (Камчатка)", "Asia\/Karachi": "Пакистан убактысы (Карачи)", "Asia\/Katmandu": "Непал убактысы (Катманду)", "Asia\/Khandyga": "Якутск убактысы (Кандыга)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Иран убактысы (Тегеран)", "Asia\/Thimphu": "Бутан убактысы (Тимпу)", "Asia\/Tokyo": "Жапон убактысы (Токио)", - "Asia\/Tomsk": "Россия (Томск)", + "Asia\/Tomsk": "Россия убактысы (Томск)", "Asia\/Ulaanbaatar": "Улан Батор убактысы", - "Asia\/Urumqi": "Кытай (Үрүмчү)", + "Asia\/Urumqi": "Кытай убактысы (Үрүмчү)", "Asia\/Ust-Nera": "Владивосток убактысы (Усть-Нера)", "Asia\/Vientiane": "Индокытай убактысы (Виентиан)", "Asia\/Vladivostok": "Владивосток убактысы", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Гринвич боюнча орточо убакыт (Гернси)", "Europe\/Helsinki": "Чыгыш Европа убактысы (Хельсинки)", "Europe\/Isle_of_Man": "Гринвич боюнча орточо убакыт (Мэн аралы)", - "Europe\/Istanbul": "Түркия (Стамбул)", + "Europe\/Istanbul": "Түркия убактысы (Стамбул)", "Europe\/Jersey": "Гринвич боюнча орточо убакыт (Жерси)", "Europe\/Kaliningrad": "Чыгыш Европа убактысы (Калининград)", "Europe\/Kiev": "Чыгыш Европа убактысы (Киев)", - "Europe\/Kirov": "Россия (Киров)", + "Europe\/Kirov": "Россия убактысы (Киров)", "Europe\/Lisbon": "Батыш Европа убактысы (Лиссабон)", "Europe\/Ljubljana": "Борбордук Европа убактысы (Любляна)", "Europe\/London": "Гринвич боюнча орточо убакыт (Лондон)", @@ -362,7 +362,7 @@ "Europe\/Prague": "Борбордук Европа убактысы (Прага)", "Europe\/Riga": "Чыгыш Европа убактысы (Рига)", "Europe\/Rome": "Борбордук Европа убактысы (Рим)", - "Europe\/Samara": "Россия (Самара)", + "Europe\/Samara": "Россия убактысы (Самара)", "Europe\/San_Marino": "Борбордук Европа убактысы (Сан Марино)", "Europe\/Sarajevo": "Борбордук Европа убактысы (Сараево)", "Europe\/Saratov": "Москва убактысы (Саратов)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Уейк аралдарынын убактысы", "Pacific\/Wallis": "Уолис жана Футуна убактысы" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/lb.json b/src/Symfony/Component/Intl/Resources/data/timezones/lb.json index 9379cf342d869..cb9fd76104661 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/lb.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/lb.json @@ -151,7 +151,7 @@ "America\/Moncton": "Atlantik-Zäit (Moncton)", "America\/Monterrey": "Nordamerikanesch Inlandzäit (Monterrey)", "America\/Montevideo": "Uruguayanesch Zäit (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Kanada Zäit (Montreal)", "America\/Montserrat": "Atlantik-Zäit (Montserrat)", "America\/Nassau": "Nordamerikanesch Ostküstenzäit (Nassau)", "America\/New_York": "Nordamerikanesch Ostküstenzäit (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Arabesch Zäit (Bahrain)", "Asia\/Baku": "Aserbaidschanesch Zäit (Baku)", "Asia\/Bangkok": "Indochina-Zäit (Bangkok)", - "Asia\/Barnaul": "Russland (Barnaul)", + "Asia\/Barnaul": "Russland Zäit (Barnaul)", "Asia\/Beirut": "Osteuropäesch Zäit (Beirut)", "Asia\/Bishkek": "Kirgisistan-Zäit (Bischkek)", "Asia\/Brunei": "Brunei-Zäit", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Iranesch Zäit (Teheran)", "Asia\/Thimphu": "Bhutan-Zäit (Thimphu)", "Asia\/Tokyo": "Japanesch Zäit (Tokio)", - "Asia\/Tomsk": "Russland (Tomsk)", + "Asia\/Tomsk": "Russland Zäit (Tomsk)", "Asia\/Ulaanbaatar": "Ulaanbaatar-Zäit", - "Asia\/Urumqi": "China (Urumqi)", + "Asia\/Urumqi": "China Zäit (Urumqi)", "Asia\/Ust-Nera": "Wladiwostok-Zäit (Ust-Nera)", "Asia\/Vientiane": "Indochina-Zäit (Vientiane)", "Asia\/Vladivostok": "Wladiwostok-Zäit", @@ -322,7 +322,6 @@ "CST6CDT": "Nordamerikanesch Inlandzäit", "EST5EDT": "Nordamerikanesch Ostküstenzäit", "Etc\/GMT": "Mëttler Greenwich-Zäit", - "Etc\/UTC": "UTC", "Europe\/Amsterdam": "Mëtteleuropäesch Zäit (Amsterdam)", "Europe\/Andorra": "Mëtteleuropäesch Zäit (Andorra)", "Europe\/Astrakhan": "Moskauer Zäit (Astrakhan)", @@ -341,11 +340,11 @@ "Europe\/Guernsey": "Mëttler Greenwich-Zäit (Guernsey)", "Europe\/Helsinki": "Osteuropäesch Zäit (Helsinki)", "Europe\/Isle_of_Man": "Mëttler Greenwich-Zäit (Isle of Man)", - "Europe\/Istanbul": "Tierkei (Istanbul)", + "Europe\/Istanbul": "Tierkei Zäit (Istanbul)", "Europe\/Jersey": "Mëttler Greenwich-Zäit (Jersey)", "Europe\/Kaliningrad": "Osteuropäesch Zäit (Kaliningrad)", "Europe\/Kiev": "Osteuropäesch Zäit (Kiew)", - "Europe\/Kirov": "Russland (Kirov)", + "Europe\/Kirov": "Russland Zäit (Kirov)", "Europe\/Lisbon": "Westeuropäesch Zäit (Lissabon)", "Europe\/Ljubljana": "Mëtteleuropäesch Zäit (Ljubljana)", "Europe\/London": "Mëttler Greenwich-Zäit (London)", @@ -396,7 +395,7 @@ "Indian\/Reunion": "Réunion-Zäit", "MST7MDT": "Rocky-Mountain-Zäit", "PST8PDT": "Nordamerikanesch Westküstenzäit", - "Pacific\/Apia": "Samoa (Apia)", + "Pacific\/Apia": "Samoa Zäit (Apia)", "Pacific\/Auckland": "Neiséiland-Zäit (Auckland)", "Pacific\/Bougainville": "Papua-Neiguinea-Zäit (Bougainville)", "Pacific\/Chatham": "Chatham-Zäit", @@ -436,11 +435,5 @@ "Pacific\/Wake": "Wake-Insel-Zäit", "Pacific\/Wallis": "Wallis-a-Futuna-Zäit" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ln.json b/src/Symfony/Component/Intl/Resources/data/timezones/ln.json index 7a98cd3825cc7..0a9cec00e8e48 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ln.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ln.json @@ -1,427 +1,415 @@ { "Version": "2.1.47.82", "Names": { - "Africa\/Abidjan": "Kotídivualɛ (Abidjan)", - "Africa\/Accra": "Gana (Accra)", - "Africa\/Addis_Ababa": "Etsíopi (Addis Ababa)", - "Africa\/Algiers": "Alizɛri (Algiers)", - "Africa\/Asmera": "Elitelɛ (Asmara)", - "Africa\/Bamako": "Malí (Bamako)", - "Africa\/Bangui": "Repibiki ya Afríka ya Káti (Bangui)", - "Africa\/Banjul": "Gambi (Banjul)", - "Africa\/Bissau": "Ginɛbisau (Bissau)", - "Africa\/Blantyre": "Malawi (Blantyre)", - "Africa\/Brazzaville": "Kongo (Brazzaville)", - "Africa\/Bujumbura": "Burundi (Bujumbura)", - "Africa\/Cairo": "Ezípite (Cairo)", - "Africa\/Casablanca": "Marokɛ (Casablanca)", - "Africa\/Ceuta": "Esipanye (Ceuta)", - "Africa\/Conakry": "Ginɛ (Conakry)", - "Africa\/Dakar": "Senegalɛ (Dakar)", - "Africa\/Dar_es_Salaam": "Tanzani (Dar es Salaam)", - "Africa\/Djibouti": "Dzibuti (Djibouti)", - "Africa\/Douala": "Kamɛrune (Douala)", - "Africa\/Freetown": "Siera Leonɛ (Freetown)", - "Africa\/Gaborone": "Botswana (Gaborone)", - "Africa\/Harare": "Zimbabwe (Harare)", - "Africa\/Johannesburg": "Afríka ya Súdi (Johannesburg)", - "Africa\/Kampala": "Uganda (Kampala)", - "Africa\/Khartoum": "Sudá (Khartoum)", - "Africa\/Kigali": "Rwanda (Kigali)", - "Africa\/Kinshasa": "Republíki ya Kongó Demokratíki (Kinshasa)", - "Africa\/Lagos": "Nizerya (Lagos)", - "Africa\/Libreville": "Gabɔ (Libreville)", - "Africa\/Lome": "Togo (Lome)", - "Africa\/Luanda": "Angóla (Luanda)", - "Africa\/Lubumbashi": "Republíki ya Kongó Demokratíki (Lubumbashi)", - "Africa\/Lusaka": "Zambi (Lusaka)", - "Africa\/Malabo": "Ginɛ́kwatɛ́lɛ (Malabo)", - "Africa\/Maputo": "Mozambíki (Maputo)", - "Africa\/Maseru": "Lesoto (Maseru)", - "Africa\/Mbabane": "Swazilandi (Mbabane)", - "Africa\/Mogadishu": "Somali (Mogadishu)", - "Africa\/Monrovia": "Libériya (Monrovia)", - "Africa\/Nairobi": "Kenya (Nairobi)", - "Africa\/Ndjamena": "Tsádi (Ndjamena)", - "Africa\/Niamey": "Nizɛrɛ (Niamey)", - "Africa\/Nouakchott": "Moritani (Nouakchott)", - "Africa\/Ouagadougou": "Bukina Faso (Ouagadougou)", - "Africa\/Porto-Novo": "Benɛ (Porto-Novo)", - "Africa\/Sao_Tome": "Sao Tomé mpé Presipɛ (Sao Tome)", - "Africa\/Tripoli": "Libí (Tripoli)", - "Africa\/Tunis": "Tinizi (Tunis)", - "Africa\/Windhoek": "Namibi (Windhoek)", - "America\/Adak": "Ameriki (Adak)", - "America\/Anchorage": "Ameriki (Anchorage)", - "America\/Anguilla": "Angiyɛ (Anguilla)", - "America\/Antigua": "Antiga mpé Barbuda (Antigua)", - "America\/Araguaina": "Brezílɛ (Araguaina)", - "America\/Argentina\/La_Rioja": "Arizantinɛ (La Rioja)", - "America\/Argentina\/Rio_Gallegos": "Arizantinɛ (Rio Gallegos)", - "America\/Argentina\/Salta": "Arizantinɛ (Salta)", - "America\/Argentina\/San_Juan": "Arizantinɛ (San Juan)", - "America\/Argentina\/San_Luis": "Arizantinɛ (San Luis)", - "America\/Argentina\/Tucuman": "Arizantinɛ (Tucuman)", - "America\/Argentina\/Ushuaia": "Arizantinɛ (Ushuaia)", - "America\/Aruba": "Aruba (Aruba)", - "America\/Asuncion": "Palagwei (Asuncion)", - "America\/Bahia": "Brezílɛ (Bahia)", - "America\/Bahia_Banderas": "Meksike (Bahia Banderas)", - "America\/Barbados": "Barɛbadɛ (Barbados)", - "America\/Belem": "Brezílɛ (Belem)", - "America\/Belize": "Belizɛ (Belize)", - "America\/Blanc-Sablon": "Kanada (Blanc-Sablon)", - "America\/Boa_Vista": "Brezílɛ (Boa Vista)", - "America\/Bogota": "Kolombi (Bogota)", - "America\/Boise": "Ameriki (Boise)", - "America\/Buenos_Aires": "Arizantinɛ (Buenos Aires)", - "America\/Cambridge_Bay": "Kanada (Cambridge Bay)", - "America\/Campo_Grande": "Brezílɛ (Campo Grande)", - "America\/Cancun": "Meksike (Cancun)", - "America\/Caracas": "Venézuela (Caracas)", - "America\/Catamarca": "Arizantinɛ (Catamarca)", - "America\/Cayenne": "Giyanɛ ya Falánsɛ (Cayenne)", - "America\/Cayman": "Bisanga bya Kayíma (Cayman)", - "America\/Chicago": "Ameriki (Chicago)", - "America\/Chihuahua": "Meksike (Chihuahua)", - "America\/Coral_Harbour": "Kanada (Atikokan)", - "America\/Cordoba": "Arizantinɛ (Cordoba)", - "America\/Costa_Rica": "Kositarika (Costa Rica)", - "America\/Creston": "Kanada (Creston)", - "America\/Cuiaba": "Brezílɛ (Cuiaba)", - "America\/Danmarkshavn": "Gowelande (Danmarkshavn)", - "America\/Dawson": "Kanada (Dawson)", - "America\/Dawson_Creek": "Kanada (Dawson Creek)", - "America\/Denver": "Ameriki (Denver)", - "America\/Detroit": "Ameriki (Detroit)", - "America\/Dominica": "Domínike (Dominica)", - "America\/Edmonton": "Kanada (Edmonton)", - "America\/Eirunepe": "Brezílɛ (Eirunepe)", - "America\/El_Salvador": "Savadɔrɛ (El Salvador)", - "America\/Fort_Nelson": "Kanada (Fort Nelson)", - "America\/Fortaleza": "Brezílɛ (Fortaleza)", - "America\/Glace_Bay": "Kanada (Glace Bay)", - "America\/Godthab": "Gowelande (Nuuk)", - "America\/Goose_Bay": "Kanada (Goose Bay)", - "America\/Grand_Turk": "Bisanga bya Turki mpé Kaiko (Grand Turk)", - "America\/Grenada": "Gelenadɛ (Grenada)", - "America\/Guadeloupe": "Gwadɛlupɛ (Guadeloupe)", - "America\/Guatemala": "Gwatémala (Guatemala)", - "America\/Guayaquil": "Ekwatɛ́lɛ (Guayaquil)", - "America\/Guyana": "Giyane (Guyana)", - "America\/Halifax": "Kanada (Halifax)", - "America\/Havana": "Kiba (Havana)", - "America\/Hermosillo": "Meksike (Hermosillo)", - "America\/Indiana\/Knox": "Ameriki (Knox, Indiana)", - "America\/Indiana\/Marengo": "Ameriki (Marengo, Indiana)", - "America\/Indiana\/Petersburg": "Ameriki (Petersburg, Indiana)", - "America\/Indiana\/Tell_City": "Ameriki (Tell City, Indiana)", - "America\/Indiana\/Vevay": "Ameriki (Vevay, Indiana)", - "America\/Indiana\/Vincennes": "Ameriki (Vincennes, Indiana)", - "America\/Indiana\/Winamac": "Ameriki (Winamac, Indiana)", - "America\/Indianapolis": "Ameriki (Indianapolis)", - "America\/Inuvik": "Kanada (Inuvik)", - "America\/Iqaluit": "Kanada (Iqaluit)", - "America\/Jamaica": "Zamaiki (Jamaica)", - "America\/Jujuy": "Arizantinɛ (Jujuy)", - "America\/Juneau": "Ameriki (Juneau)", - "America\/Kentucky\/Monticello": "Ameriki (Monticello, Kentucky)", - "America\/La_Paz": "Bolivi (La Paz)", - "America\/Lima": "Péru (Lima)", - "America\/Los_Angeles": "Ameriki (Los Angeles)", - "America\/Louisville": "Ameriki (Louisville)", - "America\/Maceio": "Brezílɛ (Maceio)", - "America\/Managua": "Nikaragwa (Managua)", - "America\/Manaus": "Brezílɛ (Manaus)", - "America\/Martinique": "Martiniki (Martinique)", - "America\/Matamoros": "Meksike (Matamoros)", - "America\/Mazatlan": "Meksike (Mazatlan)", - "America\/Mendoza": "Arizantinɛ (Mendoza)", - "America\/Menominee": "Ameriki (Menominee)", - "America\/Merida": "Meksike (Merida)", - "America\/Metlakatla": "Ameriki (Metlakatla)", - "America\/Mexico_City": "Meksike (Mexico City)", - "America\/Miquelon": "Sántu pététo mpé Mikelɔ (Miquelon)", - "America\/Moncton": "Kanada (Moncton)", - "America\/Monterrey": "Meksike (Monterrey)", - "America\/Montevideo": "Irigwei (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", - "America\/Montserrat": "Mɔsera (Montserrat)", - "America\/Nassau": "Bahamasɛ (Nassau)", - "America\/New_York": "Ameriki (New York)", - "America\/Nipigon": "Kanada (Nipigon)", - "America\/Nome": "Ameriki (Nome)", - "America\/Noronha": "Brezílɛ (Noronha)", - "America\/North_Dakota\/Beulah": "Ameriki (Beulah, North Dakota)", - "America\/North_Dakota\/Center": "Ameriki (Center, North Dakota)", - "America\/North_Dakota\/New_Salem": "Ameriki (New Salem, North Dakota)", - "America\/Ojinaga": "Meksike (Ojinaga)", - "America\/Panama": "Panama (Panama)", - "America\/Pangnirtung": "Kanada (Pangnirtung)", - "America\/Paramaribo": "Surinamɛ (Paramaribo)", - "America\/Phoenix": "Ameriki (Phoenix)", - "America\/Port-au-Prince": "Ayiti (Port-au-Prince)", - "America\/Port_of_Spain": "Tinidadɛ mpé Tobago (Port of Spain)", - "America\/Porto_Velho": "Brezílɛ (Porto Velho)", - "America\/Puerto_Rico": "Pɔtoriko (Puerto Rico)", - "America\/Punta_Arenas": "Síli (Punta Arenas)", - "America\/Rainy_River": "Kanada (Rainy River)", - "America\/Rankin_Inlet": "Kanada (Rankin Inlet)", - "America\/Recife": "Brezílɛ (Recife)", - "America\/Regina": "Kanada (Regina)", - "America\/Resolute": "Kanada (Resolute)", - "America\/Rio_Branco": "Brezílɛ (Rio Branco)", - "America\/Santa_Isabel": "Meksike (Santa Isabel)", - "America\/Santarem": "Brezílɛ (Santarem)", - "America\/Santiago": "Síli (Santiago)", - "America\/Santo_Domingo": "Repibiki ya Domínikɛ (Santo Domingo)", - "America\/Sao_Paulo": "Brezílɛ (Sao Paulo)", - "America\/Scoresbysund": "Gowelande (Ittoqqortoormiit)", - "America\/Sitka": "Ameriki (Sitka)", - "America\/St_Johns": "Kanada (St. John’s)", - "America\/St_Kitts": "Sántu krístofe mpé Nevɛ̀s (St. Kitts)", - "America\/St_Lucia": "Sántu lisi (St. Lucia)", - "America\/St_Thomas": "Bisanga bya Vierzi ya Ameriki (St. Thomas)", - "America\/St_Vincent": "Sántu vesá mpé Gelenadinɛ (St. Vincent)", - "America\/Swift_Current": "Kanada (Swift Current)", - "America\/Tegucigalpa": "Ondurasɛ (Tegucigalpa)", - "America\/Thule": "Gowelande (Thule)", - "America\/Thunder_Bay": "Kanada (Thunder Bay)", - "America\/Tijuana": "Meksike (Tijuana)", - "America\/Toronto": "Kanada (Toronto)", - "America\/Tortola": "Bisanga bya Vierzi ya Angɛlɛtɛ́lɛ (Tortola)", - "America\/Vancouver": "Kanada (Vancouver)", - "America\/Whitehorse": "Kanada (Whitehorse)", - "America\/Winnipeg": "Kanada (Winnipeg)", - "America\/Yakutat": "Ameriki (Yakutat)", - "America\/Yellowknife": "Kanada (Yellowknife)", - "Antarctica\/Casey": "Antarctique (Casey)", - "Antarctica\/Davis": "Antarctique (Davis)", - "Antarctica\/DumontDUrville": "Antarctique (Dumont d’Urville)", - "Antarctica\/Macquarie": "Ositáli (Macquarie)", - "Antarctica\/Mawson": "Antarctique (Mawson)", - "Antarctica\/McMurdo": "Antarctique (McMurdo)", - "Antarctica\/Palmer": "Antarctique (Palmer)", - "Antarctica\/Rothera": "Antarctique (Rothera)", - "Antarctica\/Syowa": "Antarctique (Syowa)", + "Africa\/Abidjan": "Ngonga ya Kotídivualɛ (Abidjan)", + "Africa\/Accra": "Ngonga ya Gana (Accra)", + "Africa\/Addis_Ababa": "Ngonga ya Etsíopi (Addis Ababa)", + "Africa\/Algiers": "Ngonga ya Alizɛri (Algiers)", + "Africa\/Asmera": "Ngonga ya Elitelɛ (Asmara)", + "Africa\/Bamako": "Ngonga ya Malí (Bamako)", + "Africa\/Bangui": "Ngonga ya Repibiki ya Afríka ya Káti (Bangui)", + "Africa\/Banjul": "Ngonga ya Gambi (Banjul)", + "Africa\/Bissau": "Ngonga ya Ginɛbisau (Bissau)", + "Africa\/Blantyre": "Ngonga ya Malawi (Blantyre)", + "Africa\/Brazzaville": "Ngonga ya Kongo (Brazzaville)", + "Africa\/Bujumbura": "Ngonga ya Burundi (Bujumbura)", + "Africa\/Cairo": "Ngonga ya Ezípite (Cairo)", + "Africa\/Casablanca": "Ngonga ya Marokɛ (Casablanca)", + "Africa\/Ceuta": "Ngonga ya Esipanye (Ceuta)", + "Africa\/Conakry": "Ngonga ya Ginɛ (Conakry)", + "Africa\/Dakar": "Ngonga ya Senegalɛ (Dakar)", + "Africa\/Dar_es_Salaam": "Ngonga ya Tanzani (Dar es Salaam)", + "Africa\/Djibouti": "Ngonga ya Dzibuti (Djibouti)", + "Africa\/Douala": "Ngonga ya Kamɛrune (Douala)", + "Africa\/Freetown": "Ngonga ya Siera Leonɛ (Freetown)", + "Africa\/Gaborone": "Ngonga ya Botswana (Gaborone)", + "Africa\/Harare": "Ngonga ya Zimbabwe (Harare)", + "Africa\/Johannesburg": "Ngonga ya Afríka ya Súdi (Johannesburg)", + "Africa\/Kampala": "Ngonga ya Uganda (Kampala)", + "Africa\/Khartoum": "Ngonga ya Sudá (Khartoum)", + "Africa\/Kigali": "Ngonga ya Rwanda (Kigali)", + "Africa\/Kinshasa": "Ngonga ya Republíki ya Kongó Demokratíki (Kinshasa)", + "Africa\/Lagos": "Ngonga ya Nizerya (Lagos)", + "Africa\/Libreville": "Ngonga ya Gabɔ (Libreville)", + "Africa\/Lome": "Ngonga ya Togo (Lome)", + "Africa\/Luanda": "Ngonga ya Angóla (Luanda)", + "Africa\/Lubumbashi": "Ngonga ya Republíki ya Kongó Demokratíki (Lubumbashi)", + "Africa\/Lusaka": "Ngonga ya Zambi (Lusaka)", + "Africa\/Malabo": "Ngonga ya Ginɛ́kwatɛ́lɛ (Malabo)", + "Africa\/Maputo": "Ngonga ya Mozambíki (Maputo)", + "Africa\/Maseru": "Ngonga ya Lesoto (Maseru)", + "Africa\/Mbabane": "Ngonga ya Swazilandi (Mbabane)", + "Africa\/Mogadishu": "Ngonga ya Somali (Mogadishu)", + "Africa\/Monrovia": "Ngonga ya Libériya (Monrovia)", + "Africa\/Nairobi": "Ngonga ya Kenya (Nairobi)", + "Africa\/Ndjamena": "Ngonga ya Tsádi (Ndjamena)", + "Africa\/Niamey": "Ngonga ya Nizɛrɛ (Niamey)", + "Africa\/Nouakchott": "Ngonga ya Moritani (Nouakchott)", + "Africa\/Ouagadougou": "Ngonga ya Bukina Faso (Ouagadougou)", + "Africa\/Porto-Novo": "Ngonga ya Benɛ (Porto-Novo)", + "Africa\/Sao_Tome": "Ngonga ya Sao Tomé mpé Presipɛ (Sao Tome)", + "Africa\/Tripoli": "Ngonga ya Libí (Tripoli)", + "Africa\/Tunis": "Ngonga ya Tinizi (Tunis)", + "Africa\/Windhoek": "Ngonga ya Namibi (Windhoek)", + "America\/Adak": "Ngonga ya Ameriki (Adak)", + "America\/Anchorage": "Ngonga ya Ameriki (Anchorage)", + "America\/Anguilla": "Ngonga ya Angiyɛ (Anguilla)", + "America\/Antigua": "Ngonga ya Antiga mpé Barbuda (Antigua)", + "America\/Araguaina": "Ngonga ya Brezílɛ (Araguaina)", + "America\/Argentina\/La_Rioja": "Ngonga ya Arizantinɛ (La Rioja)", + "America\/Argentina\/Rio_Gallegos": "Ngonga ya Arizantinɛ (Rio Gallegos)", + "America\/Argentina\/Salta": "Ngonga ya Arizantinɛ (Salta)", + "America\/Argentina\/San_Juan": "Ngonga ya Arizantinɛ (San Juan)", + "America\/Argentina\/San_Luis": "Ngonga ya Arizantinɛ (San Luis)", + "America\/Argentina\/Tucuman": "Ngonga ya Arizantinɛ (Tucuman)", + "America\/Argentina\/Ushuaia": "Ngonga ya Arizantinɛ (Ushuaia)", + "America\/Aruba": "Ngonga ya Aruba (Aruba)", + "America\/Asuncion": "Ngonga ya Palagwei (Asuncion)", + "America\/Bahia": "Ngonga ya Brezílɛ (Bahia)", + "America\/Bahia_Banderas": "Ngonga ya Meksike (Bahia Banderas)", + "America\/Barbados": "Ngonga ya Barɛbadɛ (Barbados)", + "America\/Belem": "Ngonga ya Brezílɛ (Belem)", + "America\/Belize": "Ngonga ya Belizɛ (Belize)", + "America\/Blanc-Sablon": "Ngonga ya Kanada (Blanc-Sablon)", + "America\/Boa_Vista": "Ngonga ya Brezílɛ (Boa Vista)", + "America\/Bogota": "Ngonga ya Kolombi (Bogota)", + "America\/Boise": "Ngonga ya Ameriki (Boise)", + "America\/Buenos_Aires": "Ngonga ya Arizantinɛ (Buenos Aires)", + "America\/Cambridge_Bay": "Ngonga ya Kanada (Cambridge Bay)", + "America\/Campo_Grande": "Ngonga ya Brezílɛ (Campo Grande)", + "America\/Cancun": "Ngonga ya Meksike (Cancun)", + "America\/Caracas": "Ngonga ya Venézuela (Caracas)", + "America\/Catamarca": "Ngonga ya Arizantinɛ (Catamarca)", + "America\/Cayenne": "Ngonga ya Giyanɛ ya Falánsɛ (Cayenne)", + "America\/Cayman": "Ngonga ya Bisanga bya Kayíma (Cayman)", + "America\/Chicago": "Ngonga ya Ameriki (Chicago)", + "America\/Chihuahua": "Ngonga ya Meksike (Chihuahua)", + "America\/Coral_Harbour": "Ngonga ya Kanada (Atikokan)", + "America\/Cordoba": "Ngonga ya Arizantinɛ (Cordoba)", + "America\/Costa_Rica": "Ngonga ya Kositarika (Costa Rica)", + "America\/Creston": "Ngonga ya Kanada (Creston)", + "America\/Cuiaba": "Ngonga ya Brezílɛ (Cuiaba)", + "America\/Danmarkshavn": "Ngonga ya Gowelande (Danmarkshavn)", + "America\/Dawson": "Ngonga ya Kanada (Dawson)", + "America\/Dawson_Creek": "Ngonga ya Kanada (Dawson Creek)", + "America\/Denver": "Ngonga ya Ameriki (Denver)", + "America\/Detroit": "Ngonga ya Ameriki (Detroit)", + "America\/Dominica": "Ngonga ya Domínike (Dominica)", + "America\/Edmonton": "Ngonga ya Kanada (Edmonton)", + "America\/Eirunepe": "Ngonga ya Brezílɛ (Eirunepe)", + "America\/El_Salvador": "Ngonga ya Savadɔrɛ (El Salvador)", + "America\/Fort_Nelson": "Ngonga ya Kanada (Fort Nelson)", + "America\/Fortaleza": "Ngonga ya Brezílɛ (Fortaleza)", + "America\/Glace_Bay": "Ngonga ya Kanada (Glace Bay)", + "America\/Godthab": "Ngonga ya Gowelande (Nuuk)", + "America\/Goose_Bay": "Ngonga ya Kanada (Goose Bay)", + "America\/Grand_Turk": "Ngonga ya Bisanga bya Turki mpé Kaiko (Grand Turk)", + "America\/Grenada": "Ngonga ya Gelenadɛ (Grenada)", + "America\/Guadeloupe": "Ngonga ya Gwadɛlupɛ (Guadeloupe)", + "America\/Guatemala": "Ngonga ya Gwatémala (Guatemala)", + "America\/Guayaquil": "Ngonga ya Ekwatɛ́lɛ (Guayaquil)", + "America\/Guyana": "Ngonga ya Giyane (Guyana)", + "America\/Halifax": "Ngonga ya Kanada (Halifax)", + "America\/Havana": "Ngonga ya Kiba (Havana)", + "America\/Hermosillo": "Ngonga ya Meksike (Hermosillo)", + "America\/Indiana\/Knox": "Ngonga ya Ameriki (Knox, Indiana)", + "America\/Indiana\/Marengo": "Ngonga ya Ameriki (Marengo, Indiana)", + "America\/Indiana\/Petersburg": "Ngonga ya Ameriki (Petersburg, Indiana)", + "America\/Indiana\/Tell_City": "Ngonga ya Ameriki (Tell City, Indiana)", + "America\/Indiana\/Vevay": "Ngonga ya Ameriki (Vevay, Indiana)", + "America\/Indiana\/Vincennes": "Ngonga ya Ameriki (Vincennes, Indiana)", + "America\/Indiana\/Winamac": "Ngonga ya Ameriki (Winamac, Indiana)", + "America\/Indianapolis": "Ngonga ya Ameriki (Indianapolis)", + "America\/Inuvik": "Ngonga ya Kanada (Inuvik)", + "America\/Iqaluit": "Ngonga ya Kanada (Iqaluit)", + "America\/Jamaica": "Ngonga ya Zamaiki (Jamaica)", + "America\/Jujuy": "Ngonga ya Arizantinɛ (Jujuy)", + "America\/Juneau": "Ngonga ya Ameriki (Juneau)", + "America\/Kentucky\/Monticello": "Ngonga ya Ameriki (Monticello, Kentucky)", + "America\/La_Paz": "Ngonga ya Bolivi (La Paz)", + "America\/Lima": "Ngonga ya Péru (Lima)", + "America\/Los_Angeles": "Ngonga ya Ameriki (Los Angeles)", + "America\/Louisville": "Ngonga ya Ameriki (Louisville)", + "America\/Maceio": "Ngonga ya Brezílɛ (Maceio)", + "America\/Managua": "Ngonga ya Nikaragwa (Managua)", + "America\/Manaus": "Ngonga ya Brezílɛ (Manaus)", + "America\/Martinique": "Ngonga ya Martiniki (Martinique)", + "America\/Matamoros": "Ngonga ya Meksike (Matamoros)", + "America\/Mazatlan": "Ngonga ya Meksike (Mazatlan)", + "America\/Mendoza": "Ngonga ya Arizantinɛ (Mendoza)", + "America\/Menominee": "Ngonga ya Ameriki (Menominee)", + "America\/Merida": "Ngonga ya Meksike (Merida)", + "America\/Metlakatla": "Ngonga ya Ameriki (Metlakatla)", + "America\/Mexico_City": "Ngonga ya Meksike (Mexico City)", + "America\/Miquelon": "Ngonga ya Sántu pététo mpé Mikelɔ (Miquelon)", + "America\/Moncton": "Ngonga ya Kanada (Moncton)", + "America\/Monterrey": "Ngonga ya Meksike (Monterrey)", + "America\/Montevideo": "Ngonga ya Irigwei (Montevideo)", + "America\/Montreal": "Ngonga ya Kanada (Montreal)", + "America\/Montserrat": "Ngonga ya Mɔsera (Montserrat)", + "America\/Nassau": "Ngonga ya Bahamasɛ (Nassau)", + "America\/New_York": "Ngonga ya Ameriki (New York)", + "America\/Nipigon": "Ngonga ya Kanada (Nipigon)", + "America\/Nome": "Ngonga ya Ameriki (Nome)", + "America\/Noronha": "Ngonga ya Brezílɛ (Noronha)", + "America\/North_Dakota\/Beulah": "Ngonga ya Ameriki (Beulah, North Dakota)", + "America\/North_Dakota\/Center": "Ngonga ya Ameriki (Center, North Dakota)", + "America\/North_Dakota\/New_Salem": "Ngonga ya Ameriki (New Salem, North Dakota)", + "America\/Ojinaga": "Ngonga ya Meksike (Ojinaga)", + "America\/Panama": "Ngonga ya Panama (Panama)", + "America\/Pangnirtung": "Ngonga ya Kanada (Pangnirtung)", + "America\/Paramaribo": "Ngonga ya Surinamɛ (Paramaribo)", + "America\/Phoenix": "Ngonga ya Ameriki (Phoenix)", + "America\/Port-au-Prince": "Ngonga ya Ayiti (Port-au-Prince)", + "America\/Port_of_Spain": "Ngonga ya Tinidadɛ mpé Tobago (Port of Spain)", + "America\/Porto_Velho": "Ngonga ya Brezílɛ (Porto Velho)", + "America\/Puerto_Rico": "Ngonga ya Pɔtoriko (Puerto Rico)", + "America\/Punta_Arenas": "Ngonga ya Síli (Punta Arenas)", + "America\/Rainy_River": "Ngonga ya Kanada (Rainy River)", + "America\/Rankin_Inlet": "Ngonga ya Kanada (Rankin Inlet)", + "America\/Recife": "Ngonga ya Brezílɛ (Recife)", + "America\/Regina": "Ngonga ya Kanada (Regina)", + "America\/Resolute": "Ngonga ya Kanada (Resolute)", + "America\/Rio_Branco": "Ngonga ya Brezílɛ (Rio Branco)", + "America\/Santa_Isabel": "Ngonga ya Meksike (Santa Isabel)", + "America\/Santarem": "Ngonga ya Brezílɛ (Santarem)", + "America\/Santiago": "Ngonga ya Síli (Santiago)", + "America\/Santo_Domingo": "Ngonga ya Repibiki ya Domínikɛ (Santo Domingo)", + "America\/Sao_Paulo": "Ngonga ya Brezílɛ (Sao Paulo)", + "America\/Scoresbysund": "Ngonga ya Gowelande (Ittoqqortoormiit)", + "America\/Sitka": "Ngonga ya Ameriki (Sitka)", + "America\/St_Johns": "Ngonga ya Kanada (St. John’s)", + "America\/St_Kitts": "Ngonga ya Sántu krístofe mpé Nevɛ̀s (St. Kitts)", + "America\/St_Lucia": "Ngonga ya Sántu lisi (St. Lucia)", + "America\/St_Thomas": "Ngonga ya Bisanga bya Vierzi ya Ameriki (St. Thomas)", + "America\/St_Vincent": "Ngonga ya Sántu vesá mpé Gelenadinɛ (St. Vincent)", + "America\/Swift_Current": "Ngonga ya Kanada (Swift Current)", + "America\/Tegucigalpa": "Ngonga ya Ondurasɛ (Tegucigalpa)", + "America\/Thule": "Ngonga ya Gowelande (Thule)", + "America\/Thunder_Bay": "Ngonga ya Kanada (Thunder Bay)", + "America\/Tijuana": "Ngonga ya Meksike (Tijuana)", + "America\/Toronto": "Ngonga ya Kanada (Toronto)", + "America\/Tortola": "Ngonga ya Bisanga bya Vierzi ya Angɛlɛtɛ́lɛ (Tortola)", + "America\/Vancouver": "Ngonga ya Kanada (Vancouver)", + "America\/Whitehorse": "Ngonga ya Kanada (Whitehorse)", + "America\/Winnipeg": "Ngonga ya Kanada (Winnipeg)", + "America\/Yakutat": "Ngonga ya Ameriki (Yakutat)", + "America\/Yellowknife": "Ngonga ya Kanada (Yellowknife)", + "Antarctica\/Casey": "Ngonga ya Antarctique (Casey)", + "Antarctica\/Davis": "Ngonga ya Antarctique (Davis)", + "Antarctica\/DumontDUrville": "Ngonga ya Antarctique (Dumont d’Urville)", + "Antarctica\/Macquarie": "Ngonga ya Ositáli (Macquarie)", + "Antarctica\/Mawson": "Ngonga ya Antarctique (Mawson)", + "Antarctica\/McMurdo": "Ngonga ya Antarctique (McMurdo)", + "Antarctica\/Palmer": "Ngonga ya Antarctique (Palmer)", + "Antarctica\/Rothera": "Ngonga ya Antarctique (Rothera)", + "Antarctica\/Syowa": "Ngonga ya Antarctique (Syowa)", "Antarctica\/Troll": "Ngonga ya Troll", - "Antarctica\/Vostok": "Antarctique (Vostok)", - "Asia\/Aden": "Yemɛnɛ (Aden)", - "Asia\/Almaty": "Kazakisitá (Almaty)", - "Asia\/Amman": "Zɔdani (Amman)", - "Asia\/Anadyr": "Risí (Anadyr)", - "Asia\/Aqtau": "Kazakisitá (Aqtau)", - "Asia\/Aqtobe": "Kazakisitá (Aqtobe)", - "Asia\/Ashgabat": "Tikɛménisitá (Ashgabat)", - "Asia\/Atyrau": "Kazakisitá (Atyrau)", - "Asia\/Baghdad": "Iraki (Baghdad)", - "Asia\/Bahrain": "Bahrɛnɛ (Bahrain)", - "Asia\/Baku": "Azɛlɛbaizá (Baku)", - "Asia\/Bangkok": "Tailandɛ (Bangkok)", - "Asia\/Barnaul": "Risí (Barnaul)", - "Asia\/Beirut": "Libá (Beirut)", - "Asia\/Bishkek": "Kigizisitá (Bishkek)", - "Asia\/Brunei": "Brineyi (Brunei)", - "Asia\/Calcutta": "Índɛ (Kolkata)", - "Asia\/Chita": "Risí (Chita)", - "Asia\/Choibalsan": "Mongolí (Choibalsan)", - "Asia\/Colombo": "Sirilanka (Colombo)", - "Asia\/Damascus": "Sirí (Damascus)", - "Asia\/Dhaka": "Bengalidɛsi (Dhaka)", - "Asia\/Dili": "Timorɛ ya Moniɛlɛ (Dili)", - "Asia\/Dubai": "Lɛmila alabo (Dubai)", - "Asia\/Dushanbe": "Tazikisitá (Dushanbe)", - "Asia\/Famagusta": "Sípɛlɛ (Famagusta)", - "Asia\/Gaza": "Palɛsine (Gaza)", - "Asia\/Hebron": "Palɛsine (Hebron)", - "Asia\/Hovd": "Mongolí (Hovd)", - "Asia\/Irkutsk": "Risí (Irkutsk)", - "Asia\/Jakarta": "Indonezi (Jakarta)", - "Asia\/Jayapura": "Indonezi (Jayapura)", - "Asia\/Jerusalem": "Isirayelɛ (Jerusalem)", - "Asia\/Kabul": "Afiganisitá (Kabul)", - "Asia\/Kamchatka": "Risí (Kamchatka)", - "Asia\/Karachi": "Pakisitá (Karachi)", - "Asia\/Katmandu": "Nepálɛ (Kathmandu)", - "Asia\/Khandyga": "Risí (Khandyga)", - "Asia\/Krasnoyarsk": "Risí (Krasnoyarsk)", - "Asia\/Kuala_Lumpur": "Malezi (Kuala Lumpur)", - "Asia\/Kuching": "Malezi (Kuching)", - "Asia\/Kuwait": "Koweti (Kuwait)", - "Asia\/Magadan": "Risí (Magadan)", - "Asia\/Makassar": "Indonezi (Makassar)", - "Asia\/Manila": "Filipinɛ (Manila)", - "Asia\/Muscat": "Ománɛ (Muscat)", - "Asia\/Nicosia": "Sípɛlɛ (Nicosia)", - "Asia\/Novokuznetsk": "Risí (Novokuznetsk)", - "Asia\/Novosibirsk": "Risí (Novosibirsk)", - "Asia\/Omsk": "Risí (Omsk)", - "Asia\/Oral": "Kazakisitá (Oral)", - "Asia\/Phnom_Penh": "Kambodza (Phnom Penh)", - "Asia\/Pontianak": "Indonezi (Pontianak)", - "Asia\/Pyongyang": "Korɛ ya nɔ́rdi (Pyongyang)", - "Asia\/Qatar": "Katari (Qatar)", - "Asia\/Qostanay": "Kazakisitá (Qostanay)", - "Asia\/Qyzylorda": "Kazakisitá (Qyzylorda)", - "Asia\/Rangoon": "Birmanie (Yangon)", - "Asia\/Riyadh": "Alabi Sawuditɛ (Riyadh)", - "Asia\/Saigon": "Viyetinamɛ (Ho Chi Minh)", - "Asia\/Sakhalin": "Risí (Sakhalin)", - "Asia\/Samarkand": "Uzibɛkisitá (Samarkand)", - "Asia\/Seoul": "Korɛ ya súdi (Seoul)", - "Asia\/Shanghai": "Sinɛ (Shanghai)", - "Asia\/Singapore": "Singapurɛ (Singapore)", - "Asia\/Srednekolymsk": "Risí (Srednekolymsk)", - "Asia\/Taipei": "Taiwanin (Taipei)", - "Asia\/Tashkent": "Uzibɛkisitá (Tashkent)", - "Asia\/Tbilisi": "Zorzi (Tbilisi)", - "Asia\/Tehran": "Irâ (Tehran)", - "Asia\/Thimphu": "Butáni (Thimphu)", - "Asia\/Tokyo": "Zapɔ (Tokyo)", - "Asia\/Tomsk": "Risí (Tomsk)", - "Asia\/Ulaanbaatar": "Mongolí (Ulaanbaatar)", - "Asia\/Urumqi": "Sinɛ (Urumqi)", - "Asia\/Ust-Nera": "Risí (Ust-Nera)", - "Asia\/Vientiane": "Lawosi (Vientiane)", - "Asia\/Vladivostok": "Risí (Vladivostok)", - "Asia\/Yakutsk": "Risí (Yakutsk)", - "Asia\/Yekaterinburg": "Risí (Yekaterinburg)", - "Asia\/Yerevan": "Amɛni (Yerevan)", - "Atlantic\/Azores": "Putúlugɛsi (Azores)", - "Atlantic\/Bermuda": "Bermuda (Bermuda)", - "Atlantic\/Canary": "Esipanye (Canary)", - "Atlantic\/Cape_Verde": "Bisanga bya Kapevɛrɛ (Cape Verde)", - "Atlantic\/Madeira": "Putúlugɛsi (Madeira)", - "Atlantic\/Reykjavik": "Isilandɛ (Reykjavik)", - "Atlantic\/South_Georgia": "Îles de Géorgie du Sud et Sandwich du Sud (South Georgia)", - "Atlantic\/St_Helena": "Sántu eleni (St. Helena)", - "Atlantic\/Stanley": "Bisanga bya Maluni (Stanley)", - "Australia\/Adelaide": "Ositáli (Adelaide)", - "Australia\/Brisbane": "Ositáli (Brisbane)", - "Australia\/Broken_Hill": "Ositáli (Broken Hill)", - "Australia\/Currie": "Ositáli (Currie)", - "Australia\/Darwin": "Ositáli (Darwin)", - "Australia\/Eucla": "Ositáli (Eucla)", - "Australia\/Hobart": "Ositáli (Hobart)", - "Australia\/Lindeman": "Ositáli (Lindeman)", - "Australia\/Lord_Howe": "Ositáli (Lord Howe)", - "Australia\/Melbourne": "Ositáli (Melbourne)", - "Australia\/Perth": "Ositáli (Perth)", - "Australia\/Sydney": "Ositáli (Sydney)", - "CST6CDT": "CST6CDT", - "EST5EDT": "EST5EDT", - "Etc\/GMT": "GMT", - "Etc\/UTC": "UTC", - "Europe\/Amsterdam": "Olandɛ (Amsterdam)", - "Europe\/Andorra": "Andorɛ (Andorra)", - "Europe\/Astrakhan": "Risí (Astrakhan)", - "Europe\/Athens": "Geleki (Athens)", - "Europe\/Belgrade": "Serbie (Belgrade)", - "Europe\/Berlin": "Alemani (Berlin)", - "Europe\/Bratislava": "Silovaki (Bratislava)", - "Europe\/Brussels": "Beleziki (Brussels)", - "Europe\/Bucharest": "Romani (Bucharest)", - "Europe\/Budapest": "Ongili (Budapest)", - "Europe\/Busingen": "Alemani (Busingen)", - "Europe\/Chisinau": "Molidavi (Chisinau)", - "Europe\/Copenhagen": "Danɛmarike (Copenhagen)", - "Europe\/Dublin": "Irelandɛ (Dublin)", - "Europe\/Gibraltar": "Zibatalɛ (Gibraltar)", - "Europe\/Guernsey": "Guernesey (Guernsey)", - "Europe\/Helsinki": "Filandɛ (Helsinki)", - "Europe\/Istanbul": "Tiliki (Istanbul)", - "Europe\/Kaliningrad": "Risí (Kaliningrad)", - "Europe\/Kiev": "Ikrɛni (Kiev)", - "Europe\/Kirov": "Risí (Kirov)", - "Europe\/Lisbon": "Putúlugɛsi (Lisbon)", - "Europe\/Ljubljana": "Siloveni (Ljubljana)", - "Europe\/London": "Angɛlɛtɛ́lɛ (London)", - "Europe\/Luxembourg": "Likisambulu (Luxembourg)", - "Europe\/Madrid": "Esipanye (Madrid)", - "Europe\/Malta": "Malitɛ (Malta)", - "Europe\/Minsk": "Byelorisi (Minsk)", - "Europe\/Monaco": "Monako (Monaco)", - "Europe\/Moscow": "Risí (Moscow)", - "Europe\/Oslo": "Norivezɛ (Oslo)", - "Europe\/Paris": "Falánsɛ (Paris)", - "Europe\/Podgorica": "Monténégro (Podgorica)", - "Europe\/Prague": "Shekia (Prague)", - "Europe\/Riga": "Letoni (Riga)", - "Europe\/Rome": "Itali (Rome)", - "Europe\/Samara": "Risí (Samara)", - "Europe\/San_Marino": "Sántu Marinɛ (San Marino)", - "Europe\/Sarajevo": "Bosini mpé Hezegovine (Sarajevo)", - "Europe\/Saratov": "Risí (Saratov)", - "Europe\/Simferopol": "Ikrɛni (Simferopol)", - "Europe\/Skopje": "Masedwanɛ (Skopje)", - "Europe\/Sofia": "Biligari (Sofia)", - "Europe\/Stockholm": "Swédɛ (Stockholm)", - "Europe\/Tallinn": "Esitoni (Tallinn)", - "Europe\/Tirane": "Alibani (Tirane)", - "Europe\/Ulyanovsk": "Risí (Ulyanovsk)", - "Europe\/Uzhgorod": "Ikrɛni (Uzhgorod)", - "Europe\/Vaduz": "Lishɛteni (Vaduz)", - "Europe\/Vatican": "Vatiká (Vatican)", - "Europe\/Vienna": "Otilisi (Vienna)", - "Europe\/Vilnius": "Litwani (Vilnius)", - "Europe\/Volgograd": "Risí (Volgograd)", - "Europe\/Warsaw": "Poloni (Warsaw)", - "Europe\/Zagreb": "Krowasi (Zagreb)", - "Europe\/Zaporozhye": "Ikrɛni (Zaporozhye)", - "Europe\/Zurich": "Swisɛ (Zurich)", - "Indian\/Antananarivo": "Madagasikari (Antananarivo)", - "Indian\/Chagos": "Mabelé ya Angɛlɛtɛ́lɛ na mbú ya Indiya (Chagos)", - "Indian\/Comoro": "Komorɛ (Comoro)", - "Indian\/Kerguelen": "Terres australes et antarctiques françaises (Kerguelen)", - "Indian\/Mahe": "Sɛshɛlɛ (Mahe)", - "Indian\/Maldives": "Madívɛ (Maldives)", - "Indian\/Mauritius": "Morisɛ (Mauritius)", - "Indian\/Mayotte": "Mayotɛ (Mayotte)", - "Indian\/Reunion": "Lenyo (Reunion)", - "MST7MDT": "MST7MDT", - "PST8PDT": "PST8PDT", - "Pacific\/Apia": "Samoa (Apia)", - "Pacific\/Auckland": "Zelandɛ ya sika (Auckland)", - "Pacific\/Bougainville": "Papwazi Ginɛ ya sika (Bougainville)", - "Pacific\/Chatham": "Zelandɛ ya sika (Chatham)", - "Pacific\/Easter": "Síli (Easter)", - "Pacific\/Efate": "Vanuatu (Efate)", - "Pacific\/Enderbury": "Kiribati (Enderbury)", - "Pacific\/Fakaofo": "Tokelau (Fakaofo)", - "Pacific\/Fiji": "Fidzi (Fiji)", - "Pacific\/Funafuti": "Tuvalu (Funafuti)", - "Pacific\/Galapagos": "Ekwatɛ́lɛ (Galapagos)", - "Pacific\/Gambier": "Polinezi ya Falánsɛ (Gambier)", - "Pacific\/Guadalcanal": "Bisanga Solomɔ (Guadalcanal)", - "Pacific\/Guam": "Gwamɛ (Guam)", - "Pacific\/Honolulu": "Ameriki (Honolulu)", - "Pacific\/Kiritimati": "Kiribati (Kiritimati)", - "Pacific\/Kosrae": "Mikronezi (Kosrae)", - "Pacific\/Kwajalein": "Bisanga bya Marishalɛ (Kwajalein)", - "Pacific\/Majuro": "Bisanga bya Marishalɛ (Majuro)", - "Pacific\/Marquesas": "Polinezi ya Falánsɛ (Marquesas)", - "Pacific\/Nauru": "Nauru (Nauru)", - "Pacific\/Niue": "Nyué (Niue)", - "Pacific\/Norfolk": "Esanga Norfokɛ (Norfolk)", - "Pacific\/Noumea": "Kaledoni ya sika (Noumea)", - "Pacific\/Pago_Pago": "Samoa ya Ameriki (Pago Pago)", - "Pacific\/Palau": "Palau (Palau)", - "Pacific\/Pitcairn": "Pikairni (Pitcairn)", - "Pacific\/Ponape": "Mikronezi (Pohnpei)", - "Pacific\/Port_Moresby": "Papwazi Ginɛ ya sika (Port Moresby)", - "Pacific\/Rarotonga": "Bisanga bya Kookɛ (Rarotonga)", - "Pacific\/Saipan": "Bisanga bya Marianɛ ya nɔ́rdi (Saipan)", - "Pacific\/Tahiti": "Polinezi ya Falánsɛ (Tahiti)", - "Pacific\/Tarawa": "Kiribati (Tarawa)", - "Pacific\/Tongatapu": "Tonga (Tongatapu)", - "Pacific\/Truk": "Mikronezi (Chuuk)", - "Pacific\/Wallis": "Walisɛ mpé Futuna (Wallis)" + "Antarctica\/Vostok": "Ngonga ya Antarctique (Vostok)", + "Asia\/Aden": "Ngonga ya Yemɛnɛ (Aden)", + "Asia\/Almaty": "Ngonga ya Kazakisitá (Almaty)", + "Asia\/Amman": "Ngonga ya Zɔdani (Amman)", + "Asia\/Anadyr": "Ngonga ya Risí (Anadyr)", + "Asia\/Aqtau": "Ngonga ya Kazakisitá (Aqtau)", + "Asia\/Aqtobe": "Ngonga ya Kazakisitá (Aqtobe)", + "Asia\/Ashgabat": "Ngonga ya Tikɛménisitá (Ashgabat)", + "Asia\/Atyrau": "Ngonga ya Kazakisitá (Atyrau)", + "Asia\/Baghdad": "Ngonga ya Iraki (Baghdad)", + "Asia\/Bahrain": "Ngonga ya Bahrɛnɛ (Bahrain)", + "Asia\/Baku": "Ngonga ya Azɛlɛbaizá (Baku)", + "Asia\/Bangkok": "Ngonga ya Tailandɛ (Bangkok)", + "Asia\/Barnaul": "Ngonga ya Risí (Barnaul)", + "Asia\/Beirut": "Ngonga ya Libá (Beirut)", + "Asia\/Bishkek": "Ngonga ya Kigizisitá (Bishkek)", + "Asia\/Brunei": "Ngonga ya Brineyi (Brunei)", + "Asia\/Calcutta": "Ngonga ya Índɛ (Kolkata)", + "Asia\/Chita": "Ngonga ya Risí (Chita)", + "Asia\/Choibalsan": "Ngonga ya Mongolí (Choibalsan)", + "Asia\/Colombo": "Ngonga ya Sirilanka (Colombo)", + "Asia\/Damascus": "Ngonga ya Sirí (Damascus)", + "Asia\/Dhaka": "Ngonga ya Bengalidɛsi (Dhaka)", + "Asia\/Dili": "Ngonga ya Timorɛ ya Moniɛlɛ (Dili)", + "Asia\/Dubai": "Ngonga ya Lɛmila alabo (Dubai)", + "Asia\/Dushanbe": "Ngonga ya Tazikisitá (Dushanbe)", + "Asia\/Famagusta": "Ngonga ya Sípɛlɛ (Famagusta)", + "Asia\/Gaza": "Ngonga ya Palɛsine (Gaza)", + "Asia\/Hebron": "Ngonga ya Palɛsine (Hebron)", + "Asia\/Hovd": "Ngonga ya Mongolí (Hovd)", + "Asia\/Irkutsk": "Ngonga ya Risí (Irkutsk)", + "Asia\/Jakarta": "Ngonga ya Indonezi (Jakarta)", + "Asia\/Jayapura": "Ngonga ya Indonezi (Jayapura)", + "Asia\/Jerusalem": "Ngonga ya Isirayelɛ (Jerusalem)", + "Asia\/Kabul": "Ngonga ya Afiganisitá (Kabul)", + "Asia\/Kamchatka": "Ngonga ya Risí (Kamchatka)", + "Asia\/Karachi": "Ngonga ya Pakisitá (Karachi)", + "Asia\/Katmandu": "Ngonga ya Nepálɛ (Kathmandu)", + "Asia\/Khandyga": "Ngonga ya Risí (Khandyga)", + "Asia\/Krasnoyarsk": "Ngonga ya Risí (Krasnoyarsk)", + "Asia\/Kuala_Lumpur": "Ngonga ya Malezi (Kuala Lumpur)", + "Asia\/Kuching": "Ngonga ya Malezi (Kuching)", + "Asia\/Kuwait": "Ngonga ya Koweti (Kuwait)", + "Asia\/Magadan": "Ngonga ya Risí (Magadan)", + "Asia\/Makassar": "Ngonga ya Indonezi (Makassar)", + "Asia\/Manila": "Ngonga ya Filipinɛ (Manila)", + "Asia\/Muscat": "Ngonga ya Ománɛ (Muscat)", + "Asia\/Nicosia": "Ngonga ya Sípɛlɛ (Nicosia)", + "Asia\/Novokuznetsk": "Ngonga ya Risí (Novokuznetsk)", + "Asia\/Novosibirsk": "Ngonga ya Risí (Novosibirsk)", + "Asia\/Omsk": "Ngonga ya Risí (Omsk)", + "Asia\/Oral": "Ngonga ya Kazakisitá (Oral)", + "Asia\/Phnom_Penh": "Ngonga ya Kambodza (Phnom Penh)", + "Asia\/Pontianak": "Ngonga ya Indonezi (Pontianak)", + "Asia\/Pyongyang": "Ngonga ya Korɛ ya nɔ́rdi (Pyongyang)", + "Asia\/Qatar": "Ngonga ya Katari (Qatar)", + "Asia\/Qostanay": "Ngonga ya Kazakisitá (Qostanay)", + "Asia\/Qyzylorda": "Ngonga ya Kazakisitá (Qyzylorda)", + "Asia\/Rangoon": "Ngonga ya Birmanie (Yangon)", + "Asia\/Riyadh": "Ngonga ya Alabi Sawuditɛ (Riyadh)", + "Asia\/Saigon": "Ngonga ya Viyetinamɛ (Ho Chi Minh)", + "Asia\/Sakhalin": "Ngonga ya Risí (Sakhalin)", + "Asia\/Samarkand": "Ngonga ya Uzibɛkisitá (Samarkand)", + "Asia\/Seoul": "Ngonga ya Korɛ ya súdi (Seoul)", + "Asia\/Shanghai": "Ngonga ya Sinɛ (Shanghai)", + "Asia\/Singapore": "Ngonga ya Singapurɛ (Singapore)", + "Asia\/Srednekolymsk": "Ngonga ya Risí (Srednekolymsk)", + "Asia\/Taipei": "Ngonga ya Taiwanin (Taipei)", + "Asia\/Tashkent": "Ngonga ya Uzibɛkisitá (Tashkent)", + "Asia\/Tbilisi": "Ngonga ya Zorzi (Tbilisi)", + "Asia\/Tehran": "Ngonga ya Irâ (Tehran)", + "Asia\/Thimphu": "Ngonga ya Butáni (Thimphu)", + "Asia\/Tokyo": "Ngonga ya Zapɔ (Tokyo)", + "Asia\/Tomsk": "Ngonga ya Risí (Tomsk)", + "Asia\/Ulaanbaatar": "Ngonga ya Mongolí (Ulaanbaatar)", + "Asia\/Urumqi": "Ngonga ya Sinɛ (Urumqi)", + "Asia\/Ust-Nera": "Ngonga ya Risí (Ust-Nera)", + "Asia\/Vientiane": "Ngonga ya Lawosi (Vientiane)", + "Asia\/Vladivostok": "Ngonga ya Risí (Vladivostok)", + "Asia\/Yakutsk": "Ngonga ya Risí (Yakutsk)", + "Asia\/Yekaterinburg": "Ngonga ya Risí (Yekaterinburg)", + "Asia\/Yerevan": "Ngonga ya Amɛni (Yerevan)", + "Atlantic\/Azores": "Ngonga ya Putúlugɛsi (Azores)", + "Atlantic\/Bermuda": "Ngonga ya Bermuda (Bermuda)", + "Atlantic\/Canary": "Ngonga ya Esipanye (Canary)", + "Atlantic\/Cape_Verde": "Ngonga ya Bisanga bya Kapevɛrɛ (Cape Verde)", + "Atlantic\/Madeira": "Ngonga ya Putúlugɛsi (Madeira)", + "Atlantic\/Reykjavik": "Ngonga ya Isilandɛ (Reykjavik)", + "Atlantic\/South_Georgia": "Ngonga ya Îles de Géorgie du Sud et Sandwich du Sud (South Georgia)", + "Atlantic\/St_Helena": "Ngonga ya Sántu eleni (St. Helena)", + "Atlantic\/Stanley": "Ngonga ya Bisanga bya Maluni (Stanley)", + "Australia\/Adelaide": "Ngonga ya Ositáli (Adelaide)", + "Australia\/Brisbane": "Ngonga ya Ositáli (Brisbane)", + "Australia\/Broken_Hill": "Ngonga ya Ositáli (Broken Hill)", + "Australia\/Currie": "Ngonga ya Ositáli (Currie)", + "Australia\/Darwin": "Ngonga ya Ositáli (Darwin)", + "Australia\/Eucla": "Ngonga ya Ositáli (Eucla)", + "Australia\/Hobart": "Ngonga ya Ositáli (Hobart)", + "Australia\/Lindeman": "Ngonga ya Ositáli (Lindeman)", + "Australia\/Lord_Howe": "Ngonga ya Ositáli (Lord Howe)", + "Australia\/Melbourne": "Ngonga ya Ositáli (Melbourne)", + "Australia\/Perth": "Ngonga ya Ositáli (Perth)", + "Australia\/Sydney": "Ngonga ya Ositáli (Sydney)", + "Europe\/Amsterdam": "Ngonga ya Olandɛ (Amsterdam)", + "Europe\/Andorra": "Ngonga ya Andorɛ (Andorra)", + "Europe\/Astrakhan": "Ngonga ya Risí (Astrakhan)", + "Europe\/Athens": "Ngonga ya Geleki (Athens)", + "Europe\/Belgrade": "Ngonga ya Serbie (Belgrade)", + "Europe\/Berlin": "Ngonga ya Alemani (Berlin)", + "Europe\/Bratislava": "Ngonga ya Silovaki (Bratislava)", + "Europe\/Brussels": "Ngonga ya Beleziki (Brussels)", + "Europe\/Bucharest": "Ngonga ya Romani (Bucharest)", + "Europe\/Budapest": "Ngonga ya Ongili (Budapest)", + "Europe\/Busingen": "Ngonga ya Alemani (Busingen)", + "Europe\/Chisinau": "Ngonga ya Molidavi (Chisinau)", + "Europe\/Copenhagen": "Ngonga ya Danɛmarike (Copenhagen)", + "Europe\/Dublin": "Ngonga ya Irelandɛ (Dublin)", + "Europe\/Gibraltar": "Ngonga ya Zibatalɛ (Gibraltar)", + "Europe\/Guernsey": "Ngonga ya Guernesey (Guernsey)", + "Europe\/Helsinki": "Ngonga ya Filandɛ (Helsinki)", + "Europe\/Istanbul": "Ngonga ya Tiliki (Istanbul)", + "Europe\/Kaliningrad": "Ngonga ya Risí (Kaliningrad)", + "Europe\/Kiev": "Ngonga ya Ikrɛni (Kiev)", + "Europe\/Kirov": "Ngonga ya Risí (Kirov)", + "Europe\/Lisbon": "Ngonga ya Putúlugɛsi (Lisbon)", + "Europe\/Ljubljana": "Ngonga ya Siloveni (Ljubljana)", + "Europe\/London": "Ngonga ya Angɛlɛtɛ́lɛ (London)", + "Europe\/Luxembourg": "Ngonga ya Likisambulu (Luxembourg)", + "Europe\/Madrid": "Ngonga ya Esipanye (Madrid)", + "Europe\/Malta": "Ngonga ya Malitɛ (Malta)", + "Europe\/Minsk": "Ngonga ya Byelorisi (Minsk)", + "Europe\/Monaco": "Ngonga ya Monako (Monaco)", + "Europe\/Moscow": "Ngonga ya Risí (Moscow)", + "Europe\/Oslo": "Ngonga ya Norivezɛ (Oslo)", + "Europe\/Paris": "Ngonga ya Falánsɛ (Paris)", + "Europe\/Podgorica": "Ngonga ya Monténégro (Podgorica)", + "Europe\/Prague": "Ngonga ya Shekia (Prague)", + "Europe\/Riga": "Ngonga ya Letoni (Riga)", + "Europe\/Rome": "Ngonga ya Itali (Rome)", + "Europe\/Samara": "Ngonga ya Risí (Samara)", + "Europe\/San_Marino": "Ngonga ya Sántu Marinɛ (San Marino)", + "Europe\/Sarajevo": "Ngonga ya Bosini mpé Hezegovine (Sarajevo)", + "Europe\/Saratov": "Ngonga ya Risí (Saratov)", + "Europe\/Simferopol": "Ngonga ya Ikrɛni (Simferopol)", + "Europe\/Skopje": "Ngonga ya Masedwanɛ (Skopje)", + "Europe\/Sofia": "Ngonga ya Biligari (Sofia)", + "Europe\/Stockholm": "Ngonga ya Swédɛ (Stockholm)", + "Europe\/Tallinn": "Ngonga ya Esitoni (Tallinn)", + "Europe\/Tirane": "Ngonga ya Alibani (Tirane)", + "Europe\/Ulyanovsk": "Ngonga ya Risí (Ulyanovsk)", + "Europe\/Uzhgorod": "Ngonga ya Ikrɛni (Uzhgorod)", + "Europe\/Vaduz": "Ngonga ya Lishɛteni (Vaduz)", + "Europe\/Vatican": "Ngonga ya Vatiká (Vatican)", + "Europe\/Vienna": "Ngonga ya Otilisi (Vienna)", + "Europe\/Vilnius": "Ngonga ya Litwani (Vilnius)", + "Europe\/Volgograd": "Ngonga ya Risí (Volgograd)", + "Europe\/Warsaw": "Ngonga ya Poloni (Warsaw)", + "Europe\/Zagreb": "Ngonga ya Krowasi (Zagreb)", + "Europe\/Zaporozhye": "Ngonga ya Ikrɛni (Zaporozhye)", + "Europe\/Zurich": "Ngonga ya Swisɛ (Zurich)", + "Indian\/Antananarivo": "Ngonga ya Madagasikari (Antananarivo)", + "Indian\/Chagos": "Ngonga ya Mabelé ya Angɛlɛtɛ́lɛ na mbú ya Indiya (Chagos)", + "Indian\/Comoro": "Ngonga ya Komorɛ (Comoro)", + "Indian\/Kerguelen": "Ngonga ya Terres australes et antarctiques françaises (Kerguelen)", + "Indian\/Mahe": "Ngonga ya Sɛshɛlɛ (Mahe)", + "Indian\/Maldives": "Ngonga ya Madívɛ (Maldives)", + "Indian\/Mauritius": "Ngonga ya Morisɛ (Mauritius)", + "Indian\/Mayotte": "Ngonga ya Mayotɛ (Mayotte)", + "Indian\/Reunion": "Ngonga ya Lenyo (Reunion)", + "Pacific\/Apia": "Ngonga ya Samoa (Apia)", + "Pacific\/Auckland": "Ngonga ya Zelandɛ ya sika (Auckland)", + "Pacific\/Bougainville": "Ngonga ya Papwazi Ginɛ ya sika (Bougainville)", + "Pacific\/Chatham": "Ngonga ya Zelandɛ ya sika (Chatham)", + "Pacific\/Easter": "Ngonga ya Síli (Easter)", + "Pacific\/Efate": "Ngonga ya Vanuatu (Efate)", + "Pacific\/Enderbury": "Ngonga ya Kiribati (Enderbury)", + "Pacific\/Fakaofo": "Ngonga ya Tokelau (Fakaofo)", + "Pacific\/Fiji": "Ngonga ya Fidzi (Fiji)", + "Pacific\/Funafuti": "Ngonga ya Tuvalu (Funafuti)", + "Pacific\/Galapagos": "Ngonga ya Ekwatɛ́lɛ (Galapagos)", + "Pacific\/Gambier": "Ngonga ya Polinezi ya Falánsɛ (Gambier)", + "Pacific\/Guadalcanal": "Ngonga ya Bisanga Solomɔ (Guadalcanal)", + "Pacific\/Guam": "Ngonga ya Gwamɛ (Guam)", + "Pacific\/Honolulu": "Ngonga ya Ameriki (Honolulu)", + "Pacific\/Kiritimati": "Ngonga ya Kiribati (Kiritimati)", + "Pacific\/Kosrae": "Ngonga ya Mikronezi (Kosrae)", + "Pacific\/Kwajalein": "Ngonga ya Bisanga bya Marishalɛ (Kwajalein)", + "Pacific\/Majuro": "Ngonga ya Bisanga bya Marishalɛ (Majuro)", + "Pacific\/Marquesas": "Ngonga ya Polinezi ya Falánsɛ (Marquesas)", + "Pacific\/Nauru": "Ngonga ya Nauru (Nauru)", + "Pacific\/Niue": "Ngonga ya Nyué (Niue)", + "Pacific\/Norfolk": "Ngonga ya Esanga Norfokɛ (Norfolk)", + "Pacific\/Noumea": "Ngonga ya Kaledoni ya sika (Noumea)", + "Pacific\/Pago_Pago": "Ngonga ya Samoa ya Ameriki (Pago Pago)", + "Pacific\/Palau": "Ngonga ya Palau (Palau)", + "Pacific\/Pitcairn": "Ngonga ya Pikairni (Pitcairn)", + "Pacific\/Ponape": "Ngonga ya Mikronezi (Pohnpei)", + "Pacific\/Port_Moresby": "Ngonga ya Papwazi Ginɛ ya sika (Port Moresby)", + "Pacific\/Rarotonga": "Ngonga ya Bisanga bya Kookɛ (Rarotonga)", + "Pacific\/Saipan": "Ngonga ya Bisanga bya Marianɛ ya nɔ́rdi (Saipan)", + "Pacific\/Tahiti": "Ngonga ya Polinezi ya Falánsɛ (Tahiti)", + "Pacific\/Tarawa": "Ngonga ya Kiribati (Tarawa)", + "Pacific\/Tongatapu": "Ngonga ya Tonga (Tongatapu)", + "Pacific\/Truk": "Ngonga ya Mikronezi (Chuuk)", + "Pacific\/Wallis": "Ngonga ya Walisɛ mpé Futuna (Wallis)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/lo.json b/src/Symfony/Component/Intl/Resources/data/timezones/lo.json index 8b5ef1d4b4183..089a0003940fa 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/lo.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/lo.json @@ -151,7 +151,7 @@ "America\/Moncton": "ເວລາຂອງອາແລນຕິກ (ມອນຕັນ)", "America\/Monterrey": "ເວລາກາງ (ມອນເຕີເຣຍ)", "America\/Montevideo": "​ເວ​ລາ​ອູ​ຣູ​ກວຍ (ມອນເຕວິເດໂອ)", - "America\/Montreal": "ແຄນາດາ (Montreal)", + "America\/Montreal": "ເວລາ ແຄນາດາ (Montreal)", "America\/Montserrat": "ເວລາຂອງອາແລນຕິກ (ມອນເຊີຣັດ)", "America\/Nassau": "ເວລາຕາເວັນອອກ (ແນສຊໍ)", "America\/New_York": "ເວລາຕາເວັນອອກ (ນິວຢອກ)", @@ -217,7 +217,7 @@ "Asia\/Aden": "ເວ​ລາ​ອາ​ຣາ​ບຽນ (ເອເດັນ)", "Asia\/Almaty": "ເວ​ລາ​ຄາ​ຊັກ​ສ​ຖານ​ຕາ​ເວັນ​ອອກ (ອໍມາຕີ)", "Asia\/Amman": "ເວ​ລາ​ຢູ​ໂຣບ​ຕາ​ເວັນ​ອອກ (ອຳມານ)", - "Asia\/Anadyr": "ຣັດເຊຍ (ອານາດີ)", + "Asia\/Anadyr": "ເວລາ ຣັດເຊຍ (ອານາດີ)", "Asia\/Aqtau": "ເວ​ລາ​ຄາ​ຊັກ​ສ​ຖານ​ຕາ​ເວັນ​ຕົກ (ອັດຕາອູ)", "Asia\/Aqtobe": "ເວ​ລາ​ຄາ​ຊັກ​ສ​ຖານ​ຕາ​ເວັນ​ຕົກ (ອັດໂທບີ)", "Asia\/Ashgabat": "ເວລາຕວກເມນິສຖານ (ອາດຊ໌ກາບັດ)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "ເວ​ລາ​ອາ​ຣາ​ບຽນ (ບາເຣນ)", "Asia\/Baku": "ເວລາອັສເຊີໄບຈັນ (ບາກູ)", "Asia\/Bangkok": "ເວລາອິນດູຈີນ (ບາງກອກ)", - "Asia\/Barnaul": "ຣັດເຊຍ (ບານົວ)", + "Asia\/Barnaul": "ເວລາ ຣັດເຊຍ (ບານົວ)", "Asia\/Beirut": "ເວ​ລາ​ຢູ​ໂຣບ​ຕາ​ເວັນ​ອອກ (ເບຣຸດ)", "Asia\/Bishkek": "ເວລາເຄຍກິສຖານ (ບິດຊ໌ເຄກ)", "Asia\/Brunei": "​ເວ​ລາບຣູ​ໄນດາ​ຣຸສ​ຊາ​ລາມ (ບຣູໄນ)", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "ເວ​ລາ​ອິນ​ໂດ​ເນ​ເຊຍ​ຕາ​ເວັນ​ອອກ (ຈາຢາປູຣະ)", "Asia\/Jerusalem": "ເວ​ລາ​ອິ​ສ​ຣາ​ເອວ (ເຢຣູຊາເລມ)", "Asia\/Kabul": "ເວລາ ອັຟການິສຖານ (ຄາບູ)", - "Asia\/Kamchatka": "ຣັດເຊຍ (ຄາມຊາດກາ)", + "Asia\/Kamchatka": "ເວລາ ຣັດເຊຍ (ຄາມຊາດກາ)", "Asia\/Karachi": "ເວ​ລາ​ປາ​ກີສຖານ (ກາຣາຈີ)", "Asia\/Katmandu": "​ເວ​ລາ​ເນ​ປານ (ຄັດມັນດູ)", "Asia\/Khandyga": "ເວລາຢາກູດສ (ແຄນດີກາ)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ເວ​ລາ​ອີ​ຣານ (ເຕຣານ)", "Asia\/Thimphu": "ເວ​ລາ​ພູ​ຖານ (ທິມພູ)", "Asia\/Tokyo": "ເວ​ລາ​ຍີ່​ປຸ່ນ (ໂຕກຽວ)", - "Asia\/Tomsk": "ຣັດເຊຍ (ທອມສກ໌)", + "Asia\/Tomsk": "ເວລາ ຣັດເຊຍ (ທອມສກ໌)", "Asia\/Ulaanbaatar": "ເວລາ ອູລານບາເຕີ (ອູລານບາຕາຣ໌)", - "Asia\/Urumqi": "ຈີນ (ອູຣຸມຊີ)", + "Asia\/Urumqi": "ເວລາ ຈີນ (ອູຣຸມຊີ)", "Asia\/Ust-Nera": "ເວລາລາດີໂວສຕົກ (ອຸສ ເນຣາ)", "Asia\/Vientiane": "ເວລາອິນດູຈີນ (ວຽງຈັນ)", "Asia\/Vladivostok": "ເວລາລາດີໂວສຕົກ (ວີລາດິໂວສຕອກ)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "ເວ​ລາກຣີນ​ວິ​ຊ (ເກີນຊີ)", "Europe\/Helsinki": "ເວ​ລາ​ຢູ​ໂຣບ​ຕາ​ເວັນ​ອອກ (ເຮວຊິນກິ)", "Europe\/Isle_of_Man": "ເວ​ລາກຣີນ​ວິ​ຊ (ເກາະແມນ)", - "Europe\/Istanbul": "ເທີຄີ (ອິສຕັນບູລ໌)", + "Europe\/Istanbul": "ເວລາ ເທີຄີ (ອິສຕັນບູລ໌)", "Europe\/Jersey": "ເວ​ລາກຣີນ​ວິ​ຊ (ເຈີຊີ)", "Europe\/Kaliningrad": "ເວ​ລາ​ຢູ​ໂຣບ​ຕາ​ເວັນ​ອອກ (ຄາລິນິນກຣາດ)", "Europe\/Kiev": "ເວ​ລາ​ຢູ​ໂຣບ​ຕາ​ເວັນ​ອອກ (ຂຽບ)", - "Europe\/Kirov": "ຣັດເຊຍ (ກິໂຣບ)", + "Europe\/Kirov": "ເວລາ ຣັດເຊຍ (ກິໂຣບ)", "Europe\/Lisbon": "ເວ​ລາ​ຢູ​ໂຣບ​ຕາ​ເວັນ​ຕົກ (ລິສບອນ)", "Europe\/Ljubljana": "ເວ​ລາ​ຢູ​ໂຣບ​ກາງ (ລູບລີຍານາ)", "Europe\/London": "ເວ​ລາກຣີນ​ວິ​ຊ (ລອນດອນ)", @@ -362,7 +362,7 @@ "Europe\/Prague": "ເວ​ລາ​ຢູ​ໂຣບ​ກາງ (ປຣາກ)", "Europe\/Riga": "ເວ​ລາ​ຢູ​ໂຣບ​ຕາ​ເວັນ​ອອກ (ຣິກາ)", "Europe\/Rome": "ເວ​ລາ​ຢູ​ໂຣບ​ກາງ (ໂຣມ)", - "Europe\/Samara": "ຣັດເຊຍ (ຊາມາຣາ)", + "Europe\/Samara": "ເວລາ ຣັດເຊຍ (ຊາມາຣາ)", "Europe\/San_Marino": "ເວ​ລາ​ຢູ​ໂຣບ​ກາງ (ຊານມາຣີໂນ)", "Europe\/Sarajevo": "ເວ​ລາ​ຢູ​ໂຣບ​ກາງ (ຊາຣາເຢໂວ)", "Europe\/Saratov": "ເວ​ລາ​ມອ​ສ​ໂຄ (ຊາຣາທອບ)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "ເວລາເກາະເວກ", "Pacific\/Wallis": "ເວລາວາລລິສ ແລະ ຟູຕູນາ (ວາລິດ)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/lt.json b/src/Symfony/Component/Intl/Resources/data/timezones/lt.json index 782aac015c1cd..f9d1a5021949a 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/lt.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/lt.json @@ -151,7 +151,7 @@ "America\/Moncton": "Atlanto laikas (Monktonas)", "America\/Monterrey": "Šiaurės Amerikos centro laikas (Monterėjus)", "America\/Montevideo": "Urugvajaus laikas (Montevidėjas)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Laikas: Kanada (Montreal)", "America\/Montserrat": "Atlanto laikas (Montseratas)", "America\/Nassau": "Šiaurės Amerikos rytų laikas (Nasau)", "America\/New_York": "Šiaurės Amerikos rytų laikas (Niujorkas)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Arabijos laikas (Bahreinas)", "Asia\/Baku": "Azerbaidžano laikas (Baku)", "Asia\/Bangkok": "Indokinijos laikas (Bankokas)", - "Asia\/Barnaul": "Rusija (Barnaulas)", + "Asia\/Barnaul": "Laikas: Rusija (Barnaulas)", "Asia\/Beirut": "Rytų Europos laikas (Beirutas)", "Asia\/Bishkek": "Kirgistano laikas (Biškekas)", "Asia\/Brunei": "Brunėjaus Darusalamo laikas (Brunėjus)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Irano laikas (Teheranas)", "Asia\/Thimphu": "Butano laikas (Timpu)", "Asia\/Tokyo": "Japonijos laikas (Tokijas)", - "Asia\/Tomsk": "Rusija (Tomskas)", + "Asia\/Tomsk": "Laikas: Rusija (Tomskas)", "Asia\/Ulaanbaatar": "Ulan Batoro laikas (Ulan Batoras)", - "Asia\/Urumqi": "Kinija (Urumči)", + "Asia\/Urumqi": "Laikas: Kinija (Urumči)", "Asia\/Ust-Nera": "Vladivostoko laikas (Ust Nera)", "Asia\/Vientiane": "Indokinijos laikas (Vientianas)", "Asia\/Vladivostok": "Vladivostoko laikas (Vladivostokas)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Grinvičo laikas (Gernsis)", "Europe\/Helsinki": "Rytų Europos laikas (Helsinkis)", "Europe\/Isle_of_Man": "Grinvičo laikas (Meno sala)", - "Europe\/Istanbul": "Turkija (Stambulas)", + "Europe\/Istanbul": "Laikas: Turkija (Stambulas)", "Europe\/Jersey": "Grinvičo laikas (Džersis)", "Europe\/Kaliningrad": "Rytų Europos laikas (Kaliningradas)", "Europe\/Kiev": "Rytų Europos laikas (Kijevas)", - "Europe\/Kirov": "Rusija (Kirovas)", + "Europe\/Kirov": "Laikas: Rusija (Kirovas)", "Europe\/Lisbon": "Vakarų Europos laikas (Lisabona)", "Europe\/Ljubljana": "Vidurio Europos laikas (Liubliana)", "Europe\/London": "Grinvičo laikas (Londonas)", @@ -437,10 +437,6 @@ "Pacific\/Wallis": "Voliso ir Futūnos laikas (Volisas)" }, "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "−%02d:%02d" - ] + "HourFormatNeg": "−%02d:%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/lv.json b/src/Symfony/Component/Intl/Resources/data/timezones/lv.json index 1bedbd3f67637..16e0bd8e255c8 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/lv.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/lv.json @@ -99,7 +99,7 @@ "America\/Detroit": "Detroita (Austrumu laiks)", "America\/Dominica": "Dominika (Atlantijas laiks)", "America\/Edmonton": "Edmontona (Kalnu laiks)", - "America\/Eirunepe": "Eirunepe (Brazīlija)", + "America\/Eirunepe": "Eirunepe (Laika josla: Brazīlija)", "America\/El_Salvador": "Salvadora (Centrālais laiks)", "America\/Fort_Nelson": "Fortnelsona (Kalnu laiks)", "America\/Fortaleza": "Fortaleza (Brazīlijas laiks)", @@ -151,7 +151,7 @@ "America\/Moncton": "Monktona (Atlantijas laiks)", "America\/Monterrey": "Monterreja (Centrālais laiks)", "America\/Montevideo": "Montevideo (Urugvajas laiks)", - "America\/Montreal": "Montreal (Kanāda)", + "America\/Montreal": "Montreal (Laika josla: Kanāda)", "America\/Montserrat": "Montserrata (Atlantijas laiks)", "America\/Nassau": "Naso (Austrumu laiks)", "America\/New_York": "Ņujorka (Austrumu laiks)", @@ -176,7 +176,7 @@ "America\/Recife": "Resifi (Brazīlijas laiks)", "America\/Regina": "Ridžaina (Centrālais laiks)", "America\/Resolute": "Rezolūta (Centrālais laiks)", - "America\/Rio_Branco": "Riobranko (Brazīlija)", + "America\/Rio_Branco": "Riobranko (Laika josla: Brazīlija)", "America\/Santa_Isabel": "Santaisabela (Ziemeļrietumu Meksikas laiks)", "America\/Santarem": "Santarena (Brazīlijas laiks)", "America\/Santiago": "Santjago (Čīles laiks)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Bahreina (Arābijas pussalas laiks)", "Asia\/Baku": "Baku (Azerbaidžānas laiks)", "Asia\/Bangkok": "Bangkoka (Indoķīnas laiks)", - "Asia\/Barnaul": "Barnaula (Krievija)", + "Asia\/Barnaul": "Barnaula (Laika josla: Krievija)", "Asia\/Beirut": "Beirūta (Austrumeiropas laiks)", "Asia\/Bishkek": "Biškeka (Kirgizstānas laiks)", "Asia\/Brunei": "Brunejas Darusalamas laiks", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Teherāna (Irānas laiks)", "Asia\/Thimphu": "Thimphu (Butānas laiks)", "Asia\/Tokyo": "Tokija (Japānas laiks)", - "Asia\/Tomsk": "Tomska (Krievija)", + "Asia\/Tomsk": "Tomska (Laika josla: Krievija)", "Asia\/Ulaanbaatar": "Ulanbatoras laiks", - "Asia\/Urumqi": "Urumči (Ķīna)", + "Asia\/Urumqi": "Urumči (Laika josla: Ķīna)", "Asia\/Ust-Nera": "Ustjņera (Vladivostokas laiks)", "Asia\/Vientiane": "Vjenčana (Indoķīnas laiks)", "Asia\/Vladivostok": "Vladivostokas laiks", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Gērnsija (Griničas laiks)", "Europe\/Helsinki": "Helsinki (Austrumeiropas laiks)", "Europe\/Isle_of_Man": "Menas sala (Griničas laiks)", - "Europe\/Istanbul": "Stambula (Turcija)", + "Europe\/Istanbul": "Stambula (Laika josla: Turcija)", "Europe\/Jersey": "Džērsija (Griničas laiks)", "Europe\/Kaliningrad": "Kaļiņingrada (Austrumeiropas laiks)", "Europe\/Kiev": "Kijeva (Austrumeiropas laiks)", - "Europe\/Kirov": "Kirova (Krievija)", + "Europe\/Kirov": "Kirova (Laika josla: Krievija)", "Europe\/Lisbon": "Lisabona (Rietumeiropas laiks)", "Europe\/Ljubljana": "Ļubļana (Centrāleiropas laiks)", "Europe\/London": "Londona (Griničas laiks)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Veika salas laiks", "Pacific\/Wallis": "Volisas un Futunas laiks" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/mi.json b/src/Symfony/Component/Intl/Resources/data/timezones/mi.json index 324b5db0025a8..a17477f77ba2a 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/mi.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/mi.json @@ -240,11 +240,5 @@ "Pacific\/Chatham": "Aotearoa (Rēkohu)", "Pacific\/Honolulu": "Hononga o Amerika (Honolulu)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/mk.json b/src/Symfony/Component/Intl/Resources/data/timezones/mk.json index 98b64680f7b07..c35bbc42c385d 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/mk.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/mk.json @@ -151,7 +151,7 @@ "America\/Moncton": "Атлантско време (Монктон)", "America\/Monterrey": "Централно време во Северна Америка (Монтереј)", "America\/Montevideo": "Време во Уругвај (Монтевидео)", - "America\/Montreal": "Канада (Montreal)", + "America\/Montreal": "Време во Канада (Montreal)", "America\/Montserrat": "Атлантско време (Монтсерат)", "America\/Nassau": "Источно време (Насау)", "America\/New_York": "Источно време (Њујорк)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Арапско време (Бахреин)", "Asia\/Baku": "Време во Азербејџан (Баку)", "Asia\/Bangkok": "Време во Индокина (Бангкок)", - "Asia\/Barnaul": "Русија (Барнаул)", + "Asia\/Barnaul": "Време во Русија (Барнаул)", "Asia\/Beirut": "Источноевропско време (Бејрут)", "Asia\/Bishkek": "Време во Киргистан (Бишкек)", "Asia\/Brunei": "Време во Брунеј Дарусалам", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "Време во Источна Индонезија (Џајапура)", "Asia\/Jerusalem": "Време во Израел (Ерусалим)", "Asia\/Kabul": "Време во Авганистан (Кабул)", - "Asia\/Kamchatka": "Русија (Камчатка)", + "Asia\/Kamchatka": "Време во Русија (Камчатка)", "Asia\/Karachi": "Време во Пакистан (Карачи)", "Asia\/Katmandu": "Време во Непал (Катманду)", "Asia\/Khandyga": "Време во Јакутск (Хандига)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Време во Иран (Техеран)", "Asia\/Thimphu": "Време во Бутан (Тимпу)", "Asia\/Tokyo": "Време во Јапонија (Токио)", - "Asia\/Tomsk": "Русија (Томск)", + "Asia\/Tomsk": "Време во Русија (Томск)", "Asia\/Ulaanbaatar": "Време во Улан Батор", - "Asia\/Urumqi": "Кина (Урумчи)", + "Asia\/Urumqi": "Време во Кина (Урумчи)", "Asia\/Ust-Nera": "Време во Владивосток (Уст-Нера)", "Asia\/Vientiane": "Време во Индокина (Виентијан)", "Asia\/Vladivostok": "Време во Владивосток", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Средно време по Гринич (Гернзи)", "Europe\/Helsinki": "Источноевропско време (Хелсинки)", "Europe\/Isle_of_Man": "Средно време по Гринич (Остров Ман)", - "Europe\/Istanbul": "Турција (Истанбул)", + "Europe\/Istanbul": "Време во Турција (Истанбул)", "Europe\/Jersey": "Средно време по Гринич (Џерзи)", "Europe\/Kaliningrad": "Источноевропско време (Калининград)", "Europe\/Kiev": "Источноевропско време (Киев)", - "Europe\/Kirov": "Русија (Киров)", + "Europe\/Kirov": "Време во Русија (Киров)", "Europe\/Lisbon": "Западноевропско време (Лисабон)", "Europe\/Ljubljana": "Средноевропско време (Љубљана)", "Europe\/London": "Средно време по Гринич (Лондон)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Време на островот Вејк", "Pacific\/Wallis": "Време во Валис и Футуна" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ml.json b/src/Symfony/Component/Intl/Resources/data/timezones/ml.json index 6ffd22b912b11..486851a576654 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ml.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ml.json @@ -151,7 +151,7 @@ "America\/Moncton": "അറ്റ്‌ലാന്റിക് സമയം (മോംഗ്‌ടൻ)", "America\/Monterrey": "വടക്കെ അമേരിക്കൻ സെൻട്രൽ സമയം (മോണ്ടെറി)", "America\/Montevideo": "ഉറുഗ്വേ സമയം (മൊണ്ടെ‌വീഡിയോ)", - "America\/Montreal": "കാനഡ (Montreal)", + "America\/Montreal": "കാനഡ സമയം (Montreal)", "America\/Montserrat": "അറ്റ്‌ലാന്റിക് സമയം (മൊണ്ടെസരത്ത്)", "America\/Nassau": "വടക്കെ അമേരിക്കൻ കിഴക്കൻ സമയം (നാസൗ)", "America\/New_York": "വടക്കെ അമേരിക്കൻ കിഴക്കൻ സമയം (ന്യൂയോർക്ക്)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "അറേബ്യൻ സമയം (ബഹ്റിൻ)", "Asia\/Baku": "അസർബൈജാൻ സമയം (ബാക്കു)", "Asia\/Bangkok": "ഇൻഡോചൈന സമയം (ബാങ്കോക്ക്)", - "Asia\/Barnaul": "റഷ്യ (ബർണോൽ)", + "Asia\/Barnaul": "റഷ്യ സമയം (ബർണോൽ)", "Asia\/Beirut": "കിഴക്കൻ യൂറോപ്യൻ സമയം (ബെയ്‌റൂട്ട്)", "Asia\/Bishkek": "കിർഗിസ്ഥാൻ സമയം (ബിഷ്‌കേക്)", "Asia\/Brunei": "ബ്രൂണൈ ദാറുസ്സലാം സമയം", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ഇറാൻ സമയം (ടെഹ്‌റാൻ‌)", "Asia\/Thimphu": "ഭൂട്ടാൻ സമയം (തിംഫു)", "Asia\/Tokyo": "ജപ്പാൻ സമയം (ടോക്കിയോ)", - "Asia\/Tomsk": "റഷ്യ (ടോംസ്ക്)", + "Asia\/Tomsk": "റഷ്യ സമയം (ടോംസ്ക്)", "Asia\/Ulaanbaatar": "ഉലൻ ബറ്റർ സമയം (ഉലാൻബാത്തർ)", - "Asia\/Urumqi": "ചൈന (ഉറുംഖി)", + "Asia\/Urumqi": "ചൈന സമയം (ഉറുംഖി)", "Asia\/Ust-Nera": "വ്ലാഡിവോസ്റ്റോക് സമയം (യുസ്-നേര)", "Asia\/Vientiane": "ഇൻഡോചൈന സമയം (വെന്റിയാൻ)", "Asia\/Vladivostok": "വ്ലാഡിവോസ്റ്റോക് സമയം (വ്ളാഡിവോസ്റ്റോക്)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "ഗ്രീൻവിച്ച് മീൻ സമയം (ഗേൺസേ)", "Europe\/Helsinki": "കിഴക്കൻ യൂറോപ്യൻ സമയം (ഹെൽ‌സിങ്കി)", "Europe\/Isle_of_Man": "ഗ്രീൻവിച്ച് മീൻ സമയം (ഐൽ‌ ഓഫ് മാൻ‌)", - "Europe\/Istanbul": "തുർക്കി (ഇസ്താം‌ബുൾ‌)", + "Europe\/Istanbul": "തുർക്കി സമയം (ഇസ്താം‌ബുൾ‌)", "Europe\/Jersey": "ഗ്രീൻവിച്ച് മീൻ സമയം (ജേഴ്‌സി)", "Europe\/Kaliningrad": "കിഴക്കൻ യൂറോപ്യൻ സമയം (കലിനിൻഗ്രാഡ്)", "Europe\/Kiev": "കിഴക്കൻ യൂറോപ്യൻ സമയം (കീവ്)", - "Europe\/Kirov": "റഷ്യ (കിറോ)", + "Europe\/Kirov": "റഷ്യ സമയം (കിറോ)", "Europe\/Lisbon": "പടിഞ്ഞാറൻ യൂറോപ്യൻ സമയം (ലിസ്‌ബൺ‌)", "Europe\/Ljubljana": "സെൻട്രൽ യൂറോപ്യൻ സമയം (ലുബ്‍ലിയാന)", "Europe\/London": "ഗ്രീൻവിച്ച് മീൻ സമയം (ലണ്ടൻ‌)", @@ -437,10 +437,6 @@ "Pacific\/Wallis": "വാലിസ് ആന്റ് ഫ്യൂച്യുന സമയം (വാല്ലിസ്)" }, "Meta": { - "GmtFormat": "ജിഎംടി %s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] + "GmtFormat": "ജിഎംടി %s" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/mn.json b/src/Symfony/Component/Intl/Resources/data/timezones/mn.json index 3037f4b4406a3..fb4c165095ba8 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/mn.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/mn.json @@ -99,7 +99,7 @@ "America\/Detroit": "Зүүн эргийн цаг (Детройт)", "America\/Dominica": "Атлантын цаг (Доминика)", "America\/Edmonton": "Уулын цаг (Эдмонтон)", - "America\/Eirunepe": "Бразил (Эйрунепе)", + "America\/Eirunepe": "Бразил-н цаг (Эйрунепе)", "America\/El_Salvador": "Төв цаг (Эль Сальвадор)", "America\/Fort_Nelson": "Уулын цаг (Форт Нэльсон)", "America\/Fortaleza": "Бразилийн цаг (Форталеза)", @@ -151,7 +151,7 @@ "America\/Moncton": "Атлантын цаг (Монктон)", "America\/Monterrey": "Төв цаг (Монтерей)", "America\/Montevideo": "Уругвайн цаг (Монтевидео)", - "America\/Montreal": "Канад (Montreal)", + "America\/Montreal": "Канад-н цаг (Montreal)", "America\/Montserrat": "Атлантын цаг (Монтсеррат)", "America\/Nassau": "Зүүн эргийн цаг (Нассау)", "America\/New_York": "Зүүн эргийн цаг (Нью-Йорк)", @@ -176,7 +176,7 @@ "America\/Recife": "Бразилийн цаг (Ресифи)", "America\/Regina": "Төв цаг (Регина)", "America\/Resolute": "Төв цаг (Резолют)", - "America\/Rio_Branco": "Бразил (Рио-Бранко)", + "America\/Rio_Branco": "Бразил-н цаг (Рио-Бранко)", "America\/Santa_Isabel": "Баруун хойд Мексикийн цаг (Санта Изабель)", "America\/Santarem": "Бразилийн цаг (Сантарем)", "America\/Santiago": "Чилийн цаг (Сантьяго)", @@ -217,7 +217,7 @@ "Asia\/Aden": "Арабын цаг (Аден)", "Asia\/Almaty": "Зүүн Казахстаны цаг (Алматы)", "Asia\/Amman": "Зүүн Европын цаг (Амман)", - "Asia\/Anadyr": "Орос (Анадыр)", + "Asia\/Anadyr": "Орос-н цаг (Анадыр)", "Asia\/Aqtau": "Баруун Казахстаны цаг (Актау)", "Asia\/Aqtobe": "Баруун Казахстаны цаг (Актөбе)", "Asia\/Ashgabat": "Туркменистаны цаг (Ашхабад)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Арабын цаг (Бахрейн)", "Asia\/Baku": "Азербайжаны цаг (Баку)", "Asia\/Bangkok": "Энэтхэг-Хятадын хойгийн цаг (Бангкок)", - "Asia\/Barnaul": "Орос (Барнаул)", + "Asia\/Barnaul": "Орос-н цаг (Барнаул)", "Asia\/Beirut": "Зүүн Европын цаг (Бейрут)", "Asia\/Bishkek": "Киргизийн цаг (Бишкек)", "Asia\/Brunei": "Бруней Даруссаламын цаг", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "Зүүн Индонезийн цаг (Жайпур)", "Asia\/Jerusalem": "Израилийн цаг (Ерусалем)", "Asia\/Kabul": "Афганистаны цаг (Кабул)", - "Asia\/Kamchatka": "Орос (Камчатка)", + "Asia\/Kamchatka": "Орос-н цаг (Камчатка)", "Asia\/Karachi": "Пакистаны цаг (Карачи)", "Asia\/Katmandu": "Балбын цаг (Катманду)", "Asia\/Khandyga": "Якутын цаг (Кандыга)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Ираны цаг (Тегеран)", "Asia\/Thimphu": "Бутаны цаг (Тхимпху)", "Asia\/Tokyo": "Японы цаг (Токио)", - "Asia\/Tomsk": "Орос (Томск)", + "Asia\/Tomsk": "Орос-н цаг (Томск)", "Asia\/Ulaanbaatar": "Улаанбаатарын цаг", - "Asia\/Urumqi": "Хятад (Үрүмчи)", + "Asia\/Urumqi": "Хятад-н цаг (Үрүмчи)", "Asia\/Ust-Nera": "Владивостокийн цаг (Уст-Нера)", "Asia\/Vientiane": "Энэтхэг-Хятадын хойгийн цаг (Вьентьян)", "Asia\/Vladivostok": "Владивостокийн цаг", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Гринвичийн цаг (Гернси)", "Europe\/Helsinki": "Зүүн Европын цаг (Хельсинк)", "Europe\/Isle_of_Man": "Гринвичийн цаг (Мэн Арал)", - "Europe\/Istanbul": "Турк (Истанбул)", + "Europe\/Istanbul": "Турк-н цаг (Истанбул)", "Europe\/Jersey": "Гринвичийн цаг (Жерси)", "Europe\/Kaliningrad": "Зүүн Европын цаг (Калининград)", "Europe\/Kiev": "Зүүн Европын цаг (Киев)", - "Europe\/Kirov": "Орос (Киров)", + "Europe\/Kirov": "Орос-н цаг (Киров)", "Europe\/Lisbon": "Баруун Европын цаг (Лисбон)", "Europe\/Ljubljana": "Төв Европын цаг (Любляна)", "Europe\/London": "Гринвичийн цаг (Лондон)", @@ -362,7 +362,7 @@ "Europe\/Prague": "Төв Европын цаг (Прага)", "Europe\/Riga": "Зүүн Европын цаг (Рига)", "Europe\/Rome": "Төв Европын цаг (Ром)", - "Europe\/Samara": "Орос (Самара)", + "Europe\/Samara": "Орос-н цаг (Самара)", "Europe\/San_Marino": "Төв Европын цаг (Сан Марино)", "Europe\/Sarajevo": "Төв Европын цаг (Сараево)", "Europe\/Saratov": "Москвагийн цаг (Саратов)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Вейк арлын цаг (Уэйк)", "Pacific\/Wallis": "Уоллис ба Футунагийн цаг" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/mo.json b/src/Symfony/Component/Intl/Resources/data/timezones/mo.json deleted file mode 100644 index 7349c14b62948..0000000000000 --- a/src/Symfony/Component/Intl/Resources/data/timezones/mo.json +++ /dev/null @@ -1,446 +0,0 @@ -{ - "Version": "2.1.49.82", - "Names": { - "Africa\/Abidjan": "Ora de Greenwhich (Abidjan)", - "Africa\/Accra": "Ora de Greenwhich (Accra)", - "Africa\/Addis_Ababa": "Ora Africii Orientale (Addis Abeba)", - "Africa\/Algiers": "Ora Europei Centrale (Alger)", - "Africa\/Asmera": "Ora Africii Orientale (Asmara)", - "Africa\/Bamako": "Ora de Greenwhich (Bamako)", - "Africa\/Bangui": "Ora Africii Occidentale (Bangui)", - "Africa\/Banjul": "Ora de Greenwhich (Banjul)", - "Africa\/Bissau": "Ora de Greenwhich (Bissau)", - "Africa\/Blantyre": "Ora Africii Centrale (Blantyre)", - "Africa\/Brazzaville": "Ora Africii Occidentale (Brazzaville)", - "Africa\/Bujumbura": "Ora Africii Centrale (Bujumbura)", - "Africa\/Cairo": "Ora Europei de Est (Cairo)", - "Africa\/Casablanca": "Ora Europei de Vest (Casablanca)", - "Africa\/Ceuta": "Ora Europei Centrale (Ceuta)", - "Africa\/Conakry": "Ora de Greenwhich (Conakry)", - "Africa\/Dakar": "Ora de Greenwhich (Dakar)", - "Africa\/Dar_es_Salaam": "Ora Africii Orientale (Dar es Salaam)", - "Africa\/Djibouti": "Ora Africii Orientale (Djibouti)", - "Africa\/Douala": "Ora Africii Occidentale (Douala)", - "Africa\/El_Aaiun": "Ora Europei de Vest (El Aaiun)", - "Africa\/Freetown": "Ora de Greenwhich (Freetown)", - "Africa\/Gaborone": "Ora Africii Centrale (Gaborone)", - "Africa\/Harare": "Ora Africii Centrale (Harare)", - "Africa\/Johannesburg": "Ora Africii Meridionale (Johannesburg)", - "Africa\/Juba": "Ora Africii Orientale (Juba)", - "Africa\/Kampala": "Ora Africii Orientale (Kampala)", - "Africa\/Khartoum": "Ora Africii Centrale (Khartoum)", - "Africa\/Kigali": "Ora Africii Centrale (Kigali)", - "Africa\/Kinshasa": "Ora Africii Occidentale (Kinshasa)", - "Africa\/Lagos": "Ora Africii Occidentale (Lagos)", - "Africa\/Libreville": "Ora Africii Occidentale (Libreville)", - "Africa\/Lome": "Ora de Greenwhich (Lome)", - "Africa\/Luanda": "Ora Africii Occidentale (Luanda)", - "Africa\/Lubumbashi": "Ora Africii Centrale (Lubumbashi)", - "Africa\/Lusaka": "Ora Africii Centrale (Lusaka)", - "Africa\/Malabo": "Ora Africii Occidentale (Malabo)", - "Africa\/Maputo": "Ora Africii Centrale (Maputo)", - "Africa\/Maseru": "Ora Africii Meridionale (Maseru)", - "Africa\/Mbabane": "Ora Africii Meridionale (Mbabane)", - "Africa\/Mogadishu": "Ora Africii Orientale (Mogadiscio)", - "Africa\/Monrovia": "Ora de Greenwhich (Monrovia)", - "Africa\/Nairobi": "Ora Africii Orientale (Nairobi)", - "Africa\/Ndjamena": "Ora Africii Occidentale (N’Djamena)", - "Africa\/Niamey": "Ora Africii Occidentale (Niamey)", - "Africa\/Nouakchott": "Ora de Greenwhich (Nouakchott)", - "Africa\/Ouagadougou": "Ora de Greenwhich (Ouagadougou)", - "Africa\/Porto-Novo": "Ora Africii Occidentale (Porto-Novo)", - "Africa\/Sao_Tome": "Ora de Greenwhich (Sao Tomé)", - "Africa\/Tripoli": "Ora Europei de Est (Tripoli)", - "Africa\/Tunis": "Ora Europei Centrale (Tunis)", - "Africa\/Windhoek": "Ora Africii Centrale (Windhoek)", - "America\/Adak": "Ora din Hawaii-Aleutine (Adak)", - "America\/Anchorage": "Ora din Alaska (Anchorage)", - "America\/Anguilla": "Ora zonei Atlantic nord-americane (Anguilla)", - "America\/Antigua": "Ora zonei Atlantic nord-americane (Antigua)", - "America\/Araguaina": "Ora Brasiliei (Araguaina)", - "America\/Argentina\/La_Rioja": "Ora Argentinei (La Rioja)", - "America\/Argentina\/Rio_Gallegos": "Ora Argentinei (Rio Gallegos)", - "America\/Argentina\/Salta": "Ora Argentinei (Salta)", - "America\/Argentina\/San_Juan": "Ora Argentinei (San Juan)", - "America\/Argentina\/San_Luis": "Ora Argentinei Occidentale (San Luis)", - "America\/Argentina\/Tucuman": "Ora Argentinei (Tucuman)", - "America\/Argentina\/Ushuaia": "Ora Argentinei (Ushuaia)", - "America\/Aruba": "Ora zonei Atlantic nord-americane (Aruba)", - "America\/Asuncion": "Ora din Paraguay (Asunción)", - "America\/Bahia": "Ora Brasiliei (Bahia)", - "America\/Bahia_Banderas": "Ora centrală nord-americană (Bahia Banderas)", - "America\/Barbados": "Ora zonei Atlantic nord-americane (Barbados)", - "America\/Belem": "Ora Brasiliei (Belem)", - "America\/Belize": "Ora centrală nord-americană (Belize)", - "America\/Blanc-Sablon": "Ora zonei Atlantic nord-americane (Blanc-Sablon)", - "America\/Boa_Vista": "Ora Amazonului (Boa Vista)", - "America\/Bogota": "Ora Columbiei (Bogota)", - "America\/Boise": "Ora zonei montane nord-americane (Boise)", - "America\/Buenos_Aires": "Ora Argentinei (Buenos Aires)", - "America\/Cambridge_Bay": "Ora zonei montane nord-americane (Cambridge Bay)", - "America\/Campo_Grande": "Ora Amazonului (Campo Grande)", - "America\/Cancun": "Ora orientală nord-americană (Cancun)", - "America\/Caracas": "Ora Venezuelei (Caracas)", - "America\/Catamarca": "Ora Argentinei (Catamarca)", - "America\/Cayenne": "Ora din Guyana Franceză (Cayenne)", - "America\/Cayman": "Ora orientală nord-americană (Cayman)", - "America\/Chicago": "Ora centrală nord-americană (Chicago)", - "America\/Chihuahua": "Ora zonei Pacific mexicane (Chihuahua)", - "America\/Coral_Harbour": "Ora orientală nord-americană (Atikokan)", - "America\/Cordoba": "Ora Argentinei (Cordoba)", - "America\/Costa_Rica": "Ora centrală nord-americană (Costa Rica)", - "America\/Creston": "Ora zonei montane nord-americane (Creston)", - "America\/Cuiaba": "Ora Amazonului (Cuiaba)", - "America\/Curacao": "Ora zonei Atlantic nord-americane (Curaçao)", - "America\/Danmarkshavn": "Ora de Greenwhich (Danmarkshavn)", - "America\/Dawson": "Ora zonei Pacific nord-americane (Dawson)", - "America\/Dawson_Creek": "Ora zonei montane nord-americane (Dawson Creek)", - "America\/Denver": "Ora zonei montane nord-americane (Denver)", - "America\/Detroit": "Ora orientală nord-americană (Detroit)", - "America\/Dominica": "Ora zonei Atlantic nord-americane (Dominica)", - "America\/Edmonton": "Ora zonei montane nord-americane (Edmonton)", - "America\/Eirunepe": "Ora Acre (Eirunepe)", - "America\/El_Salvador": "Ora centrală nord-americană (El Salvador)", - "America\/Fort_Nelson": "Ora zonei montane nord-americane (Fort Nelson)", - "America\/Fortaleza": "Ora Brasiliei (Fortaleza)", - "America\/Glace_Bay": "Ora zonei Atlantic nord-americane (Glace Bay)", - "America\/Godthab": "Ora Groenlandei occidentale (Nuuk)", - "America\/Goose_Bay": "Ora zonei Atlantic nord-americane (Goose Bay)", - "America\/Grand_Turk": "Ora orientală nord-americană (Grand Turk)", - "America\/Grenada": "Ora zonei Atlantic nord-americane (Grenada)", - "America\/Guadeloupe": "Ora zonei Atlantic nord-americane (Guadelupa)", - "America\/Guatemala": "Ora centrală nord-americană (Guatemala)", - "America\/Guayaquil": "Ora Ecuadorului (Guayaquil)", - "America\/Guyana": "Ora din Guyana", - "America\/Halifax": "Ora zonei Atlantic nord-americane (Halifax)", - "America\/Havana": "Ora Cubei (Havana)", - "America\/Hermosillo": "Ora zonei Pacific mexicane (Hermosillo)", - "America\/Indiana\/Knox": "Ora centrală nord-americană (Knox, Indiana)", - "America\/Indiana\/Marengo": "Ora orientală nord-americană (Marengo, Indiana)", - "America\/Indiana\/Petersburg": "Ora orientală nord-americană (Petersburg, Indiana)", - "America\/Indiana\/Tell_City": "Ora centrală nord-americană (Tell City, Indiana)", - "America\/Indiana\/Vevay": "Ora orientală nord-americană (Vevay, Indiana)", - "America\/Indiana\/Vincennes": "Ora orientală nord-americană (Vincennes, Indiana)", - "America\/Indiana\/Winamac": "Ora orientală nord-americană (Winamac, Indiana)", - "America\/Indianapolis": "Ora orientală nord-americană (Indianapolis)", - "America\/Inuvik": "Ora zonei montane nord-americane (Inuvik)", - "America\/Iqaluit": "Ora orientală nord-americană (Iqaluit)", - "America\/Jamaica": "Ora orientală nord-americană (Jamaica)", - "America\/Jujuy": "Ora Argentinei (Jujuy)", - "America\/Juneau": "Ora din Alaska (Juneau)", - "America\/Kentucky\/Monticello": "Ora orientală nord-americană (Monticello, Kentucky)", - "America\/Kralendijk": "Ora zonei Atlantic nord-americane (Kralendijk)", - "America\/La_Paz": "Ora Boliviei (La Paz)", - "America\/Lima": "Ora din Peru (Lima)", - "America\/Los_Angeles": "Ora zonei Pacific nord-americane (Los Angeles)", - "America\/Louisville": "Ora orientală nord-americană (Louisville)", - "America\/Lower_Princes": "Ora zonei Atlantic nord-americane (Lower Prince’s Quarter)", - "America\/Maceio": "Ora Brasiliei (Maceio)", - "America\/Managua": "Ora centrală nord-americană (Managua)", - "America\/Manaus": "Ora Amazonului (Manaus)", - "America\/Marigot": "Ora zonei Atlantic nord-americane (Marigot)", - "America\/Martinique": "Ora zonei Atlantic nord-americane (Martinica)", - "America\/Matamoros": "Ora centrală nord-americană (Matamoros)", - "America\/Mazatlan": "Ora zonei Pacific mexicane (Mazatlan)", - "America\/Mendoza": "Ora Argentinei (Mendoza)", - "America\/Menominee": "Ora centrală nord-americană (Menominee)", - "America\/Merida": "Ora centrală nord-americană (Merida)", - "America\/Metlakatla": "Ora din Alaska (Metlakatla)", - "America\/Mexico_City": "Ora centrală nord-americană (Ciudad de Mexico)", - "America\/Miquelon": "Ora din Saint-Pierre și Miquelon", - "America\/Moncton": "Ora zonei Atlantic nord-americane (Moncton)", - "America\/Monterrey": "Ora centrală nord-americană (Monterrey)", - "America\/Montevideo": "Ora Uruguayului (Montevideo)", - "America\/Montreal": "Canada (Montreal)", - "America\/Montserrat": "Ora zonei Atlantic nord-americane (Montserrat)", - "America\/Nassau": "Ora orientală nord-americană (Nassau)", - "America\/New_York": "Ora orientală nord-americană (New York)", - "America\/Nipigon": "Ora orientală nord-americană (Nipigon)", - "America\/Nome": "Ora din Alaska (Nome)", - "America\/Noronha": "Ora din Fernando de Noronha", - "America\/North_Dakota\/Beulah": "Ora centrală nord-americană (Beulah, Dakota de Nord)", - "America\/North_Dakota\/Center": "Ora centrală nord-americană (Center, Dakota de Nord)", - "America\/North_Dakota\/New_Salem": "Ora centrală nord-americană (New Salem, Dakota de Nord)", - "America\/Ojinaga": "Ora zonei montane nord-americane (Ojinaga)", - "America\/Panama": "Ora orientală nord-americană (Panama)", - "America\/Pangnirtung": "Ora orientală nord-americană (Pangnirtung)", - "America\/Paramaribo": "Ora Surinamului (Paramaribo)", - "America\/Phoenix": "Ora zonei montane nord-americane (Phoenix)", - "America\/Port-au-Prince": "Ora orientală nord-americană (Port-au-Prince)", - "America\/Port_of_Spain": "Ora zonei Atlantic nord-americane (Port of Spain)", - "America\/Porto_Velho": "Ora Amazonului (Porto Velho)", - "America\/Puerto_Rico": "Ora zonei Atlantic nord-americane (Puerto Rico)", - "America\/Punta_Arenas": "Ora din Chile (Punta Arenas)", - "America\/Rainy_River": "Ora centrală nord-americană (Rainy River)", - "America\/Rankin_Inlet": "Ora centrală nord-americană (Rankin Inlet)", - "America\/Recife": "Ora Brasiliei (Recife)", - "America\/Regina": "Ora centrală nord-americană (Regina)", - "America\/Resolute": "Ora centrală nord-americană (Resolute)", - "America\/Rio_Branco": "Ora Acre (Rio Branco)", - "America\/Santa_Isabel": "Ora Mexicului de nord-vest (Santa Isabel)", - "America\/Santarem": "Ora Brasiliei (Santarem)", - "America\/Santiago": "Ora din Chile (Santiago)", - "America\/Santo_Domingo": "Ora zonei Atlantic nord-americane (Santo Domingo)", - "America\/Sao_Paulo": "Ora Brasiliei (Sao Paulo)", - "America\/Scoresbysund": "Ora Groenlandei orientale (Ittoqqortoormiit)", - "America\/Sitka": "Ora din Alaska (Sitka)", - "America\/St_Barthelemy": "Ora zonei Atlantic nord-americane (Saint Barthélemy)", - "America\/St_Johns": "Ora din Newfoundland (St. John’s)", - "America\/St_Kitts": "Ora zonei Atlantic nord-americane (St. Kitts)", - "America\/St_Lucia": "Ora zonei Atlantic nord-americane (St. Lucia)", - "America\/St_Thomas": "Ora zonei Atlantic nord-americane (St. Thomas)", - "America\/St_Vincent": "Ora zonei Atlantic nord-americane (St. Vincent)", - "America\/Swift_Current": "Ora centrală nord-americană (Swift Current)", - "America\/Tegucigalpa": "Ora centrală nord-americană (Tegucigalpa)", - "America\/Thule": "Ora zonei Atlantic nord-americane (Thule)", - "America\/Thunder_Bay": "Ora orientală nord-americană (Thunder Bay)", - "America\/Tijuana": "Ora zonei Pacific nord-americane (Tijuana)", - "America\/Toronto": "Ora orientală nord-americană (Toronto)", - "America\/Tortola": "Ora zonei Atlantic nord-americane (Tortola)", - "America\/Vancouver": "Ora zonei Pacific nord-americane (Vancouver)", - "America\/Whitehorse": "Ora zonei Pacific nord-americane (Whitehorse)", - "America\/Winnipeg": "Ora centrală nord-americană (Winnipeg)", - "America\/Yakutat": "Ora din Alaska (Yakutat)", - "America\/Yellowknife": "Ora zonei montane nord-americane (Yellowknife)", - "Antarctica\/Casey": "Ora Australiei Occidentale (Casey)", - "Antarctica\/Davis": "Ora din Davis", - "Antarctica\/DumontDUrville": "Ora din Dumont-d’Urville", - "Antarctica\/Macquarie": "Ora din Macquarie", - "Antarctica\/Mawson": "Ora din Mawson", - "Antarctica\/McMurdo": "Ora Noii Zeelande (McMurdo)", - "Antarctica\/Palmer": "Ora din Chile (Palmer)", - "Antarctica\/Rothera": "Ora din Rothera", - "Antarctica\/Syowa": "Ora din Syowa (Showa)", - "Antarctica\/Troll": "Ora de Greenwhich (Troll)", - "Antarctica\/Vostok": "Ora din Vostok", - "Arctic\/Longyearbyen": "Ora Europei Centrale (Longyearbyen)", - "Asia\/Aden": "Ora arabă (Aden)", - "Asia\/Almaty": "Ora din Kazahstanul de Est (Almatî)", - "Asia\/Amman": "Ora Europei de Est (Amman)", - "Asia\/Anadyr": "Ora din Anadyr (Anadir)", - "Asia\/Aqtau": "Ora din Kazahstanul de Vest (Aktau)", - "Asia\/Aqtobe": "Ora din Kazahstanul de Vest (Aktobe)", - "Asia\/Ashgabat": "Ora din Turkmenistan (Așgabat)", - "Asia\/Atyrau": "Ora din Kazahstanul de Vest (Atîrau)", - "Asia\/Baghdad": "Ora arabă (Bagdad)", - "Asia\/Bahrain": "Ora arabă (Bahrain)", - "Asia\/Baku": "Ora Azerbaidjanului (Baku)", - "Asia\/Bangkok": "Ora Indochinei (Bangkok)", - "Asia\/Barnaul": "Rusia (Barnaul)", - "Asia\/Beirut": "Ora Europei de Est (Beirut)", - "Asia\/Bishkek": "Ora din Kârgâzstan (Bișkek)", - "Asia\/Brunei": "Ora din Brunei Darussalam", - "Asia\/Calcutta": "Ora Indiei (Calcutta)", - "Asia\/Chita": "Ora din Iakuțk (Cita)", - "Asia\/Choibalsan": "Ora din Choibalsan", - "Asia\/Colombo": "Ora Indiei (Colombo)", - "Asia\/Damascus": "Ora Europei de Est (Damasc)", - "Asia\/Dhaka": "Ora din Bangladesh (Dacca)", - "Asia\/Dili": "Ora Timorului de Est (Dili)", - "Asia\/Dubai": "Ora standard a Golfului (Dubai)", - "Asia\/Dushanbe": "Ora din Tadjikistan (Dușanbe)", - "Asia\/Famagusta": "Ora Europei de Est (Famagusta)", - "Asia\/Gaza": "Ora Europei de Est (Gaza)", - "Asia\/Hebron": "Ora Europei de Est (Hebron)", - "Asia\/Hong_Kong": "Ora din Hong Kong", - "Asia\/Hovd": "Ora din Hovd", - "Asia\/Irkutsk": "Ora din Irkuțk", - "Asia\/Jakarta": "Ora Indoneziei de Vest (Jakarta)", - "Asia\/Jayapura": "Ora Indoneziei de Est (Jayapura)", - "Asia\/Jerusalem": "Ora Israelului (Ierusalim)", - "Asia\/Kabul": "Ora Afganistanului (Kabul)", - "Asia\/Kamchatka": "Ora din Petropavlovsk-Kamciațki (Kamciatka)", - "Asia\/Karachi": "Ora Pakistanului (Karachi)", - "Asia\/Katmandu": "Ora Nepalului (Kathmandu)", - "Asia\/Khandyga": "Ora din Iakuțk (Khandyga)", - "Asia\/Krasnoyarsk": "Ora din Krasnoiarsk", - "Asia\/Kuala_Lumpur": "Ora din Malaysia (Kuala Lumpur)", - "Asia\/Kuching": "Ora din Malaysia (Kuching)", - "Asia\/Kuwait": "Ora arabă (Kuweit)", - "Asia\/Macau": "Ora Chinei (Macao)", - "Asia\/Magadan": "Ora din Magadan", - "Asia\/Makassar": "Ora Indoneziei Centrale (Makassar)", - "Asia\/Manila": "Ora din Filipine (Manila)", - "Asia\/Muscat": "Ora standard a Golfului (Muscat)", - "Asia\/Nicosia": "Ora Europei de Est (Nicosia)", - "Asia\/Novokuznetsk": "Ora din Krasnoiarsk (Novokuznețk)", - "Asia\/Novosibirsk": "Ora din Novosibirsk", - "Asia\/Omsk": "Ora din Omsk", - "Asia\/Oral": "Ora din Kazahstanul de Vest (Uralsk)", - "Asia\/Phnom_Penh": "Ora Indochinei (Phnom Penh)", - "Asia\/Pontianak": "Ora Indoneziei de Vest (Pontianak)", - "Asia\/Pyongyang": "Ora Coreei (Phenian)", - "Asia\/Qatar": "Ora arabă (Qatar)", - "Asia\/Qostanay": "Ora din Kazahstanul de Est (Kostanay)", - "Asia\/Qyzylorda": "Ora din Kazahstanul de Vest (Kyzylorda)", - "Asia\/Rangoon": "Ora Myanmarului (Yangon)", - "Asia\/Riyadh": "Ora arabă (Riad)", - "Asia\/Saigon": "Ora Indochinei (Ho Și Min)", - "Asia\/Sakhalin": "Ora din Sahalin", - "Asia\/Samarkand": "Ora din Uzbekistan (Samarkand)", - "Asia\/Seoul": "Ora Coreei (Seoul)", - "Asia\/Shanghai": "Ora Chinei (Shanghai)", - "Asia\/Singapore": "Ora din Singapore", - "Asia\/Srednekolymsk": "Ora din Magadan (Srednekolimsk)", - "Asia\/Taipei": "Ora din Taipei", - "Asia\/Tashkent": "Ora din Uzbekistan (Tașkent)", - "Asia\/Tbilisi": "Ora Georgiei (Tbilisi)", - "Asia\/Tehran": "Ora Iranului (Teheran)", - "Asia\/Thimphu": "Ora Bhutanului (Thimphu)", - "Asia\/Tokyo": "Ora Japoniei (Tokyo)", - "Asia\/Tomsk": "Rusia (Tomsk)", - "Asia\/Ulaanbaatar": "Ora din Ulan Bator", - "Asia\/Urumqi": "China (Urumqi)", - "Asia\/Ust-Nera": "Ora din Vladivostok (Ust-Nera)", - "Asia\/Vientiane": "Ora Indochinei (Vientiane)", - "Asia\/Vladivostok": "Ora din Vladivostok", - "Asia\/Yakutsk": "Ora din Iakuțk", - "Asia\/Yekaterinburg": "Ora din Ekaterinburg", - "Asia\/Yerevan": "Ora Armeniei (Erevan)", - "Atlantic\/Azores": "Ora din Azore", - "Atlantic\/Bermuda": "Ora zonei Atlantic nord-americane (Bermuda)", - "Atlantic\/Canary": "Ora Europei de Vest (Canare)", - "Atlantic\/Cape_Verde": "Ora din Capul Verde", - "Atlantic\/Faeroe": "Ora Europei de Vest (Faroe)", - "Atlantic\/Madeira": "Ora Europei de Vest (Madeira)", - "Atlantic\/Reykjavik": "Ora de Greenwhich (Reykjavik)", - "Atlantic\/South_Georgia": "Ora Georgiei de Sud (Georgia de Sud)", - "Atlantic\/St_Helena": "Ora de Greenwhich (Sf. Elena)", - "Atlantic\/Stanley": "Ora din Insulele Falkland (Stanley)", - "Australia\/Adelaide": "Ora Australiei Centrale (Adelaide)", - "Australia\/Brisbane": "Ora Australiei Orientale (Brisbane)", - "Australia\/Broken_Hill": "Ora Australiei Centrale (Broken Hill)", - "Australia\/Currie": "Ora Australiei Orientale (Currie)", - "Australia\/Darwin": "Ora Australiei Centrale (Darwin)", - "Australia\/Eucla": "Ora Australiei Central Occidentale (Eucla)", - "Australia\/Hobart": "Ora Australiei Orientale (Hobart)", - "Australia\/Lindeman": "Ora Australiei Orientale (Lindeman)", - "Australia\/Lord_Howe": "Ora din Lord Howe", - "Australia\/Melbourne": "Ora Australiei Orientale (Melbourne)", - "Australia\/Perth": "Ora Australiei Occidentale (Perth)", - "Australia\/Sydney": "Ora Australiei Orientale (Sydney)", - "CST6CDT": "Ora centrală nord-americană", - "EST5EDT": "Ora orientală nord-americană", - "Etc\/GMT": "Ora de Greenwhich", - "Etc\/UTC": "Timpul universal coordonat", - "Europe\/Amsterdam": "Ora Europei Centrale (Amsterdam)", - "Europe\/Andorra": "Ora Europei Centrale (Andorra)", - "Europe\/Astrakhan": "Ora Moscovei (Astrahan)", - "Europe\/Athens": "Ora Europei de Est (Atena)", - "Europe\/Belgrade": "Ora Europei Centrale (Belgrad)", - "Europe\/Berlin": "Ora Europei Centrale (Berlin)", - "Europe\/Bratislava": "Ora Europei Centrale (Bratislava)", - "Europe\/Brussels": "Ora Europei Centrale (Bruxelles)", - "Europe\/Bucharest": "Ora Europei de Est (București)", - "Europe\/Budapest": "Ora Europei Centrale (Budapesta)", - "Europe\/Busingen": "Ora Europei Centrale (Busingen)", - "Europe\/Chisinau": "Ora Europei de Est (Chișinău)", - "Europe\/Copenhagen": "Ora Europei Centrale (Copenhaga)", - "Europe\/Dublin": "Ora de Greenwhich (Dublin)", - "Europe\/Gibraltar": "Ora Europei Centrale (Gibraltar)", - "Europe\/Guernsey": "Ora de Greenwhich (Guernsey)", - "Europe\/Helsinki": "Ora Europei de Est (Helsinki)", - "Europe\/Isle_of_Man": "Ora de Greenwhich (Insula Man)", - "Europe\/Istanbul": "Turcia (Istanbul)", - "Europe\/Jersey": "Ora de Greenwhich (Jersey)", - "Europe\/Kaliningrad": "Ora Europei de Est (Kaliningrad)", - "Europe\/Kiev": "Ora Europei de Est (Kiev)", - "Europe\/Kirov": "Rusia (Kirov)", - "Europe\/Lisbon": "Ora Europei de Vest (Lisabona)", - "Europe\/Ljubljana": "Ora Europei Centrale (Ljubljana)", - "Europe\/London": "Ora de Greenwhich (Londra)", - "Europe\/Luxembourg": "Ora Europei Centrale (Luxemburg)", - "Europe\/Madrid": "Ora Europei Centrale (Madrid)", - "Europe\/Malta": "Ora Europei Centrale (Malta)", - "Europe\/Mariehamn": "Ora Europei de Est (Mariehamn)", - "Europe\/Minsk": "Ora Moscovei (Minsk)", - "Europe\/Monaco": "Ora Europei Centrale (Monaco)", - "Europe\/Moscow": "Ora Moscovei (Moscova)", - "Europe\/Oslo": "Ora Europei Centrale (Oslo)", - "Europe\/Paris": "Ora Europei Centrale (Paris)", - "Europe\/Podgorica": "Ora Europei Centrale (Podgorica)", - "Europe\/Prague": "Ora Europei Centrale (Praga)", - "Europe\/Riga": "Ora Europei de Est (Riga)", - "Europe\/Rome": "Ora Europei Centrale (Roma)", - "Europe\/Samara": "Ora din Samara", - "Europe\/San_Marino": "Ora Europei Centrale (San Marino)", - "Europe\/Sarajevo": "Ora Europei Centrale (Sarajevo)", - "Europe\/Saratov": "Ora Moscovei (Saratov)", - "Europe\/Simferopol": "Ora Moscovei (Simferopol)", - "Europe\/Skopje": "Ora Europei Centrale (Skopje)", - "Europe\/Sofia": "Ora Europei de Est (Sofia)", - "Europe\/Stockholm": "Ora Europei Centrale (Stockholm)", - "Europe\/Tallinn": "Ora Europei de Est (Tallinn)", - "Europe\/Tirane": "Ora Europei Centrale (Tirana)", - "Europe\/Ulyanovsk": "Ora Moscovei (Ulianovsk)", - "Europe\/Uzhgorod": "Ora Europei de Est (Ujhorod)", - "Europe\/Vaduz": "Ora Europei Centrale (Vaduz)", - "Europe\/Vatican": "Ora Europei Centrale (Vatican)", - "Europe\/Vienna": "Ora Europei Centrale (Viena)", - "Europe\/Vilnius": "Ora Europei de Est (Vilnius)", - "Europe\/Volgograd": "Ora din Volgograd", - "Europe\/Warsaw": "Ora Europei Centrale (Varșovia)", - "Europe\/Zagreb": "Ora Europei Centrale (Zagreb)", - "Europe\/Zaporozhye": "Ora Europei de Est (Zaporoje)", - "Europe\/Zurich": "Ora Europei Centrale (Zürich)", - "Indian\/Antananarivo": "Ora Africii Orientale (Antananarivo)", - "Indian\/Chagos": "Ora Oceanului Indian (Chagos)", - "Indian\/Christmas": "Ora din Insula Christmas", - "Indian\/Cocos": "Ora Insulelor Cocos", - "Indian\/Comoro": "Ora Africii Orientale (Comore)", - "Indian\/Kerguelen": "Ora din Teritoriile Australe și Antarctice Franceze (Kerguelen)", - "Indian\/Mahe": "Ora din Seychelles (Mahe)", - "Indian\/Maldives": "Ora din Maldive", - "Indian\/Mauritius": "Ora din Mauritius", - "Indian\/Mayotte": "Ora Africii Orientale (Mayotte)", - "Indian\/Reunion": "Ora din Reunion (Réunion)", - "MST7MDT": "Ora zonei montane nord-americane", - "PST8PDT": "Ora zonei Pacific nord-americane", - "Pacific\/Apia": "Ora din Apia", - "Pacific\/Auckland": "Ora Noii Zeelande (Auckland)", - "Pacific\/Bougainville": "Ora din Papua Noua Guinee (Bougainville)", - "Pacific\/Chatham": "Ora din Chatham", - "Pacific\/Easter": "Ora din Insula Paștelui", - "Pacific\/Efate": "Ora din Vanuatu (Efate)", - "Pacific\/Enderbury": "Ora Insulelor Phoenix (Enderbury)", - "Pacific\/Fakaofo": "Ora din Tokelau (Fakaofo)", - "Pacific\/Fiji": "Ora din Fiji", - "Pacific\/Funafuti": "Ora din Tuvalu (Funafuti)", - "Pacific\/Galapagos": "Ora din Galapagos", - "Pacific\/Gambier": "Ora din Gambier", - "Pacific\/Guadalcanal": "Ora Insulelor Solomon (Guadalcanal)", - "Pacific\/Guam": "Ora din Chamorro (Guam)", - "Pacific\/Honolulu": "Ora din Hawaii-Aleutine (Honolulu)", - "Pacific\/Johnston": "Ora din Hawaii-Aleutine (Johnston)", - "Pacific\/Kiritimati": "Ora din Insulele Line (Kiritimati)", - "Pacific\/Kosrae": "Ora din Kosrae", - "Pacific\/Kwajalein": "Ora Insulelor Marshall (Kwajalein)", - "Pacific\/Majuro": "Ora Insulelor Marshall (Majuro)", - "Pacific\/Marquesas": "Ora Insulelor Marchize", - "Pacific\/Midway": "Ora din Samoa (Midway)", - "Pacific\/Nauru": "Ora din Nauru", - "Pacific\/Niue": "Ora din Niue", - "Pacific\/Norfolk": "Ora Insulelor Norfolk", - "Pacific\/Noumea": "Ora Noii Caledonii (Noumea)", - "Pacific\/Pago_Pago": "Ora din Samoa (Pago Pago)", - "Pacific\/Palau": "Ora din Palau", - "Pacific\/Pitcairn": "Ora din Pitcairn (Insula Pitcairn)", - "Pacific\/Ponape": "Ora din Ponape (Pohnpei)", - "Pacific\/Port_Moresby": "Ora din Papua Noua Guinee (Port Moresby)", - "Pacific\/Rarotonga": "Ora Insulelor Cook (Rarotonga)", - "Pacific\/Saipan": "Ora din Chamorro (Saipan)", - "Pacific\/Tahiti": "Ora din Tahiti", - "Pacific\/Tarawa": "Ora Insulelor Gilbert (Tarawa)", - "Pacific\/Tongatapu": "Ora din Tonga (Tongatapu)", - "Pacific\/Truk": "Ora din Chuuk", - "Pacific\/Wake": "Ora Insulei Wake", - "Pacific\/Wallis": "Ora din Wallis și Futuna" - }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } -} diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/mr.json b/src/Symfony/Component/Intl/Resources/data/timezones/mr.json index bf743019b7367..8bbbc56ed01fe 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/mr.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/mr.json @@ -151,7 +151,7 @@ "America\/Moncton": "अटलांटिक वेळ (माँकटन)", "America\/Monterrey": "केंद्रीय वेळ (मॉन्टेरे)", "America\/Montevideo": "उरुग्वे वेळ (मोन्टेव्हिडियो)", - "America\/Montreal": "कॅनडा (Montreal)", + "America\/Montreal": "कॅनडा वेळ (Montreal)", "America\/Montserrat": "अटलांटिक वेळ (माँन्टसेरात)", "America\/Nassau": "पौर्वात्य वेळ (नसाऊ)", "America\/New_York": "पौर्वात्य वेळ (न्यूयॉर्क)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "अरेबियन वेळ (बेहरीन)", "Asia\/Baku": "अझरबैजान वेळ (बाकु)", "Asia\/Bangkok": "इंडोचायना वेळ (बँकॉक)", - "Asia\/Barnaul": "रशिया (बर्नौल)", + "Asia\/Barnaul": "रशिया वेळ (बर्नौल)", "Asia\/Beirut": "पूर्व युरोपियन वेळ (बैरुत)", "Asia\/Bishkek": "किरगिस्तान वेळ (बिश्केक)", "Asia\/Brunei": "ब्रुनेई दारूसलाम वेळ", @@ -288,9 +288,9 @@ "Asia\/Tehran": "इराण वेळ (तेहरान)", "Asia\/Thimphu": "भूतान वेळ (थिंफू)", "Asia\/Tokyo": "जपान वेळ (टोकियो)", - "Asia\/Tomsk": "रशिया (तोमसक)", + "Asia\/Tomsk": "रशिया वेळ (तोमसक)", "Asia\/Ulaanbaatar": "उलान बाटोर वेळ (उलानबातर)", - "Asia\/Urumqi": "चीन (उरुम्की)", + "Asia\/Urumqi": "चीन वेळ (उरुम्की)", "Asia\/Ust-Nera": "व्लादिवोस्तोक वेळ (उस्त-नेरा)", "Asia\/Vientiane": "इंडोचायना वेळ (व्हिएन्टाइन)", "Asia\/Vladivostok": "व्लादिवोस्तोक वेळ (व्लादिवोस्टोक)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "ग्रीनिच प्रमाण वेळ (ग्वेर्नसे)", "Europe\/Helsinki": "पूर्व युरोपियन वेळ (हेलसिंकी)", "Europe\/Isle_of_Man": "ग्रीनिच प्रमाण वेळ (आइल ऑफ मॅन)", - "Europe\/Istanbul": "तुर्की (इस्तंबूल)", + "Europe\/Istanbul": "तुर्की वेळ (इस्तंबूल)", "Europe\/Jersey": "ग्रीनिच प्रमाण वेळ (जर्सी)", "Europe\/Kaliningrad": "पूर्व युरोपियन वेळ (कलिनिनग्राड)", "Europe\/Kiev": "पूर्व युरोपियन वेळ (कीव)", - "Europe\/Kirov": "रशिया (किरोव)", + "Europe\/Kirov": "रशिया वेळ (किरोव)", "Europe\/Lisbon": "पश्चिम युरोपियन वेळ (लिस्बन)", "Europe\/Ljubljana": "मध्‍य युरोपियन वेळ (लुब्लियाना)", "Europe\/London": "ग्रीनिच प्रमाण वेळ (लंडन)", @@ -437,10 +437,6 @@ "Pacific\/Wallis": "वॉलिस आणि फुटुना वेळ (वालिस)" }, "Meta": { - "GmtFormat": "[GMT]%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] + "GmtFormat": "[GMT]%s" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ms.json b/src/Symfony/Component/Intl/Resources/data/timezones/ms.json index 78f6637950aeb..6fdb25f12b5db 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ms.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ms.json @@ -99,7 +99,7 @@ "America\/Detroit": "Waktu Timur (Detroit)", "America\/Dominica": "Waktu Atlantik (Dominica)", "America\/Edmonton": "Waktu Pergunungan (Edmonton)", - "America\/Eirunepe": "Brazil (Eirunepe)", + "America\/Eirunepe": "Waktu Brazil (Eirunepe)", "America\/El_Salvador": "Waktu Pusat (El Salvador)", "America\/Fort_Nelson": "Waktu Pergunungan (Fort Nelson)", "America\/Fortaleza": "Waktu Brasilia (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Waktu Atlantik (Moncton)", "America\/Monterrey": "Waktu Pusat (Monterrey)", "America\/Montevideo": "Waktu Uruguay (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Waktu Kanada (Montreal)", "America\/Montserrat": "Waktu Atlantik (Montserrat)", "America\/Nassau": "Waktu Timur (Nassau)", "America\/New_York": "Waktu Timur (New York)", @@ -176,7 +176,7 @@ "America\/Recife": "Waktu Brasilia (Recife)", "America\/Regina": "Waktu Pusat (Regina)", "America\/Resolute": "Waktu Pusat (Resolute)", - "America\/Rio_Branco": "Brazil (Rio Branco)", + "America\/Rio_Branco": "Waktu Brazil (Rio Branco)", "America\/Santa_Isabel": "Waktu Barat Laut Mexico (Santa Isabel)", "America\/Santarem": "Waktu Brasilia (Santarem)", "America\/Santiago": "Waktu Chile (Santiago)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Waktu Arab (Bahrain)", "Asia\/Baku": "Waktu Azerbaijan (Baku)", "Asia\/Bangkok": "Waktu Indochina (Bangkok)", - "Asia\/Barnaul": "Rusia (Barnaul)", + "Asia\/Barnaul": "Waktu Rusia (Barnaul)", "Asia\/Beirut": "Waktu Eropah Timur (Beirut)", "Asia\/Bishkek": "Waktu Kyrgystan (Bishkek)", "Asia\/Brunei": "Waktu Brunei Darussalam", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Waktu Iran (Tehran)", "Asia\/Thimphu": "Waktu Bhutan (Thimphu)", "Asia\/Tokyo": "Waktu Jepun (Tokyo)", - "Asia\/Tomsk": "Rusia (Tomsk)", + "Asia\/Tomsk": "Waktu Rusia (Tomsk)", "Asia\/Ulaanbaatar": "Waktu Ulan Bator (Ulaanbaatar)", - "Asia\/Urumqi": "China (Urumqi)", + "Asia\/Urumqi": "Waktu China (Urumqi)", "Asia\/Ust-Nera": "Waktu Vladivostok (Ust-Nera)", "Asia\/Vientiane": "Waktu Indochina (Vientiane)", "Asia\/Vladivostok": "Waktu Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Waktu Min Greenwich (Guernsey)", "Europe\/Helsinki": "Waktu Eropah Timur (Helsinki)", "Europe\/Isle_of_Man": "Waktu Min Greenwich (Isle of Man)", - "Europe\/Istanbul": "Turki (Istanbul)", + "Europe\/Istanbul": "Waktu Turki (Istanbul)", "Europe\/Jersey": "Waktu Min Greenwich (Jersey)", "Europe\/Kaliningrad": "Waktu Eropah Timur (Kaliningrad)", "Europe\/Kiev": "Waktu Eropah Timur (Kiev)", - "Europe\/Kirov": "Rusia (Kirov)", + "Europe\/Kirov": "Waktu Rusia (Kirov)", "Europe\/Lisbon": "Waktu Eropah Barat (Lisbon)", "Europe\/Ljubljana": "Waktu Eropah Tengah (Ljubljana)", "Europe\/London": "Waktu Min Greenwich (London)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Waktu Pulau Wake", "Pacific\/Wallis": "Waktu Wallis dan Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/mt.json b/src/Symfony/Component/Intl/Resources/data/timezones/mt.json index 5ea0e7cffa431..b9f1486e4e8ec 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/mt.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/mt.json @@ -1,446 +1,434 @@ { "Version": "2.1.49.82", "Names": { - "Africa\/Abidjan": "il-Kosta tal-Avorju (Abidjan)", - "Africa\/Accra": "il-Ghana (Accra)", - "Africa\/Addis_Ababa": "l-Etjopja (Addis Ababa)", + "Africa\/Abidjan": "Ħin ta’ il-Kosta tal-Avorju (Abidjan)", + "Africa\/Accra": "Ħin ta’ il-Ghana (Accra)", + "Africa\/Addis_Ababa": "Ħin ta’ l-Etjopja (Addis Ababa)", "Africa\/Algiers": "Ħin Ċentrali Ewropew (l-Alġier)", - "Africa\/Asmera": "l-Eritrea (Asmara)", - "Africa\/Bamako": "il-Mali (Bamako)", - "Africa\/Bangui": "ir-Repubblika Ċentru-Afrikana (Bangui)", - "Africa\/Banjul": "il-Gambja (Banjul)", - "Africa\/Bissau": "il-Guinea-Bissau (Bissau)", - "Africa\/Blantyre": "il-Malawi (Blantyre)", - "Africa\/Brazzaville": "il-Kongo - Brazzaville (Brazzaville)", - "Africa\/Bujumbura": "il-Burundi (Bujumbura)", - "Africa\/Cairo": "l-Eġittu (Cairo)", - "Africa\/Casablanca": "il-Marokk (Casablanca)", + "Africa\/Asmera": "Ħin ta’ l-Eritrea (Asmara)", + "Africa\/Bamako": "Ħin ta’ il-Mali (Bamako)", + "Africa\/Bangui": "Ħin ta’ ir-Repubblika Ċentru-Afrikana (Bangui)", + "Africa\/Banjul": "Ħin ta’ il-Gambja (Banjul)", + "Africa\/Bissau": "Ħin ta’ il-Guinea-Bissau (Bissau)", + "Africa\/Blantyre": "Ħin ta’ il-Malawi (Blantyre)", + "Africa\/Brazzaville": "Ħin ta’ il-Kongo - Brazzaville (Brazzaville)", + "Africa\/Bujumbura": "Ħin ta’ il-Burundi (Bujumbura)", + "Africa\/Cairo": "Ħin ta’ l-Eġittu (Cairo)", + "Africa\/Casablanca": "Ħin ta’ il-Marokk (Casablanca)", "Africa\/Ceuta": "Ħin Ċentrali Ewropew (Ceuta)", - "Africa\/Conakry": "il-Guinea (Conakry)", - "Africa\/Dakar": "is-Senegal (Dakar)", - "Africa\/Dar_es_Salaam": "it-Tanzanija (Dar es Salaam)", - "Africa\/Djibouti": "il-Djibouti (Djibouti)", - "Africa\/Douala": "il-Kamerun (Douala)", - "Africa\/El_Aaiun": "is-Saħara tal-Punent (El Aaiun)", - "Africa\/Freetown": "Sierra Leone (Freetown)", - "Africa\/Gaborone": "il-Botswana (Gaborone)", - "Africa\/Harare": "iż-Żimbabwe (Harare)", - "Africa\/Johannesburg": "l-Afrika t’Isfel (Johannesburg)", - "Africa\/Juba": "is-Sudan t’Isfel (Juba)", - "Africa\/Kampala": "l-Uganda (Kampala)", - "Africa\/Khartoum": "is-Sudan (Khartoum)", - "Africa\/Kigali": "ir-Rwanda (Kigali)", - "Africa\/Kinshasa": "ir-Repubblika Demokratika tal-Kongo (Kinshasa)", - "Africa\/Lagos": "in-Niġerja (Lagos)", - "Africa\/Libreville": "il-Gabon (Libreville)", - "Africa\/Lome": "it-Togo (Lome)", - "Africa\/Luanda": "l-Angola (Luanda)", - "Africa\/Lubumbashi": "ir-Repubblika Demokratika tal-Kongo (Lubumbashi)", - "Africa\/Lusaka": "iż-Żambja (Lusaka)", - "Africa\/Malabo": "il-Guinea Ekwatorjali (Malabo)", - "Africa\/Maputo": "il-Mozambique (Maputo)", - "Africa\/Maseru": "il-Lesoto (Maseru)", - "Africa\/Mbabane": "is-Swaziland (Mbabane)", - "Africa\/Mogadishu": "is-Somalja (Mogadishu)", - "Africa\/Monrovia": "il-Liberja (Monrovia)", - "Africa\/Nairobi": "il-Kenja (Nairobi)", - "Africa\/Ndjamena": "iċ-Chad (Ndjamena)", - "Africa\/Niamey": "in-Niġer (Niamey)", - "Africa\/Nouakchott": "il-Mauritania (Nouakchott)", - "Africa\/Ouagadougou": "il-Burkina Faso (Ouagadougou)", - "Africa\/Porto-Novo": "il-Benin (Porto-Novo)", - "Africa\/Sao_Tome": "São Tomé u Príncipe (Sao Tome)", - "Africa\/Tripoli": "il-Libja (Tripoli)", + "Africa\/Conakry": "Ħin ta’ il-Guinea (Conakry)", + "Africa\/Dakar": "Ħin ta’ is-Senegal (Dakar)", + "Africa\/Dar_es_Salaam": "Ħin ta’ it-Tanzanija (Dar es Salaam)", + "Africa\/Djibouti": "Ħin ta’ il-Djibouti (Djibouti)", + "Africa\/Douala": "Ħin ta’ il-Kamerun (Douala)", + "Africa\/El_Aaiun": "Ħin ta’ is-Saħara tal-Punent (El Aaiun)", + "Africa\/Freetown": "Ħin ta’ Sierra Leone (Freetown)", + "Africa\/Gaborone": "Ħin ta’ il-Botswana (Gaborone)", + "Africa\/Harare": "Ħin ta’ iż-Żimbabwe (Harare)", + "Africa\/Johannesburg": "Ħin ta’ l-Afrika t’Isfel (Johannesburg)", + "Africa\/Juba": "Ħin ta’ is-Sudan t’Isfel (Juba)", + "Africa\/Kampala": "Ħin ta’ l-Uganda (Kampala)", + "Africa\/Khartoum": "Ħin ta’ is-Sudan (Khartoum)", + "Africa\/Kigali": "Ħin ta’ ir-Rwanda (Kigali)", + "Africa\/Kinshasa": "Ħin ta’ ir-Repubblika Demokratika tal-Kongo (Kinshasa)", + "Africa\/Lagos": "Ħin ta’ in-Niġerja (Lagos)", + "Africa\/Libreville": "Ħin ta’ il-Gabon (Libreville)", + "Africa\/Lome": "Ħin ta’ it-Togo (Lome)", + "Africa\/Luanda": "Ħin ta’ l-Angola (Luanda)", + "Africa\/Lubumbashi": "Ħin ta’ ir-Repubblika Demokratika tal-Kongo (Lubumbashi)", + "Africa\/Lusaka": "Ħin ta’ iż-Żambja (Lusaka)", + "Africa\/Malabo": "Ħin ta’ il-Guinea Ekwatorjali (Malabo)", + "Africa\/Maputo": "Ħin ta’ il-Mozambique (Maputo)", + "Africa\/Maseru": "Ħin ta’ il-Lesoto (Maseru)", + "Africa\/Mbabane": "Ħin ta’ is-Swaziland (Mbabane)", + "Africa\/Mogadishu": "Ħin ta’ is-Somalja (Mogadishu)", + "Africa\/Monrovia": "Ħin ta’ il-Liberja (Monrovia)", + "Africa\/Nairobi": "Ħin ta’ il-Kenja (Nairobi)", + "Africa\/Ndjamena": "Ħin ta’ iċ-Chad (Ndjamena)", + "Africa\/Niamey": "Ħin ta’ in-Niġer (Niamey)", + "Africa\/Nouakchott": "Ħin ta’ il-Mauritania (Nouakchott)", + "Africa\/Ouagadougou": "Ħin ta’ il-Burkina Faso (Ouagadougou)", + "Africa\/Porto-Novo": "Ħin ta’ il-Benin (Porto-Novo)", + "Africa\/Sao_Tome": "Ħin ta’ São Tomé u Príncipe (Sao Tome)", + "Africa\/Tripoli": "Ħin ta’ il-Libja (Tripoli)", "Africa\/Tunis": "Ħin Ċentrali Ewropew (Tunis)", - "Africa\/Windhoek": "in-Namibja (Windhoek)", - "America\/Adak": "l-Istati Uniti (Adak)", - "America\/Anchorage": "l-Istati Uniti (Anchorage)", - "America\/Anguilla": "Anguilla (Anguilla)", - "America\/Antigua": "Antigua u Barbuda (Antigua)", - "America\/Araguaina": "Il-Brażil (Araguaina)", - "America\/Argentina\/La_Rioja": "l-Arġentina (La Rioja)", - "America\/Argentina\/Rio_Gallegos": "l-Arġentina (Rio Gallegos)", - "America\/Argentina\/Salta": "l-Arġentina (Salta)", - "America\/Argentina\/San_Juan": "l-Arġentina (San Juan)", - "America\/Argentina\/San_Luis": "l-Arġentina (San Luis)", - "America\/Argentina\/Tucuman": "l-Arġentina (Tucuman)", - "America\/Argentina\/Ushuaia": "l-Arġentina (Ushuaia)", - "America\/Aruba": "Aruba (Aruba)", - "America\/Asuncion": "il-Paragwaj (Asuncion)", - "America\/Bahia": "Il-Brażil (Bahia)", - "America\/Bahia_Banderas": "il-Messiku (Bahia Banderas)", - "America\/Barbados": "Barbados (Barbados)", - "America\/Belem": "Il-Brażil (Belem)", - "America\/Belize": "il-Belize (Belize)", - "America\/Blanc-Sablon": "il-Kanada (Blanc-Sablon)", - "America\/Boa_Vista": "Il-Brażil (Boa Vista)", - "America\/Bogota": "il-Kolombja (Bogota)", - "America\/Boise": "l-Istati Uniti (Boise)", - "America\/Buenos_Aires": "l-Arġentina (Buenos Aires)", - "America\/Cambridge_Bay": "il-Kanada (Cambridge Bay)", - "America\/Campo_Grande": "Il-Brażil (Campo Grande)", - "America\/Cancun": "il-Messiku (Cancun)", - "America\/Caracas": "il-Venezwela (Caracas)", - "America\/Catamarca": "l-Arġentina (Catamarca)", - "America\/Cayenne": "il-Guyana Franċiża (Cayenne)", - "America\/Cayman": "il-Gżejjer Cayman (Cayman)", - "America\/Chicago": "l-Istati Uniti (Chicago)", - "America\/Chihuahua": "il-Messiku (Chihuahua)", - "America\/Coral_Harbour": "il-Kanada (Atikokan)", - "America\/Cordoba": "l-Arġentina (Cordoba)", - "America\/Costa_Rica": "il-Costa Rica (Costa Rica)", - "America\/Creston": "il-Kanada (Creston)", - "America\/Cuiaba": "Il-Brażil (Cuiaba)", - "America\/Curacao": "Curaçao (Curacao)", - "America\/Danmarkshavn": "Greenland (Danmarkshavn)", - "America\/Dawson": "il-Kanada (Dawson)", - "America\/Dawson_Creek": "il-Kanada (Dawson Creek)", - "America\/Denver": "l-Istati Uniti (Denver)", - "America\/Detroit": "l-Istati Uniti (Detroit)", - "America\/Dominica": "Dominica (Dominica)", - "America\/Edmonton": "il-Kanada (Edmonton)", - "America\/Eirunepe": "Il-Brażil (Eirunepe)", - "America\/El_Salvador": "El Salvador (El Salvador)", - "America\/Fort_Nelson": "il-Kanada (Fort Nelson)", - "America\/Fortaleza": "Il-Brażil (Fortaleza)", - "America\/Glace_Bay": "il-Kanada (Glace Bay)", - "America\/Godthab": "Greenland (Nuuk)", - "America\/Goose_Bay": "il-Kanada (Goose Bay)", - "America\/Grand_Turk": "il-Gżejjer Turks u Caicos (Grand Turk)", - "America\/Grenada": "Grenada (Grenada)", - "America\/Guadeloupe": "Guadeloupe (Guadeloupe)", - "America\/Guatemala": "il-Gwatemala (il-Gwatemala)", - "America\/Guayaquil": "l-Ekwador (Guayaquil)", - "America\/Guyana": "il-Guyana (Guyana)", - "America\/Halifax": "il-Kanada (Halifax)", - "America\/Havana": "Kuba (Havana)", - "America\/Hermosillo": "il-Messiku (Hermosillo)", - "America\/Indiana\/Knox": "l-Istati Uniti (Knox, Indiana)", - "America\/Indiana\/Marengo": "l-Istati Uniti (Marengo, Indiana)", - "America\/Indiana\/Petersburg": "l-Istati Uniti (Petersburg, Indiana)", - "America\/Indiana\/Tell_City": "l-Istati Uniti (Tell City, Indiana)", - "America\/Indiana\/Vevay": "l-Istati Uniti (Vevay, Indiana)", - "America\/Indiana\/Vincennes": "l-Istati Uniti (Vincennes, Indiana)", - "America\/Indiana\/Winamac": "l-Istati Uniti (Winamac, Indiana)", - "America\/Indianapolis": "l-Istati Uniti (Indianapolis)", - "America\/Inuvik": "il-Kanada (Inuvik)", - "America\/Iqaluit": "il-Kanada (Iqaluit)", - "America\/Jamaica": "il-Ġamajka (il-Ġamajka)", - "America\/Jujuy": "l-Arġentina (Jujuy)", - "America\/Juneau": "l-Istati Uniti (Juneau)", - "America\/Kentucky\/Monticello": "l-Istati Uniti (Monticello, Kentucky)", - "America\/Kralendijk": "in-Netherlands tal-Karibew (Kralendijk)", - "America\/La_Paz": "il-Bolivja (La Paz)", - "America\/Lima": "il-Perù (Lima)", - "America\/Los_Angeles": "l-Istati Uniti (Los Angeles)", - "America\/Louisville": "l-Istati Uniti (Louisville)", - "America\/Lower_Princes": "Sint Maarten (Lower Prince’s Quarter)", - "America\/Maceio": "Il-Brażil (Maceio)", - "America\/Managua": "in-Nikaragwa (Managua)", - "America\/Manaus": "Il-Brażil (Manaus)", - "America\/Marigot": "Saint Martin (Marigot)", - "America\/Martinique": "Martinique (Martinique)", - "America\/Matamoros": "il-Messiku (Matamoros)", - "America\/Mazatlan": "il-Messiku (Mazatlan)", - "America\/Mendoza": "l-Arġentina (Mendoza)", - "America\/Menominee": "l-Istati Uniti (Menominee)", - "America\/Merida": "il-Messiku (Merida)", - "America\/Metlakatla": "l-Istati Uniti (Metlakatla)", - "America\/Mexico_City": "il-Messiku (Mexico City)", - "America\/Miquelon": "Saint Pierre u Miquelon (Miquelon)", - "America\/Moncton": "il-Kanada (Moncton)", - "America\/Monterrey": "il-Messiku (Monterrey)", - "America\/Montevideo": "l-Urugwaj (Montevideo)", - "America\/Montreal": "il-Kanada (Montreal)", - "America\/Montserrat": "Montserrat (Montserrat)", - "America\/Nassau": "il-Bahamas (Nassau)", - "America\/New_York": "l-Istati Uniti (New York)", - "America\/Nipigon": "il-Kanada (Nipigon)", - "America\/Nome": "l-Istati Uniti (Nome)", - "America\/Noronha": "Il-Brażil (Noronha)", - "America\/North_Dakota\/Beulah": "l-Istati Uniti (Beulah, North Dakota)", - "America\/North_Dakota\/Center": "l-Istati Uniti (Center, North Dakota)", - "America\/North_Dakota\/New_Salem": "l-Istati Uniti (New Salem, North Dakota)", - "America\/Ojinaga": "il-Messiku (Ojinaga)", - "America\/Panama": "il-Panama (Panama)", - "America\/Pangnirtung": "il-Kanada (Pangnirtung)", - "America\/Paramaribo": "is-Suriname (Paramaribo)", - "America\/Phoenix": "l-Istati Uniti (Phoenix)", - "America\/Port-au-Prince": "il-Haiti (Port-au-Prince)", - "America\/Port_of_Spain": "Trinidad u Tobago (Port of Spain)", - "America\/Porto_Velho": "Il-Brażil (Porto Velho)", - "America\/Puerto_Rico": "Puerto Rico (Puerto Rico)", - "America\/Punta_Arenas": "iċ-Ċili (Punta Arenas)", - "America\/Rainy_River": "il-Kanada (Rainy River)", - "America\/Rankin_Inlet": "il-Kanada (Rankin Inlet)", - "America\/Recife": "Il-Brażil (Recife)", - "America\/Regina": "il-Kanada (Regina)", - "America\/Resolute": "il-Kanada (Resolute)", - "America\/Rio_Branco": "Il-Brażil (Rio Branco)", - "America\/Santa_Isabel": "il-Messiku (Santa Isabel)", - "America\/Santarem": "Il-Brażil (Santarem)", - "America\/Santiago": "iċ-Ċili (Santiago)", - "America\/Santo_Domingo": "ir-Repubblika Dominicana (Santo Domingo)", - "America\/Sao_Paulo": "Il-Brażil (Sao Paulo)", - "America\/Scoresbysund": "Greenland (Ittoqqortoormiit)", - "America\/Sitka": "l-Istati Uniti (Sitka)", - "America\/St_Barthelemy": "Saint Barthélemy (St. Barthelemy)", - "America\/St_Johns": "il-Kanada (St. John’s)", - "America\/St_Kitts": "Saint Kitts u Nevis (St. Kitts)", - "America\/St_Lucia": "Saint Lucia (St. Lucia)", - "America\/St_Thomas": "il-Gżejjer Verġni tal-Istati Uniti (St. Thomas)", - "America\/St_Vincent": "Saint Vincent u l-Grenadini (St. Vincent)", - "America\/Swift_Current": "il-Kanada (Swift Current)", - "America\/Tegucigalpa": "il-Honduras (Tegucigalpa)", - "America\/Thule": "Greenland (Thule)", - "America\/Thunder_Bay": "il-Kanada (Thunder Bay)", - "America\/Tijuana": "il-Messiku (Tijuana)", - "America\/Toronto": "il-Kanada (Toronto)", - "America\/Tortola": "il-Gżejjer Verġni Brittaniċi (Tortola)", - "America\/Vancouver": "il-Kanada (Vancouver)", - "America\/Whitehorse": "il-Kanada (Whitehorse)", - "America\/Winnipeg": "il-Kanada (Winnipeg)", - "America\/Yakutat": "l-Istati Uniti (Yakutat)", - "America\/Yellowknife": "il-Kanada (Yellowknife)", - "Antarctica\/Casey": "l-Antartika (Casey)", - "Antarctica\/Davis": "l-Antartika (Davis)", - "Antarctica\/DumontDUrville": "l-Antartika (Dumont d’Urville)", - "Antarctica\/Macquarie": "l-Awstralja (Macquarie)", - "Antarctica\/Mawson": "l-Antartika (Mawson)", - "Antarctica\/McMurdo": "l-Antartika (McMurdo)", - "Antarctica\/Palmer": "l-Antartika (Palmer)", - "Antarctica\/Rothera": "l-Antartika (Rothera)", - "Antarctica\/Syowa": "l-Antartika (Syowa)", + "Africa\/Windhoek": "Ħin ta’ in-Namibja (Windhoek)", + "America\/Adak": "Ħin ta’ l-Istati Uniti (Adak)", + "America\/Anchorage": "Ħin ta’ l-Istati Uniti (Anchorage)", + "America\/Anguilla": "Ħin ta’ Anguilla (Anguilla)", + "America\/Antigua": "Ħin ta’ Antigua u Barbuda (Antigua)", + "America\/Araguaina": "Ħin ta’ Il-Brażil (Araguaina)", + "America\/Argentina\/La_Rioja": "Ħin ta’ l-Arġentina (La Rioja)", + "America\/Argentina\/Rio_Gallegos": "Ħin ta’ l-Arġentina (Rio Gallegos)", + "America\/Argentina\/Salta": "Ħin ta’ l-Arġentina (Salta)", + "America\/Argentina\/San_Juan": "Ħin ta’ l-Arġentina (San Juan)", + "America\/Argentina\/San_Luis": "Ħin ta’ l-Arġentina (San Luis)", + "America\/Argentina\/Tucuman": "Ħin ta’ l-Arġentina (Tucuman)", + "America\/Argentina\/Ushuaia": "Ħin ta’ l-Arġentina (Ushuaia)", + "America\/Aruba": "Ħin ta’ Aruba (Aruba)", + "America\/Asuncion": "Ħin ta’ il-Paragwaj (Asuncion)", + "America\/Bahia": "Ħin ta’ Il-Brażil (Bahia)", + "America\/Bahia_Banderas": "Ħin ta’ il-Messiku (Bahia Banderas)", + "America\/Barbados": "Ħin ta’ Barbados (Barbados)", + "America\/Belem": "Ħin ta’ Il-Brażil (Belem)", + "America\/Belize": "Ħin ta’ il-Belize (Belize)", + "America\/Blanc-Sablon": "Ħin ta’ il-Kanada (Blanc-Sablon)", + "America\/Boa_Vista": "Ħin ta’ Il-Brażil (Boa Vista)", + "America\/Bogota": "Ħin ta’ il-Kolombja (Bogota)", + "America\/Boise": "Ħin ta’ l-Istati Uniti (Boise)", + "America\/Buenos_Aires": "Ħin ta’ l-Arġentina (Buenos Aires)", + "America\/Cambridge_Bay": "Ħin ta’ il-Kanada (Cambridge Bay)", + "America\/Campo_Grande": "Ħin ta’ Il-Brażil (Campo Grande)", + "America\/Cancun": "Ħin ta’ il-Messiku (Cancun)", + "America\/Caracas": "Ħin ta’ il-Venezwela (Caracas)", + "America\/Catamarca": "Ħin ta’ l-Arġentina (Catamarca)", + "America\/Cayenne": "Ħin ta’ il-Guyana Franċiża (Cayenne)", + "America\/Cayman": "Ħin ta’ il-Gżejjer Cayman (Cayman)", + "America\/Chicago": "Ħin ta’ l-Istati Uniti (Chicago)", + "America\/Chihuahua": "Ħin ta’ il-Messiku (Chihuahua)", + "America\/Coral_Harbour": "Ħin ta’ il-Kanada (Atikokan)", + "America\/Cordoba": "Ħin ta’ l-Arġentina (Cordoba)", + "America\/Costa_Rica": "Ħin ta’ il-Costa Rica (Costa Rica)", + "America\/Creston": "Ħin ta’ il-Kanada (Creston)", + "America\/Cuiaba": "Ħin ta’ Il-Brażil (Cuiaba)", + "America\/Curacao": "Ħin ta’ Curaçao (Curacao)", + "America\/Danmarkshavn": "Ħin ta’ Greenland (Danmarkshavn)", + "America\/Dawson": "Ħin ta’ il-Kanada (Dawson)", + "America\/Dawson_Creek": "Ħin ta’ il-Kanada (Dawson Creek)", + "America\/Denver": "Ħin ta’ l-Istati Uniti (Denver)", + "America\/Detroit": "Ħin ta’ l-Istati Uniti (Detroit)", + "America\/Dominica": "Ħin ta’ Dominica (Dominica)", + "America\/Edmonton": "Ħin ta’ il-Kanada (Edmonton)", + "America\/Eirunepe": "Ħin ta’ Il-Brażil (Eirunepe)", + "America\/El_Salvador": "Ħin ta’ El Salvador (El Salvador)", + "America\/Fort_Nelson": "Ħin ta’ il-Kanada (Fort Nelson)", + "America\/Fortaleza": "Ħin ta’ Il-Brażil (Fortaleza)", + "America\/Glace_Bay": "Ħin ta’ il-Kanada (Glace Bay)", + "America\/Godthab": "Ħin ta’ Greenland (Nuuk)", + "America\/Goose_Bay": "Ħin ta’ il-Kanada (Goose Bay)", + "America\/Grand_Turk": "Ħin ta’ il-Gżejjer Turks u Caicos (Grand Turk)", + "America\/Grenada": "Ħin ta’ Grenada (Grenada)", + "America\/Guadeloupe": "Ħin ta’ Guadeloupe (Guadeloupe)", + "America\/Guatemala": "Ħin ta’ il-Gwatemala (il-Gwatemala)", + "America\/Guayaquil": "Ħin ta’ l-Ekwador (Guayaquil)", + "America\/Guyana": "Ħin ta’ il-Guyana (Guyana)", + "America\/Halifax": "Ħin ta’ il-Kanada (Halifax)", + "America\/Havana": "Ħin ta’ Kuba (Havana)", + "America\/Hermosillo": "Ħin ta’ il-Messiku (Hermosillo)", + "America\/Indiana\/Knox": "Ħin ta’ l-Istati Uniti (Knox, Indiana)", + "America\/Indiana\/Marengo": "Ħin ta’ l-Istati Uniti (Marengo, Indiana)", + "America\/Indiana\/Petersburg": "Ħin ta’ l-Istati Uniti (Petersburg, Indiana)", + "America\/Indiana\/Tell_City": "Ħin ta’ l-Istati Uniti (Tell City, Indiana)", + "America\/Indiana\/Vevay": "Ħin ta’ l-Istati Uniti (Vevay, Indiana)", + "America\/Indiana\/Vincennes": "Ħin ta’ l-Istati Uniti (Vincennes, Indiana)", + "America\/Indiana\/Winamac": "Ħin ta’ l-Istati Uniti (Winamac, Indiana)", + "America\/Indianapolis": "Ħin ta’ l-Istati Uniti (Indianapolis)", + "America\/Inuvik": "Ħin ta’ il-Kanada (Inuvik)", + "America\/Iqaluit": "Ħin ta’ il-Kanada (Iqaluit)", + "America\/Jamaica": "Ħin ta’ il-Ġamajka (il-Ġamajka)", + "America\/Jujuy": "Ħin ta’ l-Arġentina (Jujuy)", + "America\/Juneau": "Ħin ta’ l-Istati Uniti (Juneau)", + "America\/Kentucky\/Monticello": "Ħin ta’ l-Istati Uniti (Monticello, Kentucky)", + "America\/Kralendijk": "Ħin ta’ in-Netherlands tal-Karibew (Kralendijk)", + "America\/La_Paz": "Ħin ta’ il-Bolivja (La Paz)", + "America\/Lima": "Ħin ta’ il-Perù (Lima)", + "America\/Los_Angeles": "Ħin ta’ l-Istati Uniti (Los Angeles)", + "America\/Louisville": "Ħin ta’ l-Istati Uniti (Louisville)", + "America\/Lower_Princes": "Ħin ta’ Sint Maarten (Lower Prince’s Quarter)", + "America\/Maceio": "Ħin ta’ Il-Brażil (Maceio)", + "America\/Managua": "Ħin ta’ in-Nikaragwa (Managua)", + "America\/Manaus": "Ħin ta’ Il-Brażil (Manaus)", + "America\/Marigot": "Ħin ta’ Saint Martin (Marigot)", + "America\/Martinique": "Ħin ta’ Martinique (Martinique)", + "America\/Matamoros": "Ħin ta’ il-Messiku (Matamoros)", + "America\/Mazatlan": "Ħin ta’ il-Messiku (Mazatlan)", + "America\/Mendoza": "Ħin ta’ l-Arġentina (Mendoza)", + "America\/Menominee": "Ħin ta’ l-Istati Uniti (Menominee)", + "America\/Merida": "Ħin ta’ il-Messiku (Merida)", + "America\/Metlakatla": "Ħin ta’ l-Istati Uniti (Metlakatla)", + "America\/Mexico_City": "Ħin ta’ il-Messiku (Mexico City)", + "America\/Miquelon": "Ħin ta’ Saint Pierre u Miquelon (Miquelon)", + "America\/Moncton": "Ħin ta’ il-Kanada (Moncton)", + "America\/Monterrey": "Ħin ta’ il-Messiku (Monterrey)", + "America\/Montevideo": "Ħin ta’ l-Urugwaj (Montevideo)", + "America\/Montreal": "Ħin ta’ il-Kanada (Montreal)", + "America\/Montserrat": "Ħin ta’ Montserrat (Montserrat)", + "America\/Nassau": "Ħin ta’ il-Bahamas (Nassau)", + "America\/New_York": "Ħin ta’ l-Istati Uniti (New York)", + "America\/Nipigon": "Ħin ta’ il-Kanada (Nipigon)", + "America\/Nome": "Ħin ta’ l-Istati Uniti (Nome)", + "America\/Noronha": "Ħin ta’ Il-Brażil (Noronha)", + "America\/North_Dakota\/Beulah": "Ħin ta’ l-Istati Uniti (Beulah, North Dakota)", + "America\/North_Dakota\/Center": "Ħin ta’ l-Istati Uniti (Center, North Dakota)", + "America\/North_Dakota\/New_Salem": "Ħin ta’ l-Istati Uniti (New Salem, North Dakota)", + "America\/Ojinaga": "Ħin ta’ il-Messiku (Ojinaga)", + "America\/Panama": "Ħin ta’ il-Panama (Panama)", + "America\/Pangnirtung": "Ħin ta’ il-Kanada (Pangnirtung)", + "America\/Paramaribo": "Ħin ta’ is-Suriname (Paramaribo)", + "America\/Phoenix": "Ħin ta’ l-Istati Uniti (Phoenix)", + "America\/Port-au-Prince": "Ħin ta’ il-Haiti (Port-au-Prince)", + "America\/Port_of_Spain": "Ħin ta’ Trinidad u Tobago (Port of Spain)", + "America\/Porto_Velho": "Ħin ta’ Il-Brażil (Porto Velho)", + "America\/Puerto_Rico": "Ħin ta’ Puerto Rico (Puerto Rico)", + "America\/Punta_Arenas": "Ħin ta’ iċ-Ċili (Punta Arenas)", + "America\/Rainy_River": "Ħin ta’ il-Kanada (Rainy River)", + "America\/Rankin_Inlet": "Ħin ta’ il-Kanada (Rankin Inlet)", + "America\/Recife": "Ħin ta’ Il-Brażil (Recife)", + "America\/Regina": "Ħin ta’ il-Kanada (Regina)", + "America\/Resolute": "Ħin ta’ il-Kanada (Resolute)", + "America\/Rio_Branco": "Ħin ta’ Il-Brażil (Rio Branco)", + "America\/Santa_Isabel": "Ħin ta’ il-Messiku (Santa Isabel)", + "America\/Santarem": "Ħin ta’ Il-Brażil (Santarem)", + "America\/Santiago": "Ħin ta’ iċ-Ċili (Santiago)", + "America\/Santo_Domingo": "Ħin ta’ ir-Repubblika Dominicana (Santo Domingo)", + "America\/Sao_Paulo": "Ħin ta’ Il-Brażil (Sao Paulo)", + "America\/Scoresbysund": "Ħin ta’ Greenland (Ittoqqortoormiit)", + "America\/Sitka": "Ħin ta’ l-Istati Uniti (Sitka)", + "America\/St_Barthelemy": "Ħin ta’ Saint Barthélemy (St. Barthelemy)", + "America\/St_Johns": "Ħin ta’ il-Kanada (St. John’s)", + "America\/St_Kitts": "Ħin ta’ Saint Kitts u Nevis (St. Kitts)", + "America\/St_Lucia": "Ħin ta’ Saint Lucia (St. Lucia)", + "America\/St_Thomas": "Ħin ta’ il-Gżejjer Verġni tal-Istati Uniti (St. Thomas)", + "America\/St_Vincent": "Ħin ta’ Saint Vincent u l-Grenadini (St. Vincent)", + "America\/Swift_Current": "Ħin ta’ il-Kanada (Swift Current)", + "America\/Tegucigalpa": "Ħin ta’ il-Honduras (Tegucigalpa)", + "America\/Thule": "Ħin ta’ Greenland (Thule)", + "America\/Thunder_Bay": "Ħin ta’ il-Kanada (Thunder Bay)", + "America\/Tijuana": "Ħin ta’ il-Messiku (Tijuana)", + "America\/Toronto": "Ħin ta’ il-Kanada (Toronto)", + "America\/Tortola": "Ħin ta’ il-Gżejjer Verġni Brittaniċi (Tortola)", + "America\/Vancouver": "Ħin ta’ il-Kanada (Vancouver)", + "America\/Whitehorse": "Ħin ta’ il-Kanada (Whitehorse)", + "America\/Winnipeg": "Ħin ta’ il-Kanada (Winnipeg)", + "America\/Yakutat": "Ħin ta’ l-Istati Uniti (Yakutat)", + "America\/Yellowknife": "Ħin ta’ il-Kanada (Yellowknife)", + "Antarctica\/Casey": "Ħin ta’ l-Antartika (Casey)", + "Antarctica\/Davis": "Ħin ta’ l-Antartika (Davis)", + "Antarctica\/DumontDUrville": "Ħin ta’ l-Antartika (Dumont d’Urville)", + "Antarctica\/Macquarie": "Ħin ta’ l-Awstralja (Macquarie)", + "Antarctica\/Mawson": "Ħin ta’ l-Antartika (Mawson)", + "Antarctica\/McMurdo": "Ħin ta’ l-Antartika (McMurdo)", + "Antarctica\/Palmer": "Ħin ta’ l-Antartika (Palmer)", + "Antarctica\/Rothera": "Ħin ta’ l-Antartika (Rothera)", + "Antarctica\/Syowa": "Ħin ta’ l-Antartika (Syowa)", "Antarctica\/Troll": "Ħin ta’ Troll", - "Antarctica\/Vostok": "l-Antartika (Vostok)", + "Antarctica\/Vostok": "Ħin ta’ l-Antartika (Vostok)", "Arctic\/Longyearbyen": "Ħin Ċentrali Ewropew (Longyearbyen)", - "Asia\/Aden": "il-Jemen (Aden)", - "Asia\/Almaty": "il-Każakistan (Almaty)", - "Asia\/Amman": "il-Ġordan (Amman)", - "Asia\/Anadyr": "ir-Russja (Anadyr)", - "Asia\/Aqtau": "il-Każakistan (Aqtau)", - "Asia\/Aqtobe": "il-Każakistan (Aqtobe)", - "Asia\/Ashgabat": "it-Turkmenistan (Ashgabat)", - "Asia\/Atyrau": "il-Każakistan (Atyrau)", - "Asia\/Baghdad": "l-Iraq (Baghdad)", - "Asia\/Bahrain": "il-Bahrain (Bahrain)", - "Asia\/Baku": "l-Ażerbajġan (Baku)", - "Asia\/Bangkok": "it-Tajlandja (Bangkok)", - "Asia\/Barnaul": "ir-Russja (Barnaul)", - "Asia\/Beirut": "il-Libanu (Bejrut)", - "Asia\/Bishkek": "il-Kirgiżistan (Bishkek)", - "Asia\/Brunei": "il-Brunei (Brunei)", - "Asia\/Calcutta": "l-Indja (Kolkata)", - "Asia\/Chita": "ir-Russja (Chita)", - "Asia\/Choibalsan": "il-Mongolja (Choibalsan)", - "Asia\/Colombo": "is-Sri Lanka (Colombo)", - "Asia\/Damascus": "is-Sirja (Damasku)", - "Asia\/Dhaka": "il-Bangladesh (Dhaka)", - "Asia\/Dili": "Timor Leste (Dili)", - "Asia\/Dubai": "l-Emirati Għarab Magħquda (Dubai)", - "Asia\/Dushanbe": "it-Taġikistan (Dushanbe)", - "Asia\/Famagusta": "Ċipru (Famagusta)", - "Asia\/Gaza": "it-Territorji Palestinjani (Gaza)", - "Asia\/Hebron": "it-Territorji Palestinjani (Hebron)", - "Asia\/Hong_Kong": "ir-Reġjun Amministrattiv Speċjali ta’ Hong Kong tar-Repubblika tal-Poplu taċ-Ċina (Hong Kong)", - "Asia\/Hovd": "il-Mongolja (Hovd)", - "Asia\/Irkutsk": "ir-Russja (Irkutsk)", - "Asia\/Jakarta": "l-Indoneżja (Jakarta)", - "Asia\/Jayapura": "l-Indoneżja (Jayapura)", - "Asia\/Jerusalem": "Iżrael (Ġerusalemm)", - "Asia\/Kabul": "l-Afganistan (Kabul)", - "Asia\/Kamchatka": "ir-Russja (Kamchatka)", - "Asia\/Karachi": "il-Pakistan (Karachi)", - "Asia\/Katmandu": "in-Nepal (Kathmandu)", - "Asia\/Khandyga": "ir-Russja (Khandyga)", - "Asia\/Krasnoyarsk": "ir-Russja (Krasnoyarsk)", - "Asia\/Kuala_Lumpur": "il-Malasja (Kuala Lumpur)", - "Asia\/Kuching": "il-Malasja (Kuching)", - "Asia\/Kuwait": "il-Kuwajt (il-Belt tal-Kuwajt)", - "Asia\/Macau": "ir-Reġjun Amministrattiv Speċjali tal-Macao tar-Repubblika tal-Poplu taċ-Ċina (Macau)", - "Asia\/Magadan": "ir-Russja (Magadan)", - "Asia\/Makassar": "l-Indoneżja (Makassar)", - "Asia\/Manila": "il-Filippini (Manila)", - "Asia\/Muscat": "l-Oman (Muscat)", - "Asia\/Nicosia": "Ċipru (Nikosija)", - "Asia\/Novokuznetsk": "ir-Russja (Novokuznetsk)", - "Asia\/Novosibirsk": "ir-Russja (Novosibirsk)", - "Asia\/Omsk": "ir-Russja (Omsk)", - "Asia\/Oral": "il-Każakistan (Oral)", - "Asia\/Phnom_Penh": "il-Kambodja (Phnom Penh)", - "Asia\/Pontianak": "l-Indoneżja (Pontianak)", - "Asia\/Pyongyang": "il-Korea ta’ Fuq (Pyongyang)", - "Asia\/Qatar": "il-Qatar (Qatar)", - "Asia\/Qostanay": "il-Każakistan (Qostanay)", - "Asia\/Qyzylorda": "il-Każakistan (Qyzylorda)", - "Asia\/Rangoon": "il-Myanmar\/Burma (Rangoon)", - "Asia\/Riyadh": "l-Arabia Sawdija (Riyadh)", - "Asia\/Saigon": "il-Vjetnam (Ho Chi Minh)", - "Asia\/Sakhalin": "ir-Russja (Sakhalin)", - "Asia\/Samarkand": "l-Użbekistan (Samarkand)", - "Asia\/Seoul": "il-Korea t’Isfel (Seoul)", - "Asia\/Shanghai": "iċ-Ċina (Shanghai)", - "Asia\/Singapore": "Singapore (Singapore)", - "Asia\/Srednekolymsk": "ir-Russja (Srednekolymsk)", - "Asia\/Taipei": "it-Tajwan (Taipei)", - "Asia\/Tashkent": "l-Użbekistan (Tashkent)", - "Asia\/Tbilisi": "il-Georgia (Tbilisi)", - "Asia\/Tehran": "l-Iran (Tehran)", - "Asia\/Thimphu": "il-Bhutan (Thimphu)", - "Asia\/Tokyo": "il-Ġappun (Tokyo)", - "Asia\/Tomsk": "ir-Russja (Tomsk)", - "Asia\/Ulaanbaatar": "il-Mongolja (Ulaanbaatar)", - "Asia\/Urumqi": "iċ-Ċina (Urumqi)", - "Asia\/Ust-Nera": "ir-Russja (Ust-Nera)", - "Asia\/Vientiane": "il-Laos (Vientiane)", - "Asia\/Vladivostok": "ir-Russja (Vladivostok)", - "Asia\/Yakutsk": "ir-Russja (Yakutsk)", - "Asia\/Yekaterinburg": "ir-Russja (Yekaterinburg)", - "Asia\/Yerevan": "l-Armenja (Yerevan)", - "Atlantic\/Azores": "il-Portugall (Azores)", - "Atlantic\/Bermuda": "Bermuda (Bermuda)", - "Atlantic\/Canary": "Spanja (Canary)", - "Atlantic\/Cape_Verde": "Cape Verde (Cape Verde)", - "Atlantic\/Faeroe": "il-Gżejjer Faeroe (Faroe)", - "Atlantic\/Madeira": "il-Portugall (Madeira)", - "Atlantic\/Reykjavik": "l-iżlanda (Reykjavik)", - "Atlantic\/South_Georgia": "il-Georgia tan-Nofsinhar u l-Gżejjer Sandwich tan-Nofsinhar (il-Georgia tan-Nofsinhar)", - "Atlantic\/St_Helena": "Saint Helena (St. Helena)", - "Atlantic\/Stanley": "il-Gżejjer Falkland (Stanley)", - "Australia\/Adelaide": "l-Awstralja (Adelaide)", - "Australia\/Brisbane": "l-Awstralja (Brisbane)", - "Australia\/Broken_Hill": "l-Awstralja (Broken Hill)", - "Australia\/Currie": "l-Awstralja (Currie)", - "Australia\/Darwin": "l-Awstralja (Darwin)", - "Australia\/Eucla": "l-Awstralja (Eucla)", - "Australia\/Hobart": "l-Awstralja (Hobart)", - "Australia\/Lindeman": "l-Awstralja (Lindeman)", - "Australia\/Lord_Howe": "l-Awstralja (Lord Howe)", - "Australia\/Melbourne": "l-Awstralja (Melbourne)", - "Australia\/Perth": "l-Awstralja (Perth)", - "Australia\/Sydney": "l-Awstralja (Sydney)", - "CST6CDT": "CST6CDT", - "EST5EDT": "EST5EDT", - "Etc\/GMT": "GMT", - "Etc\/UTC": "UTC", + "Asia\/Aden": "Ħin ta’ il-Jemen (Aden)", + "Asia\/Almaty": "Ħin ta’ il-Każakistan (Almaty)", + "Asia\/Amman": "Ħin ta’ il-Ġordan (Amman)", + "Asia\/Anadyr": "Ħin ta’ ir-Russja (Anadyr)", + "Asia\/Aqtau": "Ħin ta’ il-Każakistan (Aqtau)", + "Asia\/Aqtobe": "Ħin ta’ il-Każakistan (Aqtobe)", + "Asia\/Ashgabat": "Ħin ta’ it-Turkmenistan (Ashgabat)", + "Asia\/Atyrau": "Ħin ta’ il-Każakistan (Atyrau)", + "Asia\/Baghdad": "Ħin ta’ l-Iraq (Baghdad)", + "Asia\/Bahrain": "Ħin ta’ il-Bahrain (Bahrain)", + "Asia\/Baku": "Ħin ta’ l-Ażerbajġan (Baku)", + "Asia\/Bangkok": "Ħin ta’ it-Tajlandja (Bangkok)", + "Asia\/Barnaul": "Ħin ta’ ir-Russja (Barnaul)", + "Asia\/Beirut": "Ħin ta’ il-Libanu (Bejrut)", + "Asia\/Bishkek": "Ħin ta’ il-Kirgiżistan (Bishkek)", + "Asia\/Brunei": "Ħin ta’ il-Brunei (Brunei)", + "Asia\/Calcutta": "Ħin ta’ l-Indja (Kolkata)", + "Asia\/Chita": "Ħin ta’ ir-Russja (Chita)", + "Asia\/Choibalsan": "Ħin ta’ il-Mongolja (Choibalsan)", + "Asia\/Colombo": "Ħin ta’ is-Sri Lanka (Colombo)", + "Asia\/Damascus": "Ħin ta’ is-Sirja (Damasku)", + "Asia\/Dhaka": "Ħin ta’ il-Bangladesh (Dhaka)", + "Asia\/Dili": "Ħin ta’ Timor Leste (Dili)", + "Asia\/Dubai": "Ħin ta’ l-Emirati Għarab Magħquda (Dubai)", + "Asia\/Dushanbe": "Ħin ta’ it-Taġikistan (Dushanbe)", + "Asia\/Famagusta": "Ħin ta’ Ċipru (Famagusta)", + "Asia\/Gaza": "Ħin ta’ it-Territorji Palestinjani (Gaza)", + "Asia\/Hebron": "Ħin ta’ it-Territorji Palestinjani (Hebron)", + "Asia\/Hong_Kong": "Ħin ta’ ir-Reġjun Amministrattiv Speċjali ta’ Hong Kong tar-Repubblika tal-Poplu taċ-Ċina (Hong Kong)", + "Asia\/Hovd": "Ħin ta’ il-Mongolja (Hovd)", + "Asia\/Irkutsk": "Ħin ta’ ir-Russja (Irkutsk)", + "Asia\/Jakarta": "Ħin ta’ l-Indoneżja (Jakarta)", + "Asia\/Jayapura": "Ħin ta’ l-Indoneżja (Jayapura)", + "Asia\/Jerusalem": "Ħin ta’ Iżrael (Ġerusalemm)", + "Asia\/Kabul": "Ħin ta’ l-Afganistan (Kabul)", + "Asia\/Kamchatka": "Ħin ta’ ir-Russja (Kamchatka)", + "Asia\/Karachi": "Ħin ta’ il-Pakistan (Karachi)", + "Asia\/Katmandu": "Ħin ta’ in-Nepal (Kathmandu)", + "Asia\/Khandyga": "Ħin ta’ ir-Russja (Khandyga)", + "Asia\/Krasnoyarsk": "Ħin ta’ ir-Russja (Krasnoyarsk)", + "Asia\/Kuala_Lumpur": "Ħin ta’ il-Malasja (Kuala Lumpur)", + "Asia\/Kuching": "Ħin ta’ il-Malasja (Kuching)", + "Asia\/Kuwait": "Ħin ta’ il-Kuwajt (il-Belt tal-Kuwajt)", + "Asia\/Macau": "Ħin ta’ ir-Reġjun Amministrattiv Speċjali tal-Macao tar-Repubblika tal-Poplu taċ-Ċina (Macau)", + "Asia\/Magadan": "Ħin ta’ ir-Russja (Magadan)", + "Asia\/Makassar": "Ħin ta’ l-Indoneżja (Makassar)", + "Asia\/Manila": "Ħin ta’ il-Filippini (Manila)", + "Asia\/Muscat": "Ħin ta’ l-Oman (Muscat)", + "Asia\/Nicosia": "Ħin ta’ Ċipru (Nikosija)", + "Asia\/Novokuznetsk": "Ħin ta’ ir-Russja (Novokuznetsk)", + "Asia\/Novosibirsk": "Ħin ta’ ir-Russja (Novosibirsk)", + "Asia\/Omsk": "Ħin ta’ ir-Russja (Omsk)", + "Asia\/Oral": "Ħin ta’ il-Każakistan (Oral)", + "Asia\/Phnom_Penh": "Ħin ta’ il-Kambodja (Phnom Penh)", + "Asia\/Pontianak": "Ħin ta’ l-Indoneżja (Pontianak)", + "Asia\/Pyongyang": "Ħin ta’ il-Korea ta’ Fuq (Pyongyang)", + "Asia\/Qatar": "Ħin ta’ il-Qatar (Qatar)", + "Asia\/Qostanay": "Ħin ta’ il-Każakistan (Qostanay)", + "Asia\/Qyzylorda": "Ħin ta’ il-Każakistan (Qyzylorda)", + "Asia\/Rangoon": "Ħin ta’ il-Myanmar\/Burma (Rangoon)", + "Asia\/Riyadh": "Ħin ta’ l-Arabia Sawdija (Riyadh)", + "Asia\/Saigon": "Ħin ta’ il-Vjetnam (Ho Chi Minh)", + "Asia\/Sakhalin": "Ħin ta’ ir-Russja (Sakhalin)", + "Asia\/Samarkand": "Ħin ta’ l-Użbekistan (Samarkand)", + "Asia\/Seoul": "Ħin ta’ il-Korea t’Isfel (Seoul)", + "Asia\/Shanghai": "Ħin ta’ iċ-Ċina (Shanghai)", + "Asia\/Singapore": "Ħin ta’ Singapore (Singapore)", + "Asia\/Srednekolymsk": "Ħin ta’ ir-Russja (Srednekolymsk)", + "Asia\/Taipei": "Ħin ta’ it-Tajwan (Taipei)", + "Asia\/Tashkent": "Ħin ta’ l-Użbekistan (Tashkent)", + "Asia\/Tbilisi": "Ħin ta’ il-Georgia (Tbilisi)", + "Asia\/Tehran": "Ħin ta’ l-Iran (Tehran)", + "Asia\/Thimphu": "Ħin ta’ il-Bhutan (Thimphu)", + "Asia\/Tokyo": "Ħin ta’ il-Ġappun (Tokyo)", + "Asia\/Tomsk": "Ħin ta’ ir-Russja (Tomsk)", + "Asia\/Ulaanbaatar": "Ħin ta’ il-Mongolja (Ulaanbaatar)", + "Asia\/Urumqi": "Ħin ta’ iċ-Ċina (Urumqi)", + "Asia\/Ust-Nera": "Ħin ta’ ir-Russja (Ust-Nera)", + "Asia\/Vientiane": "Ħin ta’ il-Laos (Vientiane)", + "Asia\/Vladivostok": "Ħin ta’ ir-Russja (Vladivostok)", + "Asia\/Yakutsk": "Ħin ta’ ir-Russja (Yakutsk)", + "Asia\/Yekaterinburg": "Ħin ta’ ir-Russja (Yekaterinburg)", + "Asia\/Yerevan": "Ħin ta’ l-Armenja (Yerevan)", + "Atlantic\/Azores": "Ħin ta’ il-Portugall (Azores)", + "Atlantic\/Bermuda": "Ħin ta’ Bermuda (Bermuda)", + "Atlantic\/Canary": "Ħin ta’ Spanja (Canary)", + "Atlantic\/Cape_Verde": "Ħin ta’ Cape Verde (Cape Verde)", + "Atlantic\/Faeroe": "Ħin ta’ il-Gżejjer Faeroe (Faroe)", + "Atlantic\/Madeira": "Ħin ta’ il-Portugall (Madeira)", + "Atlantic\/Reykjavik": "Ħin ta’ l-iżlanda (Reykjavik)", + "Atlantic\/South_Georgia": "Ħin ta’ il-Georgia tan-Nofsinhar u l-Gżejjer Sandwich tan-Nofsinhar (il-Georgia tan-Nofsinhar)", + "Atlantic\/St_Helena": "Ħin ta’ Saint Helena (St. Helena)", + "Atlantic\/Stanley": "Ħin ta’ il-Gżejjer Falkland (Stanley)", + "Australia\/Adelaide": "Ħin ta’ l-Awstralja (Adelaide)", + "Australia\/Brisbane": "Ħin ta’ l-Awstralja (Brisbane)", + "Australia\/Broken_Hill": "Ħin ta’ l-Awstralja (Broken Hill)", + "Australia\/Currie": "Ħin ta’ l-Awstralja (Currie)", + "Australia\/Darwin": "Ħin ta’ l-Awstralja (Darwin)", + "Australia\/Eucla": "Ħin ta’ l-Awstralja (Eucla)", + "Australia\/Hobart": "Ħin ta’ l-Awstralja (Hobart)", + "Australia\/Lindeman": "Ħin ta’ l-Awstralja (Lindeman)", + "Australia\/Lord_Howe": "Ħin ta’ l-Awstralja (Lord Howe)", + "Australia\/Melbourne": "Ħin ta’ l-Awstralja (Melbourne)", + "Australia\/Perth": "Ħin ta’ l-Awstralja (Perth)", + "Australia\/Sydney": "Ħin ta’ l-Awstralja (Sydney)", "Europe\/Amsterdam": "Ħin Ċentrali Ewropew (Amsterdam)", "Europe\/Andorra": "Ħin Ċentrali Ewropew (Andorra)", - "Europe\/Astrakhan": "ir-Russja (Astrakhan)", - "Europe\/Athens": "il-Greċja (Ateni)", + "Europe\/Astrakhan": "Ħin ta’ ir-Russja (Astrakhan)", + "Europe\/Athens": "Ħin ta’ il-Greċja (Ateni)", "Europe\/Belgrade": "Ħin Ċentrali Ewropew (Belgrad)", "Europe\/Berlin": "Ħin Ċentrali Ewropew (Berlin)", "Europe\/Bratislava": "Ħin Ċentrali Ewropew (Bratislava)", "Europe\/Brussels": "Ħin Ċentrali Ewropew (Brussell)", - "Europe\/Bucharest": "ir-Rumanija (Bucharest)", + "Europe\/Bucharest": "Ħin ta’ ir-Rumanija (Bucharest)", "Europe\/Budapest": "Ħin Ċentrali Ewropew (Budapest)", "Europe\/Busingen": "Ħin Ċentrali Ewropew (Busingen)", - "Europe\/Chisinau": "il-Moldova (Chisinau)", + "Europe\/Chisinau": "Ħin ta’ il-Moldova (Chisinau)", "Europe\/Copenhagen": "Ħin Ċentrali Ewropew (Copenhagen)", - "Europe\/Dublin": "l-Irlanda (Dublin)", + "Europe\/Dublin": "Ħin ta’ l-Irlanda (Dublin)", "Europe\/Gibraltar": "Ħin Ċentrali Ewropew (Ġibiltà)", - "Europe\/Guernsey": "Guernsey (Guernsey)", - "Europe\/Helsinki": "il-Finlandja (Helsinki)", - "Europe\/Isle_of_Man": "Isle of Man (Isle of Man)", - "Europe\/Istanbul": "it-Turkija (Istanbul)", - "Europe\/Jersey": "Jersey (Jersey)", - "Europe\/Kaliningrad": "ir-Russja (Kaliningrad)", - "Europe\/Kiev": "l-Ukrajna (Kiev)", - "Europe\/Kirov": "ir-Russja (Kirov)", - "Europe\/Lisbon": "il-Portugall (Lisbona)", + "Europe\/Guernsey": "Ħin ta’ Guernsey (Guernsey)", + "Europe\/Helsinki": "Ħin ta’ il-Finlandja (Helsinki)", + "Europe\/Isle_of_Man": "Ħin ta’ Isle of Man (Isle of Man)", + "Europe\/Istanbul": "Ħin ta’ it-Turkija (Istanbul)", + "Europe\/Jersey": "Ħin ta’ Jersey (Jersey)", + "Europe\/Kaliningrad": "Ħin ta’ ir-Russja (Kaliningrad)", + "Europe\/Kiev": "Ħin ta’ l-Ukrajna (Kiev)", + "Europe\/Kirov": "Ħin ta’ ir-Russja (Kirov)", + "Europe\/Lisbon": "Ħin ta’ il-Portugall (Lisbona)", "Europe\/Ljubljana": "Ħin Ċentrali Ewropew (Ljubljana)", - "Europe\/London": "ir-Renju Unit (Londra)", + "Europe\/London": "Ħin ta’ ir-Renju Unit (Londra)", "Europe\/Luxembourg": "Ħin Ċentrali Ewropew (il-Lussemburgu)", "Europe\/Madrid": "Ħin Ċentrali Ewropew (Madrid)", "Europe\/Malta": "Ħin Ċentrali Ewropew (Valletta)", - "Europe\/Mariehamn": "il-Gżejjer Aland (Mariehamn)", - "Europe\/Minsk": "il-Belarussja (Minsk)", + "Europe\/Mariehamn": "Ħin ta’ il-Gżejjer Aland (Mariehamn)", + "Europe\/Minsk": "Ħin ta’ il-Belarussja (Minsk)", "Europe\/Monaco": "Ħin Ċentrali Ewropew (Monaco)", - "Europe\/Moscow": "ir-Russja (Moska)", + "Europe\/Moscow": "Ħin ta’ ir-Russja (Moska)", "Europe\/Oslo": "Ħin Ċentrali Ewropew (Oslo)", "Europe\/Paris": "Ħin Ċentrali Ewropew (Pariġi)", "Europe\/Podgorica": "Ħin Ċentrali Ewropew (Podgorica)", "Europe\/Prague": "Ħin Ċentrali Ewropew (Praga)", - "Europe\/Riga": "il-Latvja (Riga)", + "Europe\/Riga": "Ħin ta’ il-Latvja (Riga)", "Europe\/Rome": "Ħin Ċentrali Ewropew (Ruma)", - "Europe\/Samara": "ir-Russja (Samara)", + "Europe\/Samara": "Ħin ta’ ir-Russja (Samara)", "Europe\/San_Marino": "Ħin Ċentrali Ewropew (San Marino)", "Europe\/Sarajevo": "Ħin Ċentrali Ewropew (Sarajevo)", - "Europe\/Saratov": "ir-Russja (Saratov)", - "Europe\/Simferopol": "l-Ukrajna (Simferopol)", + "Europe\/Saratov": "Ħin ta’ ir-Russja (Saratov)", + "Europe\/Simferopol": "Ħin ta’ l-Ukrajna (Simferopol)", "Europe\/Skopje": "Ħin Ċentrali Ewropew (Skopje)", - "Europe\/Sofia": "il-Bulgarija (Sofija)", + "Europe\/Sofia": "Ħin ta’ il-Bulgarija (Sofija)", "Europe\/Stockholm": "Ħin Ċentrali Ewropew (Stokkolma)", - "Europe\/Tallinn": "l-Estonja (Tallinn)", + "Europe\/Tallinn": "Ħin ta’ l-Estonja (Tallinn)", "Europe\/Tirane": "Ħin Ċentrali Ewropew (Tirana)", - "Europe\/Ulyanovsk": "ir-Russja (Ulyanovsk)", - "Europe\/Uzhgorod": "l-Ukrajna (Uzhgorod)", + "Europe\/Ulyanovsk": "Ħin ta’ ir-Russja (Ulyanovsk)", + "Europe\/Uzhgorod": "Ħin ta’ l-Ukrajna (Uzhgorod)", "Europe\/Vaduz": "Ħin Ċentrali Ewropew (Vaduz)", "Europe\/Vatican": "Ħin Ċentrali Ewropew (il-belt tal-Vatikan)", "Europe\/Vienna": "Ħin Ċentrali Ewropew (Vjenna)", - "Europe\/Vilnius": "il-Litwanja (Vilnius)", - "Europe\/Volgograd": "ir-Russja (Volgograd)", + "Europe\/Vilnius": "Ħin ta’ il-Litwanja (Vilnius)", + "Europe\/Volgograd": "Ħin ta’ ir-Russja (Volgograd)", "Europe\/Warsaw": "Ħin Ċentrali Ewropew (Varsavja)", "Europe\/Zagreb": "Ħin Ċentrali Ewropew (Zagreb)", - "Europe\/Zaporozhye": "l-Ukrajna (Zaporozhye)", + "Europe\/Zaporozhye": "Ħin ta’ l-Ukrajna (Zaporozhye)", "Europe\/Zurich": "Ħin Ċentrali Ewropew (Zurich)", - "Indian\/Antananarivo": "Madagascar (Antananarivo)", - "Indian\/Chagos": "Territorju Brittaniku tal-Oċean Indjan (Chagos)", - "Indian\/Christmas": "il-Gżira Christmas (Christmas)", - "Indian\/Cocos": "Gżejjer Cocos (Keeling) (Cocos)", - "Indian\/Comoro": "Comoros (Comoro)", - "Indian\/Kerguelen": "It-Territorji Franċiżi tan-Nofsinhar (Kerguelen)", - "Indian\/Mahe": "is-Seychelles (Mahe)", - "Indian\/Maldives": "il-Maldivi (il-Maldivi)", - "Indian\/Mauritius": "Mauritius (Mauritius)", - "Indian\/Mayotte": "Mayotte (Mayotte)", - "Indian\/Reunion": "Réunion (Reunion)", - "MST7MDT": "MST7MDT", - "PST8PDT": "PST8PDT", - "Pacific\/Apia": "Samoa (Apia)", - "Pacific\/Auckland": "New Zealand (Auckland)", - "Pacific\/Bougainville": "Papua New Guinea (Bougainville)", - "Pacific\/Chatham": "New Zealand (Chatham)", - "Pacific\/Easter": "iċ-Ċili (Easter)", - "Pacific\/Efate": "Vanuatu (Efate)", - "Pacific\/Enderbury": "Kiribati (Enderbury)", - "Pacific\/Fakaofo": "it-Tokelau (Fakaofo)", - "Pacific\/Fiji": "Fiġi (Fiji)", - "Pacific\/Funafuti": "Tuvalu (Funafuti)", - "Pacific\/Galapagos": "l-Ekwador (Galapagos)", - "Pacific\/Gambier": "Polineżja Franċiża (Gambier)", - "Pacific\/Guadalcanal": "il-Gżejjer Solomon (Guadalcanal)", - "Pacific\/Guam": "Guam (Guam)", - "Pacific\/Honolulu": "l-Istati Uniti (Honolulu)", - "Pacific\/Johnston": "Il-Gżejjer Minuri Mbiegħda tal-Istati Uniti (Johnston)", - "Pacific\/Kiritimati": "Kiribati (Kiritimati)", - "Pacific\/Kosrae": "Mikroneżja (Kosrae)", - "Pacific\/Kwajalein": "Gżejjer Marshall (Kwajalein)", - "Pacific\/Majuro": "Gżejjer Marshall (Majuro)", - "Pacific\/Marquesas": "Polineżja Franċiża (Marquesas)", - "Pacific\/Midway": "Il-Gżejjer Minuri Mbiegħda tal-Istati Uniti (Midway)", - "Pacific\/Nauru": "Nauru (Nauru)", - "Pacific\/Niue": "Niue (Niue)", - "Pacific\/Norfolk": "Gżira Norfolk (Norfolk)", - "Pacific\/Noumea": "New Caledonia (Noumea)", - "Pacific\/Pago_Pago": "is-Samoa Amerikana (Pago Pago)", - "Pacific\/Palau": "Palau (Palau)", - "Pacific\/Pitcairn": "Gżejjer Pitcairn (Pitcairn)", - "Pacific\/Ponape": "Mikroneżja (Pohnpei)", - "Pacific\/Port_Moresby": "Papua New Guinea (Port Moresby)", - "Pacific\/Rarotonga": "Gżejjer Cook (Rarotonga)", - "Pacific\/Saipan": "Ġżejjer Mariana tat-Tramuntana (Saipan)", - "Pacific\/Tahiti": "Polineżja Franċiża (Tahiti)", - "Pacific\/Tarawa": "Kiribati (Tarawa)", - "Pacific\/Tongatapu": "Tonga (Tongatapu)", - "Pacific\/Truk": "Mikroneżja (Chuuk)", - "Pacific\/Wake": "Il-Gżejjer Minuri Mbiegħda tal-Istati Uniti (Wake)", - "Pacific\/Wallis": "Wallis u Futuna (Wallis)" + "Indian\/Antananarivo": "Ħin ta’ Madagascar (Antananarivo)", + "Indian\/Chagos": "Ħin ta’ Territorju Brittaniku tal-Oċean Indjan (Chagos)", + "Indian\/Christmas": "Ħin ta’ il-Gżira Christmas (Christmas)", + "Indian\/Cocos": "Ħin ta’ Gżejjer Cocos (Keeling) (Cocos)", + "Indian\/Comoro": "Ħin ta’ Comoros (Comoro)", + "Indian\/Kerguelen": "Ħin ta’ It-Territorji Franċiżi tan-Nofsinhar (Kerguelen)", + "Indian\/Mahe": "Ħin ta’ is-Seychelles (Mahe)", + "Indian\/Maldives": "Ħin ta’ il-Maldivi (il-Maldivi)", + "Indian\/Mauritius": "Ħin ta’ Mauritius (Mauritius)", + "Indian\/Mayotte": "Ħin ta’ Mayotte (Mayotte)", + "Indian\/Reunion": "Ħin ta’ Réunion (Reunion)", + "Pacific\/Apia": "Ħin ta’ Samoa (Apia)", + "Pacific\/Auckland": "Ħin ta’ New Zealand (Auckland)", + "Pacific\/Bougainville": "Ħin ta’ Papua New Guinea (Bougainville)", + "Pacific\/Chatham": "Ħin ta’ New Zealand (Chatham)", + "Pacific\/Easter": "Ħin ta’ iċ-Ċili (Easter)", + "Pacific\/Efate": "Ħin ta’ Vanuatu (Efate)", + "Pacific\/Enderbury": "Ħin ta’ Kiribati (Enderbury)", + "Pacific\/Fakaofo": "Ħin ta’ it-Tokelau (Fakaofo)", + "Pacific\/Fiji": "Ħin ta’ Fiġi (Fiji)", + "Pacific\/Funafuti": "Ħin ta’ Tuvalu (Funafuti)", + "Pacific\/Galapagos": "Ħin ta’ l-Ekwador (Galapagos)", + "Pacific\/Gambier": "Ħin ta’ Polineżja Franċiża (Gambier)", + "Pacific\/Guadalcanal": "Ħin ta’ il-Gżejjer Solomon (Guadalcanal)", + "Pacific\/Guam": "Ħin ta’ Guam (Guam)", + "Pacific\/Honolulu": "Ħin ta’ l-Istati Uniti (Honolulu)", + "Pacific\/Johnston": "Ħin ta’ Il-Gżejjer Minuri Mbiegħda tal-Istati Uniti (Johnston)", + "Pacific\/Kiritimati": "Ħin ta’ Kiribati (Kiritimati)", + "Pacific\/Kosrae": "Ħin ta’ Mikroneżja (Kosrae)", + "Pacific\/Kwajalein": "Ħin ta’ Gżejjer Marshall (Kwajalein)", + "Pacific\/Majuro": "Ħin ta’ Gżejjer Marshall (Majuro)", + "Pacific\/Marquesas": "Ħin ta’ Polineżja Franċiża (Marquesas)", + "Pacific\/Midway": "Ħin ta’ Il-Gżejjer Minuri Mbiegħda tal-Istati Uniti (Midway)", + "Pacific\/Nauru": "Ħin ta’ Nauru (Nauru)", + "Pacific\/Niue": "Ħin ta’ Niue (Niue)", + "Pacific\/Norfolk": "Ħin ta’ Gżira Norfolk (Norfolk)", + "Pacific\/Noumea": "Ħin ta’ New Caledonia (Noumea)", + "Pacific\/Pago_Pago": "Ħin ta’ is-Samoa Amerikana (Pago Pago)", + "Pacific\/Palau": "Ħin ta’ Palau (Palau)", + "Pacific\/Pitcairn": "Ħin ta’ Gżejjer Pitcairn (Pitcairn)", + "Pacific\/Ponape": "Ħin ta’ Mikroneżja (Pohnpei)", + "Pacific\/Port_Moresby": "Ħin ta’ Papua New Guinea (Port Moresby)", + "Pacific\/Rarotonga": "Ħin ta’ Gżejjer Cook (Rarotonga)", + "Pacific\/Saipan": "Ħin ta’ Ġżejjer Mariana tat-Tramuntana (Saipan)", + "Pacific\/Tahiti": "Ħin ta’ Polineżja Franċiża (Tahiti)", + "Pacific\/Tarawa": "Ħin ta’ Kiribati (Tarawa)", + "Pacific\/Tongatapu": "Ħin ta’ Tonga (Tongatapu)", + "Pacific\/Truk": "Ħin ta’ Mikroneżja (Chuuk)", + "Pacific\/Wake": "Ħin ta’ Il-Gżejjer Minuri Mbiegħda tal-Istati Uniti (Wake)", + "Pacific\/Wallis": "Ħin ta’ Wallis u Futuna (Wallis)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/my.json b/src/Symfony/Component/Intl/Resources/data/timezones/my.json index 31fac4b8bd3f0..4885b689bf8c3 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/my.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/my.json @@ -99,7 +99,7 @@ "America\/Detroit": "မြောက်အမေရိက အရှေ့ပိုင်းအချိန် (ဒက်ထရွိုက်)", "America\/Dominica": "အတ္တလန်တစ် အချိန် (ဒိုမီနီကာ)", "America\/Edmonton": "မြောက်အမေရိက တောင်တန်းဒေသအချိန် (အက်ဒ်မွန်တန်)", - "America\/Eirunepe": "ဘရာဇီး (အီရူနီပီ)", + "America\/Eirunepe": "ဘရာဇီး အချိန် (အီရူနီပီ)", "America\/El_Salvador": "မြောက်အမေရိက အလယ်ပိုင်းအချိန် (အယ်လ်ဆာဗေဒို)", "America\/Fort_Nelson": "မြောက်အမေရိက တောင်တန်းဒေသအချိန် (ဖို့တ် နယ်လ်ဆင်)", "America\/Fortaleza": "ဘရာဇီး အချိန် (ဖို့တ်တာလီဇာ)", @@ -151,7 +151,7 @@ "America\/Moncton": "အတ္တလန်တစ် အချိန် (မွန်ခ်တွန်)", "America\/Monterrey": "မြောက်အမေရိက အလယ်ပိုင်းအချိန် (မွန်တဲရေး)", "America\/Montevideo": "ဥရုဂွေး အချိန် (မွန်တီဗီဒီအို)", - "America\/Montreal": "ကနေဒါ (Montreal)", + "America\/Montreal": "ကနေဒါ အချိန် (Montreal)", "America\/Montserrat": "အတ္တလန်တစ် အချိန် (မွန့်(တ်)ဆေးရတ်)", "America\/Nassau": "မြောက်အမေရိက အရှေ့ပိုင်းအချိန် (နာ့ဆော်)", "America\/New_York": "မြောက်အမေရိက အရှေ့ပိုင်းအချိန် (နယူးယောက်)", @@ -176,7 +176,7 @@ "America\/Recife": "ဘရာဇီး အချိန် (ဟေစီဖီလ်)", "America\/Regina": "မြောက်အမေရိက အလယ်ပိုင်းအချိန် (ရယ်ဂျီနာ)", "America\/Resolute": "မြောက်အမေရိက အလယ်ပိုင်းအချိန် (ရီဆိုလုပ်(တ်))", - "America\/Rio_Branco": "ဘရာဇီး (ရီယို ဘရန်ကို)", + "America\/Rio_Branco": "ဘရာဇီး အချိန် (ရီယို ဘရန်ကို)", "America\/Santa_Isabel": "အနောက်တောင် မက္ကဆီကို အချိန် (ဆန်တာ အစ္ဇဘဲလ်)", "America\/Santarem": "ဘရာဇီး အချိန် (ဆန်တာရမ်)", "America\/Santiago": "ချီလီ အချိန် (ဆန်တီအာဂို)", @@ -217,7 +217,7 @@ "Asia\/Aden": "အာရေဗျ အချိန် (အာဒင်)", "Asia\/Almaty": "အရှေ့ကာဇက်စတန် အချိန် (အော်မာတီ)", "Asia\/Amman": "အရှေ့ဥရောပ အချိန် (အာမာန်း)", - "Asia\/Anadyr": "ရုရှား (အန်အာဒီအာ)", + "Asia\/Anadyr": "ရုရှား အချိန် (အန်အာဒီအာ)", "Asia\/Aqtau": "အနောက်ကာဇက်စတန် အချိန် (အက်တာဥု)", "Asia\/Aqtobe": "အနောက်ကာဇက်စတန် အချိန် (အာချတူးဘီ)", "Asia\/Ashgabat": "တာ့ခ်မင်နစ္စတန် အချိန် (အာရှ်ဂါဘာဒ်)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "အာရေဗျ အချိန် (ဘာရိန်း)", "Asia\/Baku": "အဇာဘိုင်ဂျန် အချိန် (ဘာကူ)", "Asia\/Bangkok": "အင်ဒိုချိုင်းနား အချိန် (ဘန်ကောက်)", - "Asia\/Barnaul": "ရုရှား (ဘရ်နာအူ)", + "Asia\/Barnaul": "ရုရှား အချိန် (ဘရ်နာအူ)", "Asia\/Beirut": "အရှေ့ဥရောပ အချိန် (ဘေရွတ်)", "Asia\/Bishkek": "ကာဂျစ္စတန် အချိန် (ဘီရှ်ခက်)", "Asia\/Brunei": "ဘရူနိုင်း စံတော်ချိန်", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "အရှေ့ပိုင်း အင်ဒိုနီးရှား အချိန် (ဂျာရာပူရာ)", "Asia\/Jerusalem": "အစ္စရေး အချိန် (ဂျေရုဆလင်)", "Asia\/Kabul": "အာဖဂန်နစ္စတန် အချိန် (ကဘူးလျ)", - "Asia\/Kamchatka": "ရုရှား (ခမ်ချာ့ခါ)", + "Asia\/Kamchatka": "ရုရှား အချိန် (ခမ်ချာ့ခါ)", "Asia\/Karachi": "ပါကစ္စတန် အချိန် (ကရာချိ)", "Asia\/Katmandu": "နီပေါ အချိန် (ခတ်တမန်ဒူ)", "Asia\/Khandyga": "ယူခူးတ်စ် အချိန် (ခန်ဒိုင်ဂါ)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "အီရန် အချိန် (တီဟီရန်)", "Asia\/Thimphu": "ဘူတန် အချိန် (တင်ဖူး)", "Asia\/Tokyo": "ဂျပန် အချိန် (တိုကျို)", - "Asia\/Tomsk": "ရုရှား (တွန်မ်စ်ခ်)", + "Asia\/Tomsk": "ရုရှား အချိန် (တွန်မ်စ်ခ်)", "Asia\/Ulaanbaatar": "ဥလန်ဘာတော အချိန်", - "Asia\/Urumqi": "တရုတ် (အူရုမ်ချီ)", + "Asia\/Urumqi": "တရုတ် အချိန် (အူရုမ်ချီ)", "Asia\/Ust-Nera": "ဗလာဒီဗော့စတော့ခ် အချိန် (အူးစ် နီရား)", "Asia\/Vientiane": "အင်ဒိုချိုင်းနား အချိန် (ဗီယင်ကျန်း)", "Asia\/Vladivostok": "ဗလာဒီဗော့စတော့ခ် အချိန်", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "ဂရင်းနစ် စံတော်ချိန် (ဂွန်းဇီ)", "Europe\/Helsinki": "အရှေ့ဥရောပ အချိန် (ဟဲလ်စင်ကီ)", "Europe\/Isle_of_Man": "ဂရင်းနစ် စံတော်ချိန် (မန်းကျွန်း)", - "Europe\/Istanbul": "တူရကီ (အစ္စတန်ဘူလ်)", + "Europe\/Istanbul": "တူရကီ အချိန် (အစ္စတန်ဘူလ်)", "Europe\/Jersey": "ဂရင်းနစ် စံတော်ချိန် (ဂျာစီ)", "Europe\/Kaliningrad": "အရှေ့ဥရောပ အချိန် (ခါလီနင်ဂရက်)", "Europe\/Kiev": "အရှေ့ဥရောပ အချိန် (ခီးအက်ဖ်)", - "Europe\/Kirov": "ရုရှား (ခီရိုဗ်)", + "Europe\/Kirov": "ရုရှား အချိန် (ခီရိုဗ်)", "Europe\/Lisbon": "အနောက်ဥရောပ အချိန် (လစ္စဘွန်း)", "Europe\/Ljubljana": "ဥရောပအလယ်ပိုင်း အချိန် (လူဘလီအားနား)", "Europe\/London": "ဂရင်းနစ် စံတော်ချိန် (လန်ဒန်)", @@ -362,7 +362,7 @@ "Europe\/Prague": "ဥရောပအလယ်ပိုင်း အချိန် (ပရက်ဂ်)", "Europe\/Riga": "အရှေ့ဥရောပ အချိန် (ရီဂါ)", "Europe\/Rome": "ဥရောပအလယ်ပိုင်း အချိန် (ရောမ)", - "Europe\/Samara": "ရုရှား (ဆာမားရာ)", + "Europe\/Samara": "ရုရှား အချိန် (ဆာမားရာ)", "Europe\/San_Marino": "ဥရောပအလယ်ပိုင်း အချိန် (ဆန်မရီးနို)", "Europe\/Sarajevo": "ဥရောပအလယ်ပိုင်း အချိန် (ဆာရာယေဗို)", "Europe\/Saratov": "မော်စကို အချိန် (ဆာရာတို့ဖ်)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "ဝိတ်ခ်ကျွန်း အချိန် (ဝိက်ခ်)", "Pacific\/Wallis": "ဝေါလီစ်နှင့် ဖူကျူနာ အချိန်" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/nb.json b/src/Symfony/Component/Intl/Resources/data/timezones/nb.json index f5b65c9f648e7..eb16dbdb06977 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/nb.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/nb.json @@ -151,7 +151,7 @@ "America\/Moncton": "tidssone for den nordamerikanske atlanterhavskysten (Moncton)", "America\/Monterrey": "tidssone for det sentrale Nord-Amerika (Monterrey)", "America\/Montevideo": "uruguayansk tid (Montevideo)", - "America\/Montreal": "Canada (Montreal)", + "America\/Montreal": "tidssone for Canada (Montreal)", "America\/Montserrat": "tidssone for den nordamerikanske atlanterhavskysten (Montserrat)", "America\/Nassau": "tidssone for den nordamerikanske østkysten (Nassau)", "America\/New_York": "tidssone for den nordamerikanske østkysten (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "arabisk tid (Bahrain)", "Asia\/Baku": "aserbajdsjansk tid (Baku)", "Asia\/Bangkok": "indokinesisk tid (Bangkok)", - "Asia\/Barnaul": "Russland (Barnaul)", + "Asia\/Barnaul": "tidssone for Russland (Barnaul)", "Asia\/Beirut": "østeuropeisk tid (Beirut)", "Asia\/Bishkek": "kirgisisk tid (Bisjkek)", "Asia\/Brunei": "tidssone for Brunei Darussalam", @@ -288,9 +288,9 @@ "Asia\/Tehran": "iransk tid (Teheran)", "Asia\/Thimphu": "bhutansk tid (Thimpu)", "Asia\/Tokyo": "japansk tid (Tokyo)", - "Asia\/Tomsk": "Russland (Tomsk)", + "Asia\/Tomsk": "tidssone for Russland (Tomsk)", "Asia\/Ulaanbaatar": "tidssone for Ulan Bator", - "Asia\/Urumqi": "Kina (Ürümqi)", + "Asia\/Urumqi": "tidssone for Kina (Ürümqi)", "Asia\/Ust-Nera": "tidssone for Vladivostok (Ust-Nera)", "Asia\/Vientiane": "indokinesisk tid (Vientiane)", "Asia\/Vladivostok": "tidssone for Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwich middeltid (Guernsey)", "Europe\/Helsinki": "østeuropeisk tid (Helsingfors)", "Europe\/Isle_of_Man": "Greenwich middeltid (Man)", - "Europe\/Istanbul": "Tyrkia (Istanbul)", + "Europe\/Istanbul": "tidssone for Tyrkia (Istanbul)", "Europe\/Jersey": "Greenwich middeltid (Jersey)", "Europe\/Kaliningrad": "østeuropeisk tid (Kaliningrad)", "Europe\/Kiev": "østeuropeisk tid (Kiev)", - "Europe\/Kirov": "Russland (Kirov)", + "Europe\/Kirov": "tidssone for Russland (Kirov)", "Europe\/Lisbon": "vesteuropeisk tid (Lisboa)", "Europe\/Ljubljana": "sentraleuropeisk tid (Ljubljana)", "Europe\/London": "Greenwich middeltid (London)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "tidssone for Wake Island", "Pacific\/Wallis": "tidssone for Wallis- og Futunaøyene" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ne.json b/src/Symfony/Component/Intl/Resources/data/timezones/ne.json index be2c2e2986b95..4d24875465af1 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ne.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ne.json @@ -99,7 +99,7 @@ "America\/Detroit": "पूर्वी समय (डिट्रोइट)", "America\/Dominica": "एट्लान्टिक समय (डोमिनिका)", "America\/Edmonton": "हिमाली समय (एड्मोन्टन)", - "America\/Eirunepe": "ब्राजिल (आइरनेपे)", + "America\/Eirunepe": "ब्राजिल समय (आइरनेपे)", "America\/El_Salvador": "केन्द्रीय समय (एल् साल्भाडोर)", "America\/Fort_Nelson": "हिमाली समय (फोर्ट नेल्सन)", "America\/Fortaleza": "ब्राजिलीया समय (फोर्टालेजा)", @@ -151,7 +151,7 @@ "America\/Moncton": "एट्लान्टिक समय (मोन्कटन)", "America\/Monterrey": "केन्द्रीय समय (मोन्टेर्रे)", "America\/Montevideo": "उरुग्वे समय (मोन्टेभिडियो)", - "America\/Montreal": "क्यानाडा (Montreal)", + "America\/Montreal": "क्यानाडा समय (Montreal)", "America\/Montserrat": "एट्लान्टिक समय (मन्टसेर्राट)", "America\/Nassau": "पूर्वी समय (नास्साउ)", "America\/New_York": "पूर्वी समय (न्युयोर्क)", @@ -176,7 +176,7 @@ "America\/Recife": "ब्राजिलीया समय (रिसाइफ)", "America\/Regina": "केन्द्रीय समय (रेजिना)", "America\/Resolute": "केन्द्रीय समय (रिजोलुट)", - "America\/Rio_Branco": "ब्राजिल (रियो ब्रान्को)", + "America\/Rio_Branco": "ब्राजिल समय (रियो ब्रान्को)", "America\/Santa_Isabel": "उत्तर पश्चिम मेक्सिको समय (सान्टा ईसाबेल)", "America\/Santarem": "ब्राजिलीया समय (सान्टारेम)", "America\/Santiago": "चिली समय (सान्टिआगो)", @@ -217,7 +217,7 @@ "Asia\/Aden": "अरबी समय (एडेन)", "Asia\/Almaty": "पूर्वी काजकस्तान समय (आल्माटी)", "Asia\/Amman": "पूर्वी युरोपेली समय (आम्मान)", - "Asia\/Anadyr": "रूस (आनाडियर)", + "Asia\/Anadyr": "रूस समय (आनाडियर)", "Asia\/Aqtau": "पश्चिम काजकस्तान समय (आक्टाउ)", "Asia\/Aqtobe": "पश्चिम काजकस्तान समय (आक्टोब)", "Asia\/Ashgabat": "तुर्कमेनिस्तान समय (अस्काबाट)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "अरबी समय (बहराईन)", "Asia\/Baku": "अजरबैजान समय (बाकु)", "Asia\/Bangkok": "इन्डोचाइना समय (बैंकक)", - "Asia\/Barnaul": "रूस (बरनौल)", + "Asia\/Barnaul": "रूस समय (बरनौल)", "Asia\/Beirut": "पूर्वी युरोपेली समय (बेईरुट)", "Asia\/Bishkek": "किर्गिस्तान समय (बिसकेक्)", "Asia\/Brunei": "ब्रुनाइ दारूस्सलम समय", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "पूर्वी इन्डोनेशिया समय (जयापुरा)", "Asia\/Jerusalem": "इजरायल समय (जेरुसलेम)", "Asia\/Kabul": "अफगानिस्तान समय (काबुल)", - "Asia\/Kamchatka": "रूस (कामचट्का)", + "Asia\/Kamchatka": "रूस समय (कामचट्का)", "Asia\/Karachi": "पाकिस्तानी समय (कराची)", "Asia\/Katmandu": "नेपाली समय (काठमाण्डौं)", "Asia\/Khandyga": "याकुस्ट समय (खान्दिगा)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "इरानी समय (तेहेरान)", "Asia\/Thimphu": "भुटानी समय (थिम्पु)", "Asia\/Tokyo": "जापान समय (टोकियो)", - "Asia\/Tomsk": "रूस (टोम्स्क)", + "Asia\/Tomsk": "रूस समय (टोम्स्क)", "Asia\/Ulaanbaatar": "उलान बाटोर समय (उलानबटार)", - "Asia\/Urumqi": "चीन (उरूम्की)", + "Asia\/Urumqi": "चीन समय (उरूम्की)", "Asia\/Ust-Nera": "भ्लादिभास्टोक समय (उस्ट-नेरा)", "Asia\/Vientiane": "इन्डोचाइना समय (भियन्तिन)", "Asia\/Vladivostok": "भ्लादिभास्टोक समय (भ्लाडिभास्टोक)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "ग्रीनविच मिन समय (गुएर्नसे)", "Europe\/Helsinki": "पूर्वी युरोपेली समय (हेल्सिन्की)", "Europe\/Isle_of_Man": "ग्रीनविच मिन समय (इजल अफ् म्यान)", - "Europe\/Istanbul": "टर्की (ईस्टानबुल)", + "Europe\/Istanbul": "टर्की समय (ईस्टानबुल)", "Europe\/Jersey": "ग्रीनविच मिन समय (जर्सी)", "Europe\/Kaliningrad": "पूर्वी युरोपेली समय (कालिनिनग्राद)", "Europe\/Kiev": "पूर्वी युरोपेली समय (किभ)", - "Europe\/Kirov": "रूस (किरोभ)", + "Europe\/Kirov": "रूस समय (किरोभ)", "Europe\/Lisbon": "पश्चिमी युरोपेली समय (लिस्बोन)", "Europe\/Ljubljana": "केन्द्रीय युरोपेली समय (लजुबिजाना)", "Europe\/London": "ग्रीनविच मिन समय (लण्डन)", @@ -362,7 +362,7 @@ "Europe\/Prague": "केन्द्रीय युरोपेली समय (प्राग)", "Europe\/Riga": "पूर्वी युरोपेली समय (रिगा)", "Europe\/Rome": "केन्द्रीय युरोपेली समय (रोम)", - "Europe\/Samara": "रूस (सामारा)", + "Europe\/Samara": "रूस समय (सामारा)", "Europe\/San_Marino": "केन्द्रीय युरोपेली समय (सान मारिनो)", "Europe\/Sarajevo": "केन्द्रीय युरोपेली समय (साराजेभो)", "Europe\/Saratov": "मस्को समय (साराटोभ)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "वेक टापु समय", "Pacific\/Wallis": "वालिस् र फुटुना समय" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/nl.json b/src/Symfony/Component/Intl/Resources/data/timezones/nl.json index aafb0fc424f5d..2a2ed1950ed58 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/nl.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/nl.json @@ -151,7 +151,7 @@ "America\/Moncton": "Atlantic-tijd (Moncton)", "America\/Monterrey": "Central-tijd (Monterrey)", "America\/Montevideo": "Uruguayaanse tijd (Montevideo)", - "America\/Montreal": "Canada (Montreal)", + "America\/Montreal": "Canada-tijd (Montreal)", "America\/Montserrat": "Atlantic-tijd (Montserrat)", "America\/Nassau": "Eastern-tijd (Nassau)", "America\/New_York": "Eastern-tijd (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Arabische tijd (Bahrein)", "Asia\/Baku": "Azerbeidzjaanse tijd (Bakoe)", "Asia\/Bangkok": "Indochinese tijd (Bangkok)", - "Asia\/Barnaul": "Rusland (Barnaul)", + "Asia\/Barnaul": "Rusland-tijd (Barnaul)", "Asia\/Beirut": "Oost-Europese tijd (Beiroet)", "Asia\/Bishkek": "Kirgizische tijd (Bisjkek)", "Asia\/Brunei": "Bruneise tijd", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Iraanse tijd (Teheran)", "Asia\/Thimphu": "Bhutaanse tijd (Thimphu)", "Asia\/Tokyo": "Japanse tijd (Tokio)", - "Asia\/Tomsk": "Rusland (Tomsk)", + "Asia\/Tomsk": "Rusland-tijd (Tomsk)", "Asia\/Ulaanbaatar": "Ulaanbaatar-tijd", - "Asia\/Urumqi": "China (Urumqi)", + "Asia\/Urumqi": "China-tijd (Urumqi)", "Asia\/Ust-Nera": "Vladivostok-tijd (Ust-Nera)", "Asia\/Vientiane": "Indochinese tijd (Vientiane)", "Asia\/Vladivostok": "Vladivostok-tijd", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwich Mean Time (Guernsey)", "Europe\/Helsinki": "Oost-Europese tijd (Helsinki)", "Europe\/Isle_of_Man": "Greenwich Mean Time (Isle of Man)", - "Europe\/Istanbul": "Turkije (Istanboel)", + "Europe\/Istanbul": "Turkije-tijd (Istanboel)", "Europe\/Jersey": "Greenwich Mean Time (Jersey)", "Europe\/Kaliningrad": "Oost-Europese tijd (Kaliningrad)", "Europe\/Kiev": "Oost-Europese tijd (Kiev)", - "Europe\/Kirov": "Rusland (Kirov)", + "Europe\/Kirov": "Rusland-tijd (Kirov)", "Europe\/Lisbon": "West-Europese tijd (Lissabon)", "Europe\/Ljubljana": "Midden-Europese tijd (Ljubljana)", "Europe\/London": "Greenwich Mean Time (Londen)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Wake-eilandse tijd", "Pacific\/Wallis": "Wallis en Futunase tijd" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/nn.json b/src/Symfony/Component/Intl/Resources/data/timezones/nn.json index e5c13be0a797c..b0c92f91c211f 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/nn.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/nn.json @@ -99,7 +99,7 @@ "America\/Detroit": "tidssone for den nordamerikansk austkysten (Detroit)", "America\/Dominica": "tidssone for den nordamerikanske atlanterhavskysten (Dominica)", "America\/Edmonton": "tidssone for Rocky Mountains (USA) (Edmonton)", - "America\/Eirunepe": "Brasil (Eirunepe)", + "America\/Eirunepe": "tidssone for Brasil (Eirunepe)", "America\/El_Salvador": "tidssone for sentrale Nord-Amerika (El Salvador)", "America\/Fort_Nelson": "tidssone for Rocky Mountains (USA) (Fort Nelson)", "America\/Fortaleza": "tidssone for Brasilia (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "tidssone for den nordamerikanske atlanterhavskysten (Moncton)", "America\/Monterrey": "tidssone for sentrale Nord-Amerika (Monterrey)", "America\/Montevideo": "uruguayansk tid (Montevideo)", - "America\/Montreal": "Canada (Montreal)", + "America\/Montreal": "tidssone for Canada (Montreal)", "America\/Montserrat": "tidssone for den nordamerikanske atlanterhavskysten (Montserrat)", "America\/Nassau": "tidssone for den nordamerikansk austkysten (Nassau)", "America\/New_York": "tidssone for den nordamerikansk austkysten (New York)", @@ -176,7 +176,7 @@ "America\/Recife": "tidssone for Brasilia (Recife)", "America\/Regina": "tidssone for sentrale Nord-Amerika (Regina)", "America\/Resolute": "tidssone for sentrale Nord-Amerika (Resolute)", - "America\/Rio_Branco": "Brasil (Rio Branco)", + "America\/Rio_Branco": "tidssone for Brasil (Rio Branco)", "America\/Santa_Isabel": "tidssone for nordvestlege Mexico (Santa Isabel)", "America\/Santarem": "tidssone for Brasilia (Santarém)", "America\/Santiago": "chilensk tid (Santiago)", @@ -217,7 +217,7 @@ "Asia\/Aden": "arabisk tid (Aden)", "Asia\/Almaty": "austkasakhstansk tid (Almaty)", "Asia\/Amman": "austeuropeisk tid (Amman)", - "Asia\/Anadyr": "Russland (Anadyr)", + "Asia\/Anadyr": "tidssone for Russland (Anadyr)", "Asia\/Aqtau": "vestkasakhstansk tid (Aktau)", "Asia\/Aqtobe": "vestkasakhstansk tid (Aktobe)", "Asia\/Ashgabat": "turkmensk tid (Asjgabat)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "arabisk tid (Bahrain)", "Asia\/Baku": "aserbajdsjansk tid (Baku)", "Asia\/Bangkok": "indokinesisk tid (Bangkok)", - "Asia\/Barnaul": "Russland (Barnaul)", + "Asia\/Barnaul": "tidssone for Russland (Barnaul)", "Asia\/Beirut": "austeuropeisk tid (Beirut)", "Asia\/Bishkek": "kirgisisk tid (Bisjkek)", "Asia\/Brunei": "tidssone for Brunei Darussalam", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "austindonesisk tid (Jajapura)", "Asia\/Jerusalem": "israelsk tid (Jerusalem)", "Asia\/Kabul": "afghansk tid (Kabul)", - "Asia\/Kamchatka": "Russland (Kamtsjatka)", + "Asia\/Kamchatka": "tidssone for Russland (Kamtsjatka)", "Asia\/Karachi": "pakistansk tid (Karachi)", "Asia\/Katmandu": "nepalsk tid (Katmandu)", "Asia\/Khandyga": "tidssone for Jakutsk (Khandyga)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "iransk tid (Teheran)", "Asia\/Thimphu": "bhutansk tid (Thimphu)", "Asia\/Tokyo": "japansk tid (Tokyo)", - "Asia\/Tomsk": "Russland (Tomsk)", + "Asia\/Tomsk": "tidssone for Russland (Tomsk)", "Asia\/Ulaanbaatar": "tidssone for Ulan Bator", - "Asia\/Urumqi": "Kina (Ürümqi)", + "Asia\/Urumqi": "tidssone for Kina (Ürümqi)", "Asia\/Ust-Nera": "tidssone for Vladivostok (Ust-Nera)", "Asia\/Vientiane": "indokinesisk tid (Vientiane)", "Asia\/Vladivostok": "tidssone for Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwich middeltid (Guernsey)", "Europe\/Helsinki": "austeuropeisk tid (Helsingfors)", "Europe\/Isle_of_Man": "Greenwich middeltid (Man)", - "Europe\/Istanbul": "Tyrkia (Istanbul)", + "Europe\/Istanbul": "tidssone for Tyrkia (Istanbul)", "Europe\/Jersey": "Greenwich middeltid (Jersey)", "Europe\/Kaliningrad": "austeuropeisk tid (Kaliningrad)", "Europe\/Kiev": "austeuropeisk tid (Kiev)", - "Europe\/Kirov": "Russland (Kirov)", + "Europe\/Kirov": "tidssone for Russland (Kirov)", "Europe\/Lisbon": "vesteuropeisk tid (Lisboa)", "Europe\/Ljubljana": "sentraleuropeisk tid (Ljubljana)", "Europe\/London": "Greenwich middeltid (London)", @@ -362,7 +362,7 @@ "Europe\/Prague": "sentraleuropeisk tid (Praha)", "Europe\/Riga": "austeuropeisk tid (Riga)", "Europe\/Rome": "sentraleuropeisk tid (Roma)", - "Europe\/Samara": "Russland (Samara)", + "Europe\/Samara": "tidssone for Russland (Samara)", "Europe\/San_Marino": "sentraleuropeisk tid (San Marino)", "Europe\/Sarajevo": "sentraleuropeisk tid (Sarajevo)", "Europe\/Saratov": "tidssone for Moskva (Saratov)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "tidssone for Wake Island", "Pacific\/Wallis": "tidssone for Wallis- og Futunaøyane" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/no.json b/src/Symfony/Component/Intl/Resources/data/timezones/no.json deleted file mode 100644 index f5b65c9f648e7..0000000000000 --- a/src/Symfony/Component/Intl/Resources/data/timezones/no.json +++ /dev/null @@ -1,446 +0,0 @@ -{ - "Version": "2.1.48.42", - "Names": { - "Africa\/Abidjan": "Greenwich middeltid (Abidjan)", - "Africa\/Accra": "Greenwich middeltid (Accra)", - "Africa\/Addis_Ababa": "østafrikansk tid (Addis Abeba)", - "Africa\/Algiers": "sentraleuropeisk tid (Alger)", - "Africa\/Asmera": "østafrikansk tid (Asmara)", - "Africa\/Bamako": "Greenwich middeltid (Bamako)", - "Africa\/Bangui": "vestafrikansk tid (Bangui)", - "Africa\/Banjul": "Greenwich middeltid (Banjul)", - "Africa\/Bissau": "Greenwich middeltid (Bissau)", - "Africa\/Blantyre": "sentralafrikansk tid (Blantyre)", - "Africa\/Brazzaville": "vestafrikansk tid (Brazzaville)", - "Africa\/Bujumbura": "sentralafrikansk tid (Bujumbura)", - "Africa\/Cairo": "østeuropeisk tid (Kairo)", - "Africa\/Casablanca": "vesteuropeisk tid (Casablanca)", - "Africa\/Ceuta": "sentraleuropeisk tid (Ceuta)", - "Africa\/Conakry": "Greenwich middeltid (Conakry)", - "Africa\/Dakar": "Greenwich middeltid (Dakar)", - "Africa\/Dar_es_Salaam": "østafrikansk tid (Dar-es-Salaam)", - "Africa\/Djibouti": "østafrikansk tid (Djibouti)", - "Africa\/Douala": "vestafrikansk tid (Douala)", - "Africa\/El_Aaiun": "vesteuropeisk tid (El Aaiún)", - "Africa\/Freetown": "Greenwich middeltid (Freetown)", - "Africa\/Gaborone": "sentralafrikansk tid (Gaborone)", - "Africa\/Harare": "sentralafrikansk tid (Harare)", - "Africa\/Johannesburg": "sørafrikansk tid (Johannesburg)", - "Africa\/Juba": "østafrikansk tid (Juba)", - "Africa\/Kampala": "østafrikansk tid (Kampala)", - "Africa\/Khartoum": "sentralafrikansk tid (Khartoum)", - "Africa\/Kigali": "sentralafrikansk tid (Kigali)", - "Africa\/Kinshasa": "vestafrikansk tid (Kinshasa)", - "Africa\/Lagos": "vestafrikansk tid (Lagos)", - "Africa\/Libreville": "vestafrikansk tid (Libreville)", - "Africa\/Lome": "Greenwich middeltid (Lomé)", - "Africa\/Luanda": "vestafrikansk tid (Luanda)", - "Africa\/Lubumbashi": "sentralafrikansk tid (Lubumbashi)", - "Africa\/Lusaka": "sentralafrikansk tid (Lusaka)", - "Africa\/Malabo": "vestafrikansk tid (Malabo)", - "Africa\/Maputo": "sentralafrikansk tid (Maputo)", - "Africa\/Maseru": "sørafrikansk tid (Maseru)", - "Africa\/Mbabane": "sørafrikansk tid (Mbabane)", - "Africa\/Mogadishu": "østafrikansk tid (Mogadishu)", - "Africa\/Monrovia": "Greenwich middeltid (Monrovia)", - "Africa\/Nairobi": "østafrikansk tid (Nairobi)", - "Africa\/Ndjamena": "vestafrikansk tid (Ndjamena)", - "Africa\/Niamey": "vestafrikansk tid (Niamey)", - "Africa\/Nouakchott": "Greenwich middeltid (Nouakchott)", - "Africa\/Ouagadougou": "Greenwich middeltid (Ouagadougou)", - "Africa\/Porto-Novo": "vestafrikansk tid (Porto-Novo)", - "Africa\/Sao_Tome": "Greenwich middeltid (São Tomé)", - "Africa\/Tripoli": "østeuropeisk tid (Tripoli)", - "Africa\/Tunis": "sentraleuropeisk tid (Tunis)", - "Africa\/Windhoek": "sentralafrikansk tid (Windhoek)", - "America\/Adak": "tidssone for Hawaii og Aleutene (Adak)", - "America\/Anchorage": "alaskisk tid (Anchorage)", - "America\/Anguilla": "tidssone for den nordamerikanske atlanterhavskysten (Anguilla)", - "America\/Antigua": "tidssone for den nordamerikanske atlanterhavskysten (Antigua)", - "America\/Araguaina": "tidssone for Brasilia (Araguaína)", - "America\/Argentina\/La_Rioja": "argentinsk tid (La Rioja)", - "America\/Argentina\/Rio_Gallegos": "argentinsk tid (Rio Gallegos)", - "America\/Argentina\/Salta": "argentinsk tid (Salta)", - "America\/Argentina\/San_Juan": "argentinsk tid (San Juan)", - "America\/Argentina\/San_Luis": "vestargentinsk tid (San Luis)", - "America\/Argentina\/Tucuman": "argentinsk tid (Tucumán)", - "America\/Argentina\/Ushuaia": "argentinsk tid (Ushuaia)", - "America\/Aruba": "tidssone for den nordamerikanske atlanterhavskysten (Aruba)", - "America\/Asuncion": "paraguayansk tid (Asunción)", - "America\/Bahia": "tidssone for Brasilia (Bahia)", - "America\/Bahia_Banderas": "tidssone for det sentrale Nord-Amerika (Bahía Banderas)", - "America\/Barbados": "tidssone for den nordamerikanske atlanterhavskysten (Barbados)", - "America\/Belem": "tidssone for Brasilia (Belém)", - "America\/Belize": "tidssone for det sentrale Nord-Amerika (Belize)", - "America\/Blanc-Sablon": "tidssone for den nordamerikanske atlanterhavskysten (Blanc-Sablon)", - "America\/Boa_Vista": "tidssone for Amazonas (Boa Vista)", - "America\/Bogota": "colombiansk tid (Bogotá)", - "America\/Boise": "tidssone for Rocky Mountains (USA) (Boise)", - "America\/Buenos_Aires": "argentinsk tid (Buenos Aires)", - "America\/Cambridge_Bay": "tidssone for Rocky Mountains (USA) (Cambridge Bay)", - "America\/Campo_Grande": "tidssone for Amazonas (Campo Grande)", - "America\/Cancun": "tidssone for den nordamerikanske østkysten (Cancún)", - "America\/Caracas": "venezuelansk tid (Caracas)", - "America\/Catamarca": "argentinsk tid (Catamarca)", - "America\/Cayenne": "tidssone for Fransk Guyana (Cayenne)", - "America\/Cayman": "tidssone for den nordamerikanske østkysten (Caymanøyene)", - "America\/Chicago": "tidssone for det sentrale Nord-Amerika (Chicago)", - "America\/Chihuahua": "tidssone for den meksikanske Stillehavskysten (Chihuahua)", - "America\/Coral_Harbour": "tidssone for den nordamerikanske østkysten (Atikokan)", - "America\/Cordoba": "argentinsk tid (Córdoba)", - "America\/Costa_Rica": "tidssone for det sentrale Nord-Amerika (Costa Rica)", - "America\/Creston": "tidssone for Rocky Mountains (USA) (Creston)", - "America\/Cuiaba": "tidssone for Amazonas (Cuiabá)", - "America\/Curacao": "tidssone for den nordamerikanske atlanterhavskysten (Curaçao)", - "America\/Danmarkshavn": "Greenwich middeltid (Danmarkshavn)", - "America\/Dawson": "tidssone for den nordamerikanske Stillehavskysten (Dawson)", - "America\/Dawson_Creek": "tidssone for Rocky Mountains (USA) (Dawson Creek)", - "America\/Denver": "tidssone for Rocky Mountains (USA) (Denver)", - "America\/Detroit": "tidssone for den nordamerikanske østkysten (Detroit)", - "America\/Dominica": "tidssone for den nordamerikanske atlanterhavskysten (Dominica)", - "America\/Edmonton": "tidssone for Rocky Mountains (USA) (Edmonton)", - "America\/Eirunepe": "Acre-tid (Eirunepe)", - "America\/El_Salvador": "tidssone for det sentrale Nord-Amerika (El Salvador)", - "America\/Fort_Nelson": "tidssone for Rocky Mountains (USA) (Fort Nelson)", - "America\/Fortaleza": "tidssone for Brasilia (Fortaleza)", - "America\/Glace_Bay": "tidssone for den nordamerikanske atlanterhavskysten (Glace Bay)", - "America\/Godthab": "vestgrønlandsk tid (Nuuk)", - "America\/Goose_Bay": "tidssone for den nordamerikanske atlanterhavskysten (Goose Bay)", - "America\/Grand_Turk": "tidssone for den nordamerikanske østkysten (Grand Turk)", - "America\/Grenada": "tidssone for den nordamerikanske atlanterhavskysten (Grenada)", - "America\/Guadeloupe": "tidssone for den nordamerikanske atlanterhavskysten (Guadeloupe)", - "America\/Guatemala": "tidssone for det sentrale Nord-Amerika (Guatemala)", - "America\/Guayaquil": "ecuadoriansk tid (Guayaquil)", - "America\/Guyana": "guyansk tid (Guyana)", - "America\/Halifax": "tidssone for den nordamerikanske atlanterhavskysten (Halifax)", - "America\/Havana": "cubansk tid (Havana)", - "America\/Hermosillo": "tidssone for den meksikanske Stillehavskysten (Hermosillo)", - "America\/Indiana\/Knox": "tidssone for det sentrale Nord-Amerika (Knox, Indiana)", - "America\/Indiana\/Marengo": "tidssone for den nordamerikanske østkysten (Marengo, Indiana)", - "America\/Indiana\/Petersburg": "tidssone for den nordamerikanske østkysten (Petersburg, Indiana)", - "America\/Indiana\/Tell_City": "tidssone for det sentrale Nord-Amerika (Tell City, Indiana)", - "America\/Indiana\/Vevay": "tidssone for den nordamerikanske østkysten (Vevay, Indiana)", - "America\/Indiana\/Vincennes": "tidssone for den nordamerikanske østkysten (Vincennes, Indiana)", - "America\/Indiana\/Winamac": "tidssone for den nordamerikanske østkysten (Winamac, Indiana)", - "America\/Indianapolis": "tidssone for den nordamerikanske østkysten (Indianapolis)", - "America\/Inuvik": "tidssone for Rocky Mountains (USA) (Inuvik)", - "America\/Iqaluit": "tidssone for den nordamerikanske østkysten (Iqaluit)", - "America\/Jamaica": "tidssone for den nordamerikanske østkysten (Jamaica)", - "America\/Jujuy": "argentinsk tid (Jujuy)", - "America\/Juneau": "alaskisk tid (Juneau)", - "America\/Kentucky\/Monticello": "tidssone for den nordamerikanske østkysten (Monticello, Kentucky)", - "America\/Kralendijk": "tidssone for den nordamerikanske atlanterhavskysten (Kralendijk)", - "America\/La_Paz": "boliviansk tid (La Paz)", - "America\/Lima": "peruansk tid (Lima)", - "America\/Los_Angeles": "tidssone for den nordamerikanske Stillehavskysten (Los Angeles)", - "America\/Louisville": "tidssone for den nordamerikanske østkysten (Louisville)", - "America\/Lower_Princes": "tidssone for den nordamerikanske atlanterhavskysten (Lower Prince’s Quarter)", - "America\/Maceio": "tidssone for Brasilia (Maceió)", - "America\/Managua": "tidssone for det sentrale Nord-Amerika (Managua)", - "America\/Manaus": "tidssone for Amazonas (Manaus)", - "America\/Marigot": "tidssone for den nordamerikanske atlanterhavskysten (Marigot)", - "America\/Martinique": "tidssone for den nordamerikanske atlanterhavskysten (Martinique)", - "America\/Matamoros": "tidssone for det sentrale Nord-Amerika (Matamoros)", - "America\/Mazatlan": "tidssone for den meksikanske Stillehavskysten (Mazatlan)", - "America\/Mendoza": "argentinsk tid (Mendoza)", - "America\/Menominee": "tidssone for det sentrale Nord-Amerika (Menominee)", - "America\/Merida": "tidssone for det sentrale Nord-Amerika (Mérida)", - "America\/Metlakatla": "alaskisk tid (Metlakatla)", - "America\/Mexico_City": "tidssone for det sentrale Nord-Amerika (Mexico by)", - "America\/Miquelon": "tidssone for Saint-Pierre-et-Miquelon", - "America\/Moncton": "tidssone for den nordamerikanske atlanterhavskysten (Moncton)", - "America\/Monterrey": "tidssone for det sentrale Nord-Amerika (Monterrey)", - "America\/Montevideo": "uruguayansk tid (Montevideo)", - "America\/Montreal": "Canada (Montreal)", - "America\/Montserrat": "tidssone for den nordamerikanske atlanterhavskysten (Montserrat)", - "America\/Nassau": "tidssone for den nordamerikanske østkysten (Nassau)", - "America\/New_York": "tidssone for den nordamerikanske østkysten (New York)", - "America\/Nipigon": "tidssone for den nordamerikanske østkysten (Nipigon)", - "America\/Nome": "alaskisk tid (Nome)", - "America\/Noronha": "tidssone for Fernando de Noronha", - "America\/North_Dakota\/Beulah": "tidssone for det sentrale Nord-Amerika (Beulah, Nord-Dakota)", - "America\/North_Dakota\/Center": "tidssone for det sentrale Nord-Amerika (Center, Nord-Dakota)", - "America\/North_Dakota\/New_Salem": "tidssone for det sentrale Nord-Amerika (New Salem, Nord-Dakota)", - "America\/Ojinaga": "tidssone for Rocky Mountains (USA) (Ojinaga)", - "America\/Panama": "tidssone for den nordamerikanske østkysten (Panama)", - "America\/Pangnirtung": "tidssone for den nordamerikanske østkysten (Pangnirtung)", - "America\/Paramaribo": "surinamsk tid (Paramaribo)", - "America\/Phoenix": "tidssone for Rocky Mountains (USA) (Phoenix)", - "America\/Port-au-Prince": "tidssone for den nordamerikanske østkysten (Port-au-Prince)", - "America\/Port_of_Spain": "tidssone for den nordamerikanske atlanterhavskysten (Port of Spain)", - "America\/Porto_Velho": "tidssone for Amazonas (Porto Velho)", - "America\/Puerto_Rico": "tidssone for den nordamerikanske atlanterhavskysten (Puerto Rico)", - "America\/Punta_Arenas": "chilensk tid (Punta Arenas)", - "America\/Rainy_River": "tidssone for det sentrale Nord-Amerika (Rainy River)", - "America\/Rankin_Inlet": "tidssone for det sentrale Nord-Amerika (Rankin Inlet)", - "America\/Recife": "tidssone for Brasilia (Recife)", - "America\/Regina": "tidssone for det sentrale Nord-Amerika (Regina)", - "America\/Resolute": "tidssone for det sentrale Nord-Amerika (Resolute)", - "America\/Rio_Branco": "Acre-tid (Rio Branco)", - "America\/Santa_Isabel": "tidssone for nordvestlige Mexico (Santa Isabel)", - "America\/Santarem": "tidssone for Brasilia (Santarém)", - "America\/Santiago": "chilensk tid (Santiago)", - "America\/Santo_Domingo": "tidssone for den nordamerikanske atlanterhavskysten (Santo Domingo)", - "America\/Sao_Paulo": "tidssone for Brasilia (São Paulo)", - "America\/Scoresbysund": "østgrønlandsk tid (Ittoqqortoormiit)", - "America\/Sitka": "alaskisk tid (Sitka)", - "America\/St_Barthelemy": "tidssone for den nordamerikanske atlanterhavskysten (Saint-Barthélemy)", - "America\/St_Johns": "tidssone for Newfoundland (St. John’s)", - "America\/St_Kitts": "tidssone for den nordamerikanske atlanterhavskysten (St. Kitts)", - "America\/St_Lucia": "tidssone for den nordamerikanske atlanterhavskysten (St. Lucia)", - "America\/St_Thomas": "tidssone for den nordamerikanske atlanterhavskysten (St. Thomas)", - "America\/St_Vincent": "tidssone for den nordamerikanske atlanterhavskysten (St. Vincent)", - "America\/Swift_Current": "tidssone for det sentrale Nord-Amerika (Swift Current)", - "America\/Tegucigalpa": "tidssone for det sentrale Nord-Amerika (Tegucigalpa)", - "America\/Thule": "tidssone for den nordamerikanske atlanterhavskysten (Thule)", - "America\/Thunder_Bay": "tidssone for den nordamerikanske østkysten (Thunder Bay)", - "America\/Tijuana": "tidssone for den nordamerikanske Stillehavskysten (Tijuana)", - "America\/Toronto": "tidssone for den nordamerikanske østkysten (Toronto)", - "America\/Tortola": "tidssone for den nordamerikanske atlanterhavskysten (Tortola)", - "America\/Vancouver": "tidssone for den nordamerikanske Stillehavskysten (Vancouver)", - "America\/Whitehorse": "tidssone for den nordamerikanske Stillehavskysten (Whitehorse)", - "America\/Winnipeg": "tidssone for det sentrale Nord-Amerika (Winnipeg)", - "America\/Yakutat": "alaskisk tid (Yakutat)", - "America\/Yellowknife": "tidssone for Rocky Mountains (USA) (Yellowknife)", - "Antarctica\/Casey": "vestaustralsk tid (Casey)", - "Antarctica\/Davis": "tidssone for Davis", - "Antarctica\/DumontDUrville": "tidssone for Dumont d’Urville", - "Antarctica\/Macquarie": "tidssone for Macquarieøya", - "Antarctica\/Mawson": "tidssone for Mawson", - "Antarctica\/McMurdo": "newzealandsk tid (McMurdo)", - "Antarctica\/Palmer": "chilensk tid (Palmer)", - "Antarctica\/Rothera": "tidssone for Rothera", - "Antarctica\/Syowa": "tidssone for Syowa", - "Antarctica\/Troll": "Greenwich middeltid (Troll)", - "Antarctica\/Vostok": "tidssone for Vostok", - "Arctic\/Longyearbyen": "sentraleuropeisk tid (Longyearbyen)", - "Asia\/Aden": "arabisk tid (Aden)", - "Asia\/Almaty": "østkasakhstansk tid (Almaty)", - "Asia\/Amman": "østeuropeisk tid (Amman)", - "Asia\/Anadyr": "Russisk (Anadyr) tid", - "Asia\/Aqtau": "vestkasakhstansk tid (Aktau)", - "Asia\/Aqtobe": "vestkasakhstansk tid (Aqtöbe)", - "Asia\/Ashgabat": "turkmensk tid (Asjkhabad)", - "Asia\/Atyrau": "vestkasakhstansk tid (Atyrau)", - "Asia\/Baghdad": "arabisk tid (Bagdad)", - "Asia\/Bahrain": "arabisk tid (Bahrain)", - "Asia\/Baku": "aserbajdsjansk tid (Baku)", - "Asia\/Bangkok": "indokinesisk tid (Bangkok)", - "Asia\/Barnaul": "Russland (Barnaul)", - "Asia\/Beirut": "østeuropeisk tid (Beirut)", - "Asia\/Bishkek": "kirgisisk tid (Bisjkek)", - "Asia\/Brunei": "tidssone for Brunei Darussalam", - "Asia\/Calcutta": "indisk tid (Kolkata)", - "Asia\/Chita": "tidssone for Jakutsk (Tsjita)", - "Asia\/Choibalsan": "tidssone for Tsjojbalsan (Choybalsan)", - "Asia\/Colombo": "indisk tid (Colombo)", - "Asia\/Damascus": "østeuropeisk tid (Damaskus)", - "Asia\/Dhaka": "bangladeshisk tid (Dhaka)", - "Asia\/Dili": "østtimoresisk tid (Dili)", - "Asia\/Dubai": "tidssone for Persiabukta (Dubai)", - "Asia\/Dushanbe": "tadsjikisk tid (Dusjanbe)", - "Asia\/Famagusta": "østeuropeisk tid (Famagusta)", - "Asia\/Gaza": "østeuropeisk tid (Gaza)", - "Asia\/Hebron": "østeuropeisk tid (Hebron)", - "Asia\/Hong_Kong": "tidssone for Hongkong", - "Asia\/Hovd": "tidssone for Khovd", - "Asia\/Irkutsk": "tidssone for Irkutsk", - "Asia\/Jakarta": "vestindonesisk tid (Jakarta)", - "Asia\/Jayapura": "østindonesisk tid (Jajapura)", - "Asia\/Jerusalem": "israelsk tid (Jerusalem)", - "Asia\/Kabul": "afghansk tid (Kabul)", - "Asia\/Kamchatka": "Russisk (Petropavlovsk-Kamtsjatskij) tid (Kamtsjatka)", - "Asia\/Karachi": "pakistansk tid (Karachi)", - "Asia\/Katmandu": "nepalsk tid (Katmandu)", - "Asia\/Khandyga": "tidssone for Jakutsk (Khandyga)", - "Asia\/Krasnoyarsk": "tidssone for Krasnojarsk", - "Asia\/Kuala_Lumpur": "malaysisk tid (Kuala Lumpur)", - "Asia\/Kuching": "malaysisk tid (Kuching)", - "Asia\/Kuwait": "arabisk tid (Kuwait)", - "Asia\/Macau": "kinesisk tid (Macao)", - "Asia\/Magadan": "tidssone for Magadan", - "Asia\/Makassar": "sentralindonesisk tid (Makassar)", - "Asia\/Manila": "filippinsk tid (Manila)", - "Asia\/Muscat": "tidssone for Persiabukta (Muskat)", - "Asia\/Nicosia": "østeuropeisk tid (Nikosia)", - "Asia\/Novokuznetsk": "tidssone for Krasnojarsk (Novokuznetsk)", - "Asia\/Novosibirsk": "tidssone for Novosibirsk", - "Asia\/Omsk": "tidssone for Omsk", - "Asia\/Oral": "vestkasakhstansk tid (Oral)", - "Asia\/Phnom_Penh": "indokinesisk tid (Phnom Penh)", - "Asia\/Pontianak": "vestindonesisk tid (Pontianak)", - "Asia\/Pyongyang": "koreansk tid (Pyongyang)", - "Asia\/Qatar": "arabisk tid (Qatar)", - "Asia\/Qostanay": "østkasakhstansk tid (Kostanay)", - "Asia\/Qyzylorda": "vestkasakhstansk tid (Kyzylorda)", - "Asia\/Rangoon": "myanmarsk tid (Yangon)", - "Asia\/Riyadh": "arabisk tid (Riyadh)", - "Asia\/Saigon": "indokinesisk tid (Ho Chi Minh-byen)", - "Asia\/Sakhalin": "tidssone for Sakhalin", - "Asia\/Samarkand": "usbekisk tid (Samarkand)", - "Asia\/Seoul": "koreansk tid (Seoul)", - "Asia\/Shanghai": "kinesisk tid (Shanghai)", - "Asia\/Singapore": "singaporsk tid (Singapore)", - "Asia\/Srednekolymsk": "tidssone for Magadan (Srednekolymsk)", - "Asia\/Taipei": "tidssone for Taipei", - "Asia\/Tashkent": "usbekisk tid (Tasjkent)", - "Asia\/Tbilisi": "georgisk tid (Tbilisi)", - "Asia\/Tehran": "iransk tid (Teheran)", - "Asia\/Thimphu": "bhutansk tid (Thimpu)", - "Asia\/Tokyo": "japansk tid (Tokyo)", - "Asia\/Tomsk": "Russland (Tomsk)", - "Asia\/Ulaanbaatar": "tidssone for Ulan Bator", - "Asia\/Urumqi": "Kina (Ürümqi)", - "Asia\/Ust-Nera": "tidssone for Vladivostok (Ust-Nera)", - "Asia\/Vientiane": "indokinesisk tid (Vientiane)", - "Asia\/Vladivostok": "tidssone for Vladivostok", - "Asia\/Yakutsk": "tidssone for Jakutsk", - "Asia\/Yekaterinburg": "tidssone for Jekaterinburg", - "Asia\/Yerevan": "armensk tid (Jerevan)", - "Atlantic\/Azores": "asorisk tid (Asorene)", - "Atlantic\/Bermuda": "tidssone for den nordamerikanske atlanterhavskysten (Bermuda)", - "Atlantic\/Canary": "vesteuropeisk tid (Kanariøyene)", - "Atlantic\/Cape_Verde": "kappverdisk tid (Kapp Verde)", - "Atlantic\/Faeroe": "vesteuropeisk tid (Færøyene)", - "Atlantic\/Madeira": "vesteuropeisk tid (Madeira)", - "Atlantic\/Reykjavik": "Greenwich middeltid (Reykjavík)", - "Atlantic\/South_Georgia": "tidssone for Sør-Georgia", - "Atlantic\/St_Helena": "Greenwich middeltid (St. Helena)", - "Atlantic\/Stanley": "tidssone for Falklandsøyene (Stanley)", - "Australia\/Adelaide": "sentralaustralsk tid (Adelaide)", - "Australia\/Brisbane": "østaustralsk tid (Brisbane)", - "Australia\/Broken_Hill": "sentralaustralsk tid (Broken Hill)", - "Australia\/Currie": "østaustralsk tid (Currie)", - "Australia\/Darwin": "sentralaustralsk tid (Darwin)", - "Australia\/Eucla": "vest-sentralaustralsk tid (Eucla)", - "Australia\/Hobart": "østaustralsk tid (Hobart)", - "Australia\/Lindeman": "østaustralsk tid (Lindeman)", - "Australia\/Lord_Howe": "tidssone for Lord Howe-øya", - "Australia\/Melbourne": "østaustralsk tid (Melbourne)", - "Australia\/Perth": "vestaustralsk tid (Perth)", - "Australia\/Sydney": "østaustralsk tid (Sydney)", - "CST6CDT": "tidssone for det sentrale Nord-Amerika", - "EST5EDT": "tidssone for den nordamerikanske østkysten", - "Etc\/GMT": "Greenwich middeltid", - "Etc\/UTC": "koordinert universaltid", - "Europe\/Amsterdam": "sentraleuropeisk tid (Amsterdam)", - "Europe\/Andorra": "sentraleuropeisk tid (Andorra)", - "Europe\/Astrakhan": "tidssone for Moskva (Astrakhan)", - "Europe\/Athens": "østeuropeisk tid (Athen)", - "Europe\/Belgrade": "sentraleuropeisk tid (Beograd)", - "Europe\/Berlin": "sentraleuropeisk tid (Berlin)", - "Europe\/Bratislava": "sentraleuropeisk tid (Bratislava)", - "Europe\/Brussels": "sentraleuropeisk tid (Brussel)", - "Europe\/Bucharest": "østeuropeisk tid (București)", - "Europe\/Budapest": "sentraleuropeisk tid (Budapest)", - "Europe\/Busingen": "sentraleuropeisk tid (Büsingen)", - "Europe\/Chisinau": "østeuropeisk tid (Chișinău)", - "Europe\/Copenhagen": "sentraleuropeisk tid (København)", - "Europe\/Dublin": "Greenwich middeltid (Dublin)", - "Europe\/Gibraltar": "sentraleuropeisk tid (Gibraltar)", - "Europe\/Guernsey": "Greenwich middeltid (Guernsey)", - "Europe\/Helsinki": "østeuropeisk tid (Helsingfors)", - "Europe\/Isle_of_Man": "Greenwich middeltid (Man)", - "Europe\/Istanbul": "Tyrkia (Istanbul)", - "Europe\/Jersey": "Greenwich middeltid (Jersey)", - "Europe\/Kaliningrad": "østeuropeisk tid (Kaliningrad)", - "Europe\/Kiev": "østeuropeisk tid (Kiev)", - "Europe\/Kirov": "Russland (Kirov)", - "Europe\/Lisbon": "vesteuropeisk tid (Lisboa)", - "Europe\/Ljubljana": "sentraleuropeisk tid (Ljubljana)", - "Europe\/London": "Greenwich middeltid (London)", - "Europe\/Luxembourg": "sentraleuropeisk tid (Luxemburg)", - "Europe\/Madrid": "sentraleuropeisk tid (Madrid)", - "Europe\/Malta": "sentraleuropeisk tid (Malta)", - "Europe\/Mariehamn": "østeuropeisk tid (Mariehamn)", - "Europe\/Minsk": "tidssone for Moskva (Minsk)", - "Europe\/Monaco": "sentraleuropeisk tid (Monaco)", - "Europe\/Moscow": "tidssone for Moskva", - "Europe\/Oslo": "sentraleuropeisk tid (Oslo)", - "Europe\/Paris": "sentraleuropeisk tid (Paris)", - "Europe\/Podgorica": "sentraleuropeisk tid (Podgorica)", - "Europe\/Prague": "sentraleuropeisk tid (Praha)", - "Europe\/Riga": "østeuropeisk tid (Riga)", - "Europe\/Rome": "sentraleuropeisk tid (Roma)", - "Europe\/Samara": "Russisk (Samara) tid", - "Europe\/San_Marino": "sentraleuropeisk tid (San Marino)", - "Europe\/Sarajevo": "sentraleuropeisk tid (Sarajevo)", - "Europe\/Saratov": "tidssone for Moskva (Saratov)", - "Europe\/Simferopol": "tidssone for Moskva (Simferopol)", - "Europe\/Skopje": "sentraleuropeisk tid (Skopje)", - "Europe\/Sofia": "østeuropeisk tid (Sofia)", - "Europe\/Stockholm": "sentraleuropeisk tid (Stockholm)", - "Europe\/Tallinn": "østeuropeisk tid (Tallinn)", - "Europe\/Tirane": "sentraleuropeisk tid (Tirana)", - "Europe\/Ulyanovsk": "tidssone for Moskva (Uljanovsk)", - "Europe\/Uzhgorod": "østeuropeisk tid (Uzjhorod)", - "Europe\/Vaduz": "sentraleuropeisk tid (Vaduz)", - "Europe\/Vatican": "sentraleuropeisk tid (Vatikanstaten)", - "Europe\/Vienna": "sentraleuropeisk tid (Wien)", - "Europe\/Vilnius": "østeuropeisk tid (Vilnius)", - "Europe\/Volgograd": "tidssone for Volgograd", - "Europe\/Warsaw": "sentraleuropeisk tid (Warszawa)", - "Europe\/Zagreb": "sentraleuropeisk tid (Zagreb)", - "Europe\/Zaporozhye": "østeuropeisk tid (Zaporizjzja)", - "Europe\/Zurich": "sentraleuropeisk tid (Zürich)", - "Indian\/Antananarivo": "østafrikansk tid (Antananarivo)", - "Indian\/Chagos": "tidssone for Indiahavet (Chagos)", - "Indian\/Christmas": "tidssone for Christmasøya", - "Indian\/Cocos": "tidssone for Kokosøyene", - "Indian\/Comoro": "østafrikansk tid (Komorene)", - "Indian\/Kerguelen": "tidssone for De franske sørterritorier (Kerguelen)", - "Indian\/Mahe": "seychellisk tid (Mahé)", - "Indian\/Maldives": "maldivisk tid (Maldivene)", - "Indian\/Mauritius": "mauritisk tid (Mauritius)", - "Indian\/Mayotte": "østafrikansk tid (Mayotte)", - "Indian\/Reunion": "tidssone for Réunion", - "MST7MDT": "tidssone for Rocky Mountains (USA)", - "PST8PDT": "tidssone for den nordamerikanske Stillehavskysten", - "Pacific\/Apia": "tidssone for Apia", - "Pacific\/Auckland": "newzealandsk tid (Auckland)", - "Pacific\/Bougainville": "papuansk tid (Bougainville)", - "Pacific\/Chatham": "tidssone for Chatham", - "Pacific\/Easter": "tidssone for Påskeøya", - "Pacific\/Efate": "vanuatisk tid (Efate)", - "Pacific\/Enderbury": "tidssone for Phoenixøyene (Enderbury)", - "Pacific\/Fakaofo": "tidssone for Tokelau (Fakaofo)", - "Pacific\/Fiji": "fijiansk tid", - "Pacific\/Funafuti": "tuvalsk tid (Funafuti)", - "Pacific\/Galapagos": "tidssone for Galápagosøyene", - "Pacific\/Gambier": "tidssone for Gambier", - "Pacific\/Guadalcanal": "salomonsk tid (Guadalcanal)", - "Pacific\/Guam": "tidssone for Chamorro (Guam)", - "Pacific\/Honolulu": "tidssone for Hawaii og Aleutene (Honolulu)", - "Pacific\/Johnston": "tidssone for Hawaii og Aleutene (Johnston)", - "Pacific\/Kiritimati": "tidssone for Linjeøyene (Kiritimati)", - "Pacific\/Kosrae": "tidssone for Kosrae", - "Pacific\/Kwajalein": "marshallesisk tid (Kwajalein)", - "Pacific\/Majuro": "marshallesisk tid (Majuro)", - "Pacific\/Marquesas": "tidssone for Marquesasøyene", - "Pacific\/Midway": "samoansk tid (Midway)", - "Pacific\/Nauru": "naurisk tid (Nauru)", - "Pacific\/Niue": "tidssone for Niue", - "Pacific\/Norfolk": "tidssone for Norfolkøya", - "Pacific\/Noumea": "kaledonsk tid (Nouméa)", - "Pacific\/Pago_Pago": "samoansk tid (Pago Pago)", - "Pacific\/Palau": "palauisk tid", - "Pacific\/Pitcairn": "tidssone for Pitcairn", - "Pacific\/Ponape": "tidssone for Pohnpei", - "Pacific\/Port_Moresby": "papuansk tid (Port Moresby)", - "Pacific\/Rarotonga": "tidssone for Cookøyene (Rarotonga)", - "Pacific\/Saipan": "tidssone for Chamorro (Saipan)", - "Pacific\/Tahiti": "tahitisk tid", - "Pacific\/Tarawa": "tidssone for Gilbertøyene (Tarawa)", - "Pacific\/Tongatapu": "tongansk tid (Tongatapu)", - "Pacific\/Truk": "tidssone for Chuukøyene", - "Pacific\/Wake": "tidssone for Wake Island", - "Pacific\/Wallis": "tidssone for Wallis- og Futunaøyene" - }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } -} diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/om.json b/src/Symfony/Component/Intl/Resources/data/timezones/om.json index 073233bd93f77..303d69a9d1cf5 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/om.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/om.json @@ -70,10 +70,6 @@ "Asia\/Vladivostok": "Russia (Vladivostok)", "Asia\/Yakutsk": "Russia (Yakutsk)", "Asia\/Yekaterinburg": "Russia (Yekaterinburg)", - "CST6CDT": "CST6CDT", - "EST5EDT": "EST5EDT", - "Etc\/GMT": "GMT", - "Etc\/UTC": "UTC", "Europe\/Astrakhan": "Russia (Astrakhan)", "Europe\/Berlin": "Germany (Berlin)", "Europe\/Busingen": "Germany (Busingen)", @@ -87,15 +83,7 @@ "Europe\/Saratov": "Russia (Saratov)", "Europe\/Ulyanovsk": "Russia (Ulyanovsk)", "Europe\/Volgograd": "Russia (Volgograd)", - "MST7MDT": "MST7MDT", - "PST8PDT": "PST8PDT", "Pacific\/Honolulu": "United States (Honolulu)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/or.json b/src/Symfony/Component/Intl/Resources/data/timezones/or.json index 28eee2a322320..90adc1f963bed 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/or.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/or.json @@ -99,7 +99,7 @@ "America\/Detroit": "ପୂର୍ବାଞ୍ଚଳ ସମୟ (ଡେଟ୍ରୋଇଟ୍)", "America\/Dominica": "ଆଟଲାଣ୍ଟିକ୍ ସମୟ (ଡୋମିନିକା)", "America\/Edmonton": "ପାର୍ବତ୍ୟ ସମୟ (ଏଡମୋନଟୋନ୍)", - "America\/Eirunepe": "ବ୍ରାଜିଲ୍ (ଇରୁନେପେ)", + "America\/Eirunepe": "ବ୍ରାଜିଲ୍ ସମୟ (ଇରୁନେପେ)", "America\/El_Salvador": "କେନ୍ଦ୍ରୀୟ ସମୟ (ଏଲ୍ ସାଲଭାଡୋର୍)", "America\/Fort_Nelson": "ପାର୍ବତ୍ୟ ସମୟ (ଫୋର୍ଟ୍ ନେଲସନ୍)", "America\/Fortaleza": "ବ୍ରାସିଲିଆ ସମୟ (ଫୋର୍ଟେଲେଜା)", @@ -151,7 +151,7 @@ "America\/Moncton": "ଆଟଲାଣ୍ଟିକ୍ ସମୟ (ମାନକଟୋନ୍)", "America\/Monterrey": "କେନ୍ଦ୍ରୀୟ ସମୟ (ମୋନଟେରିଏ)", "America\/Montevideo": "ଉରୁଗୁଏ ସମୟ (ମଣ୍ଟେଭିଡିଓ)", - "America\/Montreal": "କାନାଡା (Montreal)", + "America\/Montreal": "କାନାଡା ସମୟ (Montreal)", "America\/Montserrat": "ଆଟଲାଣ୍ଟିକ୍ ସମୟ (ମୋନଟସେରରାଟ୍)", "America\/Nassau": "ପୂର୍ବାଞ୍ଚଳ ସମୟ (ନାସାଉ)", "America\/New_York": "ପୂର୍ବାଞ୍ଚଳ ସମୟ (ନ୍ୟୁ ୟୋର୍କ୍)", @@ -176,7 +176,7 @@ "America\/Recife": "ବ୍ରାସିଲିଆ ସମୟ (ରେସିଫି)", "America\/Regina": "କେନ୍ଦ୍ରୀୟ ସମୟ (ରେଗିନା)", "America\/Resolute": "କେନ୍ଦ୍ରୀୟ ସମୟ (ରିସୋଲୁଟେ)", - "America\/Rio_Branco": "ବ୍ରାଜିଲ୍ (ରିଓ ବ୍ରାଙ୍କୋ)", + "America\/Rio_Branco": "ବ୍ରାଜିଲ୍ ସମୟ (ରିଓ ବ୍ରାଙ୍କୋ)", "America\/Santa_Isabel": "ଉତ୍ତରପଶ୍ଚିମ ମେକ୍ସିକୋ ସମୟ (Santa Isabel)", "America\/Santarem": "ବ୍ରାସିଲିଆ ସମୟ (ସାଣ୍ଟାରେମ୍‌)", "America\/Santiago": "ଚିଲି ସମୟ (ସାଣ୍ଟିଆଗୋ)", @@ -217,7 +217,7 @@ "Asia\/Aden": "ଆରବୀୟ ସମୟ (ଏଡେନ୍‌)", "Asia\/Almaty": "ପୂର୍ବ କାଜାକସ୍ତାନ୍ ସମୟ (ଅଲମାଟି)", "Asia\/Amman": "ପୂର୍ବାଞ୍ଚଳ ୟୁରୋପୀୟ ସମୟ (ଅମ୍ମାନ)", - "Asia\/Anadyr": "ରୁଷିଆ (ଆନାଡୟାର୍)", + "Asia\/Anadyr": "ରୁଷିଆ ସମୟ (ଆନାଡୟାର୍)", "Asia\/Aqtau": "ପଶ୍ଚିମ କାଜାକସ୍ତାନ ସମୟ (ଆକଟାଉ)", "Asia\/Aqtobe": "ପଶ୍ଚିମ କାଜାକସ୍ତାନ ସମୟ (ଆକଟୋବ୍‌)", "Asia\/Ashgabat": "ତୁର୍କମେନିସ୍ତାନ ସମୟ (ଆଶ୍‌ଗାବୋଟ୍‌)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "ଆରବୀୟ ସମୟ (ବାହାରିନ୍)", "Asia\/Baku": "ଆଜେରବାଇଜାନ ସମୟ (ବାକୁ)", "Asia\/Bangkok": "ଇଣ୍ଡୋଚାଇନା ସମୟ (ବ୍ୟାଙ୍ଗକକ୍‌)", - "Asia\/Barnaul": "ରୁଷିଆ (ବାରନାଉଲ୍)", + "Asia\/Barnaul": "ରୁଷିଆ ସମୟ (ବାରନାଉଲ୍)", "Asia\/Beirut": "ପୂର୍ବାଞ୍ଚଳ ୟୁରୋପୀୟ ସମୟ (ବୀରୁଟ୍‌)", "Asia\/Bishkek": "କିର୍ଗିସ୍ତାନ ସମୟ (ବିଶକେକ୍‌)", "Asia\/Brunei": "ବ୍ରୁନେଇ ଡାରୁସାଲାମ ସମୟ", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "ପୂର୍ବ ଇଣ୍ଡୋନେସିଆ ସମୟ (ଜୟପୁରା)", "Asia\/Jerusalem": "ଇସ୍ରାଏଲ ସମୟ (ଜେରୁଜେଲମ)", "Asia\/Kabul": "ଆଫଗାନିସ୍ତାନ ସମୟ (କାବୁଲ)", - "Asia\/Kamchatka": "ରୁଷିଆ (କାମଚାଟକା)", + "Asia\/Kamchatka": "ରୁଷିଆ ସମୟ (କାମଚାଟକା)", "Asia\/Karachi": "ପାକିସ୍ତାନ ସମୟ (କରାଚି)", "Asia\/Katmandu": "ନେପାଳ ସମୟ (କାଠମାଣ୍ଡୁ)", "Asia\/Khandyga": "ୟାକୁଟସ୍କ ସମୟ (ଖାନଡ୍ୟାଗା)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ଇରାନ ସମୟ (ତେହେରାନ୍)", "Asia\/Thimphu": "ଭୁଟାନ ସମୟ (ଥିମ୍ପୁ)", "Asia\/Tokyo": "ଜାପାନ ସମୟ (ଟୋକିଓ)", - "Asia\/Tomsk": "ରୁଷିଆ (ଟୋମସ୍କ)", + "Asia\/Tomsk": "ରୁଷିଆ ସମୟ (ଟୋମସ୍କ)", "Asia\/Ulaanbaatar": "ଉଲାନ୍‌ବାଟର୍‌ ସମୟ", - "Asia\/Urumqi": "ଚିନ୍ (ଉରୁମକି)", + "Asia\/Urumqi": "ଚିନ୍ ସମୟ (ଉରୁମକି)", "Asia\/Ust-Nera": "ଭ୍ଲାଡିଭୋଷ୍ଟୋକ୍ ସମୟ (ୟୁଷ୍ଟ-ନେରା)", "Asia\/Vientiane": "ଇଣ୍ଡୋଚାଇନା ସମୟ (ଭିଏଣ୍ଟିଏନ୍‌)", "Asia\/Vladivostok": "ଭ୍ଲାଡିଭୋଷ୍ଟୋକ୍ ସମୟ", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "ଗ୍ରୀନୱିଚ୍ ମିନ୍ ସମୟ (ଗୁଏରନସେ)", "Europe\/Helsinki": "ପୂର୍ବାଞ୍ଚଳ ୟୁରୋପୀୟ ସମୟ (ହେଲସିନକି)", "Europe\/Isle_of_Man": "ଗ୍ରୀନୱିଚ୍ ମିନ୍ ସମୟ (ଇସଲେ ଅଫ୍ ମେନ୍)", - "Europe\/Istanbul": "ତୁର୍କୀ (ଇସ୍ତାନବୁଲ)", + "Europe\/Istanbul": "ତୁର୍କୀ ସମୟ (ଇସ୍ତାନବୁଲ)", "Europe\/Jersey": "ଗ୍ରୀନୱିଚ୍ ମିନ୍ ସମୟ (ଜର୍ସି)", "Europe\/Kaliningrad": "ପୂର୍ବାଞ୍ଚଳ ୟୁରୋପୀୟ ସମୟ (କାଲିନିନଗ୍ରାଡ୍)", "Europe\/Kiev": "ପୂର୍ବାଞ୍ଚଳ ୟୁରୋପୀୟ ସମୟ (କିଏଭ୍)", - "Europe\/Kirov": "ରୁଷିଆ (କିରୋଭ)", + "Europe\/Kirov": "ରୁଷିଆ ସମୟ (କିରୋଭ)", "Europe\/Lisbon": "ପଶ୍ଚିମାଞ୍ଚଳ ୟୁରୋପୀୟ ସମୟ (ଲିସବୋନ୍)", "Europe\/Ljubljana": "କେନ୍ଦ୍ରୀୟ ୟୁରୋପୀୟ ସମୟ (ଲଜୁବ୍ଲଜାନ୍)", "Europe\/London": "ଗ୍ରୀନୱିଚ୍ ମିନ୍ ସମୟ (ଲଣ୍ଡନ୍)", @@ -362,7 +362,7 @@ "Europe\/Prague": "କେନ୍ଦ୍ରୀୟ ୟୁରୋପୀୟ ସମୟ (ପ୍ରାଗ୍)", "Europe\/Riga": "ପୂର୍ବାଞ୍ଚଳ ୟୁରୋପୀୟ ସମୟ (ରିଗା)", "Europe\/Rome": "କେନ୍ଦ୍ରୀୟ ୟୁରୋପୀୟ ସମୟ (ରୋମ୍)", - "Europe\/Samara": "ରୁଷିଆ (ସାମାରା)", + "Europe\/Samara": "ରୁଷିଆ ସମୟ (ସାମାରା)", "Europe\/San_Marino": "କେନ୍ଦ୍ରୀୟ ୟୁରୋପୀୟ ସମୟ (ସାନ୍ ମାରିନୋ)", "Europe\/Sarajevo": "କେନ୍ଦ୍ରୀୟ ୟୁରୋପୀୟ ସମୟ (ସାରାଜେଭୋ)", "Europe\/Saratov": "ମସ୍କୋ ସମୟ (ସାରାଟୋଭ୍)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "ୱେକ୍‌ ଦ୍ୱୀପ ସମୟ", "Pacific\/Wallis": "ୱାଲିସ୍‌ ଏବଂ ଫୁଟୁନା ସମୟ" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/os.json b/src/Symfony/Component/Intl/Resources/data/timezones/os.json index 1b07d0014b179..943636b2f0102 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/os.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/os.json @@ -21,92 +21,89 @@ "Africa\/Sao_Tome": "Гринвичы рӕстӕмбис рӕстӕг (Sao Tome)", "Africa\/Tripoli": "Скӕсӕн Европӕйаг рӕстӕг (Tripoli)", "Africa\/Tunis": "Астӕуккаг Европӕйаг рӕстӕг (Tunis)", - "America\/Adak": "АИШ (Adak)", - "America\/Anchorage": "АИШ (Anchorage)", - "America\/Araguaina": "Бразили (Araguaina)", - "America\/Bahia": "Бразили (Bahia)", - "America\/Belem": "Бразили (Belem)", - "America\/Boa_Vista": "Бразили (Boa Vista)", - "America\/Boise": "АИШ (Boise)", - "America\/Campo_Grande": "Бразили (Campo Grande)", - "America\/Chicago": "АИШ (Chicago)", - "America\/Cuiaba": "Бразили (Cuiaba)", + "America\/Adak": "АИШ рӕстӕг (Adak)", + "America\/Anchorage": "АИШ рӕстӕг (Anchorage)", + "America\/Araguaina": "Бразили рӕстӕг (Araguaina)", + "America\/Bahia": "Бразили рӕстӕг (Bahia)", + "America\/Belem": "Бразили рӕстӕг (Belem)", + "America\/Boa_Vista": "Бразили рӕстӕг (Boa Vista)", + "America\/Boise": "АИШ рӕстӕг (Boise)", + "America\/Campo_Grande": "Бразили рӕстӕг (Campo Grande)", + "America\/Chicago": "АИШ рӕстӕг (Chicago)", + "America\/Cuiaba": "Бразили рӕстӕг (Cuiaba)", "America\/Danmarkshavn": "Гринвичы рӕстӕмбис рӕстӕг (Danmarkshavn)", - "America\/Denver": "АИШ (Denver)", - "America\/Detroit": "АИШ (Detroit)", - "America\/Eirunepe": "Бразили (Eirunepe)", - "America\/Fortaleza": "Бразили (Fortaleza)", - "America\/Indiana\/Knox": "АИШ (Knox, Indiana)", - "America\/Indiana\/Marengo": "АИШ (Marengo, Indiana)", - "America\/Indiana\/Petersburg": "АИШ (Petersburg, Indiana)", - "America\/Indiana\/Tell_City": "АИШ (Tell City, Indiana)", - "America\/Indiana\/Vevay": "АИШ (Vevay, Indiana)", - "America\/Indiana\/Vincennes": "АИШ (Vincennes, Indiana)", - "America\/Indiana\/Winamac": "АИШ (Winamac, Indiana)", - "America\/Indianapolis": "АИШ (Indianapolis)", - "America\/Juneau": "АИШ (Juneau)", - "America\/Kentucky\/Monticello": "АИШ (Monticello, Kentucky)", - "America\/Los_Angeles": "АИШ (Los Angeles)", - "America\/Louisville": "АИШ (Louisville)", - "America\/Maceio": "Бразили (Maceio)", - "America\/Manaus": "Бразили (Manaus)", - "America\/Menominee": "АИШ (Menominee)", - "America\/Metlakatla": "АИШ (Metlakatla)", - "America\/New_York": "АИШ (New York)", - "America\/Nome": "АИШ (Nome)", - "America\/Noronha": "Бразили (Noronha)", - "America\/North_Dakota\/Beulah": "АИШ (Beulah, North Dakota)", - "America\/North_Dakota\/Center": "АИШ (Center, North Dakota)", - "America\/North_Dakota\/New_Salem": "АИШ (New Salem, North Dakota)", - "America\/Phoenix": "АИШ (Phoenix)", - "America\/Porto_Velho": "Бразили (Porto Velho)", - "America\/Recife": "Бразили (Recife)", - "America\/Rio_Branco": "Бразили (Rio Branco)", - "America\/Santarem": "Бразили (Santarem)", - "America\/Sao_Paulo": "Бразили (Sao Paulo)", - "America\/Sitka": "АИШ (Sitka)", - "America\/Yakutat": "АИШ (Yakutat)", + "America\/Denver": "АИШ рӕстӕг (Denver)", + "America\/Detroit": "АИШ рӕстӕг (Detroit)", + "America\/Eirunepe": "Бразили рӕстӕг (Eirunepe)", + "America\/Fortaleza": "Бразили рӕстӕг (Fortaleza)", + "America\/Indiana\/Knox": "АИШ рӕстӕг (Knox, Indiana)", + "America\/Indiana\/Marengo": "АИШ рӕстӕг (Marengo, Indiana)", + "America\/Indiana\/Petersburg": "АИШ рӕстӕг (Petersburg, Indiana)", + "America\/Indiana\/Tell_City": "АИШ рӕстӕг (Tell City, Indiana)", + "America\/Indiana\/Vevay": "АИШ рӕстӕг (Vevay, Indiana)", + "America\/Indiana\/Vincennes": "АИШ рӕстӕг (Vincennes, Indiana)", + "America\/Indiana\/Winamac": "АИШ рӕстӕг (Winamac, Indiana)", + "America\/Indianapolis": "АИШ рӕстӕг (Indianapolis)", + "America\/Juneau": "АИШ рӕстӕг (Juneau)", + "America\/Kentucky\/Monticello": "АИШ рӕстӕг (Monticello, Kentucky)", + "America\/Los_Angeles": "АИШ рӕстӕг (Los Angeles)", + "America\/Louisville": "АИШ рӕстӕг (Louisville)", + "America\/Maceio": "Бразили рӕстӕг (Maceio)", + "America\/Manaus": "Бразили рӕстӕг (Manaus)", + "America\/Menominee": "АИШ рӕстӕг (Menominee)", + "America\/Metlakatla": "АИШ рӕстӕг (Metlakatla)", + "America\/New_York": "АИШ рӕстӕг (New York)", + "America\/Nome": "АИШ рӕстӕг (Nome)", + "America\/Noronha": "Бразили рӕстӕг (Noronha)", + "America\/North_Dakota\/Beulah": "АИШ рӕстӕг (Beulah, North Dakota)", + "America\/North_Dakota\/Center": "АИШ рӕстӕг (Center, North Dakota)", + "America\/North_Dakota\/New_Salem": "АИШ рӕстӕг (New Salem, North Dakota)", + "America\/Phoenix": "АИШ рӕстӕг (Phoenix)", + "America\/Porto_Velho": "Бразили рӕстӕг (Porto Velho)", + "America\/Recife": "Бразили рӕстӕг (Recife)", + "America\/Rio_Branco": "Бразили рӕстӕг (Rio Branco)", + "America\/Santarem": "Бразили рӕстӕг (Santarem)", + "America\/Sao_Paulo": "Бразили рӕстӕг (Sao Paulo)", + "America\/Sitka": "АИШ рӕстӕг (Sitka)", + "America\/Yakutat": "АИШ рӕстӕг (Yakutat)", "Antarctica\/Troll": "Гринвичы рӕстӕмбис рӕстӕг (Troll)", "Arctic\/Longyearbyen": "Астӕуккаг Европӕйаг рӕстӕг (Longyearbyen)", "Asia\/Amman": "Скӕсӕн Европӕйаг рӕстӕг (Amman)", - "Asia\/Anadyr": "Уӕрӕсе (Anadyr)", - "Asia\/Barnaul": "Уӕрӕсе (Barnaul)", + "Asia\/Anadyr": "Уӕрӕсе рӕстӕг (Anadyr)", + "Asia\/Barnaul": "Уӕрӕсе рӕстӕг (Barnaul)", "Asia\/Beirut": "Скӕсӕн Европӕйаг рӕстӕг (Beirut)", - "Asia\/Calcutta": "Инди (Kolkata)", - "Asia\/Chita": "Уӕрӕсе (Chita)", + "Asia\/Calcutta": "Инди рӕстӕг (Kolkata)", + "Asia\/Chita": "Уӕрӕсе рӕстӕг (Chita)", "Asia\/Damascus": "Скӕсӕн Европӕйаг рӕстӕг (Damascus)", "Asia\/Famagusta": "Скӕсӕн Европӕйаг рӕстӕг (Famagusta)", "Asia\/Gaza": "Скӕсӕн Европӕйаг рӕстӕг (Gaza)", "Asia\/Hebron": "Скӕсӕн Европӕйаг рӕстӕг (Hebron)", - "Asia\/Irkutsk": "Уӕрӕсе (Irkutsk)", - "Asia\/Kamchatka": "Уӕрӕсе (Kamchatka)", - "Asia\/Khandyga": "Уӕрӕсе (Khandyga)", - "Asia\/Krasnoyarsk": "Уӕрӕсе (Krasnoyarsk)", - "Asia\/Magadan": "Уӕрӕсе (Magadan)", + "Asia\/Irkutsk": "Уӕрӕсе рӕстӕг (Irkutsk)", + "Asia\/Kamchatka": "Уӕрӕсе рӕстӕг (Kamchatka)", + "Asia\/Khandyga": "Уӕрӕсе рӕстӕг (Khandyga)", + "Asia\/Krasnoyarsk": "Уӕрӕсе рӕстӕг (Krasnoyarsk)", + "Asia\/Magadan": "Уӕрӕсе рӕстӕг (Magadan)", "Asia\/Nicosia": "Скӕсӕн Европӕйаг рӕстӕг (Nicosia)", - "Asia\/Novokuznetsk": "Уӕрӕсе (Novokuznetsk)", - "Asia\/Novosibirsk": "Уӕрӕсе (Novosibirsk)", - "Asia\/Omsk": "Уӕрӕсе (Omsk)", - "Asia\/Sakhalin": "Уӕрӕсе (Sakhalin)", - "Asia\/Shanghai": "Китай (Shanghai)", - "Asia\/Srednekolymsk": "Уӕрӕсе (Srednekolymsk)", + "Asia\/Novokuznetsk": "Уӕрӕсе рӕстӕг (Novokuznetsk)", + "Asia\/Novosibirsk": "Уӕрӕсе рӕстӕг (Novosibirsk)", + "Asia\/Omsk": "Уӕрӕсе рӕстӕг (Omsk)", + "Asia\/Sakhalin": "Уӕрӕсе рӕстӕг (Sakhalin)", + "Asia\/Shanghai": "Китай рӕстӕг (Shanghai)", + "Asia\/Srednekolymsk": "Уӕрӕсе рӕстӕг (Srednekolymsk)", "Asia\/Tbilisi": "Гуырдзыстоны рӕстӕг (Тбилис)", - "Asia\/Tokyo": "Япон (Tokyo)", - "Asia\/Tomsk": "Уӕрӕсе (Tomsk)", - "Asia\/Urumqi": "Китай (Urumqi)", - "Asia\/Ust-Nera": "Уӕрӕсе (Ust-Nera)", - "Asia\/Vladivostok": "Уӕрӕсе (Vladivostok)", - "Asia\/Yakutsk": "Уӕрӕсе (Yakutsk)", - "Asia\/Yekaterinburg": "Уӕрӕсе (Yekaterinburg)", + "Asia\/Tokyo": "Япон рӕстӕг (Tokyo)", + "Asia\/Tomsk": "Уӕрӕсе рӕстӕг (Tomsk)", + "Asia\/Urumqi": "Китай рӕстӕг (Urumqi)", + "Asia\/Ust-Nera": "Уӕрӕсе рӕстӕг (Ust-Nera)", + "Asia\/Vladivostok": "Уӕрӕсе рӕстӕг (Vladivostok)", + "Asia\/Yakutsk": "Уӕрӕсе рӕстӕг (Yakutsk)", + "Asia\/Yekaterinburg": "Уӕрӕсе рӕстӕг (Yekaterinburg)", "Atlantic\/Canary": "Ныгъуылӕн Европӕйаг рӕстӕг (Canary)", "Atlantic\/Faeroe": "Ныгъуылӕн Европӕйаг рӕстӕг (Faroe)", "Atlantic\/Madeira": "Ныгъуылӕн Европӕйаг рӕстӕг (Madeira)", "Atlantic\/Reykjavik": "Гринвичы рӕстӕмбис рӕстӕг (Reykjavik)", "Atlantic\/St_Helena": "Гринвичы рӕстӕмбис рӕстӕг (St. Helena)", - "CST6CDT": "CST6CDT", - "EST5EDT": "EST5EDT", "Etc\/GMT": "Гринвичы рӕстӕмбис рӕстӕг", - "Etc\/UTC": "UTC", "Europe\/Amsterdam": "Астӕуккаг Европӕйаг рӕстӕг (Amsterdam)", "Europe\/Andorra": "Астӕуккаг Европӕйаг рӕстӕг (Andorra)", "Europe\/Astrakhan": "Мӕскуыйы рӕстӕг (Astrakhan)", @@ -128,7 +125,7 @@ "Europe\/Jersey": "Гринвичы рӕстӕмбис рӕстӕг (Jersey)", "Europe\/Kaliningrad": "Скӕсӕн Европӕйаг рӕстӕг (Kaliningrad)", "Europe\/Kiev": "Скӕсӕн Европӕйаг рӕстӕг (Kiev)", - "Europe\/Kirov": "Уӕрӕсе (Kirov)", + "Europe\/Kirov": "Уӕрӕсе рӕстӕг (Kirov)", "Europe\/Lisbon": "Ныгъуылӕн Европӕйаг рӕстӕг (Lisbon)", "Europe\/Ljubljana": "Астӕуккаг Европӕйаг рӕстӕг (Ljubljana)", "Europe\/London": "Гринвичы рӕстӕмбис рӕстӕг (London)", @@ -145,7 +142,7 @@ "Europe\/Prague": "Астӕуккаг Европӕйаг рӕстӕг (Prague)", "Europe\/Riga": "Скӕсӕн Европӕйаг рӕстӕг (Riga)", "Europe\/Rome": "Астӕуккаг Европӕйаг рӕстӕг (Rome)", - "Europe\/Samara": "Уӕрӕсе (Samara)", + "Europe\/Samara": "Уӕрӕсе рӕстӕг (Samara)", "Europe\/San_Marino": "Астӕуккаг Европӕйаг рӕстӕг (San Marino)", "Europe\/Sarajevo": "Астӕуккаг Европӕйаг рӕстӕг (Sarajevo)", "Europe\/Saratov": "Мӕскуыйы рӕстӕг (Saratov)", @@ -161,20 +158,12 @@ "Europe\/Vatican": "Астӕуккаг Европӕйаг рӕстӕг (Vatican)", "Europe\/Vienna": "Астӕуккаг Европӕйаг рӕстӕг (Vienna)", "Europe\/Vilnius": "Скӕсӕн Европӕйаг рӕстӕг (Vilnius)", - "Europe\/Volgograd": "Уӕрӕсе (Volgograd)", + "Europe\/Volgograd": "Уӕрӕсе рӕстӕг (Volgograd)", "Europe\/Warsaw": "Астӕуккаг Европӕйаг рӕстӕг (Warsaw)", "Europe\/Zagreb": "Астӕуккаг Европӕйаг рӕстӕг (Zagreb)", "Europe\/Zaporozhye": "Скӕсӕн Европӕйаг рӕстӕг (Zaporozhye)", "Europe\/Zurich": "Астӕуккаг Европӕйаг рӕстӕг (Zurich)", - "MST7MDT": "MST7MDT", - "PST8PDT": "PST8PDT", - "Pacific\/Honolulu": "АИШ (Honolulu)" + "Pacific\/Honolulu": "АИШ рӕстӕг (Honolulu)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/pa.json b/src/Symfony/Component/Intl/Resources/data/timezones/pa.json index 083952cabecad..550c8305b9c8f 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/pa.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/pa.json @@ -99,7 +99,7 @@ "America\/Detroit": "ਉੱਤਰੀ ਅਮਰੀਕੀ ਪੂਰਬੀ ਵੇਲਾ (ਡਿਟਰੋਇਟ)", "America\/Dominica": "ਅਟਲਾਂਟਿਕ ਵੇਲਾ (ਡੋਮੀਨਿਕਾ)", "America\/Edmonton": "ਉੱਤਰੀ ਅਮਰੀਕੀ ਮਾਉਂਟੇਨ ਵੇਲਾ (ਐਡਮੋਂਟਨ)", - "America\/Eirunepe": "ਬ੍ਰਾਜ਼ੀਲ (ਯੁਰੂਨੀਪੇ)", + "America\/Eirunepe": "ਬ੍ਰਾਜ਼ੀਲ ਵੇਲਾ (ਯੁਰੂਨੀਪੇ)", "America\/El_Salvador": "ਉੱਤਰੀ ਅਮਰੀਕੀ ਕੇਂਦਰੀ ਵੇਲਾ (ਅਲ ਸਲਵਾਡੋਰ)", "America\/Fort_Nelson": "ਉੱਤਰੀ ਅਮਰੀਕੀ ਮਾਉਂਟੇਨ ਵੇਲਾ (ਫੋਰਟ ਨੈਲਸਨ)", "America\/Fortaleza": "ਬ੍ਰਾਜ਼ੀਲੀਆ ਵੇਲਾ (ਫੋਰਟਾਲੇਜ਼ਾ)", @@ -151,7 +151,7 @@ "America\/Moncton": "ਅਟਲਾਂਟਿਕ ਵੇਲਾ (ਮੋਂਕਟਨ)", "America\/Monterrey": "ਉੱਤਰੀ ਅਮਰੀਕੀ ਕੇਂਦਰੀ ਵੇਲਾ (ਮੋਨਟੇਰੀ)", "America\/Montevideo": "ਉਰੂਗਵੇ ਵੇਲਾ (ਮੋਂਟੇਵੀਡੀਓ)", - "America\/Montreal": "ਕੈਨੇਡਾ (Montreal)", + "America\/Montreal": "ਕੈਨੇਡਾ ਵੇਲਾ (Montreal)", "America\/Montserrat": "ਅਟਲਾਂਟਿਕ ਵੇਲਾ (ਮੋਂਟਸੇਰਾਤ)", "America\/Nassau": "ਉੱਤਰੀ ਅਮਰੀਕੀ ਪੂਰਬੀ ਵੇਲਾ (ਨਾਸਾਓ)", "America\/New_York": "ਉੱਤਰੀ ਅਮਰੀਕੀ ਪੂਰਬੀ ਵੇਲਾ (ਨਿਊ ਯਾਰਕ)", @@ -176,7 +176,7 @@ "America\/Recife": "ਬ੍ਰਾਜ਼ੀਲੀਆ ਵੇਲਾ (ਰੇਸੀਫੇ)", "America\/Regina": "ਉੱਤਰੀ ਅਮਰੀਕੀ ਕੇਂਦਰੀ ਵੇਲਾ (ਰੈਜੀਨਾ)", "America\/Resolute": "ਉੱਤਰੀ ਅਮਰੀਕੀ ਕੇਂਦਰੀ ਵੇਲਾ (ਰੈਜ਼ੋਲਿਊਟ)", - "America\/Rio_Branco": "ਬ੍ਰਾਜ਼ੀਲ (ਰੀਓ ਬ੍ਰਾਂਕੋ)", + "America\/Rio_Branco": "ਬ੍ਰਾਜ਼ੀਲ ਵੇਲਾ (ਰੀਓ ਬ੍ਰਾਂਕੋ)", "America\/Santa_Isabel": "ਉੱਤਰ ਪੱਛਮੀ ਮੈਕਸੀਕੋ ਵੇਲਾ (ਸੈਂਟਾ ਇਸਾਬੇਲ)", "America\/Santarem": "ਬ੍ਰਾਜ਼ੀਲੀਆ ਵੇਲਾ (ਸੇਂਟਾਰਮ)", "America\/Santiago": "ਚਿਲੀ ਵੇਲਾ (ਸੇਂਟੀਆਗੋ)", @@ -217,7 +217,7 @@ "Asia\/Aden": "ਅਰਬੀ ਵੇਲਾ (ਅਡੇਨ)", "Asia\/Almaty": "ਪੂਰਬੀ ਕਜ਼ਾਖ਼ਸਤਾਨ ਵੇਲਾ (ਅਲਮੇਟੀ)", "Asia\/Amman": "ਪੂਰਬੀ ਯੂਰਪੀ ਵੇਲਾ (ਅਮਾਨ)", - "Asia\/Anadyr": "ਰੂਸ (ਐਨਾਡਾਇਰ)", + "Asia\/Anadyr": "ਰੂਸ ਵੇਲਾ (ਐਨਾਡਾਇਰ)", "Asia\/Aqtau": "ਪੱਛਮੀ ਕਜ਼ਾਖ਼ਸਤਾਨ ਵੇਲਾ (ਅਕਤੌ)", "Asia\/Aqtobe": "ਪੱਛਮੀ ਕਜ਼ਾਖ਼ਸਤਾਨ ਵੇਲਾ (ਅਕਤੋਬੇ)", "Asia\/Ashgabat": "ਤੁਰਕਮੇਨਿਸਤਾਨ ਵੇਲਾ (ਅਸ਼ਗਾਬਾਟ)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "ਅਰਬੀ ਵੇਲਾ (ਬਹਿਰੀਨ)", "Asia\/Baku": "ਅਜ਼ਰਬਾਈਜਾਨ ਵੇਲਾ (ਬਾਕੂ)", "Asia\/Bangkok": "ਇੰਡੋਚਾਈਨਾ ਵੇਲਾ (ਬੈਂਕਾਕ)", - "Asia\/Barnaul": "ਰੂਸ (ਬਰਨੌਲ)", + "Asia\/Barnaul": "ਰੂਸ ਵੇਲਾ (ਬਰਨੌਲ)", "Asia\/Beirut": "ਪੂਰਬੀ ਯੂਰਪੀ ਵੇਲਾ (ਬੈਰੂਤ)", "Asia\/Bishkek": "ਕਿਰਗਿਸਤਾਨ ਵੇਲਾ (ਬਿਸ਼ਕੇਕ)", "Asia\/Brunei": "ਬਰੂਨੇਈ ਦਾਰੂਸਲਾਮ ਵੇਲਾ", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "ਪੂਰਬੀ ਇੰਡੋਨੇਸ਼ੀਆ ਵੇਲਾ (ਜਯਾਪੁਰਾ)", "Asia\/Jerusalem": "ਇਜ਼ਰਾਈਲ ਵੇਲਾ (ਜੇਰੂਸਲਮ)", "Asia\/Kabul": "ਅਫ਼ਗਾਨਿਸਤਾਨ ਵੇਲਾ (ਕਾਬੁਲ)", - "Asia\/Kamchatka": "ਰੂਸ (ਕਮਚਟਕਾ)", + "Asia\/Kamchatka": "ਰੂਸ ਵੇਲਾ (ਕਮਚਟਕਾ)", "Asia\/Karachi": "ਪਾਕਿਸਤਾਨ ਵੇਲਾ (ਕਰਾਚੀ)", "Asia\/Katmandu": "ਨੇਪਾਲ ਵੇਲਾ (ਕਾਠਮਾਂਡੂ)", "Asia\/Khandyga": "ਯਕੁਤਸਕ ਵੇਲਾ (ਖਾਨਡਿਗਾ)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ਈਰਾਨ ਵੇਲਾ (ਤੇਹਰਾਨ)", "Asia\/Thimphu": "ਭੂਟਾਨ ਵੇਲਾ (ਥਿੰਫੂ)", "Asia\/Tokyo": "ਜਪਾਨ ਵੇਲਾ (ਟੋਕੀਓ)", - "Asia\/Tomsk": "ਰੂਸ (ਟੋਮਸਕ)", + "Asia\/Tomsk": "ਰੂਸ ਵੇਲਾ (ਟੋਮਸਕ)", "Asia\/Ulaanbaatar": "ਉਲਨ ਬਟੋਰ ਵੇਲਾ (ਉਲਾਨਬਾਤਰ)", - "Asia\/Urumqi": "ਚੀਨ (ਊਰੂਮਕੀ)", + "Asia\/Urumqi": "ਚੀਨ ਵੇਲਾ (ਊਰੂਮਕੀ)", "Asia\/Ust-Nera": "ਵਲਾਦੀਵੋਸਤਕ ਵੇਲਾ (ਉਸਤ-ਨੇਰਾ)", "Asia\/Vientiane": "ਇੰਡੋਚਾਈਨਾ ਵੇਲਾ (ਵਾਏਨਟਿਆਨੇ)", "Asia\/Vladivostok": "ਵਲਾਦੀਵੋਸਤਕ ਵੇਲਾ", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "ਗ੍ਰੀਨਵਿਚ ਮੀਨ ਵੇਲਾ (ਗਰਨਜੀ)", "Europe\/Helsinki": "ਪੂਰਬੀ ਯੂਰਪੀ ਵੇਲਾ (ਹੇਲਸਿੰਕੀ)", "Europe\/Isle_of_Man": "ਗ੍ਰੀਨਵਿਚ ਮੀਨ ਵੇਲਾ (ਆਇਲ ਆਫ ਮੈਨ)", - "Europe\/Istanbul": "ਤੁਰਕੀ (ਇਸਤਾਂਬੁਲ)", + "Europe\/Istanbul": "ਤੁਰਕੀ ਵੇਲਾ (ਇਸਤਾਂਬੁਲ)", "Europe\/Jersey": "ਗ੍ਰੀਨਵਿਚ ਮੀਨ ਵੇਲਾ (ਜਰਸੀ)", "Europe\/Kaliningrad": "ਪੂਰਬੀ ਯੂਰਪੀ ਵੇਲਾ (ਕਲੀਨਿੰਗ੍ਰੇਡ)", "Europe\/Kiev": "ਪੂਰਬੀ ਯੂਰਪੀ ਵੇਲਾ (ਕੀਵ)", - "Europe\/Kirov": "ਰੂਸ (ਕੀਰੋਵ)", + "Europe\/Kirov": "ਰੂਸ ਵੇਲਾ (ਕੀਰੋਵ)", "Europe\/Lisbon": "ਪੱਛਮੀ ਯੂਰਪੀ ਵੇਲਾ (ਲਿਸਬਨ)", "Europe\/Ljubljana": "ਮੱਧ ਯੂਰਪੀ ਵੇਲਾ (ਲਜੁਬਲਜਾਨਾ)", "Europe\/London": "ਗ੍ਰੀਨਵਿਚ ਮੀਨ ਵੇਲਾ (ਲੰਡਨ)", @@ -362,7 +362,7 @@ "Europe\/Prague": "ਮੱਧ ਯੂਰਪੀ ਵੇਲਾ (ਪ੍ਰਾਗ)", "Europe\/Riga": "ਪੂਰਬੀ ਯੂਰਪੀ ਵੇਲਾ (ਰਿਗਾ)", "Europe\/Rome": "ਮੱਧ ਯੂਰਪੀ ਵੇਲਾ (ਰੋਮ)", - "Europe\/Samara": "ਰੂਸ (ਸਮਾਰਾ)", + "Europe\/Samara": "ਰੂਸ ਵੇਲਾ (ਸਮਾਰਾ)", "Europe\/San_Marino": "ਮੱਧ ਯੂਰਪੀ ਵੇਲਾ (ਸੈਨ ਮਰੀਨੋ)", "Europe\/Sarajevo": "ਮੱਧ ਯੂਰਪੀ ਵੇਲਾ (ਸਾਰਾਜੇਵੋ)", "Europe\/Saratov": "ਮਾਸਕੋ ਵੇਲਾ (ਸੈਰਾਟੋਵ)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "ਵੇਕ ਆਈਲੈਂਡ ਵੇਲਾ", "Pacific\/Wallis": "ਵਾਲਿਸ ਅਤੇ ਫੁਟੂਨਾ ਵੇਲਾ" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/pl.json b/src/Symfony/Component/Intl/Resources/data/timezones/pl.json index ce0ccb46c4807..2330db954934b 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/pl.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/pl.json @@ -99,7 +99,7 @@ "America\/Detroit": "czas wschodnioamerykański (Detroit)", "America\/Dominica": "czas atlantycki (Dominika)", "America\/Edmonton": "czas górski (Edmonton)", - "America\/Eirunepe": "Brazylia (Eirunepe)", + "America\/Eirunepe": "czas: Brazylia (Eirunepe)", "America\/El_Salvador": "czas środkowoamerykański (Salwador)", "America\/Fort_Nelson": "czas górski (Fort Nelson)", "America\/Fortaleza": "Brasília (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "czas atlantycki (Moncton)", "America\/Monterrey": "czas środkowoamerykański (Monterrey)", "America\/Montevideo": "Urugwaj (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "czas: Kanada (Montreal)", "America\/Montserrat": "czas atlantycki (Montserrat)", "America\/Nassau": "czas wschodnioamerykański (Nassau)", "America\/New_York": "czas wschodnioamerykański (Nowy Jork)", @@ -176,7 +176,7 @@ "America\/Recife": "Brasília (Recife)", "America\/Regina": "czas środkowoamerykański (Regina)", "America\/Resolute": "czas środkowoamerykański (Resolute)", - "America\/Rio_Branco": "Brazylia (Rio Branco)", + "America\/Rio_Branco": "czas: Brazylia (Rio Branco)", "America\/Santa_Isabel": "Meksyk Północno-Zachodni (Santa Isabel)", "America\/Santarem": "Brasília (Santarem)", "America\/Santiago": "Chile (Santiago)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Półwysep Arabski (Bahrajn)", "Asia\/Baku": "Azerbejdżan (Baku)", "Asia\/Bangkok": "czas indochiński (Bangkok)", - "Asia\/Barnaul": "Rosja (Barnauł)", + "Asia\/Barnaul": "czas: Rosja (Barnauł)", "Asia\/Beirut": "czas wschodnioeuropejski (Bejrut)", "Asia\/Bishkek": "Kirgistan (Biszkek)", "Asia\/Brunei": "Brunei", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Iran (Teheran)", "Asia\/Thimphu": "Bhutan (Thimphu)", "Asia\/Tokyo": "Japonia (Tokio)", - "Asia\/Tomsk": "Rosja (Tomsk)", + "Asia\/Tomsk": "czas: Rosja (Tomsk)", "Asia\/Ulaanbaatar": "Ułan Bator", - "Asia\/Urumqi": "Chiny (Urumczi)", + "Asia\/Urumqi": "czas: Chiny (Urumczi)", "Asia\/Ust-Nera": "Władywostok (Ust-Niera)", "Asia\/Vientiane": "czas indochiński (Wientian)", "Asia\/Vladivostok": "Władywostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "czas uniwersalny (Guernsey)", "Europe\/Helsinki": "czas wschodnioeuropejski (Helsinki)", "Europe\/Isle_of_Man": "czas uniwersalny (Wyspa Man)", - "Europe\/Istanbul": "Turcja (Stambuł)", + "Europe\/Istanbul": "czas: Turcja (Stambuł)", "Europe\/Jersey": "czas uniwersalny (Jersey)", "Europe\/Kaliningrad": "czas wschodnioeuropejski (Kaliningrad)", "Europe\/Kiev": "czas wschodnioeuropejski (Kijów)", - "Europe\/Kirov": "Rosja (Kirow)", + "Europe\/Kirov": "czas: Rosja (Kirow)", "Europe\/Lisbon": "czas zachodnioeuropejski (Lizbona)", "Europe\/Ljubljana": "czas środkowoeuropejski (Lublana)", "Europe\/London": "czas uniwersalny (Londyn)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Wake", "Pacific\/Wallis": "Wallis i Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ps.json b/src/Symfony/Component/Intl/Resources/data/timezones/ps.json index 40812e1e5a3ce..468ff5e38f82d 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ps.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ps.json @@ -13,7 +13,7 @@ "Africa\/Blantyre": "منځنی افريقا وخت (Blantyre)", "Africa\/Brazzaville": "لوېديځ افريقا وخت (Brazzaville)", "Africa\/Bujumbura": "منځنی افريقا وخت (بجوګورا)", - "Africa\/Cairo": "مصر (قاهره)", + "Africa\/Cairo": "د مصر په وخت (قاهره)", "Africa\/Casablanca": "لوېديزې اروپا وخت (کاسابلانکا)", "Africa\/Ceuta": "منځنۍ اروپا وخت (Ceuta)", "Africa\/Conakry": "گرينويچ وخت (کونکري)", @@ -50,7 +50,7 @@ "Africa\/Ouagadougou": "گرينويچ وخت (اوواګاګواګو)", "Africa\/Porto-Novo": "لوېديځ افريقا وخت (پورټو - نوو)", "Africa\/Sao_Tome": "گرينويچ وخت (ساو ټوم)", - "Africa\/Tripoli": "لیبیا (تريپولي)", + "Africa\/Tripoli": "د لیبیا په وخت (تريپولي)", "Africa\/Tunis": "منځنۍ اروپا وخت (تونس)", "Africa\/Windhoek": "منځنی افريقا وخت (وینهوک)", "America\/Adak": "هوایی الیوتین وخت (اداک)", @@ -99,7 +99,7 @@ "America\/Detroit": "ختیځ وخت (ډایټروټ)", "America\/Dominica": "اتلانتیک د وخت (دومینیکا)", "America\/Edmonton": "د غره د وخت (ایډمونټن)", - "America\/Eirunepe": "برازیل (اییرونپ)", + "America\/Eirunepe": "د برازیل په وخت (اییرونپ)", "America\/El_Salvador": "مرکزي وخت (ايل سلوادور)", "America\/Fort_Nelson": "د غره د وخت (فورټ نیلسن)", "America\/Fortaleza": "برسلیا وخت (فورتیلزا)", @@ -151,7 +151,7 @@ "America\/Moncton": "اتلانتیک د وخت (مونټون)", "America\/Monterrey": "مرکزي وخت (منټرري)", "America\/Montevideo": "یوروګوای وخت (مونټ وډیو)", - "America\/Montreal": "کاناډا (Montreal)", + "America\/Montreal": "د کاناډا په وخت (Montreal)", "America\/Montserrat": "اتلانتیک د وخت (مانټیسیرت)", "America\/Nassau": "ختیځ وخت (نیساو)", "America\/New_York": "ختیځ وخت (نیویارک)", @@ -176,7 +176,7 @@ "America\/Recife": "برسلیا وخت (ریسیفي)", "America\/Regina": "مرکزي وخت (ریګینا)", "America\/Resolute": "مرکزي وخت (غوڅ)", - "America\/Rio_Branco": "برازیل (ریو برانکو)", + "America\/Rio_Branco": "د برازیل په وخت (ریو برانکو)", "America\/Santa_Isabel": "د شمال لویدیځ مکسیکو وخت (Santa Isabel)", "America\/Santarem": "برسلیا وخت (سناترم)", "America\/Santiago": "چلی وخت (سنتياګو)", @@ -216,8 +216,8 @@ "Arctic\/Longyearbyen": "منځنۍ اروپا وخت (لاندینبیبین)", "Asia\/Aden": "عربي وخت (اډن)", "Asia\/Almaty": "ختیځ د قزاقستان د وخت (الماتی)", - "Asia\/Amman": "اردن (اممان)", - "Asia\/Anadyr": "روسیه (اناډير)", + "Asia\/Amman": "د اردن په وخت (اممان)", + "Asia\/Anadyr": "د روسیه په وخت (اناډير)", "Asia\/Aqtau": "لویدیځ قزاقستان وخت (اکاټو)", "Asia\/Aqtobe": "لویدیځ قزاقستان وخت (اکتوب)", "Asia\/Ashgabat": "ترکمانستان وخت (اشغ آباد)", @@ -226,22 +226,22 @@ "Asia\/Bahrain": "عربي وخت (بحرین)", "Asia\/Baku": "د آذربايجان وخت (باکو)", "Asia\/Bangkok": "د اندوچینا وخت (بانکاک)", - "Asia\/Barnaul": "روسیه (برنول)", - "Asia\/Beirut": "لبنان (بیروت)", + "Asia\/Barnaul": "د روسیه په وخت (برنول)", + "Asia\/Beirut": "د لبنان په وخت (بیروت)", "Asia\/Bishkek": "کرغیزستان وخت (بشکیک)", "Asia\/Brunei": "د بروني درسلام وخت (برویني)", "Asia\/Calcutta": "د هند معیاري وخت (کولکته)", "Asia\/Chita": "ياکوټسک وخت (چيتا)", "Asia\/Choibalsan": "چوئیبیلسن وخت (Choibalsan)", "Asia\/Colombo": "د هند معیاري وخت (کولمبو)", - "Asia\/Damascus": "سوریه (دمشق)", + "Asia\/Damascus": "د سوریه په وخت (دمشق)", "Asia\/Dhaka": "بنگله دېش وخت (ډهاکه)", "Asia\/Dili": "ختیځ ختیځ تیمور وخت (ديلي)", "Asia\/Dubai": "د خلیج معياري وخت (دوبی)", "Asia\/Dushanbe": "تاجکستان د وخت (دوشنبي)", - "Asia\/Famagusta": "قبرس (Famagusta)", - "Asia\/Gaza": "فلسطين سيمې (غزه)", - "Asia\/Hebron": "فلسطين سيمې (هبرون)", + "Asia\/Famagusta": "د قبرس په وخت (Famagusta)", + "Asia\/Gaza": "د فلسطين سيمې په وخت (غزه)", + "Asia\/Hebron": "د فلسطين سيمې په وخت (هبرون)", "Asia\/Hong_Kong": "د هانګ کانګ د وخت", "Asia\/Hovd": "هاوډ وخت (Hovd)", "Asia\/Irkutsk": "د ارکوټس وخت (ایرکوټس)", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "د اندونیزیا وخت (جاپورا)", "Asia\/Jerusalem": "د اسراییل وخت (یهودان)", "Asia\/Kabul": "افغانستان وخت (کابل)", - "Asia\/Kamchatka": "روسیه (کامچاتکا)", + "Asia\/Kamchatka": "د روسیه په وخت (کامچاتکا)", "Asia\/Karachi": "د پاکستان وخت (کراچي)", "Asia\/Katmandu": "نیپال وخت (کټمنډو)", "Asia\/Khandyga": "ياکوټسک وخت (خندګي)", @@ -262,7 +262,7 @@ "Asia\/Makassar": "د اندونیزیا مرکزي وخت (مکاسار)", "Asia\/Manila": "د فلپین وخت (منیلا)", "Asia\/Muscat": "د خلیج معياري وخت (مسکټ)", - "Asia\/Nicosia": "قبرس (نیکوسیا)", + "Asia\/Nicosia": "د قبرس په وخت (نیکوسیا)", "Asia\/Novokuznetsk": "کریسایویسسک وخت (نووکوزنیټک)", "Asia\/Novosibirsk": "د نووسوسبیرک وخت", "Asia\/Omsk": "اوزک وخت (اوک)", @@ -288,16 +288,16 @@ "Asia\/Tehran": "د ایران وخت (تهران)", "Asia\/Thimphu": "د بوتان وخت (تهيمفو)", "Asia\/Tokyo": "جاپان د وخت (ټوکیو)", - "Asia\/Tomsk": "روسیه (توماس)", + "Asia\/Tomsk": "د روسیه په وخت (توماس)", "Asia\/Ulaanbaatar": "دلانانباټ وخت (اللانبیر)", - "Asia\/Urumqi": "چین (Urumqi)", + "Asia\/Urumqi": "د چین په وخت (Urumqi)", "Asia\/Ust-Nera": "ولادیوستاک وخت (اوسترا)", "Asia\/Vientiane": "د اندوچینا وخت (وینټینیا)", "Asia\/Vladivostok": "ولادیوستاک وخت", "Asia\/Yakutsk": "ياکوټسک وخت (یااکټس)", "Asia\/Yekaterinburg": "د ياکيټرنبرګ وخت (یاراتینینګ برګ)", "Asia\/Yerevan": "ارمنستان وخت (ییران)", - "Atlantic\/Azores": "پورتګال (Azores)", + "Atlantic\/Azores": "د پورتګال په وخت (Azores)", "Atlantic\/Bermuda": "اتلانتیک د وخت (برمودا)", "Atlantic\/Canary": "لوېديزې اروپا وخت (کیري)", "Atlantic\/Cape_Verde": "کیپ وردډ وخت (کېپ وردا)", @@ -326,33 +326,33 @@ "Europe\/Amsterdam": "منځنۍ اروپا وخت (امستردام)", "Europe\/Andorra": "منځنۍ اروپا وخت (اندورا)", "Europe\/Astrakhan": "ماسکو وخت (آسترخان)", - "Europe\/Athens": "یونان (ایترین)", + "Europe\/Athens": "د یونان په وخت (ایترین)", "Europe\/Belgrade": "منځنۍ اروپا وخت (بلغاد)", "Europe\/Berlin": "منځنۍ اروپا وخت (برلین)", "Europe\/Bratislava": "منځنۍ اروپا وخت (براتسکوا)", "Europe\/Brussels": "منځنۍ اروپا وخت (بروسلز)", - "Europe\/Bucharest": "رومانیا (بخارست)", + "Europe\/Bucharest": "د رومانیا په وخت (بخارست)", "Europe\/Budapest": "منځنۍ اروپا وخت (بوډاپیس)", "Europe\/Busingen": "منځنۍ اروپا وخت (بسینګین)", - "Europe\/Chisinau": "مولدوا (چیسینو)", + "Europe\/Chisinau": "د مولدوا په وخت (چیسینو)", "Europe\/Copenhagen": "منځنۍ اروپا وخت (کوپینګنګ)", "Europe\/Dublin": "گرينويچ وخت (ډوبلین)", "Europe\/Gibraltar": "منځنۍ اروپا وخت (جبل الطارق)", "Europe\/Guernsey": "گرينويچ وخت (ګرنسي)", - "Europe\/Helsinki": "فنلینډ (هیلسنکی)", + "Europe\/Helsinki": "د فنلینډ په وخت (هیلسنکی)", "Europe\/Isle_of_Man": "گرينويچ وخت (د آئل آف مین)", - "Europe\/Istanbul": "ترکي (استانبول)", + "Europe\/Istanbul": "د ترکي په وخت (استانبول)", "Europe\/Jersey": "گرينويچ وخت (جرسی)", - "Europe\/Kaliningrad": "روسیه (کیليینګراډر)", - "Europe\/Kiev": "اوکراین (کیو)", - "Europe\/Kirov": "روسیه (کیروف)", + "Europe\/Kaliningrad": "د روسیه په وخت (کیليینګراډر)", + "Europe\/Kiev": "د اوکراین په وخت (کیو)", + "Europe\/Kirov": "د روسیه په وخت (کیروف)", "Europe\/Lisbon": "لوېديزې اروپا وخت (لیسبون)", "Europe\/Ljubljana": "منځنۍ اروپا وخت (لوججانا)", "Europe\/London": "گرينويچ وخت (لندن)", "Europe\/Luxembourg": "منځنۍ اروپا وخت (لوګزامبورګ)", "Europe\/Madrid": "منځنۍ اروپا وخت (میډریډ)", "Europe\/Malta": "منځنۍ اروپا وخت (مالتا)", - "Europe\/Mariehamn": "الاند ټاپوان (ماریاهمین)", + "Europe\/Mariehamn": "د الاند ټاپوان په وخت (ماریاهمین)", "Europe\/Minsk": "ماسکو وخت (منسک)", "Europe\/Monaco": "منځنۍ اروپا وخت (موناکو)", "Europe\/Moscow": "ماسکو وخت", @@ -360,28 +360,28 @@ "Europe\/Paris": "منځنۍ اروپا وخت (پاریس)", "Europe\/Podgorica": "منځنۍ اروپا وخت (پوډورګویکا)", "Europe\/Prague": "منځنۍ اروپا وخت (پراګ)", - "Europe\/Riga": "ليتهويا (ریګ)", + "Europe\/Riga": "د ليتهويا په وخت (ریګ)", "Europe\/Rome": "منځنۍ اروپا وخت (روم)", - "Europe\/Samara": "روسیه (سمارا)", + "Europe\/Samara": "د روسیه په وخت (سمارا)", "Europe\/San_Marino": "منځنۍ اروپا وخت (سان مارینو)", "Europe\/Sarajevo": "منځنۍ اروپا وخت (سرجیو)", "Europe\/Saratov": "ماسکو وخت (سراتف)", "Europe\/Simferopol": "ماسکو وخت (سیمفروپول)", "Europe\/Skopje": "منځنۍ اروپا وخت (سکپوګ)", - "Europe\/Sofia": "بلغاریه (صوفیا)", + "Europe\/Sofia": "د بلغاریه په وخت (صوفیا)", "Europe\/Stockholm": "منځنۍ اروپا وخت (استولوم)", - "Europe\/Tallinn": "استونیا (تالين)", + "Europe\/Tallinn": "د استونیا په وخت (تالين)", "Europe\/Tirane": "منځنۍ اروپا وخت (Tirane)", "Europe\/Ulyanovsk": "ماسکو وخت (ایلیانوفس)", - "Europe\/Uzhgorod": "اوکراین (یوژورډ)", + "Europe\/Uzhgorod": "د اوکراین په وخت (یوژورډ)", "Europe\/Vaduz": "منځنۍ اروپا وخت (وادز)", "Europe\/Vatican": "منځنۍ اروپا وخت (ویټیکان)", "Europe\/Vienna": "منځنۍ اروپا وخت (ویانا)", - "Europe\/Vilnius": "لیتوانیا (ویلیونس)", + "Europe\/Vilnius": "د لیتوانیا په وخت (ویلیونس)", "Europe\/Volgograd": "د والګوګراد وخت (والګراډر)", "Europe\/Warsaw": "منځنۍ اروپا وخت (وارسا)", "Europe\/Zagreb": "منځنۍ اروپا وخت (زګرب)", - "Europe\/Zaporozhye": "اوکراین (زاپوروژی)", + "Europe\/Zaporozhye": "د اوکراین په وخت (زاپوروژی)", "Europe\/Zurich": "منځنۍ اروپا وخت (زریچ)", "Indian\/Antananarivo": "ختيځ افريقا وخت (انتوننارو)", "Indian\/Chagos": "د هند سمندر وخت (چارګوس)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "دک ټاپو وخت (ویک)", "Pacific\/Wallis": "والیس او فوتونا وخت (والس)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ps_PK.json b/src/Symfony/Component/Intl/Resources/data/timezones/ps_PK.json index 6d2cb610bcc22..b010ee752de3e 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ps_PK.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ps_PK.json @@ -5,6 +5,8 @@ "Africa\/El_Aaiun": "لوېديزے اروپا وخت (الیون)", "Africa\/Harare": "منځنی افريقا وخت (هرارے)", "America\/Lower_Princes": "اتلانتیک د وخت (د کمتر شهزاده درے میاشتنۍ)", + "Asia\/Gaza": "د فلسطين سيمے په وخت (غزه)", + "Asia\/Hebron": "د فلسطين سيمے په وخت (هبرون)", "Atlantic\/Canary": "لوېديزے اروپا وخت (کیري)", "Atlantic\/Faeroe": "لوېديزے اروپا وخت (فارو)", "Atlantic\/Madeira": "لوېديزے اروپا وخت (مایررا)", diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/pt.json b/src/Symfony/Component/Intl/Resources/data/timezones/pt.json index b4c7e365c4042..d71bc29d27004 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/pt.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/pt.json @@ -151,7 +151,7 @@ "America\/Moncton": "Horário do Atlântico (Moncton)", "America\/Monterrey": "Horário Central (Monterrey)", "America\/Montevideo": "Horário do Uruguai (Montevidéu)", - "America\/Montreal": "Canadá (Montreal)", + "America\/Montreal": "Horário Canadá (Montreal)", "America\/Montserrat": "Horário do Atlântico (Montserrat)", "America\/Nassau": "Horário do Leste (Nassau)", "America\/New_York": "Horário do Leste (Nova York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Horário da Arábia (Bahrein)", "Asia\/Baku": "Horário do Arzeibaijão (Baku)", "Asia\/Bangkok": "Horário da Indochina (Bangkok)", - "Asia\/Barnaul": "Rússia (Barnaul)", + "Asia\/Barnaul": "Horário Rússia (Barnaul)", "Asia\/Beirut": "Horário da Europa Oriental (Beirute)", "Asia\/Bishkek": "Horário do Quirguistão (Bishkek)", "Asia\/Brunei": "Horário de Brunei Darussalam", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Horário do Irã (Teerã)", "Asia\/Thimphu": "Horário do Butão (Timphu)", "Asia\/Tokyo": "Horário do Japão (Tóquio)", - "Asia\/Tomsk": "Rússia (Tomsk)", + "Asia\/Tomsk": "Horário Rússia (Tomsk)", "Asia\/Ulaanbaatar": "Horário de Ulan Bator", - "Asia\/Urumqi": "China (Urumqi)", + "Asia\/Urumqi": "Horário China (Urumqi)", "Asia\/Ust-Nera": "Horário de Vladivostok (Ust-Nera)", "Asia\/Vientiane": "Horário da Indochina (Vientiane)", "Asia\/Vladivostok": "Horário de Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Horário do Meridiano de Greenwich (Guernsey)", "Europe\/Helsinki": "Horário da Europa Oriental (Helsinque)", "Europe\/Isle_of_Man": "Horário do Meridiano de Greenwich (Ilha de Man)", - "Europe\/Istanbul": "Turquia (Istambul)", + "Europe\/Istanbul": "Horário Turquia (Istambul)", "Europe\/Jersey": "Horário do Meridiano de Greenwich (Jersey)", "Europe\/Kaliningrad": "Horário da Europa Oriental (Kaliningrado)", "Europe\/Kiev": "Horário da Europa Oriental (Kiev)", - "Europe\/Kirov": "Rússia (Kirov)", + "Europe\/Kirov": "Horário Rússia (Kirov)", "Europe\/Lisbon": "Horário da Europa Ocidental (Lisboa)", "Europe\/Ljubljana": "Horário da Europa Central (Liubliana)", "Europe\/London": "Horário do Meridiano de Greenwich (Londres)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Horário das Ilhas Wake", "Pacific\/Wallis": "Horário de Wallis e Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/pt_PT.json b/src/Symfony/Component/Intl/Resources/data/timezones/pt_PT.json index 35a856c210849..556755668decc 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/pt_PT.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/pt_PT.json @@ -151,6 +151,7 @@ "America\/Moncton": "Hora do Atlântico (Moncton)", "America\/Monterrey": "Hora Central (Monterrey)", "America\/Montevideo": "Hora do Uruguai (Montevideu)", + "America\/Montreal": "Hora de Canadá (Montreal)", "America\/Montserrat": "Hora do Atlântico (Monserrate)", "America\/Nassau": "Hora Oriental (Nassau)", "America\/New_York": "Hora Oriental (Nova Iorque)", @@ -225,6 +226,7 @@ "Asia\/Bahrain": "Hora da Arábia (Barém)", "Asia\/Baku": "Hora do Azerbaijão (Baku)", "Asia\/Bangkok": "Hora da Indochina (Banguecoque)", + "Asia\/Barnaul": "Hora de Rússia (Barnaul)", "Asia\/Beirut": "Hora da Europa Oriental (Beirute)", "Asia\/Bishkek": "Hora do Quirguistão (Bishkek)", "Asia\/Brunei": "Hora do Brunei Darussalam", @@ -286,8 +288,9 @@ "Asia\/Tehran": "Hora do Irão (Teerão)", "Asia\/Thimphu": "Hora do Butão (Timphu)", "Asia\/Tokyo": "Hora do Japão (Tóquio)", + "Asia\/Tomsk": "Hora de Rússia (Tomsk)", "Asia\/Ulaanbaatar": "Hora de Ulan Bator", - "Asia\/Urumqi": "China (Urumqi)", + "Asia\/Urumqi": "Hora de China (Urumqi)", "Asia\/Ust-Nera": "Hora de Vladivostok (Ust-Nera)", "Asia\/Vientiane": "Hora da Indochina (Vientiane)", "Asia\/Vladivostok": "Hora de Vladivostok", @@ -338,9 +341,11 @@ "Europe\/Guernsey": "Hora de Greenwich (Guernsey)", "Europe\/Helsinki": "Hora da Europa Oriental (Helsínquia)", "Europe\/Isle_of_Man": "Hora de Greenwich (Ilha de Man)", + "Europe\/Istanbul": "Hora de Turquia (Istambul)", "Europe\/Jersey": "Hora de Greenwich (Jersey)", "Europe\/Kaliningrad": "Hora da Europa Oriental (Caliningrado)", "Europe\/Kiev": "Hora da Europa Oriental (Kiev)", + "Europe\/Kirov": "Hora de Rússia (Kirov)", "Europe\/Lisbon": "Hora da Europa Ocidental (Lisboa)", "Europe\/Ljubljana": "Hora da Europa Central (Liubliana)", "Europe\/London": "Hora de Greenwich (Londres)", diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/qu.json b/src/Symfony/Component/Intl/Resources/data/timezones/qu.json index f78f59add07a3..baa8b6f657cfc 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/qu.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/qu.json @@ -248,10 +248,6 @@ "Australia\/Melbourne": "Australia (Melbourne)", "Australia\/Perth": "Australia (Perth)", "Australia\/Sydney": "Australia (Sydney)", - "CST6CDT": "CST6CDT", - "EST5EDT": "EST5EDT", - "Etc\/GMT": "GMT", - "Etc\/UTC": "UTC", "Europe\/Amsterdam": "Países Bajos (Amsterdam)", "Europe\/Andorra": "Andorra (Andorra)", "Europe\/Astrakhan": "Rusia (Astrakhan)", @@ -308,8 +304,6 @@ "Indian\/Maldives": "Maldives Time", "Indian\/Mauritius": "Mauritius Time", "Indian\/Reunion": "Reunion Time", - "MST7MDT": "MST7MDT", - "PST8PDT": "PST8PDT", "Pacific\/Apia": "Samoa (Apia)", "Pacific\/Auckland": "New Zealand Time (Auckland)", "Pacific\/Bougainville": "Papua New Guinea Time (Bougainville)", @@ -349,11 +343,5 @@ "Pacific\/Wake": "Islas menores alejadas de los EE.UU. (Wake)", "Pacific\/Wallis": "Wallis & Futuna Time" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/rm.json b/src/Symfony/Component/Intl/Resources/data/timezones/rm.json index d09b1cb2ddfef..84b43a3e8566c 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/rm.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/rm.json @@ -315,10 +315,6 @@ "Australia\/Melbourne": "Australia (Melbourne)", "Australia\/Perth": "Australia (Perth)", "Australia\/Sydney": "Australia (Sydney)", - "CST6CDT": "CST6CDT", - "EST5EDT": "EST5EDT", - "Etc\/GMT": "GMT", - "Etc\/UTC": "UTC", "Europe\/Amsterdam": "Pajais Bass (Amsterdam)", "Europe\/Andorra": "Andorra (Andorra)", "Europe\/Astrakhan": "Russia (Astrakhan)", @@ -390,8 +386,6 @@ "Indian\/Mauritius": "Mauritius (Mauritius)", "Indian\/Mayotte": "Mayotte (Mayotte)", "Indian\/Reunion": "Réunion (Réunion)", - "MST7MDT": "MST7MDT", - "PST8PDT": "PST8PDT", "Pacific\/Apia": "Samoa (Apia)", "Pacific\/Auckland": "Nova Zelanda (Auckland)", "Pacific\/Bougainville": "Papua Nova Guinea (Bougainville)", @@ -432,11 +426,5 @@ "Pacific\/Wake": "Inslas pitschnas perifericas dals Stadis Unids da l’America (Wake)", "Pacific\/Wallis": "Wallis e Futuna (Matāʻutu)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ro.json b/src/Symfony/Component/Intl/Resources/data/timezones/ro.json index 7349c14b62948..fee3a387dfa6a 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ro.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ro.json @@ -151,7 +151,7 @@ "America\/Moncton": "Ora zonei Atlantic nord-americane (Moncton)", "America\/Monterrey": "Ora centrală nord-americană (Monterrey)", "America\/Montevideo": "Ora Uruguayului (Montevideo)", - "America\/Montreal": "Canada (Montreal)", + "America\/Montreal": "Ora din Canada (Montreal)", "America\/Montserrat": "Ora zonei Atlantic nord-americane (Montserrat)", "America\/Nassau": "Ora orientală nord-americană (Nassau)", "America\/New_York": "Ora orientală nord-americană (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Ora arabă (Bahrain)", "Asia\/Baku": "Ora Azerbaidjanului (Baku)", "Asia\/Bangkok": "Ora Indochinei (Bangkok)", - "Asia\/Barnaul": "Rusia (Barnaul)", + "Asia\/Barnaul": "Ora din Rusia (Barnaul)", "Asia\/Beirut": "Ora Europei de Est (Beirut)", "Asia\/Bishkek": "Ora din Kârgâzstan (Bișkek)", "Asia\/Brunei": "Ora din Brunei Darussalam", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Ora Iranului (Teheran)", "Asia\/Thimphu": "Ora Bhutanului (Thimphu)", "Asia\/Tokyo": "Ora Japoniei (Tokyo)", - "Asia\/Tomsk": "Rusia (Tomsk)", + "Asia\/Tomsk": "Ora din Rusia (Tomsk)", "Asia\/Ulaanbaatar": "Ora din Ulan Bator", - "Asia\/Urumqi": "China (Urumqi)", + "Asia\/Urumqi": "Ora din China (Urumqi)", "Asia\/Ust-Nera": "Ora din Vladivostok (Ust-Nera)", "Asia\/Vientiane": "Ora Indochinei (Vientiane)", "Asia\/Vladivostok": "Ora din Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Ora de Greenwhich (Guernsey)", "Europe\/Helsinki": "Ora Europei de Est (Helsinki)", "Europe\/Isle_of_Man": "Ora de Greenwhich (Insula Man)", - "Europe\/Istanbul": "Turcia (Istanbul)", + "Europe\/Istanbul": "Ora din Turcia (Istanbul)", "Europe\/Jersey": "Ora de Greenwhich (Jersey)", "Europe\/Kaliningrad": "Ora Europei de Est (Kaliningrad)", "Europe\/Kiev": "Ora Europei de Est (Kiev)", - "Europe\/Kirov": "Rusia (Kirov)", + "Europe\/Kirov": "Ora din Rusia (Kirov)", "Europe\/Lisbon": "Ora Europei de Vest (Lisabona)", "Europe\/Ljubljana": "Ora Europei Centrale (Ljubljana)", "Europe\/London": "Ora de Greenwhich (Londra)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Ora Insulei Wake", "Pacific\/Wallis": "Ora din Wallis și Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/root.json b/src/Symfony/Component/Intl/Resources/data/timezones/root.json new file mode 100644 index 0000000000000..e64966b220ea6 --- /dev/null +++ b/src/Symfony/Component/Intl/Resources/data/timezones/root.json @@ -0,0 +1,8 @@ +{ + "Version": "2.1.49.82", + "Meta": { + "GmtFormat": "GMT%s", + "HourFormatPos": "+%02d:%02d", + "HourFormatNeg": "-%02d:%02d" + } +} diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ru.json b/src/Symfony/Component/Intl/Resources/data/timezones/ru.json index c861dbf105070..09cbfaea441d9 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ru.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ru.json @@ -436,11 +436,5 @@ "Pacific\/Wake": "Уэйк", "Pacific\/Wallis": "Уоллис и Футуна" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/rw.json b/src/Symfony/Component/Intl/Resources/data/timezones/rw.json index 669fcbcb14f71..91d7d5baee381 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/rw.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/rw.json @@ -3,20 +3,8 @@ "Names": { "Africa\/Kigali": "U Rwanda (Kigali)", "Antarctica\/Troll": "Troll", - "CST6CDT": "CST6CDT", - "EST5EDT": "EST5EDT", - "Etc\/GMT": "GMT", - "Etc\/UTC": "UTC", "Europe\/Skopje": "Masedoniya y'Amajyaruguru (Skopje)", - "MST7MDT": "MST7MDT", - "PST8PDT": "PST8PDT", "Pacific\/Tongatapu": "Tonga (Tongatapu)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/sd.json b/src/Symfony/Component/Intl/Resources/data/timezones/sd.json index 488666d039731..431a448f3e7fa 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/sd.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/sd.json @@ -99,7 +99,7 @@ "America\/Detroit": "مشرقي وقت (ڊيٽرائيٽ)", "America\/Dominica": "ايٽلانٽڪ جو وقت (ڊومينيڪا)", "America\/Edmonton": "پهاڙي وقت (ايڊمونٽن)", - "America\/Eirunepe": "برازيل (ايرونيپ)", + "America\/Eirunepe": "برازيل وقت (ايرونيپ)", "America\/El_Salvador": "مرڪزي وقت (ايل سلواڊور)", "America\/Fort_Nelson": "پهاڙي وقت (فورٽ نيلسن)", "America\/Fortaleza": "بريسيليائي وقت (فورٽاليزا)", @@ -151,7 +151,7 @@ "America\/Moncton": "ايٽلانٽڪ جو وقت (مانڪٽن)", "America\/Monterrey": "مرڪزي وقت (مانٽيري)", "America\/Montevideo": "يوروگائي جو وقت (مونٽي ويڊيو)", - "America\/Montreal": "ڪئناڊا (Montreal)", + "America\/Montreal": "ڪئناڊا وقت (Montreal)", "America\/Montserrat": "ايٽلانٽڪ جو وقت (مانٽسريٽ)", "America\/Nassau": "مشرقي وقت (ناسائو)", "America\/New_York": "مشرقي وقت (نيويارڪ)", @@ -176,7 +176,7 @@ "America\/Recife": "بريسيليائي وقت (هيسيفي)", "America\/Regina": "مرڪزي وقت (ریجینا)", "America\/Resolute": "مرڪزي وقت (ريزوليوٽ)", - "America\/Rio_Branco": "برازيل (ريو برانڪو)", + "America\/Rio_Branco": "برازيل وقت (ريو برانڪو)", "America\/Santa_Isabel": "شمالي مغربي ميڪسيڪو جو وقت (Santa Isabel)", "America\/Santarem": "بريسيليائي وقت (سنٽاريم)", "America\/Santiago": "چلي جو وقت (سينٽياگو)", @@ -217,7 +217,7 @@ "Asia\/Aden": "عربين جو وقت (عدن)", "Asia\/Almaty": "اوڀر قزاقستان جو وقت (الماتي)", "Asia\/Amman": "مشرقي يورپي وقت (امان)", - "Asia\/Anadyr": "روس (انيدر)", + "Asia\/Anadyr": "روس وقت (انيدر)", "Asia\/Aqtau": "اولهه قزاقستان جو وقت (اڪٽائو)", "Asia\/Aqtobe": "اولهه قزاقستان جو وقت (ايڪٽوب)", "Asia\/Ashgabat": "ترڪمانستان جو وقت (آشگاباد)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "عربين جو وقت (بحرين)", "Asia\/Baku": "آذربائيجان جو وقت (باڪو)", "Asia\/Bangkok": "انڊو چائنا جو وقت (بئنڪاڪ)", - "Asia\/Barnaul": "روس (برنل)", + "Asia\/Barnaul": "روس وقت (برنل)", "Asia\/Beirut": "مشرقي يورپي وقت (بيروت)", "Asia\/Bishkek": "ڪرگزستان جو وقت (بشڪيڪ)", "Asia\/Brunei": "برونائي داروالسلام جو وقت", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "اوڀر انڊونيشيا جو وقت (جياپورا)", "Asia\/Jerusalem": "اسرائيل جو وقت (يوروشلم)", "Asia\/Kabul": "افغانستان جو وقت (ڪابل)", - "Asia\/Kamchatka": "روس (ڪمچاسڪي)", + "Asia\/Kamchatka": "روس وقت (ڪمچاسڪي)", "Asia\/Karachi": "پاڪستان جو وقت (ڪراچي)", "Asia\/Katmandu": "نيپال جو وقت (کٽمنڊو)", "Asia\/Khandyga": "ياڪتسڪ جو وقت (کندياگا)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ايران جو وقت (تهران)", "Asia\/Thimphu": "ڀوٽان جو وقت (ٿمفو)", "Asia\/Tokyo": "جاپان جو وقت (ٽوڪيو)", - "Asia\/Tomsk": "روس (تمسڪ)", + "Asia\/Tomsk": "روس وقت (تمسڪ)", "Asia\/Ulaanbaatar": "اولان باتر جو وقت", - "Asia\/Urumqi": "چين (يورمڪي)", + "Asia\/Urumqi": "چين وقت (يورمڪي)", "Asia\/Ust-Nera": "ولادووستوڪ جو وقت (اسٽ نيرا)", "Asia\/Vientiane": "انڊو چائنا جو وقت (وينٽيان)", "Asia\/Vladivostok": "ولادووستوڪ جو وقت", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "گرين وچ مين ٽائيم (گرنزي)", "Europe\/Helsinki": "مشرقي يورپي وقت (هيلسنڪي)", "Europe\/Isle_of_Man": "گرين وچ مين ٽائيم (آئيزل آف مين)", - "Europe\/Istanbul": "ترڪي (استنبول)", + "Europe\/Istanbul": "ترڪي وقت (استنبول)", "Europe\/Jersey": "گرين وچ مين ٽائيم (جرسي)", "Europe\/Kaliningrad": "مشرقي يورپي وقت (ڪلينن گراڊ)", "Europe\/Kiev": "مشرقي يورپي وقت (ڪيف)", - "Europe\/Kirov": "روس (ڪيروف)", + "Europe\/Kirov": "روس وقت (ڪيروف)", "Europe\/Lisbon": "مغربي يورپي وقت (لسبن)", "Europe\/Ljubljana": "مرڪزي يورپي وقت (لبليانا)", "Europe\/London": "گرين وچ مين ٽائيم (لنڊن)", @@ -362,7 +362,7 @@ "Europe\/Prague": "مرڪزي يورپي وقت (پراگ)", "Europe\/Riga": "مشرقي يورپي وقت (رگا)", "Europe\/Rome": "مرڪزي يورپي وقت (روم)", - "Europe\/Samara": "روس (سمارا)", + "Europe\/Samara": "روس وقت (سمارا)", "Europe\/San_Marino": "مرڪزي يورپي وقت (سين مرينو)", "Europe\/Sarajevo": "مرڪزي يورپي وقت (سراجیوو)", "Europe\/Saratov": "ماسڪو جو وقت (سراتو)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "ويڪ آئي لينڊ جو وقت", "Pacific\/Wallis": "ويلس ۽ فتونا جو وقت" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/se.json b/src/Symfony/Component/Intl/Resources/data/timezones/se.json index 3fa7845776c77..7ffaf1dea8a69 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/se.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/se.json @@ -3,325 +3,322 @@ "Names": { "Africa\/Abidjan": "Abidjan (Greenwich gaskka áigi)", "Africa\/Accra": "Accra (Greenwich gaskka áigi)", - "Africa\/Addis_Ababa": "Addis Ababa (Etiopia)", + "Africa\/Addis_Ababa": "Addis Ababa (Etiopia áigi)", "Africa\/Algiers": "Algiers (gaska-Eurohpá áigi)", - "Africa\/Asmera": "Asmara (Eritrea)", + "Africa\/Asmera": "Asmara (Eritrea áigi)", "Africa\/Bamako": "Bamako (Greenwich gaskka áigi)", - "Africa\/Bangui": "Bangui (Gaska-Afrihká dásseváldi)", + "Africa\/Bangui": "Bangui (Gaska-Afrihká dásseváldi áigi)", "Africa\/Banjul": "Banjul (Greenwich gaskka áigi)", "Africa\/Bissau": "Bissau (Greenwich gaskka áigi)", - "Africa\/Blantyre": "Blantyre (Malawi)", - "Africa\/Brazzaville": "Brazzaville (Kongo-Brazzaville)", - "Africa\/Bujumbura": "Bujumbura (Burundi)", + "Africa\/Blantyre": "Blantyre (Malawi áigi)", + "Africa\/Brazzaville": "Brazzaville (Kongo-Brazzaville áigi)", + "Africa\/Bujumbura": "Bujumbura (Burundi áigi)", "Africa\/Cairo": "Cairo (nuorti-Eurohpá áigi)", "Africa\/Casablanca": "Casablanca (oarje-Eurohpá áigi)", "Africa\/Ceuta": "Ceuta (gaska-Eurohpá áigi)", "Africa\/Conakry": "Conakry (Greenwich gaskka áigi)", "Africa\/Dakar": "Dakar (Greenwich gaskka áigi)", - "Africa\/Dar_es_Salaam": "Dar es Salaam (Tanzánia)", - "Africa\/Djibouti": "Djibouti (Djibouti)", - "Africa\/Douala": "Douala (Kamerun)", + "Africa\/Dar_es_Salaam": "Dar es Salaam (Tanzánia áigi)", + "Africa\/Djibouti": "Djibouti (Djibouti áigi)", + "Africa\/Douala": "Douala (Kamerun áigi)", "Africa\/El_Aaiun": "El Aaiun (oarje-Eurohpá áigi)", "Africa\/Freetown": "Freetown (Greenwich gaskka áigi)", - "Africa\/Gaborone": "Gaborone (Botswana)", - "Africa\/Harare": "Harare (Zimbabwe)", - "Africa\/Johannesburg": "Johannesburg (Mátta-Afrihká)", - "Africa\/Juba": "Juba (Máttasudan)", - "Africa\/Kampala": "Kampala (Uganda)", - "Africa\/Khartoum": "Khartoum (Davvisudan)", - "Africa\/Kigali": "Kigali (Rwanda)", - "Africa\/Kinshasa": "Kinshasa (Kongo-Kinshasa)", - "Africa\/Lagos": "Lagos (Nigeria)", - "Africa\/Libreville": "Libreville (Gabon)", + "Africa\/Gaborone": "Gaborone (Botswana áigi)", + "Africa\/Harare": "Harare (Zimbabwe áigi)", + "Africa\/Johannesburg": "Johannesburg (Mátta-Afrihká áigi)", + "Africa\/Juba": "Juba (Máttasudan áigi)", + "Africa\/Kampala": "Kampala (Uganda áigi)", + "Africa\/Khartoum": "Khartoum (Davvisudan áigi)", + "Africa\/Kigali": "Kigali (Rwanda áigi)", + "Africa\/Kinshasa": "Kinshasa (Kongo-Kinshasa áigi)", + "Africa\/Lagos": "Lagos (Nigeria áigi)", + "Africa\/Libreville": "Libreville (Gabon áigi)", "Africa\/Lome": "Lome (Greenwich gaskka áigi)", - "Africa\/Luanda": "Luanda (Angola)", - "Africa\/Lubumbashi": "Lubumbashi (Kongo-Kinshasa)", - "Africa\/Lusaka": "Lusaka (Zambia)", - "Africa\/Malabo": "Malabo (Ekvatoriála Guinea)", - "Africa\/Maputo": "Maputo (Mosambik)", - "Africa\/Maseru": "Maseru (Lesotho)", - "Africa\/Mbabane": "Mbabane (Svazieana)", - "Africa\/Mogadishu": "Mogadishu (Somália)", + "Africa\/Luanda": "Luanda (Angola áigi)", + "Africa\/Lubumbashi": "Lubumbashi (Kongo-Kinshasa áigi)", + "Africa\/Lusaka": "Lusaka (Zambia áigi)", + "Africa\/Malabo": "Malabo (Ekvatoriála Guinea áigi)", + "Africa\/Maputo": "Maputo (Mosambik áigi)", + "Africa\/Maseru": "Maseru (Lesotho áigi)", + "Africa\/Mbabane": "Mbabane (Svazieana áigi)", + "Africa\/Mogadishu": "Mogadishu (Somália áigi)", "Africa\/Monrovia": "Monrovia (Greenwich gaskka áigi)", - "Africa\/Nairobi": "Nairobi (Kenia)", - "Africa\/Ndjamena": "Ndjamena (Tčad)", - "Africa\/Niamey": "Niamey (Niger)", + "Africa\/Nairobi": "Nairobi (Kenia áigi)", + "Africa\/Ndjamena": "Ndjamena (Tčad áigi)", + "Africa\/Niamey": "Niamey (Niger áigi)", "Africa\/Nouakchott": "Nouakchott (Greenwich gaskka áigi)", "Africa\/Ouagadougou": "Ouagadougou (Greenwich gaskka áigi)", - "Africa\/Porto-Novo": "Porto-Novo (Benin)", + "Africa\/Porto-Novo": "Porto-Novo (Benin áigi)", "Africa\/Sao_Tome": "Sao Tome (Greenwich gaskka áigi)", "Africa\/Tripoli": "Tripoli (nuorti-Eurohpá áigi)", "Africa\/Tunis": "Tunis (gaska-Eurohpá áigi)", - "Africa\/Windhoek": "Windhoek (Namibia)", - "America\/Adak": "Adak (Amerihká ovttastuvvan stáhtat)", - "America\/Anchorage": "Anchorage (Amerihká ovttastuvvan stáhtat)", - "America\/Anguilla": "Anguilla (Anguilla)", - "America\/Antigua": "Antigua (Antigua ja Barbuda)", - "America\/Araguaina": "Araguaina (Brasil)", - "America\/Argentina\/La_Rioja": "La Rioja (Argentina)", - "America\/Argentina\/Rio_Gallegos": "Rio Gallegos (Argentina)", - "America\/Argentina\/Salta": "Salta (Argentina)", - "America\/Argentina\/San_Juan": "San Juan (Argentina)", - "America\/Argentina\/San_Luis": "San Luis (Argentina)", - "America\/Argentina\/Tucuman": "Tucuman (Argentina)", - "America\/Argentina\/Ushuaia": "Ushuaia (Argentina)", - "America\/Aruba": "Aruba (Aruba)", - "America\/Asuncion": "Asuncion (Paraguay)", - "America\/Bahia": "Bahia (Brasil)", - "America\/Bahia_Banderas": "Bahia Banderas (Meksiko)", - "America\/Barbados": "Barbados (Barbados)", - "America\/Belem": "Belem (Brasil)", - "America\/Belize": "Belize (Belize)", - "America\/Blanc-Sablon": "Blanc-Sablon (Kanáda)", - "America\/Boa_Vista": "Boa Vista (Brasil)", - "America\/Bogota": "Bogota (Kolombia)", - "America\/Boise": "Boise (Amerihká ovttastuvvan stáhtat)", - "America\/Buenos_Aires": "Buenos Aires (Argentina)", - "America\/Cambridge_Bay": "Cambridge Bay (Kanáda)", - "America\/Campo_Grande": "Campo Grande (Brasil)", - "America\/Cancun": "Cancun (Meksiko)", - "America\/Caracas": "Caracas (Venezuela)", - "America\/Catamarca": "Catamarca (Argentina)", - "America\/Cayenne": "Cayenne (Frankriikka Guayana)", - "America\/Cayman": "Cayman (Cayman-sullot)", - "America\/Chicago": "Chicago (Amerihká ovttastuvvan stáhtat)", - "America\/Chihuahua": "Chihuahua (Meksiko)", - "America\/Coral_Harbour": "Atikokan (Kanáda)", - "America\/Cordoba": "Cordoba (Argentina)", - "America\/Costa_Rica": "Costa Rica (Costa Rica)", - "America\/Creston": "Creston (Kanáda)", - "America\/Cuiaba": "Cuiaba (Brasil)", - "America\/Curacao": "Curaçao (Curaçao)", + "Africa\/Windhoek": "Windhoek (Namibia áigi)", + "America\/Adak": "Adak (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Anchorage": "Anchorage (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Anguilla": "Anguilla (Anguilla áigi)", + "America\/Antigua": "Antigua (Antigua ja Barbuda áigi)", + "America\/Araguaina": "Araguaina (Brasil áigi)", + "America\/Argentina\/La_Rioja": "La Rioja (Argentina áigi)", + "America\/Argentina\/Rio_Gallegos": "Rio Gallegos (Argentina áigi)", + "America\/Argentina\/Salta": "Salta (Argentina áigi)", + "America\/Argentina\/San_Juan": "San Juan (Argentina áigi)", + "America\/Argentina\/San_Luis": "San Luis (Argentina áigi)", + "America\/Argentina\/Tucuman": "Tucuman (Argentina áigi)", + "America\/Argentina\/Ushuaia": "Ushuaia (Argentina áigi)", + "America\/Aruba": "Aruba (Aruba áigi)", + "America\/Asuncion": "Asuncion (Paraguay áigi)", + "America\/Bahia": "Bahia (Brasil áigi)", + "America\/Bahia_Banderas": "Bahia Banderas (Meksiko áigi)", + "America\/Barbados": "Barbados (Barbados áigi)", + "America\/Belem": "Belem (Brasil áigi)", + "America\/Belize": "Belize (Belize áigi)", + "America\/Blanc-Sablon": "Blanc-Sablon (Kanáda áigi)", + "America\/Boa_Vista": "Boa Vista (Brasil áigi)", + "America\/Bogota": "Bogota (Kolombia áigi)", + "America\/Boise": "Boise (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Buenos_Aires": "Buenos Aires (Argentina áigi)", + "America\/Cambridge_Bay": "Cambridge Bay (Kanáda áigi)", + "America\/Campo_Grande": "Campo Grande (Brasil áigi)", + "America\/Cancun": "Cancun (Meksiko áigi)", + "America\/Caracas": "Caracas (Venezuela áigi)", + "America\/Catamarca": "Catamarca (Argentina áigi)", + "America\/Cayenne": "Cayenne (Frankriikka Guayana áigi)", + "America\/Cayman": "Cayman (Cayman-sullot áigi)", + "America\/Chicago": "Chicago (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Chihuahua": "Chihuahua (Meksiko áigi)", + "America\/Coral_Harbour": "Atikokan (Kanáda áigi)", + "America\/Cordoba": "Cordoba (Argentina áigi)", + "America\/Costa_Rica": "Costa Rica (Costa Rica áigi)", + "America\/Creston": "Creston (Kanáda áigi)", + "America\/Cuiaba": "Cuiaba (Brasil áigi)", + "America\/Curacao": "Curaçao (Curaçao áigi)", "America\/Danmarkshavn": "Danmarkshavn (Greenwich gaskka áigi)", - "America\/Dawson": "Dawson (Kanáda)", - "America\/Dawson_Creek": "Dawson Creek (Kanáda)", - "America\/Denver": "Denver (Amerihká ovttastuvvan stáhtat)", - "America\/Detroit": "Detroit (Amerihká ovttastuvvan stáhtat)", - "America\/Dominica": "Dominica (Dominica)", - "America\/Edmonton": "Edmonton (Kanáda)", - "America\/Eirunepe": "Eirunepe (Brasil)", - "America\/El_Salvador": "El Salvador (El Salvador)", - "America\/Fort_Nelson": "Fort Nelson (Kanáda)", - "America\/Fortaleza": "Fortaleza (Brasil)", - "America\/Glace_Bay": "Glace Bay (Kanáda)", - "America\/Godthab": "Nuuk (Kalaallit Nunaat)", - "America\/Goose_Bay": "Goose Bay (Kanáda)", - "America\/Grand_Turk": "Grand Turk (Turks ja Caicos-sullot)", - "America\/Grenada": "Grenada (Grenada)", - "America\/Guadeloupe": "Guadeloupe (Guadeloupe)", - "America\/Guatemala": "Guatemala (Guatemala)", - "America\/Guayaquil": "Guayaquil (Ecuador)", - "America\/Guyana": "Guyana (Guyana)", - "America\/Halifax": "Halifax (Kanáda)", - "America\/Havana": "Havana (Kuba)", - "America\/Hermosillo": "Hermosillo (Meksiko)", - "America\/Indiana\/Knox": "Knox, Indiana (Amerihká ovttastuvvan stáhtat)", - "America\/Indiana\/Marengo": "Marengo, Indiana (Amerihká ovttastuvvan stáhtat)", - "America\/Indiana\/Petersburg": "Petersburg, Indiana (Amerihká ovttastuvvan stáhtat)", - "America\/Indiana\/Tell_City": "Tell City, Indiana (Amerihká ovttastuvvan stáhtat)", - "America\/Indiana\/Vevay": "Vevay, Indiana (Amerihká ovttastuvvan stáhtat)", - "America\/Indiana\/Vincennes": "Vincennes, Indiana (Amerihká ovttastuvvan stáhtat)", - "America\/Indiana\/Winamac": "Winamac, Indiana (Amerihká ovttastuvvan stáhtat)", - "America\/Indianapolis": "Indianapolis (Amerihká ovttastuvvan stáhtat)", - "America\/Inuvik": "Inuvik (Kanáda)", - "America\/Iqaluit": "Iqaluit (Kanáda)", - "America\/Jamaica": "Jamaica (Jamaica)", - "America\/Jujuy": "Jujuy (Argentina)", - "America\/Juneau": "Juneau (Amerihká ovttastuvvan stáhtat)", - "America\/Kentucky\/Monticello": "Monticello, Kentucky (Amerihká ovttastuvvan stáhtat)", - "America\/La_Paz": "La Paz (Bolivia)", - "America\/Lima": "Lima (Peru)", - "America\/Los_Angeles": "Los Angeles (Amerihká ovttastuvvan stáhtat)", - "America\/Louisville": "Louisville (Amerihká ovttastuvvan stáhtat)", - "America\/Lower_Princes": "Lower Prince’s Quarter (Vuolleeatnamat Saint Martin)", - "America\/Maceio": "Maceio (Brasil)", - "America\/Managua": "Managua (Nicaragua)", - "America\/Manaus": "Manaus (Brasil)", - "America\/Marigot": "Marigot (Frankriikka Saint Martin)", - "America\/Martinique": "Martinique (Martinique)", - "America\/Matamoros": "Matamoros (Meksiko)", - "America\/Mazatlan": "Mazatlan (Meksiko)", - "America\/Mendoza": "Mendoza (Argentina)", - "America\/Menominee": "Menominee (Amerihká ovttastuvvan stáhtat)", - "America\/Merida": "Mérida (Meksiko)", - "America\/Metlakatla": "Metlakatla (Amerihká ovttastuvvan stáhtat)", - "America\/Mexico_City": "Mexico City (Meksiko)", - "America\/Miquelon": "Miquelon (Saint Pierre ja Miquelon)", - "America\/Moncton": "Moncton (Kanáda)", - "America\/Monterrey": "Monterrey (Meksiko)", - "America\/Montevideo": "Montevideo (Uruguay)", - "America\/Montreal": "Montreal (Kanáda)", - "America\/Montserrat": "Montserrat (Montserrat)", - "America\/Nassau": "Nassau (Bahamas)", - "America\/New_York": "New York (Amerihká ovttastuvvan stáhtat)", - "America\/Nipigon": "Nipigon (Kanáda)", - "America\/Nome": "Nome (Amerihká ovttastuvvan stáhtat)", - "America\/Noronha": "Noronha (Brasil)", - "America\/North_Dakota\/Beulah": "Beulah, North Dakota (Amerihká ovttastuvvan stáhtat)", - "America\/North_Dakota\/Center": "Center, North Dakota (Amerihká ovttastuvvan stáhtat)", - "America\/North_Dakota\/New_Salem": "New Salem, North Dakota (Amerihká ovttastuvvan stáhtat)", - "America\/Ojinaga": "Ojinaga (Meksiko)", - "America\/Panama": "Panama (Panama)", - "America\/Pangnirtung": "Pangnirtung (Kanáda)", - "America\/Paramaribo": "Paramaribo (Surinam)", - "America\/Phoenix": "Phoenix (Amerihká ovttastuvvan stáhtat)", - "America\/Port-au-Prince": "Port-au-Prince (Haiti)", - "America\/Port_of_Spain": "Port of Spain (Trinidad ja Tobago)", - "America\/Porto_Velho": "Porto Velho (Brasil)", - "America\/Puerto_Rico": "Puerto Rico (Puerto Rico)", - "America\/Punta_Arenas": "Punta Arenas (Čiile)", - "America\/Rainy_River": "Rainy River (Kanáda)", - "America\/Rankin_Inlet": "Rankin Inlet (Kanáda)", - "America\/Recife": "Recife (Brasil)", - "America\/Regina": "Regina (Kanáda)", - "America\/Resolute": "Resolute (Kanáda)", - "America\/Rio_Branco": "Rio Branco (Brasil)", - "America\/Santa_Isabel": "Santa Isabel (Meksiko)", - "America\/Santarem": "Santarem (Brasil)", - "America\/Santiago": "Santiago (Čiile)", - "America\/Santo_Domingo": "Santo Domingo (Dominikána dásseváldi)", - "America\/Sao_Paulo": "São Paulo (Brasil)", - "America\/Scoresbysund": "Ittoqqortoormiit (Kalaallit Nunaat)", - "America\/Sitka": "Sitka (Amerihká ovttastuvvan stáhtat)", - "America\/St_Barthelemy": "Saint Barthélemy (Saint Barthélemy)", - "America\/St_Johns": "St. John’s (Kanáda)", - "America\/St_Kitts": "St. Kitts (Saint Kitts ja Nevis)", - "America\/St_Lucia": "St. Lucia (Saint Lucia)", - "America\/St_Thomas": "St. Thomas (AOS Virgin-sullot)", - "America\/St_Vincent": "St. Vincent (Saint Vincent ja Grenadine)", - "America\/Swift_Current": "Swift Current (Kanáda)", - "America\/Tegucigalpa": "Tegucigalpa (Honduras)", - "America\/Thule": "Thule (Kalaallit Nunaat)", - "America\/Thunder_Bay": "Thunder Bay (Kanáda)", - "America\/Tijuana": "Tijuana (Meksiko)", - "America\/Toronto": "Toronto (Kanáda)", - "America\/Tortola": "Tortola (Brittania Virgin-sullot)", - "America\/Vancouver": "Vancouver (Kanáda)", - "America\/Whitehorse": "Whitehorse (Kanáda)", - "America\/Winnipeg": "Winnipeg (Kanáda)", - "America\/Yakutat": "Yakutat (Amerihká ovttastuvvan stáhtat)", - "America\/Yellowknife": "Yellowknife (Kanáda)", - "Antarctica\/Casey": "Casey (Antárktis)", - "Antarctica\/Davis": "Davis (Antárktis)", - "Antarctica\/DumontDUrville": "Dumont d’Urville (Antárktis)", - "Antarctica\/Macquarie": "Macquarie (Austrália)", - "Antarctica\/Mawson": "Mawson (Antárktis)", - "Antarctica\/McMurdo": "McMurdo (Antárktis)", - "Antarctica\/Palmer": "Palmer (Antárktis)", - "Antarctica\/Rothera": "Rothera (Antárktis)", - "Antarctica\/Syowa": "Syowa (Antárktis)", + "America\/Dawson": "Dawson (Kanáda áigi)", + "America\/Dawson_Creek": "Dawson Creek (Kanáda áigi)", + "America\/Denver": "Denver (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Detroit": "Detroit (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Dominica": "Dominica (Dominica áigi)", + "America\/Edmonton": "Edmonton (Kanáda áigi)", + "America\/Eirunepe": "Eirunepe (Brasil áigi)", + "America\/El_Salvador": "El Salvador (El Salvador áigi)", + "America\/Fort_Nelson": "Fort Nelson (Kanáda áigi)", + "America\/Fortaleza": "Fortaleza (Brasil áigi)", + "America\/Glace_Bay": "Glace Bay (Kanáda áigi)", + "America\/Godthab": "Nuuk (Kalaallit Nunaat áigi)", + "America\/Goose_Bay": "Goose Bay (Kanáda áigi)", + "America\/Grand_Turk": "Grand Turk (Turks ja Caicos-sullot áigi)", + "America\/Grenada": "Grenada (Grenada áigi)", + "America\/Guadeloupe": "Guadeloupe (Guadeloupe áigi)", + "America\/Guatemala": "Guatemala (Guatemala áigi)", + "America\/Guayaquil": "Guayaquil (Ecuador áigi)", + "America\/Guyana": "Guyana (Guyana áigi)", + "America\/Halifax": "Halifax (Kanáda áigi)", + "America\/Havana": "Havana (Kuba áigi)", + "America\/Hermosillo": "Hermosillo (Meksiko áigi)", + "America\/Indiana\/Knox": "Knox, Indiana (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Indiana\/Marengo": "Marengo, Indiana (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Indiana\/Petersburg": "Petersburg, Indiana (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Indiana\/Tell_City": "Tell City, Indiana (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Indiana\/Vevay": "Vevay, Indiana (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Indiana\/Vincennes": "Vincennes, Indiana (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Indiana\/Winamac": "Winamac, Indiana (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Indianapolis": "Indianapolis (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Inuvik": "Inuvik (Kanáda áigi)", + "America\/Iqaluit": "Iqaluit (Kanáda áigi)", + "America\/Jamaica": "Jamaica (Jamaica áigi)", + "America\/Jujuy": "Jujuy (Argentina áigi)", + "America\/Juneau": "Juneau (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Kentucky\/Monticello": "Monticello, Kentucky (Amerihká ovttastuvvan stáhtat áigi)", + "America\/La_Paz": "La Paz (Bolivia áigi)", + "America\/Lima": "Lima (Peru áigi)", + "America\/Los_Angeles": "Los Angeles (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Louisville": "Louisville (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Lower_Princes": "Lower Prince’s Quarter (Vuolleeatnamat Saint Martin áigi)", + "America\/Maceio": "Maceio (Brasil áigi)", + "America\/Managua": "Managua (Nicaragua áigi)", + "America\/Manaus": "Manaus (Brasil áigi)", + "America\/Marigot": "Marigot (Frankriikka Saint Martin áigi)", + "America\/Martinique": "Martinique (Martinique áigi)", + "America\/Matamoros": "Matamoros (Meksiko áigi)", + "America\/Mazatlan": "Mazatlan (Meksiko áigi)", + "America\/Mendoza": "Mendoza (Argentina áigi)", + "America\/Menominee": "Menominee (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Merida": "Mérida (Meksiko áigi)", + "America\/Metlakatla": "Metlakatla (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Mexico_City": "Mexico City (Meksiko áigi)", + "America\/Miquelon": "Miquelon (Saint Pierre ja Miquelon áigi)", + "America\/Moncton": "Moncton (Kanáda áigi)", + "America\/Monterrey": "Monterrey (Meksiko áigi)", + "America\/Montevideo": "Montevideo (Uruguay áigi)", + "America\/Montreal": "Montreal (Kanáda áigi)", + "America\/Montserrat": "Montserrat (Montserrat áigi)", + "America\/Nassau": "Nassau (Bahamas áigi)", + "America\/New_York": "New York (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Nipigon": "Nipigon (Kanáda áigi)", + "America\/Nome": "Nome (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Noronha": "Noronha (Brasil áigi)", + "America\/North_Dakota\/Beulah": "Beulah, North Dakota (Amerihká ovttastuvvan stáhtat áigi)", + "America\/North_Dakota\/Center": "Center, North Dakota (Amerihká ovttastuvvan stáhtat áigi)", + "America\/North_Dakota\/New_Salem": "New Salem, North Dakota (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Ojinaga": "Ojinaga (Meksiko áigi)", + "America\/Panama": "Panama (Panama áigi)", + "America\/Pangnirtung": "Pangnirtung (Kanáda áigi)", + "America\/Paramaribo": "Paramaribo (Surinam áigi)", + "America\/Phoenix": "Phoenix (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Port-au-Prince": "Port-au-Prince (Haiti áigi)", + "America\/Port_of_Spain": "Port of Spain (Trinidad ja Tobago áigi)", + "America\/Porto_Velho": "Porto Velho (Brasil áigi)", + "America\/Puerto_Rico": "Puerto Rico (Puerto Rico áigi)", + "America\/Punta_Arenas": "Punta Arenas (Čiile áigi)", + "America\/Rainy_River": "Rainy River (Kanáda áigi)", + "America\/Rankin_Inlet": "Rankin Inlet (Kanáda áigi)", + "America\/Recife": "Recife (Brasil áigi)", + "America\/Regina": "Regina (Kanáda áigi)", + "America\/Resolute": "Resolute (Kanáda áigi)", + "America\/Rio_Branco": "Rio Branco (Brasil áigi)", + "America\/Santa_Isabel": "Santa Isabel (Meksiko áigi)", + "America\/Santarem": "Santarem (Brasil áigi)", + "America\/Santiago": "Santiago (Čiile áigi)", + "America\/Santo_Domingo": "Santo Domingo (Dominikána dásseváldi áigi)", + "America\/Sao_Paulo": "São Paulo (Brasil áigi)", + "America\/Scoresbysund": "Ittoqqortoormiit (Kalaallit Nunaat áigi)", + "America\/Sitka": "Sitka (Amerihká ovttastuvvan stáhtat áigi)", + "America\/St_Barthelemy": "Saint Barthélemy (Saint Barthélemy áigi)", + "America\/St_Johns": "St. John’s (Kanáda áigi)", + "America\/St_Kitts": "St. Kitts (Saint Kitts ja Nevis áigi)", + "America\/St_Lucia": "St. Lucia (Saint Lucia áigi)", + "America\/St_Thomas": "St. Thomas (AOS Virgin-sullot áigi)", + "America\/St_Vincent": "St. Vincent (Saint Vincent ja Grenadine áigi)", + "America\/Swift_Current": "Swift Current (Kanáda áigi)", + "America\/Tegucigalpa": "Tegucigalpa (Honduras áigi)", + "America\/Thule": "Thule (Kalaallit Nunaat áigi)", + "America\/Thunder_Bay": "Thunder Bay (Kanáda áigi)", + "America\/Tijuana": "Tijuana (Meksiko áigi)", + "America\/Toronto": "Toronto (Kanáda áigi)", + "America\/Tortola": "Tortola (Brittania Virgin-sullot áigi)", + "America\/Vancouver": "Vancouver (Kanáda áigi)", + "America\/Whitehorse": "Whitehorse (Kanáda áigi)", + "America\/Winnipeg": "Winnipeg (Kanáda áigi)", + "America\/Yakutat": "Yakutat (Amerihká ovttastuvvan stáhtat áigi)", + "America\/Yellowknife": "Yellowknife (Kanáda áigi)", + "Antarctica\/Casey": "Casey (Antárktis áigi)", + "Antarctica\/Davis": "Davis (Antárktis áigi)", + "Antarctica\/DumontDUrville": "Dumont d’Urville (Antárktis áigi)", + "Antarctica\/Macquarie": "Macquarie (Austrália áigi)", + "Antarctica\/Mawson": "Mawson (Antárktis áigi)", + "Antarctica\/McMurdo": "McMurdo (Antárktis áigi)", + "Antarctica\/Palmer": "Palmer (Antárktis áigi)", + "Antarctica\/Rothera": "Rothera (Antárktis áigi)", + "Antarctica\/Syowa": "Syowa (Antárktis áigi)", "Antarctica\/Troll": "Troll (Greenwich gaskka áigi)", - "Antarctica\/Vostok": "Vostok (Antárktis)", + "Antarctica\/Vostok": "Vostok (Antárktis áigi)", "Arctic\/Longyearbyen": "Longyearbyen (gaska-Eurohpá áigi)", - "Asia\/Aden": "Aden (Jemen)", - "Asia\/Almaty": "Almaty (Kasakstan)", + "Asia\/Aden": "Aden (Jemen áigi)", + "Asia\/Almaty": "Almaty (Kasakstan áigi)", "Asia\/Amman": "Amman (nuorti-Eurohpá áigi)", - "Asia\/Anadyr": "Anadyr (Ruošša)", - "Asia\/Aqtau": "Aqtau (Kasakstan)", - "Asia\/Aqtobe": "Aqtobe (Kasakstan)", - "Asia\/Ashgabat": "Ashgabat (Turkmenistan)", - "Asia\/Atyrau": "Atyrau (Kasakstan)", - "Asia\/Baghdad": "Baghdad (Irak)", - "Asia\/Bahrain": "Bahrain (Bahrain)", - "Asia\/Baku": "Baku (Aserbaižan)", - "Asia\/Bangkok": "Bangkok (Thaieana)", - "Asia\/Barnaul": "Barnaul (Ruošša)", + "Asia\/Anadyr": "Anadyr (Ruošša áigi)", + "Asia\/Aqtau": "Aqtau (Kasakstan áigi)", + "Asia\/Aqtobe": "Aqtobe (Kasakstan áigi)", + "Asia\/Ashgabat": "Ashgabat (Turkmenistan áigi)", + "Asia\/Atyrau": "Atyrau (Kasakstan áigi)", + "Asia\/Baghdad": "Baghdad (Irak áigi)", + "Asia\/Bahrain": "Bahrain (Bahrain áigi)", + "Asia\/Baku": "Baku (Aserbaižan áigi)", + "Asia\/Bangkok": "Bangkok (Thaieana áigi)", + "Asia\/Barnaul": "Barnaul (Ruošša áigi)", "Asia\/Beirut": "Beirut (nuorti-Eurohpá áigi)", - "Asia\/Bishkek": "Bishkek (Kirgisistan)", - "Asia\/Brunei": "Brunei (Brunei)", - "Asia\/Calcutta": "Kolkata (India)", - "Asia\/Chita": "Chita (Ruošša)", - "Asia\/Choibalsan": "Choibalsan (Mongolia)", - "Asia\/Colombo": "Colombo (Sri Lanka)", + "Asia\/Bishkek": "Bishkek (Kirgisistan áigi)", + "Asia\/Brunei": "Brunei (Brunei áigi)", + "Asia\/Calcutta": "Kolkata (India áigi)", + "Asia\/Chita": "Chita (Ruošša áigi)", + "Asia\/Choibalsan": "Choibalsan (Mongolia áigi)", + "Asia\/Colombo": "Colombo (Sri Lanka áigi)", "Asia\/Damascus": "Damascus (nuorti-Eurohpá áigi)", - "Asia\/Dhaka": "Dhaka (Bangladesh)", - "Asia\/Dili": "Dili (Nuorta-Timor)", - "Asia\/Dubai": "Dubai (Ovttastuvvan Arábaemiráhtat)", - "Asia\/Dushanbe": "Dushanbe (Tažikistan)", + "Asia\/Dhaka": "Dhaka (Bangladesh áigi)", + "Asia\/Dili": "Dili (Nuorta-Timor áigi)", + "Asia\/Dubai": "Dubai (Ovttastuvvan Arábaemiráhtat áigi)", + "Asia\/Dushanbe": "Dushanbe (Tažikistan áigi)", "Asia\/Famagusta": "Famagusta (nuorti-Eurohpá áigi)", "Asia\/Gaza": "Gaza (nuorti-Eurohpá áigi)", "Asia\/Hebron": "Hebron (nuorti-Eurohpá áigi)", - "Asia\/Hong_Kong": "Hong Kong (Hongkong)", - "Asia\/Hovd": "Hovd (Mongolia)", - "Asia\/Irkutsk": "Irkutsk (Ruošša)", - "Asia\/Jakarta": "Jakarta (Indonesia)", - "Asia\/Jayapura": "Jayapura (Indonesia)", - "Asia\/Jerusalem": "Jerusalem (Israel)", - "Asia\/Kabul": "Kabul (Afghanistan)", - "Asia\/Kamchatka": "Kamchatka (Ruošša)", - "Asia\/Karachi": "Karachi (Pakistan)", - "Asia\/Katmandu": "Kathmandu (Nepal)", - "Asia\/Khandyga": "Khandyga (Ruošša)", - "Asia\/Krasnoyarsk": "Krasnoyarsk (Ruošša)", - "Asia\/Kuala_Lumpur": "Kuala Lumpur (Malesia)", - "Asia\/Kuching": "Kuching (Malesia)", - "Asia\/Kuwait": "Kuwait (Kuwait)", - "Asia\/Macau": "Macao (Makáo)", - "Asia\/Magadan": "Magadan (Ruošša)", - "Asia\/Makassar": "Makassar (Indonesia)", - "Asia\/Manila": "Manila (Filippiinnat)", - "Asia\/Muscat": "Muscat (Oman)", + "Asia\/Hong_Kong": "Hong Kong (Hongkong áigi)", + "Asia\/Hovd": "Hovd (Mongolia áigi)", + "Asia\/Irkutsk": "Irkutsk (Ruošša áigi)", + "Asia\/Jakarta": "Jakarta (Indonesia áigi)", + "Asia\/Jayapura": "Jayapura (Indonesia áigi)", + "Asia\/Jerusalem": "Jerusalem (Israel áigi)", + "Asia\/Kabul": "Kabul (Afghanistan áigi)", + "Asia\/Kamchatka": "Kamchatka (Ruošša áigi)", + "Asia\/Karachi": "Karachi (Pakistan áigi)", + "Asia\/Katmandu": "Kathmandu (Nepal áigi)", + "Asia\/Khandyga": "Khandyga (Ruošša áigi)", + "Asia\/Krasnoyarsk": "Krasnoyarsk (Ruošša áigi)", + "Asia\/Kuala_Lumpur": "Kuala Lumpur (Malesia áigi)", + "Asia\/Kuching": "Kuching (Malesia áigi)", + "Asia\/Kuwait": "Kuwait (Kuwait áigi)", + "Asia\/Macau": "Macao (Makáo áigi)", + "Asia\/Magadan": "Magadan (Ruošša áigi)", + "Asia\/Makassar": "Makassar (Indonesia áigi)", + "Asia\/Manila": "Manila (Filippiinnat áigi)", + "Asia\/Muscat": "Muscat (Oman áigi)", "Asia\/Nicosia": "Nicosia (nuorti-Eurohpá áigi)", - "Asia\/Novokuznetsk": "Novokuznetsk (Ruošša)", - "Asia\/Novosibirsk": "Novosibirsk (Ruošša)", - "Asia\/Omsk": "Omsk (Ruošša)", - "Asia\/Oral": "Oral (Kasakstan)", - "Asia\/Phnom_Penh": "Phnom Penh (Kambodža)", - "Asia\/Pontianak": "Pontianak (Indonesia)", - "Asia\/Pyongyang": "Pyongyang (Davvi-Korea)", - "Asia\/Qatar": "Qatar (Qatar)", - "Asia\/Qostanay": "Qostanay (Kasakstan)", - "Asia\/Qyzylorda": "Qyzylorda (Kasakstan)", - "Asia\/Rangoon": "Yangon (Burma)", - "Asia\/Riyadh": "Riyadh (Saudi-Arábia)", - "Asia\/Saigon": "Ho Chi Minh (Vietnam)", - "Asia\/Sakhalin": "Sakhalin (Ruošša)", - "Asia\/Samarkand": "Samarkand (Usbekistan)", - "Asia\/Seoul": "Seoul (Mátta-Korea)", - "Asia\/Shanghai": "Shanghai (Kiinná)", - "Asia\/Singapore": "Singapore (Singapore)", - "Asia\/Srednekolymsk": "Srednekolymsk (Ruošša)", - "Asia\/Taipei": "Taipei (Taiwan)", - "Asia\/Tashkent": "Tashkent (Usbekistan)", - "Asia\/Tbilisi": "Tbilisi (Georgia)", - "Asia\/Tehran": "Tehran (Iran)", - "Asia\/Thimphu": "Thimphu (Bhutan)", - "Asia\/Tokyo": "Tokyo (Japána)", - "Asia\/Tomsk": "Tomsk (Ruošša)", - "Asia\/Ulaanbaatar": "Ulaanbaatar (Mongolia)", - "Asia\/Urumqi": "Urumqi (Kiinná)", - "Asia\/Ust-Nera": "Ust-Nera (Ruošša)", - "Asia\/Vientiane": "Vientiane (Laos)", - "Asia\/Vladivostok": "Vladivostok (Ruošša)", - "Asia\/Yakutsk": "Yakutsk (Ruošša)", - "Asia\/Yekaterinburg": "Yekaterinburg (Ruošša)", - "Asia\/Yerevan": "Yerevan (Armenia)", - "Atlantic\/Azores": "Azores (Portugála)", - "Atlantic\/Bermuda": "Bermuda (Bermuda)", + "Asia\/Novokuznetsk": "Novokuznetsk (Ruošša áigi)", + "Asia\/Novosibirsk": "Novosibirsk (Ruošša áigi)", + "Asia\/Omsk": "Omsk (Ruošša áigi)", + "Asia\/Oral": "Oral (Kasakstan áigi)", + "Asia\/Phnom_Penh": "Phnom Penh (Kambodža áigi)", + "Asia\/Pontianak": "Pontianak (Indonesia áigi)", + "Asia\/Pyongyang": "Pyongyang (Davvi-Korea áigi)", + "Asia\/Qatar": "Qatar (Qatar áigi)", + "Asia\/Qostanay": "Qostanay (Kasakstan áigi)", + "Asia\/Qyzylorda": "Qyzylorda (Kasakstan áigi)", + "Asia\/Rangoon": "Yangon (Burma áigi)", + "Asia\/Riyadh": "Riyadh (Saudi-Arábia áigi)", + "Asia\/Saigon": "Ho Chi Minh (Vietnam áigi)", + "Asia\/Sakhalin": "Sakhalin (Ruošša áigi)", + "Asia\/Samarkand": "Samarkand (Usbekistan áigi)", + "Asia\/Seoul": "Seoul (Mátta-Korea áigi)", + "Asia\/Shanghai": "Shanghai (Kiinná áigi)", + "Asia\/Singapore": "Singapore (Singapore áigi)", + "Asia\/Srednekolymsk": "Srednekolymsk (Ruošša áigi)", + "Asia\/Taipei": "Taipei (Taiwan áigi)", + "Asia\/Tashkent": "Tashkent (Usbekistan áigi)", + "Asia\/Tbilisi": "Tbilisi (Georgia áigi)", + "Asia\/Tehran": "Tehran (Iran áigi)", + "Asia\/Thimphu": "Thimphu (Bhutan áigi)", + "Asia\/Tokyo": "Tokyo (Japána áigi)", + "Asia\/Tomsk": "Tomsk (Ruošša áigi)", + "Asia\/Ulaanbaatar": "Ulaanbaatar (Mongolia áigi)", + "Asia\/Urumqi": "Urumqi (Kiinná áigi)", + "Asia\/Ust-Nera": "Ust-Nera (Ruošša áigi)", + "Asia\/Vientiane": "Vientiane (Laos áigi)", + "Asia\/Vladivostok": "Vladivostok (Ruošša áigi)", + "Asia\/Yakutsk": "Yakutsk (Ruošša áigi)", + "Asia\/Yekaterinburg": "Yekaterinburg (Ruošša áigi)", + "Asia\/Yerevan": "Yerevan (Armenia áigi)", + "Atlantic\/Azores": "Azores (Portugála áigi)", + "Atlantic\/Bermuda": "Bermuda (Bermuda áigi)", "Atlantic\/Canary": "Canary (oarje-Eurohpá áigi)", - "Atlantic\/Cape_Verde": "Cape Verde (Kap Verde)", + "Atlantic\/Cape_Verde": "Cape Verde (Kap Verde áigi)", "Atlantic\/Faeroe": "Faroe (oarje-Eurohpá áigi)", "Atlantic\/Madeira": "Madeira (oarje-Eurohpá áigi)", "Atlantic\/Reykjavik": "Reykjavik (Greenwich gaskka áigi)", - "Atlantic\/South_Georgia": "South Georgia (Lulli Georgia ja Lulli Sandwich-sullot)", + "Atlantic\/South_Georgia": "South Georgia (Lulli Georgia ja Lulli Sandwich-sullot áigi)", "Atlantic\/St_Helena": "St. Helena (Greenwich gaskka áigi)", - "Atlantic\/Stanley": "Stanley (Falklandsullot)", - "Australia\/Adelaide": "Adelaide (Austrália)", - "Australia\/Brisbane": "Brisbane (Austrália)", - "Australia\/Broken_Hill": "Broken Hill (Austrália)", - "Australia\/Currie": "Currie (Austrália)", - "Australia\/Darwin": "Darwin (Austrália)", - "Australia\/Eucla": "Eucla (Austrália)", - "Australia\/Hobart": "Hobart (Austrália)", - "Australia\/Lindeman": "Lindeman (Austrália)", - "Australia\/Lord_Howe": "Lord Howe (Austrália)", - "Australia\/Melbourne": "Melbourne (Austrália)", - "Australia\/Perth": "Perth (Austrália)", - "Australia\/Sydney": "Sydney (Austrália)", - "CST6CDT": "CST6CDT", - "EST5EDT": "EST5EDT", + "Atlantic\/Stanley": "Stanley (Falklandsullot áigi)", + "Australia\/Adelaide": "Adelaide (Austrália áigi)", + "Australia\/Brisbane": "Brisbane (Austrália áigi)", + "Australia\/Broken_Hill": "Broken Hill (Austrália áigi)", + "Australia\/Currie": "Currie (Austrália áigi)", + "Australia\/Darwin": "Darwin (Austrália áigi)", + "Australia\/Eucla": "Eucla (Austrália áigi)", + "Australia\/Hobart": "Hobart (Austrália áigi)", + "Australia\/Lindeman": "Lindeman (Austrália áigi)", + "Australia\/Lord_Howe": "Lord Howe (Austrália áigi)", + "Australia\/Melbourne": "Melbourne (Austrália áigi)", + "Australia\/Perth": "Perth (Austrália áigi)", + "Australia\/Sydney": "Sydney (Austrália áigi)", "Etc\/GMT": "Greenwich gaskka áigi", - "Etc\/UTC": "UTC", "Europe\/Amsterdam": "Amsterdam (gaska-Eurohpá áigi)", "Europe\/Andorra": "Andorra (gaska-Eurohpá áigi)", "Europe\/Astrakhan": "Astrakhan (Moskva-áigi)", @@ -340,11 +337,11 @@ "Europe\/Guernsey": "Guernsey (Greenwich gaskka áigi)", "Europe\/Helsinki": "Helsinki (nuorti-Eurohpá áigi)", "Europe\/Isle_of_Man": "Isle of Man (Greenwich gaskka áigi)", - "Europe\/Istanbul": "Istanbul (Durka)", + "Europe\/Istanbul": "Istanbul (Durka áigi)", "Europe\/Jersey": "Jersey (Greenwich gaskka áigi)", "Europe\/Kaliningrad": "Kaliningrad (nuorti-Eurohpá áigi)", "Europe\/Kiev": "Kiev (nuorti-Eurohpá áigi)", - "Europe\/Kirov": "Kirov (Ruošša)", + "Europe\/Kirov": "Kirov (Ruošša áigi)", "Europe\/Lisbon": "Lisbon (oarje-Eurohpá áigi)", "Europe\/Ljubljana": "Ljubljana (gaska-Eurohpá áigi)", "Europe\/London": "London (Greenwich gaskka áigi)", @@ -361,7 +358,7 @@ "Europe\/Prague": "Prague (gaska-Eurohpá áigi)", "Europe\/Riga": "Riga (nuorti-Eurohpá áigi)", "Europe\/Rome": "Rome (gaska-Eurohpá áigi)", - "Europe\/Samara": "Samara (Ruošša)", + "Europe\/Samara": "Samara (Ruošša áigi)", "Europe\/San_Marino": "San Marino (gaska-Eurohpá áigi)", "Europe\/Sarajevo": "Sarajevo (gaska-Eurohpá áigi)", "Europe\/Saratov": "Saratov (Moskva-áigi)", @@ -377,64 +374,59 @@ "Europe\/Vatican": "Vatican (gaska-Eurohpá áigi)", "Europe\/Vienna": "Vienna (gaska-Eurohpá áigi)", "Europe\/Vilnius": "Vilnius (nuorti-Eurohpá áigi)", - "Europe\/Volgograd": "Volgograd (Ruošša)", + "Europe\/Volgograd": "Volgograd (Ruošša áigi)", "Europe\/Warsaw": "Warsaw (gaska-Eurohpá áigi)", "Europe\/Zagreb": "Zagreb (gaska-Eurohpá áigi)", "Europe\/Zaporozhye": "Zaporozhye (nuorti-Eurohpá áigi)", "Europe\/Zurich": "Zurich (gaska-Eurohpá áigi)", - "Indian\/Antananarivo": "Antananarivo (Madagaskar)", - "Indian\/Christmas": "Christmas (Juovllat-sullot)", - "Indian\/Cocos": "Cocos (Cocos-sullot)", - "Indian\/Comoro": "Comoro (Komoros)", - "Indian\/Mahe": "Mahe (Seychellsullot)", - "Indian\/Maldives": "Maldives (Malediivvat)", - "Indian\/Mauritius": "Mauritius (Mauritius)", - "Indian\/Mayotte": "Mayotte (Mayotte)", - "Indian\/Reunion": "Reunion (Réunion)", - "MST7MDT": "MST7MDT", - "PST8PDT": "PST8PDT", - "Pacific\/Apia": "Apia (Samoa)", - "Pacific\/Auckland": "Auckland (Ođđa-Selánda)", - "Pacific\/Bougainville": "Bougainville (Papua-Ođđa-Guinea)", - "Pacific\/Chatham": "Chatham (Ođđa-Selánda)", - "Pacific\/Easter": "Easter (Čiile)", - "Pacific\/Efate": "Efate (Vanuatu)", - "Pacific\/Enderbury": "Enderbury (Kiribati)", - "Pacific\/Fakaofo": "Fakaofo (Tokelau)", - "Pacific\/Fiji": "Fiji (Fijisullot)", - "Pacific\/Funafuti": "Funafuti (Tuvalu)", - "Pacific\/Galapagos": "Galapagos (Ecuador)", - "Pacific\/Gambier": "Gambier (Frankriikka Polynesia)", - "Pacific\/Guadalcanal": "Guadalcanal (Salomon-sullot)", - "Pacific\/Guam": "Guam (Guam)", - "Pacific\/Honolulu": "Honolulu (Amerihká ovttastuvvan stáhtat)", - "Pacific\/Kiritimati": "Kiritimati (Kiribati)", - "Pacific\/Kosrae": "Kosrae (Mikronesia)", - "Pacific\/Kwajalein": "Kwajalein (Marshallsullot)", - "Pacific\/Majuro": "Majuro (Marshallsullot)", - "Pacific\/Marquesas": "Marquesas (Frankriikka Polynesia)", - "Pacific\/Nauru": "Nauru (Nauru)", - "Pacific\/Niue": "Niue (Niue)", - "Pacific\/Norfolk": "Norfolk (Norfolksullot)", - "Pacific\/Noumea": "Noumea (Ođđa-Kaledonia)", - "Pacific\/Pago_Pago": "Pago Pago (Amerihká Samoa)", - "Pacific\/Palau": "Palau (Palau)", - "Pacific\/Pitcairn": "Pitcairn (Pitcairn)", - "Pacific\/Ponape": "Pohnpei (Mikronesia)", - "Pacific\/Port_Moresby": "Port Moresby (Papua-Ođđa-Guinea)", - "Pacific\/Rarotonga": "Rarotonga (Cook-sullot)", - "Pacific\/Saipan": "Saipan (Davvi-Mariánat)", - "Pacific\/Tahiti": "Tahiti (Frankriikka Polynesia)", - "Pacific\/Tarawa": "Tarawa (Kiribati)", - "Pacific\/Tongatapu": "Tongatapu (Tonga)", - "Pacific\/Truk": "Chuuk (Mikronesia)", - "Pacific\/Wallis": "Wallis (Wallis ja Futuna)" + "Indian\/Antananarivo": "Antananarivo (Madagaskar áigi)", + "Indian\/Christmas": "Christmas (Juovllat-sullot áigi)", + "Indian\/Cocos": "Cocos (Cocos-sullot áigi)", + "Indian\/Comoro": "Comoro (Komoros áigi)", + "Indian\/Mahe": "Mahe (Seychellsullot áigi)", + "Indian\/Maldives": "Maldives (Malediivvat áigi)", + "Indian\/Mauritius": "Mauritius (Mauritius áigi)", + "Indian\/Mayotte": "Mayotte (Mayotte áigi)", + "Indian\/Reunion": "Reunion (Réunion áigi)", + "Pacific\/Apia": "Apia (Samoa áigi)", + "Pacific\/Auckland": "Auckland (Ođđa-Selánda áigi)", + "Pacific\/Bougainville": "Bougainville (Papua-Ođđa-Guinea áigi)", + "Pacific\/Chatham": "Chatham (Ođđa-Selánda áigi)", + "Pacific\/Easter": "Easter (Čiile áigi)", + "Pacific\/Efate": "Efate (Vanuatu áigi)", + "Pacific\/Enderbury": "Enderbury (Kiribati áigi)", + "Pacific\/Fakaofo": "Fakaofo (Tokelau áigi)", + "Pacific\/Fiji": "Fiji (Fijisullot áigi)", + "Pacific\/Funafuti": "Funafuti (Tuvalu áigi)", + "Pacific\/Galapagos": "Galapagos (Ecuador áigi)", + "Pacific\/Gambier": "Gambier (Frankriikka Polynesia áigi)", + "Pacific\/Guadalcanal": "Guadalcanal (Salomon-sullot áigi)", + "Pacific\/Guam": "Guam (Guam áigi)", + "Pacific\/Honolulu": "Honolulu (Amerihká ovttastuvvan stáhtat áigi)", + "Pacific\/Kiritimati": "Kiritimati (Kiribati áigi)", + "Pacific\/Kosrae": "Kosrae (Mikronesia áigi)", + "Pacific\/Kwajalein": "Kwajalein (Marshallsullot áigi)", + "Pacific\/Majuro": "Majuro (Marshallsullot áigi)", + "Pacific\/Marquesas": "Marquesas (Frankriikka Polynesia áigi)", + "Pacific\/Nauru": "Nauru (Nauru áigi)", + "Pacific\/Niue": "Niue (Niue áigi)", + "Pacific\/Norfolk": "Norfolk (Norfolksullot áigi)", + "Pacific\/Noumea": "Noumea (Ođđa-Kaledonia áigi)", + "Pacific\/Pago_Pago": "Pago Pago (Amerihká Samoa áigi)", + "Pacific\/Palau": "Palau (Palau áigi)", + "Pacific\/Pitcairn": "Pitcairn (Pitcairn áigi)", + "Pacific\/Ponape": "Pohnpei (Mikronesia áigi)", + "Pacific\/Port_Moresby": "Port Moresby (Papua-Ođđa-Guinea áigi)", + "Pacific\/Rarotonga": "Rarotonga (Cook-sullot áigi)", + "Pacific\/Saipan": "Saipan (Davvi-Mariánat áigi)", + "Pacific\/Tahiti": "Tahiti (Frankriikka Polynesia áigi)", + "Pacific\/Tarawa": "Tarawa (Kiribati áigi)", + "Pacific\/Tongatapu": "Tongatapu (Tonga áigi)", + "Pacific\/Truk": "Chuuk (Mikronesia áigi)", + "Pacific\/Wallis": "Wallis (Wallis ja Futuna áigi)" }, "Meta": { "GmtFormat": "UTC%s", - "HourFormat": [ - "+%02d:%02d", - "−%02d:%02d" - ] + "HourFormatNeg": "−%02d:%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/se_FI.json b/src/Symfony/Component/Intl/Resources/data/timezones/se_FI.json index 334e8f6a951a6..0fc5f8002bf37 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/se_FI.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/se_FI.json @@ -58,13 +58,7 @@ "America\/Anguilla": "Anguilla (atlántalaš áigi)", "America\/Antigua": "Antigua (atlántalaš áigi)", "America\/Araguaina": "Araguaina (Brasilia áigi)", - "America\/Argentina\/La_Rioja": "La Rioja (Argentina áigi)", - "America\/Argentina\/Rio_Gallegos": "Rio Gallegos (Argentina áigi)", - "America\/Argentina\/Salta": "Salta (Argentina áigi)", - "America\/Argentina\/San_Juan": "San Juan (Argentina áigi)", "America\/Argentina\/San_Luis": "San Luis (Oarje-Argentina áigi)", - "America\/Argentina\/Tucuman": "Tucuman (Argentina áigi)", - "America\/Argentina\/Ushuaia": "Ushuaia (Argentina áigi)", "America\/Aruba": "Aruba (atlántalaš áigi)", "America\/Asuncion": "Asuncion (Paraguaya áigi)", "America\/Bahia": "Bahia (Brasilia áigi)", @@ -76,18 +70,14 @@ "America\/Boa_Vista": "Boa Vista (Amazona áigi)", "America\/Bogota": "Bogota (Colombia áigi)", "America\/Boise": "Boise (duottaráigi)", - "America\/Buenos_Aires": "Buenos Aires (Argentina áigi)", "America\/Cambridge_Bay": "Cambridge Bay (duottaráigi)", "America\/Campo_Grande": "Campo Grande (Amazona áigi)", "America\/Cancun": "Cancun (áigi nuortan)", - "America\/Caracas": "Caracas (Venezuela áigi)", - "America\/Catamarca": "Catamarca (Argentina áigi)", "America\/Cayenne": "Cayenne (Frankriikka Guyana áigi)", "America\/Cayman": "Cayman (áigi nuortan)", "America\/Chicago": "Chicago (dábálašáigi)", "America\/Chihuahua": "Chihuahua (Meksiko Jáskesábi áigi)", "America\/Coral_Harbour": "Atikokan (áigi nuortan)", - "America\/Cordoba": "Cordoba (Argentina áigi)", "America\/Costa_Rica": "Costa Rica (dábálašáigi)", "America\/Creston": "Creston (duottaráigi)", "America\/Cuiaba": "Cuiaba (Amazona áigi)", @@ -125,12 +115,9 @@ "America\/Inuvik": "Inuvik (duottaráigi)", "America\/Iqaluit": "Iqaluit (áigi nuortan)", "America\/Jamaica": "Jamaica (áigi nuortan)", - "America\/Jujuy": "Jujuy (Argentina áigi)", "America\/Juneau": "Juneau (Alaska áigi)", "America\/Kentucky\/Monticello": "Monticello, Kentucky (áigi nuortan)", "America\/Kralendijk": "Kralendijk (atlántalaš áigi)", - "America\/La_Paz": "La Paz (Bolivia áigi)", - "America\/Lima": "Lima (Peru áigi)", "America\/Los_Angeles": "Los Angeles (Jaskesábi áigi)", "America\/Louisville": "Louisville (áigi nuortan)", "America\/Lower_Princes": "Lower Prince’s Quarter (atlántalaš áigi)", @@ -141,7 +128,6 @@ "America\/Martinique": "Martinique (atlántalaš áigi)", "America\/Matamoros": "Matamoros (dábálašáigi)", "America\/Mazatlan": "Mazatlan (Meksiko Jáskesábi áigi)", - "America\/Mendoza": "Mendoza (Argentina áigi)", "America\/Menominee": "Menominee (dábálašáigi)", "America\/Merida": "Mérida (dábálašáigi)", "America\/Metlakatla": "Metlakatla (Alaska áigi)", @@ -244,13 +230,11 @@ "Asia\/Jayapura": "Jayapura (Nuorta-Indonesia áigi)", "Asia\/Jerusalem": "Jerusalem (Israela áigi)", "Asia\/Kabul": "Kabul (Afganisthana áigi)", - "Asia\/Kamchatka": "Kamčatka (Ruošša)", + "Asia\/Kamchatka": "Kamčatka (Ruošša áigi)", "Asia\/Karachi": "Karachi (Pakistana áigi)", "Asia\/Katmandu": "Kathmandu (Nepala áigi)", "Asia\/Khandyga": "Khandyga (Jakucka áigi)", "Asia\/Krasnoyarsk": "Krasnojarska áigi", - "Asia\/Kuala_Lumpur": "Kuala Lumpur (Malesia áigi)", - "Asia\/Kuching": "Kuching (Malesia áigi)", "Asia\/Kuwait": "Kuwait (Arábia áigi)", "Asia\/Macau": "Macao (Kiinná áigi)", "Asia\/Magadan": "Magadana áigi", @@ -274,15 +258,12 @@ "Asia\/Sakhalin": "Sahalina áigi", "Asia\/Samarkand": "Samarkand (Usbekistana áigi)", "Asia\/Seoul": "Seoul (Korea áigi)", - "Asia\/Shanghai": "Shanghai (Kiinná áigi)", "Asia\/Singapore": "Singapore dálveáigi", "Asia\/Srednekolymsk": "Srednekolymsk (Magadana áigi)", "Asia\/Taipei": "Taipeia áigi", "Asia\/Tashkent": "Tashkent (Usbekistana áigi)", - "Asia\/Tbilisi": "Tbilisi (Georgia áigi)", "Asia\/Tehran": "Teheran (Irana áigi)", "Asia\/Thimphu": "Thimphu (Bhutana áigi)", - "Asia\/Tokyo": "Tokyo (Japána áigi)", "Asia\/Ulaanbaatar": "Ulan-Batora áigi", "Asia\/Ust-Nera": "Ust-Nera (Vladivostoka áigi)", "Asia\/Vientiane": "Vientiane (Indokiinná áigi)", @@ -387,15 +368,12 @@ "MST7MDT": "duottaráigi", "PST8PDT": "Jaskesábi áigi", "Pacific\/Apia": "Apia áigi", - "Pacific\/Auckland": "Auckland (Ođđa-Selánda áigi)", "Pacific\/Bougainville": "Bougainville (Papua Ođđa-Guinea áigi)", "Pacific\/Chatham": "Chathama áigi", "Pacific\/Easter": "Easter (Beassášsullo áigi)", - "Pacific\/Efate": "Efate (Vanuatu áigi)", "Pacific\/Enderbury": "Enderbury (Phoenixsulloid áigi)", "Pacific\/Fakaofo": "Fakaofo (Tokelaua áigi)", "Pacific\/Fiji": "Fiji áigi", - "Pacific\/Funafuti": "Funafuti (Tuvalu áigi)", "Pacific\/Galapagos": "Galapagosa áigi", "Pacific\/Gambier": "Gambiera áigi", "Pacific\/Guadalcanal": "Guadalcanal (Salomonsulloid áigi)", @@ -411,7 +389,6 @@ "Pacific\/Nauru": "Nauru áigi", "Pacific\/Niue": "Niuea áigi", "Pacific\/Norfolk": "Norfolksullo áigi", - "Pacific\/Noumea": "Noumea (Ođđa-Kaledonia áigi)", "Pacific\/Pago_Pago": "Pago Pago (Samoa áigi)", "Pacific\/Palau": "Palaua áigi", "Pacific\/Pitcairn": "Pitcairnsulloid áigi", @@ -421,16 +398,12 @@ "Pacific\/Saipan": "Saipan (Čamorro dálveáigi)", "Pacific\/Tahiti": "Tahiti áigi", "Pacific\/Tarawa": "Tarawa (Gilbertsulloid áigi)", - "Pacific\/Tongatapu": "Tongatapu (Tonga áigi)", "Pacific\/Truk": "Chuuka áigi", "Pacific\/Wake": "Wakesullo áigi", "Pacific\/Wallis": "Wallis- ja Futuna áigi" }, "Meta": { "GmtFormat": "%s GMT", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] + "HourFormatNeg": "-%02d:%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/sh.json b/src/Symfony/Component/Intl/Resources/data/timezones/sh.json deleted file mode 100644 index a86dc3c9242e0..0000000000000 --- a/src/Symfony/Component/Intl/Resources/data/timezones/sh.json +++ /dev/null @@ -1,446 +0,0 @@ -{ - "Version": "2.1.49.82", - "Names": { - "Africa\/Abidjan": "Srednje vreme po Griniču (Abidžan)", - "Africa\/Accra": "Srednje vreme po Griniču (Akra)", - "Africa\/Addis_Ababa": "Istočno-afričko vreme (Adis Abeba)", - "Africa\/Algiers": "Srednjeevropsko vreme (Alžir)", - "Africa\/Asmera": "Istočno-afričko vreme (Asmera)", - "Africa\/Bamako": "Srednje vreme po Griniču (Bamako)", - "Africa\/Bangui": "Zapadno-afričko vreme (Bangui)", - "Africa\/Banjul": "Srednje vreme po Griniču (Banžul)", - "Africa\/Bissau": "Srednje vreme po Griniču (Bisao)", - "Africa\/Blantyre": "Centralno-afričko vreme (Blantir)", - "Africa\/Brazzaville": "Zapadno-afričko vreme (Brazavil)", - "Africa\/Bujumbura": "Centralno-afričko vreme (Budžumbura)", - "Africa\/Cairo": "Istočnoevropsko vreme (Kairo)", - "Africa\/Casablanca": "Zapadnoevropsko vreme (Kazablanka)", - "Africa\/Ceuta": "Srednjeevropsko vreme (Seuta)", - "Africa\/Conakry": "Srednje vreme po Griniču (Konakri)", - "Africa\/Dakar": "Srednje vreme po Griniču (Dakar)", - "Africa\/Dar_es_Salaam": "Istočno-afričko vreme (Dar-es-Salam)", - "Africa\/Djibouti": "Istočno-afričko vreme (Džibuti)", - "Africa\/Douala": "Zapadno-afričko vreme (Duala)", - "Africa\/El_Aaiun": "Zapadnoevropsko vreme (El Ajun)", - "Africa\/Freetown": "Srednje vreme po Griniču (Fritaun)", - "Africa\/Gaborone": "Centralno-afričko vreme (Gaboron)", - "Africa\/Harare": "Centralno-afričko vreme (Harare)", - "Africa\/Johannesburg": "Južno-afričko vreme (Johanesburg)", - "Africa\/Juba": "Istočno-afričko vreme (Džuba)", - "Africa\/Kampala": "Istočno-afričko vreme (Kampala)", - "Africa\/Khartoum": "Centralno-afričko vreme (Kartum)", - "Africa\/Kigali": "Centralno-afričko vreme (Kigali)", - "Africa\/Kinshasa": "Zapadno-afričko vreme (Kinšasa)", - "Africa\/Lagos": "Zapadno-afričko vreme (Lagos)", - "Africa\/Libreville": "Zapadno-afričko vreme (Librevil)", - "Africa\/Lome": "Srednje vreme po Griniču (Lome)", - "Africa\/Luanda": "Zapadno-afričko vreme (Luanda)", - "Africa\/Lubumbashi": "Centralno-afričko vreme (Lubumbaši)", - "Africa\/Lusaka": "Centralno-afričko vreme (Lusaka)", - "Africa\/Malabo": "Zapadno-afričko vreme (Malabo)", - "Africa\/Maputo": "Centralno-afričko vreme (Maputo)", - "Africa\/Maseru": "Južno-afričko vreme (Maseru)", - "Africa\/Mbabane": "Južno-afričko vreme (Mbabane)", - "Africa\/Mogadishu": "Istočno-afričko vreme (Mogadiš)", - "Africa\/Monrovia": "Srednje vreme po Griniču (Monrovija)", - "Africa\/Nairobi": "Istočno-afričko vreme (Najrobi)", - "Africa\/Ndjamena": "Zapadno-afričko vreme (Ndžamena)", - "Africa\/Niamey": "Zapadno-afričko vreme (Nijamej)", - "Africa\/Nouakchott": "Srednje vreme po Griniču (Nuakšot)", - "Africa\/Ouagadougou": "Srednje vreme po Griniču (Uagadugu)", - "Africa\/Porto-Novo": "Zapadno-afričko vreme (Porto Novo)", - "Africa\/Sao_Tome": "Srednje vreme po Griniču (Sao Tome)", - "Africa\/Tripoli": "Istočnoevropsko vreme (Tripoli)", - "Africa\/Tunis": "Srednjeevropsko vreme (Tunis)", - "Africa\/Windhoek": "Centralno-afričko vreme (Vindhuk)", - "America\/Adak": "Havajsko-aleutsko vreme (Adak)", - "America\/Anchorage": "Aljaska (Enkoridž)", - "America\/Anguilla": "Atlantsko vreme (Angvila)", - "America\/Antigua": "Atlantsko vreme (Antigva)", - "America\/Araguaina": "Brazilija vreme (Aragvajana)", - "America\/Argentina\/La_Rioja": "Argentina vreme (La Rioha)", - "America\/Argentina\/Rio_Gallegos": "Argentina vreme (Rio Galjegos)", - "America\/Argentina\/Salta": "Argentina vreme (Salta)", - "America\/Argentina\/San_Juan": "Argentina vreme (San Huan)", - "America\/Argentina\/San_Luis": "Zapadna Argentina vreme (San Lui)", - "America\/Argentina\/Tucuman": "Argentina vreme (Tukuman)", - "America\/Argentina\/Ushuaia": "Argentina vreme (Ušuaija)", - "America\/Aruba": "Atlantsko vreme (Aruba)", - "America\/Asuncion": "Paragvaj vreme (Asunsion)", - "America\/Bahia": "Brazilija vreme (Baija)", - "America\/Bahia_Banderas": "Severnoameričko centralno vreme (Baija Banderas)", - "America\/Barbados": "Atlantsko vreme (Barbados)", - "America\/Belem": "Brazilija vreme (Belem)", - "America\/Belize": "Severnoameričko centralno vreme (Belize)", - "America\/Blanc-Sablon": "Atlantsko vreme (Blank-Sejblon)", - "America\/Boa_Vista": "Amazon vreme (Boa Vista)", - "America\/Bogota": "Kolumbija vreme (Bogota)", - "America\/Boise": "Severnoameričko planinsko vreme (Bojzi)", - "America\/Buenos_Aires": "Argentina vreme (Buenos Ajres)", - "America\/Cambridge_Bay": "Severnoameričko planinsko vreme (Kembridž Bej)", - "America\/Campo_Grande": "Amazon vreme (Kampo Grande)", - "America\/Cancun": "Severnoameričko istočno vreme (Kankun)", - "America\/Caracas": "Venecuela vreme (Karakas)", - "America\/Catamarca": "Argentina vreme (Katamarka)", - "America\/Cayenne": "Francuska Gvajana vreme (Kajen)", - "America\/Cayman": "Severnoameričko istočno vreme (Kajmanska Ostrva)", - "America\/Chicago": "Severnoameričko centralno vreme (Čikago)", - "America\/Chihuahua": "Meksički Pacifik (Čihuahua)", - "America\/Coral_Harbour": "Severnoameričko istočno vreme (Koral Harbur)", - "America\/Cordoba": "Argentina vreme (Kordoba)", - "America\/Costa_Rica": "Severnoameričko centralno vreme (Kostarika)", - "America\/Creston": "Severnoameričko planinsko vreme (Kreston)", - "America\/Cuiaba": "Amazon vreme (Kuiaba)", - "America\/Curacao": "Atlantsko vreme (Kiraso)", - "America\/Danmarkshavn": "Srednje vreme po Griniču (Danmarkshagen)", - "America\/Dawson": "Severnoameričko pacifičko vreme (Doson)", - "America\/Dawson_Creek": "Severnoameričko planinsko vreme (Doson Krik)", - "America\/Denver": "Severnoameričko planinsko vreme (Denver)", - "America\/Detroit": "Severnoameričko istočno vreme (Detroit)", - "America\/Dominica": "Atlantsko vreme (Dominika)", - "America\/Edmonton": "Severnoameričko planinsko vreme (Edmonton)", - "America\/Eirunepe": "Akre vreme (Eirunepe)", - "America\/El_Salvador": "Severnoameričko centralno vreme (Salvador)", - "America\/Fort_Nelson": "Severnoameričko planinsko vreme (Fort Nelson)", - "America\/Fortaleza": "Brazilija vreme (Fortaleza)", - "America\/Glace_Bay": "Atlantsko vreme (Glejs Bej)", - "America\/Godthab": "Zapadni Grenland (Gothab)", - "America\/Goose_Bay": "Atlantsko vreme (Gus Bej)", - "America\/Grand_Turk": "Severnoameričko istočno vreme (Grand Turk)", - "America\/Grenada": "Atlantsko vreme (Grenada)", - "America\/Guadeloupe": "Atlantsko vreme (Gvadalupe)", - "America\/Guatemala": "Severnoameričko centralno vreme (Gvatemala)", - "America\/Guayaquil": "Ekvador vreme (Gvajakil)", - "America\/Guyana": "Gvajana vreme", - "America\/Halifax": "Atlantsko vreme (Halifaks)", - "America\/Havana": "Kuba (Havana)", - "America\/Hermosillo": "Meksički Pacifik (Hermosiljo)", - "America\/Indiana\/Knox": "Severnoameričko centralno vreme (Noks, Indijana)", - "America\/Indiana\/Marengo": "Severnoameričko istočno vreme (Marengo, Indijana)", - "America\/Indiana\/Petersburg": "Severnoameričko istočno vreme (Pitersburg, Indijana)", - "America\/Indiana\/Tell_City": "Severnoameričko centralno vreme (Tel Siti, Indijana)", - "America\/Indiana\/Vevay": "Severnoameričko istočno vreme (Vevaj, Indijana)", - "America\/Indiana\/Vincennes": "Severnoameričko istočno vreme (Vincenes, Indijana)", - "America\/Indiana\/Winamac": "Severnoameričko istočno vreme (Vinamak, Indijana)", - "America\/Indianapolis": "Severnoameričko istočno vreme (Indianapolis)", - "America\/Inuvik": "Severnoameričko planinsko vreme (Inuvik)", - "America\/Iqaluit": "Severnoameričko istočno vreme (Ikvaluit)", - "America\/Jamaica": "Severnoameričko istočno vreme (Jamajka)", - "America\/Jujuy": "Argentina vreme (Žužui)", - "America\/Juneau": "Aljaska (Žuno)", - "America\/Kentucky\/Monticello": "Severnoameričko istočno vreme (Montičelo, Kentaki)", - "America\/Kralendijk": "Atlantsko vreme (Kralendajk)", - "America\/La_Paz": "Bolivija vreme (La Paz)", - "America\/Lima": "Peru vreme (Lima)", - "America\/Los_Angeles": "Severnoameričko pacifičko vreme (Los Anđeles)", - "America\/Louisville": "Severnoameričko istočno vreme (Luivile)", - "America\/Lower_Princes": "Atlantsko vreme (Louer Prinsiz Kvorter)", - "America\/Maceio": "Brazilija vreme (Masejo)", - "America\/Managua": "Severnoameričko centralno vreme (Managva)", - "America\/Manaus": "Amazon vreme (Manaus)", - "America\/Marigot": "Atlantsko vreme (Marigo)", - "America\/Martinique": "Atlantsko vreme (Martinik)", - "America\/Matamoros": "Severnoameričko centralno vreme (Matamoros)", - "America\/Mazatlan": "Meksički Pacifik (Mazatlan)", - "America\/Mendoza": "Argentina vreme (Mendosa)", - "America\/Menominee": "Severnoameričko centralno vreme (Menomini)", - "America\/Merida": "Severnoameričko centralno vreme (Merida)", - "America\/Metlakatla": "Aljaska (Metlakatla)", - "America\/Mexico_City": "Severnoameričko centralno vreme (Meksiko Siti)", - "America\/Miquelon": "Sen Pjer i Mikelon", - "America\/Moncton": "Atlantsko vreme (Monkton)", - "America\/Monterrey": "Severnoameričko centralno vreme (Monterej)", - "America\/Montevideo": "Urugvaj vreme (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", - "America\/Montserrat": "Atlantsko vreme (Montserat)", - "America\/Nassau": "Severnoameričko istočno vreme (Nasau)", - "America\/New_York": "Severnoameričko istočno vreme (Njujork)", - "America\/Nipigon": "Severnoameričko istočno vreme (Nipigon)", - "America\/Nome": "Aljaska (Nom)", - "America\/Noronha": "Fernando de Noronja vreme", - "America\/North_Dakota\/Beulah": "Severnoameričko centralno vreme (Bijula, Severna Dakota)", - "America\/North_Dakota\/Center": "Severnoameričko centralno vreme (Centar, Severna Dakota)", - "America\/North_Dakota\/New_Salem": "Severnoameričko centralno vreme (Novi Salem, Severna Dakota)", - "America\/Ojinaga": "Severnoameričko planinsko vreme (Ohinaga)", - "America\/Panama": "Severnoameričko istočno vreme (Panama)", - "America\/Pangnirtung": "Severnoameričko istočno vreme (Pangnirtung)", - "America\/Paramaribo": "Surinam vreme (Paramaribo)", - "America\/Phoenix": "Severnoameričko planinsko vreme (Finiks)", - "America\/Port-au-Prince": "Severnoameričko istočno vreme (Port o Prens)", - "America\/Port_of_Spain": "Atlantsko vreme (Port of Spejn)", - "America\/Porto_Velho": "Amazon vreme (Porto Veljo)", - "America\/Puerto_Rico": "Atlantsko vreme (Porto Riko)", - "America\/Punta_Arenas": "Čile vreme (Punta Arenas)", - "America\/Rainy_River": "Severnoameričko centralno vreme (Rejni River)", - "America\/Rankin_Inlet": "Severnoameričko centralno vreme (Rankin Inlet)", - "America\/Recife": "Brazilija vreme (Resife)", - "America\/Regina": "Severnoameričko centralno vreme (Regina)", - "America\/Resolute": "Severnoameričko centralno vreme (Resolut)", - "America\/Rio_Branco": "Akre vreme (Rio Branko)", - "America\/Santa_Isabel": "Severozapadni Meksiko (Santa Izabel)", - "America\/Santarem": "Brazilija vreme (Santarem)", - "America\/Santiago": "Čile vreme (Santjago)", - "America\/Santo_Domingo": "Atlantsko vreme (Santo Domingo)", - "America\/Sao_Paulo": "Brazilija vreme (Sao Paolo)", - "America\/Scoresbysund": "Istočni Grenland (Skorezbisund)", - "America\/Sitka": "Aljaska (Sitka)", - "America\/St_Barthelemy": "Atlantsko vreme (Sv. Bartolomej)", - "America\/St_Johns": "Njufaundlend (Sv. Džon)", - "America\/St_Kitts": "Atlantsko vreme (Sent Kits)", - "America\/St_Lucia": "Atlantsko vreme (Sv. Lucija)", - "America\/St_Thomas": "Atlantsko vreme (Sv. Toma)", - "America\/St_Vincent": "Atlantsko vreme (Sent Vinsent)", - "America\/Swift_Current": "Severnoameričko centralno vreme (Svift Kurent)", - "America\/Tegucigalpa": "Severnoameričko centralno vreme (Tegusigalpa)", - "America\/Thule": "Atlantsko vreme (Tul)", - "America\/Thunder_Bay": "Severnoameričko istočno vreme (Tander Bej)", - "America\/Tijuana": "Severnoameričko pacifičko vreme (Tihuana)", - "America\/Toronto": "Severnoameričko istočno vreme (Toronto)", - "America\/Tortola": "Atlantsko vreme (Tortola)", - "America\/Vancouver": "Severnoameričko pacifičko vreme (Vankuver)", - "America\/Whitehorse": "Severnoameričko pacifičko vreme (Vajthors)", - "America\/Winnipeg": "Severnoameričko centralno vreme (Vinipeg)", - "America\/Yakutat": "Aljaska (Jakutat)", - "America\/Yellowknife": "Severnoameričko planinsko vreme (Jelounajf)", - "Antarctica\/Casey": "Australijsko zapadno vreme (Kejsi)", - "Antarctica\/Davis": "Dejvis vreme", - "Antarctica\/DumontDUrville": "Dimon d’Urvil vreme", - "Antarctica\/Macquarie": "Ostrvo Makveri vreme (Mekvori)", - "Antarctica\/Mawson": "Moson vreme", - "Antarctica\/McMurdo": "Novi Zeland vreme (Makmurdo)", - "Antarctica\/Palmer": "Čile vreme (Palmer)", - "Antarctica\/Rothera": "Rotera vreme", - "Antarctica\/Syowa": "Šova vreme", - "Antarctica\/Troll": "Srednje vreme po Griniču (Trol)", - "Antarctica\/Vostok": "Vostok vreme", - "Arctic\/Longyearbyen": "Srednjeevropsko vreme (Longjerbjen)", - "Asia\/Aden": "Arabijsko vreme (Aden)", - "Asia\/Almaty": "Istočno-kazahstansko vreme (Almati)", - "Asia\/Amman": "Istočnoevropsko vreme (Aman)", - "Asia\/Anadyr": "Anadir vreme", - "Asia\/Aqtau": "Zapadno-kazahstansko vreme (Aktau)", - "Asia\/Aqtobe": "Zapadno-kazahstansko vreme (Akutobe)", - "Asia\/Ashgabat": "Turkmenistan vreme (Ašhabad)", - "Asia\/Atyrau": "Zapadno-kazahstansko vreme (Atirau)", - "Asia\/Baghdad": "Arabijsko vreme (Bagdad)", - "Asia\/Bahrain": "Arabijsko vreme (Bahrein)", - "Asia\/Baku": "Azerbejdžan vreme (Baku)", - "Asia\/Bangkok": "Indokina vreme (Bangkok)", - "Asia\/Barnaul": "Rusija (Barnaul)", - "Asia\/Beirut": "Istočnoevropsko vreme (Bejrut)", - "Asia\/Bishkek": "Kirgistan vreme (Biškek)", - "Asia\/Brunei": "Brunej Darusalum vreme", - "Asia\/Calcutta": "Indijsko standardno vreme (Kalkuta)", - "Asia\/Chita": "Jakutsk vreme (Čita)", - "Asia\/Choibalsan": "Čojbalsan vreme", - "Asia\/Colombo": "Indijsko standardno vreme (Kolombo)", - "Asia\/Damascus": "Istočnoevropsko vreme (Damask)", - "Asia\/Dhaka": "Bangladeš vreme (Daka)", - "Asia\/Dili": "Istočni timor vreme (Dili)", - "Asia\/Dubai": "Zalivsko vreme (Dubai)", - "Asia\/Dushanbe": "Tadžikistan vreme (Dušanbe)", - "Asia\/Famagusta": "Istočnoevropsko vreme (Famagusta)", - "Asia\/Gaza": "Istočnoevropsko vreme (Gaza)", - "Asia\/Hebron": "Istočnoevropsko vreme (Hebron)", - "Asia\/Hong_Kong": "Hong Kong vreme (Hongkong)", - "Asia\/Hovd": "Hovd vreme", - "Asia\/Irkutsk": "Irkuck vreme", - "Asia\/Jakarta": "Zapadno-indonezijsko vreme (Džakarta)", - "Asia\/Jayapura": "Istočno-indonezijsko vreme (Džajapura)", - "Asia\/Jerusalem": "Izraelsko vreme (Jerusalim)", - "Asia\/Kabul": "Avganistan vreme (Kabul)", - "Asia\/Kamchatka": "Petropavlovsko-kamčatsko vreme (Kamčatka)", - "Asia\/Karachi": "Pakistan vreme (Karači)", - "Asia\/Katmandu": "Nepal vreme (Katmandu)", - "Asia\/Khandyga": "Jakutsk vreme (Handiga)", - "Asia\/Krasnoyarsk": "Krasnojarsk vreme", - "Asia\/Kuala_Lumpur": "Malezija vreme (Kuala Lumpur)", - "Asia\/Kuching": "Malezija vreme (Kučing)", - "Asia\/Kuwait": "Arabijsko vreme (Kuvajt)", - "Asia\/Macau": "Kina vreme (Makao)", - "Asia\/Magadan": "Magadan vreme", - "Asia\/Makassar": "Centralno-indonezijsko vreme (Makasar)", - "Asia\/Manila": "Filipini vreme (Manila)", - "Asia\/Muscat": "Zalivsko vreme (Muskat)", - "Asia\/Nicosia": "Istočnoevropsko vreme (Nikozija)", - "Asia\/Novokuznetsk": "Krasnojarsk vreme (Novokuznjeck)", - "Asia\/Novosibirsk": "Novosibirsk vreme", - "Asia\/Omsk": "Omsk vreme", - "Asia\/Oral": "Zapadno-kazahstansko vreme (Oral)", - "Asia\/Phnom_Penh": "Indokina vreme (Pnom Pen)", - "Asia\/Pontianak": "Zapadno-indonezijsko vreme (Pontijanak)", - "Asia\/Pyongyang": "Korejsko vreme (Pjongjang)", - "Asia\/Qatar": "Arabijsko vreme (Katar)", - "Asia\/Qostanay": "Istočno-kazahstansko vreme (Qostanay)", - "Asia\/Qyzylorda": "Zapadno-kazahstansko vreme (Kizilorda)", - "Asia\/Rangoon": "Mijanmar vreme (Rangun)", - "Asia\/Riyadh": "Arabijsko vreme (Rijad)", - "Asia\/Saigon": "Indokina vreme (Ho Ši Min)", - "Asia\/Sakhalin": "Sahalin vreme", - "Asia\/Samarkand": "Uzbekistan vreme (Samarkand)", - "Asia\/Seoul": "Korejsko vreme (Seul)", - "Asia\/Shanghai": "Kina vreme (Šangaj)", - "Asia\/Singapore": "Singapur, standardno vreme", - "Asia\/Srednekolymsk": "Magadan vreme (Srednjekolimsk)", - "Asia\/Taipei": "Tajpej vreme", - "Asia\/Tashkent": "Uzbekistan vreme (Taškent)", - "Asia\/Tbilisi": "Gruzija vreme (Tbilisi)", - "Asia\/Tehran": "Iran vreme (Teheran)", - "Asia\/Thimphu": "Butan vreme (Timpu)", - "Asia\/Tokyo": "Japansko vreme (Tokio)", - "Asia\/Tomsk": "Rusija (Tomsk)", - "Asia\/Ulaanbaatar": "Ulan Bator vreme", - "Asia\/Urumqi": "Kina (Urumći)", - "Asia\/Ust-Nera": "Vladivostok vreme (Ust-Nera)", - "Asia\/Vientiane": "Indokina vreme (Vijentijan)", - "Asia\/Vladivostok": "Vladivostok vreme", - "Asia\/Yakutsk": "Jakutsk vreme", - "Asia\/Yekaterinburg": "Jekaterinburg vreme", - "Asia\/Yerevan": "Jermenija vreme (Jerevan)", - "Atlantic\/Azores": "Azori vreme", - "Atlantic\/Bermuda": "Atlantsko vreme (Bermuda)", - "Atlantic\/Canary": "Zapadnoevropsko vreme (Kanarska ostrva)", - "Atlantic\/Cape_Verde": "Zelenortska Ostrva vreme", - "Atlantic\/Faeroe": "Zapadnoevropsko vreme (Farska Ostrva)", - "Atlantic\/Madeira": "Zapadnoevropsko vreme (Madeira)", - "Atlantic\/Reykjavik": "Srednje vreme po Griniču (Rejkjavik)", - "Atlantic\/South_Georgia": "Južna Džordžija vreme", - "Atlantic\/St_Helena": "Srednje vreme po Griniču (Sveta Jelena)", - "Atlantic\/Stanley": "Folklandska Ostrva vreme (Stenli)", - "Australia\/Adelaide": "Australijsko centralno vreme (Adelejd)", - "Australia\/Brisbane": "Australijsko istočno vreme (Brizbejn)", - "Australia\/Broken_Hill": "Australijsko centralno vreme (Broken Hil)", - "Australia\/Currie": "Australijsko istočno vreme (Kari)", - "Australia\/Darwin": "Australijsko centralno vreme (Darvin)", - "Australia\/Eucla": "Australijsko centralno zapadno vreme (Iukla)", - "Australia\/Hobart": "Australijsko istočno vreme (Hobart)", - "Australia\/Lindeman": "Australijsko istočno vreme (Lindeman)", - "Australia\/Lord_Howe": "Lord Hov vreme (Lord Hau)", - "Australia\/Melbourne": "Australijsko istočno vreme (Melburn)", - "Australia\/Perth": "Australijsko zapadno vreme (Pert)", - "Australia\/Sydney": "Australijsko istočno vreme (Sidnej)", - "CST6CDT": "Severnoameričko centralno vreme", - "EST5EDT": "Severnoameričko istočno vreme", - "Etc\/GMT": "Srednje vreme po Griniču", - "Etc\/UTC": "Koordinisano univerzalno vreme", - "Europe\/Amsterdam": "Srednjeevropsko vreme (Amsterdam)", - "Europe\/Andorra": "Srednjeevropsko vreme (Andora)", - "Europe\/Astrakhan": "Moskva vreme (Astrakan)", - "Europe\/Athens": "Istočnoevropsko vreme (Atina)", - "Europe\/Belgrade": "Srednjeevropsko vreme (Beograd)", - "Europe\/Berlin": "Srednjeevropsko vreme (Berlin)", - "Europe\/Bratislava": "Srednjeevropsko vreme (Bratislava)", - "Europe\/Brussels": "Srednjeevropsko vreme (Brisel)", - "Europe\/Bucharest": "Istočnoevropsko vreme (Bukurešt)", - "Europe\/Budapest": "Srednjeevropsko vreme (Budimpešta)", - "Europe\/Busingen": "Srednjeevropsko vreme (Bisingen)", - "Europe\/Chisinau": "Istočnoevropsko vreme (Kišinjev)", - "Europe\/Copenhagen": "Srednjeevropsko vreme (Kopenhagen)", - "Europe\/Dublin": "Srednje vreme po Griniču (Dablin)", - "Europe\/Gibraltar": "Srednjeevropsko vreme (Gibraltar)", - "Europe\/Guernsey": "Srednje vreme po Griniču (Gernzi)", - "Europe\/Helsinki": "Istočnoevropsko vreme (Helsinki)", - "Europe\/Isle_of_Man": "Srednje vreme po Griniču (Ostrvo Man)", - "Europe\/Istanbul": "Turska (Istanbul)", - "Europe\/Jersey": "Srednje vreme po Griniču (Džersi)", - "Europe\/Kaliningrad": "Istočnoevropsko vreme (Kalinjingrad)", - "Europe\/Kiev": "Istočnoevropsko vreme (Kijev)", - "Europe\/Kirov": "Rusija (Kirov)", - "Europe\/Lisbon": "Zapadnoevropsko vreme (Lisabon)", - "Europe\/Ljubljana": "Srednjeevropsko vreme (Ljubljana)", - "Europe\/London": "Srednje vreme po Griniču (London)", - "Europe\/Luxembourg": "Srednjeevropsko vreme (Luksemburg)", - "Europe\/Madrid": "Srednjeevropsko vreme (Madrid)", - "Europe\/Malta": "Srednjeevropsko vreme (Malta)", - "Europe\/Mariehamn": "Istočnoevropsko vreme (Marihamn)", - "Europe\/Minsk": "Moskva vreme (Minsk)", - "Europe\/Monaco": "Srednjeevropsko vreme (Monako)", - "Europe\/Moscow": "Moskva vreme", - "Europe\/Oslo": "Srednjeevropsko vreme (Oslo)", - "Europe\/Paris": "Srednjeevropsko vreme (Pariz)", - "Europe\/Podgorica": "Srednjeevropsko vreme (Podgorica)", - "Europe\/Prague": "Srednjeevropsko vreme (Prag)", - "Europe\/Riga": "Istočnoevropsko vreme (Riga)", - "Europe\/Rome": "Srednjeevropsko vreme (Rim)", - "Europe\/Samara": "Samara vreme", - "Europe\/San_Marino": "Srednjeevropsko vreme (San Marino)", - "Europe\/Sarajevo": "Srednjeevropsko vreme (Sarajevo)", - "Europe\/Saratov": "Moskva vreme (Saratov)", - "Europe\/Simferopol": "Moskva vreme (Simferopolj)", - "Europe\/Skopje": "Srednjeevropsko vreme (Skoplje)", - "Europe\/Sofia": "Istočnoevropsko vreme (Sofija)", - "Europe\/Stockholm": "Srednjeevropsko vreme (Stokholm)", - "Europe\/Tallinn": "Istočnoevropsko vreme (Talin)", - "Europe\/Tirane": "Srednjeevropsko vreme (Tirana)", - "Europe\/Ulyanovsk": "Moskva vreme (Uljanovsk)", - "Europe\/Uzhgorod": "Istočnoevropsko vreme (Užgorod)", - "Europe\/Vaduz": "Srednjeevropsko vreme (Vaduz)", - "Europe\/Vatican": "Srednjeevropsko vreme (Vatikan)", - "Europe\/Vienna": "Srednjeevropsko vreme (Beč)", - "Europe\/Vilnius": "Istočnoevropsko vreme (Vilnjus)", - "Europe\/Volgograd": "Volgograd vreme", - "Europe\/Warsaw": "Srednjeevropsko vreme (Varšava)", - "Europe\/Zagreb": "Srednjeevropsko vreme (Zagreb)", - "Europe\/Zaporozhye": "Istočnoevropsko vreme (Zaporožje)", - "Europe\/Zurich": "Srednjeevropsko vreme (Cirih)", - "Indian\/Antananarivo": "Istočno-afričko vreme (Antananarivo)", - "Indian\/Chagos": "Indijsko okeansko vreme (Čagos)", - "Indian\/Christmas": "Božićno ostrvo vreme", - "Indian\/Cocos": "Kokos (Keling) Ostrva vreme", - "Indian\/Comoro": "Istočno-afričko vreme (Komoro)", - "Indian\/Kerguelen": "Francusko južno i antarktičko vreme (Kergelen)", - "Indian\/Mahe": "Sejšeli vreme (Mahe)", - "Indian\/Maldives": "Maldivi vreme", - "Indian\/Mauritius": "Mauricijus vreme", - "Indian\/Mayotte": "Istočno-afričko vreme (Majot)", - "Indian\/Reunion": "Reinion vreme (Reunion)", - "MST7MDT": "Severnoameričko planinsko vreme", - "PST8PDT": "Severnoameričko pacifičko vreme", - "Pacific\/Apia": "Apija vreme", - "Pacific\/Auckland": "Novi Zeland vreme (Okland)", - "Pacific\/Bougainville": "Papua Nova Gvineja vreme (Buganvil)", - "Pacific\/Chatham": "Čatam vreme", - "Pacific\/Easter": "Uskršnja ostrva vreme (Uskršnje ostrvo)", - "Pacific\/Efate": "Vanuatu vreme (Efat)", - "Pacific\/Enderbury": "Feniks ostrva vreme (Enderberi)", - "Pacific\/Fakaofo": "Tokelau vreme (Fakaofo)", - "Pacific\/Fiji": "Fidži vreme", - "Pacific\/Funafuti": "Tuvalu vreme (Funafuti)", - "Pacific\/Galapagos": "Galapagos vreme", - "Pacific\/Gambier": "Gambije vreme", - "Pacific\/Guadalcanal": "Solomonska Ostrva vreme (Gvadalkanal)", - "Pacific\/Guam": "Čamoro vreme (Guam)", - "Pacific\/Honolulu": "Havajsko-aleutsko vreme (Honolulu)", - "Pacific\/Johnston": "Havajsko-aleutsko vreme (Džonston)", - "Pacific\/Kiritimati": "Ostrva Lajn vreme (Kiritimati)", - "Pacific\/Kosrae": "Košre vreme", - "Pacific\/Kwajalein": "Maršalska Ostrva vreme (Kvadžalejin)", - "Pacific\/Majuro": "Maršalska Ostrva vreme (Majuro)", - "Pacific\/Marquesas": "Markiz vreme", - "Pacific\/Midway": "Samoa vreme (Midvej)", - "Pacific\/Nauru": "Nauru vreme", - "Pacific\/Niue": "Niue vreme", - "Pacific\/Norfolk": "Norfolk Ostrvo vreme", - "Pacific\/Noumea": "Nova Kaledonija vreme (Numea)", - "Pacific\/Pago_Pago": "Samoa vreme (Pago Pago)", - "Pacific\/Palau": "Palau vreme", - "Pacific\/Pitcairn": "Pitkern vreme", - "Pacific\/Ponape": "Ponpej vreme (Ponape)", - "Pacific\/Port_Moresby": "Papua Nova Gvineja vreme (Port Morzbi)", - "Pacific\/Rarotonga": "Kukova ostrva vreme (Rarotonga)", - "Pacific\/Saipan": "Čamoro vreme (Sajpan)", - "Pacific\/Tahiti": "Tahiti vreme", - "Pacific\/Tarawa": "Gilbert ostrva vreme (Tarava)", - "Pacific\/Tongatapu": "Tonga vreme (Tongatapu)", - "Pacific\/Truk": "Čuuk vreme (Truk)", - "Pacific\/Wake": "Vejk ostrvo vreme", - "Pacific\/Wallis": "Valis i Futuna Ostrva vreme" - }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } -} diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/si.json b/src/Symfony/Component/Intl/Resources/data/timezones/si.json index 0d8ccded67713..62ff902891679 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/si.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/si.json @@ -99,7 +99,7 @@ "America\/Detroit": "උතුරු ඇමරිකානු නැගෙනහිර වේලාව (ඩෙත්රුවා)", "America\/Dominica": "අත්ලාන්තික් වේලාව (ඩොමිනිකා)", "America\/Edmonton": "උතුරු ඇමරිකානු කඳුකර වේලාව (එඩ්මන්ටන්)", - "America\/Eirunepe": "බ්‍රසීලය (එයිරුනේප්)", + "America\/Eirunepe": "බ්‍රසීලය වේලාව (එයිරුනේප්)", "America\/El_Salvador": "උතුරු ඇමරිකානු මධ්‍යම වේලාව (එල්සැල්වදෝර්)", "America\/Fort_Nelson": "උතුරු ඇමරිකානු කඳුකර වේලාව (ෆෝට් නෙල්සන්)", "America\/Fortaleza": "බ්‍රසීල වේලාව (ෆොර්ටලේසා)", @@ -151,7 +151,7 @@ "America\/Moncton": "අත්ලාන්තික් වේලාව (මොන්ක්ටන්)", "America\/Monterrey": "උතුරු ඇමරිකානු මධ්‍යම වේලාව (මොන්ටෙරේ)", "America\/Montevideo": "උරුගුවේ වේලාව (මොන්ටෙවිඩියෝ)", - "America\/Montreal": "කැනඩාව (Montreal)", + "America\/Montreal": "කැනඩාව වේලාව (Montreal)", "America\/Montserrat": "අත්ලාන්තික් වේලාව (මොන්ට්සේරාට්)", "America\/Nassau": "උතුරු ඇමරිකානු නැගෙනහිර වේලාව (නස්සෝ)", "America\/New_York": "උතුරු ඇමරිකානු නැගෙනහිර වේලාව (නිව්යෝක්)", @@ -176,7 +176,7 @@ "America\/Recife": "බ්‍රසීල වේලාව (රෙසිෆ්)", "America\/Regina": "උතුරු ඇමරිකානු මධ්‍යම වේලාව (රෙජිනා)", "America\/Resolute": "උතුරු ඇමරිකානු මධ්‍යම වේලාව (රෙසොලුට්)", - "America\/Rio_Branco": "බ්‍රසීලය (රියෝ බ්‍රන්කෝ)", + "America\/Rio_Branco": "බ්‍රසීලය වේලාව (රියෝ බ්‍රන්කෝ)", "America\/Santa_Isabel": "වයඹ මෙක්සිකෝ වේලාව (සැන්ටා ඉසබෙල්)", "America\/Santarem": "බ්‍රසීල වේලාව (සන්ටරේම්)", "America\/Santiago": "චිලී වේලාව (සන්තියාගෝ)", @@ -217,7 +217,7 @@ "Asia\/Aden": "අරාබි වේලාව (ඒඩ්න්)", "Asia\/Almaty": "නැගෙනහිර කසකස්තාන වේලාව (අල්මටි)", "Asia\/Amman": "නැගෙනහිර යුරෝපීය වේලාව (අම්මාන්)", - "Asia\/Anadyr": "රුසියාව (ඇනාදිය්ර්)", + "Asia\/Anadyr": "රුසියාව වේලාව (ඇනාදිය්ර්)", "Asia\/Aqtau": "බටහිර කසකස්තාන වේලාව (අක්ටෝ)", "Asia\/Aqtobe": "බටහිර කසකස්තාන වේලාව (අක්ටෝබ්)", "Asia\/Ashgabat": "ටර්ක්මෙනිස්තාන වේලාව (අශ්ගබැට්)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "අරාබි වේලාව (බහරේන්)", "Asia\/Baku": "අසර්බයිජාන් වේලාව (බාකු)", "Asia\/Bangkok": "ඉන්දුචීන වේලාව (බැංකොක්)", - "Asia\/Barnaul": "රුසියාව (බර්නෞල්)", + "Asia\/Barnaul": "රුසියාව වේලාව (බර්නෞල්)", "Asia\/Beirut": "නැගෙනහිර යුරෝපීය වේලාව (බීරුට්)", "Asia\/Bishkek": "කිර්ගිස්තාන වේලාව (බිශ්කෙක්)", "Asia\/Brunei": "බෘනායි දරුස්සලාම් වේලාව (බෲනායි)", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "නැගෙනහිර ඉන්දුනීසියානු වේලාව (ජයපුර)", "Asia\/Jerusalem": "ඊශ්‍රායල වේලාව (ජෙරුසලම)", "Asia\/Kabul": "ඇෆ්ගනිස්ථාන වේලාව (කාබුල්)", - "Asia\/Kamchatka": "රුසියාව (කම්චට්කා)", + "Asia\/Kamchatka": "රුසියාව වේලාව (කම්චට්කා)", "Asia\/Karachi": "පාකිස්ථාන වේලාව (කරච්චිචි)", "Asia\/Katmandu": "නේපාල වේලාව (කත්මන්ඩු)", "Asia\/Khandyga": "යකුට්ස්ක් වේලාව (ඛන්ඩිගා)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ඉරාන වේලාව (ටෙහෙරාන්)", "Asia\/Thimphu": "භුතාන වේලාව (තිම්පු)", "Asia\/Tokyo": "ජපාන වේලාව (ටෝකියෝ)", - "Asia\/Tomsk": "රුසියාව (ටොම්ස්ක්)", + "Asia\/Tomsk": "රුසියාව වේලාව (ටොම්ස්ක්)", "Asia\/Ulaanbaatar": "උලාන් බාටර් වේලාව (උලාන්බාටර්)", - "Asia\/Urumqi": "චීනය (උරුම්කි)", + "Asia\/Urumqi": "චීනය වේලාව (උරුම්කි)", "Asia\/Ust-Nera": "ව්ලදිවෝස්ටෝක් වේලාව (උස්ට්-නෙරා)", "Asia\/Vientiane": "ඉන්දුචීන වේලාව (වියැන්ටියන්)", "Asia\/Vladivostok": "ව්ලදිවෝස්ටෝක් වේලාව (ව්ලඩිවොස්ටොක්)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "ග්‍රිනිච් මධ්‍යම වේලාව (ගුවන්සේ)", "Europe\/Helsinki": "නැගෙනහිර යුරෝපීය වේලාව (හෙල්සින්කි)", "Europe\/Isle_of_Man": "ග්‍රිනිච් මධ්‍යම වේලාව (අයිල් ඔෆ් මෑන්)", - "Europe\/Istanbul": "තුර්කිය (ඉස්තාන්බුල්)", + "Europe\/Istanbul": "තුර්කිය වේලාව (ඉස්තාන්බුල්)", "Europe\/Jersey": "ග්‍රිනිච් මධ්‍යම වේලාව (ජර්සි)", "Europe\/Kaliningrad": "නැගෙනහිර යුරෝපීය වේලාව (කලිනින්ග්‍රෑඩ්)", "Europe\/Kiev": "නැගෙනහිර යුරෝපීය වේලාව (කිව්)", - "Europe\/Kirov": "රුසියාව (කිරොව්)", + "Europe\/Kirov": "රුසියාව වේලාව (කිරොව්)", "Europe\/Lisbon": "බටහිර යුරෝපීය වේලාව (ලිස්බන්)", "Europe\/Ljubljana": "මධ්‍යම යුරෝපීය වේලාව (ල්ජුබුල්ජනා)", "Europe\/London": "ග්‍රිනිච් මධ්‍යම වේලාව (ලන්ඩන්)", @@ -362,7 +362,7 @@ "Europe\/Prague": "මධ්‍යම යුරෝපීය වේලාව (ප්‍රෙග්)", "Europe\/Riga": "නැගෙනහිර යුරෝපීය වේලාව (රිගා)", "Europe\/Rome": "මධ්‍යම යුරෝපීය වේලාව (රෝමය)", - "Europe\/Samara": "රුසියාව (සමරා)", + "Europe\/Samara": "රුසියාව වේලාව (සමරා)", "Europe\/San_Marino": "මධ්‍යම යුරෝපීය වේලාව (සැන් මැරිනෝ)", "Europe\/Sarajevo": "මධ්‍යම යුරෝපීය වේලාව (සරාජෙවෝ)", "Europe\/Saratov": "මොස්කව් වේලාව (සරටොව්)", @@ -438,9 +438,7 @@ }, "Meta": { "GmtFormat": "ග්‍රිමවේ%s", - "HourFormat": [ - "+%02d.%02d", - "-%02d.%02d" - ] + "HourFormatPos": "+%02d.%02d", + "HourFormatNeg": "-%02d.%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/sk.json b/src/Symfony/Component/Intl/Resources/data/timezones/sk.json index f08f52e88e97e..eb079b2b3ebd1 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/sk.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/sk.json @@ -151,7 +151,7 @@ "America\/Moncton": "atlantický čas (Moncton)", "America\/Monterrey": "severoamerický centrálny čas (Monterrey)", "America\/Montevideo": "uruguajský čas (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "časové pásmo Kanada (Montreal)", "America\/Montserrat": "atlantický čas (Montserrat)", "America\/Nassau": "severoamerický východný čas (Nassau)", "America\/New_York": "severoamerický východný čas (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "arabský čas (Bahrajn)", "Asia\/Baku": "azerbajdžanský čas (Baku)", "Asia\/Bangkok": "indočínsky čas (Bangkok)", - "Asia\/Barnaul": "Rusko (Barnaul)", + "Asia\/Barnaul": "časové pásmo Rusko (Barnaul)", "Asia\/Beirut": "východoeurópsky čas (Bejrút)", "Asia\/Bishkek": "kirgizský čas (Biškek)", "Asia\/Brunei": "brunejský čas", @@ -288,9 +288,9 @@ "Asia\/Tehran": "iránsky čas (Teherán)", "Asia\/Thimphu": "bhutánsky čas (Thimphu)", "Asia\/Tokyo": "japonský čas (Tokio)", - "Asia\/Tomsk": "Rusko (Tomsk)", + "Asia\/Tomsk": "časové pásmo Rusko (Tomsk)", "Asia\/Ulaanbaatar": "ulanbátarský čas", - "Asia\/Urumqi": "Čína (Urumči)", + "Asia\/Urumqi": "časové pásmo Čína (Urumči)", "Asia\/Ust-Nera": "vladivostocký čas (Usť-Nera)", "Asia\/Vientiane": "indočínsky čas (Vientian)", "Asia\/Vladivostok": "vladivostocký čas (Vladivostok)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "greenwichský čas (Guernsey)", "Europe\/Helsinki": "východoeurópsky čas (Helsinki)", "Europe\/Isle_of_Man": "greenwichský čas (Ostrov Man)", - "Europe\/Istanbul": "Turecko (Istanbul)", + "Europe\/Istanbul": "časové pásmo Turecko (Istanbul)", "Europe\/Jersey": "greenwichský čas (Jersey)", "Europe\/Kaliningrad": "východoeurópsky čas (Kaliningrad)", "Europe\/Kiev": "východoeurópsky čas (Kyjev)", - "Europe\/Kirov": "Rusko (Kirov)", + "Europe\/Kirov": "časové pásmo Rusko (Kirov)", "Europe\/Lisbon": "západoeurópsky čas (Lisabon)", "Europe\/Ljubljana": "stredoeurópsky čas (Ľubľana)", "Europe\/London": "greenwichský čas (Londýn)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "čas ostrova Wake", "Pacific\/Wallis": "čas ostrovov Wallis a Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/sl.json b/src/Symfony/Component/Intl/Resources/data/timezones/sl.json index f5cff90993241..e71ec31fb3e15 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/sl.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/sl.json @@ -99,7 +99,7 @@ "America\/Detroit": "Vzhodni čas (Detroit)", "America\/Dominica": "Atlantski čas (Dominika)", "America\/Edmonton": "Gorski čas (Edmonton)", - "America\/Eirunepe": "Brazilija (Eirunepe)", + "America\/Eirunepe": "Brazilija čas (Eirunepe)", "America\/El_Salvador": "Centralni čas (Salvador)", "America\/Fort_Nelson": "Gorski čas (Fort Nelson)", "America\/Fortaleza": "Brasilski čas (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Atlantski čas (Moncton)", "America\/Monterrey": "Centralni čas (Monterrey)", "America\/Montevideo": "Urugvajski čas (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Kanada čas (Montreal)", "America\/Montserrat": "Atlantski čas (Montserrat)", "America\/Nassau": "Vzhodni čas (Nassau)", "America\/New_York": "Vzhodni čas (New York)", @@ -176,7 +176,7 @@ "America\/Recife": "Brasilski čas (Recife)", "America\/Regina": "Centralni čas (Regina)", "America\/Resolute": "Centralni čas (Resolute)", - "America\/Rio_Branco": "Brazilija (Rio Branco)", + "America\/Rio_Branco": "Brazilija čas (Rio Branco)", "America\/Santa_Isabel": "Mehiški severozahodni čas (Santa Isabel)", "America\/Santarem": "Brasilski čas (Santarem)", "America\/Santiago": "Čilski čas (Santiago)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Arabski čas (Bahrajn)", "Asia\/Baku": "Azerbajdžanski čas (Baku)", "Asia\/Bangkok": "Indokitajski čas (Bangkok)", - "Asia\/Barnaul": "Rusija (Barnaul)", + "Asia\/Barnaul": "Rusija čas (Barnaul)", "Asia\/Beirut": "Vzhodnoevropski čas (Bejrut)", "Asia\/Bishkek": "Kirgizistanski čas (Biškek)", "Asia\/Brunei": "Brunejski čas", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Iranski čas (Teheran)", "Asia\/Thimphu": "Butanski čas (Timpu)", "Asia\/Tokyo": "Japonski čas (Tokio)", - "Asia\/Tomsk": "Rusija (Tomsk)", + "Asia\/Tomsk": "Rusija čas (Tomsk)", "Asia\/Ulaanbaatar": "Ulanbatorski čas (Ulan Bator)", - "Asia\/Urumqi": "Kitajska (Urumči)", + "Asia\/Urumqi": "Kitajska čas (Urumči)", "Asia\/Ust-Nera": "Vladivostoški čas (Ust-Nera)", "Asia\/Vientiane": "Indokitajski čas (Vientiane)", "Asia\/Vladivostok": "Vladivostoški čas (Vladivostok)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwiški srednji čas (Guernsey)", "Europe\/Helsinki": "Vzhodnoevropski čas (Helsinki)", "Europe\/Isle_of_Man": "Greenwiški srednji čas (Otok Man)", - "Europe\/Istanbul": "Turčija (Istanbul)", + "Europe\/Istanbul": "Turčija čas (Istanbul)", "Europe\/Jersey": "Greenwiški srednji čas (Jersey)", "Europe\/Kaliningrad": "Vzhodnoevropski čas (Kaliningrad)", "Europe\/Kiev": "Vzhodnoevropski čas (Kijev)", - "Europe\/Kirov": "Rusija (Kirov)", + "Europe\/Kirov": "Rusija čas (Kirov)", "Europe\/Lisbon": "Zahodnoevropski čas (Lizbona)", "Europe\/Ljubljana": "Srednjeevropski čas (Ljubljana)", "Europe\/London": "Greenwiški srednji čas (London)", @@ -437,10 +437,7 @@ "Pacific\/Wallis": "Čas: Wallis in Futuna" }, "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d.%02d", - "-%02d.%02d" - ] + "HourFormatPos": "+%02d.%02d", + "HourFormatNeg": "-%02d.%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/so.json b/src/Symfony/Component/Intl/Resources/data/timezones/so.json index 550f6259eeb32..da2507a1578eb 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/so.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/so.json @@ -99,7 +99,7 @@ "America\/Detroit": "Waqtiga Bariga ee Waqooyiga Ameerika (Detoroyt)", "America\/Dominica": "Waqtiga Atlantika ee Waqooyiga Ameerika (Dominiika)", "America\/Edmonton": "Waqtiga Buuraleyda ee Waqooyiga Ameerika (Edmonton)", - "America\/Eirunepe": "Baraasiil (Iiruneeb)", + "America\/Eirunepe": "Waqtiga Baraasiil (Iiruneeb)", "America\/El_Salvador": "Waqtiga Bartamaha Waqooyiga Ameerika (El Salfadoor)", "America\/Fort_Nelson": "Waqtiga Buuraleyda ee Waqooyiga Ameerika (Foot Nelson)", "America\/Fortaleza": "Waqtiga Baraasiliya (Footalesa)", @@ -151,7 +151,7 @@ "America\/Moncton": "Waqtiga Atlantika ee Waqooyiga Ameerika (Moonktoon)", "America\/Monterrey": "Waqtiga Bartamaha Waqooyiga Ameerika (Moonteerey)", "America\/Montevideo": "Waqtiga Urugwaay (Moontafiidiyo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Waqtiga Kanada (Montreal)", "America\/Montserrat": "Waqtiga Atlantika ee Waqooyiga Ameerika (Moontseraat)", "America\/Nassau": "Waqtiga Bariga ee Waqooyiga Ameerika (Nasaaw)", "America\/New_York": "Waqtiga Bariga ee Waqooyiga Ameerika (Niyuu Yook)", @@ -176,7 +176,7 @@ "America\/Recife": "Waqtiga Baraasiliya (Receyf)", "America\/Regina": "Waqtiga Bartamaha Waqooyiga Ameerika (Rejiina)", "America\/Resolute": "Waqtiga Bartamaha Waqooyiga Ameerika (Resoluut)", - "America\/Rio_Branco": "Baraasiil (Riyo Baraanko)", + "America\/Rio_Branco": "Waqtiga Baraasiil (Riyo Baraanko)", "America\/Santa_Isabel": "Waqtiga Waqooyi-Galbeed Meksiko (Santa Isabel)", "America\/Santarem": "Waqtiga Baraasiliya (Santareem)", "America\/Santiago": "Waqtiga Jili (Santiyaago)", @@ -217,7 +217,7 @@ "Asia\/Aden": "Waqtiga Carabta (Cadan)", "Asia\/Almaty": "Waqtiga Bariga Kasakhistaan (Almati)", "Asia\/Amman": "Waqtiga Bariga Yurub (Ammaan)", - "Asia\/Anadyr": "Ruush (Anadiyr)", + "Asia\/Anadyr": "Waqtiga Ruush (Anadiyr)", "Asia\/Aqtau": "Waqtiga Koonfurta Kasakhistan (Aktaw)", "Asia\/Aqtobe": "Waqtiga Koonfurta Kasakhistan (Aqtobe)", "Asia\/Ashgabat": "Waqtiga Turkmenistaan (Ashgabat)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Waqtiga Carabta (Baxreyn)", "Asia\/Baku": "Waqtiga Asarbeyjan (Baku)", "Asia\/Bangkok": "Waqtiga Indoshiina (Bangkook)", - "Asia\/Barnaul": "Ruush (Barnaauul)", + "Asia\/Barnaul": "Waqtiga Ruush (Barnaauul)", "Asia\/Beirut": "Waqtiga Bariga Yurub (Beyruud)", "Asia\/Bishkek": "Waqtiga Kiyrigistaan (Bishkek)", "Asia\/Brunei": "Waqtiga Buruney Daarusalaam", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "Waqtiga Indoneeysiya (Jayabura)", "Asia\/Jerusalem": "Waqtiga Israaiil (Jeerusaalem)", "Asia\/Kabul": "Waqtiga Afggaanistaan (Kaabuul)", - "Asia\/Kamchatka": "Ruush (Kamkatka)", + "Asia\/Kamchatka": "Waqtiga Ruush (Kamkatka)", "Asia\/Karachi": "Waqtiga Bakistaan (Karaaji)", "Asia\/Katmandu": "Waqtiga Neebaal (Katmandu)", "Asia\/Khandyga": "Waqtiyada Yakut (Khandiyga)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Waqtiga Iiraan (Tehraan)", "Asia\/Thimphu": "Waqtiga Butaan (Timbu)", "Asia\/Tokyo": "Waqtiga Jabaan (Tokyo)", - "Asia\/Tomsk": "Ruush (Tomsk)", + "Asia\/Tomsk": "Waqtiga Ruush (Tomsk)", "Asia\/Ulaanbaatar": "Waqtiga Ulaanbaataar (Ulaanbaatar)", - "Asia\/Urumqi": "Shiinaha (Urumqi)", + "Asia\/Urumqi": "Waqtiga Shiinaha (Urumqi)", "Asia\/Ust-Nera": "Waqtiga Faladifostok (Ust-Nera)", "Asia\/Vientiane": "Waqtiga Indoshiina (Fiyaantiyaan)", "Asia\/Vladivostok": "Waqtiga Faladifostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Waqtiga Celceliska Giriinwij (Geernisi)", "Europe\/Helsinki": "Waqtiga Bariga Yurub (Heleniski)", "Europe\/Isle_of_Man": "Waqtiga Celceliska Giriinwij (Ayle of Maan)", - "Europe\/Istanbul": "Turki (Istanbuul)", + "Europe\/Istanbul": "Waqtiga Turki (Istanbuul)", "Europe\/Jersey": "Waqtiga Celceliska Giriinwij (Jaarsey)", "Europe\/Kaliningrad": "Waqtiga Bariga Yurub (Kaliningrad)", "Europe\/Kiev": "Waqtiga Bariga Yurub (Kiyf)", - "Europe\/Kirov": "Ruush (Kiroof)", + "Europe\/Kirov": "Waqtiga Ruush (Kiroof)", "Europe\/Lisbon": "Waqtiga Galbeedka Yurub (Lisbon)", "Europe\/Ljubljana": "Waqtiga Bartamaha Yurub (Lubalaana)", "Europe\/London": "Waqtiga Celceliska Giriinwij (Landan)", @@ -362,7 +362,7 @@ "Europe\/Prague": "Waqtiga Bartamaha Yurub (Baraag)", "Europe\/Riga": "Waqtiga Bariga Yurub (Riija)", "Europe\/Rome": "Waqtiga Bartamaha Yurub (Rooma)", - "Europe\/Samara": "Ruush (Samara)", + "Europe\/Samara": "Waqtiga Ruush (Samara)", "Europe\/San_Marino": "Waqtiga Bartamaha Yurub (San Mariino)", "Europe\/Sarajevo": "Waqtiga Bartamaha Yurub (Sarayeefo)", "Europe\/Saratov": "Waqtiga Moskow (Saratoof)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Waqtiga Wayk Iylaanis (Wake)", "Pacific\/Wallis": "Waqtiga Walis & Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/sq.json b/src/Symfony/Component/Intl/Resources/data/timezones/sq.json index 370062bd0961f..d98ea7f1f4daa 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/sq.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/sq.json @@ -151,7 +151,7 @@ "America\/Moncton": "Ora e Atlantikut (Monkton)", "America\/Monterrey": "Ora e SHBA-së Qendrore (Monterrej)", "America\/Montevideo": "Ora e Uruguait (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Ora: Kanada (Montreal)", "America\/Montserrat": "Ora e Atlantikut (Montserat)", "America\/Nassau": "Ora e SHBA-së Lindore (Nasao)", "America\/New_York": "Ora e SHBA-së Lindore (Nju-Jork)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Ora arabe (Bahrejn)", "Asia\/Baku": "Ora e Azerbajxhanit (Baku)", "Asia\/Bangkok": "Ora e Indokinës (Bangkok)", - "Asia\/Barnaul": "Rusi (Barnaul)", + "Asia\/Barnaul": "Ora: Rusi (Barnaul)", "Asia\/Beirut": "Ora e Evropës Lindore (Bejrut)", "Asia\/Bishkek": "Ora e Kirgizisë (Bishkek)", "Asia\/Brunei": "Ora e Brunei-Durasalamit", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Ora e Iranit (Teheran)", "Asia\/Thimphu": "Ora e Butanit (Thimpu)", "Asia\/Tokyo": "Ora e Japonisë (Tokio)", - "Asia\/Tomsk": "Rusi (Tomsk)", + "Asia\/Tomsk": "Ora: Rusi (Tomsk)", "Asia\/Ulaanbaatar": "Ora e Ulan-Batorit (Ulanbatar)", - "Asia\/Urumqi": "Kinë (Urumqi)", + "Asia\/Urumqi": "Ora: Kinë (Urumqi)", "Asia\/Ust-Nera": "Ora e Vladivostokut (Ust-Nera)", "Asia\/Vientiane": "Ora e Indokinës (Vjentianë)", "Asia\/Vladivostok": "Ora e Vladivostokut", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Ora e Grinuiçit (Gernsej)", "Europe\/Helsinki": "Ora e Evropës Lindore (Helsinki)", "Europe\/Isle_of_Man": "Ora e Grinuiçit (Ishulli i Manit)", - "Europe\/Istanbul": "Turqi (Stamboll)", + "Europe\/Istanbul": "Ora: Turqi (Stamboll)", "Europe\/Jersey": "Ora e Grinuiçit (Xhersej)", "Europe\/Kaliningrad": "Ora e Evropës Lindore (Kaliningrad)", "Europe\/Kiev": "Ora e Evropës Lindore (Kiev)", - "Europe\/Kirov": "Rusi (Kirov)", + "Europe\/Kirov": "Ora: Rusi (Kirov)", "Europe\/Lisbon": "Ora e Evropës Perëndimore (Lisbonë)", "Europe\/Ljubljana": "Ora e Evropës Qendrore (Lubjanë)", "Europe\/London": "Ora e Grinuiçit (Londër)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Ora e Ishullit Uejk", "Pacific\/Wallis": "Ora e Uollisit dhe Futunës" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/sr.json b/src/Symfony/Component/Intl/Resources/data/timezones/sr.json index c77df92a04de7..ecd996ff27bb2 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/sr.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/sr.json @@ -436,11 +436,5 @@ "Pacific\/Wake": "Вејк острво време", "Pacific\/Wallis": "Валис и Футуна Острва време" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/sr_Latn.json b/src/Symfony/Component/Intl/Resources/data/timezones/sr_Latn.json index 0f41dcc05bead..82de447f57f56 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/sr_Latn.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/sr_Latn.json @@ -151,6 +151,7 @@ "America\/Moncton": "Atlantsko vreme (Monkton)", "America\/Monterrey": "Severnoameričko centralno vreme (Monterej)", "America\/Montevideo": "Urugvaj vreme (Montevideo)", + "America\/Montreal": "Kanada (Montreal)", "America\/Montserrat": "Atlantsko vreme (Montserat)", "America\/Nassau": "Severnoameričko istočno vreme (Nasau)", "America\/New_York": "Severnoameričko istočno vreme (Njujork)", diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/sv.json b/src/Symfony/Component/Intl/Resources/data/timezones/sv.json index 1db51b042ff35..eaa4bc553283e 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/sv.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/sv.json @@ -151,7 +151,7 @@ "America\/Moncton": "nordamerikansk atlanttid (Moncton)", "America\/Monterrey": "centralnordamerikansk tid (Monterrey)", "America\/Montevideo": "uruguayansk tid (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Kanadatid (Montreal)", "America\/Montserrat": "nordamerikansk atlanttid (Montserrat)", "America\/Nassau": "östnordamerikansk tid (Nassau)", "America\/New_York": "östnordamerikansk tid (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "saudiarabisk tid (Bahrain)", "Asia\/Baku": "azerbajdzjansk tid (Baku)", "Asia\/Bangkok": "indokinesisk tid (Bangkok)", - "Asia\/Barnaul": "Ryssland (Barnaul)", + "Asia\/Barnaul": "Rysslandtid (Barnaul)", "Asia\/Beirut": "östeuropeisk tid (Beirut)", "Asia\/Bishkek": "kirgizisk tid (Bisjkek)", "Asia\/Brunei": "Bruneitid", @@ -288,9 +288,9 @@ "Asia\/Tehran": "iransk tid (Teheran)", "Asia\/Thimphu": "bhutansk tid (Thimphu)", "Asia\/Tokyo": "japansk tid (Tokyo)", - "Asia\/Tomsk": "Ryssland (Tomsk)", + "Asia\/Tomsk": "Rysslandtid (Tomsk)", "Asia\/Ulaanbaatar": "Ulaanbaatartid", - "Asia\/Urumqi": "Kina (Ürümqi)", + "Asia\/Urumqi": "Kinatid (Ürümqi)", "Asia\/Ust-Nera": "Vladivostoktid (Ust-Nera)", "Asia\/Vientiane": "indokinesisk tid (Vientiane)", "Asia\/Vladivostok": "Vladivostoktid", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwichtid (Guernsey)", "Europe\/Helsinki": "östeuropeisk tid (Helsingfors)", "Europe\/Isle_of_Man": "Greenwichtid (Isle of Man)", - "Europe\/Istanbul": "Turkiet (Istanbul)", + "Europe\/Istanbul": "Turkiettid (Istanbul)", "Europe\/Jersey": "Greenwichtid (Jersey)", "Europe\/Kaliningrad": "östeuropeisk tid (Kaliningrad)", "Europe\/Kiev": "östeuropeisk tid (Kiev)", - "Europe\/Kirov": "Ryssland (Kirov)", + "Europe\/Kirov": "Rysslandtid (Kirov)", "Europe\/Lisbon": "västeuropeisk tid (Lissabon)", "Europe\/Ljubljana": "centraleuropeisk tid (Ljubljana)", "Europe\/London": "Greenwichtid (London)", @@ -437,10 +437,6 @@ "Pacific\/Wallis": "Wallis- och Futunaöarnas tid (Wallisön)" }, "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "−%02d:%02d" - ] + "HourFormatNeg": "−%02d:%02d" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/sw.json b/src/Symfony/Component/Intl/Resources/data/timezones/sw.json index fb00d95119923..579b33f4cd65c 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/sw.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/sw.json @@ -99,7 +99,7 @@ "America\/Detroit": "Saa za Mashariki (Detroit)", "America\/Dominica": "Saa za Atlantiki (Dominica)", "America\/Edmonton": "Saa za Mountain (Edmonton)", - "America\/Eirunepe": "Brazil (Eirunepe)", + "America\/Eirunepe": "Saa za Brazil (Eirunepe)", "America\/El_Salvador": "Saa za Kati (El Salvador)", "America\/Fort_Nelson": "Saa za Mountain (Fort Nelson)", "America\/Fortaleza": "Saa za Brasilia (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Saa za Atlantiki (Moncton)", "America\/Monterrey": "Saa za Kati (Monterrey)", "America\/Montevideo": "Saa za Uruguay (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Saa za Kanada (Montreal)", "America\/Montserrat": "Saa za Atlantiki (Montserrat)", "America\/Nassau": "Saa za Mashariki (Nassau)", "America\/New_York": "Saa za Mashariki (New York)", @@ -176,7 +176,7 @@ "America\/Recife": "Saa za Brasilia (Recife)", "America\/Regina": "Saa za Kati (Regina)", "America\/Resolute": "Saa za Kati (Resolute)", - "America\/Rio_Branco": "Brazil (Rio Branco)", + "America\/Rio_Branco": "Saa za Brazil (Rio Branco)", "America\/Santa_Isabel": "Saa za Mexico Kaskazini Magharibi (Santa Isabel)", "America\/Santarem": "Saa za Brasilia (Santarem)", "America\/Santiago": "Saa za Chile (Santiago)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Saa za Uarabuni (Bahrain)", "Asia\/Baku": "Saa za Azerbaijan (Baku)", "Asia\/Bangkok": "Saa za Indochina (Bangkok)", - "Asia\/Barnaul": "Urusi (Barnaul)", + "Asia\/Barnaul": "Saa za Urusi (Barnaul)", "Asia\/Beirut": "Saa za Mashariki mwa Ulaya (Beirut)", "Asia\/Bishkek": "Saa za Kyrgystan (Bishkek)", "Asia\/Brunei": "Saa za Brunei Darussalam", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Saa za Iran (Tehran)", "Asia\/Thimphu": "Saa za Bhutan (Thimphu)", "Asia\/Tokyo": "Saa za Japan (Tokyo)", - "Asia\/Tomsk": "Urusi (Tomsk)", + "Asia\/Tomsk": "Saa za Urusi (Tomsk)", "Asia\/Ulaanbaatar": "Saa za Ulan Bator (Ulaanbaatar)", - "Asia\/Urumqi": "Uchina (Urumqi)", + "Asia\/Urumqi": "Saa za Uchina (Urumqi)", "Asia\/Ust-Nera": "Saa za Vladivostok (Ust-Nera)", "Asia\/Vientiane": "Saa za Indochina (Vientiane)", "Asia\/Vladivostok": "Saa za Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Saa za Greenwich (Guernsey)", "Europe\/Helsinki": "Saa za Mashariki mwa Ulaya (Helsinki)", "Europe\/Isle_of_Man": "Saa za Greenwich (Isle of Man)", - "Europe\/Istanbul": "Uturuki (Istanbul)", + "Europe\/Istanbul": "Saa za Uturuki (Istanbul)", "Europe\/Jersey": "Saa za Greenwich (Jersey)", "Europe\/Kaliningrad": "Saa za Mashariki mwa Ulaya (Kaliningrad)", "Europe\/Kiev": "Saa za Mashariki mwa Ulaya (Kiev)", - "Europe\/Kirov": "Urusi (Kirov)", + "Europe\/Kirov": "Saa za Urusi (Kirov)", "Europe\/Lisbon": "Saa za Magharibi mwa Ulaya (Lisbon)", "Europe\/Ljubljana": "Saa za Ulaya ya Kati (Ljubljana)", "Europe\/London": "Saa za Greenwich (London)", @@ -437,10 +437,6 @@ "Pacific\/Wallis": "Saa za Wallis na Futuna" }, "Meta": { - "GmtFormat": "GMT %s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] + "GmtFormat": "GMT %s" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ta.json b/src/Symfony/Component/Intl/Resources/data/timezones/ta.json index 5f03736541511..56e2d9f5f2046 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ta.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ta.json @@ -151,7 +151,7 @@ "America\/Moncton": "அட்லாண்டிக் நேரம் (மாங்டான்)", "America\/Monterrey": "மத்திய நேரம் (மான்டெர்ரே)", "America\/Montevideo": "உருகுவே நேரம் (மான்டேவீடியோ)", - "America\/Montreal": "கனடா (Montreal)", + "America\/Montreal": "கனடா நேரம் (Montreal)", "America\/Montserrat": "அட்லாண்டிக் நேரம் (மான்செரேட்)", "America\/Nassau": "கிழக்கத்திய நேரம் (நசவ்)", "America\/New_York": "கிழக்கத்திய நேரம் (நியூயார்க்)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "அரேபிய நேரம் (பஹ்ரைன்)", "Asia\/Baku": "அசர்பைஜான் நேரம் (பாக்கூ)", "Asia\/Bangkok": "இந்தோசீன நேரம் (பாங்காக்)", - "Asia\/Barnaul": "ரஷ்யா (பார்னால்)", + "Asia\/Barnaul": "ரஷ்யா நேரம் (பார்னால்)", "Asia\/Beirut": "கிழக்கத்திய ஐரோப்பிய நேரம் (பெய்ரூட்)", "Asia\/Bishkek": "கிர்கிஸ்தான் நேரம் (பிஷ்கெக்)", "Asia\/Brunei": "புருனே டருஸ்ஸலாம் நேரம்", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ஈரான் நேரம் (டெஹ்ரான்)", "Asia\/Thimphu": "பூடான் நேரம் (திம்பு)", "Asia\/Tokyo": "ஜப்பான் நேரம் (டோக்கியோ)", - "Asia\/Tomsk": "ரஷ்யா (டாம்ஸ்க்)", + "Asia\/Tomsk": "ரஷ்யா நேரம் (டாம்ஸ்க்)", "Asia\/Ulaanbaatar": "உலன் பாடர் நேரம் (உலான்பாட்டர்)", - "Asia\/Urumqi": "சீனா (உரும்கி)", + "Asia\/Urumqi": "சீனா நேரம் (உரும்கி)", "Asia\/Ust-Nera": "விளாடிவோஸ்டோக் நேரம் (உஸ்ட்-நேரா)", "Asia\/Vientiane": "இந்தோசீன நேரம் (வியன்டியன்)", "Asia\/Vladivostok": "விளாடிவோஸ்டோக் நேரம் (விளாடிவொஸ்தோக்)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "கிரீன்விச் சராசரி நேரம் (கர்னஸே)", "Europe\/Helsinki": "கிழக்கத்திய ஐரோப்பிய நேரம் (ஹெல்சிங்கி)", "Europe\/Isle_of_Man": "கிரீன்விச் சராசரி நேரம் (ஐல் ஆஃப் மேன்)", - "Europe\/Istanbul": "துருக்கி (இஸ்தான்புல்)", + "Europe\/Istanbul": "துருக்கி நேரம் (இஸ்தான்புல்)", "Europe\/Jersey": "கிரீன்விச் சராசரி நேரம் (ஜெர்சி)", "Europe\/Kaliningrad": "கிழக்கத்திய ஐரோப்பிய நேரம் (கலினின்கிராட்)", "Europe\/Kiev": "கிழக்கத்திய ஐரோப்பிய நேரம் (கீவ்)", - "Europe\/Kirov": "ரஷ்யா (கிரோவ்)", + "Europe\/Kirov": "ரஷ்யா நேரம் (கிரோவ்)", "Europe\/Lisbon": "மேற்கத்திய ஐரோப்பிய நேரம் (லிஸ்பன்)", "Europe\/Ljubljana": "மத்திய ஐரோப்பிய நேரம் (ஜுப்லானா)", "Europe\/London": "கிரீன்விச் சராசரி நேரம் (லண்டன்)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "வேக் தீவு நேரம்", "Pacific\/Wallis": "வாலிஸ் மற்றும் ஃப்யூடுனா நேரம்" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/te.json b/src/Symfony/Component/Intl/Resources/data/timezones/te.json index ec3229811d242..af80f51195e48 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/te.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/te.json @@ -151,7 +151,7 @@ "America\/Moncton": "అట్లాంటిక్ సమయం (మోన్‌క్టోన్)", "America\/Monterrey": "మధ్యమ సమయం (మోంటెర్రే)", "America\/Montevideo": "ఉరుగ్వే సమయం (మోంటెవీడియో)", - "America\/Montreal": "కెనడా (Montreal)", + "America\/Montreal": "కెనడా సమయం (Montreal)", "America\/Montserrat": "అట్లాంటిక్ సమయం (మాంట్సెరాట్)", "America\/Nassau": "తూర్పు సమయం (నాస్సావ్)", "America\/New_York": "తూర్పు సమయం (న్యూయార్క్)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "అరేబియన్ సమయం (బహ్రెయిన్)", "Asia\/Baku": "అజర్బైజాన్ సమయం (బాకు)", "Asia\/Bangkok": "ఇండోచైనా సమయం (బ్యాంకాక్)", - "Asia\/Barnaul": "రష్యా (బార్నాల్)", + "Asia\/Barnaul": "రష్యా సమయం (బార్నాల్)", "Asia\/Beirut": "తూర్పు యూరోపియన్ సమయం (బీరట్)", "Asia\/Bishkek": "కిర్గిస్తాన్ సమయం (బిష్కెక్)", "Asia\/Brunei": "బ్రూనే దరుసలామ్ సమయం (బ్రూనై)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ఇరాన్ సమయం (టెహ్రాన్)", "Asia\/Thimphu": "భూటాన్ సమయం (థింఫు)", "Asia\/Tokyo": "జపాన్ సమయం (టోక్యో)", - "Asia\/Tomsk": "రష్యా (టామ్స్క్)", + "Asia\/Tomsk": "రష్యా సమయం (టామ్స్క్)", "Asia\/Ulaanbaatar": "ఉలన్ బతోర్ సమయం (ఉలాన్బాటర్)", - "Asia\/Urumqi": "చైనా (ఉరుమ్‌కీ)", + "Asia\/Urumqi": "చైనా సమయం (ఉరుమ్‌కీ)", "Asia\/Ust-Nera": "వ్లాడివోస్టోక్ సమయం (అస్ట్-నెరా)", "Asia\/Vientiane": "ఇండోచైనా సమయం (వియన్టైన్)", "Asia\/Vladivostok": "వ్లాడివోస్టోక్ సమయం", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "గ్రీన్‌విచ్ సగటు సమయం (గ్వెర్న్సే)", "Europe\/Helsinki": "తూర్పు యూరోపియన్ సమయం (హెల్సింకి)", "Europe\/Isle_of_Man": "గ్రీన్‌విచ్ సగటు సమయం (ఐల్ ఆఫ్ మేన్)", - "Europe\/Istanbul": "టర్కీ (ఇస్తాంబుల్)", + "Europe\/Istanbul": "టర్కీ సమయం (ఇస్తాంబుల్)", "Europe\/Jersey": "గ్రీన్‌విచ్ సగటు సమయం (జెర్సీ)", "Europe\/Kaliningrad": "తూర్పు యూరోపియన్ సమయం (కలినిన్‌గ్రద్)", "Europe\/Kiev": "తూర్పు యూరోపియన్ సమయం (కీవ్)", - "Europe\/Kirov": "రష్యా (కిరోవ్)", + "Europe\/Kirov": "రష్యా సమయం (కిరోవ్)", "Europe\/Lisbon": "పశ్చిమ యూరోపియన్ సమయం (లిస్బన్)", "Europe\/Ljubljana": "సెంట్రల్ యూరోపియన్ సమయం (ల్యూబ్ల్యానా)", "Europe\/London": "గ్రీన్‌విచ్ సగటు సమయం (లండన్)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "వేక్ దీవి సమయం", "Pacific\/Wallis": "వాలీస్ మరియు ఫుటునా సమయం (వాల్లిస్)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/tg.json b/src/Symfony/Component/Intl/Resources/data/timezones/tg.json index 0d367ef984b65..eb5447d516030 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/tg.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/tg.json @@ -432,11 +432,5 @@ "Pacific\/Wake": "Ҷазираҳои Хурди Дурдасти ИМА (Wake)", "Pacific\/Wallis": "Уоллис ва Футуна (Wallis)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/th.json b/src/Symfony/Component/Intl/Resources/data/timezones/th.json index 01466e0dfc71a..8242439a827cf 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/th.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/th.json @@ -151,7 +151,7 @@ "America\/Moncton": "เวลาแอตแลนติก (มองตัน)", "America\/Monterrey": "เวลาตอนกลางในอเมริกาเหนือ (มอนเตร์เรย์)", "America\/Montevideo": "เวลาอุรุกวัย (มอนเตวิเดโอ)", - "America\/Montreal": "แคนาดา (Montreal)", + "America\/Montreal": "เวลาแคนาดา (Montreal)", "America\/Montserrat": "เวลาแอตแลนติก (มอนเซอร์รัต)", "America\/Nassau": "เวลาทางตะวันออกในอเมริกาเหนือ (แนสซอ)", "America\/New_York": "เวลาทางตะวันออกในอเมริกาเหนือ (นิวยอร์ก)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "เวลาอาหรับ (บาห์เรน)", "Asia\/Baku": "เวลาอาเซอร์ไบจาน (บากู)", "Asia\/Bangkok": "เวลาอินโดจีน (กรุงเทพ)", - "Asia\/Barnaul": "รัสเซีย (บาร์เนาว์)", + "Asia\/Barnaul": "เวลารัสเซีย (บาร์เนาว์)", "Asia\/Beirut": "เวลายุโรปตะวันออก (เบรุต)", "Asia\/Bishkek": "เวลาคีร์กีซสถาน (บิชเคก)", "Asia\/Brunei": "เวลาบรูไนดารุสซาลาม", @@ -288,9 +288,9 @@ "Asia\/Tehran": "เวลาอิหร่าน (เตหะราน)", "Asia\/Thimphu": "เวลาภูฏาน (ทิมพู)", "Asia\/Tokyo": "เวลาญี่ปุ่น (โตเกียว)", - "Asia\/Tomsk": "รัสเซีย (ตอมสค์)", + "Asia\/Tomsk": "เวลารัสเซีย (ตอมสค์)", "Asia\/Ulaanbaatar": "เวลาอูลานบาตอร์", - "Asia\/Urumqi": "จีน (อุรุมชี)", + "Asia\/Urumqi": "เวลาจีน (อุรุมชี)", "Asia\/Ust-Nera": "เวลาวลาดีวอสตอค (อุสต์เนรา)", "Asia\/Vientiane": "เวลาอินโดจีน (เวียงจันทน์)", "Asia\/Vladivostok": "เวลาวลาดีวอสตอค (วลาดิโวสต็อก)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "เวลามาตรฐานกรีนิช (เกิร์นซีย์)", "Europe\/Helsinki": "เวลายุโรปตะวันออก (เฮลซิงกิ)", "Europe\/Isle_of_Man": "เวลามาตรฐานกรีนิช (เกาะแมน)", - "Europe\/Istanbul": "ตุรกี (อิสตันบูล)", + "Europe\/Istanbul": "เวลาตุรกี (อิสตันบูล)", "Europe\/Jersey": "เวลามาตรฐานกรีนิช (เจอร์ซีย์)", "Europe\/Kaliningrad": "เวลายุโรปตะวันออก (คาลินิงกราด)", "Europe\/Kiev": "เวลายุโรปตะวันออก (เคียฟ)", - "Europe\/Kirov": "รัสเซีย (คิรอฟ)", + "Europe\/Kirov": "เวลารัสเซีย (คิรอฟ)", "Europe\/Lisbon": "เวลายุโรปตะวันตก (ลิสบอน)", "Europe\/Ljubljana": "เวลายุโรปกลาง (ลูบลิยานา)", "Europe\/London": "เวลามาตรฐานกรีนิช (ลอนดอน)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "เวลาเกาะเวก", "Pacific\/Wallis": "เวลาวาลลิสและฟุตูนา" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ti.json b/src/Symfony/Component/Intl/Resources/data/timezones/ti.json index f232c821770d5..5d6dc02f1e564 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ti.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ti.json @@ -319,10 +319,6 @@ "Australia\/Melbourne": "አውስትሬሊያ (Melbourne)", "Australia\/Perth": "አውስትሬሊያ (Perth)", "Australia\/Sydney": "አውስትሬሊያ (Sydney)", - "CST6CDT": "CST6CDT", - "EST5EDT": "EST5EDT", - "Etc\/GMT": "GMT", - "Etc\/UTC": "UTC", "Europe\/Amsterdam": "ኔዘርላንድስ (Amsterdam)", "Europe\/Andorra": "አንዶራ (Andorra)", "Europe\/Astrakhan": "ራሺያ (Astrakhan)", @@ -394,8 +390,6 @@ "Indian\/Mauritius": "ማሩሸስ (Mauritius)", "Indian\/Mayotte": "ሜይኦቴ (Mayotte)", "Indian\/Reunion": "ሪዩኒየን (Reunion)", - "MST7MDT": "MST7MDT", - "PST8PDT": "PST8PDT", "Pacific\/Apia": "ሳሞአ (Apia)", "Pacific\/Auckland": "ኒው ዚላንድ (Auckland)", "Pacific\/Bougainville": "ፓፑዋ ኒው ጊኒ (Bougainville)", @@ -436,11 +430,5 @@ "Pacific\/Wake": "ናይ ኣሜሪካ ፍንትት ዝበሉ ደሴታት (Wake)", "Pacific\/Wallis": "ዋሊስን ፉቱናን (Wallis)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/tk.json b/src/Symfony/Component/Intl/Resources/data/timezones/tk.json index e7464fa1c44f6..5bf41ff627e2e 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/tk.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/tk.json @@ -99,7 +99,7 @@ "America\/Detroit": "Demirgazyk Amerika gündogar wagty (Detroýt)", "America\/Dominica": "Atlantik wagty (Dominika)", "America\/Edmonton": "Demirgazyk Amerika dag wagty (Edmonton)", - "America\/Eirunepe": "Braziliýa (Eýrunepe)", + "America\/Eirunepe": "Braziliýa wagty (Eýrunepe)", "America\/El_Salvador": "Merkezi Amerika (Salwador)", "America\/Fort_Nelson": "Demirgazyk Amerika dag wagty (Fort Nelson)", "America\/Fortaleza": "Braziliýa wagty (Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Atlantik wagty (Monkton)", "America\/Monterrey": "Merkezi Amerika (Monterreý)", "America\/Montevideo": "Urugwaý wagty (Montewideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Kanada wagty (Montreal)", "America\/Montserrat": "Atlantik wagty (Monserrat)", "America\/Nassau": "Demirgazyk Amerika gündogar wagty (Nassau)", "America\/New_York": "Demirgazyk Amerika gündogar wagty (Nýu-Ýork)", @@ -176,7 +176,7 @@ "America\/Recife": "Braziliýa wagty (Resifi)", "America\/Regina": "Merkezi Amerika (Rejaýna)", "America\/Resolute": "Merkezi Amerika (Rozulýut)", - "America\/Rio_Branco": "Braziliýa (Riu-Branku)", + "America\/Rio_Branco": "Braziliýa wagty (Riu-Branku)", "America\/Santa_Isabel": "Demirgazyk-günbatar Meksika wagty (Santa-Izabel)", "America\/Santarem": "Braziliýa wagty (Santarem)", "America\/Santiago": "Çili wagty (Santýago)", @@ -217,7 +217,7 @@ "Asia\/Aden": "Arap ýurtlary wagty (Aden)", "Asia\/Almaty": "Gündogar Gazagystan wagty (Almaty)", "Asia\/Amman": "Gündogar Ýewropa wagty (Amman)", - "Asia\/Anadyr": "Russiýa (Anadyr)", + "Asia\/Anadyr": "Russiýa wagty (Anadyr)", "Asia\/Aqtau": "Günbatar Gazagystan wagty (Aktau)", "Asia\/Aqtobe": "Günbatar Gazagystan wagty (Aktobe)", "Asia\/Ashgabat": "Türkmenistan wagty (Aşgabat)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Arap ýurtlary wagty (Bahreýn)", "Asia\/Baku": "Azerbaýjan wagty (Baku)", "Asia\/Bangkok": "Hindihytaý wagty (Bangkok)", - "Asia\/Barnaul": "Russiýa (Barnaul)", + "Asia\/Barnaul": "Russiýa wagty (Barnaul)", "Asia\/Beirut": "Gündogar Ýewropa wagty (Beýrut)", "Asia\/Bishkek": "Gyrgyzystan wagty (Bişkek)", "Asia\/Brunei": "Bruneý-Darussalam wagty", @@ -249,7 +249,7 @@ "Asia\/Jayapura": "Gündogar Indoneziýa wagty (Jaýapura)", "Asia\/Jerusalem": "Ysraýyl wagty (Iýerusalim)", "Asia\/Kabul": "Owganystan wagty (Kabul)", - "Asia\/Kamchatka": "Russiýa (Kamçatka)", + "Asia\/Kamchatka": "Russiýa wagty (Kamçatka)", "Asia\/Karachi": "Pakistan wagty (Karaçi)", "Asia\/Katmandu": "Nepal wagty (Katmandu)", "Asia\/Khandyga": "Ýakutsk wagty (Handyga)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Eýran wagty (Tähran)", "Asia\/Thimphu": "Butan wagty (Timpu)", "Asia\/Tokyo": "Ýaponiýa wagty (Tokio)", - "Asia\/Tomsk": "Russiýa (Tomsk)", + "Asia\/Tomsk": "Russiýa wagty (Tomsk)", "Asia\/Ulaanbaatar": "Ulan-Bator wagty", - "Asia\/Urumqi": "Hytaý (Urumçi)", + "Asia\/Urumqi": "Hytaý wagty (Urumçi)", "Asia\/Ust-Nera": "Wladiwostok wagty (Ust-Nera)", "Asia\/Vientiane": "Hindihytaý wagty (Wýentýan)", "Asia\/Vladivostok": "Wladiwostok wagty", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Grinwiç boýunça orta wagt (Gernsi)", "Europe\/Helsinki": "Gündogar Ýewropa wagty (Helsinki)", "Europe\/Isle_of_Man": "Grinwiç boýunça orta wagt (Men adasy)", - "Europe\/Istanbul": "Türkiýe (Stambul)", + "Europe\/Istanbul": "Türkiýe wagty (Stambul)", "Europe\/Jersey": "Grinwiç boýunça orta wagt (Jersi)", "Europe\/Kaliningrad": "Gündogar Ýewropa wagty (Kaliningrad)", "Europe\/Kiev": "Gündogar Ýewropa wagty (Kiýew)", - "Europe\/Kirov": "Russiýa (Kirow)", + "Europe\/Kirov": "Russiýa wagty (Kirow)", "Europe\/Lisbon": "Günbatar Ýewropa wagty (Lissabon)", "Europe\/Ljubljana": "Merkezi Ýewropa wagty (Lýublýana)", "Europe\/London": "Grinwiç boýunça orta wagt (London)", @@ -362,7 +362,7 @@ "Europe\/Prague": "Merkezi Ýewropa wagty (Praga)", "Europe\/Riga": "Gündogar Ýewropa wagty (Riga)", "Europe\/Rome": "Merkezi Ýewropa wagty (Rim)", - "Europe\/Samara": "Russiýa (Samara)", + "Europe\/Samara": "Russiýa wagty (Samara)", "Europe\/San_Marino": "Merkezi Ýewropa wagty (San-Marino)", "Europe\/Sarajevo": "Merkezi Ýewropa wagty (Saraýewo)", "Europe\/Saratov": "Moskwa wagty (Saratow)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Weýk adasy wagty", "Pacific\/Wallis": "Uollis we Futuna wagty" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/tl.json b/src/Symfony/Component/Intl/Resources/data/timezones/tl.json deleted file mode 100644 index 56bb247014e93..0000000000000 --- a/src/Symfony/Component/Intl/Resources/data/timezones/tl.json +++ /dev/null @@ -1,446 +0,0 @@ -{ - "Version": "2.1.49.82", - "Names": { - "Africa\/Abidjan": "Greenwich Mean Time (Abidjan)", - "Africa\/Accra": "Greenwich Mean Time (Accra)", - "Africa\/Addis_Ababa": "Oras sa Silangang Africa (Addis Ababa)", - "Africa\/Algiers": "Oras sa Gitnang Europe (Algiers)", - "Africa\/Asmera": "Oras sa Silangang Africa (Asmara)", - "Africa\/Bamako": "Greenwich Mean Time (Bamako)", - "Africa\/Bangui": "Oras sa Kanlurang Africa (Bangui)", - "Africa\/Banjul": "Greenwich Mean Time (Banjul)", - "Africa\/Bissau": "Greenwich Mean Time (Bissau)", - "Africa\/Blantyre": "Oras sa Gitnang Africa (Blantyre)", - "Africa\/Brazzaville": "Oras sa Kanlurang Africa (Brazzaville)", - "Africa\/Bujumbura": "Oras sa Gitnang Africa (Bujumbura)", - "Africa\/Cairo": "Oras sa Silangang Europe (Cairo)", - "Africa\/Casablanca": "Oras sa Kanlurang Europe (Casablanca)", - "Africa\/Ceuta": "Oras sa Gitnang Europe (Ceuta)", - "Africa\/Conakry": "Greenwich Mean Time (Conakry)", - "Africa\/Dakar": "Greenwich Mean Time (Dakar)", - "Africa\/Dar_es_Salaam": "Oras sa Silangang Africa (Dar es Salaam)", - "Africa\/Djibouti": "Oras sa Silangang Africa (Djibouti)", - "Africa\/Douala": "Oras sa Kanlurang Africa (Douala)", - "Africa\/El_Aaiun": "Oras sa Kanlurang Europe (El Aaiun)", - "Africa\/Freetown": "Greenwich Mean Time (Freetown)", - "Africa\/Gaborone": "Oras sa Gitnang Africa (Gaborone)", - "Africa\/Harare": "Oras sa Gitnang Africa (Harare)", - "Africa\/Johannesburg": "Oras sa Timog Africa (Johannesburg)", - "Africa\/Juba": "Oras sa Silangang Africa (Juba)", - "Africa\/Kampala": "Oras sa Silangang Africa (Kampala)", - "Africa\/Khartoum": "Oras sa Gitnang Africa (Khartoum)", - "Africa\/Kigali": "Oras sa Gitnang Africa (Kigali)", - "Africa\/Kinshasa": "Oras sa Kanlurang Africa (Kinshasa)", - "Africa\/Lagos": "Oras sa Kanlurang Africa (Lagos)", - "Africa\/Libreville": "Oras sa Kanlurang Africa (Libreville)", - "Africa\/Lome": "Greenwich Mean Time (Lome)", - "Africa\/Luanda": "Oras sa Kanlurang Africa (Luanda)", - "Africa\/Lubumbashi": "Oras sa Gitnang Africa (Lubumbashi)", - "Africa\/Lusaka": "Oras sa Gitnang Africa (Lusaka)", - "Africa\/Malabo": "Oras sa Kanlurang Africa (Malabo)", - "Africa\/Maputo": "Oras sa Gitnang Africa (Maputo)", - "Africa\/Maseru": "Oras sa Timog Africa (Maseru)", - "Africa\/Mbabane": "Oras sa Timog Africa (Mbabane)", - "Africa\/Mogadishu": "Oras sa Silangang Africa (Mogadishu)", - "Africa\/Monrovia": "Greenwich Mean Time (Monrovia)", - "Africa\/Nairobi": "Oras sa Silangang Africa (Nairobi)", - "Africa\/Ndjamena": "Oras sa Kanlurang Africa (Ndjamena)", - "Africa\/Niamey": "Oras sa Kanlurang Africa (Niamey)", - "Africa\/Nouakchott": "Greenwich Mean Time (Nouakchott)", - "Africa\/Ouagadougou": "Greenwich Mean Time (Ouagadougou)", - "Africa\/Porto-Novo": "Oras sa Kanlurang Africa (Porto-Novo)", - "Africa\/Sao_Tome": "Greenwich Mean Time (Sao Tome)", - "Africa\/Tripoli": "Oras sa Silangang Europe (Tripoli)", - "Africa\/Tunis": "Oras sa Gitnang Europe (Tunis)", - "Africa\/Windhoek": "Oras sa Gitnang Africa (Windhoek)", - "America\/Adak": "Oras sa Hawaii-Aleutian (Adak)", - "America\/Anchorage": "Oras sa Alaska (Anchorage)", - "America\/Anguilla": "Oras sa Atlantiko (Anguilla)", - "America\/Antigua": "Oras sa Atlantiko (Antigua)", - "America\/Araguaina": "Oras sa Brasilia (Araguaina)", - "America\/Argentina\/La_Rioja": "Oras sa Argentina (La Rioja)", - "America\/Argentina\/Rio_Gallegos": "Oras sa Argentina (Rio Gallegos)", - "America\/Argentina\/Salta": "Oras sa Argentina (Salta)", - "America\/Argentina\/San_Juan": "Oras sa Argentina (San Juan)", - "America\/Argentina\/San_Luis": "Oras sa Kanlurang Argentina (San Luis)", - "America\/Argentina\/Tucuman": "Oras sa Argentina (Tucuman)", - "America\/Argentina\/Ushuaia": "Oras sa Argentina (Ushuaia)", - "America\/Aruba": "Oras sa Atlantiko (Aruba)", - "America\/Asuncion": "Oras sa Paraguay (Asunción)", - "America\/Bahia": "Oras sa Brasilia (Bahia)", - "America\/Bahia_Banderas": "Sentral na Oras (Bahia Banderas)", - "America\/Barbados": "Oras sa Atlantiko (Barbados)", - "America\/Belem": "Oras sa Brasilia (Belem)", - "America\/Belize": "Sentral na Oras (Belize)", - "America\/Blanc-Sablon": "Oras sa Atlantiko (Blanc-Sablon)", - "America\/Boa_Vista": "Oras sa Amazon (Boa Vista)", - "America\/Bogota": "Oras sa Colombia (Bogota)", - "America\/Boise": "Oras sa Bundok (Boise)", - "America\/Buenos_Aires": "Oras sa Argentina (Buenos Aires)", - "America\/Cambridge_Bay": "Oras sa Bundok (Cambridge Bay)", - "America\/Campo_Grande": "Oras sa Amazon (Campo Grande)", - "America\/Cancun": "Eastern Time (Cancun)", - "America\/Caracas": "Oras sa Venezuela (Caracas)", - "America\/Catamarca": "Oras sa Argentina (Catamarca)", - "America\/Cayenne": "Oras sa French Guiana (Cayenne)", - "America\/Cayman": "Eastern Time (Cayman)", - "America\/Chicago": "Sentral na Oras (Chicago)", - "America\/Chihuahua": "Oras sa Pasipiko ng Mexico (Chihuahua)", - "America\/Coral_Harbour": "Eastern Time (Atikokan)", - "America\/Cordoba": "Oras sa Argentina (Cordoba)", - "America\/Costa_Rica": "Sentral na Oras (Costa Rica)", - "America\/Creston": "Oras sa Bundok (Creston)", - "America\/Cuiaba": "Oras sa Amazon (Cuiaba)", - "America\/Curacao": "Oras sa Atlantiko (Curacao)", - "America\/Danmarkshavn": "Greenwich Mean Time (Danmarkshavn)", - "America\/Dawson": "Oras sa Pasipiko (Dawson)", - "America\/Dawson_Creek": "Oras sa Bundok (Dawson Creek)", - "America\/Denver": "Oras sa Bundok (Denver)", - "America\/Detroit": "Eastern Time (Detroit)", - "America\/Dominica": "Oras sa Atlantiko (Dominica)", - "America\/Edmonton": "Oras sa Bundok (Edmonton)", - "America\/Eirunepe": "Brazil (Eirunepe)", - "America\/El_Salvador": "Sentral na Oras (El Salvador)", - "America\/Fort_Nelson": "Oras sa Bundok (Fort Nelson)", - "America\/Fortaleza": "Oras sa Brasilia (Fortaleza)", - "America\/Glace_Bay": "Oras sa Atlantiko (Glace Bay)", - "America\/Godthab": "Oras sa Kanlurang Greenland (Nuuk)", - "America\/Goose_Bay": "Oras sa Atlantiko (Goose Bay)", - "America\/Grand_Turk": "Eastern Time (Grand Turk)", - "America\/Grenada": "Oras sa Atlantiko (Grenada)", - "America\/Guadeloupe": "Oras sa Atlantiko (Guadeloupe)", - "America\/Guatemala": "Sentral na Oras (Guatemala)", - "America\/Guayaquil": "Oras sa Ecuador (Guayaquil)", - "America\/Guyana": "Oras sa Guyana", - "America\/Halifax": "Oras sa Atlantiko (Halifax)", - "America\/Havana": "Oras sa Cuba (Havana)", - "America\/Hermosillo": "Oras sa Pasipiko ng Mexico (Hermosillo)", - "America\/Indiana\/Knox": "Sentral na Oras (Knox, Indiana)", - "America\/Indiana\/Marengo": "Eastern Time (Marengo, Indiana)", - "America\/Indiana\/Petersburg": "Eastern Time (Petersburg, Indiana)", - "America\/Indiana\/Tell_City": "Sentral na Oras (Tell City, Indiana)", - "America\/Indiana\/Vevay": "Eastern Time (Vevay, Indiana)", - "America\/Indiana\/Vincennes": "Eastern Time (Vincennes, Indiana)", - "America\/Indiana\/Winamac": "Eastern Time (Winamac, Indiana)", - "America\/Indianapolis": "Eastern Time (Indianapolis)", - "America\/Inuvik": "Oras sa Bundok (Inuvik)", - "America\/Iqaluit": "Eastern Time (Iqaluit)", - "America\/Jamaica": "Eastern Time (Jamaica)", - "America\/Jujuy": "Oras sa Argentina (Jujuy)", - "America\/Juneau": "Oras sa Alaska (Juneau)", - "America\/Kentucky\/Monticello": "Eastern Time (Monticello, Kentucky)", - "America\/Kralendijk": "Oras sa Atlantiko (Kralendijk)", - "America\/La_Paz": "Oras sa Bolivia (La Paz)", - "America\/Lima": "Oras sa Peru (Lima)", - "America\/Los_Angeles": "Oras sa Pasipiko (Los Angeles)", - "America\/Louisville": "Eastern Time (Louisville)", - "America\/Lower_Princes": "Oras sa Atlantiko (Lower Prince’s Quarter)", - "America\/Maceio": "Oras sa Brasilia (Maceio)", - "America\/Managua": "Sentral na Oras (Managua)", - "America\/Manaus": "Oras sa Amazon (Manaus)", - "America\/Marigot": "Oras sa Atlantiko (Marigot)", - "America\/Martinique": "Oras sa Atlantiko (Martinique)", - "America\/Matamoros": "Sentral na Oras (Matamoros)", - "America\/Mazatlan": "Oras sa Pasipiko ng Mexico (Mazatlan)", - "America\/Mendoza": "Oras sa Argentina (Mendoza)", - "America\/Menominee": "Sentral na Oras (Menominee)", - "America\/Merida": "Sentral na Oras (Merida)", - "America\/Metlakatla": "Oras sa Alaska (Metlakatla)", - "America\/Mexico_City": "Sentral na Oras (Lungsod ng Mexico)", - "America\/Miquelon": "Oras sa Saint Pierre & Miquelon", - "America\/Moncton": "Oras sa Atlantiko (Moncton)", - "America\/Monterrey": "Sentral na Oras (Monterrey)", - "America\/Montevideo": "Oras sa Uruguay (Montevideo)", - "America\/Montreal": "Canada (Montreal)", - "America\/Montserrat": "Oras sa Atlantiko (Montserrat)", - "America\/Nassau": "Eastern Time (Nassau)", - "America\/New_York": "Eastern Time (New York)", - "America\/Nipigon": "Eastern Time (Nipigon)", - "America\/Nome": "Oras sa Alaska (Nome)", - "America\/Noronha": "Oras sa Fernando de Noronha", - "America\/North_Dakota\/Beulah": "Sentral na Oras (Beulah, North Dakota)", - "America\/North_Dakota\/Center": "Sentral na Oras (Center, North Dakota)", - "America\/North_Dakota\/New_Salem": "Sentral na Oras (New Salem, North Dakota)", - "America\/Ojinaga": "Oras sa Bundok (Ojinaga)", - "America\/Panama": "Eastern Time (Panama)", - "America\/Pangnirtung": "Eastern Time (Pangnirtung)", - "America\/Paramaribo": "Oras sa Suriname (Paramaribo)", - "America\/Phoenix": "Oras sa Bundok (Phoenix)", - "America\/Port-au-Prince": "Eastern Time (Port-au-Prince)", - "America\/Port_of_Spain": "Oras sa Atlantiko (Puwerto ng Espanya)", - "America\/Porto_Velho": "Oras sa Amazon (Porto Velho)", - "America\/Puerto_Rico": "Oras sa Atlantiko (Puerto Rico)", - "America\/Punta_Arenas": "Oras sa Chile (Punta Arenas)", - "America\/Rainy_River": "Sentral na Oras (Rainy River)", - "America\/Rankin_Inlet": "Sentral na Oras (Makipot na Look ng Rankin)", - "America\/Recife": "Oras sa Brasilia (Recife)", - "America\/Regina": "Sentral na Oras (Regina)", - "America\/Resolute": "Sentral na Oras (Resolute)", - "America\/Rio_Branco": "Brazil (Rio Branco)", - "America\/Santa_Isabel": "Oras sa Hilagang-kanlurang Mexico (Santa Isabel)", - "America\/Santarem": "Oras sa Brasilia (Santarem)", - "America\/Santiago": "Oras sa Chile (Santiago)", - "America\/Santo_Domingo": "Oras sa Atlantiko (Santo Domingo)", - "America\/Sao_Paulo": "Oras sa Brasilia (Sao Paulo)", - "America\/Scoresbysund": "Oras sa Silangang Greenland (Ittoqqortoormiit)", - "America\/Sitka": "Oras sa Alaska (Sitka)", - "America\/St_Barthelemy": "Oras sa Atlantiko (St. Barthélemy)", - "America\/St_Johns": "Oras sa Newfoundland (St. John’s)", - "America\/St_Kitts": "Oras sa Atlantiko (St. Kitts)", - "America\/St_Lucia": "Oras sa Atlantiko (St. Lucia)", - "America\/St_Thomas": "Oras sa Atlantiko (St. Thomas)", - "America\/St_Vincent": "Oras sa Atlantiko (St. Vincent)", - "America\/Swift_Current": "Sentral na Oras (Swift Current)", - "America\/Tegucigalpa": "Sentral na Oras (Tegucigalpa)", - "America\/Thule": "Oras sa Atlantiko (Thule)", - "America\/Thunder_Bay": "Eastern Time (Thunder Bay)", - "America\/Tijuana": "Oras sa Pasipiko (Tijuana)", - "America\/Toronto": "Eastern Time (Toronto)", - "America\/Tortola": "Oras sa Atlantiko (Tortola)", - "America\/Vancouver": "Oras sa Pasipiko (Vancouver)", - "America\/Whitehorse": "Oras sa Pasipiko (Whitehorse)", - "America\/Winnipeg": "Sentral na Oras (Winnipeg)", - "America\/Yakutat": "Oras sa Alaska (Yakutat)", - "America\/Yellowknife": "Oras sa Bundok (Yellowknife)", - "Antarctica\/Casey": "Oras sa Kanlurang Australya (Casey)", - "Antarctica\/Davis": "Oras sa Davis", - "Antarctica\/DumontDUrville": "Oras sa Dumont-d’Urville", - "Antarctica\/Macquarie": "Oras sa Macquarie Island", - "Antarctica\/Mawson": "Oras sa Mawson", - "Antarctica\/McMurdo": "Oras sa New Zealand (McMurdo)", - "Antarctica\/Palmer": "Oras sa Chile (Palmer)", - "Antarctica\/Rothera": "Oras sa Rothera", - "Antarctica\/Syowa": "Oras sa Syowa", - "Antarctica\/Troll": "Greenwich Mean Time (Troll)", - "Antarctica\/Vostok": "Oras sa Vostok", - "Arctic\/Longyearbyen": "Oras sa Gitnang Europe (Longyearbyen)", - "Asia\/Aden": "Oras sa Arabia (Aden)", - "Asia\/Almaty": "Oras sa Silangang Kazakhstan (Almaty)", - "Asia\/Amman": "Oras sa Silangang Europe (Amman)", - "Asia\/Anadyr": "Oras sa Anadyr", - "Asia\/Aqtau": "Oras sa Kanlurang Kazakhstan (Aqtau)", - "Asia\/Aqtobe": "Oras sa Kanlurang Kazakhstan (Aqtobe)", - "Asia\/Ashgabat": "Oras sa Turkmenistan (Ashgabat)", - "Asia\/Atyrau": "Oras sa Kanlurang Kazakhstan (Atyrau)", - "Asia\/Baghdad": "Oras sa Arabia (Baghdad)", - "Asia\/Bahrain": "Oras sa Arabia (Bahrain)", - "Asia\/Baku": "Oras sa Azerbaijan (Baku)", - "Asia\/Bangkok": "Oras sa Indochina (Bangkok)", - "Asia\/Barnaul": "Russia (Barnaul)", - "Asia\/Beirut": "Oras sa Silangang Europe (Beirut)", - "Asia\/Bishkek": "Oras sa Kyrgystan (Bishkek)", - "Asia\/Brunei": "Oras sa Brunei Darussalam", - "Asia\/Calcutta": "Standard na Oras sa Bhutan (Kolkata)", - "Asia\/Chita": "Oras sa Yakutsk (Chita)", - "Asia\/Choibalsan": "Oras sa Choibalsan", - "Asia\/Colombo": "Standard na Oras sa Bhutan (Colombo)", - "Asia\/Damascus": "Oras sa Silangang Europe (Damascus)", - "Asia\/Dhaka": "Oras sa Bangladesh (Dhaka)", - "Asia\/Dili": "Oras sa East Timor (Dili)", - "Asia\/Dubai": "Oras sa Gulf (Dubai)", - "Asia\/Dushanbe": "Oras sa Tajikistan (Dushanbe)", - "Asia\/Famagusta": "Oras sa Silangang Europe (Famagusta)", - "Asia\/Gaza": "Oras sa Silangang Europe (Gaza)", - "Asia\/Hebron": "Oras sa Silangang Europe (Hebron)", - "Asia\/Hong_Kong": "Oras sa Hong Kong", - "Asia\/Hovd": "Oras sa Hovd", - "Asia\/Irkutsk": "Oras sa Irkutsk", - "Asia\/Jakarta": "Oras sa Kanlurang Indonesia (Jakarta)", - "Asia\/Jayapura": "Oras sa Silangang Indonesia (Jayapura)", - "Asia\/Jerusalem": "Oras sa Israel (Jerusalem)", - "Asia\/Kabul": "Oras sa Afghanistan (Kabul)", - "Asia\/Kamchatka": "Oras sa Petropavlovsk-Kamchatski (Kamchatka)", - "Asia\/Karachi": "Oras sa Pakistan (Karachi)", - "Asia\/Katmandu": "Oras sa Nepal (Kathmandu)", - "Asia\/Khandyga": "Oras sa Yakutsk (Khandyga)", - "Asia\/Krasnoyarsk": "Oras sa Krasnoyarsk", - "Asia\/Kuala_Lumpur": "Oras sa Malaysia (Kuala Lumpur)", - "Asia\/Kuching": "Oras sa Malaysia (Kuching)", - "Asia\/Kuwait": "Oras sa Arabia (Kuwait)", - "Asia\/Macau": "Oras sa China (Macau)", - "Asia\/Magadan": "Oras sa Magadan", - "Asia\/Makassar": "Oras sa Gitnang Indonesia (Makassar)", - "Asia\/Manila": "Oras sa Pilipinas (Manila)", - "Asia\/Muscat": "Oras sa Gulf (Muscat)", - "Asia\/Nicosia": "Oras sa Silangang Europe (Nicosia)", - "Asia\/Novokuznetsk": "Oras sa Krasnoyarsk (Novokuznetsk)", - "Asia\/Novosibirsk": "Oras sa Novosibirsk", - "Asia\/Omsk": "Oras sa Omsk", - "Asia\/Oral": "Oras sa Kanlurang Kazakhstan (Oral)", - "Asia\/Phnom_Penh": "Oras sa Indochina (Phnom Penh)", - "Asia\/Pontianak": "Oras sa Kanlurang Indonesia (Pontianak)", - "Asia\/Pyongyang": "Oras sa Korea (Pyongyang)", - "Asia\/Qatar": "Oras sa Arabia (Qatar)", - "Asia\/Qostanay": "Oras sa Silangang Kazakhstan (Kostanay)", - "Asia\/Qyzylorda": "Oras sa Kanlurang Kazakhstan (Qyzylorda)", - "Asia\/Rangoon": "Oras sa Myanmar (Rangoon)", - "Asia\/Riyadh": "Oras sa Arabia (Riyadh)", - "Asia\/Saigon": "Oras sa Indochina (Lungsod ng Ho Chi Minh)", - "Asia\/Sakhalin": "Oras sa Sakhalin", - "Asia\/Samarkand": "Oras sa Uzbekistan (Samarkand)", - "Asia\/Seoul": "Oras sa Korea (Seoul)", - "Asia\/Shanghai": "Oras sa China (Shanghai)", - "Asia\/Singapore": "Standard na Oras sa Singapore", - "Asia\/Srednekolymsk": "Oras sa Magadan (Srednekolymsk)", - "Asia\/Taipei": "Oras sa Taipei", - "Asia\/Tashkent": "Oras sa Uzbekistan (Tashkent)", - "Asia\/Tbilisi": "Oras sa Georgia (Tbilisi)", - "Asia\/Tehran": "Oras sa Iran (Tehran)", - "Asia\/Thimphu": "Oras sa Bhutan (Thimphu)", - "Asia\/Tokyo": "Oras sa Japan (Tokyo)", - "Asia\/Tomsk": "Russia (Tomsk)", - "Asia\/Ulaanbaatar": "Oras sa Ulan Bator (Ulaanbaatar)", - "Asia\/Urumqi": "China (Urumqi)", - "Asia\/Ust-Nera": "Oras sa Vladivostok (Ust-Nera)", - "Asia\/Vientiane": "Oras sa Indochina (Vientiane)", - "Asia\/Vladivostok": "Oras sa Vladivostok", - "Asia\/Yakutsk": "Oras sa Yakutsk", - "Asia\/Yekaterinburg": "Oras sa Yekaterinburg", - "Asia\/Yerevan": "Oras sa Armenia (Yerevan)", - "Atlantic\/Azores": "Oras sa Azores", - "Atlantic\/Bermuda": "Oras sa Atlantiko (Bermuda)", - "Atlantic\/Canary": "Oras sa Kanlurang Europe (Canary)", - "Atlantic\/Cape_Verde": "Oras sa Cape Verde", - "Atlantic\/Faeroe": "Oras sa Kanlurang Europe (Faroe)", - "Atlantic\/Madeira": "Oras sa Kanlurang Europe (Madeira)", - "Atlantic\/Reykjavik": "Greenwich Mean Time (Reykjavik)", - "Atlantic\/South_Georgia": "Oras sa Timog Georgia (South Georgia)", - "Atlantic\/St_Helena": "Greenwich Mean Time (St. Helena)", - "Atlantic\/Stanley": "Oras sa Falkland Islands (Stanley)", - "Australia\/Adelaide": "Oras sa Gitnang Australya (Adelaide)", - "Australia\/Brisbane": "Oras sa Silangang Australya (Brisbane)", - "Australia\/Broken_Hill": "Oras sa Gitnang Australya (Broken Hill)", - "Australia\/Currie": "Oras sa Silangang Australya (Currie)", - "Australia\/Darwin": "Oras sa Gitnang Australya (Darwin)", - "Australia\/Eucla": "Oras ng Gitnang Kanluran ng Australya (Eucla)", - "Australia\/Hobart": "Oras sa Silangang Australya (Hobart)", - "Australia\/Lindeman": "Oras sa Silangang Australya (Lindeman)", - "Australia\/Lord_Howe": "Oras sa Lord Howe", - "Australia\/Melbourne": "Oras sa Silangang Australya (Melbourne)", - "Australia\/Perth": "Oras sa Kanlurang Australya (Perth)", - "Australia\/Sydney": "Oras sa Silangang Australya (Sydney)", - "CST6CDT": "Sentral na Oras", - "EST5EDT": "Eastern Time", - "Etc\/GMT": "Greenwich Mean Time", - "Etc\/UTC": "Coordinated Universal Time", - "Europe\/Amsterdam": "Oras sa Gitnang Europe (Amsterdam)", - "Europe\/Andorra": "Oras sa Gitnang Europe (Andorra)", - "Europe\/Astrakhan": "Oras sa Moscow (Astrakhan)", - "Europe\/Athens": "Oras sa Silangang Europe (Athens)", - "Europe\/Belgrade": "Oras sa Gitnang Europe (Belgrade)", - "Europe\/Berlin": "Oras sa Gitnang Europe (Berlin)", - "Europe\/Bratislava": "Oras sa Gitnang Europe (Bratislava)", - "Europe\/Brussels": "Oras sa Gitnang Europe (Brussels)", - "Europe\/Bucharest": "Oras sa Silangang Europe (Bucharest)", - "Europe\/Budapest": "Oras sa Gitnang Europe (Budapest)", - "Europe\/Busingen": "Oras sa Gitnang Europe (Busingen)", - "Europe\/Chisinau": "Oras sa Silangang Europe (Chisinau)", - "Europe\/Copenhagen": "Oras sa Gitnang Europe (Copenhagen)", - "Europe\/Dublin": "Greenwich Mean Time (Dublin)", - "Europe\/Gibraltar": "Oras sa Gitnang Europe (Gibraltar)", - "Europe\/Guernsey": "Greenwich Mean Time (Guernsey)", - "Europe\/Helsinki": "Oras sa Silangang Europe (Helsinki)", - "Europe\/Isle_of_Man": "Greenwich Mean Time (Isle of Man)", - "Europe\/Istanbul": "Turkey (Istanbul)", - "Europe\/Jersey": "Greenwich Mean Time (Jersey)", - "Europe\/Kaliningrad": "Oras sa Silangang Europe (Kaliningrad)", - "Europe\/Kiev": "Oras sa Silangang Europe (Kiev)", - "Europe\/Kirov": "Russia (Kirov)", - "Europe\/Lisbon": "Oras sa Kanlurang Europe (Lisbon)", - "Europe\/Ljubljana": "Oras sa Gitnang Europe (Ljubljana)", - "Europe\/London": "Greenwich Mean Time (London)", - "Europe\/Luxembourg": "Oras sa Gitnang Europe (Luxembourg)", - "Europe\/Madrid": "Oras sa Gitnang Europe (Madrid)", - "Europe\/Malta": "Oras sa Gitnang Europe (Malta)", - "Europe\/Mariehamn": "Oras sa Silangang Europe (Mariehamn)", - "Europe\/Minsk": "Oras sa Moscow (Minsk)", - "Europe\/Monaco": "Oras sa Gitnang Europe (Monaco)", - "Europe\/Moscow": "Oras sa Moscow", - "Europe\/Oslo": "Oras sa Gitnang Europe (Oslo)", - "Europe\/Paris": "Oras sa Gitnang Europe (Paris)", - "Europe\/Podgorica": "Oras sa Gitnang Europe (Podgorica)", - "Europe\/Prague": "Oras sa Gitnang Europe (Prague)", - "Europe\/Riga": "Oras sa Silangang Europe (Riga)", - "Europe\/Rome": "Oras sa Gitnang Europe (Rome)", - "Europe\/Samara": "Oras sa Samara", - "Europe\/San_Marino": "Oras sa Gitnang Europe (San Marino)", - "Europe\/Sarajevo": "Oras sa Gitnang Europe (Sarajevo)", - "Europe\/Saratov": "Oras sa Moscow (Saratov)", - "Europe\/Simferopol": "Oras sa Moscow (Simferopol)", - "Europe\/Skopje": "Oras sa Gitnang Europe (Skopje)", - "Europe\/Sofia": "Oras sa Silangang Europe (Sofia)", - "Europe\/Stockholm": "Oras sa Gitnang Europe (Stockholm)", - "Europe\/Tallinn": "Oras sa Silangang Europe (Tallinn)", - "Europe\/Tirane": "Oras sa Gitnang Europe (Tirane)", - "Europe\/Ulyanovsk": "Oras sa Moscow (Ulyanovsk)", - "Europe\/Uzhgorod": "Oras sa Silangang Europe (Uzhgorod)", - "Europe\/Vaduz": "Oras sa Gitnang Europe (Vaduz)", - "Europe\/Vatican": "Oras sa Gitnang Europe (Vatican)", - "Europe\/Vienna": "Oras sa Gitnang Europe (Vienna)", - "Europe\/Vilnius": "Oras sa Silangang Europe (Vilnius)", - "Europe\/Volgograd": "Oras sa Volgograd", - "Europe\/Warsaw": "Oras sa Gitnang Europe (Warsaw)", - "Europe\/Zagreb": "Oras sa Gitnang Europe (Zagreb)", - "Europe\/Zaporozhye": "Oras sa Silangang Europe (Zaporozhye)", - "Europe\/Zurich": "Oras sa Gitnang Europe (Zurich)", - "Indian\/Antananarivo": "Oras sa Silangang Africa (Antananarivo)", - "Indian\/Chagos": "Oras sa Indian Ocean (Chagos)", - "Indian\/Christmas": "Oras sa Christmas Island", - "Indian\/Cocos": "Oras sa Cocos Islands", - "Indian\/Comoro": "Oras sa Silangang Africa (Comoro)", - "Indian\/Kerguelen": "Oras sa Katimugang France at Antartiko (Kerguelen)", - "Indian\/Mahe": "Oras sa Seychelles (Mahe)", - "Indian\/Maldives": "Oras sa Maldives", - "Indian\/Mauritius": "Oras sa Mauritius", - "Indian\/Mayotte": "Oras sa Silangang Africa (Mayotte)", - "Indian\/Reunion": "Oras sa Reunion (Réunion)", - "MST7MDT": "Oras sa Bundok", - "PST8PDT": "Oras sa Pasipiko", - "Pacific\/Apia": "Oras sa Apia", - "Pacific\/Auckland": "Oras sa New Zealand (Auckland)", - "Pacific\/Bougainville": "Oras sa Papua New Guinea (Bougainville)", - "Pacific\/Chatham": "Oras sa Chatham", - "Pacific\/Easter": "Oras sa Easter Island", - "Pacific\/Efate": "Oras sa Vanuatu (Efate)", - "Pacific\/Enderbury": "Oras sa Phoenix Islands (Enderbury)", - "Pacific\/Fakaofo": "Oras sa Tokelau (Fakaofo)", - "Pacific\/Fiji": "Oras sa Fiji", - "Pacific\/Funafuti": "Oras sa Tuvalu (Funafuti)", - "Pacific\/Galapagos": "Oras sa Galapagos", - "Pacific\/Gambier": "Oras sa Gambier", - "Pacific\/Guadalcanal": "Oras sa Solomon Islands (Guadalcanal)", - "Pacific\/Guam": "Standard na Oras sa Chamorro (Guam)", - "Pacific\/Honolulu": "Oras sa Hawaii-Aleutian (Honolulu)", - "Pacific\/Johnston": "Oras sa Hawaii-Aleutian (Johnston)", - "Pacific\/Kiritimati": "Oras sa Line Islands (Kiritimati)", - "Pacific\/Kosrae": "Oras sa Kosrae", - "Pacific\/Kwajalein": "Oras sa Marshall Islands (Kwajalein)", - "Pacific\/Majuro": "Oras sa Marshall Islands (Majuro)", - "Pacific\/Marquesas": "Oras sa Marquesas", - "Pacific\/Midway": "Oras sa Samoa (Midway)", - "Pacific\/Nauru": "Oras sa Nauru", - "Pacific\/Niue": "Oras sa Niue", - "Pacific\/Norfolk": "Oras sa Norfolk Island", - "Pacific\/Noumea": "Oras sa New Caledonia (Noumea)", - "Pacific\/Pago_Pago": "Oras sa Samoa (Pago Pago)", - "Pacific\/Palau": "Oras sa Palau", - "Pacific\/Pitcairn": "Oras sa Pitcairn", - "Pacific\/Ponape": "Oras sa Ponape (Pohnpei)", - "Pacific\/Port_Moresby": "Oras sa Papua New Guinea (Port Moresby)", - "Pacific\/Rarotonga": "Oras sa Cook Islands (Rarotonga)", - "Pacific\/Saipan": "Standard na Oras sa Chamorro (Saipan)", - "Pacific\/Tahiti": "Oras sa Tahiti", - "Pacific\/Tarawa": "Oras sa Gilbert Islands (Tarawa)", - "Pacific\/Tongatapu": "Oras sa Tonga (Tongatapu)", - "Pacific\/Truk": "Oras sa Chuuk", - "Pacific\/Wake": "Oras sa Wake Island", - "Pacific\/Wallis": "Oras sa Wallis & Futuna" - }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } -} diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/to.json b/src/Symfony/Component/Intl/Resources/data/timezones/to.json index 9babd8c83b4b3..b3fa27a997556 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/to.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/to.json @@ -151,7 +151,7 @@ "America\/Moncton": "houa fakaʻamelika-tokelau ʻatalanitiki (Moncton)", "America\/Monterrey": "houa fakaʻamelika-tokelau loto (Monterrey)", "America\/Montevideo": "houa fakaʻulukuai (Montevideo)", - "America\/Montreal": "Kānata (Montreal)", + "America\/Montreal": "Taimi Kānata (Montreal)", "America\/Montserrat": "houa fakaʻamelika-tokelau ʻatalanitiki (Montserrat)", "America\/Nassau": "houa fakaʻamelika-tokelau hahake (Nassau)", "America\/New_York": "houa fakaʻamelika-tokelau hahake (Niu ʻIoke)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "houa fakaʻalepea (Bahrain)", "Asia\/Baku": "houa fakaʻasapaisani (Baku)", "Asia\/Bangkok": "houa fakaʻinitosiaina (Bangkok)", - "Asia\/Barnaul": "Lūsia (Barnaul)", + "Asia\/Barnaul": "Taimi Lūsia (Barnaul)", "Asia\/Beirut": "houa fakaʻeulope-hahake (Beirut)", "Asia\/Bishkek": "houa fakakīkisitani (Bishkek)", "Asia\/Brunei": "houa fakapulunei (Brunei)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "houa fakaʻilaani (Tehran)", "Asia\/Thimphu": "houa fakapūtani (Thimphu)", "Asia\/Tokyo": "houa fakasiapani (Tokyo)", - "Asia\/Tomsk": "Lūsia (Tomsk)", + "Asia\/Tomsk": "Taimi Lūsia (Tomsk)", "Asia\/Ulaanbaatar": "houa fakaʻulānipātā (Ulaanbaatar)", - "Asia\/Urumqi": "Siaina (Urumqi)", + "Asia\/Urumqi": "Taimi Siaina (Urumqi)", "Asia\/Ust-Nera": "houa fakalūsia-valativositoki (Ust-Nera)", "Asia\/Vientiane": "houa fakaʻinitosiaina (Vientiane)", "Asia\/Vladivostok": "houa fakalūsia-valativositoki (Vladivostok)", @@ -322,7 +322,6 @@ "CST6CDT": "houa fakaʻamelika-tokelau loto", "EST5EDT": "houa fakaʻamelika-tokelau hahake", "Etc\/GMT": "houa fakakiliniuisi mālie", - "Etc\/UTC": "UTC", "Europe\/Amsterdam": "houa fakaʻeulope-loto (Amsterdam)", "Europe\/Andorra": "houa fakaʻeulope-loto (Andorra)", "Europe\/Astrakhan": "houa fakalūsia-mosikou (Astrakhan)", @@ -341,11 +340,11 @@ "Europe\/Guernsey": "houa fakakiliniuisi mālie (Guernsey)", "Europe\/Helsinki": "houa fakaʻeulope-hahake (Helsinki)", "Europe\/Isle_of_Man": "houa fakakiliniuisi mālie (Isle of Man)", - "Europe\/Istanbul": "Toake (Istanbul)", + "Europe\/Istanbul": "Taimi Toake (Istanbul)", "Europe\/Jersey": "houa fakakiliniuisi mālie (Jersey)", "Europe\/Kaliningrad": "houa fakaʻeulope-hahake (Kaliningrad)", "Europe\/Kiev": "houa fakaʻeulope-hahake (Kiev)", - "Europe\/Kirov": "Lūsia (Kirov)", + "Europe\/Kirov": "Taimi Lūsia (Kirov)", "Europe\/Lisbon": "houa fakaʻeulope-hihifo (Lisbon)", "Europe\/Ljubljana": "houa fakaʻeulope-loto (Ljubljana)", "Europe\/London": "houa fakakiliniuisi mālie (Lonitoni)", @@ -436,11 +435,5 @@ "Pacific\/Wake": "houa fakamotuueke (Wake)", "Pacific\/Wallis": "houa fakaʻuvea mo futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/tr.json b/src/Symfony/Component/Intl/Resources/data/timezones/tr.json index b66a24250e7f4..f27f49c4b2bc3 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/tr.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/tr.json @@ -151,7 +151,7 @@ "America\/Moncton": "Atlantik Saati (Moncton)", "America\/Monterrey": "Kuzey Amerika Merkezi Saati (Monterrey)", "America\/Montevideo": "Uruguay Saati (Montevideo)", - "America\/Montreal": "Kanada (Montreal)", + "America\/Montreal": "Kanada Saati (Montreal)", "America\/Montserrat": "Atlantik Saati (Montserrat)", "America\/Nassau": "Kuzey Amerika Doğu Saati (Nassau)", "America\/New_York": "Kuzey Amerika Doğu Saati (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Arabistan Saati (Bahreyn)", "Asia\/Baku": "Azerbaycan Saati (Bakü)", "Asia\/Bangkok": "Hindiçin Saati (Bangkok)", - "Asia\/Barnaul": "Rusya (Barnaul)", + "Asia\/Barnaul": "Rusya Saati (Barnaul)", "Asia\/Beirut": "Doğu Avrupa Saati (Beyrut)", "Asia\/Bishkek": "Kırgızistan Saati (Bişkek)", "Asia\/Brunei": "Brunei Darü’s-Selam Saati", @@ -288,9 +288,9 @@ "Asia\/Tehran": "İran Saati (Tahran)", "Asia\/Thimphu": "Butan Saati (Thimphu)", "Asia\/Tokyo": "Japonya Saati (Tokyo)", - "Asia\/Tomsk": "Rusya (Tomsk)", + "Asia\/Tomsk": "Rusya Saati (Tomsk)", "Asia\/Ulaanbaatar": "Ulan Batur Saati", - "Asia\/Urumqi": "Çin (Urumçi)", + "Asia\/Urumqi": "Çin Saati (Urumçi)", "Asia\/Ust-Nera": "Vladivostok Saati (Ust-Nera)", "Asia\/Vientiane": "Hindiçin Saati (Vientiane)", "Asia\/Vladivostok": "Vladivostok Saati", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Greenwich Ortalama Saati (Guernsey)", "Europe\/Helsinki": "Doğu Avrupa Saati (Helsinki)", "Europe\/Isle_of_Man": "Greenwich Ortalama Saati (Man Adası)", - "Europe\/Istanbul": "Türkiye (İstanbul)", + "Europe\/Istanbul": "Türkiye Saati (İstanbul)", "Europe\/Jersey": "Greenwich Ortalama Saati (Jersey)", "Europe\/Kaliningrad": "Doğu Avrupa Saati (Kaliningrad)", "Europe\/Kiev": "Doğu Avrupa Saati (Kiev)", - "Europe\/Kirov": "Rusya (Kirov)", + "Europe\/Kirov": "Rusya Saati (Kirov)", "Europe\/Lisbon": "Batı Avrupa Saati (Lizbon)", "Europe\/Ljubljana": "Orta Avrupa Saati (Ljubljana)", "Europe\/London": "Greenwich Ortalama Saati (Londra)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Wake Adası Saati", "Pacific\/Wallis": "Wallis ve Futuna Saati" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/tt.json b/src/Symfony/Component/Intl/Resources/data/timezones/tt.json index 8fee1b3fed65b..019ad847b3a21 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/tt.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/tt.json @@ -3,91 +3,91 @@ "Names": { "Africa\/Abidjan": "Гринвич уртача вакыты (Abidjan)", "Africa\/Accra": "Гринвич уртача вакыты (Accra)", - "Africa\/Addis_Ababa": "Эфиопия (Addis Ababa)", + "Africa\/Addis_Ababa": "Эфиопия вакыты (Addis Ababa)", "Africa\/Algiers": "Үзәк Европа вакыты (Algiers)", - "Africa\/Asmera": "Эритрея (Asmara)", + "Africa\/Asmera": "Эритрея вакыты (Asmara)", "Africa\/Bamako": "Гринвич уртача вакыты (Bamako)", - "Africa\/Bangui": "Үзәк Африка Республикасы (Bangui)", + "Africa\/Bangui": "Үзәк Африка Республикасы вакыты (Bangui)", "Africa\/Banjul": "Гринвич уртача вакыты (Banjul)", "Africa\/Bissau": "Гринвич уртача вакыты (Bissau)", - "Africa\/Blantyre": "Малави (Blantyre)", - "Africa\/Bujumbura": "Бурунди (Bujumbura)", + "Africa\/Blantyre": "Малави вакыты (Blantyre)", + "Africa\/Bujumbura": "Бурунди вакыты (Bujumbura)", "Africa\/Cairo": "Көнчыгыш Европа вакыты (Cairo)", "Africa\/Casablanca": "Көнбатыш Европа вакыты (Casablanca)", "Africa\/Ceuta": "Үзәк Европа вакыты (Ceuta)", "Africa\/Conakry": "Гринвич уртача вакыты (Conakry)", "Africa\/Dakar": "Гринвич уртача вакыты (Dakar)", - "Africa\/Dar_es_Salaam": "Танзания (Dar es Salaam)", - "Africa\/Djibouti": "Җибүти (Djibouti)", - "Africa\/Douala": "Камерун (Douala)", + "Africa\/Dar_es_Salaam": "Танзания вакыты (Dar es Salaam)", + "Africa\/Djibouti": "Җибүти вакыты (Djibouti)", + "Africa\/Douala": "Камерун вакыты (Douala)", "Africa\/El_Aaiun": "Көнбатыш Европа вакыты (El Aaiun)", "Africa\/Freetown": "Гринвич уртача вакыты (Freetown)", - "Africa\/Gaborone": "Ботсвана (Gaborone)", - "Africa\/Harare": "Зимбабве (Harare)", - "Africa\/Johannesburg": "Көньяк Африка (Johannesburg)", - "Africa\/Juba": "Көньяк Судан (Juba)", - "Africa\/Kampala": "Уганда (Kampala)", - "Africa\/Khartoum": "Судан (Khartoum)", - "Africa\/Kigali": "Руанда (Kigali)", - "Africa\/Lagos": "Нигерия (Lagos)", - "Africa\/Libreville": "Габон (Libreville)", + "Africa\/Gaborone": "Ботсвана вакыты (Gaborone)", + "Africa\/Harare": "Зимбабве вакыты (Harare)", + "Africa\/Johannesburg": "Көньяк Африка вакыты (Johannesburg)", + "Africa\/Juba": "Көньяк Судан вакыты (Juba)", + "Africa\/Kampala": "Уганда вакыты (Kampala)", + "Africa\/Khartoum": "Судан вакыты (Khartoum)", + "Africa\/Kigali": "Руанда вакыты (Kigali)", + "Africa\/Lagos": "Нигерия вакыты (Lagos)", + "Africa\/Libreville": "Габон вакыты (Libreville)", "Africa\/Lome": "Гринвич уртача вакыты (Lome)", - "Africa\/Luanda": "Ангола (Luanda)", - "Africa\/Lusaka": "Замбия (Lusaka)", - "Africa\/Malabo": "Экваториаль Гвинея (Malabo)", - "Africa\/Maputo": "Мозамбик (Maputo)", - "Africa\/Maseru": "Лесото (Maseru)", - "Africa\/Mbabane": "Свазиленд (Mbabane)", - "Africa\/Mogadishu": "Сомали (Mogadishu)", + "Africa\/Luanda": "Ангола вакыты (Luanda)", + "Africa\/Lusaka": "Замбия вакыты (Lusaka)", + "Africa\/Malabo": "Экваториаль Гвинея вакыты (Malabo)", + "Africa\/Maputo": "Мозамбик вакыты (Maputo)", + "Africa\/Maseru": "Лесото вакыты (Maseru)", + "Africa\/Mbabane": "Свазиленд вакыты (Mbabane)", + "Africa\/Mogadishu": "Сомали вакыты (Mogadishu)", "Africa\/Monrovia": "Гринвич уртача вакыты (Monrovia)", - "Africa\/Nairobi": "Кения (Nairobi)", - "Africa\/Ndjamena": "Чад (Ndjamena)", - "Africa\/Niamey": "Нигер (Niamey)", + "Africa\/Nairobi": "Кения вакыты (Nairobi)", + "Africa\/Ndjamena": "Чад вакыты (Ndjamena)", + "Africa\/Niamey": "Нигер вакыты (Niamey)", "Africa\/Nouakchott": "Гринвич уртача вакыты (Nouakchott)", "Africa\/Ouagadougou": "Гринвич уртача вакыты (Ouagadougou)", - "Africa\/Porto-Novo": "Бенин (Porto-Novo)", + "Africa\/Porto-Novo": "Бенин вакыты (Porto-Novo)", "Africa\/Sao_Tome": "Гринвич уртача вакыты (Sao Tome)", "Africa\/Tripoli": "Көнчыгыш Европа вакыты (Tripoli)", "Africa\/Tunis": "Үзәк Европа вакыты (Tunis)", - "Africa\/Windhoek": "Намибия (Windhoek)", - "America\/Adak": "АКШ (Adak)", - "America\/Anchorage": "АКШ (Anchorage)", + "Africa\/Windhoek": "Намибия вакыты (Windhoek)", + "America\/Adak": "АКШ вакыты (Adak)", + "America\/Anchorage": "АКШ вакыты (Anchorage)", "America\/Anguilla": "Төньяк Америка атлантик вакыты (Anguilla)", "America\/Antigua": "Төньяк Америка атлантик вакыты (Antigua)", - "America\/Araguaina": "Бразилия (Araguaina)", - "America\/Argentina\/La_Rioja": "Аргентина (La Rioja)", - "America\/Argentina\/Rio_Gallegos": "Аргентина (Rio Gallegos)", - "America\/Argentina\/Salta": "Аргентина (Salta)", - "America\/Argentina\/San_Juan": "Аргентина (San Juan)", - "America\/Argentina\/San_Luis": "Аргентина (San Luis)", - "America\/Argentina\/Tucuman": "Аргентина (Tucuman)", - "America\/Argentina\/Ushuaia": "Аргентина (Ushuaia)", + "America\/Araguaina": "Бразилия вакыты (Araguaina)", + "America\/Argentina\/La_Rioja": "Аргентина вакыты (La Rioja)", + "America\/Argentina\/Rio_Gallegos": "Аргентина вакыты (Rio Gallegos)", + "America\/Argentina\/Salta": "Аргентина вакыты (Salta)", + "America\/Argentina\/San_Juan": "Аргентина вакыты (San Juan)", + "America\/Argentina\/San_Luis": "Аргентина вакыты (San Luis)", + "America\/Argentina\/Tucuman": "Аргентина вакыты (Tucuman)", + "America\/Argentina\/Ushuaia": "Аргентина вакыты (Ushuaia)", "America\/Aruba": "Төньяк Америка атлантик вакыты (Aruba)", - "America\/Asuncion": "Парагвай (Asuncion)", - "America\/Bahia": "Бразилия (Bahia)", + "America\/Asuncion": "Парагвай вакыты (Asuncion)", + "America\/Bahia": "Бразилия вакыты (Bahia)", "America\/Bahia_Banderas": "Төньяк Америка үзәк вакыты (Bahia Banderas)", "America\/Barbados": "Төньяк Америка атлантик вакыты (Barbados)", - "America\/Belem": "Бразилия (Belem)", + "America\/Belem": "Бразилия вакыты (Belem)", "America\/Belize": "Төньяк Америка үзәк вакыты (Belize)", "America\/Blanc-Sablon": "Төньяк Америка атлантик вакыты (Blanc-Sablon)", - "America\/Boa_Vista": "Бразилия (Boa Vista)", - "America\/Bogota": "Колумбия (Bogota)", + "America\/Boa_Vista": "Бразилия вакыты (Boa Vista)", + "America\/Bogota": "Колумбия вакыты (Bogota)", "America\/Boise": "Төньяк Америка тау вакыты (Boise)", - "America\/Buenos_Aires": "Аргентина (Buenos Aires)", + "America\/Buenos_Aires": "Аргентина вакыты (Buenos Aires)", "America\/Cambridge_Bay": "Төньяк Америка тау вакыты (Cambridge Bay)", - "America\/Campo_Grande": "Бразилия (Campo Grande)", + "America\/Campo_Grande": "Бразилия вакыты (Campo Grande)", "America\/Cancun": "Төньяк Америка көнчыгыш вакыты (Cancun)", - "America\/Caracas": "Венесуэла (Caracas)", - "America\/Catamarca": "Аргентина (Catamarca)", - "America\/Cayenne": "Француз Гвианасы (Cayenne)", + "America\/Caracas": "Венесуэла вакыты (Caracas)", + "America\/Catamarca": "Аргентина вакыты (Catamarca)", + "America\/Cayenne": "Француз Гвианасы вакыты (Cayenne)", "America\/Cayman": "Төньяк Америка көнчыгыш вакыты (Cayman)", "America\/Chicago": "Төньяк Америка үзәк вакыты (Chicago)", - "America\/Chihuahua": "Мексика (Chihuahua)", + "America\/Chihuahua": "Мексика вакыты (Chihuahua)", "America\/Coral_Harbour": "Төньяк Америка көнчыгыш вакыты (Atikokan)", - "America\/Cordoba": "Аргентина (Cordoba)", + "America\/Cordoba": "Аргентина вакыты (Cordoba)", "America\/Costa_Rica": "Төньяк Америка үзәк вакыты (Costa Rica)", "America\/Creston": "Төньяк Америка тау вакыты (Creston)", - "America\/Cuiaba": "Бразилия (Cuiaba)", + "America\/Cuiaba": "Бразилия вакыты (Cuiaba)", "America\/Curacao": "Төньяк Америка атлантик вакыты (Curacao)", "America\/Danmarkshavn": "Гринвич уртача вакыты (Danmarkshavn)", "America\/Dawson": "Төньяк Америка Тын океан вакыты (Dawson)", @@ -96,22 +96,22 @@ "America\/Detroit": "Төньяк Америка көнчыгыш вакыты (Detroit)", "America\/Dominica": "Төньяк Америка атлантик вакыты (Dominica)", "America\/Edmonton": "Төньяк Америка тау вакыты (Edmonton)", - "America\/Eirunepe": "Бразилия (Eirunepe)", + "America\/Eirunepe": "Бразилия вакыты (Eirunepe)", "America\/El_Salvador": "Төньяк Америка үзәк вакыты (El Salvador)", "America\/Fort_Nelson": "Төньяк Америка тау вакыты (Fort Nelson)", - "America\/Fortaleza": "Бразилия (Fortaleza)", + "America\/Fortaleza": "Бразилия вакыты (Fortaleza)", "America\/Glace_Bay": "Төньяк Америка атлантик вакыты (Glace Bay)", - "America\/Godthab": "Гренландия (Nuuk)", + "America\/Godthab": "Гренландия вакыты (Nuuk)", "America\/Goose_Bay": "Төньяк Америка атлантик вакыты (Goose Bay)", "America\/Grand_Turk": "Төньяк Америка көнчыгыш вакыты (Grand Turk)", "America\/Grenada": "Төньяк Америка атлантик вакыты (Grenada)", "America\/Guadeloupe": "Төньяк Америка атлантик вакыты (Guadeloupe)", "America\/Guatemala": "Төньяк Америка үзәк вакыты (Guatemala)", - "America\/Guayaquil": "Эквадор (Guayaquil)", - "America\/Guyana": "Гайана (Guyana)", + "America\/Guayaquil": "Эквадор вакыты (Guayaquil)", + "America\/Guyana": "Гайана вакыты (Guyana)", "America\/Halifax": "Төньяк Америка атлантик вакыты (Halifax)", - "America\/Havana": "Куба (Havana)", - "America\/Hermosillo": "Мексика (Hermosillo)", + "America\/Havana": "Куба вакыты (Havana)", + "America\/Hermosillo": "Мексика вакыты (Hermosillo)", "America\/Indiana\/Knox": "Төньяк Америка үзәк вакыты (Knox, Indiana)", "America\/Indiana\/Marengo": "Төньяк Америка көнчыгыш вакыты (Marengo, Indiana)", "America\/Indiana\/Petersburg": "Төньяк Америка көнчыгыш вакыты (Petersburg, Indiana)", @@ -123,66 +123,66 @@ "America\/Inuvik": "Төньяк Америка тау вакыты (Inuvik)", "America\/Iqaluit": "Төньяк Америка көнчыгыш вакыты (Iqaluit)", "America\/Jamaica": "Төньяк Америка көнчыгыш вакыты (Jamaica)", - "America\/Jujuy": "Аргентина (Jujuy)", - "America\/Juneau": "АКШ (Juneau)", + "America\/Jujuy": "Аргентина вакыты (Jujuy)", + "America\/Juneau": "АКШ вакыты (Juneau)", "America\/Kentucky\/Monticello": "Төньяк Америка көнчыгыш вакыты (Monticello, Kentucky)", "America\/Kralendijk": "Төньяк Америка атлантик вакыты (Kralendijk)", - "America\/La_Paz": "Боливия (La Paz)", - "America\/Lima": "Перу (Lima)", + "America\/La_Paz": "Боливия вакыты (La Paz)", + "America\/Lima": "Перу вакыты (Lima)", "America\/Los_Angeles": "Төньяк Америка Тын океан вакыты (Los Angeles)", "America\/Louisville": "Төньяк Америка көнчыгыш вакыты (Louisville)", "America\/Lower_Princes": "Төньяк Америка атлантик вакыты (Lower Prince’s Quarter)", - "America\/Maceio": "Бразилия (Maceio)", + "America\/Maceio": "Бразилия вакыты (Maceio)", "America\/Managua": "Төньяк Америка үзәк вакыты (Managua)", - "America\/Manaus": "Бразилия (Manaus)", + "America\/Manaus": "Бразилия вакыты (Manaus)", "America\/Marigot": "Төньяк Америка атлантик вакыты (Marigot)", "America\/Martinique": "Төньяк Америка атлантик вакыты (Martinique)", "America\/Matamoros": "Төньяк Америка үзәк вакыты (Matamoros)", - "America\/Mazatlan": "Мексика (Mazatlan)", - "America\/Mendoza": "Аргентина (Mendoza)", + "America\/Mazatlan": "Мексика вакыты (Mazatlan)", + "America\/Mendoza": "Аргентина вакыты (Mendoza)", "America\/Menominee": "Төньяк Америка үзәк вакыты (Menominee)", "America\/Merida": "Төньяк Америка үзәк вакыты (Merida)", - "America\/Metlakatla": "АКШ (Metlakatla)", + "America\/Metlakatla": "АКШ вакыты (Metlakatla)", "America\/Mexico_City": "Төньяк Америка үзәк вакыты (Mexico City)", - "America\/Miquelon": "Сен-Пьер һәм Микелон (Miquelon)", + "America\/Miquelon": "Сен-Пьер һәм Микелон вакыты (Miquelon)", "America\/Moncton": "Төньяк Америка атлантик вакыты (Moncton)", "America\/Monterrey": "Төньяк Америка үзәк вакыты (Monterrey)", - "America\/Montevideo": "Уругвай (Montevideo)", - "America\/Montreal": "Канада (Montreal)", + "America\/Montevideo": "Уругвай вакыты (Montevideo)", + "America\/Montreal": "Канада вакыты (Montreal)", "America\/Montserrat": "Төньяк Америка атлантик вакыты (Montserrat)", "America\/Nassau": "Төньяк Америка көнчыгыш вакыты (Nassau)", "America\/New_York": "Төньяк Америка көнчыгыш вакыты (New York)", "America\/Nipigon": "Төньяк Америка көнчыгыш вакыты (Nipigon)", - "America\/Nome": "АКШ (Nome)", - "America\/Noronha": "Бразилия (Noronha)", + "America\/Nome": "АКШ вакыты (Nome)", + "America\/Noronha": "Бразилия вакыты (Noronha)", "America\/North_Dakota\/Beulah": "Төньяк Америка үзәк вакыты (Beulah, North Dakota)", "America\/North_Dakota\/Center": "Төньяк Америка үзәк вакыты (Center, North Dakota)", "America\/North_Dakota\/New_Salem": "Төньяк Америка үзәк вакыты (New Salem, North Dakota)", "America\/Ojinaga": "Төньяк Америка тау вакыты (Ojinaga)", "America\/Panama": "Төньяк Америка көнчыгыш вакыты (Panama)", "America\/Pangnirtung": "Төньяк Америка көнчыгыш вакыты (Pangnirtung)", - "America\/Paramaribo": "Суринам (Paramaribo)", + "America\/Paramaribo": "Суринам вакыты (Paramaribo)", "America\/Phoenix": "Төньяк Америка тау вакыты (Phoenix)", "America\/Port-au-Prince": "Төньяк Америка көнчыгыш вакыты (Port-au-Prince)", "America\/Port_of_Spain": "Төньяк Америка атлантик вакыты (Port of Spain)", - "America\/Porto_Velho": "Бразилия (Porto Velho)", + "America\/Porto_Velho": "Бразилия вакыты (Porto Velho)", "America\/Puerto_Rico": "Төньяк Америка атлантик вакыты (Puerto Rico)", - "America\/Punta_Arenas": "Чили (Punta Arenas)", + "America\/Punta_Arenas": "Чили вакыты (Punta Arenas)", "America\/Rainy_River": "Төньяк Америка үзәк вакыты (Rainy River)", "America\/Rankin_Inlet": "Төньяк Америка үзәк вакыты (Rankin Inlet)", - "America\/Recife": "Бразилия (Recife)", + "America\/Recife": "Бразилия вакыты (Recife)", "America\/Regina": "Төньяк Америка үзәк вакыты (Regina)", "America\/Resolute": "Төньяк Америка үзәк вакыты (Resolute)", - "America\/Rio_Branco": "Бразилия (Rio Branco)", - "America\/Santa_Isabel": "Мексика (Santa Isabel)", - "America\/Santarem": "Бразилия (Santarem)", - "America\/Santiago": "Чили (Santiago)", + "America\/Rio_Branco": "Бразилия вакыты (Rio Branco)", + "America\/Santa_Isabel": "Мексика вакыты (Santa Isabel)", + "America\/Santarem": "Бразилия вакыты (Santarem)", + "America\/Santiago": "Чили вакыты (Santiago)", "America\/Santo_Domingo": "Төньяк Америка атлантик вакыты (Santo Domingo)", - "America\/Sao_Paulo": "Бразилия (Sao Paulo)", - "America\/Scoresbysund": "Гренландия (Ittoqqortoormiit)", - "America\/Sitka": "АКШ (Sitka)", + "America\/Sao_Paulo": "Бразилия вакыты (Sao Paulo)", + "America\/Scoresbysund": "Гренландия вакыты (Ittoqqortoormiit)", + "America\/Sitka": "АКШ вакыты (Sitka)", "America\/St_Barthelemy": "Төньяк Америка атлантик вакыты (St. Barthelemy)", - "America\/St_Johns": "Канада (St. John’s)", + "America\/St_Johns": "Канада вакыты (St. John’s)", "America\/St_Kitts": "Төньяк Америка атлантик вакыты (St. Kitts)", "America\/St_Lucia": "Төньяк Америка атлантик вакыты (St. Lucia)", "America\/St_Thomas": "Төньяк Америка атлантик вакыты (St. Thomas)", @@ -197,130 +197,130 @@ "America\/Vancouver": "Төньяк Америка Тын океан вакыты (Vancouver)", "America\/Whitehorse": "Төньяк Америка Тын океан вакыты (Whitehorse)", "America\/Winnipeg": "Төньяк Америка үзәк вакыты (Winnipeg)", - "America\/Yakutat": "АКШ (Yakutat)", + "America\/Yakutat": "АКШ вакыты (Yakutat)", "America\/Yellowknife": "Төньяк Америка тау вакыты (Yellowknife)", - "Antarctica\/Casey": "Антарктика (Casey)", - "Antarctica\/Davis": "Антарктика (Davis)", - "Antarctica\/DumontDUrville": "Антарктика (Dumont d’Urville)", - "Antarctica\/Macquarie": "Австралия (Macquarie)", - "Antarctica\/Mawson": "Антарктика (Mawson)", - "Antarctica\/McMurdo": "Антарктика (McMurdo)", - "Antarctica\/Palmer": "Антарктика (Palmer)", - "Antarctica\/Rothera": "Антарктика (Rothera)", - "Antarctica\/Syowa": "Антарктика (Syowa)", + "Antarctica\/Casey": "Антарктика вакыты (Casey)", + "Antarctica\/Davis": "Антарктика вакыты (Davis)", + "Antarctica\/DumontDUrville": "Антарктика вакыты (Dumont d’Urville)", + "Antarctica\/Macquarie": "Австралия вакыты (Macquarie)", + "Antarctica\/Mawson": "Антарктика вакыты (Mawson)", + "Antarctica\/McMurdo": "Антарктика вакыты (McMurdo)", + "Antarctica\/Palmer": "Антарктика вакыты (Palmer)", + "Antarctica\/Rothera": "Антарктика вакыты (Rothera)", + "Antarctica\/Syowa": "Антарктика вакыты (Syowa)", "Antarctica\/Troll": "Гринвич уртача вакыты (Troll)", - "Antarctica\/Vostok": "Антарктика (Vostok)", + "Antarctica\/Vostok": "Антарктика вакыты (Vostok)", "Arctic\/Longyearbyen": "Үзәк Европа вакыты (Longyearbyen)", - "Asia\/Aden": "Йәмән (Aden)", - "Asia\/Almaty": "Казахстан (Almaty)", + "Asia\/Aden": "Йәмән вакыты (Aden)", + "Asia\/Almaty": "Казахстан вакыты (Almaty)", "Asia\/Amman": "Көнчыгыш Европа вакыты (Amman)", - "Asia\/Anadyr": "Россия (Anadyr)", - "Asia\/Aqtau": "Казахстан (Aqtau)", - "Asia\/Aqtobe": "Казахстан (Aqtobe)", - "Asia\/Ashgabat": "Төркмәнстан (Ashgabat)", - "Asia\/Atyrau": "Казахстан (Atyrau)", - "Asia\/Baghdad": "Гыйрак (Baghdad)", - "Asia\/Bahrain": "Бәхрәйн (Bahrain)", - "Asia\/Baku": "Әзәрбайҗан (Baku)", - "Asia\/Bangkok": "Тайланд (Bangkok)", - "Asia\/Barnaul": "Россия (Barnaul)", + "Asia\/Anadyr": "Россия вакыты (Anadyr)", + "Asia\/Aqtau": "Казахстан вакыты (Aqtau)", + "Asia\/Aqtobe": "Казахстан вакыты (Aqtobe)", + "Asia\/Ashgabat": "Төркмәнстан вакыты (Ashgabat)", + "Asia\/Atyrau": "Казахстан вакыты (Atyrau)", + "Asia\/Baghdad": "Гыйрак вакыты (Baghdad)", + "Asia\/Bahrain": "Бәхрәйн вакыты (Bahrain)", + "Asia\/Baku": "Әзәрбайҗан вакыты (Baku)", + "Asia\/Bangkok": "Тайланд вакыты (Bangkok)", + "Asia\/Barnaul": "Россия вакыты (Barnaul)", "Asia\/Beirut": "Көнчыгыш Европа вакыты (Beirut)", - "Asia\/Bishkek": "Кыргызстан (Bishkek)", - "Asia\/Brunei": "Бруней (Brunei)", - "Asia\/Calcutta": "Индия (Kolkata)", - "Asia\/Chita": "Россия (Chita)", - "Asia\/Choibalsan": "Монголия (Choibalsan)", - "Asia\/Colombo": "Шри-Ланка (Colombo)", + "Asia\/Bishkek": "Кыргызстан вакыты (Bishkek)", + "Asia\/Brunei": "Бруней вакыты (Brunei)", + "Asia\/Calcutta": "Индия вакыты (Kolkata)", + "Asia\/Chita": "Россия вакыты (Chita)", + "Asia\/Choibalsan": "Монголия вакыты (Choibalsan)", + "Asia\/Colombo": "Шри-Ланка вакыты (Colombo)", "Asia\/Damascus": "Көнчыгыш Европа вакыты (Damascus)", - "Asia\/Dhaka": "Бангладеш (Dhaka)", - "Asia\/Dili": "Тимор-Лесте (Dili)", - "Asia\/Dubai": "Берләшкән Гарәп Әмирлекләре (Dubai)", - "Asia\/Dushanbe": "Таҗикстан (Dushanbe)", + "Asia\/Dhaka": "Бангладеш вакыты (Dhaka)", + "Asia\/Dili": "Тимор-Лесте вакыты (Dili)", + "Asia\/Dubai": "Берләшкән Гарәп Әмирлекләре вакыты (Dubai)", + "Asia\/Dushanbe": "Таҗикстан вакыты (Dushanbe)", "Asia\/Famagusta": "Көнчыгыш Европа вакыты (Famagusta)", "Asia\/Gaza": "Көнчыгыш Европа вакыты (Gaza)", "Asia\/Hebron": "Көнчыгыш Европа вакыты (Hebron)", - "Asia\/Hong_Kong": "Гонконг Махсус Идарәле Төбәге (Hong Kong)", - "Asia\/Hovd": "Монголия (Hovd)", - "Asia\/Irkutsk": "Россия (Irkutsk)", - "Asia\/Jakarta": "Индонезия (Jakarta)", - "Asia\/Jayapura": "Индонезия (Jayapura)", - "Asia\/Jerusalem": "Израиль (Jerusalem)", - "Asia\/Kabul": "Әфганстан (Kabul)", - "Asia\/Kamchatka": "Россия (Kamchatka)", - "Asia\/Karachi": "Пакистан (Karachi)", - "Asia\/Katmandu": "Непал (Kathmandu)", - "Asia\/Khandyga": "Россия (Khandyga)", - "Asia\/Krasnoyarsk": "Россия (Krasnoyarsk)", - "Asia\/Kuala_Lumpur": "Малайзия (Kuala Lumpur)", - "Asia\/Kuching": "Малайзия (Kuching)", - "Asia\/Kuwait": "Күвәйт (Kuwait)", - "Asia\/Macau": "Макао Махсус Идарәле Төбәге (Macao)", - "Asia\/Magadan": "Россия (Magadan)", - "Asia\/Makassar": "Индонезия (Makassar)", - "Asia\/Manila": "Филиппин (Manila)", - "Asia\/Muscat": "Оман (Muscat)", + "Asia\/Hong_Kong": "Гонконг Махсус Идарәле Төбәге вакыты (Hong Kong)", + "Asia\/Hovd": "Монголия вакыты (Hovd)", + "Asia\/Irkutsk": "Россия вакыты (Irkutsk)", + "Asia\/Jakarta": "Индонезия вакыты (Jakarta)", + "Asia\/Jayapura": "Индонезия вакыты (Jayapura)", + "Asia\/Jerusalem": "Израиль вакыты (Jerusalem)", + "Asia\/Kabul": "Әфганстан вакыты (Kabul)", + "Asia\/Kamchatka": "Россия вакыты (Kamchatka)", + "Asia\/Karachi": "Пакистан вакыты (Karachi)", + "Asia\/Katmandu": "Непал вакыты (Kathmandu)", + "Asia\/Khandyga": "Россия вакыты (Khandyga)", + "Asia\/Krasnoyarsk": "Россия вакыты (Krasnoyarsk)", + "Asia\/Kuala_Lumpur": "Малайзия вакыты (Kuala Lumpur)", + "Asia\/Kuching": "Малайзия вакыты (Kuching)", + "Asia\/Kuwait": "Күвәйт вакыты (Kuwait)", + "Asia\/Macau": "Макао Махсус Идарәле Төбәге вакыты (Macao)", + "Asia\/Magadan": "Россия вакыты (Magadan)", + "Asia\/Makassar": "Индонезия вакыты (Makassar)", + "Asia\/Manila": "Филиппин вакыты (Manila)", + "Asia\/Muscat": "Оман вакыты (Muscat)", "Asia\/Nicosia": "Көнчыгыш Европа вакыты (Nicosia)", - "Asia\/Novokuznetsk": "Россия (Novokuznetsk)", - "Asia\/Novosibirsk": "Россия (Novosibirsk)", - "Asia\/Omsk": "Россия (Omsk)", - "Asia\/Oral": "Казахстан (Oral)", - "Asia\/Phnom_Penh": "Камбоджа (Phnom Penh)", - "Asia\/Pontianak": "Индонезия (Pontianak)", - "Asia\/Pyongyang": "Төньяк Корея (Pyongyang)", - "Asia\/Qatar": "Катар (Qatar)", - "Asia\/Qostanay": "Казахстан (Qostanay)", - "Asia\/Qyzylorda": "Казахстан (Qyzylorda)", - "Asia\/Riyadh": "Согуд Гарәбстаны (Riyadh)", - "Asia\/Saigon": "Вьетнам (Ho Chi Minh)", - "Asia\/Sakhalin": "Россия (Sakhalin)", - "Asia\/Samarkand": "Үзбәкстан (Samarkand)", - "Asia\/Shanghai": "Кытай (Shanghai)", - "Asia\/Singapore": "Сингапур (Singapore)", - "Asia\/Srednekolymsk": "Россия (Srednekolymsk)", - "Asia\/Taipei": "Тайвань (Taipei)", - "Asia\/Tashkent": "Үзбәкстан (Tashkent)", - "Asia\/Tbilisi": "Грузия (Tbilisi)", - "Asia\/Tehran": "Иран (Tehran)", - "Asia\/Thimphu": "Бутан (Thimphu)", - "Asia\/Tokyo": "Япония (Tokyo)", - "Asia\/Tomsk": "Россия (Tomsk)", - "Asia\/Ulaanbaatar": "Монголия (Ulaanbaatar)", - "Asia\/Urumqi": "Кытай (Urumqi)", - "Asia\/Ust-Nera": "Россия (Ust-Nera)", - "Asia\/Vientiane": "Лаос (Vientiane)", - "Asia\/Vladivostok": "Россия (Vladivostok)", - "Asia\/Yakutsk": "Россия (Yakutsk)", - "Asia\/Yekaterinburg": "Россия (Yekaterinburg)", - "Asia\/Yerevan": "Әрмәнстан (Yerevan)", - "Atlantic\/Azores": "Португалия (Azores)", + "Asia\/Novokuznetsk": "Россия вакыты (Novokuznetsk)", + "Asia\/Novosibirsk": "Россия вакыты (Novosibirsk)", + "Asia\/Omsk": "Россия вакыты (Omsk)", + "Asia\/Oral": "Казахстан вакыты (Oral)", + "Asia\/Phnom_Penh": "Камбоджа вакыты (Phnom Penh)", + "Asia\/Pontianak": "Индонезия вакыты (Pontianak)", + "Asia\/Pyongyang": "Төньяк Корея вакыты (Pyongyang)", + "Asia\/Qatar": "Катар вакыты (Qatar)", + "Asia\/Qostanay": "Казахстан вакыты (Qostanay)", + "Asia\/Qyzylorda": "Казахстан вакыты (Qyzylorda)", + "Asia\/Riyadh": "Согуд Гарәбстаны вакыты (Riyadh)", + "Asia\/Saigon": "Вьетнам вакыты (Ho Chi Minh)", + "Asia\/Sakhalin": "Россия вакыты (Sakhalin)", + "Asia\/Samarkand": "Үзбәкстан вакыты (Samarkand)", + "Asia\/Shanghai": "Кытай вакыты (Shanghai)", + "Asia\/Singapore": "Сингапур вакыты (Singapore)", + "Asia\/Srednekolymsk": "Россия вакыты (Srednekolymsk)", + "Asia\/Taipei": "Тайвань вакыты (Taipei)", + "Asia\/Tashkent": "Үзбәкстан вакыты (Tashkent)", + "Asia\/Tbilisi": "Грузия вакыты (Tbilisi)", + "Asia\/Tehran": "Иран вакыты (Tehran)", + "Asia\/Thimphu": "Бутан вакыты (Thimphu)", + "Asia\/Tokyo": "Япония вакыты (Tokyo)", + "Asia\/Tomsk": "Россия вакыты (Tomsk)", + "Asia\/Ulaanbaatar": "Монголия вакыты (Ulaanbaatar)", + "Asia\/Urumqi": "Кытай вакыты (Urumqi)", + "Asia\/Ust-Nera": "Россия вакыты (Ust-Nera)", + "Asia\/Vientiane": "Лаос вакыты (Vientiane)", + "Asia\/Vladivostok": "Россия вакыты (Vladivostok)", + "Asia\/Yakutsk": "Россия вакыты (Yakutsk)", + "Asia\/Yekaterinburg": "Россия вакыты (Yekaterinburg)", + "Asia\/Yerevan": "Әрмәнстан вакыты (Yerevan)", + "Atlantic\/Azores": "Португалия вакыты (Azores)", "Atlantic\/Bermuda": "Төньяк Америка атлантик вакыты (Bermuda)", "Atlantic\/Canary": "Көнбатыш Европа вакыты (Canary)", - "Atlantic\/Cape_Verde": "Кабо-Верде (Cape Verde)", + "Atlantic\/Cape_Verde": "Кабо-Верде вакыты (Cape Verde)", "Atlantic\/Faeroe": "Көнбатыш Европа вакыты (Faroe)", "Atlantic\/Madeira": "Көнбатыш Европа вакыты (Madeira)", "Atlantic\/Reykjavik": "Гринвич уртача вакыты (Reykjavik)", - "Atlantic\/South_Georgia": "Көньяк Георгия һәм Көньяк Сандвич утраулары (South Georgia)", + "Atlantic\/South_Georgia": "Көньяк Георгия һәм Көньяк Сандвич утраулары вакыты (South Georgia)", "Atlantic\/St_Helena": "Гринвич уртача вакыты (St. Helena)", - "Atlantic\/Stanley": "Фолкленд утраулары (Stanley)", - "Australia\/Adelaide": "Австралия (Adelaide)", - "Australia\/Brisbane": "Австралия (Brisbane)", - "Australia\/Broken_Hill": "Австралия (Broken Hill)", - "Australia\/Currie": "Австралия (Currie)", - "Australia\/Darwin": "Австралия (Darwin)", - "Australia\/Eucla": "Австралия (Eucla)", - "Australia\/Hobart": "Австралия (Hobart)", - "Australia\/Lindeman": "Австралия (Lindeman)", - "Australia\/Lord_Howe": "Австралия (Lord Howe)", - "Australia\/Melbourne": "Австралия (Melbourne)", - "Australia\/Perth": "Австралия (Perth)", - "Australia\/Sydney": "Австралия (Sydney)", + "Atlantic\/Stanley": "Фолкленд утраулары вакыты (Stanley)", + "Australia\/Adelaide": "Австралия вакыты (Adelaide)", + "Australia\/Brisbane": "Австралия вакыты (Brisbane)", + "Australia\/Broken_Hill": "Австралия вакыты (Broken Hill)", + "Australia\/Currie": "Австралия вакыты (Currie)", + "Australia\/Darwin": "Австралия вакыты (Darwin)", + "Australia\/Eucla": "Австралия вакыты (Eucla)", + "Australia\/Hobart": "Австралия вакыты (Hobart)", + "Australia\/Lindeman": "Австралия вакыты (Lindeman)", + "Australia\/Lord_Howe": "Австралия вакыты (Lord Howe)", + "Australia\/Melbourne": "Австралия вакыты (Melbourne)", + "Australia\/Perth": "Австралия вакыты (Perth)", + "Australia\/Sydney": "Австралия вакыты (Sydney)", "CST6CDT": "Төньяк Америка үзәк вакыты", "EST5EDT": "Төньяк Америка көнчыгыш вакыты", "Etc\/GMT": "Гринвич уртача вакыты", "Etc\/UTC": "Бөтендөнья килештерелгән вакыты", "Europe\/Amsterdam": "Үзәк Европа вакыты (Amsterdam)", "Europe\/Andorra": "Үзәк Европа вакыты (Andorra)", - "Europe\/Astrakhan": "Россия (Astrakhan)", + "Europe\/Astrakhan": "Россия вакыты (Astrakhan)", "Europe\/Athens": "Көнчыгыш Европа вакыты (Athens)", "Europe\/Belgrade": "Үзәк Европа вакыты (Belgrade)", "Europe\/Berlin": "Үзәк Европа вакыты (Berlin)", @@ -336,11 +336,11 @@ "Europe\/Guernsey": "Гринвич уртача вакыты (Guernsey)", "Europe\/Helsinki": "Көнчыгыш Европа вакыты (Helsinki)", "Europe\/Isle_of_Man": "Гринвич уртача вакыты (Isle of Man)", - "Europe\/Istanbul": "Төркия (Istanbul)", + "Europe\/Istanbul": "Төркия вакыты (Istanbul)", "Europe\/Jersey": "Гринвич уртача вакыты (Jersey)", "Europe\/Kaliningrad": "Көнчыгыш Европа вакыты (Kaliningrad)", "Europe\/Kiev": "Көнчыгыш Европа вакыты (Kiev)", - "Europe\/Kirov": "Россия (Kirov)", + "Europe\/Kirov": "Россия вакыты (Kirov)", "Europe\/Lisbon": "Көнбатыш Европа вакыты (Lisbon)", "Europe\/Ljubljana": "Үзәк Европа вакыты (Ljubljana)", "Europe\/London": "Гринвич уртача вакыты (London)", @@ -348,94 +348,88 @@ "Europe\/Madrid": "Үзәк Европа вакыты (Madrid)", "Europe\/Malta": "Үзәк Европа вакыты (Malta)", "Europe\/Mariehamn": "Көнчыгыш Европа вакыты (Mariehamn)", - "Europe\/Minsk": "Беларусь (Minsk)", + "Europe\/Minsk": "Беларусь вакыты (Minsk)", "Europe\/Monaco": "Үзәк Европа вакыты (Monaco)", - "Europe\/Moscow": "Россия (Moscow)", + "Europe\/Moscow": "Россия вакыты (Moscow)", "Europe\/Oslo": "Үзәк Европа вакыты (Oslo)", "Europe\/Paris": "Үзәк Европа вакыты (Paris)", "Europe\/Podgorica": "Үзәк Европа вакыты (Podgorica)", "Europe\/Prague": "Үзәк Европа вакыты (Prague)", "Europe\/Riga": "Көнчыгыш Европа вакыты (Riga)", "Europe\/Rome": "Үзәк Европа вакыты (Rome)", - "Europe\/Samara": "Россия (Samara)", + "Europe\/Samara": "Россия вакыты (Samara)", "Europe\/San_Marino": "Үзәк Европа вакыты (San Marino)", "Europe\/Sarajevo": "Үзәк Европа вакыты (Sarajevo)", - "Europe\/Saratov": "Россия (Saratov)", - "Europe\/Simferopol": "Украина (Simferopol)", + "Europe\/Saratov": "Россия вакыты (Saratov)", + "Europe\/Simferopol": "Украина вакыты (Simferopol)", "Europe\/Skopje": "Үзәк Европа вакыты (Skopje)", "Europe\/Sofia": "Көнчыгыш Европа вакыты (Sofia)", "Europe\/Stockholm": "Үзәк Европа вакыты (Stockholm)", "Europe\/Tallinn": "Көнчыгыш Европа вакыты (Tallinn)", "Europe\/Tirane": "Үзәк Европа вакыты (Tirane)", - "Europe\/Ulyanovsk": "Россия (Ulyanovsk)", + "Europe\/Ulyanovsk": "Россия вакыты (Ulyanovsk)", "Europe\/Uzhgorod": "Көнчыгыш Европа вакыты (Uzhgorod)", "Europe\/Vaduz": "Үзәк Европа вакыты (Vaduz)", "Europe\/Vatican": "Үзәк Европа вакыты (Vatican)", "Europe\/Vienna": "Үзәк Европа вакыты (Vienna)", "Europe\/Vilnius": "Көнчыгыш Европа вакыты (Vilnius)", - "Europe\/Volgograd": "Россия (Volgograd)", + "Europe\/Volgograd": "Россия вакыты (Volgograd)", "Europe\/Warsaw": "Үзәк Европа вакыты (Warsaw)", "Europe\/Zagreb": "Үзәк Европа вакыты (Zagreb)", "Europe\/Zaporozhye": "Көнчыгыш Европа вакыты (Zaporozhye)", "Europe\/Zurich": "Үзәк Европа вакыты (Zurich)", - "Indian\/Antananarivo": "Мадагаскар (Antananarivo)", - "Indian\/Chagos": "Британиянең Һинд Океанындагы Территориясе (Chagos)", - "Indian\/Christmas": "Раштуа утравы (Christmas)", - "Indian\/Cocos": "Кокос (Килинг) утраулары (Cocos)", - "Indian\/Comoro": "Комор утраулары (Comoro)", - "Indian\/Kerguelen": "Франциянең Көньяк Территорияләре (Kerguelen)", - "Indian\/Mahe": "Сейшел утраулары (Mahe)", - "Indian\/Maldives": "Мальдив утраулары (Maldives)", - "Indian\/Mauritius": "Маврикий (Mauritius)", - "Indian\/Mayotte": "Майотта (Mayotte)", - "Indian\/Reunion": "Реюньон (Reunion)", + "Indian\/Antananarivo": "Мадагаскар вакыты (Antananarivo)", + "Indian\/Chagos": "Британиянең Һинд Океанындагы Территориясе вакыты (Chagos)", + "Indian\/Christmas": "Раштуа утравы вакыты (Christmas)", + "Indian\/Cocos": "Кокос (Килинг) утраулары вакыты (Cocos)", + "Indian\/Comoro": "Комор утраулары вакыты (Comoro)", + "Indian\/Kerguelen": "Франциянең Көньяк Территорияләре вакыты (Kerguelen)", + "Indian\/Mahe": "Сейшел утраулары вакыты (Mahe)", + "Indian\/Maldives": "Мальдив утраулары вакыты (Maldives)", + "Indian\/Mauritius": "Маврикий вакыты (Mauritius)", + "Indian\/Mayotte": "Майотта вакыты (Mayotte)", + "Indian\/Reunion": "Реюньон вакыты (Reunion)", "MST7MDT": "Төньяк Америка тау вакыты", "PST8PDT": "Төньяк Америка Тын океан вакыты", - "Pacific\/Apia": "Самоа (Apia)", - "Pacific\/Auckland": "Яңа Зеландия (Auckland)", - "Pacific\/Bougainville": "Папуа - Яңа Гвинея (Bougainville)", - "Pacific\/Chatham": "Яңа Зеландия (Chatham)", - "Pacific\/Easter": "Чили (Easter)", - "Pacific\/Efate": "Вануату (Efate)", - "Pacific\/Enderbury": "Кирибати (Enderbury)", - "Pacific\/Fakaofo": "Токелау (Fakaofo)", - "Pacific\/Fiji": "Фиджи (Fiji)", - "Pacific\/Funafuti": "Тувалу (Funafuti)", - "Pacific\/Galapagos": "Эквадор (Galapagos)", - "Pacific\/Gambier": "Француз Полинезиясе (Gambier)", - "Pacific\/Guadalcanal": "Сөләйман утраулары (Guadalcanal)", - "Pacific\/Guam": "Гуам (Guam)", - "Pacific\/Honolulu": "АКШ (Honolulu)", - "Pacific\/Johnston": "АКШ Кече Читтәге утраулары (Johnston)", - "Pacific\/Kiritimati": "Кирибати (Kiritimati)", - "Pacific\/Kosrae": "Микронезия (Kosrae)", - "Pacific\/Kwajalein": "Маршалл утраулары (Kwajalein)", - "Pacific\/Majuro": "Маршалл утраулары (Majuro)", - "Pacific\/Marquesas": "Француз Полинезиясе (Marquesas)", - "Pacific\/Midway": "АКШ Кече Читтәге утраулары (Midway)", - "Pacific\/Nauru": "Науру (Nauru)", - "Pacific\/Niue": "Ниуэ (Niue)", - "Pacific\/Norfolk": "Норфолк утравы (Norfolk)", - "Pacific\/Noumea": "Яңа Каледония (Noumea)", - "Pacific\/Pago_Pago": "Америка Самоасы (Pago Pago)", - "Pacific\/Palau": "Палау (Palau)", - "Pacific\/Pitcairn": "Питкэрн утраулары (Pitcairn)", - "Pacific\/Ponape": "Микронезия (Pohnpei)", - "Pacific\/Port_Moresby": "Папуа - Яңа Гвинея (Port Moresby)", - "Pacific\/Rarotonga": "Кук утраулары (Rarotonga)", - "Pacific\/Saipan": "Төньяк Мариана утраулары (Saipan)", - "Pacific\/Tahiti": "Француз Полинезиясе (Tahiti)", - "Pacific\/Tarawa": "Кирибати (Tarawa)", - "Pacific\/Tongatapu": "Тонга (Tongatapu)", - "Pacific\/Truk": "Микронезия (Chuuk)", - "Pacific\/Wake": "АКШ Кече Читтәге утраулары (Wake)", - "Pacific\/Wallis": "Уоллис һәм Футуна (Wallis)" + "Pacific\/Apia": "Самоа вакыты (Apia)", + "Pacific\/Auckland": "Яңа Зеландия вакыты (Auckland)", + "Pacific\/Bougainville": "Папуа - Яңа Гвинея вакыты (Bougainville)", + "Pacific\/Chatham": "Яңа Зеландия вакыты (Chatham)", + "Pacific\/Easter": "Чили вакыты (Easter)", + "Pacific\/Efate": "Вануату вакыты (Efate)", + "Pacific\/Enderbury": "Кирибати вакыты (Enderbury)", + "Pacific\/Fakaofo": "Токелау вакыты (Fakaofo)", + "Pacific\/Fiji": "Фиджи вакыты (Fiji)", + "Pacific\/Funafuti": "Тувалу вакыты (Funafuti)", + "Pacific\/Galapagos": "Эквадор вакыты (Galapagos)", + "Pacific\/Gambier": "Француз Полинезиясе вакыты (Gambier)", + "Pacific\/Guadalcanal": "Сөләйман утраулары вакыты (Guadalcanal)", + "Pacific\/Guam": "Гуам вакыты (Guam)", + "Pacific\/Honolulu": "АКШ вакыты (Honolulu)", + "Pacific\/Johnston": "АКШ Кече Читтәге утраулары вакыты (Johnston)", + "Pacific\/Kiritimati": "Кирибати вакыты (Kiritimati)", + "Pacific\/Kosrae": "Микронезия вакыты (Kosrae)", + "Pacific\/Kwajalein": "Маршалл утраулары вакыты (Kwajalein)", + "Pacific\/Majuro": "Маршалл утраулары вакыты (Majuro)", + "Pacific\/Marquesas": "Француз Полинезиясе вакыты (Marquesas)", + "Pacific\/Midway": "АКШ Кече Читтәге утраулары вакыты (Midway)", + "Pacific\/Nauru": "Науру вакыты (Nauru)", + "Pacific\/Niue": "Ниуэ вакыты (Niue)", + "Pacific\/Norfolk": "Норфолк утравы вакыты (Norfolk)", + "Pacific\/Noumea": "Яңа Каледония вакыты (Noumea)", + "Pacific\/Pago_Pago": "Америка Самоасы вакыты (Pago Pago)", + "Pacific\/Palau": "Палау вакыты (Palau)", + "Pacific\/Pitcairn": "Питкэрн утраулары вакыты (Pitcairn)", + "Pacific\/Ponape": "Микронезия вакыты (Pohnpei)", + "Pacific\/Port_Moresby": "Папуа - Яңа Гвинея вакыты (Port Moresby)", + "Pacific\/Rarotonga": "Кук утраулары вакыты (Rarotonga)", + "Pacific\/Saipan": "Төньяк Мариана утраулары вакыты (Saipan)", + "Pacific\/Tahiti": "Француз Полинезиясе вакыты (Tahiti)", + "Pacific\/Tarawa": "Кирибати вакыты (Tarawa)", + "Pacific\/Tongatapu": "Тонга вакыты (Tongatapu)", + "Pacific\/Truk": "Микронезия вакыты (Chuuk)", + "Pacific\/Wake": "АКШ Кече Читтәге утраулары вакыты (Wake)", + "Pacific\/Wallis": "Уоллис һәм Футуна вакыты (Wallis)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ug.json b/src/Symfony/Component/Intl/Resources/data/timezones/ug.json index cd52220cc1d80..e92bf4d952e8a 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ug.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ug.json @@ -151,7 +151,7 @@ "America\/Moncton": "ئاتلانتىك ئوكيان ۋاقتى (Moncton)", "America\/Monterrey": "ئوتتۇرا قىسىم ۋاقتى (Monterrey)", "America\/Montevideo": "ئۇرۇگۋاي ۋاقتى (Montevideo)", - "America\/Montreal": "كانادا (Montreal)", + "America\/Montreal": "كانادا ۋاقتى (Montreal)", "America\/Montserrat": "ئاتلانتىك ئوكيان ۋاقتى (Montserrat)", "America\/Nassau": "شەرقىي قىسىم ۋاقتى (Nassau)", "America\/New_York": "شەرقىي قىسىم ۋاقتى (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "ئەرەب ۋاقتى (Bahrain)", "Asia\/Baku": "ئەزەربەيجان ۋاقتى (Baku)", "Asia\/Bangkok": "ھىندى چىنى ۋاقتى (Bangkok)", - "Asia\/Barnaul": "رۇسىيە (Barnaul)", + "Asia\/Barnaul": "رۇسىيە ۋاقتى (Barnaul)", "Asia\/Beirut": "شەرقىي ياۋروپا ۋاقتى (Beirut)", "Asia\/Bishkek": "قىرغىزىستان ۋاقتى (Bishkek)", "Asia\/Brunei": "بىرۇنىي دارۇسسالام ۋاقتى (Brunei)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ئىران ۋاقتى (Tehran)", "Asia\/Thimphu": "بۇتان ۋاقتى (Thimphu)", "Asia\/Tokyo": "ياپونىيە ۋاقتى (Tokyo)", - "Asia\/Tomsk": "رۇسىيە (Tomsk)", + "Asia\/Tomsk": "رۇسىيە ۋاقتى (Tomsk)", "Asia\/Ulaanbaatar": "ئۇلانباتور ۋاقتى (Ulaanbaatar)", - "Asia\/Urumqi": "جۇڭگو (Urumqi)", + "Asia\/Urumqi": "جۇڭگو ۋاقتى (Urumqi)", "Asia\/Ust-Nera": "ۋىلادىۋوستوك ۋاقتى (Ust-Nera)", "Asia\/Vientiane": "ھىندى چىنى ۋاقتى (Vientiane)", "Asia\/Vladivostok": "ۋىلادىۋوستوك ۋاقتى (Vladivostok)", @@ -322,7 +322,6 @@ "CST6CDT": "ئوتتۇرا قىسىم ۋاقتى", "EST5EDT": "شەرقىي قىسىم ۋاقتى", "Etc\/GMT": "گىرىنۋىچ ۋاقتى", - "Etc\/UTC": "UTC", "Europe\/Amsterdam": "ئوتتۇرا ياۋروپا ۋاقتى (Amsterdam)", "Europe\/Andorra": "ئوتتۇرا ياۋروپا ۋاقتى (Andorra)", "Europe\/Astrakhan": "موسكۋا ۋاقتى (Astrakhan)", @@ -341,11 +340,11 @@ "Europe\/Guernsey": "گىرىنۋىچ ۋاقتى (Guernsey)", "Europe\/Helsinki": "شەرقىي ياۋروپا ۋاقتى (Helsinki)", "Europe\/Isle_of_Man": "گىرىنۋىچ ۋاقتى (Isle of Man)", - "Europe\/Istanbul": "تۈركىيە (Istanbul)", + "Europe\/Istanbul": "تۈركىيە ۋاقتى (Istanbul)", "Europe\/Jersey": "گىرىنۋىچ ۋاقتى (Jersey)", "Europe\/Kaliningrad": "شەرقىي ياۋروپا ۋاقتى (Kaliningrad)", "Europe\/Kiev": "شەرقىي ياۋروپا ۋاقتى (Kiev)", - "Europe\/Kirov": "رۇسىيە (Kirov)", + "Europe\/Kirov": "رۇسىيە ۋاقتى (Kirov)", "Europe\/Lisbon": "غەربىي ياۋروپا ۋاقتى (Lisbon)", "Europe\/Ljubljana": "ئوتتۇرا ياۋروپا ۋاقتى (Ljubljana)", "Europe\/London": "گىرىنۋىچ ۋاقتى (London)", @@ -396,7 +395,7 @@ "Indian\/Reunion": "رېئونىيون ۋاقتى", "MST7MDT": "تاغ ۋاقتى", "PST8PDT": "تىنچ ئوكيان ۋاقتى", - "Pacific\/Apia": "ساموئا (Apia)", + "Pacific\/Apia": "ساموئا ۋاقتى (Apia)", "Pacific\/Auckland": "يېڭى زېلاندىيە ۋاقتى (Auckland)", "Pacific\/Bougainville": "پاپۇئا يېڭى گىۋىنېيەسى ۋاقتى (Bougainville)", "Pacific\/Chatham": "چاتام ۋاقتى (Chatham)", @@ -436,11 +435,5 @@ "Pacific\/Wake": "ۋېيك ئارىلى ۋاقتى (Wake)", "Pacific\/Wallis": "ۋاللىس ۋە فۇتۇنا ۋاقتى (Wallis)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/uk.json b/src/Symfony/Component/Intl/Resources/data/timezones/uk.json index 3ed488775e993..fa491949efd20 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/uk.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/uk.json @@ -151,7 +151,7 @@ "America\/Moncton": "за атлантичним часом (Монктон)", "America\/Monterrey": "за північноамериканським центральним часом (Монтерей)", "America\/Montevideo": "за часом в Уруґваї (Монтевідео)", - "America\/Montreal": "Канада (Montreal)", + "America\/Montreal": "час: Канада (Montreal)", "America\/Montserrat": "за атлантичним часом (Монтсеррат)", "America\/Nassau": "за північноамериканським східним часом (Насау)", "America\/New_York": "за північноамериканським східним часом (Нью-Йорк)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "за арабським часом (Бахрейн)", "Asia\/Baku": "за часом в Азербайджані (Баку)", "Asia\/Bangkok": "за часом в Індокитаї (Банґкок)", - "Asia\/Barnaul": "Росія (Барнаул)", + "Asia\/Barnaul": "час: Росія (Барнаул)", "Asia\/Beirut": "за східноєвропейським часом (Бейрут)", "Asia\/Bishkek": "за часом у Киргизстані (Бішкек)", "Asia\/Brunei": "за часом у Брунеї (Бруней)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "за іранським часом (Тегеран)", "Asia\/Thimphu": "за часом у Бутані (Тхімпху)", "Asia\/Tokyo": "за японським часом (Токіо)", - "Asia\/Tomsk": "Росія (Томськ)", + "Asia\/Tomsk": "час: Росія (Томськ)", "Asia\/Ulaanbaatar": "за часом в Улан-Баторі", - "Asia\/Urumqi": "Китай (Урумчі)", + "Asia\/Urumqi": "час: Китай (Урумчі)", "Asia\/Ust-Nera": "за владивостоцьким часом (Усть-Нера)", "Asia\/Vientiane": "за часом в Індокитаї (Вʼєнтьян)", "Asia\/Vladivostok": "за владивостоцьким часом (Владивосток)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "за Ґрінвічем (Ґернсі)", "Europe\/Helsinki": "за східноєвропейським часом (Гельсінкі)", "Europe\/Isle_of_Man": "за Ґрінвічем (Острів Мен)", - "Europe\/Istanbul": "Туреччина (Стамбул)", + "Europe\/Istanbul": "час: Туреччина (Стамбул)", "Europe\/Jersey": "за Ґрінвічем (Джерсі)", "Europe\/Kaliningrad": "за східноєвропейським часом (Калінінград)", "Europe\/Kiev": "за східноєвропейським часом (Київ)", - "Europe\/Kirov": "Росія (Кіров)", + "Europe\/Kirov": "час: Росія (Кіров)", "Europe\/Lisbon": "за західноєвропейським часом (Лісабон)", "Europe\/Ljubljana": "за центральноєвропейським часом (Любляна)", "Europe\/London": "за Ґрінвічем (Лондон)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "за часом на острові Вейк", "Pacific\/Wallis": "за часом на островах Уолліс і Футуна" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/ur.json b/src/Symfony/Component/Intl/Resources/data/timezones/ur.json index fd0233d2c0ed4..9f69cafe7153d 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/ur.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/ur.json @@ -99,7 +99,7 @@ "America\/Detroit": "ایسٹرن ٹائم (ڈیٹرائٹ)", "America\/Dominica": "اٹلانٹک ٹائم (ڈومنیکا)", "America\/Edmonton": "ماؤنٹین ٹائم (ایڈمونٹن)", - "America\/Eirunepe": "برازیل (ایرونیپ)", + "America\/Eirunepe": "برازیل وقت (ایرونیپ)", "America\/El_Salvador": "سنٹرل ٹائم (ال سلواڈور)", "America\/Fort_Nelson": "ماؤنٹین ٹائم (فورٹ نیلسن)", "America\/Fortaleza": "برازیلیا ٹائم (فورٹالیزا)", @@ -151,7 +151,7 @@ "America\/Moncton": "اٹلانٹک ٹائم (مونکٹن)", "America\/Monterrey": "سنٹرل ٹائم (مونٹیری)", "America\/Montevideo": "یوروگوئے کا وقت (مونٹی ویڈیو)", - "America\/Montreal": "کینیڈا (Montreal)", + "America\/Montreal": "کینیڈا وقت (Montreal)", "America\/Montserrat": "اٹلانٹک ٹائم (مونٹسیراٹ)", "America\/Nassau": "ایسٹرن ٹائم (نساؤ)", "America\/New_York": "ایسٹرن ٹائم (نیو یارک)", @@ -176,7 +176,7 @@ "America\/Recife": "برازیلیا ٹائم (ریسائف)", "America\/Regina": "سنٹرل ٹائم (ریجینا)", "America\/Resolute": "سنٹرل ٹائم (ریزولیوٹ)", - "America\/Rio_Branco": "برازیل (ریئو برینکو)", + "America\/Rio_Branco": "برازیل وقت (ریئو برینکو)", "America\/Santa_Isabel": "شمال مغربی میکسیکو ٹائم (سانتا ایزابیل)", "America\/Santarem": "برازیلیا ٹائم (سنٹارین)", "America\/Santiago": "چلی کا وقت (سنٹیاگو)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "عرب کا وقت (بحرین)", "Asia\/Baku": "آذربائیجان کا وقت (باکو)", "Asia\/Bangkok": "ہند چین ٹائم (بنکاک)", - "Asia\/Barnaul": "روس (برنال)", + "Asia\/Barnaul": "روس وقت (برنال)", "Asia\/Beirut": "مشرقی یورپ کا وقت (بیروت)", "Asia\/Bishkek": "کرغستان کا وقت (بشکیک)", "Asia\/Brunei": "برونئی دارالسلام ٹائم", @@ -288,9 +288,9 @@ "Asia\/Tehran": "ایران کا وقت (تہران)", "Asia\/Thimphu": "بھوٹان کا وقت (تھمپو)", "Asia\/Tokyo": "جاپان ٹائم (ٹوکیو)", - "Asia\/Tomsk": "روس (ٹامسک)", + "Asia\/Tomsk": "روس وقت (ٹامسک)", "Asia\/Ulaanbaatar": "یولان بیتور ٹائم (اولان باتار)", - "Asia\/Urumqi": "چین (یورومکی)", + "Asia\/Urumqi": "چین وقت (یورومکی)", "Asia\/Ust-Nera": "ولادی ووستک ٹائم (اوست-نیرا)", "Asia\/Vientiane": "ہند چین ٹائم (وینٹیانا)", "Asia\/Vladivostok": "ولادی ووستک ٹائم", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "گرین وچ کا اصل وقت (گرنزی)", "Europe\/Helsinki": "مشرقی یورپ کا وقت (ہیلسنکی)", "Europe\/Isle_of_Man": "گرین وچ کا اصل وقت (آئل آف مین)", - "Europe\/Istanbul": "ترکی (استنبول)", + "Europe\/Istanbul": "ترکی وقت (استنبول)", "Europe\/Jersey": "گرین وچ کا اصل وقت (جرسی)", "Europe\/Kaliningrad": "مشرقی یورپ کا وقت (کالينينغراد)", "Europe\/Kiev": "مشرقی یورپ کا وقت (کیوو)", - "Europe\/Kirov": "روس (کیروف)", + "Europe\/Kirov": "روس وقت (کیروف)", "Europe\/Lisbon": "مغربی یورپ کا وقت (لسبن)", "Europe\/Ljubljana": "وسط یورپ کا وقت (لیوبلیانا)", "Europe\/London": "گرین وچ کا اصل وقت (لندن)", @@ -437,10 +437,6 @@ "Pacific\/Wallis": "والیز اور فٹونا ٹائم (ولّیس)" }, "Meta": { - "GmtFormat": "GMT %s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] + "GmtFormat": "GMT %s" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/uz.json b/src/Symfony/Component/Intl/Resources/data/timezones/uz.json index 66d54693c6a4d..a502508a01d40 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/uz.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/uz.json @@ -436,11 +436,5 @@ "Pacific\/Wake": "Ueyk oroli vaqti", "Pacific\/Wallis": "Uollis va Futuna vaqti" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/uz_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/timezones/uz_Cyrl.json index f3bda2012ef33..7fc0f669b1baf 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/uz_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/uz_Cyrl.json @@ -98,6 +98,7 @@ "America\/Detroit": "Шимолий Америка шарқий вақти (Detroyt)", "America\/Dominica": "Атлантика вақти (Dominika)", "America\/Edmonton": "Шимолий Америка тоғ вақти (Edmonton)", + "America\/Eirunepe": "Бразилия вақти (Eyrunepe)", "America\/El_Salvador": "Шимолий Америка (Salvador)", "America\/Fort_Nelson": "Шимолий Америка тоғ вақти (Fort Nelson)", "America\/Fortaleza": "Бразилия вақти (Fortaleza)", @@ -147,6 +148,7 @@ "America\/Moncton": "Атлантика вақти (Monkton)", "America\/Monterrey": "Шимолий Америка (Monterrey)", "America\/Montevideo": "Уругвай вақти (Montevideo)", + "America\/Montreal": "Канада вақти (Montreal)", "America\/Montserrat": "Атлантика вақти (Montserrat)", "America\/Nassau": "Шимолий Америка шарқий вақти (Nassau)", "America\/New_York": "Шимолий Америка шарқий вақти (Nyu-York)", @@ -171,6 +173,7 @@ "America\/Recife": "Бразилия вақти (Resifi)", "America\/Regina": "Шимолий Америка (Rejayna)", "America\/Resolute": "Шимолий Америка (Rezolyut)", + "America\/Rio_Branco": "Бразилия вақти (Riu-Branku)", "America\/Santarem": "Бразилия вақти (Santarem)", "America\/Santiago": "Чили вақти (Santyago)", "America\/Santo_Domingo": "Атлантика вақти (Santo-Domingo)", @@ -210,6 +213,7 @@ "Asia\/Aden": "Арабистон вақти (Adan)", "Asia\/Almaty": "Шарқий Қозоғистон вақти (Almati)", "Asia\/Amman": "Шарқий Европа вақти (Ammon)", + "Asia\/Anadyr": "Россия вақти (Anadir)", "Asia\/Aqtau": "Ғарбий Қозоғистон вақти (Oqtov)", "Asia\/Aqtobe": "Ғарбий Қозоғистон вақти (Oqto‘ba)", "Asia\/Ashgabat": "Туркманистон вақти (Ashxobod)", @@ -218,6 +222,7 @@ "Asia\/Bahrain": "Арабистон вақти (Bahrayn)", "Asia\/Baku": "Озарбайжон вақти (Boku)", "Asia\/Bangkok": "Ҳинд-Хитой вақти (Bangkok)", + "Asia\/Barnaul": "Россия вақти (Barnaul)", "Asia\/Beirut": "Шарқий Европа вақти (Bayrut)", "Asia\/Bishkek": "Қирғизистон вақти (Bishkek)", "Asia\/Brunei": "Бруней Даруссалом вақти (Bruney)", @@ -240,6 +245,7 @@ "Asia\/Jayapura": "Шарқий Индонезия вақти (Jaypur)", "Asia\/Jerusalem": "Исроил вақти (Quddus)", "Asia\/Kabul": "Афғонистон вақти (Qobul)", + "Asia\/Kamchatka": "Россия вақти (Kamchatka)", "Asia\/Karachi": "Покистон вақти (Karachi)", "Asia\/Katmandu": "Непал вақти (Kathmandu)", "Asia\/Khandyga": "Якутск вақти (Xandiga)", @@ -278,7 +284,9 @@ "Asia\/Tehran": "Эрон вақти (Tehron)", "Asia\/Thimphu": "Бутан вақти (Thimphu)", "Asia\/Tokyo": "Япония вақти (Tokio)", + "Asia\/Tomsk": "Россия вақти (Tomsk)", "Asia\/Ulaanbaatar": "Улан-Батор вақти (Ulan-Bator)", + "Asia\/Urumqi": "Хитой вақти (Urumchi)", "Asia\/Ust-Nera": "Владивосток вақти (Ust-Nera)", "Asia\/Vientiane": "Ҳинд-Хитой вақти (Vyentyan)", "Asia\/Vladivostok": "Владивосток вақти (Vladivostok)", @@ -328,9 +336,11 @@ "Europe\/Guernsey": "Гринвич вақти (Gernsi)", "Europe\/Helsinki": "Шарқий Европа вақти (Xelsinki)", "Europe\/Isle_of_Man": "Гринвич вақти (Men oroli)", + "Europe\/Istanbul": "Туркия вақти (Istanbul)", "Europe\/Jersey": "Гринвич вақти (Jersi)", "Europe\/Kaliningrad": "Шарқий Европа вақти (Kaliningrad)", "Europe\/Kiev": "Шарқий Европа вақти (Kiyev)", + "Europe\/Kirov": "Россия вақти (Kirov)", "Europe\/Lisbon": "Ғарбий Европа вақти (Lissabon)", "Europe\/Ljubljana": "Марказий Европа вақти (Lyublyana)", "Europe\/London": "Гринвич вақти (London)", @@ -347,6 +357,7 @@ "Europe\/Prague": "Марказий Европа вақти (Praga)", "Europe\/Riga": "Шарқий Европа вақти (Riga)", "Europe\/Rome": "Марказий Европа вақти (Rim)", + "Europe\/Samara": "Россия вақти (Samara)", "Europe\/San_Marino": "Марказий Европа вақти (San-Marino)", "Europe\/Sarajevo": "Марказий Европа вақти (Sarayevo)", "Europe\/Saratov": "Москва вақти (Saratov)", diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/vi.json b/src/Symfony/Component/Intl/Resources/data/timezones/vi.json index 94247fc422ce5..8fdc7a121d727 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/vi.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/vi.json @@ -151,7 +151,7 @@ "America\/Moncton": "Giờ Đại Tây Dương (Moncton)", "America\/Monterrey": "Giờ miền Trung (Monterrey)", "America\/Montevideo": "Giờ Uruguay (Montevideo)", - "America\/Montreal": "Canada (Montreal)", + "America\/Montreal": "Giờ Canada (Montreal)", "America\/Montserrat": "Giờ Đại Tây Dương (Montserrat)", "America\/Nassau": "Giờ miền Đông (Nassau)", "America\/New_York": "Giờ miền Đông (New York)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Giờ Ả Rập (Bahrain)", "Asia\/Baku": "Giờ Azerbaijan (Baku)", "Asia\/Bangkok": "Giờ Đông Dương (Bangkok)", - "Asia\/Barnaul": "Nga (Barnaul)", + "Asia\/Barnaul": "Giờ Nga (Barnaul)", "Asia\/Beirut": "Giờ Đông Âu (Beirut)", "Asia\/Bishkek": "Giờ Kyrgystan (Bishkek)", "Asia\/Brunei": "Giờ Brunei Darussalam", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Giờ Iran (Tehran)", "Asia\/Thimphu": "Giờ Bhutan (Thimphu)", "Asia\/Tokyo": "Giờ Nhật Bản (Tokyo)", - "Asia\/Tomsk": "Nga (Tomsk)", + "Asia\/Tomsk": "Giờ Nga (Tomsk)", "Asia\/Ulaanbaatar": "Giờ Ulan Bator (Ulaanbaatar)", - "Asia\/Urumqi": "Trung Quốc (Urumqi)", + "Asia\/Urumqi": "Giờ Trung Quốc (Urumqi)", "Asia\/Ust-Nera": "Giờ Vladivostok (Ust-Nera)", "Asia\/Vientiane": "Giờ Đông Dương (Viêng Chăn)", "Asia\/Vladivostok": "Giờ Vladivostok", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Giờ Trung bình Greenwich (Guernsey)", "Europe\/Helsinki": "Giờ Đông Âu (Helsinki)", "Europe\/Isle_of_Man": "Giờ Trung bình Greenwich (Đảo Man)", - "Europe\/Istanbul": "Thổ Nhĩ Kỳ (Istanbul)", + "Europe\/Istanbul": "Giờ Thổ Nhĩ Kỳ (Istanbul)", "Europe\/Jersey": "Giờ Trung bình Greenwich (Jersey)", "Europe\/Kaliningrad": "Giờ Đông Âu (Kaliningrad)", "Europe\/Kiev": "Giờ Đông Âu (Kiev)", - "Europe\/Kirov": "Nga (Kirov)", + "Europe\/Kirov": "Giờ Nga (Kirov)", "Europe\/Lisbon": "Giờ Tây Âu (Lisbon)", "Europe\/Ljubljana": "Giờ Trung Âu (Ljubljana)", "Europe\/London": "Giờ Trung bình Greenwich (London)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Giờ Đảo Wake", "Pacific\/Wallis": "Giờ Wallis và Futuna" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/wo.json b/src/Symfony/Component/Intl/Resources/data/timezones/wo.json index ad5a98000d09a..e790a4d05084e 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/wo.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/wo.json @@ -430,11 +430,5 @@ "Pacific\/Wake": "Duni Amerig Utar meer (Wake)", "Pacific\/Wallis": "Walis ak Futuna (Wallis)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/yi.json b/src/Symfony/Component/Intl/Resources/data/timezones/yi.json index 34ee424f45c0d..394088e2b963a 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/yi.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/yi.json @@ -273,10 +273,6 @@ "Australia\/Melbourne": "אויסטראַליע (Melbourne)", "Australia\/Perth": "אויסטראַליע (Perth)", "Australia\/Sydney": "אויסטראַליע (Sydney)", - "CST6CDT": "CST6CDT", - "EST5EDT": "EST5EDT", - "Etc\/GMT": "GMT", - "Etc\/UTC": "UTC", "Europe\/Amsterdam": "האלאַנד (Amsterdam)", "Europe\/Andorra": "אַנדארע (Andorra)", "Europe\/Astrakhan": "רוסלאַנד (Astrakhan)", @@ -342,8 +338,6 @@ "Indian\/Mauritius": "מאריציוס (Mauritius)", "Indian\/Mayotte": "מאַיאט (Mayotte)", "Indian\/Reunion": "רעאוניאן (Reunion)", - "MST7MDT": "MST7MDT", - "PST8PDT": "PST8PDT", "Pacific\/Apia": "סאַמאאַ (Apia)", "Pacific\/Auckland": "ניו זילאַנד (Auckland)", "Pacific\/Bougainville": "פּאַפּואַ נײַ גינע (Bougainville)", @@ -374,11 +368,5 @@ "Pacific\/Tongatapu": "טאנגאַ (Tongatapu)", "Pacific\/Truk": "מיקראנעזיע (Chuuk)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/yo.json b/src/Symfony/Component/Intl/Resources/data/timezones/yo.json index 979e67a119c98..a8cdc622676df 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/yo.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/yo.json @@ -3,93 +3,93 @@ "Names": { "Africa\/Abidjan": "Greenwich Mean Time (Abidjan)", "Africa\/Accra": "Greenwich Mean Time (Accra)", - "Africa\/Addis_Ababa": "Orílẹ́ède Etopia (Addis Ababa)", + "Africa\/Addis_Ababa": "Orílẹ́ède Etopia Ìgbà (Addis Ababa)", "Africa\/Algiers": "Àkókò Àárin Europe (Algiers)", - "Africa\/Asmera": "Orílẹ́ède Eritira (Asmara)", + "Africa\/Asmera": "Orílẹ́ède Eritira Ìgbà (Asmara)", "Africa\/Bamako": "Greenwich Mean Time (Bamako)", - "Africa\/Bangui": "Orílẹ́ède Àrin gùngun Áfíríkà (Bangui)", + "Africa\/Bangui": "Orílẹ́ède Àrin gùngun Áfíríkà Ìgbà (Bangui)", "Africa\/Banjul": "Greenwich Mean Time (Banjul)", "Africa\/Bissau": "Greenwich Mean Time (Bissau)", - "Africa\/Blantyre": "Orílẹ́ède Malawi (Blantyre)", - "Africa\/Brazzaville": "Orílẹ́ède Kóngò (Brazzaville)", - "Africa\/Bujumbura": "Orílẹ́ède Bùùrúndì (Bujumbura)", + "Africa\/Blantyre": "Orílẹ́ède Malawi Ìgbà (Blantyre)", + "Africa\/Brazzaville": "Orílẹ́ède Kóngò Ìgbà (Brazzaville)", + "Africa\/Bujumbura": "Orílẹ́ède Bùùrúndì Ìgbà (Bujumbura)", "Africa\/Cairo": "Àkókò Ìhà Ìlà Oòrùn Europe (Cairo)", "Africa\/Casablanca": "Àkókò Ìwọ Oòrùn Europe (Casablanca)", "Africa\/Ceuta": "Àkókò Àárin Europe (Ceuta)", "Africa\/Conakry": "Greenwich Mean Time (Conakry)", "Africa\/Dakar": "Greenwich Mean Time (Dakar)", - "Africa\/Dar_es_Salaam": "Orílẹ́ède Tanṣania (Dar es Salaam)", - "Africa\/Djibouti": "Orílẹ́ède Díbọ́ótì (Djibouti)", - "Africa\/Douala": "Orílẹ́ède Kamerúúnì (Douala)", + "Africa\/Dar_es_Salaam": "Orílẹ́ède Tanṣania Ìgbà (Dar es Salaam)", + "Africa\/Djibouti": "Orílẹ́ède Díbọ́ótì Ìgbà (Djibouti)", + "Africa\/Douala": "Orílẹ́ède Kamerúúnì Ìgbà (Douala)", "Africa\/El_Aaiun": "Àkókò Ìwọ Oòrùn Europe (El Aaiun)", "Africa\/Freetown": "Greenwich Mean Time (Freetown)", - "Africa\/Gaborone": "Orílẹ́ède Bọ̀tìsúwánà (Gaborone)", - "Africa\/Harare": "Orílẹ́ède ṣimibabe (Harare)", - "Africa\/Johannesburg": "Orílẹ́ède Ariwa Afirika (Johannesburg)", - "Africa\/Kampala": "Orílẹ́ède Uganda (Kampala)", - "Africa\/Khartoum": "Orílẹ́ède Sudani (Khartoum)", - "Africa\/Kigali": "Orílẹ́ède Ruwanda (Kigali)", - "Africa\/Kinshasa": "Orilẹ́ède Kóngò (Kinshasa)", - "Africa\/Lagos": "Orilẹ̀-èdè Nàìjíríà (Lagos)", - "Africa\/Libreville": "Orílẹ́ède Gabon (Libreville)", + "Africa\/Gaborone": "Orílẹ́ède Bọ̀tìsúwánà Ìgbà (Gaborone)", + "Africa\/Harare": "Orílẹ́ède ṣimibabe Ìgbà (Harare)", + "Africa\/Johannesburg": "Orílẹ́ède Ariwa Afirika Ìgbà (Johannesburg)", + "Africa\/Kampala": "Orílẹ́ède Uganda Ìgbà (Kampala)", + "Africa\/Khartoum": "Orílẹ́ède Sudani Ìgbà (Khartoum)", + "Africa\/Kigali": "Orílẹ́ède Ruwanda Ìgbà (Kigali)", + "Africa\/Kinshasa": "Orilẹ́ède Kóngò Ìgbà (Kinshasa)", + "Africa\/Lagos": "Orilẹ̀-èdè Nàìjíríà Ìgbà (Lagos)", + "Africa\/Libreville": "Orílẹ́ède Gabon Ìgbà (Libreville)", "Africa\/Lome": "Greenwich Mean Time (Lome)", - "Africa\/Luanda": "Orílẹ́ède Ààngólà (Luanda)", - "Africa\/Lubumbashi": "Orilẹ́ède Kóngò (Lubumbashi)", - "Africa\/Lusaka": "Orílẹ́ède ṣamibia (Lusaka)", - "Africa\/Malabo": "Orílẹ́ède Ekutoria Gini (Malabo)", - "Africa\/Maputo": "Orílẹ́ède Moṣamibiku (Maputo)", - "Africa\/Maseru": "Orílẹ́ède Lesoto (Maseru)", - "Africa\/Mbabane": "Orílẹ́ède Saṣiland (Mbabane)", - "Africa\/Mogadishu": "Orílẹ́ède Somalia (Mogadishu)", + "Africa\/Luanda": "Orílẹ́ède Ààngólà Ìgbà (Luanda)", + "Africa\/Lubumbashi": "Orilẹ́ède Kóngò Ìgbà (Lubumbashi)", + "Africa\/Lusaka": "Orílẹ́ède ṣamibia Ìgbà (Lusaka)", + "Africa\/Malabo": "Orílẹ́ède Ekutoria Gini Ìgbà (Malabo)", + "Africa\/Maputo": "Orílẹ́ède Moṣamibiku Ìgbà (Maputo)", + "Africa\/Maseru": "Orílẹ́ède Lesoto Ìgbà (Maseru)", + "Africa\/Mbabane": "Orílẹ́ède Saṣiland Ìgbà (Mbabane)", + "Africa\/Mogadishu": "Orílẹ́ède Somalia Ìgbà (Mogadishu)", "Africa\/Monrovia": "Greenwich Mean Time (Monrovia)", - "Africa\/Nairobi": "Orílẹ́ède Kenya (Nairobi)", - "Africa\/Ndjamena": "Orílẹ́ède ṣààdì (Ndjamena)", - "Africa\/Niamey": "Orílẹ́ède Nàìjá (Niamey)", + "Africa\/Nairobi": "Orílẹ́ède Kenya Ìgbà (Nairobi)", + "Africa\/Ndjamena": "Orílẹ́ède ṣààdì Ìgbà (Ndjamena)", + "Africa\/Niamey": "Orílẹ́ède Nàìjá Ìgbà (Niamey)", "Africa\/Nouakchott": "Greenwich Mean Time (Nouakchott)", "Africa\/Ouagadougou": "Greenwich Mean Time (Ouagadougou)", - "Africa\/Porto-Novo": "Orílẹ́ède Bẹ̀nẹ̀ (Porto-Novo)", + "Africa\/Porto-Novo": "Orílẹ́ède Bẹ̀nẹ̀ Ìgbà (Porto-Novo)", "Africa\/Sao_Tome": "Greenwich Mean Time (Sao Tome)", "Africa\/Tripoli": "Àkókò Ìhà Ìlà Oòrùn Europe (Tripoli)", "Africa\/Tunis": "Àkókò Àárin Europe (Tunis)", - "Africa\/Windhoek": "Orílẹ́ède Namibia (Windhoek)", - "America\/Adak": "Orílẹ̀-èdè Amẹrikà (Adak)", - "America\/Anchorage": "Orílẹ̀-èdè Amẹrikà (Anchorage)", + "Africa\/Windhoek": "Orílẹ́ède Namibia Ìgbà (Windhoek)", + "America\/Adak": "Orílẹ̀-èdè Amẹrikà Ìgbà (Adak)", + "America\/Anchorage": "Orílẹ̀-èdè Amẹrikà Ìgbà (Anchorage)", "America\/Anguilla": "Àkókò Àtìláńtíìkì (Anguilla)", "America\/Antigua": "Àkókò Àtìláńtíìkì (Antigua)", - "America\/Araguaina": "Orilẹ̀-èdè Bàràsílì (Araguaina)", - "America\/Argentina\/La_Rioja": "Orílẹ́ède Agentínà (La Rioja)", - "America\/Argentina\/Rio_Gallegos": "Orílẹ́ède Agentínà (Rio Gallegos)", - "America\/Argentina\/Salta": "Orílẹ́ède Agentínà (Salta)", - "America\/Argentina\/San_Juan": "Orílẹ́ède Agentínà (San Juan)", - "America\/Argentina\/San_Luis": "Orílẹ́ède Agentínà (San Luis)", - "America\/Argentina\/Tucuman": "Orílẹ́ède Agentínà (Tucuman)", - "America\/Argentina\/Ushuaia": "Orílẹ́ède Agentínà (Ushuaia)", + "America\/Araguaina": "Orilẹ̀-èdè Bàràsílì Ìgbà (Araguaina)", + "America\/Argentina\/La_Rioja": "Orílẹ́ède Agentínà Ìgbà (La Rioja)", + "America\/Argentina\/Rio_Gallegos": "Orílẹ́ède Agentínà Ìgbà (Rio Gallegos)", + "America\/Argentina\/Salta": "Orílẹ́ède Agentínà Ìgbà (Salta)", + "America\/Argentina\/San_Juan": "Orílẹ́ède Agentínà Ìgbà (San Juan)", + "America\/Argentina\/San_Luis": "Orílẹ́ède Agentínà Ìgbà (San Luis)", + "America\/Argentina\/Tucuman": "Orílẹ́ède Agentínà Ìgbà (Tucuman)", + "America\/Argentina\/Ushuaia": "Orílẹ́ède Agentínà Ìgbà (Ushuaia)", "America\/Aruba": "Àkókò Àtìláńtíìkì (Aruba)", - "America\/Asuncion": "Orílẹ́ède Paraguye (Asuncion)", - "America\/Bahia": "Orilẹ̀-èdè Bàràsílì (Bahia)", + "America\/Asuncion": "Orílẹ́ède Paraguye Ìgbà (Asuncion)", + "America\/Bahia": "Orilẹ̀-èdè Bàràsílì Ìgbà (Bahia)", "America\/Bahia_Banderas": "àkókò àárín gbùngbùn (Bahia Banderas)", "America\/Barbados": "Àkókò Àtìláńtíìkì (Barbados)", - "America\/Belem": "Orilẹ̀-èdè Bàràsílì (Belem)", + "America\/Belem": "Orilẹ̀-èdè Bàràsílì Ìgbà (Belem)", "America\/Belize": "àkókò àárín gbùngbùn (Belize)", "America\/Blanc-Sablon": "Àkókò Àtìláńtíìkì (Blanc-Sablon)", - "America\/Boa_Vista": "Orilẹ̀-èdè Bàràsílì (Boa Vista)", - "America\/Bogota": "Orílẹ́ède Kòlómíbìa (Bogota)", + "America\/Boa_Vista": "Orilẹ̀-èdè Bàràsílì Ìgbà (Boa Vista)", + "America\/Bogota": "Orílẹ́ède Kòlómíbìa Ìgbà (Bogota)", "America\/Boise": "Àkókò òkè (Boise)", - "America\/Buenos_Aires": "Orílẹ́ède Agentínà (Buenos Aires)", + "America\/Buenos_Aires": "Orílẹ́ède Agentínà Ìgbà (Buenos Aires)", "America\/Cambridge_Bay": "Àkókò òkè (Cambridge Bay)", - "America\/Campo_Grande": "Orilẹ̀-èdè Bàràsílì (Campo Grande)", + "America\/Campo_Grande": "Orilẹ̀-èdè Bàràsílì Ìgbà (Campo Grande)", "America\/Cancun": "Àkókò ìhà ìlà oòrùn (Cancun)", - "America\/Caracas": "Orílẹ́ède Fẹnẹṣuẹla (Caracas)", - "America\/Catamarca": "Orílẹ́ède Agentínà (Catamarca)", - "America\/Cayenne": "Orílẹ́ède Firenṣi Guana (Cayenne)", + "America\/Caracas": "Orílẹ́ède Fẹnẹṣuẹla Ìgbà (Caracas)", + "America\/Catamarca": "Orílẹ́ède Agentínà Ìgbà (Catamarca)", + "America\/Cayenne": "Orílẹ́ède Firenṣi Guana Ìgbà (Cayenne)", "America\/Cayman": "Àkókò ìhà ìlà oòrùn (Cayman)", "America\/Chicago": "àkókò àárín gbùngbùn (Chicago)", - "America\/Chihuahua": "Orílẹ́ède Mesiko (Chihuahua)", + "America\/Chihuahua": "Orílẹ́ède Mesiko Ìgbà (Chihuahua)", "America\/Coral_Harbour": "Àkókò ìhà ìlà oòrùn (Atikokan)", - "America\/Cordoba": "Orílẹ́ède Agentínà (Cordoba)", + "America\/Cordoba": "Orílẹ́ède Agentínà Ìgbà (Cordoba)", "America\/Costa_Rica": "àkókò àárín gbùngbùn (Costa Rica)", "America\/Creston": "Àkókò òkè (Creston)", - "America\/Cuiaba": "Orilẹ̀-èdè Bàràsílì (Cuiaba)", + "America\/Cuiaba": "Orilẹ̀-èdè Bàràsílì Ìgbà (Cuiaba)", "America\/Curacao": "Àkókò Àtìláńtíìkì (Curacao)", "America\/Danmarkshavn": "Greenwich Mean Time (Danmarkshavn)", "America\/Dawson": "Àkókò Pàsífíìkì (Dawson)", @@ -98,22 +98,22 @@ "America\/Detroit": "Àkókò ìhà ìlà oòrùn (Detroit)", "America\/Dominica": "Àkókò Àtìláńtíìkì (Dominica)", "America\/Edmonton": "Àkókò òkè (Edmonton)", - "America\/Eirunepe": "Orilẹ̀-èdè Bàràsílì (Eirunepe)", + "America\/Eirunepe": "Orilẹ̀-èdè Bàràsílì Ìgbà (Eirunepe)", "America\/El_Salvador": "àkókò àárín gbùngbùn (El Salvador)", "America\/Fort_Nelson": "Àkókò òkè (Fort Nelson)", - "America\/Fortaleza": "Orilẹ̀-èdè Bàràsílì (Fortaleza)", + "America\/Fortaleza": "Orilẹ̀-èdè Bàràsílì Ìgbà (Fortaleza)", "America\/Glace_Bay": "Àkókò Àtìláńtíìkì (Glace Bay)", - "America\/Godthab": "Orílẹ́ède Gerelandi (Nuuk)", + "America\/Godthab": "Orílẹ́ède Gerelandi Ìgbà (Nuuk)", "America\/Goose_Bay": "Àkókò Àtìláńtíìkì (Goose Bay)", "America\/Grand_Turk": "Àkókò ìhà ìlà oòrùn (Grand Turk)", "America\/Grenada": "Àkókò Àtìláńtíìkì (Grenada)", "America\/Guadeloupe": "Àkókò Àtìláńtíìkì (Guadeloupe)", "America\/Guatemala": "àkókò àárín gbùngbùn (Guatemala)", - "America\/Guayaquil": "Orílẹ́ède Ekuádò (Guayaquil)", - "America\/Guyana": "Orílẹ́ède Guyana (Guyana)", + "America\/Guayaquil": "Orílẹ́ède Ekuádò Ìgbà (Guayaquil)", + "America\/Guyana": "Orílẹ́ède Guyana Ìgbà (Guyana)", "America\/Halifax": "Àkókò Àtìláńtíìkì (Halifax)", - "America\/Havana": "Orílẹ́ède Kúbà (Havana)", - "America\/Hermosillo": "Orílẹ́ède Mesiko (Hermosillo)", + "America\/Havana": "Orílẹ́ède Kúbà Ìgbà (Havana)", + "America\/Hermosillo": "Orílẹ́ède Mesiko Ìgbà (Hermosillo)", "America\/Indiana\/Knox": "àkókò àárín gbùngbùn (Knox, Indiana)", "America\/Indiana\/Marengo": "Àkókò ìhà ìlà oòrùn (Marengo, Indiana)", "America\/Indiana\/Petersburg": "Àkókò ìhà ìlà oòrùn (Petersburg, Indiana)", @@ -125,66 +125,66 @@ "America\/Inuvik": "Àkókò òkè (Inuvik)", "America\/Iqaluit": "Àkókò ìhà ìlà oòrùn (Iqaluit)", "America\/Jamaica": "Àkókò ìhà ìlà oòrùn (Jamaica)", - "America\/Jujuy": "Orílẹ́ède Agentínà (Jujuy)", - "America\/Juneau": "Orílẹ̀-èdè Amẹrikà (Juneau)", + "America\/Jujuy": "Orílẹ́ède Agentínà Ìgbà (Jujuy)", + "America\/Juneau": "Orílẹ̀-èdè Amẹrikà Ìgbà (Juneau)", "America\/Kentucky\/Monticello": "Àkókò ìhà ìlà oòrùn (Monticello, Kentucky)", "America\/Kralendijk": "Àkókò Àtìláńtíìkì (Kralendijk)", - "America\/La_Paz": "Orílẹ́ède Bọ̀lífíyà (La Paz)", - "America\/Lima": "Orílẹ́ède Peru (Lima)", + "America\/La_Paz": "Orílẹ́ède Bọ̀lífíyà Ìgbà (La Paz)", + "America\/Lima": "Orílẹ́ède Peru Ìgbà (Lima)", "America\/Los_Angeles": "Àkókò Pàsífíìkì (Los Angeles)", "America\/Louisville": "Àkókò ìhà ìlà oòrùn (Louisville)", "America\/Lower_Princes": "Àkókò Àtìláńtíìkì (Lower Prince’s Quarter)", - "America\/Maceio": "Orilẹ̀-èdè Bàràsílì (Maceio)", + "America\/Maceio": "Orilẹ̀-èdè Bàràsílì Ìgbà (Maceio)", "America\/Managua": "àkókò àárín gbùngbùn (Managua)", - "America\/Manaus": "Orilẹ̀-èdè Bàràsílì (Manaus)", + "America\/Manaus": "Orilẹ̀-èdè Bàràsílì Ìgbà (Manaus)", "America\/Marigot": "Àkókò Àtìláńtíìkì (Marigot)", "America\/Martinique": "Àkókò Àtìláńtíìkì (Martinique)", "America\/Matamoros": "àkókò àárín gbùngbùn (Matamoros)", - "America\/Mazatlan": "Orílẹ́ède Mesiko (Mazatlan)", - "America\/Mendoza": "Orílẹ́ède Agentínà (Mendoza)", + "America\/Mazatlan": "Orílẹ́ède Mesiko Ìgbà (Mazatlan)", + "America\/Mendoza": "Orílẹ́ède Agentínà Ìgbà (Mendoza)", "America\/Menominee": "àkókò àárín gbùngbùn (Menominee)", "America\/Merida": "àkókò àárín gbùngbùn (Merida)", - "America\/Metlakatla": "Orílẹ̀-èdè Amẹrikà (Metlakatla)", + "America\/Metlakatla": "Orílẹ̀-èdè Amẹrikà Ìgbà (Metlakatla)", "America\/Mexico_City": "àkókò àárín gbùngbùn (Mexico City)", - "America\/Miquelon": "Orílẹ́ède Pẹẹri ati mikuloni (Miquelon)", + "America\/Miquelon": "Orílẹ́ède Pẹẹri ati mikuloni Ìgbà (Miquelon)", "America\/Moncton": "Àkókò Àtìláńtíìkì (Moncton)", "America\/Monterrey": "àkókò àárín gbùngbùn (Monterrey)", - "America\/Montevideo": "Orílẹ́ède Nruguayi (Montevideo)", - "America\/Montreal": "Orílẹ́ède Kánádà (Montreal)", + "America\/Montevideo": "Orílẹ́ède Nruguayi Ìgbà (Montevideo)", + "America\/Montreal": "Orílẹ́ède Kánádà Ìgbà (Montreal)", "America\/Montserrat": "Àkókò Àtìláńtíìkì (Montserrat)", "America\/Nassau": "Àkókò ìhà ìlà oòrùn (Nassau)", "America\/New_York": "Àkókò ìhà ìlà oòrùn (New York)", "America\/Nipigon": "Àkókò ìhà ìlà oòrùn (Nipigon)", - "America\/Nome": "Orílẹ̀-èdè Amẹrikà (Nome)", - "America\/Noronha": "Orilẹ̀-èdè Bàràsílì (Noronha)", + "America\/Nome": "Orílẹ̀-èdè Amẹrikà Ìgbà (Nome)", + "America\/Noronha": "Orilẹ̀-èdè Bàràsílì Ìgbà (Noronha)", "America\/North_Dakota\/Beulah": "àkókò àárín gbùngbùn (Beulah, North Dakota)", "America\/North_Dakota\/Center": "àkókò àárín gbùngbùn (Center, North Dakota)", "America\/North_Dakota\/New_Salem": "àkókò àárín gbùngbùn (New Salem, North Dakota)", "America\/Ojinaga": "Àkókò òkè (Ojinaga)", "America\/Panama": "Àkókò ìhà ìlà oòrùn (Panama)", "America\/Pangnirtung": "Àkókò ìhà ìlà oòrùn (Pangnirtung)", - "America\/Paramaribo": "Orílẹ́ède Surinami (Paramaribo)", + "America\/Paramaribo": "Orílẹ́ède Surinami Ìgbà (Paramaribo)", "America\/Phoenix": "Àkókò òkè (Phoenix)", "America\/Port-au-Prince": "Àkókò ìhà ìlà oòrùn (Port-au-Prince)", "America\/Port_of_Spain": "Àkókò Àtìláńtíìkì (Port of Spain)", - "America\/Porto_Velho": "Orilẹ̀-èdè Bàràsílì (Porto Velho)", + "America\/Porto_Velho": "Orilẹ̀-èdè Bàràsílì Ìgbà (Porto Velho)", "America\/Puerto_Rico": "Àkókò Àtìláńtíìkì (Puerto Rico)", - "America\/Punta_Arenas": "Orílẹ́ède ṣílè (Punta Arenas)", + "America\/Punta_Arenas": "Orílẹ́ède ṣílè Ìgbà (Punta Arenas)", "America\/Rainy_River": "àkókò àárín gbùngbùn (Rainy River)", "America\/Rankin_Inlet": "àkókò àárín gbùngbùn (Rankin Inlet)", - "America\/Recife": "Orilẹ̀-èdè Bàràsílì (Recife)", + "America\/Recife": "Orilẹ̀-èdè Bàràsílì Ìgbà (Recife)", "America\/Regina": "àkókò àárín gbùngbùn (Regina)", "America\/Resolute": "àkókò àárín gbùngbùn (Resolute)", - "America\/Rio_Branco": "Orilẹ̀-èdè Bàràsílì (Rio Branco)", - "America\/Santa_Isabel": "Orílẹ́ède Mesiko (Santa Isabel)", - "America\/Santarem": "Orilẹ̀-èdè Bàràsílì (Santarem)", - "America\/Santiago": "Orílẹ́ède ṣílè (Santiago)", + "America\/Rio_Branco": "Orilẹ̀-èdè Bàràsílì Ìgbà (Rio Branco)", + "America\/Santa_Isabel": "Orílẹ́ède Mesiko Ìgbà (Santa Isabel)", + "America\/Santarem": "Orilẹ̀-èdè Bàràsílì Ìgbà (Santarem)", + "America\/Santiago": "Orílẹ́ède ṣílè Ìgbà (Santiago)", "America\/Santo_Domingo": "Àkókò Àtìláńtíìkì (Santo Domingo)", - "America\/Sao_Paulo": "Orilẹ̀-èdè Bàràsílì (Sao Paulo)", - "America\/Scoresbysund": "Orílẹ́ède Gerelandi (Ittoqqortoormiit)", - "America\/Sitka": "Orílẹ̀-èdè Amẹrikà (Sitka)", + "America\/Sao_Paulo": "Orilẹ̀-èdè Bàràsílì Ìgbà (Sao Paulo)", + "America\/Scoresbysund": "Orílẹ́ède Gerelandi Ìgbà (Ittoqqortoormiit)", + "America\/Sitka": "Orílẹ̀-èdè Amẹrikà Ìgbà (Sitka)", "America\/St_Barthelemy": "Àkókò Àtìláńtíìkì (St. Barthelemy)", - "America\/St_Johns": "Orílẹ́ède Kánádà (St. John’s)", + "America\/St_Johns": "Orílẹ́ède Kánádà Ìgbà (St. John’s)", "America\/St_Kitts": "Àkókò Àtìláńtíìkì (St. Kitts)", "America\/St_Lucia": "Àkókò Àtìláńtíìkì (St. Lucia)", "America\/St_Thomas": "Àkókò Àtìláńtíìkì (St. Thomas)", @@ -199,120 +199,120 @@ "America\/Vancouver": "Àkókò Pàsífíìkì (Vancouver)", "America\/Whitehorse": "Àkókò Pàsífíìkì (Whitehorse)", "America\/Winnipeg": "àkókò àárín gbùngbùn (Winnipeg)", - "America\/Yakutat": "Orílẹ̀-èdè Amẹrikà (Yakutat)", + "America\/Yakutat": "Orílẹ̀-èdè Amẹrikà Ìgbà (Yakutat)", "America\/Yellowknife": "Àkókò òkè (Yellowknife)", - "Antarctica\/Macquarie": "Orílẹ́ède Ástràlìá (Macquarie)", + "Antarctica\/Macquarie": "Orílẹ́ède Ástràlìá Ìgbà (Macquarie)", "Antarctica\/Troll": "Greenwich Mean Time (Troll)", "Arctic\/Longyearbyen": "Àkókò Àárin Europe (Longyearbyen)", - "Asia\/Aden": "Orílẹ́ède yemeni (Aden)", - "Asia\/Almaty": "Orílẹ́ède Kaṣaṣatani (Almaty)", + "Asia\/Aden": "Orílẹ́ède yemeni Ìgbà (Aden)", + "Asia\/Almaty": "Orílẹ́ède Kaṣaṣatani Ìgbà (Almaty)", "Asia\/Amman": "Àkókò Ìhà Ìlà Oòrùn Europe (Amman)", - "Asia\/Anadyr": "Orílẹ́ède Rọṣia (Anadyr)", - "Asia\/Aqtau": "Orílẹ́ède Kaṣaṣatani (Aqtau)", - "Asia\/Aqtobe": "Orílẹ́ède Kaṣaṣatani (Aqtobe)", - "Asia\/Ashgabat": "Orílẹ́ède Tọọkimenisita (Ashgabat)", - "Asia\/Atyrau": "Orílẹ́ède Kaṣaṣatani (Atyrau)", - "Asia\/Baghdad": "Orílẹ́ède Iraki (Baghdad)", - "Asia\/Bahrain": "Orílẹ́ède Báránì (Bahrain)", - "Asia\/Baku": "Orílẹ́ède Asẹ́bájánì (Baku)", - "Asia\/Bangkok": "Orílẹ́ède Tailandi (Bangkok)", - "Asia\/Barnaul": "Orílẹ́ède Rọṣia (Barnaul)", + "Asia\/Anadyr": "Orílẹ́ède Rọṣia Ìgbà (Anadyr)", + "Asia\/Aqtau": "Orílẹ́ède Kaṣaṣatani Ìgbà (Aqtau)", + "Asia\/Aqtobe": "Orílẹ́ède Kaṣaṣatani Ìgbà (Aqtobe)", + "Asia\/Ashgabat": "Orílẹ́ède Tọọkimenisita Ìgbà (Ashgabat)", + "Asia\/Atyrau": "Orílẹ́ède Kaṣaṣatani Ìgbà (Atyrau)", + "Asia\/Baghdad": "Orílẹ́ède Iraki Ìgbà (Baghdad)", + "Asia\/Bahrain": "Orílẹ́ède Báránì Ìgbà (Bahrain)", + "Asia\/Baku": "Orílẹ́ède Asẹ́bájánì Ìgbà (Baku)", + "Asia\/Bangkok": "Orílẹ́ède Tailandi Ìgbà (Bangkok)", + "Asia\/Barnaul": "Orílẹ́ède Rọṣia Ìgbà (Barnaul)", "Asia\/Beirut": "Àkókò Ìhà Ìlà Oòrùn Europe (Beirut)", - "Asia\/Bishkek": "Orílẹ́ède Kuriṣisitani (Bishkek)", - "Asia\/Brunei": "Orílẹ́ède Búrúnẹ́lì (Brunei)", - "Asia\/Calcutta": "Orílẹ́ède India (Kolkata)", - "Asia\/Chita": "Orílẹ́ède Rọṣia (Chita)", - "Asia\/Choibalsan": "Orílẹ́ède Mogolia (Choibalsan)", - "Asia\/Colombo": "Orílẹ́ède Siri Lanka (Colombo)", + "Asia\/Bishkek": "Orílẹ́ède Kuriṣisitani Ìgbà (Bishkek)", + "Asia\/Brunei": "Orílẹ́ède Búrúnẹ́lì Ìgbà (Brunei)", + "Asia\/Calcutta": "Orílẹ́ède India Ìgbà (Kolkata)", + "Asia\/Chita": "Orílẹ́ède Rọṣia Ìgbà (Chita)", + "Asia\/Choibalsan": "Orílẹ́ède Mogolia Ìgbà (Choibalsan)", + "Asia\/Colombo": "Orílẹ́ède Siri Lanka Ìgbà (Colombo)", "Asia\/Damascus": "Àkókò Ìhà Ìlà Oòrùn Europe (Damascus)", - "Asia\/Dhaka": "Orílẹ́ède Bángáládésì (Dhaka)", - "Asia\/Dili": "Orílẹ́ède ÌlàOòrùn Tímọ̀ (Dili)", - "Asia\/Dubai": "Orílẹ́ède Ẹmirate ti Awọn Arabu (Dubai)", - "Asia\/Dushanbe": "Orílẹ́ède Takisitani (Dushanbe)", + "Asia\/Dhaka": "Orílẹ́ède Bángáládésì Ìgbà (Dhaka)", + "Asia\/Dili": "Orílẹ́ède ÌlàOòrùn Tímọ̀ Ìgbà (Dili)", + "Asia\/Dubai": "Orílẹ́ède Ẹmirate ti Awọn Arabu Ìgbà (Dubai)", + "Asia\/Dushanbe": "Orílẹ́ède Takisitani Ìgbà (Dushanbe)", "Asia\/Famagusta": "Àkókò Ìhà Ìlà Oòrùn Europe (Famagusta)", "Asia\/Gaza": "Àkókò Ìhà Ìlà Oòrùn Europe (Gaza)", "Asia\/Hebron": "Àkókò Ìhà Ìlà Oòrùn Europe (Hebron)", - "Asia\/Hovd": "Orílẹ́ède Mogolia (Hovd)", - "Asia\/Irkutsk": "Orílẹ́ède Rọṣia (Irkutsk)", - "Asia\/Jakarta": "Orílẹ́ède Indonesia (Jakarta)", - "Asia\/Jayapura": "Orílẹ́ède Indonesia (Jayapura)", - "Asia\/Jerusalem": "Orílẹ́ède Iserẹli (Jerusalem)", - "Asia\/Kabul": "Orílẹ́ède Àfùgànístánì (Kabul)", - "Asia\/Kamchatka": "Orílẹ́ède Rọṣia (Kamchatka)", - "Asia\/Karachi": "Orílẹ́ède Pakisitan (Karachi)", - "Asia\/Katmandu": "Orílẹ́ède Nepa (Kathmandu)", - "Asia\/Khandyga": "Orílẹ́ède Rọṣia (Khandyga)", - "Asia\/Krasnoyarsk": "Orílẹ́ède Rọṣia (Krasnoyarsk)", - "Asia\/Kuala_Lumpur": "Orílẹ́ède Malasia (Kuala Lumpur)", - "Asia\/Kuching": "Orílẹ́ède Malasia (Kuching)", - "Asia\/Kuwait": "Orílẹ́ède Kuweti (Kuwait)", - "Asia\/Magadan": "Orílẹ́ède Rọṣia (Magadan)", - "Asia\/Makassar": "Orílẹ́ède Indonesia (Makassar)", - "Asia\/Manila": "Orílẹ́ède filipini (Manila)", - "Asia\/Muscat": "Orílẹ́ède Ọọma (Muscat)", + "Asia\/Hovd": "Orílẹ́ède Mogolia Ìgbà (Hovd)", + "Asia\/Irkutsk": "Orílẹ́ède Rọṣia Ìgbà (Irkutsk)", + "Asia\/Jakarta": "Orílẹ́ède Indonesia Ìgbà (Jakarta)", + "Asia\/Jayapura": "Orílẹ́ède Indonesia Ìgbà (Jayapura)", + "Asia\/Jerusalem": "Orílẹ́ède Iserẹli Ìgbà (Jerusalem)", + "Asia\/Kabul": "Orílẹ́ède Àfùgànístánì Ìgbà (Kabul)", + "Asia\/Kamchatka": "Orílẹ́ède Rọṣia Ìgbà (Kamchatka)", + "Asia\/Karachi": "Orílẹ́ède Pakisitan Ìgbà (Karachi)", + "Asia\/Katmandu": "Orílẹ́ède Nepa Ìgbà (Kathmandu)", + "Asia\/Khandyga": "Orílẹ́ède Rọṣia Ìgbà (Khandyga)", + "Asia\/Krasnoyarsk": "Orílẹ́ède Rọṣia Ìgbà (Krasnoyarsk)", + "Asia\/Kuala_Lumpur": "Orílẹ́ède Malasia Ìgbà (Kuala Lumpur)", + "Asia\/Kuching": "Orílẹ́ède Malasia Ìgbà (Kuching)", + "Asia\/Kuwait": "Orílẹ́ède Kuweti Ìgbà (Kuwait)", + "Asia\/Magadan": "Orílẹ́ède Rọṣia Ìgbà (Magadan)", + "Asia\/Makassar": "Orílẹ́ède Indonesia Ìgbà (Makassar)", + "Asia\/Manila": "Orílẹ́ède filipini Ìgbà (Manila)", + "Asia\/Muscat": "Orílẹ́ède Ọọma Ìgbà (Muscat)", "Asia\/Nicosia": "Àkókò Ìhà Ìlà Oòrùn Europe (Nicosia)", - "Asia\/Novokuznetsk": "Orílẹ́ède Rọṣia (Novokuznetsk)", - "Asia\/Novosibirsk": "Orílẹ́ède Rọṣia (Novosibirsk)", - "Asia\/Omsk": "Orílẹ́ède Rọṣia (Omsk)", - "Asia\/Oral": "Orílẹ́ède Kaṣaṣatani (Oral)", - "Asia\/Phnom_Penh": "Orílẹ́ède Kàmùbódíà (Phnom Penh)", - "Asia\/Pontianak": "Orílẹ́ède Indonesia (Pontianak)", - "Asia\/Pyongyang": "Orílẹ́ède Guusu Kọria (Pyongyang)", - "Asia\/Qatar": "Orílẹ́ède Kota (Qatar)", - "Asia\/Qostanay": "Orílẹ́ède Kaṣaṣatani (Qostanay)", - "Asia\/Qyzylorda": "Orílẹ́ède Kaṣaṣatani (Qyzylorda)", - "Asia\/Rangoon": "Orílẹ́ède Manamari (Yangon)", - "Asia\/Riyadh": "Orílẹ́ède Saudi Arabia (Riyadh)", - "Asia\/Saigon": "Orílẹ́ède Fẹtinami (Ho Chi Minh)", - "Asia\/Sakhalin": "Orílẹ́ède Rọṣia (Sakhalin)", - "Asia\/Samarkand": "Orílẹ́ède Nṣibẹkisitani (Samarkand)", - "Asia\/Seoul": "Orílẹ́ède Ariwa Kọria (Seoul)", - "Asia\/Shanghai": "Orilẹ̀-èdè Ṣáínà (Shanghai)", - "Asia\/Singapore": "Orílẹ́ède Singapo (Singapore)", - "Asia\/Srednekolymsk": "Orílẹ́ède Rọṣia (Srednekolymsk)", - "Asia\/Taipei": "Orílẹ́ède Taiwani (Taipei)", - "Asia\/Tashkent": "Orílẹ́ède Nṣibẹkisitani (Tashkent)", - "Asia\/Tbilisi": "Orílẹ́ède Gọgia (Tbilisi)", - "Asia\/Tehran": "Orílẹ́ède Irani (Tehran)", - "Asia\/Thimphu": "Orílẹ́ède Bútánì (Thimphu)", - "Asia\/Tokyo": "Orílẹ́ède Japani (Tokyo)", - "Asia\/Tomsk": "Orílẹ́ède Rọṣia (Tomsk)", - "Asia\/Ulaanbaatar": "Orílẹ́ède Mogolia (Ulaanbaatar)", - "Asia\/Urumqi": "Orilẹ̀-èdè Ṣáínà (Urumqi)", - "Asia\/Ust-Nera": "Orílẹ́ède Rọṣia (Ust-Nera)", - "Asia\/Vientiane": "Orílẹ́ède Laosi (Vientiane)", - "Asia\/Vladivostok": "Orílẹ́ède Rọṣia (Vladivostok)", - "Asia\/Yakutsk": "Orílẹ́ède Rọṣia (Yakutsk)", - "Asia\/Yekaterinburg": "Orílẹ́ède Rọṣia (Yekaterinburg)", - "Asia\/Yerevan": "Orílẹ́ède Améníà (Yerevan)", - "Atlantic\/Azores": "Orílẹ́ède Pọtugi (Azores)", + "Asia\/Novokuznetsk": "Orílẹ́ède Rọṣia Ìgbà (Novokuznetsk)", + "Asia\/Novosibirsk": "Orílẹ́ède Rọṣia Ìgbà (Novosibirsk)", + "Asia\/Omsk": "Orílẹ́ède Rọṣia Ìgbà (Omsk)", + "Asia\/Oral": "Orílẹ́ède Kaṣaṣatani Ìgbà (Oral)", + "Asia\/Phnom_Penh": "Orílẹ́ède Kàmùbódíà Ìgbà (Phnom Penh)", + "Asia\/Pontianak": "Orílẹ́ède Indonesia Ìgbà (Pontianak)", + "Asia\/Pyongyang": "Orílẹ́ède Guusu Kọria Ìgbà (Pyongyang)", + "Asia\/Qatar": "Orílẹ́ède Kota Ìgbà (Qatar)", + "Asia\/Qostanay": "Orílẹ́ède Kaṣaṣatani Ìgbà (Qostanay)", + "Asia\/Qyzylorda": "Orílẹ́ède Kaṣaṣatani Ìgbà (Qyzylorda)", + "Asia\/Rangoon": "Orílẹ́ède Manamari Ìgbà (Yangon)", + "Asia\/Riyadh": "Orílẹ́ède Saudi Arabia Ìgbà (Riyadh)", + "Asia\/Saigon": "Orílẹ́ède Fẹtinami Ìgbà (Ho Chi Minh)", + "Asia\/Sakhalin": "Orílẹ́ède Rọṣia Ìgbà (Sakhalin)", + "Asia\/Samarkand": "Orílẹ́ède Nṣibẹkisitani Ìgbà (Samarkand)", + "Asia\/Seoul": "Orílẹ́ède Ariwa Kọria Ìgbà (Seoul)", + "Asia\/Shanghai": "Orilẹ̀-èdè Ṣáínà Ìgbà (Shanghai)", + "Asia\/Singapore": "Orílẹ́ède Singapo Ìgbà (Singapore)", + "Asia\/Srednekolymsk": "Orílẹ́ède Rọṣia Ìgbà (Srednekolymsk)", + "Asia\/Taipei": "Orílẹ́ède Taiwani Ìgbà (Taipei)", + "Asia\/Tashkent": "Orílẹ́ède Nṣibẹkisitani Ìgbà (Tashkent)", + "Asia\/Tbilisi": "Orílẹ́ède Gọgia Ìgbà (Tbilisi)", + "Asia\/Tehran": "Orílẹ́ède Irani Ìgbà (Tehran)", + "Asia\/Thimphu": "Orílẹ́ède Bútánì Ìgbà (Thimphu)", + "Asia\/Tokyo": "Orílẹ́ède Japani Ìgbà (Tokyo)", + "Asia\/Tomsk": "Orílẹ́ède Rọṣia Ìgbà (Tomsk)", + "Asia\/Ulaanbaatar": "Orílẹ́ède Mogolia Ìgbà (Ulaanbaatar)", + "Asia\/Urumqi": "Orilẹ̀-èdè Ṣáínà Ìgbà (Urumqi)", + "Asia\/Ust-Nera": "Orílẹ́ède Rọṣia Ìgbà (Ust-Nera)", + "Asia\/Vientiane": "Orílẹ́ède Laosi Ìgbà (Vientiane)", + "Asia\/Vladivostok": "Orílẹ́ède Rọṣia Ìgbà (Vladivostok)", + "Asia\/Yakutsk": "Orílẹ́ède Rọṣia Ìgbà (Yakutsk)", + "Asia\/Yekaterinburg": "Orílẹ́ède Rọṣia Ìgbà (Yekaterinburg)", + "Asia\/Yerevan": "Orílẹ́ède Améníà Ìgbà (Yerevan)", + "Atlantic\/Azores": "Orílẹ́ède Pọtugi Ìgbà (Azores)", "Atlantic\/Bermuda": "Àkókò Àtìláńtíìkì (Bermuda)", "Atlantic\/Canary": "Àkókò Ìwọ Oòrùn Europe (Canary)", - "Atlantic\/Cape_Verde": "Orílẹ́ède Etíokun Kápé féndè (Cape Verde)", + "Atlantic\/Cape_Verde": "Orílẹ́ède Etíokun Kápé féndè Ìgbà (Cape Verde)", "Atlantic\/Faeroe": "Àkókò Ìwọ Oòrùn Europe (Faroe)", "Atlantic\/Madeira": "Àkókò Ìwọ Oòrùn Europe (Madeira)", "Atlantic\/Reykjavik": "Greenwich Mean Time (Reykjavik)", "Atlantic\/St_Helena": "Greenwich Mean Time (St. Helena)", - "Atlantic\/Stanley": "Orílẹ́ède Etikun Fakalandi (Stanley)", - "Australia\/Adelaide": "Orílẹ́ède Ástràlìá (Adelaide)", - "Australia\/Brisbane": "Orílẹ́ède Ástràlìá (Brisbane)", - "Australia\/Broken_Hill": "Orílẹ́ède Ástràlìá (Broken Hill)", - "Australia\/Currie": "Orílẹ́ède Ástràlìá (Currie)", - "Australia\/Darwin": "Orílẹ́ède Ástràlìá (Darwin)", - "Australia\/Eucla": "Orílẹ́ède Ástràlìá (Eucla)", - "Australia\/Hobart": "Orílẹ́ède Ástràlìá (Hobart)", - "Australia\/Lindeman": "Orílẹ́ède Ástràlìá (Lindeman)", - "Australia\/Lord_Howe": "Orílẹ́ède Ástràlìá (Lord Howe)", - "Australia\/Melbourne": "Orílẹ́ède Ástràlìá (Melbourne)", - "Australia\/Perth": "Orílẹ́ède Ástràlìá (Perth)", - "Australia\/Sydney": "Orílẹ́ède Ástràlìá (Sydney)", + "Atlantic\/Stanley": "Orílẹ́ède Etikun Fakalandi Ìgbà (Stanley)", + "Australia\/Adelaide": "Orílẹ́ède Ástràlìá Ìgbà (Adelaide)", + "Australia\/Brisbane": "Orílẹ́ède Ástràlìá Ìgbà (Brisbane)", + "Australia\/Broken_Hill": "Orílẹ́ède Ástràlìá Ìgbà (Broken Hill)", + "Australia\/Currie": "Orílẹ́ède Ástràlìá Ìgbà (Currie)", + "Australia\/Darwin": "Orílẹ́ède Ástràlìá Ìgbà (Darwin)", + "Australia\/Eucla": "Orílẹ́ède Ástràlìá Ìgbà (Eucla)", + "Australia\/Hobart": "Orílẹ́ède Ástràlìá Ìgbà (Hobart)", + "Australia\/Lindeman": "Orílẹ́ède Ástràlìá Ìgbà (Lindeman)", + "Australia\/Lord_Howe": "Orílẹ́ède Ástràlìá Ìgbà (Lord Howe)", + "Australia\/Melbourne": "Orílẹ́ède Ástràlìá Ìgbà (Melbourne)", + "Australia\/Perth": "Orílẹ́ède Ástràlìá Ìgbà (Perth)", + "Australia\/Sydney": "Orílẹ́ède Ástràlìá Ìgbà (Sydney)", "CST6CDT": "àkókò àárín gbùngbùn", "EST5EDT": "Àkókò ìhà ìlà oòrùn", "Etc\/GMT": "Greenwich Mean Time", "Etc\/UTC": "Àpapọ̀ Àkókò Àgbáyé", "Europe\/Amsterdam": "Àkókò Àárin Europe (Amsterdam)", "Europe\/Andorra": "Àkókò Àárin Europe (Andorra)", - "Europe\/Astrakhan": "Orílẹ́ède Rọṣia (Astrakhan)", + "Europe\/Astrakhan": "Orílẹ́ède Rọṣia Ìgbà (Astrakhan)", "Europe\/Athens": "Àkókò Ìhà Ìlà Oòrùn Europe (Athens)", "Europe\/Belgrade": "Àkókò Àárin Europe (Belgrade)", "Europe\/Berlin": "Àkókò Àárin Europe (Berlin)", @@ -328,11 +328,11 @@ "Europe\/Guernsey": "Greenwich Mean Time (Guernsey)", "Europe\/Helsinki": "Àkókò Ìhà Ìlà Oòrùn Europe (Helsinki)", "Europe\/Isle_of_Man": "Greenwich Mean Time (Isle of Man)", - "Europe\/Istanbul": "Orílẹ́ède Tọọki (Istanbul)", + "Europe\/Istanbul": "Orílẹ́ède Tọọki Ìgbà (Istanbul)", "Europe\/Jersey": "Greenwich Mean Time (Jersey)", "Europe\/Kaliningrad": "Àkókò Ìhà Ìlà Oòrùn Europe (Kaliningrad)", "Europe\/Kiev": "Àkókò Ìhà Ìlà Oòrùn Europe (Kiev)", - "Europe\/Kirov": "Orílẹ́ède Rọṣia (Kirov)", + "Europe\/Kirov": "Orílẹ́ède Rọṣia Ìgbà (Kirov)", "Europe\/Lisbon": "Àkókò Ìwọ Oòrùn Europe (Lisbon)", "Europe\/Ljubljana": "Àkókò Àárin Europe (Ljubljana)", "Europe\/London": "Greenwich Mean Time (London)", @@ -340,88 +340,84 @@ "Europe\/Madrid": "Àkókò Àárin Europe (Madrid)", "Europe\/Malta": "Àkókò Àárin Europe (Malta)", "Europe\/Mariehamn": "Àkókò Ìhà Ìlà Oòrùn Europe (Mariehamn)", - "Europe\/Minsk": "Orílẹ́ède Bélárúsì (Minsk)", + "Europe\/Minsk": "Orílẹ́ède Bélárúsì Ìgbà (Minsk)", "Europe\/Monaco": "Àkókò Àárin Europe (Monaco)", - "Europe\/Moscow": "Orílẹ́ède Rọṣia (Moscow)", + "Europe\/Moscow": "Orílẹ́ède Rọṣia Ìgbà (Moscow)", "Europe\/Oslo": "Àkókò Àárin Europe (Oslo)", "Europe\/Paris": "Àkókò Àárin Europe (Paris)", "Europe\/Podgorica": "Àkókò Àárin Europe (Podgorica)", "Europe\/Prague": "Àkókò Àárin Europe (Prague)", "Europe\/Riga": "Àkókò Ìhà Ìlà Oòrùn Europe (Riga)", "Europe\/Rome": "Àkókò Àárin Europe (Rome)", - "Europe\/Samara": "Orílẹ́ède Rọṣia (Samara)", + "Europe\/Samara": "Orílẹ́ède Rọṣia Ìgbà (Samara)", "Europe\/San_Marino": "Àkókò Àárin Europe (San Marino)", "Europe\/Sarajevo": "Àkókò Àárin Europe (Sarajevo)", - "Europe\/Saratov": "Orílẹ́ède Rọṣia (Saratov)", - "Europe\/Simferopol": "Orílẹ́ède Ukarini (Simferopol)", + "Europe\/Saratov": "Orílẹ́ède Rọṣia Ìgbà (Saratov)", + "Europe\/Simferopol": "Orílẹ́ède Ukarini Ìgbà (Simferopol)", "Europe\/Skopje": "Àkókò Àárin Europe (Skopje)", "Europe\/Sofia": "Àkókò Ìhà Ìlà Oòrùn Europe (Sofia)", "Europe\/Stockholm": "Àkókò Àárin Europe (Stockholm)", "Europe\/Tallinn": "Àkókò Ìhà Ìlà Oòrùn Europe (Tallinn)", "Europe\/Tirane": "Àkókò Àárin Europe (Tirane)", - "Europe\/Ulyanovsk": "Orílẹ́ède Rọṣia (Ulyanovsk)", + "Europe\/Ulyanovsk": "Orílẹ́ède Rọṣia Ìgbà (Ulyanovsk)", "Europe\/Uzhgorod": "Àkókò Ìhà Ìlà Oòrùn Europe (Uzhgorod)", "Europe\/Vaduz": "Àkókò Àárin Europe (Vaduz)", "Europe\/Vatican": "Àkókò Àárin Europe (Vatican)", "Europe\/Vienna": "Àkókò Àárin Europe (Vienna)", "Europe\/Vilnius": "Àkókò Ìhà Ìlà Oòrùn Europe (Vilnius)", - "Europe\/Volgograd": "Orílẹ́ède Rọṣia (Volgograd)", + "Europe\/Volgograd": "Orílẹ́ède Rọṣia Ìgbà (Volgograd)", "Europe\/Warsaw": "Àkókò Àárin Europe (Warsaw)", "Europe\/Zagreb": "Àkókò Àárin Europe (Zagreb)", "Europe\/Zaporozhye": "Àkókò Ìhà Ìlà Oòrùn Europe (Zaporozhye)", "Europe\/Zurich": "Àkókò Àárin Europe (Zurich)", - "Indian\/Antananarivo": "Orílẹ́ède Madasika (Antananarivo)", - "Indian\/Chagos": "Orílẹ́ède Etíkun Índíánì ti Ìlú Bírítísì (Chagos)", - "Indian\/Comoro": "Orílẹ́ède Kòmòrósì (Comoro)", - "Indian\/Mahe": "Orílẹ́ède seṣẹlẹsi (Mahe)", - "Indian\/Maldives": "Orílẹ́ède Maladifi (Maldives)", - "Indian\/Mauritius": "Orílẹ́ède Maritiusi (Mauritius)", - "Indian\/Mayotte": "Orílẹ́ède Mayote (Mayotte)", - "Indian\/Reunion": "Orílẹ́ède Riuniyan (Reunion)", + "Indian\/Antananarivo": "Orílẹ́ède Madasika Ìgbà (Antananarivo)", + "Indian\/Chagos": "Orílẹ́ède Etíkun Índíánì ti Ìlú Bírítísì Ìgbà (Chagos)", + "Indian\/Comoro": "Orílẹ́ède Kòmòrósì Ìgbà (Comoro)", + "Indian\/Mahe": "Orílẹ́ède seṣẹlẹsi Ìgbà (Mahe)", + "Indian\/Maldives": "Orílẹ́ède Maladifi Ìgbà (Maldives)", + "Indian\/Mauritius": "Orílẹ́ède Maritiusi Ìgbà (Mauritius)", + "Indian\/Mayotte": "Orílẹ́ède Mayote Ìgbà (Mayotte)", + "Indian\/Reunion": "Orílẹ́ède Riuniyan Ìgbà (Reunion)", "MST7MDT": "Àkókò òkè", "PST8PDT": "Àkókò Pàsífíìkì", - "Pacific\/Apia": "Orílẹ́ède Samọ (Apia)", - "Pacific\/Auckland": "Orílẹ́ède ṣilandi Titun (Auckland)", - "Pacific\/Bougainville": "Orílẹ́ède Paapu ti Giini (Bougainville)", - "Pacific\/Chatham": "Orílẹ́ède ṣilandi Titun (Chatham)", - "Pacific\/Easter": "Orílẹ́ède ṣílè (Easter)", - "Pacific\/Efate": "Orílẹ́ède Faniatu (Efate)", - "Pacific\/Enderbury": "Orílẹ́ède Kiribati (Enderbury)", - "Pacific\/Fakaofo": "Orílẹ́ède Tokelau (Fakaofo)", - "Pacific\/Fiji": "Orílẹ́ède Fiji (Fiji)", - "Pacific\/Funafuti": "Orílẹ́ède Tufalu (Funafuti)", - "Pacific\/Galapagos": "Orílẹ́ède Ekuádò (Galapagos)", - "Pacific\/Gambier": "Orílẹ́ède Firenṣi Polinesia (Gambier)", - "Pacific\/Guadalcanal": "Orílẹ́ède Etikun Solomoni (Guadalcanal)", - "Pacific\/Guam": "Orílẹ́ède Guamu (Guam)", - "Pacific\/Honolulu": "Orílẹ̀-èdè Amẹrikà (Honolulu)", - "Pacific\/Kiritimati": "Orílẹ́ède Kiribati (Kiritimati)", - "Pacific\/Kosrae": "Orílẹ́ède Makoronesia (Kosrae)", - "Pacific\/Kwajalein": "Orílẹ́ède Etikun Máṣali (Kwajalein)", - "Pacific\/Majuro": "Orílẹ́ède Etikun Máṣali (Majuro)", - "Pacific\/Marquesas": "Orílẹ́ède Firenṣi Polinesia (Marquesas)", - "Pacific\/Nauru": "Orílẹ́ède Nauru (Nauru)", - "Pacific\/Niue": "Orílẹ́ède Niue (Niue)", - "Pacific\/Norfolk": "Orílẹ́ède Etikun Nọ́úfókì (Norfolk)", - "Pacific\/Noumea": "Orílẹ́ède Kaledonia Titun (Noumea)", - "Pacific\/Pago_Pago": "Sámóánì ti Orílẹ́ède Àméríkà (Pago Pago)", - "Pacific\/Palau": "Orílẹ́ède Paalu (Palau)", - "Pacific\/Pitcairn": "Orílẹ́ède Pikarini (Pitcairn)", - "Pacific\/Ponape": "Orílẹ́ède Makoronesia (Pohnpei)", - "Pacific\/Port_Moresby": "Orílẹ́ède Paapu ti Giini (Port Moresby)", - "Pacific\/Rarotonga": "Orílẹ́ède Etíokun Kùúkù (Rarotonga)", - "Pacific\/Saipan": "Orílẹ́ède Etikun Guusu Mariana (Saipan)", - "Pacific\/Tahiti": "Orílẹ́ède Firenṣi Polinesia (Tahiti)", - "Pacific\/Tarawa": "Orílẹ́ède Kiribati (Tarawa)", - "Pacific\/Tongatapu": "Orílẹ́ède Tonga (Tongatapu)", - "Pacific\/Truk": "Orílẹ́ède Makoronesia (Chuuk)", - "Pacific\/Wallis": "Orílẹ́ède Wali ati futuna (Wallis)" + "Pacific\/Apia": "Orílẹ́ède Samọ Ìgbà (Apia)", + "Pacific\/Auckland": "Orílẹ́ède ṣilandi Titun Ìgbà (Auckland)", + "Pacific\/Bougainville": "Orílẹ́ède Paapu ti Giini Ìgbà (Bougainville)", + "Pacific\/Chatham": "Orílẹ́ède ṣilandi Titun Ìgbà (Chatham)", + "Pacific\/Easter": "Orílẹ́ède ṣílè Ìgbà (Easter)", + "Pacific\/Efate": "Orílẹ́ède Faniatu Ìgbà (Efate)", + "Pacific\/Enderbury": "Orílẹ́ède Kiribati Ìgbà (Enderbury)", + "Pacific\/Fakaofo": "Orílẹ́ède Tokelau Ìgbà (Fakaofo)", + "Pacific\/Fiji": "Orílẹ́ède Fiji Ìgbà (Fiji)", + "Pacific\/Funafuti": "Orílẹ́ède Tufalu Ìgbà (Funafuti)", + "Pacific\/Galapagos": "Orílẹ́ède Ekuádò Ìgbà (Galapagos)", + "Pacific\/Gambier": "Orílẹ́ède Firenṣi Polinesia Ìgbà (Gambier)", + "Pacific\/Guadalcanal": "Orílẹ́ède Etikun Solomoni Ìgbà (Guadalcanal)", + "Pacific\/Guam": "Orílẹ́ède Guamu Ìgbà (Guam)", + "Pacific\/Honolulu": "Orílẹ̀-èdè Amẹrikà Ìgbà (Honolulu)", + "Pacific\/Kiritimati": "Orílẹ́ède Kiribati Ìgbà (Kiritimati)", + "Pacific\/Kosrae": "Orílẹ́ède Makoronesia Ìgbà (Kosrae)", + "Pacific\/Kwajalein": "Orílẹ́ède Etikun Máṣali Ìgbà (Kwajalein)", + "Pacific\/Majuro": "Orílẹ́ède Etikun Máṣali Ìgbà (Majuro)", + "Pacific\/Marquesas": "Orílẹ́ède Firenṣi Polinesia Ìgbà (Marquesas)", + "Pacific\/Nauru": "Orílẹ́ède Nauru Ìgbà (Nauru)", + "Pacific\/Niue": "Orílẹ́ède Niue Ìgbà (Niue)", + "Pacific\/Norfolk": "Orílẹ́ède Etikun Nọ́úfókì Ìgbà (Norfolk)", + "Pacific\/Noumea": "Orílẹ́ède Kaledonia Titun Ìgbà (Noumea)", + "Pacific\/Pago_Pago": "Sámóánì ti Orílẹ́ède Àméríkà Ìgbà (Pago Pago)", + "Pacific\/Palau": "Orílẹ́ède Paalu Ìgbà (Palau)", + "Pacific\/Pitcairn": "Orílẹ́ède Pikarini Ìgbà (Pitcairn)", + "Pacific\/Ponape": "Orílẹ́ède Makoronesia Ìgbà (Pohnpei)", + "Pacific\/Port_Moresby": "Orílẹ́ède Paapu ti Giini Ìgbà (Port Moresby)", + "Pacific\/Rarotonga": "Orílẹ́ède Etíokun Kùúkù Ìgbà (Rarotonga)", + "Pacific\/Saipan": "Orílẹ́ède Etikun Guusu Mariana Ìgbà (Saipan)", + "Pacific\/Tahiti": "Orílẹ́ède Firenṣi Polinesia Ìgbà (Tahiti)", + "Pacific\/Tarawa": "Orílẹ́ède Kiribati Ìgbà (Tarawa)", + "Pacific\/Tongatapu": "Orílẹ́ède Tonga Ìgbà (Tongatapu)", + "Pacific\/Truk": "Orílẹ́ède Makoronesia Ìgbà (Chuuk)", + "Pacific\/Wallis": "Orílẹ́ède Wali ati futuna Ìgbà (Wallis)" }, "Meta": { - "GmtFormat": "WAT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] + "GmtFormat": "WAT%s" } } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/yo_BJ.json b/src/Symfony/Component/Intl/Resources/data/timezones/yo_BJ.json index fc5f32c7de504..0510e6f1c3171 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/yo_BJ.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/yo_BJ.json @@ -1,13 +1,245 @@ { "Version": "2.1.48.77", "Names": { + "Africa\/Addis_Ababa": "Orílɛ́ède Etopia Ìgbà (Addis Ababa)", + "Africa\/Asmera": "Orílɛ́ède Eritira Ìgbà (Asmara)", + "Africa\/Bangui": "Orílɛ́ède Àrin gùngun Áfíríkà Ìgbà (Bangui)", + "Africa\/Blantyre": "Orílɛ́ède Malawi Ìgbà (Blantyre)", + "Africa\/Brazzaville": "Orílɛ́ède Kóngò Ìgbà (Brazzaville)", + "Africa\/Bujumbura": "Orílɛ́ède Bùùrúndì Ìgbà (Bujumbura)", "Africa\/Casablanca": "Àkókò Ìwɔ Oòrùn Europe (Casablanca)", + "Africa\/Dar_es_Salaam": "Orílɛ́ède Tanshania Ìgbà (Dar es Salaam)", + "Africa\/Djibouti": "Orílɛ́ède Díbɔ́ótì Ìgbà (Djibouti)", + "Africa\/Douala": "Orílɛ́ède Kamerúúnì Ìgbà (Douala)", "Africa\/El_Aaiun": "Àkókò Ìwɔ Oòrùn Europe (El Aaiun)", + "Africa\/Gaborone": "Orílɛ́ède Bɔ̀tìsúwánà Ìgbà (Gaborone)", + "Africa\/Harare": "Orílɛ́ède shimibabe Ìgbà (Harare)", + "Africa\/Johannesburg": "Orílɛ́ède Ariwa Afirika Ìgbà (Johannesburg)", + "Africa\/Kampala": "Orílɛ́ède Uganda Ìgbà (Kampala)", + "Africa\/Khartoum": "Orílɛ́ède Sudani Ìgbà (Khartoum)", + "Africa\/Kigali": "Orílɛ́ède Ruwanda Ìgbà (Kigali)", + "Africa\/Kinshasa": "Orilɛ́ède Kóngò Ìgbà (Kinshasa)", + "Africa\/Lagos": "Orilɛ̀-èdè Nàìjíríà Ìgbà (Lagos)", + "Africa\/Libreville": "Orílɛ́ède Gabon Ìgbà (Libreville)", + "Africa\/Luanda": "Orílɛ́ède Ààngólà Ìgbà (Luanda)", + "Africa\/Lubumbashi": "Orilɛ́ède Kóngò Ìgbà (Lubumbashi)", + "Africa\/Lusaka": "Orílɛ́ède shamibia Ìgbà (Lusaka)", + "Africa\/Malabo": "Orílɛ́ède Ekutoria Gini Ìgbà (Malabo)", + "Africa\/Maputo": "Orílɛ́ède Moshamibiku Ìgbà (Maputo)", + "Africa\/Maseru": "Orílɛ́ède Lesoto Ìgbà (Maseru)", + "Africa\/Mbabane": "Orílɛ́ède Sashiland Ìgbà (Mbabane)", + "Africa\/Mogadishu": "Orílɛ́ède Somalia Ìgbà (Mogadishu)", + "Africa\/Nairobi": "Orílɛ́ède Kenya Ìgbà (Nairobi)", + "Africa\/Ndjamena": "Orílɛ́ède shààdì Ìgbà (Ndjamena)", + "Africa\/Niamey": "Orílɛ́ède Nàìjá Ìgbà (Niamey)", + "Africa\/Porto-Novo": "Orílɛ́ède Bɛ̀nɛ̀ Ìgbà (Porto-Novo)", + "Africa\/Windhoek": "Orílɛ́ède Namibia Ìgbà (Windhoek)", + "America\/Adak": "Orílɛ̀-èdè Amɛrikà Ìgbà (Adak)", + "America\/Anchorage": "Orílɛ̀-èdè Amɛrikà Ìgbà (Anchorage)", + "America\/Araguaina": "Orilɛ̀-èdè Bàràsílì Ìgbà (Araguaina)", + "America\/Argentina\/La_Rioja": "Orílɛ́ède Agentínà Ìgbà (La Rioja)", + "America\/Argentina\/Rio_Gallegos": "Orílɛ́ède Agentínà Ìgbà (Rio Gallegos)", + "America\/Argentina\/Salta": "Orílɛ́ède Agentínà Ìgbà (Salta)", + "America\/Argentina\/San_Juan": "Orílɛ́ède Agentínà Ìgbà (San Juan)", + "America\/Argentina\/San_Luis": "Orílɛ́ède Agentínà Ìgbà (San Luis)", + "America\/Argentina\/Tucuman": "Orílɛ́ède Agentínà Ìgbà (Tucuman)", + "America\/Argentina\/Ushuaia": "Orílɛ́ède Agentínà Ìgbà (Ushuaia)", + "America\/Asuncion": "Orílɛ́ède Paraguye Ìgbà (Asuncion)", + "America\/Bahia": "Orilɛ̀-èdè Bàràsílì Ìgbà (Bahia)", + "America\/Belem": "Orilɛ̀-èdè Bàràsílì Ìgbà (Belem)", + "America\/Boa_Vista": "Orilɛ̀-èdè Bàràsílì Ìgbà (Boa Vista)", + "America\/Bogota": "Orílɛ́ède Kòlómíbìa Ìgbà (Bogota)", + "America\/Buenos_Aires": "Orílɛ́ède Agentínà Ìgbà (Buenos Aires)", + "America\/Campo_Grande": "Orilɛ̀-èdè Bàràsílì Ìgbà (Campo Grande)", + "America\/Caracas": "Orílɛ́ède Fɛnɛshuɛla Ìgbà (Caracas)", + "America\/Catamarca": "Orílɛ́ède Agentínà Ìgbà (Catamarca)", + "America\/Cayenne": "Orílɛ́ède Firenshi Guana Ìgbà (Cayenne)", + "America\/Chihuahua": "Orílɛ́ède Mesiko Ìgbà (Chihuahua)", + "America\/Cordoba": "Orílɛ́ède Agentínà Ìgbà (Cordoba)", + "America\/Cuiaba": "Orilɛ̀-èdè Bàràsílì Ìgbà (Cuiaba)", + "America\/Eirunepe": "Orilɛ̀-èdè Bàràsílì Ìgbà (Eirunepe)", + "America\/Fortaleza": "Orilɛ̀-èdè Bàràsílì Ìgbà (Fortaleza)", + "America\/Godthab": "Orílɛ́ède Gerelandi Ìgbà (Nuuk)", + "America\/Guayaquil": "Orílɛ́ède Ekuádò Ìgbà (Guayaquil)", + "America\/Guyana": "Orílɛ́ède Guyana Ìgbà (Guyana)", + "America\/Havana": "Orílɛ́ède Kúbà Ìgbà (Havana)", + "America\/Hermosillo": "Orílɛ́ède Mesiko Ìgbà (Hermosillo)", + "America\/Jujuy": "Orílɛ́ède Agentínà Ìgbà (Jujuy)", + "America\/Juneau": "Orílɛ̀-èdè Amɛrikà Ìgbà (Juneau)", + "America\/La_Paz": "Orílɛ́ède Bɔ̀lífíyà Ìgbà (La Paz)", + "America\/Lima": "Orílɛ́ède Peru Ìgbà (Lima)", + "America\/Maceio": "Orilɛ̀-èdè Bàràsílì Ìgbà (Maceio)", + "America\/Manaus": "Orilɛ̀-èdè Bàràsílì Ìgbà (Manaus)", + "America\/Mazatlan": "Orílɛ́ède Mesiko Ìgbà (Mazatlan)", + "America\/Mendoza": "Orílɛ́ède Agentínà Ìgbà (Mendoza)", + "America\/Metlakatla": "Orílɛ̀-èdè Amɛrikà Ìgbà (Metlakatla)", + "America\/Miquelon": "Orílɛ́ède Pɛɛri ati mikuloni Ìgbà (Miquelon)", + "America\/Montevideo": "Orílɛ́ède Nruguayi Ìgbà (Montevideo)", + "America\/Montreal": "Orílɛ́ède Kánádà Ìgbà (Montreal)", + "America\/Nome": "Orílɛ̀-èdè Amɛrikà Ìgbà (Nome)", + "America\/Noronha": "Orilɛ̀-èdè Bàràsílì Ìgbà (Noronha)", + "America\/Paramaribo": "Orílɛ́ède Surinami Ìgbà (Paramaribo)", + "America\/Porto_Velho": "Orilɛ̀-èdè Bàràsílì Ìgbà (Porto Velho)", + "America\/Punta_Arenas": "Orílɛ́ède shílè Ìgbà (Punta Arenas)", + "America\/Recife": "Orilɛ̀-èdè Bàràsílì Ìgbà (Recife)", + "America\/Rio_Branco": "Orilɛ̀-èdè Bàràsílì Ìgbà (Rio Branco)", + "America\/Santa_Isabel": "Orílɛ́ède Mesiko Ìgbà (Santa Isabel)", + "America\/Santarem": "Orilɛ̀-èdè Bàràsílì Ìgbà (Santarem)", + "America\/Santiago": "Orílɛ́ède shílè Ìgbà (Santiago)", + "America\/Sao_Paulo": "Orilɛ̀-èdè Bàràsílì Ìgbà (Sao Paulo)", + "America\/Scoresbysund": "Orílɛ́ède Gerelandi Ìgbà (Ittoqqortoormiit)", + "America\/Sitka": "Orílɛ̀-èdè Amɛrikà Ìgbà (Sitka)", + "America\/St_Johns": "Orílɛ́ède Kánádà Ìgbà (St. John’s)", + "America\/Yakutat": "Orílɛ̀-èdè Amɛrikà Ìgbà (Yakutat)", + "Antarctica\/Macquarie": "Orílɛ́ède Ástràlìá Ìgbà (Macquarie)", + "Asia\/Aden": "Orílɛ́ède yemeni Ìgbà (Aden)", + "Asia\/Almaty": "Orílɛ́ède Kashashatani Ìgbà (Almaty)", + "Asia\/Anadyr": "Orílɛ́ède Rɔshia Ìgbà (Anadyr)", + "Asia\/Aqtau": "Orílɛ́ède Kashashatani Ìgbà (Aqtau)", + "Asia\/Aqtobe": "Orílɛ́ède Kashashatani Ìgbà (Aqtobe)", + "Asia\/Ashgabat": "Orílɛ́ède Tɔɔkimenisita Ìgbà (Ashgabat)", + "Asia\/Atyrau": "Orílɛ́ède Kashashatani Ìgbà (Atyrau)", + "Asia\/Baghdad": "Orílɛ́ède Iraki Ìgbà (Baghdad)", + "Asia\/Bahrain": "Orílɛ́ède Báránì Ìgbà (Bahrain)", + "Asia\/Baku": "Orílɛ́ède Asɛ́bájánì Ìgbà (Baku)", + "Asia\/Bangkok": "Orílɛ́ède Tailandi Ìgbà (Bangkok)", + "Asia\/Barnaul": "Orílɛ́ède Rɔshia Ìgbà (Barnaul)", + "Asia\/Bishkek": "Orílɛ́ède Kurishisitani Ìgbà (Bishkek)", + "Asia\/Brunei": "Orílɛ́ède Búrúnɛ́lì Ìgbà (Brunei)", + "Asia\/Calcutta": "Orílɛ́ède India Ìgbà (Kolkata)", + "Asia\/Chita": "Orílɛ́ède Rɔshia Ìgbà (Chita)", + "Asia\/Choibalsan": "Orílɛ́ède Mogolia Ìgbà (Choibalsan)", + "Asia\/Colombo": "Orílɛ́ède Siri Lanka Ìgbà (Colombo)", + "Asia\/Dhaka": "Orílɛ́ède Bángáládésì Ìgbà (Dhaka)", + "Asia\/Dili": "Orílɛ́ède ÌlàOòrùn Tímɔ̀ Ìgbà (Dili)", + "Asia\/Dubai": "Orílɛ́ède Ɛmirate ti Awɔn Arabu Ìgbà (Dubai)", + "Asia\/Dushanbe": "Orílɛ́ède Takisitani Ìgbà (Dushanbe)", + "Asia\/Hovd": "Orílɛ́ède Mogolia Ìgbà (Hovd)", + "Asia\/Irkutsk": "Orílɛ́ède Rɔshia Ìgbà (Irkutsk)", + "Asia\/Jakarta": "Orílɛ́ède Indonesia Ìgbà (Jakarta)", + "Asia\/Jayapura": "Orílɛ́ède Indonesia Ìgbà (Jayapura)", + "Asia\/Jerusalem": "Orílɛ́ède Iserɛli Ìgbà (Jerusalem)", + "Asia\/Kabul": "Orílɛ́ède Àfùgànístánì Ìgbà (Kabul)", + "Asia\/Kamchatka": "Orílɛ́ède Rɔshia Ìgbà (Kamchatka)", + "Asia\/Karachi": "Orílɛ́ède Pakisitan Ìgbà (Karachi)", + "Asia\/Katmandu": "Orílɛ́ède Nepa Ìgbà (Kathmandu)", + "Asia\/Khandyga": "Orílɛ́ède Rɔshia Ìgbà (Khandyga)", + "Asia\/Krasnoyarsk": "Orílɛ́ède Rɔshia Ìgbà (Krasnoyarsk)", + "Asia\/Kuala_Lumpur": "Orílɛ́ède Malasia Ìgbà (Kuala Lumpur)", + "Asia\/Kuching": "Orílɛ́ède Malasia Ìgbà (Kuching)", + "Asia\/Kuwait": "Orílɛ́ède Kuweti Ìgbà (Kuwait)", + "Asia\/Magadan": "Orílɛ́ède Rɔshia Ìgbà (Magadan)", + "Asia\/Makassar": "Orílɛ́ède Indonesia Ìgbà (Makassar)", + "Asia\/Manila": "Orílɛ́ède filipini Ìgbà (Manila)", + "Asia\/Muscat": "Orílɛ́ède Ɔɔma Ìgbà (Muscat)", + "Asia\/Novokuznetsk": "Orílɛ́ède Rɔshia Ìgbà (Novokuznetsk)", + "Asia\/Novosibirsk": "Orílɛ́ède Rɔshia Ìgbà (Novosibirsk)", + "Asia\/Omsk": "Orílɛ́ède Rɔshia Ìgbà (Omsk)", + "Asia\/Oral": "Orílɛ́ède Kashashatani Ìgbà (Oral)", + "Asia\/Phnom_Penh": "Orílɛ́ède Kàmùbódíà Ìgbà (Phnom Penh)", + "Asia\/Pontianak": "Orílɛ́ède Indonesia Ìgbà (Pontianak)", + "Asia\/Pyongyang": "Orílɛ́ède Guusu Kɔria Ìgbà (Pyongyang)", + "Asia\/Qatar": "Orílɛ́ède Kota Ìgbà (Qatar)", + "Asia\/Qostanay": "Orílɛ́ède Kashashatani Ìgbà (Qostanay)", + "Asia\/Qyzylorda": "Orílɛ́ède Kashashatani Ìgbà (Qyzylorda)", + "Asia\/Rangoon": "Orílɛ́ède Manamari Ìgbà (Yangon)", + "Asia\/Riyadh": "Orílɛ́ède Saudi Arabia Ìgbà (Riyadh)", + "Asia\/Saigon": "Orílɛ́ède Fɛtinami Ìgbà (Ho Chi Minh)", + "Asia\/Sakhalin": "Orílɛ́ède Rɔshia Ìgbà (Sakhalin)", + "Asia\/Samarkand": "Orílɛ́ède Nshibɛkisitani Ìgbà (Samarkand)", + "Asia\/Seoul": "Orílɛ́ède Ariwa Kɔria Ìgbà (Seoul)", + "Asia\/Shanghai": "Orilɛ̀-èdè Sháínà Ìgbà (Shanghai)", + "Asia\/Singapore": "Orílɛ́ède Singapo Ìgbà (Singapore)", + "Asia\/Srednekolymsk": "Orílɛ́ède Rɔshia Ìgbà (Srednekolymsk)", + "Asia\/Taipei": "Orílɛ́ède Taiwani Ìgbà (Taipei)", + "Asia\/Tashkent": "Orílɛ́ède Nshibɛkisitani Ìgbà (Tashkent)", + "Asia\/Tbilisi": "Orílɛ́ède Gɔgia Ìgbà (Tbilisi)", + "Asia\/Tehran": "Orílɛ́ède Irani Ìgbà (Tehran)", + "Asia\/Thimphu": "Orílɛ́ède Bútánì Ìgbà (Thimphu)", + "Asia\/Tokyo": "Orílɛ́ède Japani Ìgbà (Tokyo)", + "Asia\/Tomsk": "Orílɛ́ède Rɔshia Ìgbà (Tomsk)", + "Asia\/Ulaanbaatar": "Orílɛ́ède Mogolia Ìgbà (Ulaanbaatar)", + "Asia\/Urumqi": "Orilɛ̀-èdè Sháínà Ìgbà (Urumqi)", + "Asia\/Ust-Nera": "Orílɛ́ède Rɔshia Ìgbà (Ust-Nera)", + "Asia\/Vientiane": "Orílɛ́ède Laosi Ìgbà (Vientiane)", + "Asia\/Vladivostok": "Orílɛ́ède Rɔshia Ìgbà (Vladivostok)", + "Asia\/Yakutsk": "Orílɛ́ède Rɔshia Ìgbà (Yakutsk)", + "Asia\/Yekaterinburg": "Orílɛ́ède Rɔshia Ìgbà (Yekaterinburg)", + "Asia\/Yerevan": "Orílɛ́ède Améníà Ìgbà (Yerevan)", + "Atlantic\/Azores": "Orílɛ́ède Pɔtugi Ìgbà (Azores)", "Atlantic\/Canary": "Àkókò Ìwɔ Oòrùn Europe (Canary)", + "Atlantic\/Cape_Verde": "Orílɛ́ède Etíokun Kápé féndè Ìgbà (Cape Verde)", "Atlantic\/Faeroe": "Àkókò Ìwɔ Oòrùn Europe (Faroe)", "Atlantic\/Madeira": "Àkókò Ìwɔ Oòrùn Europe (Madeira)", + "Atlantic\/Stanley": "Orílɛ́ède Etikun Fakalandi Ìgbà (Stanley)", + "Australia\/Adelaide": "Orílɛ́ède Ástràlìá Ìgbà (Adelaide)", + "Australia\/Brisbane": "Orílɛ́ède Ástràlìá Ìgbà (Brisbane)", + "Australia\/Broken_Hill": "Orílɛ́ède Ástràlìá Ìgbà (Broken Hill)", + "Australia\/Currie": "Orílɛ́ède Ástràlìá Ìgbà (Currie)", + "Australia\/Darwin": "Orílɛ́ède Ástràlìá Ìgbà (Darwin)", + "Australia\/Eucla": "Orílɛ́ède Ástràlìá Ìgbà (Eucla)", + "Australia\/Hobart": "Orílɛ́ède Ástràlìá Ìgbà (Hobart)", + "Australia\/Lindeman": "Orílɛ́ède Ástràlìá Ìgbà (Lindeman)", + "Australia\/Lord_Howe": "Orílɛ́ède Ástràlìá Ìgbà (Lord Howe)", + "Australia\/Melbourne": "Orílɛ́ède Ástràlìá Ìgbà (Melbourne)", + "Australia\/Perth": "Orílɛ́ède Ástràlìá Ìgbà (Perth)", + "Australia\/Sydney": "Orílɛ́ède Ástràlìá Ìgbà (Sydney)", "Etc\/UTC": "Àpapɔ̀ Àkókò Àgbáyé", - "Europe\/Lisbon": "Àkókò Ìwɔ Oòrùn Europe (Lisbon)" + "Europe\/Astrakhan": "Orílɛ́ède Rɔshia Ìgbà (Astrakhan)", + "Europe\/Istanbul": "Orílɛ́ède Tɔɔki Ìgbà (Istanbul)", + "Europe\/Kirov": "Orílɛ́ède Rɔshia Ìgbà (Kirov)", + "Europe\/Lisbon": "Àkókò Ìwɔ Oòrùn Europe (Lisbon)", + "Europe\/Minsk": "Orílɛ́ède Bélárúsì Ìgbà (Minsk)", + "Europe\/Moscow": "Orílɛ́ède Rɔshia Ìgbà (Moscow)", + "Europe\/Samara": "Orílɛ́ède Rɔshia Ìgbà (Samara)", + "Europe\/Saratov": "Orílɛ́ède Rɔshia Ìgbà (Saratov)", + "Europe\/Simferopol": "Orílɛ́ède Ukarini Ìgbà (Simferopol)", + "Europe\/Ulyanovsk": "Orílɛ́ède Rɔshia Ìgbà (Ulyanovsk)", + "Europe\/Volgograd": "Orílɛ́ède Rɔshia Ìgbà (Volgograd)", + "Indian\/Antananarivo": "Orílɛ́ède Madasika Ìgbà (Antananarivo)", + "Indian\/Chagos": "Orílɛ́ède Etíkun Índíánì ti Ìlú Bírítísì Ìgbà (Chagos)", + "Indian\/Comoro": "Orílɛ́ède Kòmòrósì Ìgbà (Comoro)", + "Indian\/Mahe": "Orílɛ́ède seshɛlɛsi Ìgbà (Mahe)", + "Indian\/Maldives": "Orílɛ́ède Maladifi Ìgbà (Maldives)", + "Indian\/Mauritius": "Orílɛ́ède Maritiusi Ìgbà (Mauritius)", + "Indian\/Mayotte": "Orílɛ́ède Mayote Ìgbà (Mayotte)", + "Indian\/Reunion": "Orílɛ́ède Riuniyan Ìgbà (Reunion)", + "Pacific\/Apia": "Orílɛ́ède Samɔ Ìgbà (Apia)", + "Pacific\/Auckland": "Orílɛ́ède shilandi Titun Ìgbà (Auckland)", + "Pacific\/Bougainville": "Orílɛ́ède Paapu ti Giini Ìgbà (Bougainville)", + "Pacific\/Chatham": "Orílɛ́ède shilandi Titun Ìgbà (Chatham)", + "Pacific\/Easter": "Orílɛ́ède shílè Ìgbà (Easter)", + "Pacific\/Efate": "Orílɛ́ède Faniatu Ìgbà (Efate)", + "Pacific\/Enderbury": "Orílɛ́ède Kiribati Ìgbà (Enderbury)", + "Pacific\/Fakaofo": "Orílɛ́ède Tokelau Ìgbà (Fakaofo)", + "Pacific\/Fiji": "Orílɛ́ède Fiji Ìgbà (Fiji)", + "Pacific\/Funafuti": "Orílɛ́ède Tufalu Ìgbà (Funafuti)", + "Pacific\/Galapagos": "Orílɛ́ède Ekuádò Ìgbà (Galapagos)", + "Pacific\/Gambier": "Orílɛ́ède Firenshi Polinesia Ìgbà (Gambier)", + "Pacific\/Guadalcanal": "Orílɛ́ède Etikun Solomoni Ìgbà (Guadalcanal)", + "Pacific\/Guam": "Orílɛ́ède Guamu Ìgbà (Guam)", + "Pacific\/Honolulu": "Orílɛ̀-èdè Amɛrikà Ìgbà (Honolulu)", + "Pacific\/Kiritimati": "Orílɛ́ède Kiribati Ìgbà (Kiritimati)", + "Pacific\/Kosrae": "Orílɛ́ède Makoronesia Ìgbà (Kosrae)", + "Pacific\/Kwajalein": "Orílɛ́ède Etikun Máshali Ìgbà (Kwajalein)", + "Pacific\/Majuro": "Orílɛ́ède Etikun Máshali Ìgbà (Majuro)", + "Pacific\/Marquesas": "Orílɛ́ède Firenshi Polinesia Ìgbà (Marquesas)", + "Pacific\/Nauru": "Orílɛ́ède Nauru Ìgbà (Nauru)", + "Pacific\/Niue": "Orílɛ́ède Niue Ìgbà (Niue)", + "Pacific\/Norfolk": "Orílɛ́ède Etikun Nɔ́úfókì Ìgbà (Norfolk)", + "Pacific\/Noumea": "Orílɛ́ède Kaledonia Titun Ìgbà (Noumea)", + "Pacific\/Pago_Pago": "Sámóánì ti Orílɛ́ède Àméríkà Ìgbà (Pago Pago)", + "Pacific\/Palau": "Orílɛ́ède Paalu Ìgbà (Palau)", + "Pacific\/Pitcairn": "Orílɛ́ède Pikarini Ìgbà (Pitcairn)", + "Pacific\/Ponape": "Orílɛ́ède Makoronesia Ìgbà (Pohnpei)", + "Pacific\/Port_Moresby": "Orílɛ́ède Paapu ti Giini Ìgbà (Port Moresby)", + "Pacific\/Rarotonga": "Orílɛ́ède Etíokun Kùúkù Ìgbà (Rarotonga)", + "Pacific\/Saipan": "Orílɛ́ède Etikun Guusu Mariana Ìgbà (Saipan)", + "Pacific\/Tahiti": "Orílɛ́ède Firenshi Polinesia Ìgbà (Tahiti)", + "Pacific\/Tarawa": "Orílɛ́ède Kiribati Ìgbà (Tarawa)", + "Pacific\/Tongatapu": "Orílɛ́ède Tonga Ìgbà (Tongatapu)", + "Pacific\/Truk": "Orílɛ́ède Makoronesia Ìgbà (Chuuk)", + "Pacific\/Wallis": "Orílɛ́ède Wali ati futuna Ìgbà (Wallis)" }, "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/zh.json b/src/Symfony/Component/Intl/Resources/data/timezones/zh.json index 83e17c95741e6..7f80743196104 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/zh.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/zh.json @@ -151,7 +151,7 @@ "America\/Moncton": "大西洋时间（蒙克顿）", "America\/Monterrey": "北美中部时间（蒙特雷）", "America\/Montevideo": "乌拉圭时间（蒙得维的亚）", - "America\/Montreal": "加拿大（Montreal）", + "America\/Montreal": "加拿大时间（Montreal）", "America\/Montserrat": "大西洋时间（蒙特塞拉特）", "America\/Nassau": "北美东部时间（拿骚）", "America\/New_York": "北美东部时间（纽约）", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "阿拉伯时间（巴林）", "Asia\/Baku": "阿塞拜疆时间（巴库）", "Asia\/Bangkok": "印度支那时间（曼谷）", - "Asia\/Barnaul": "俄罗斯（巴尔瑙尔）", + "Asia\/Barnaul": "俄罗斯时间（巴尔瑙尔）", "Asia\/Beirut": "东欧时间（贝鲁特）", "Asia\/Bishkek": "吉尔吉斯斯坦时间（比什凯克）", "Asia\/Brunei": "文莱达鲁萨兰时间", @@ -288,9 +288,9 @@ "Asia\/Tehran": "伊朗时间（德黑兰）", "Asia\/Thimphu": "不丹时间（廷布）", "Asia\/Tokyo": "日本时间（东京）", - "Asia\/Tomsk": "俄罗斯（托木斯克）", + "Asia\/Tomsk": "俄罗斯时间（托木斯克）", "Asia\/Ulaanbaatar": "乌兰巴托时间", - "Asia\/Urumqi": "中国（乌鲁木齐）", + "Asia\/Urumqi": "中国时间（乌鲁木齐）", "Asia\/Ust-Nera": "海参崴时间（乌斯内拉）", "Asia\/Vientiane": "印度支那时间（万象）", "Asia\/Vladivostok": "海参崴时间（符拉迪沃斯托克）", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "格林尼治标准时间（根西岛）", "Europe\/Helsinki": "东欧时间（赫尔辛基）", "Europe\/Isle_of_Man": "格林尼治标准时间（曼岛）", - "Europe\/Istanbul": "土耳其（伊斯坦布尔）", + "Europe\/Istanbul": "土耳其时间（伊斯坦布尔）", "Europe\/Jersey": "格林尼治标准时间（泽西岛）", "Europe\/Kaliningrad": "东欧时间（加里宁格勒）", "Europe\/Kiev": "东欧时间（基辅）", - "Europe\/Kirov": "俄罗斯（基洛夫）", + "Europe\/Kirov": "俄罗斯时间（基洛夫）", "Europe\/Lisbon": "西欧时间（里斯本）", "Europe\/Ljubljana": "中欧时间（卢布尔雅那）", "Europe\/London": "格林尼治标准时间（伦敦）", @@ -436,11 +436,5 @@ "Pacific\/Wake": "威克岛时间", "Pacific\/Wallis": "瓦利斯和富图纳时间" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/zh_HK.json b/src/Symfony/Component/Intl/Resources/data/timezones/zh_HK.json deleted file mode 100644 index 7574cb4b4ed31..0000000000000 --- a/src/Symfony/Component/Intl/Resources/data/timezones/zh_HK.json +++ /dev/null @@ -1,202 +0,0 @@ -{ - "Version": "2.1.47.86", - "Names": { - "Africa\/Abidjan": "格林尼治标准时间（阿比贊）", - "Africa\/Asmera": "东部非洲时间（阿斯馬拉）", - "Africa\/Bangui": "西部非洲时间（班基）", - "Africa\/Conakry": "格林尼治标准时间（科納克里）", - "Africa\/Dar_es_Salaam": "东部非洲时间（達累斯薩拉姆）", - "Africa\/Johannesburg": "南非時間（約翰內斯堡）", - "Africa\/Kinshasa": "西部非洲时间（金沙薩）", - "Africa\/Libreville": "西部非洲时间（利布維）", - "Africa\/Luanda": "西部非洲时间（盧安達）", - "Africa\/Lusaka": "中部非洲时间（盧薩卡）", - "Africa\/Maseru": "南非時間（馬塞魯）", - "Africa\/Mbabane": "南非時間（姆巴巴纳）", - "Africa\/Nairobi": "东部非洲时间（內羅畢）", - "Africa\/Windhoek": "中部非洲时间（溫特和克）", - "America\/Adak": "夏威夷-阿留申時間（埃達克）", - "America\/Araguaina": "巴西利亚时间（阿拉瓜伊納）", - "America\/Argentina\/La_Rioja": "阿根廷时间（拉里奧哈）", - "America\/Aruba": "大西洋时间（阿魯巴）", - "America\/Asuncion": "巴拉圭时间（阿松森）", - "America\/Bahia": "巴西利亚时间（巴希雅）", - "America\/Bahia_Banderas": "北美中部時間（巴伊亞德班德拉斯）", - "America\/Belize": "北美中部時間（伯利茲）", - "America\/Boa_Vista": "亚马逊时间（博阿維斯塔）", - "America\/Boise": "北美山區時間（博伊西）", - "America\/Cambridge_Bay": "北美山區時間（剑桥湾）", - "America\/Cancun": "北美東部時間（坎昆）", - "America\/Cayman": "北美東部時間（开曼）", - "America\/Chicago": "北美中部時間（芝加哥）", - "America\/Chihuahua": "墨西哥太平洋时间（芝娃娃）", - "America\/Coral_Harbour": "北美東部時間（阿蒂科肯）", - "America\/Cordoba": "阿根廷时间（科爾多瓦）", - "America\/Costa_Rica": "北美中部時間（哥斯達黎加）", - "America\/Creston": "北美山區時間（克雷斯顿）", - "America\/Cuiaba": "亚马逊时间（庫亞巴）", - "America\/Dawson": "北美太平洋時間（道森）", - "America\/Dawson_Creek": "北美山區時間（道森灣）", - "America\/Denver": "北美山區時間（丹佛）", - "America\/Detroit": "北美東部時間（底特律）", - "America\/Edmonton": "北美山區時間（愛民頓）", - "America\/El_Salvador": "北美中部時間（萨尔瓦多）", - "America\/Fort_Nelson": "北美山區時間（纳尔逊堡）", - "America\/Fortaleza": "巴西利亚时间（福塔萊薩）", - "America\/Glace_Bay": "大西洋时间（格萊斯灣）", - "America\/Grand_Turk": "北美東部時間（大特克）", - "America\/Grenada": "大西洋时间（格林納達）", - "America\/Guadeloupe": "大西洋时间（瓜德羅普）", - "America\/Guatemala": "北美中部時間（危地馬拉）", - "America\/Guayaquil": "厄瓜多爾時間（瓜亚基尔）", - "America\/Guyana": "圭亞那時間", - "America\/Havana": "古巴时间（夏灣拿）", - "America\/Indiana\/Knox": "北美中部時間（印第安納州諾克斯）", - "America\/Indiana\/Marengo": "北美東部時間（印第安納州馬倫哥）", - "America\/Indiana\/Petersburg": "北美東部時間（印第安納州彼得堡）", - "America\/Indiana\/Tell_City": "北美中部時間（印第安納州特爾城）", - "America\/Indiana\/Vevay": "北美東部時間（印第安納州韋韋）", - "America\/Indiana\/Vincennes": "北美東部時間（印第安納州溫森斯）", - "America\/Indiana\/Winamac": "北美東部時間（印第安納州威納馬克）", - "America\/Indianapolis": "北美東部時間（印第安納波利斯）", - "America\/Inuvik": "北美山區時間（伊努維克）", - "America\/Iqaluit": "北美東部時間（伊魁特）", - "America\/Jamaica": "北美東部時間（牙买加）", - "America\/Kentucky\/Monticello": "北美東部時間（肯塔基州蒙蒂塞洛）", - "America\/Los_Angeles": "北美太平洋時間（洛杉矶）", - "America\/Louisville": "北美東部時間（路易維爾）", - "America\/Maceio": "巴西利亚时间（馬塞約）", - "America\/Managua": "北美中部時間（馬那瓜）", - "America\/Martinique": "大西洋时间（馬提尼克）", - "America\/Matamoros": "北美中部時間（马塔莫罗斯）", - "America\/Menominee": "北美中部時間（梅諾米尼）", - "America\/Merida": "北美中部時間（梅里达）", - "America\/Mexico_City": "北美中部時間（墨西哥城）", - "America\/Monterrey": "北美中部時間（蒙特雷）", - "America\/Montevideo": "乌拉圭时间（蒙得維的亞）", - "America\/Montserrat": "大西洋时间（蒙塞拉特島）", - "America\/Nassau": "北美東部時間（拿騷）", - "America\/New_York": "北美東部時間（纽约）", - "America\/Nipigon": "北美東部時間（尼皮貢）", - "America\/Noronha": "費爾南多迪諾羅尼亞時間", - "America\/North_Dakota\/Beulah": "北美中部時間（北達科他州比尤拉）", - "America\/North_Dakota\/Center": "北美中部時間（北達科他州中心市）", - "America\/North_Dakota\/New_Salem": "北美中部時間（北達科他州新薩勒姆）", - "America\/Ojinaga": "北美山區時間（奥希纳加）", - "America\/Panama": "北美東部時間（巴拿马）", - "America\/Pangnirtung": "北美東部時間（旁涅唐）", - "America\/Paramaribo": "蘇里南時間（帕拉马里博）", - "America\/Phoenix": "北美山區時間（凤凰城）", - "America\/Port-au-Prince": "北美東部時間（太子港）", - "America\/Porto_Velho": "亚马逊时间（韋柳港）", - "America\/Rainy_River": "北美中部時間（雷尼河）", - "America\/Rankin_Inlet": "北美中部時間（兰今湾）", - "America\/Regina": "北美中部時間（里贾纳）", - "America\/Resolute": "北美中部時間（雷索卢特）", - "America\/Rio_Branco": "阿克里时间（里約布蘭科）", - "America\/Santiago": "智利时间（聖地亞哥）", - "America\/Santo_Domingo": "大西洋时间（聖多明各）", - "America\/St_Barthelemy": "大西洋时间（聖巴泰勒米）", - "America\/St_Johns": "纽芬兰时间（聖約翰斯）", - "America\/St_Lucia": "大西洋时间（聖盧西亞）", - "America\/St_Vincent": "大西洋时间（聖文森特）", - "America\/Swift_Current": "北美中部時間（斯威夫特卡伦特）", - "America\/Tegucigalpa": "北美中部時間（特古西加爾巴）", - "America\/Thule": "大西洋时间（圖勒）", - "America\/Thunder_Bay": "北美東部時間（雷灣）", - "America\/Tijuana": "北美太平洋時間（蒂華納）", - "America\/Toronto": "北美東部時間（多伦多）", - "America\/Vancouver": "北美太平洋時間（温哥华）", - "America\/Whitehorse": "北美太平洋時間（白馬市）", - "America\/Winnipeg": "北美中部時間（温尼伯）", - "America\/Yakutat": "阿拉斯加时间（亞庫塔特）", - "America\/Yellowknife": "北美山區時間（黃刀鎮）", - "Antarctica\/Casey": "澳大利亚西部时间（凱西站）", - "Antarctica\/Davis": "戴维斯时间（戴維斯站）", - "Antarctica\/DumontDUrville": "迪蒙迪維爾時間（杜蒙迪維爾站）", - "Antarctica\/Macquarie": "麥夸里群島時間", - "Antarctica\/Mawson": "莫森时间（莫森站）", - "Antarctica\/McMurdo": "新西兰时间（麥克默多站）", - "Antarctica\/Palmer": "智利时间（帕爾默）", - "Antarctica\/Rothera": "罗瑟拉时间（羅瑟拉站）", - "Antarctica\/Syowa": "昭和时间（昭和站）", - "Antarctica\/Troll": "格林尼治标准时间（特羅爾站）", - "Arctic\/Longyearbyen": "中欧时间（朗伊爾城）", - "Asia\/Anadyr": "阿纳德尔时间（阿納德爾）", - "Asia\/Baku": "亞塞拜疆時間（巴库）", - "Asia\/Bangkok": "中南半島時間（曼谷）", - "Asia\/Bishkek": "吉尔吉斯斯坦时间（比斯凱克）", - "Asia\/Calcutta": "印度時間（加尔各答）", - "Asia\/Chita": "雅庫茨克時間（赤塔）", - "Asia\/Colombo": "印度時間（科倫坡）", - "Asia\/Dubai": "波斯灣海域時間（迪拜）", - "Asia\/Dushanbe": "塔吉克斯坦时间（杜尚別）", - "Asia\/Hebron": "东欧时间（希伯侖）", - "Asia\/Irkutsk": "伊爾庫茨克時間", - "Asia\/Jayapura": "印度尼西亚东部时间（查雅普拉）", - "Asia\/Khandyga": "雅庫茨克時間（汉德加）", - "Asia\/Makassar": "印度尼西亚中部时间（錫江）", - "Asia\/Muscat": "波斯灣海域時間（馬斯喀特）", - "Asia\/Nicosia": "东欧时间（尼科西亞）", - "Asia\/Phnom_Penh": "中南半島時間（金边）", - "Asia\/Qatar": "阿拉伯时间（卡塔爾）", - "Asia\/Saigon": "中南半島時間（胡志明市）", - "Asia\/Singapore": "新加坡時間", - "Asia\/Tbilisi": "格魯吉亞時間（第比利斯）", - "Asia\/Vientiane": "中南半島時間（万象）", - "Asia\/Yakutsk": "雅庫茨克時間", - "Asia\/Yekaterinburg": "叶卡捷琳堡时间（葉卡捷琳堡）", - "Atlantic\/Cape_Verde": "佛得角時間", - "Atlantic\/Madeira": "西欧时间（馬德拉島）", - "Atlantic\/Stanley": "福克兰群岛时间（史丹利）", - "Australia\/Adelaide": "澳大利亚中部时间（阿德萊德）", - "Australia\/Brisbane": "澳大利亚东部时间（布里斯本）", - "Australia\/Currie": "澳大利亚东部时间（卡里）", - "Australia\/Hobart": "澳大利亚东部时间（荷伯特）", - "CST6CDT": "北美中部時間", - "EST5EDT": "北美東部時間", - "Europe\/Belgrade": "中欧时间（貝爾格萊德）", - "Europe\/Bratislava": "中欧时间（伯拉第斯拉瓦）", - "Europe\/Chisinau": "东欧时间（基希訥烏）", - "Europe\/Guernsey": "格林尼治标准时间（根西島）", - "Europe\/Isle_of_Man": "格林尼治标准时间（馬恩島）", - "Europe\/Ljubljana": "中欧时间（盧布爾雅那）", - "Europe\/Malta": "中欧时间（馬耳他）", - "Europe\/Sarajevo": "中欧时间（薩拉熱窩）", - "Europe\/Uzhgorod": "东欧时间（烏日哥羅德）", - "Europe\/Vaduz": "中欧时间（華杜茲）", - "Europe\/Zagreb": "中欧时间（薩格勒布）", - "Indian\/Chagos": "印度洋时间（查戈斯群島）", - "Indian\/Cocos": "可可斯群島時間", - "Indian\/Comoro": "东部非洲时间（科摩羅）", - "Indian\/Kerguelen": "法属南方和南极领地时间（凱爾蓋朗群島）", - "Indian\/Mahe": "塞舌爾時間（马埃岛）", - "Indian\/Maldives": "馬爾代夫時間", - "Indian\/Mauritius": "毛里裘斯時間", - "Indian\/Mayotte": "东部非洲时间（馬約特）", - "Indian\/Reunion": "留尼汪时间（留尼旺）", - "MST7MDT": "北美山區時間", - "PST8PDT": "北美太平洋時間", - "Pacific\/Bougainville": "巴布亞新畿內亞時間（布干維爾島）", - "Pacific\/Efate": "瓦努阿圖時間（埃法特）", - "Pacific\/Enderbury": "菲尼克斯群岛时间（恩德伯里島）", - "Pacific\/Fakaofo": "托克劳时间（法考福環礁）", - "Pacific\/Funafuti": "圖瓦盧時間（富纳富提）", - "Pacific\/Galapagos": "加拉帕戈群島時間（加拉帕戈斯）", - "Pacific\/Gambier": "甘比尔时间（甘比爾）", - "Pacific\/Guadalcanal": "所羅門群島時間（瓜達爾卡納爾島）", - "Pacific\/Honolulu": "夏威夷-阿留申時間（檀香山）", - "Pacific\/Johnston": "夏威夷-阿留申時間（約翰斯頓環礁）", - "Pacific\/Kosrae": "科斯雷時間", - "Pacific\/Kwajalein": "马绍尔群岛时间（瓜加林環礁）", - "Pacific\/Majuro": "马绍尔群岛时间（馬久羅）", - "Pacific\/Marquesas": "馬克薩斯時間（馬克薩斯群島）", - "Pacific\/Nauru": "瑙魯時間", - "Pacific\/Noumea": "新喀里多尼亞時間（努美阿）", - "Pacific\/Pitcairn": "皮特康時間（皮特康群島）", - "Pacific\/Port_Moresby": "巴布亞新畿內亞時間（莫尔兹比港）", - "Pacific\/Tongatapu": "湯加時間（湯加塔布島）", - "Pacific\/Wake": "威克岛时间（威克島）" - }, - "Meta": [] -} diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/zh_Hans_SG.json b/src/Symfony/Component/Intl/Resources/data/timezones/zh_Hans_SG.json index 343fdd7149dee..ff017c03adfff 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/zh_Hans_SG.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/zh_Hans_SG.json @@ -1,7 +1,440 @@ { "Version": "2.1.47.71", "Names": { - "America\/Scoresbysund": "格陵兰岛东部时间（斯考斯伯松德）" + "Africa\/Abidjan": "格林尼治标准时间（阿比让）", + "Africa\/Accra": "格林尼治标准时间（阿克拉）", + "Africa\/Addis_Ababa": "东部非洲时间（亚的斯亚贝巴）", + "Africa\/Algiers": "中欧时间（阿尔及尔）", + "Africa\/Asmera": "东部非洲时间（阿斯马拉）", + "Africa\/Bamako": "格林尼治标准时间（巴马科）", + "Africa\/Bangui": "西部非洲时间（班吉）", + "Africa\/Banjul": "格林尼治标准时间（班珠尔）", + "Africa\/Bissau": "格林尼治标准时间（比绍）", + "Africa\/Blantyre": "中部非洲时间（布兰太尔）", + "Africa\/Brazzaville": "西部非洲时间（布拉柴维尔）", + "Africa\/Bujumbura": "中部非洲时间（布琼布拉）", + "Africa\/Cairo": "东欧时间（开罗）", + "Africa\/Casablanca": "西欧时间（卡萨布兰卡）", + "Africa\/Ceuta": "中欧时间（休达）", + "Africa\/Conakry": "格林尼治标准时间（科纳克里）", + "Africa\/Dakar": "格林尼治标准时间（达喀尔）", + "Africa\/Dar_es_Salaam": "东部非洲时间（达累斯萨拉姆）", + "Africa\/Djibouti": "东部非洲时间（吉布提）", + "Africa\/Douala": "西部非洲时间（杜阿拉）", + "Africa\/El_Aaiun": "西欧时间（阿尤恩）", + "Africa\/Freetown": "格林尼治标准时间（弗里敦）", + "Africa\/Gaborone": "中部非洲时间（哈博罗内）", + "Africa\/Harare": "中部非洲时间（哈拉雷）", + "Africa\/Johannesburg": "南非标准时间（约翰内斯堡）", + "Africa\/Juba": "东部非洲时间（朱巴）", + "Africa\/Kampala": "东部非洲时间（坎帕拉）", + "Africa\/Khartoum": "中部非洲时间（喀土穆）", + "Africa\/Kigali": "中部非洲时间（基加利）", + "Africa\/Kinshasa": "西部非洲时间（金沙萨）", + "Africa\/Lagos": "西部非洲时间（拉各斯）", + "Africa\/Libreville": "西部非洲时间（利伯维尔）", + "Africa\/Lome": "格林尼治标准时间（洛美）", + "Africa\/Luanda": "西部非洲时间（罗安达）", + "Africa\/Lubumbashi": "中部非洲时间（卢本巴希）", + "Africa\/Lusaka": "中部非洲时间（卢萨卡）", + "Africa\/Malabo": "西部非洲时间（马拉博）", + "Africa\/Maputo": "中部非洲时间（马普托）", + "Africa\/Maseru": "南非标准时间（马塞卢）", + "Africa\/Mbabane": "南非标准时间（姆巴巴纳）", + "Africa\/Mogadishu": "东部非洲时间（摩加迪沙）", + "Africa\/Monrovia": "格林尼治标准时间（蒙罗维亚）", + "Africa\/Nairobi": "东部非洲时间（内罗毕）", + "Africa\/Ndjamena": "西部非洲时间（恩贾梅纳）", + "Africa\/Niamey": "西部非洲时间（尼亚美）", + "Africa\/Nouakchott": "格林尼治标准时间（努瓦克肖特）", + "Africa\/Ouagadougou": "格林尼治标准时间（瓦加杜古）", + "Africa\/Porto-Novo": "西部非洲时间（波多诺伏）", + "Africa\/Sao_Tome": "格林尼治标准时间（圣多美）", + "Africa\/Tripoli": "东欧时间（的黎波里）", + "Africa\/Tunis": "中欧时间（突尼斯）", + "Africa\/Windhoek": "中部非洲时间（温得和克）", + "America\/Adak": "夏威夷-阿留申时间（埃达克）", + "America\/Anchorage": "阿拉斯加时间（安克雷奇）", + "America\/Anguilla": "大西洋时间（安圭拉）", + "America\/Antigua": "大西洋时间（安提瓜）", + "America\/Araguaina": "巴西利亚时间（阿拉瓜伊纳）", + "America\/Argentina\/La_Rioja": "阿根廷时间（拉里奥哈）", + "America\/Argentina\/Rio_Gallegos": "阿根廷时间（里奥加耶戈斯）", + "America\/Argentina\/Salta": "阿根廷时间（萨尔塔）", + "America\/Argentina\/San_Juan": "阿根廷时间（圣胡安）", + "America\/Argentina\/San_Luis": "阿根廷西部时间（圣路易斯）", + "America\/Argentina\/Tucuman": "阿根廷时间（图库曼）", + "America\/Argentina\/Ushuaia": "阿根廷时间（乌斯怀亚）", + "America\/Aruba": "大西洋时间（阿鲁巴）", + "America\/Asuncion": "巴拉圭时间（亚松森）", + "America\/Bahia": "巴西利亚时间（巴伊亚）", + "America\/Bahia_Banderas": "北美中部时间（巴伊亚班德拉斯）", + "America\/Barbados": "大西洋时间（巴巴多斯）", + "America\/Belem": "巴西利亚时间（贝伦）", + "America\/Belize": "北美中部时间（伯利兹）", + "America\/Blanc-Sablon": "大西洋时间（布兰克萨布隆）", + "America\/Boa_Vista": "亚马逊时间（博阿维斯塔）", + "America\/Bogota": "哥伦比亚时间（波哥大）", + "America\/Boise": "北美山区时间（博伊西）", + "America\/Buenos_Aires": "阿根廷时间（布宜诺斯艾利斯）", + "America\/Cambridge_Bay": "北美山区时间（剑桥湾）", + "America\/Campo_Grande": "亚马逊时间（大坎普）", + "America\/Cancun": "北美东部时间（坎昆）", + "America\/Caracas": "委内瑞拉时间（加拉加斯）", + "America\/Catamarca": "阿根廷时间（卡塔马卡）", + "America\/Cayenne": "法属圭亚那标准时间（卡宴）", + "America\/Cayman": "北美东部时间（开曼）", + "America\/Chicago": "北美中部时间（芝加哥）", + "America\/Chihuahua": "墨西哥太平洋时间（奇瓦瓦）", + "America\/Coral_Harbour": "北美东部时间（阿蒂科肯）", + "America\/Cordoba": "阿根廷时间（科尔多瓦）", + "America\/Costa_Rica": "北美中部时间（哥斯达黎加）", + "America\/Creston": "北美山区时间（克雷斯顿）", + "America\/Cuiaba": "亚马逊时间（库亚巴）", + "America\/Curacao": "大西洋时间（库拉索）", + "America\/Danmarkshavn": "格林尼治标准时间（丹马沙文）", + "America\/Dawson": "北美太平洋时间（道森）", + "America\/Dawson_Creek": "北美山区时间（道森克里克）", + "America\/Denver": "北美山区时间（丹佛）", + "America\/Detroit": "北美东部时间（底特律）", + "America\/Dominica": "大西洋时间（多米尼加）", + "America\/Edmonton": "北美山区时间（埃德蒙顿）", + "America\/Eirunepe": "阿克里时间（依伦尼贝）", + "America\/El_Salvador": "北美中部时间（萨尔瓦多）", + "America\/Fort_Nelson": "北美山区时间（纳尔逊堡）", + "America\/Fortaleza": "巴西利亚时间（福塔雷萨）", + "America\/Glace_Bay": "大西洋时间（格莱斯贝）", + "America\/Godthab": "格陵兰岛西部时间（努克）", + "America\/Goose_Bay": "大西洋时间（古斯湾）", + "America\/Grand_Turk": "北美东部时间（大特克）", + "America\/Grenada": "大西洋时间（格林纳达）", + "America\/Guadeloupe": "大西洋时间（瓜德罗普）", + "America\/Guatemala": "北美中部时间（危地马拉）", + "America\/Guayaquil": "厄瓜多尔标准时间（瓜亚基尔）", + "America\/Guyana": "圭亚那时间", + "America\/Halifax": "大西洋时间（哈利法克斯）", + "America\/Havana": "古巴时间（哈瓦那）", + "America\/Hermosillo": "墨西哥太平洋时间（埃莫西约）", + "America\/Indiana\/Knox": "北美中部时间（印第安纳州诺克斯）", + "America\/Indiana\/Marengo": "北美东部时间（印第安纳州马伦戈）", + "America\/Indiana\/Petersburg": "北美东部时间（印第安纳州彼得斯堡）", + "America\/Indiana\/Tell_City": "北美中部时间（印第安纳州特尔城）", + "America\/Indiana\/Vevay": "北美东部时间（印第安纳州维维市）", + "America\/Indiana\/Vincennes": "北美东部时间（印第安纳州温森斯）", + "America\/Indiana\/Winamac": "北美东部时间（印第安纳州威纳马克）", + "America\/Indianapolis": "北美东部时间（印第安纳波利斯）", + "America\/Inuvik": "北美山区时间（伊努维克）", + "America\/Iqaluit": "北美东部时间（伊魁特）", + "America\/Jamaica": "北美东部时间（牙买加）", + "America\/Jujuy": "阿根廷时间（胡胡伊）", + "America\/Juneau": "阿拉斯加时间（朱诺）", + "America\/Kentucky\/Monticello": "北美东部时间（肯塔基州蒙蒂塞洛）", + "America\/Kralendijk": "大西洋时间（克拉伦代克）", + "America\/La_Paz": "玻利维亚标准时间（拉巴斯）", + "America\/Lima": "秘鲁时间（利马）", + "America\/Los_Angeles": "北美太平洋时间（洛杉矶）", + "America\/Louisville": "北美东部时间（路易斯维尔）", + "America\/Lower_Princes": "大西洋时间（下太子区）", + "America\/Maceio": "巴西利亚时间（马塞约）", + "America\/Managua": "北美中部时间（马那瓜）", + "America\/Manaus": "亚马逊时间（马瑙斯）", + "America\/Marigot": "大西洋时间（马里戈特）", + "America\/Martinique": "大西洋时间（马提尼克）", + "America\/Matamoros": "北美中部时间（马塔莫罗斯）", + "America\/Mazatlan": "墨西哥太平洋时间（马萨特兰）", + "America\/Mendoza": "阿根廷时间（门多萨）", + "America\/Menominee": "北美中部时间（梅诺米尼）", + "America\/Merida": "北美中部时间（梅里达）", + "America\/Metlakatla": "阿拉斯加时间（梅特拉卡特拉）", + "America\/Mexico_City": "北美中部时间（墨西哥城）", + "America\/Miquelon": "圣皮埃尔和密克隆群岛时间", + "America\/Moncton": "大西洋时间（蒙克顿）", + "America\/Monterrey": "北美中部时间（蒙特雷）", + "America\/Montevideo": "乌拉圭时间（蒙得维的亚）", + "America\/Montreal": "加拿大时间（Montreal）", + "America\/Montserrat": "大西洋时间（蒙特塞拉特）", + "America\/Nassau": "北美东部时间（拿骚）", + "America\/New_York": "北美东部时间（纽约）", + "America\/Nipigon": "北美东部时间（尼皮贡）", + "America\/Nome": "阿拉斯加时间（诺姆）", + "America\/Noronha": "费尔南多-迪诺罗尼亚岛时间（洛罗尼亚）", + "America\/North_Dakota\/Beulah": "北美中部时间（北达科他州比尤拉）", + "America\/North_Dakota\/Center": "北美中部时间（北达科他州申特）", + "America\/North_Dakota\/New_Salem": "北美中部时间（北达科他州新塞勒姆）", + "America\/Ojinaga": "北美山区时间（奥希纳加）", + "America\/Panama": "北美东部时间（巴拿马）", + "America\/Pangnirtung": "北美东部时间（旁涅唐）", + "America\/Paramaribo": "苏里南时间（帕拉马里博）", + "America\/Phoenix": "北美山区时间（凤凰城）", + "America\/Port-au-Prince": "北美东部时间（太子港）", + "America\/Port_of_Spain": "大西洋时间（西班牙港）", + "America\/Porto_Velho": "亚马逊时间（波多韦柳）", + "America\/Puerto_Rico": "大西洋时间（波多黎各）", + "America\/Punta_Arenas": "智利时间（蓬塔阿雷纳斯）", + "America\/Rainy_River": "北美中部时间（雷尼河）", + "America\/Rankin_Inlet": "北美中部时间（兰今湾）", + "America\/Recife": "巴西利亚时间（累西腓）", + "America\/Regina": "北美中部时间（里贾纳）", + "America\/Resolute": "北美中部时间（雷索卢特）", + "America\/Rio_Branco": "阿克里时间（里奥布郎库）", + "America\/Santa_Isabel": "墨西哥西北部时间（圣伊萨贝尔）", + "America\/Santarem": "巴西利亚时间（圣塔伦）", + "America\/Santiago": "智利时间（圣地亚哥）", + "America\/Santo_Domingo": "大西洋时间（圣多明各）", + "America\/Sao_Paulo": "巴西利亚时间（圣保罗）", + "America\/Scoresbysund": "格陵兰岛东部时间（斯考斯伯松德）", + "America\/Sitka": "阿拉斯加时间（锡特卡）", + "America\/St_Barthelemy": "大西洋时间（圣巴泰勒米岛）", + "America\/St_Johns": "纽芬兰时间（圣约翰斯）", + "America\/St_Kitts": "大西洋时间（圣基茨）", + "America\/St_Lucia": "大西洋时间（圣卢西亚）", + "America\/St_Thomas": "大西洋时间（圣托马斯）", + "America\/St_Vincent": "大西洋时间（圣文森特）", + "America\/Swift_Current": "北美中部时间（斯威夫特卡伦特）", + "America\/Tegucigalpa": "北美中部时间（特古西加尔巴）", + "America\/Thule": "大西洋时间（图勒）", + "America\/Thunder_Bay": "北美东部时间（桑德贝）", + "America\/Tijuana": "北美太平洋时间（蒂华纳）", + "America\/Toronto": "北美东部时间（多伦多）", + "America\/Tortola": "大西洋时间（托尔托拉）", + "America\/Vancouver": "北美太平洋时间（温哥华）", + "America\/Whitehorse": "北美太平洋时间（怀特霍斯）", + "America\/Winnipeg": "北美中部时间（温尼伯）", + "America\/Yakutat": "阿拉斯加时间（亚库塔特）", + "America\/Yellowknife": "北美山区时间（耶洛奈夫）", + "Antarctica\/Casey": "澳大利亚西部时间（卡塞）", + "Antarctica\/Davis": "戴维斯时间", + "Antarctica\/DumontDUrville": "迪蒙迪尔维尔时间", + "Antarctica\/Macquarie": "麦夸里岛时间（麦格理）", + "Antarctica\/Mawson": "莫森时间", + "Antarctica\/McMurdo": "新西兰时间（麦克默多）", + "Antarctica\/Palmer": "智利时间（帕默尔）", + "Antarctica\/Rothera": "罗瑟拉时间", + "Antarctica\/Syowa": "昭和时间", + "Antarctica\/Troll": "格林尼治标准时间（特罗尔）", + "Antarctica\/Vostok": "沃斯托克时间", + "Arctic\/Longyearbyen": "中欧时间（朗伊尔城）", + "Asia\/Aden": "阿拉伯时间（亚丁）", + "Asia\/Almaty": "哈萨克斯坦东部时间（阿拉木图）", + "Asia\/Amman": "东欧时间（安曼）", + "Asia\/Anadyr": "阿纳德尔时间", + "Asia\/Aqtau": "哈萨克斯坦西部时间（阿克套）", + "Asia\/Aqtobe": "哈萨克斯坦西部时间（阿克托别）", + "Asia\/Ashgabat": "土库曼斯坦时间（阿什哈巴德）", + "Asia\/Atyrau": "哈萨克斯坦西部时间（阿特劳）", + "Asia\/Baghdad": "阿拉伯时间（巴格达）", + "Asia\/Bahrain": "阿拉伯时间（巴林）", + "Asia\/Baku": "阿塞拜疆时间（巴库）", + "Asia\/Bangkok": "印度支那时间（曼谷）", + "Asia\/Barnaul": "俄罗斯时间（巴尔瑙尔）", + "Asia\/Beirut": "东欧时间（贝鲁特）", + "Asia\/Bishkek": "吉尔吉斯斯坦时间（比什凯克）", + "Asia\/Brunei": "文莱达鲁萨兰时间", + "Asia\/Calcutta": "印度时间（加尔各答）", + "Asia\/Chita": "雅库茨克时间（赤塔）", + "Asia\/Choibalsan": "乔巴山时间", + "Asia\/Colombo": "印度时间（科伦坡）", + "Asia\/Damascus": "东欧时间（大马士革）", + "Asia\/Dhaka": "孟加拉时间（达卡）", + "Asia\/Dili": "东帝汶时间（帝力）", + "Asia\/Dubai": "海湾标准时间（迪拜）", + "Asia\/Dushanbe": "塔吉克斯坦时间（杜尚别）", + "Asia\/Famagusta": "东欧时间（法马古斯塔）", + "Asia\/Gaza": "东欧时间（加沙）", + "Asia\/Hebron": "东欧时间（希伯伦）", + "Asia\/Hong_Kong": "香港时间", + "Asia\/Hovd": "科布多时间", + "Asia\/Irkutsk": "伊尔库茨克时间", + "Asia\/Jakarta": "印度尼西亚西部时间（雅加达）", + "Asia\/Jayapura": "印度尼西亚东部时间（查亚普拉）", + "Asia\/Jerusalem": "以色列时间（耶路撒冷）", + "Asia\/Kabul": "阿富汗时间（喀布尔）", + "Asia\/Kamchatka": "彼得罗巴甫洛夫斯克-堪察加时间", + "Asia\/Karachi": "巴基斯坦时间（卡拉奇）", + "Asia\/Katmandu": "尼泊尔时间（加德满都）", + "Asia\/Khandyga": "雅库茨克时间（汉德加）", + "Asia\/Krasnoyarsk": "克拉斯诺亚尔斯克时间", + "Asia\/Kuala_Lumpur": "马来西亚时间（吉隆坡）", + "Asia\/Kuching": "马来西亚时间（古晋）", + "Asia\/Kuwait": "阿拉伯时间（科威特）", + "Asia\/Macau": "中国时间（澳门）", + "Asia\/Magadan": "马加丹时间", + "Asia\/Makassar": "印度尼西亚中部时间（望加锡）", + "Asia\/Manila": "菲律宾时间（马尼拉）", + "Asia\/Muscat": "海湾标准时间（马斯喀特）", + "Asia\/Nicosia": "东欧时间（尼科西亚）", + "Asia\/Novokuznetsk": "克拉斯诺亚尔斯克时间（新库兹涅茨克）", + "Asia\/Novosibirsk": "新西伯利亚时间（诺沃西比尔斯克）", + "Asia\/Omsk": "鄂木斯克时间", + "Asia\/Oral": "哈萨克斯坦西部时间（乌拉尔）", + "Asia\/Phnom_Penh": "印度支那时间（金边）", + "Asia\/Pontianak": "印度尼西亚西部时间（坤甸）", + "Asia\/Pyongyang": "韩国时间（平壤）", + "Asia\/Qatar": "阿拉伯时间（卡塔尔）", + "Asia\/Qostanay": "哈萨克斯坦东部时间（库斯塔奈）", + "Asia\/Qyzylorda": "哈萨克斯坦西部时间（克孜洛尔达）", + "Asia\/Rangoon": "缅甸时间（仰光）", + "Asia\/Riyadh": "阿拉伯时间（利雅得）", + "Asia\/Saigon": "印度支那时间（胡志明市）", + "Asia\/Sakhalin": "库页岛时间（萨哈林）", + "Asia\/Samarkand": "乌兹别克斯坦时间（撒马尔罕）", + "Asia\/Seoul": "韩国时间（首尔）", + "Asia\/Shanghai": "中国时间（上海）", + "Asia\/Singapore": "新加坡标准时间", + "Asia\/Srednekolymsk": "马加丹时间（中科雷姆斯克）", + "Asia\/Taipei": "台北时间", + "Asia\/Tashkent": "乌兹别克斯坦时间（塔什干）", + "Asia\/Tbilisi": "格鲁吉亚时间（第比利斯）", + "Asia\/Tehran": "伊朗时间（德黑兰）", + "Asia\/Thimphu": "不丹时间（廷布）", + "Asia\/Tokyo": "日本时间（东京）", + "Asia\/Tomsk": "俄罗斯时间（托木斯克）", + "Asia\/Ulaanbaatar": "乌兰巴托时间", + "Asia\/Urumqi": "中国时间（乌鲁木齐）", + "Asia\/Ust-Nera": "海参崴时间（乌斯内拉）", + "Asia\/Vientiane": "印度支那时间（万象）", + "Asia\/Vladivostok": "海参崴时间（符拉迪沃斯托克）", + "Asia\/Yakutsk": "雅库茨克时间", + "Asia\/Yekaterinburg": "叶卡捷琳堡时间", + "Asia\/Yerevan": "亚美尼亚时间（埃里温）", + "Atlantic\/Azores": "亚速尔群岛时间", + "Atlantic\/Bermuda": "大西洋时间（百慕大）", + "Atlantic\/Canary": "西欧时间（加那利）", + "Atlantic\/Cape_Verde": "佛得角时间", + "Atlantic\/Faeroe": "西欧时间（法罗）", + "Atlantic\/Madeira": "西欧时间（马德拉）", + "Atlantic\/Reykjavik": "格林尼治标准时间（雷克雅未克）", + "Atlantic\/South_Georgia": "南乔治亚岛时间", + "Atlantic\/St_Helena": "格林尼治标准时间（圣赫勒拿）", + "Atlantic\/Stanley": "福克兰群岛时间（斯坦利）", + "Australia\/Adelaide": "澳大利亚中部时间（阿德莱德）", + "Australia\/Brisbane": "澳大利亚东部时间（布里斯班）", + "Australia\/Broken_Hill": "澳大利亚中部时间（布罗肯希尔）", + "Australia\/Currie": "澳大利亚东部时间（库利）", + "Australia\/Darwin": "澳大利亚中部时间（达尔文）", + "Australia\/Eucla": "澳大利亚中西部时间（尤克拉）", + "Australia\/Hobart": "澳大利亚东部时间（霍巴特）", + "Australia\/Lindeman": "澳大利亚东部时间（林德曼）", + "Australia\/Lord_Howe": "豪勋爵岛时间", + "Australia\/Melbourne": "澳大利亚东部时间（墨尔本）", + "Australia\/Perth": "澳大利亚西部时间（珀斯）", + "Australia\/Sydney": "澳大利亚东部时间（悉尼）", + "CST6CDT": "北美中部时间", + "EST5EDT": "北美东部时间", + "Etc\/GMT": "格林尼治标准时间", + "Etc\/UTC": "协调世界时", + "Europe\/Amsterdam": "中欧时间（阿姆斯特丹）", + "Europe\/Andorra": "中欧时间（安道尔）", + "Europe\/Astrakhan": "莫斯科时间（阿斯特拉罕）", + "Europe\/Athens": "东欧时间（雅典）", + "Europe\/Belgrade": "中欧时间（贝尔格莱德）", + "Europe\/Berlin": "中欧时间（柏林）", + "Europe\/Bratislava": "中欧时间（布拉迪斯拉发）", + "Europe\/Brussels": "中欧时间（布鲁塞尔）", + "Europe\/Bucharest": "东欧时间（布加勒斯特）", + "Europe\/Budapest": "中欧时间（布达佩斯）", + "Europe\/Busingen": "中欧时间（布辛根）", + "Europe\/Chisinau": "东欧时间（基希讷乌）", + "Europe\/Copenhagen": "中欧时间（哥本哈根）", + "Europe\/Dublin": "格林尼治标准时间（都柏林）", + "Europe\/Gibraltar": "中欧时间（直布罗陀）", + "Europe\/Guernsey": "格林尼治标准时间（根西岛）", + "Europe\/Helsinki": "东欧时间（赫尔辛基）", + "Europe\/Isle_of_Man": "格林尼治标准时间（曼岛）", + "Europe\/Istanbul": "土耳其时间（伊斯坦布尔）", + "Europe\/Jersey": "格林尼治标准时间（泽西岛）", + "Europe\/Kaliningrad": "东欧时间（加里宁格勒）", + "Europe\/Kiev": "东欧时间（基辅）", + "Europe\/Kirov": "俄罗斯时间（基洛夫）", + "Europe\/Lisbon": "西欧时间（里斯本）", + "Europe\/Ljubljana": "中欧时间（卢布尔雅那）", + "Europe\/London": "格林尼治标准时间（伦敦）", + "Europe\/Luxembourg": "中欧时间（卢森堡）", + "Europe\/Madrid": "中欧时间（马德里）", + "Europe\/Malta": "中欧时间（马耳他）", + "Europe\/Mariehamn": "东欧时间（玛丽港）", + "Europe\/Minsk": "莫斯科时间（明斯克）", + "Europe\/Monaco": "中欧时间（摩纳哥）", + "Europe\/Moscow": "莫斯科时间", + "Europe\/Oslo": "中欧时间（奥斯陆）", + "Europe\/Paris": "中欧时间（巴黎）", + "Europe\/Podgorica": "中欧时间（波德戈里察）", + "Europe\/Prague": "中欧时间（布拉格）", + "Europe\/Riga": "东欧时间（里加）", + "Europe\/Rome": "中欧时间（罗马）", + "Europe\/Samara": "萨马拉时间", + "Europe\/San_Marino": "中欧时间（圣马力诺）", + "Europe\/Sarajevo": "中欧时间（萨拉热窝）", + "Europe\/Saratov": "莫斯科时间（萨拉托夫）", + "Europe\/Simferopol": "莫斯科时间（辛菲罗波尔）", + "Europe\/Skopje": "中欧时间（斯科普里）", + "Europe\/Sofia": "东欧时间（索非亚）", + "Europe\/Stockholm": "中欧时间（斯德哥尔摩）", + "Europe\/Tallinn": "东欧时间（塔林）", + "Europe\/Tirane": "中欧时间（地拉那）", + "Europe\/Ulyanovsk": "莫斯科时间（乌里扬诺夫斯克）", + "Europe\/Uzhgorod": "东欧时间（乌日哥罗德）", + "Europe\/Vaduz": "中欧时间（瓦杜兹）", + "Europe\/Vatican": "中欧时间（梵蒂冈）", + "Europe\/Vienna": "中欧时间（维也纳）", + "Europe\/Vilnius": "东欧时间（维尔纽斯）", + "Europe\/Volgograd": "伏尔加格勒时间", + "Europe\/Warsaw": "中欧时间（华沙）", + "Europe\/Zagreb": "中欧时间（萨格勒布）", + "Europe\/Zaporozhye": "东欧时间（扎波罗热）", + "Europe\/Zurich": "中欧时间（苏黎世）", + "Indian\/Antananarivo": "东部非洲时间（安塔那那利佛）", + "Indian\/Chagos": "印度洋时间（查戈斯）", + "Indian\/Christmas": "圣诞岛时间", + "Indian\/Cocos": "科科斯群岛时间（可可斯）", + "Indian\/Comoro": "东部非洲时间（科摩罗）", + "Indian\/Kerguelen": "法属南方和南极领地时间（凯尔盖朗）", + "Indian\/Mahe": "塞舌尔时间（马埃岛）", + "Indian\/Maldives": "马尔代夫时间", + "Indian\/Mauritius": "毛里求斯时间", + "Indian\/Mayotte": "东部非洲时间（马约特）", + "Indian\/Reunion": "留尼汪时间", + "MST7MDT": "北美山区时间", + "PST8PDT": "北美太平洋时间", + "Pacific\/Apia": "阿皮亚时间", + "Pacific\/Auckland": "新西兰时间（奥克兰）", + "Pacific\/Bougainville": "巴布亚新几内亚时间（布干维尔）", + "Pacific\/Chatham": "查坦时间（查塔姆）", + "Pacific\/Easter": "复活节岛时间", + "Pacific\/Efate": "瓦努阿图时间（埃法特）", + "Pacific\/Enderbury": "菲尼克斯群岛时间（恩德伯里）", + "Pacific\/Fakaofo": "托克劳时间（法考福）", + "Pacific\/Fiji": "斐济时间", + "Pacific\/Funafuti": "图瓦卢时间（富纳富提）", + "Pacific\/Galapagos": "加拉帕戈斯时间", + "Pacific\/Gambier": "甘比尔时间", + "Pacific\/Guadalcanal": "所罗门群岛时间（瓜达尔卡纳尔）", + "Pacific\/Guam": "查莫罗时间（关岛）", + "Pacific\/Honolulu": "夏威夷-阿留申时间（檀香山）", + "Pacific\/Johnston": "夏威夷-阿留申时间（约翰斯顿）", + "Pacific\/Kiritimati": "莱恩群岛时间（基里地马地岛）", + "Pacific\/Kosrae": "科斯雷时间（库赛埃）", + "Pacific\/Kwajalein": "马绍尔群岛时间（夸贾林）", + "Pacific\/Majuro": "马绍尔群岛时间（马朱罗）", + "Pacific\/Marquesas": "马克萨斯群岛时间", + "Pacific\/Midway": "萨摩亚时间（中途岛）", + "Pacific\/Nauru": "瑙鲁时间", + "Pacific\/Niue": "纽埃时间", + "Pacific\/Norfolk": "诺福克岛时间", + "Pacific\/Noumea": "新喀里多尼亚时间（努美阿）", + "Pacific\/Pago_Pago": "萨摩亚时间（帕果帕果）", + "Pacific\/Palau": "帕劳时间", + "Pacific\/Pitcairn": "皮特凯恩时间", + "Pacific\/Ponape": "波纳佩时间（波纳佩岛）", + "Pacific\/Port_Moresby": "巴布亚新几内亚时间（莫尔兹比港）", + "Pacific\/Rarotonga": "库克群岛时间（拉罗汤加）", + "Pacific\/Saipan": "查莫罗时间（塞班）", + "Pacific\/Tahiti": "塔希提岛时间", + "Pacific\/Tarawa": "吉尔伯特群岛时间（塔拉瓦）", + "Pacific\/Tongatapu": "汤加时间（东加塔布）", + "Pacific\/Truk": "楚克时间（特鲁克群岛）", + "Pacific\/Wake": "威克岛时间", + "Pacific\/Wallis": "瓦利斯和富图纳时间" }, "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/zh_Hant.json b/src/Symfony/Component/Intl/Resources/data/timezones/zh_Hant.json index 9c2d00390574a..55051c63167e0 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/zh_Hant.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/zh_Hant.json @@ -151,6 +151,7 @@ "America\/Moncton": "大西洋時間（蒙克頓）", "America\/Monterrey": "中部時間（蒙特瑞）", "America\/Montevideo": "烏拉圭時間（蒙特維多）", + "America\/Montreal": "加拿大時間（Montreal）", "America\/Montserrat": "大西洋時間（蒙哲臘）", "America\/Nassau": "東部時間（拿索）", "America\/New_York": "東部時間（紐約）", @@ -225,7 +226,7 @@ "Asia\/Bahrain": "阿拉伯時間（巴林）", "Asia\/Baku": "亞塞拜然時間（巴庫）", "Asia\/Bangkok": "印度支那時間（曼谷）", - "Asia\/Barnaul": "俄羅斯（巴爾瑙爾）", + "Asia\/Barnaul": "俄羅斯時間（巴爾瑙爾）", "Asia\/Beirut": "東歐時間（貝魯特）", "Asia\/Bishkek": "吉爾吉斯時間（比什凱克）", "Asia\/Brunei": "汶萊時間", @@ -287,8 +288,9 @@ "Asia\/Tehran": "伊朗時間（德黑蘭）", "Asia\/Thimphu": "不丹時間（廷布）", "Asia\/Tokyo": "日本時間（東京）", + "Asia\/Tomsk": "俄羅斯時間（托木斯克）", "Asia\/Ulaanbaatar": "烏蘭巴托時間", - "Asia\/Urumqi": "中國（烏魯木齊）", + "Asia\/Urumqi": "中國時間（烏魯木齊）", "Asia\/Ust-Nera": "海參崴時間（烏斯內拉）", "Asia\/Vientiane": "印度支那時間（永珍）", "Asia\/Vladivostok": "海參崴時間", @@ -339,10 +341,11 @@ "Europe\/Guernsey": "格林威治標準時間（根息島）", "Europe\/Helsinki": "東歐時間（赫爾辛基）", "Europe\/Isle_of_Man": "格林威治標準時間（曼島）", - "Europe\/Istanbul": "土耳其（伊斯坦堡）", + "Europe\/Istanbul": "土耳其時間（伊斯坦堡）", "Europe\/Jersey": "格林威治標準時間（澤西島）", "Europe\/Kaliningrad": "東歐時間（加里寧格勒）", "Europe\/Kiev": "東歐時間（基輔）", + "Europe\/Kirov": "俄羅斯時間（基洛夫）", "Europe\/Lisbon": "西歐時間（里斯本）", "Europe\/Ljubljana": "中歐時間（盧比安納）", "Europe\/London": "格林威治標準時間（倫敦）", diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/zh_Hant_HK.json b/src/Symfony/Component/Intl/Resources/data/timezones/zh_Hant_HK.json index fd205b2f61771..0a01310d22493 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/zh_Hant_HK.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/zh_Hant_HK.json @@ -210,7 +210,6 @@ "Pacific\/Fakaofo": "托克勞群島時間（法考福環礁）", "Pacific\/Funafuti": "圖瓦盧時間（富那富提）", "Pacific\/Galapagos": "加拉帕戈群島時間（加拉巴哥群島）", - "Pacific\/Gambier": "甘比爾群島時間", "Pacific\/Guadalcanal": "所羅門群島時間（瓜達爾卡納爾島）", "Pacific\/Johnston": "夏威夷-阿留申時間（約翰斯頓環礁）", "Pacific\/Kosrae": "科斯雷時間", @@ -222,8 +221,7 @@ "Pacific\/Pago_Pago": "薩摩亞時間（帕果帕果）", "Pacific\/Pitcairn": "皮特康時間（皮特康群島）", "Pacific\/Port_Moresby": "巴布亞新畿內亞時間（莫士比港）", - "Pacific\/Tongatapu": "湯加時間（湯加塔布島）", - "Pacific\/Wake": "威克島時間" + "Pacific\/Tongatapu": "湯加時間（湯加塔布島）" }, "Meta": [] } diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/zh_SG.json b/src/Symfony/Component/Intl/Resources/data/timezones/zh_SG.json deleted file mode 100644 index 343fdd7149dee..0000000000000 --- a/src/Symfony/Component/Intl/Resources/data/timezones/zh_SG.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Version": "2.1.47.71", - "Names": { - "America\/Scoresbysund": "格陵兰岛东部时间（斯考斯伯松德）" - }, - "Meta": [] -} diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/zu.json b/src/Symfony/Component/Intl/Resources/data/timezones/zu.json index 4a0e1e9a99d62..1e03992630a61 100644 --- a/src/Symfony/Component/Intl/Resources/data/timezones/zu.json +++ b/src/Symfony/Component/Intl/Resources/data/timezones/zu.json @@ -99,7 +99,7 @@ "America\/Detroit": "Isikhathi sase-North American East (i-Detroit)", "America\/Dominica": "Isikhathi sase-Atlantic (i-Dominica)", "America\/Edmonton": "Isikhathi sase-North American Mountain (i-Edmonton)", - "America\/Eirunepe": "i-Brazil (i-Eirunepe)", + "America\/Eirunepe": "Isikhathi sase-i-Brazil (i-Eirunepe)", "America\/El_Salvador": "Isikhathi sase-North American Central (i-El Salvador)", "America\/Fort_Nelson": "Isikhathi sase-North American Mountain (i-Fort Nelson)", "America\/Fortaleza": "Isikhathi sase-Brasilia (i-Fortaleza)", @@ -151,7 +151,7 @@ "America\/Moncton": "Isikhathi sase-Atlantic (i-Moncton)", "America\/Monterrey": "Isikhathi sase-North American Central (i-Monterrey)", "America\/Montevideo": "Isikhathi sase-Uruguay (i-Montevideo)", - "America\/Montreal": "i-Canada (Montreal)", + "America\/Montreal": "Isikhathi sase-i-Canada (Montreal)", "America\/Montserrat": "Isikhathi sase-Atlantic (i-Montserrat)", "America\/Nassau": "Isikhathi sase-North American East (i-Nassau)", "America\/New_York": "Isikhathi sase-North American East (i-New York)", @@ -176,7 +176,7 @@ "America\/Recife": "Isikhathi sase-Brasilia (i-Recife)", "America\/Regina": "Isikhathi sase-North American Central (i-Regina)", "America\/Resolute": "Isikhathi sase-North American Central (i-Resolute)", - "America\/Rio_Branco": "i-Brazil (i-Rio Branco)", + "America\/Rio_Branco": "Isikhathi sase-i-Brazil (i-Rio Branco)", "America\/Santa_Isabel": "Isikhathi sase-Northwest Mexico (i-Santa Isabel)", "America\/Santarem": "Isikhathi sase-Brasilia (i-Santarem)", "America\/Santiago": "Isikhathi sase-Chile (i-Santiago)", @@ -226,7 +226,7 @@ "Asia\/Bahrain": "Isikhathi sase-Arabian (i-Bahrain)", "Asia\/Baku": "Isikhathi sase-Azerbaijan (i-Baku)", "Asia\/Bangkok": "Isikhathi sase-Indochina (i-Bangkok)", - "Asia\/Barnaul": "i-Russia (i-Barnaul)", + "Asia\/Barnaul": "Isikhathi sase-i-Russia (i-Barnaul)", "Asia\/Beirut": "Isikhathi sase-Eastern Europe (i-Beirut)", "Asia\/Bishkek": "Isikhathi sase-Kyrgystan (i-Bishkek)", "Asia\/Brunei": "Isikhathi sase-Brunei Darussalam (i-Brunei)", @@ -288,9 +288,9 @@ "Asia\/Tehran": "Isikhathi sase-Iran (i-Tehran)", "Asia\/Thimphu": "Isikhathi sase-Bhutan (i-Thimphu)", "Asia\/Tokyo": "Isikhathi sase-Japan (i-Tokyo)", - "Asia\/Tomsk": "i-Russia (i-Tomsk)", + "Asia\/Tomsk": "Isikhathi sase-i-Russia (i-Tomsk)", "Asia\/Ulaanbaatar": "Isikhathi sase-Ulan Bator (i-Ulaanbaatar)", - "Asia\/Urumqi": "i-China (i-Urumqi)", + "Asia\/Urumqi": "Isikhathi sase-i-China (i-Urumqi)", "Asia\/Ust-Nera": "Isikhathi sase-Vladivostok (i-Ust-Nera)", "Asia\/Vientiane": "Isikhathi sase-Indochina (i-Vientiane)", "Asia\/Vladivostok": "Isikhathi sase-Vladivostok (i-Vladivostok)", @@ -341,11 +341,11 @@ "Europe\/Guernsey": "Isikhathi sase-Greenwich Mean (i-Guernsey)", "Europe\/Helsinki": "Isikhathi sase-Eastern Europe (i-Helsinki)", "Europe\/Isle_of_Man": "Isikhathi sase-Greenwich Mean (i-Isle of Man)", - "Europe\/Istanbul": "i-Turkey (i-Istanbul)", + "Europe\/Istanbul": "Isikhathi sase-i-Turkey (i-Istanbul)", "Europe\/Jersey": "Isikhathi sase-Greenwich Mean (i-Jersey)", "Europe\/Kaliningrad": "Isikhathi sase-Eastern Europe (i-Kaliningrad)", "Europe\/Kiev": "Isikhathi sase-Eastern Europe (i-Kiev)", - "Europe\/Kirov": "i-Russia (i-Kirov)", + "Europe\/Kirov": "Isikhathi sase-i-Russia (i-Kirov)", "Europe\/Lisbon": "Isikhathi sase-Western Europe (i-Lisbon)", "Europe\/Ljubljana": "Isikhathi sase-Central Europe (i-Ljubljana)", "Europe\/London": "Isikhathi sase-Greenwich Mean (i-London)", @@ -436,11 +436,5 @@ "Pacific\/Wake": "Isikhathi sase-Wake Island (i-Wake)", "Pacific\/Wallis": "Isikhathi sase-Wallis nase-Futuna (i-Wallis)" }, - "Meta": { - "GmtFormat": "GMT%s", - "HourFormat": [ - "+%02d:%02d", - "-%02d:%02d" - ] - } + "Meta": [] } diff --git a/src/Symfony/Component/Intl/Timezones.php b/src/Symfony/Component/Intl/Timezones.php index 1058a0978be56..94afc7186062e 100644 --- a/src/Symfony/Component/Intl/Timezones.php +++ b/src/Symfony/Component/Intl/Timezones.php @@ -86,7 +86,7 @@ public static function getGmtOffset(string $timezone, int $timestamp = null, str $offset = self::getRawOffset($timezone, $timestamp); $abs = abs($offset); - return sprintf(self::readEntry(['Meta', 'GmtFormat'], $displayLocale), sprintf(self::readEntry(['Meta', 'HourFormat', 0 <= $offset ? 0 : 1], $displayLocale), $abs / 3600, $abs / 60 % 60)); + return sprintf(self::readEntry(['Meta', 'GmtFormat'], $displayLocale), sprintf(self::readEntry(['Meta', 'HourFormat'.(0 <= $offset ? 'Pos' : 'Neg')], $displayLocale), $abs / 3600, $abs / 60 % 60)); } /** From d261bb5dd10e786aaf185bd44e9cc37469792828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20de=20Guillebon?= Date: Thu, 9 May 2019 15:04:55 +0200 Subject: [PATCH 12/67] Fix finding parent definition --- .../DependencyInjection/AddValidatorInitializersPass.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php index dcc02ca694589..d7bea0fb73d94 100644 --- a/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php +++ b/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php @@ -62,7 +62,7 @@ public function process(ContainerBuilder $container) } while (!($class = $translator->getClass()) && $translator instanceof ChildDefinition) { - $translator = $translator->getParent(); + $translator = $container->findDefinition($translator->getParent()); } if (!is_subclass_of($class, LegacyTranslatorInterface::class)) { From 10da2310daa39303544b234de02a24555c087655 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 9 May 2019 15:11:39 +0200 Subject: [PATCH 13/67] [Doctrine\Bridge] fix tests --- src/Symfony/Bridge/Doctrine/composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 819af8522046f..265994893d2f5 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -25,6 +25,7 @@ }, "require-dev": { "symfony/stopwatch": "~3.4|~4.0", + "symfony/config": "^4.2", "symfony/dependency-injection": "~3.4|~4.0", "symfony/form": "~4.3", "symfony/http-kernel": "~3.4|~4.0", From d88446be072ea3466eda4673f1611364cac5528a Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Thu, 9 May 2019 11:10:11 -0400 Subject: [PATCH 14/67] Making cache rebuild correctly with MessageSubscriberInterface return values --- .../Resource/ReflectionClassResource.php | 8 +++++ .../Resource/ReflectionClassResourceTest.php | 33 +++++++++++++++++++ src/Symfony/Component/Config/composer.json | 1 + 3 files changed, 42 insertions(+) diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php index a7e73becf55f4..3890dd29eddd8 100644 --- a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php +++ b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php @@ -13,6 +13,7 @@ use Symfony\Component\DependencyInjection\ServiceSubscriberInterface as LegacyServiceSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Symfony\Component\Messenger\Handler\MessageSubscriberInterface; use Symfony\Contracts\Service\ServiceSubscriberInterface; /** @@ -164,6 +165,13 @@ private function generateSignature(\ReflectionClass $class) yield print_r($class->name::getSubscribedEvents(), true); } + if (interface_exists(MessageSubscriberInterface::class, false) && $class->isSubclassOf(MessageSubscriberInterface::class)) { + yield MessageSubscriberInterface::class; + foreach ($class->name::getHandledMessages() as $key => $value) { + yield $key.print_r($value, true); + } + } + if (interface_exists(LegacyServiceSubscriberInterface::class, false) && $class->isSubclassOf(LegacyServiceSubscriberInterface::class)) { yield LegacyServiceSubscriberInterface::class; yield print_r([$class->name, 'getSubscribedServices'](), true); diff --git a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php index abc461cd7c898..e22933245d252 100644 --- a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php +++ b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php @@ -15,6 +15,7 @@ use Symfony\Component\Config\Resource\ReflectionClassResource; use Symfony\Component\DependencyInjection\ServiceSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Symfony\Component\Messenger\Handler\MessageSubscriberInterface; class ReflectionClassResourceTest extends TestCase { @@ -147,6 +148,24 @@ public function testEventSubscriber() $this->assertTrue($res->isFresh(0)); } + public function testMessageSubscriber() + { + $res = new ReflectionClassResource(new \ReflectionClass(TestMessageSubscriber::class)); + $this->assertTrue($res->isFresh(0)); + + TestMessageSubscriberConfigHolder::$handledMessages = ['SomeMessageClass' => []]; + $this->assertFalse($res->isFresh(0)); + + $res = new ReflectionClassResource(new \ReflectionClass(TestMessageSubscriber::class)); + $this->assertTrue($res->isFresh(0)); + + TestMessageSubscriberConfigHolder::$handledMessages = ['OtherMessageClass' => []]; + $this->assertFalse($res->isFresh(0)); + + $res = new ReflectionClassResource(new \ReflectionClass(TestMessageSubscriber::class)); + $this->assertTrue($res->isFresh(0)); + } + public function testServiceSubscriber() { $res = new ReflectionClassResource(new \ReflectionClass(TestServiceSubscriber::class)); @@ -174,6 +193,20 @@ public static function getSubscribedEvents() } } +class TestMessageSubscriber implements MessageSubscriberInterface +{ + public static function getHandledMessages(): iterable + { + foreach (TestMessageSubscriberConfigHolder::$handledMessages as $key => $subscribedMessage) { + yield $key => $subscribedMessage; + } + } +} +class TestMessageSubscriberConfigHolder +{ + public static $handledMessages = []; +} + class TestServiceSubscriber implements ServiceSubscriberInterface { public static $subscribedServices = []; diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json index 35fbffdb69a41..00a88e81b5c50 100644 --- a/src/Symfony/Component/Config/composer.json +++ b/src/Symfony/Component/Config/composer.json @@ -24,6 +24,7 @@ "symfony/dependency-injection": "~3.4|~4.0", "symfony/event-dispatcher": "~3.4|~4.0", "symfony/finder": "~3.4|~4.0", + "symfony/messenger": "~4.1", "symfony/yaml": "~3.4|~4.0" }, "conflict": { From 7fce86f1dba28a172b3b113c330078875fb1dda5 Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Thu, 9 May 2019 18:59:49 +0200 Subject: [PATCH 15/67] [Form] Restore default locale during tests --- .../IntegerToLocalizedStringTransformerTest.php | 10 ++++++++-- .../NumberToLocalizedStringTransformerTest.php | 10 ++++++++-- .../PercentToLocalizedStringTransformerTest.php | 10 ++++++++-- .../Form/Tests/Extension/Core/Type/DateTypeTest.php | 4 +++- .../Form/Tests/Extension/Core/Type/MoneyTypeTest.php | 11 +++++++++++ .../Form/Tests/Extension/Core/Type/NumberTypeTest.php | 10 ++++++++++ 6 files changed, 48 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php index 8cdbb1959a79e..f918434715e80 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php @@ -17,13 +17,19 @@ class IntegerToLocalizedStringTransformerTest extends TestCase { + private $defaultLocale; + protected function setUp() { - parent::setUp(); - + $this->defaultLocale = \Locale::getDefault(); \Locale::setDefault('en'); } + protected function tearDown() + { + \Locale::setDefault($this->defaultLocale); + } + public function transformWithRoundingProvider() { return [ diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php index 1f05af6128ca7..9baad43549e62 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php @@ -17,13 +17,19 @@ class NumberToLocalizedStringTransformerTest extends TestCase { + private $defaultLocale; + protected function setUp() { - parent::setUp(); - + $this->defaultLocale = \Locale::getDefault(); \Locale::setDefault('en'); } + protected function tearDown() + { + \Locale::setDefault($this->defaultLocale); + } + public function provideTransformations() { return [ diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php index c6007a398b861..f726edcda466a 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php @@ -17,13 +17,19 @@ class PercentToLocalizedStringTransformerTest extends TestCase { + private $defaultLocale; + protected function setUp() { - parent::setUp(); - + $this->defaultLocale = \Locale::getDefault(); \Locale::setDefault('en'); } + protected function tearDown() + { + \Locale::setDefault($this->defaultLocale); + } + public function testTransform() { $transformer = new PercentToLocalizedStringTransformer(); diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php index 247a5d4b37861..31dfc65af0700 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php @@ -20,17 +20,19 @@ class DateTypeTest extends BaseTypeTest const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\DateType'; private $defaultTimezone; + private $defaultLocale; protected function setUp() { parent::setUp(); $this->defaultTimezone = date_default_timezone_get(); + $this->defaultLocale = \Locale::getDefault(); } protected function tearDown() { date_default_timezone_set($this->defaultTimezone); - \Locale::setDefault('en'); + \Locale::setDefault($this->defaultLocale); } /** diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php index f75ea90249059..34576ec6306ee 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php @@ -17,6 +17,8 @@ class MoneyTypeTest extends BaseTypeTest { const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\MoneyType'; + private $defaultLocale; + protected function setUp() { // we test against different locales, so we need the full @@ -24,6 +26,15 @@ protected function setUp() IntlTestHelper::requireFullIntl($this, false); parent::setUp(); + + $this->defaultLocale = \Locale::getDefault(); + } + + protected function tearDown() + { + parent::tearDown(); + + \Locale::setDefault($this->defaultLocale); } public function testPassMoneyPatternToView() diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php index c19c82b117697..9cc2893c662dc 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php @@ -17,6 +17,8 @@ class NumberTypeTest extends BaseTypeTest { const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\NumberType'; + private $defaultLocale; + protected function setUp() { parent::setUp(); @@ -24,9 +26,17 @@ protected function setUp() // we test against "de_DE", so we need the full implementation IntlTestHelper::requireFullIntl($this, false); + $this->defaultLocale = \Locale::getDefault(); \Locale::setDefault('de_DE'); } + protected function tearDown() + { + parent::tearDown(); + + \Locale::setDefault($this->defaultLocale); + } + public function testDefaultFormatting() { $form = $this->factory->create(static::TESTED_TYPE); From 11ed09813fc4a3c53be2d14b605501c5f42cc96b Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Thu, 9 May 2019 19:25:09 -0700 Subject: [PATCH 16/67] Fix typo: depreciation -> deprecation --- .../Component/OptionsResolver/Tests/OptionsResolverTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php index 54d18911498ed..e0417fdf34c0d 100644 --- a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php +++ b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php @@ -751,7 +751,7 @@ function (OptionsResolver $resolver) { 0, ]; - yield 'It explicitly ignores a depreciation' => [ + yield 'It explicitly ignores a deprecation' => [ function (OptionsResolver $resolver) { $resolver ->setDefault('baz', function (Options $options) { From 001b93061109f0e4e64a9de8b43333448be317ff Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Sat, 27 Apr 2019 21:26:49 +0200 Subject: [PATCH 17/67] [Form] Add intl/choice_translation_locale option to TimezoneType --- .../Form/Extension/Core/Type/TimezoneType.php | 55 ++++++++++++++-- .../Extension/Core/Type/TimezoneTypeTest.php | 62 +++++++++++++++++++ 2 files changed, 111 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php index 54968e6799615..ccf51d1fb5f27 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php @@ -13,10 +13,12 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader; +use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader; use Symfony\Component\Form\Exception\LogicException; use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeZoneToStringTransformer; use Symfony\Component\Form\Extension\Core\DataTransformer\IntlTimeZoneToStringTransformer; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Intl\Timezones; use Symfony\Component\OptionsResolver\Options; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -40,19 +42,41 @@ public function buildForm(FormBuilderInterface $builder, array $options) public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ + 'intl' => false, 'choice_loader' => function (Options $options) { - $regions = $options->offsetGet('regions', false); $input = $options['input']; + if ($options['intl']) { + $choiceTranslationLocale = $options['choice_translation_locale']; + + return new IntlCallbackChoiceLoader(function () use ($input, $choiceTranslationLocale) { + return self::getIntlTimezones($input, $choiceTranslationLocale); + }); + } + + $regions = $options->offsetGet('regions', false); + return new CallbackChoiceLoader(function () use ($regions, $input) { - return self::getTimezones($regions, $input); + return self::getPhpTimezones($regions, $input); }); }, 'choice_translation_domain' => false, + 'choice_translation_locale' => null, 'input' => 'string', 'regions' => \DateTimeZone::ALL, ]); + $resolver->setAllowedTypes('intl', ['bool']); + + $resolver->setAllowedTypes('choice_translation_locale', ['null', 'string']); + $resolver->setNormalizer('choice_translation_locale', function (Options $options, $value) { + if (null !== $value && !$options['intl']) { + throw new LogicException('The "choice_translation_locale" option can only be used if the "intl" option is set to true.'); + } + + return $value; + }); + $resolver->setAllowedValues('input', ['string', 'datetimezone', 'intltimezone']); $resolver->setNormalizer('input', function (Options $options, $value) { if ('intltimezone' === $value && !class_exists(\IntlTimeZone::class)) { @@ -64,6 +88,13 @@ public function configureOptions(OptionsResolver $resolver) $resolver->setAllowedTypes('regions', 'int'); $resolver->setDeprecated('regions', 'The option "%name%" is deprecated since Symfony 4.2.'); + $resolver->setNormalizer('regions', function (Options $options, $value) { + if ($options['intl'] && \DateTimeZone::ALL !== (\DateTimeZone::ALL & $value)) { + throw new LogicException('The "regions" option can only be used if the "intl" option is set to false.'); + } + + return $value; + }); } /** @@ -82,10 +113,7 @@ public function getBlockPrefix() return 'timezone'; } - /** - * Returns a normalized array of timezone choices. - */ - private static function getTimezones(int $regions, string $input): array + private static function getPhpTimezones(int $regions, string $input): array { $timezones = []; @@ -99,4 +127,19 @@ private static function getTimezones(int $regions, string $input): array return $timezones; } + + private static function getIntlTimezones(string $input, string $locale = null): array + { + $timezones = array_flip(Timezones::getNames($locale)); + + if ('intltimezone' === $input) { + foreach ($timezones as $name => $timezone) { + if ('Etc/Unknown' === \IntlTimeZone::createTimeZone($timezone)->getID()) { + unset($timezones[$name]); + } + } + } + + return $timezones; + } } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php index 8e1fee8d3628d..bded60a7de62f 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; use Symfony\Component\Form\ChoiceList\View\ChoiceView; +use Symfony\Component\Intl\Util\IntlTestHelper; class TimezoneTypeTest extends BaseTypeTest { @@ -83,6 +84,17 @@ public function testFilterByRegions() $this->assertContains(new ChoiceView('Europe/Amsterdam', 'Europe/Amsterdam', 'Europe / Amsterdam'), $choices, '', false, false); } + /** + * @group legacy + * @expectedDeprecation The option "regions" is deprecated since Symfony 4.2. + * @expectedException \Symfony\Component\Form\Exception\LogicException + * @expectedExceptionMessage The "regions" option can only be used if the "intl" option is set to false. + */ + public function testFilterByRegionsWithIntl() + { + $this->factory->create(static::TESTED_TYPE, null, ['regions' => \DateTimeZone::EUROPE, 'intl' => true]); + } + /** * @requires extension intl */ @@ -116,4 +128,54 @@ public function testIntlTimeZoneInputWithBc() $this->assertNull($form->getData()); $this->assertNotContains('Europe/Saratov', $form->getConfig()->getAttribute('choice_list')->getValues()); } + + /** + * @requires extension intl + */ + public function testIntlTimeZoneInputWithBcAndIntl() + { + $form = $this->factory->create(static::TESTED_TYPE, null, ['input' => 'intltimezone', 'intl' => true]); + $form->submit('Europe/Saratov'); + + $this->assertNull($form->getData()); + $this->assertNotContains('Europe/Saratov', $form->getConfig()->getAttribute('choice_list')->getValues()); + } + + public function testTimezonesAreSelectableWithIntl() + { + IntlTestHelper::requireIntl($this, false); + + $choices = $this->factory->create(static::TESTED_TYPE, null, ['intl' => true]) + ->createView()->vars['choices']; + + $this->assertContains(new ChoiceView('Europe/Amsterdam', 'Europe/Amsterdam', 'Central European Time (Amsterdam)'), $choices, '', false, false); + $this->assertContains(new ChoiceView('Etc/UTC', 'Etc/UTC', 'Coordinated Universal Time'), $choices, '', false, false); + } + + /** + * @requires extension intl + */ + public function testChoiceTranslationLocaleOptionWithIntl() + { + $choices = $this->factory + ->create(static::TESTED_TYPE, null, [ + 'intl' => true, + 'choice_translation_locale' => 'uk', + ]) + ->createView()->vars['choices']; + + $this->assertContains(new ChoiceView('Europe/Amsterdam', 'Europe/Amsterdam', 'за центральноєвропейським часом (Амстердам)'), $choices, '', false, false); + $this->assertContains(new ChoiceView('Etc/UTC', 'Etc/UTC', 'за всесвітнім координованим часом'), $choices, '', false, false); + } + + /** + * @expectedException \Symfony\Component\Form\Exception\LogicException + * @expectedExceptionMessage The "choice_translation_locale" option can only be used if the "intl" option is set to true. + */ + public function testChoiceTranslationLocaleOptionWithoutIntl() + { + $this->factory->create(static::TESTED_TYPE, null, [ + 'choice_translation_locale' => 'uk', + ]); + } } From 74afcd6777d4d27acf2f928a95bd3d12c5919c1a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 10 May 2019 08:05:43 +0200 Subject: [PATCH 18/67] removed deprecated usage of some Twig features --- composer.json | 2 +- .../Bridge/Twig/Resources/views/Form/form_div_layout.html.twig | 2 +- src/Symfony/Bridge/Twig/composer.json | 2 +- src/Symfony/Bundle/TwigBundle/composer.json | 2 +- .../Resources/views/Collector/request.html.twig | 2 +- src/Symfony/Bundle/WebProfilerBundle/composer.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index b1fde067a7c1c..8049c9e468340 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "doctrine/event-manager": "~1.0", "doctrine/persistence": "~1.0", "fig/link-util": "^1.0", - "twig/twig": "^1.40|^2.9", + "twig/twig": "^1.41|^2.10", "psr/cache": "~1.0", "psr/container": "^1.0", "psr/link": "^1.0", diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig index 6d96cbd221943..a32a19cf0557f 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig @@ -399,7 +399,7 @@ {# Support #} {%- block form_rows -%} - {% for child in form if not child.rendered %} + {% for child in form|filter(child => not child.rendered) %} {{- form_row(child) -}} {% endfor %} {%- endblock form_rows -%} diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 9674f21031509..345dc26e47037 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -18,7 +18,7 @@ "require": { "php": "^7.1.3", "symfony/contracts": "^1.0.2", - "twig/twig": "^1.40|^2.9" + "twig/twig": "^1.41|^2.10" }, "require-dev": { "symfony/asset": "~3.4|~4.0", diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index 4e163c2eedec4..d9db82a45c117 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -22,7 +22,7 @@ "symfony/http-foundation": "~4.1", "symfony/http-kernel": "~4.1", "symfony/polyfill-ctype": "~1.8", - "twig/twig": "~1.40|~2.9" + "twig/twig": "~1.41|~2.10" }, "require-dev": { "symfony/asset": "~3.4|~4.0", diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig index 923049aebc43c..03ad94f92429c 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig @@ -259,7 +259,7 @@

Defined as regular env variables

{% set requestserver = [] %} - {% for key, value in collector.requestserver if key not in collector.dotenvvars.keys %} + {% for key, value in collector.requestserver|filter((_, key) => key not in collector.dotenvvars.keys) %} {% set requestserver = requestserver|merge({(key): value}) %} {% endfor %} {{ include('@WebProfiler/Profiler/table.html.twig', { data: requestserver }, with_context = false) }} diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index c43de7eef3dc2..7cba80a6c5c66 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -22,7 +22,7 @@ "symfony/routing": "~3.4|~4.0", "symfony/twig-bundle": "~4.2", "symfony/var-dumper": "~3.4|~4.0", - "twig/twig": "~1.34|~2.4" + "twig/twig": "^1.41|^2.10" }, "require-dev": { "symfony/console": "~3.4|~4.0", From 53b68afec4f54169ed997b147132be12f052e947 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 10 May 2019 09:52:53 +0200 Subject: [PATCH 19/67] [TwigBundle] fixed Mailer integration in Twig --- src/Symfony/Bundle/TwigBundle/Resources/config/mailer.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/mailer.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/mailer.xml index d61bc32c45406..0e425952ffe59 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/config/mailer.xml +++ b/src/Symfony/Bundle/TwigBundle/Resources/config/mailer.xml @@ -6,8 +6,9 @@ - + null + From bdeeae15102fcbd4b5a03d72f77f685f9b164383 Mon Sep 17 00:00:00 2001 From: Jonas Elfering Date: Fri, 10 May 2019 10:08:25 +0200 Subject: [PATCH 20/67] Fix the interface incompatibility of EventDispatchers The `LegacyEventDispatcherProxy` now implements the full `EventDispatcherInterface` from the `EventDispatcherBundle`. Before it just implemented the Interface from the `Contracts` Bundle, that made it incompatible with the `WrappedListener`. This fixes #31457. --- .../Component/EventDispatcher/LegacyEventDispatcherProxy.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php b/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php index e1f8aaee00d07..86917b7d5438f 100644 --- a/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php +++ b/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php @@ -13,7 +13,7 @@ use Psr\EventDispatcher\StoppableEventInterface; use Symfony\Contracts\EventDispatcher\Event as ContractsEvent; -use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface as ContractsEventDispatcherInterface; /** * An helper class to provide BC/FC with the legacy signature of EventDispatcherInterface::dispatch(). @@ -26,7 +26,7 @@ final class LegacyEventDispatcherProxy implements EventDispatcherInterface { private $dispatcher; - public static function decorate(?EventDispatcherInterface $dispatcher): ?EventDispatcherInterface + public static function decorate(?ContractsEventDispatcherInterface $dispatcher): ?ContractsEventDispatcherInterface { if (null === $dispatcher) { return null; From 7bcd714381442d642f9932f15b7ffa8328344520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Sat, 6 Apr 2019 20:49:38 +0200 Subject: [PATCH 21/67] [FrameworkBundle] Fixed issue when a parameter container a '%' On my computer: ``` dump(get_cfg_var('xdebug.file_link_format')); "subl://%f:%l" ``` When I ran `bin/console debug:config framework` I got this exception: ``` In ParameterBag.php line 100: [Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException] The parameter "templating.helper.code.file_link_format" has a dependency on a non-existent parameter "f:". Exception trace: () at /home/gregoire/dev/github.com/lyrixx/symfony/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php:100 ... ``` This issue was introduced [here](https://github.com/symfony/symfony/pull/27684/files#diff-b3847149480405e1de881530b4c75ab5L212) --- .../Command/ContainerDebugCommand.php | 7 +-- .../Console/Descriptor/Descriptor.php | 26 +++++++++-- .../Functional/ContainerDebugCommandTest.php | 44 ++++++------------- .../Functional/Fixtures/describe_env_vars.txt | 17 +++++++ 4 files changed, 56 insertions(+), 38 deletions(-) create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Fixtures/describe_env_vars.txt diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php index 3736d4dc9d99a..b7c4fba0333fe 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php @@ -224,15 +224,12 @@ protected function getContainerBuilder() if (!$kernel->isDebug() || !(new ConfigCache($kernel->getContainer()->getParameter('debug.container.dump'), true))->isFresh()) { $buildContainer = \Closure::bind(function () { return $this->buildContainer(); }, $kernel, \get_class($kernel)); $container = $buildContainer(); + $container->getCompilerPassConfig()->setRemovingPasses([]); + $container->compile(); } else { (new XmlFileLoader($container = new ContainerBuilder(), new FileLocator()))->load($kernel->getContainer()->getParameter('debug.container.dump')); - $container->setParameter('container.build_hash', $hash = ContainerBuilder::hash(__METHOD__)); - $container->setParameter('container.build_id', hash('crc32', $hash.time())); } - $container->getCompilerPassConfig()->setRemovingPasses([]); - $container->compile(); - return $this->containerBuilder = $container; } diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php index 7babbd39129f2..e454633c787d9 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php @@ -322,21 +322,41 @@ public static function getClassDescription(string $class, string &$resolvedClass private function getContainerEnvVars(ContainerBuilder $container): array { + if (!$container->hasParameter('debug.container.dump')) { + return []; + } + + if (!is_file($container->getParameter('debug.container.dump'))) { + return []; + } + + $file = file_get_contents($container->getParameter('debug.container.dump')); + preg_match_all('{%env\(((?:\w++:)*+\w++)\)%}', $file, $envVars); + $envVars = array_unique($envVars[1]); + + $bag = $container->getParameterBag(); + $getDefaultParameter = function (string $name) { + return parent::get($name); + }; + $getDefaultParameter = $getDefaultParameter->bindTo($bag, \get_class($bag)); + $getEnvReflection = new \ReflectionMethod($container, 'getEnv'); $getEnvReflection->setAccessible(true); + $envs = []; - foreach (array_keys($container->getEnvCounters()) as $env) { + + foreach ($envVars as $env) { $processor = 'string'; if (false !== $i = strrpos($name = $env, ':')) { $name = substr($env, $i + 1); $processor = substr($env, 0, $i); } - $defaultValue = ($hasDefault = $container->hasParameter("env($name)")) ? $container->getParameter("env($name)") : null; + $defaultValue = ($hasDefault = $container->hasParameter("env($name)")) ? $getDefaultParameter("env($name)") : null; if (false === ($runtimeValue = $_ENV[$name] ?? $_SERVER[$name] ?? getenv($name))) { $runtimeValue = null; } $processedValue = ($hasRuntime = null !== $runtimeValue) || $hasDefault ? $getEnvReflection->invoke($container, $env) : null; - $envs[$name.$processor] = [ + $envs["$name$processor"] = [ 'name' => $name, 'processor' => $processor, 'default_available' => $hasDefault, diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php index 9f833afbe7313..229f1419cfa7e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php @@ -83,11 +83,13 @@ public function testIgnoreBackslashWhenFindingService(string $validServiceId) public function testDescribeEnvVars() { putenv('REAL=value'); - static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']); + static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml', 'debug' => true]); $application = new Application(static::$kernel); $application->setAutoExit(false); + @unlink(static::$container->getParameter('debug.container.dump')); + $tester = new ApplicationTester($application); $tester->run(['command' => 'debug:container', '--env-vars' => true], ['decorated' => false]); @@ -96,13 +98,13 @@ public function testDescribeEnvVars() Symfony Container Environment Variables ======================================= - --------- ----------------- ------------ - Name Default value Real value - --------- ----------------- ------------ - JSON "[1, "2.5", 3]" n/a - REAL n/a "value" - UNKNOWN n/a n/a - --------- ----------------- ------------ + --------- ----------------- ------------%w + Name Default value Real value%w + --------- ----------------- ------------%w + JSON "[1, "2.5", 3]" n/a%w + REAL n/a "value"%w + UNKNOWN n/a n/a%w + --------- ----------------- ------------%w // Note real values might be different between web and CLI.%w @@ -118,35 +120,17 @@ public function testDescribeEnvVars() public function testDescribeEnvVar() { - static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']); + static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml', 'debug' => true]); $application = new Application(static::$kernel); $application->setAutoExit(false); + @unlink(static::$container->getParameter('debug.container.dump')); + $tester = new ApplicationTester($application); $tester->run(['command' => 'debug:container', '--env-var' => 'js'], ['decorated' => false]); - $this->assertContains(<<<'TXT' -%env(float:key:2:json:JSON)% ----------------------------- - - ----------------- ----------------- - Default value "[1, "2.5", 3]" - Real value n/a - Processed value 3.0 - ----------------- ----------------- - -%env(int:key:2:json:JSON)% --------------------------- - - ----------------- ----------------- - Default value "[1, "2.5", 3]" - Real value n/a - Processed value 3 - ----------------- ----------------- - -TXT - , $tester->getDisplay(true)); + $this->assertContains(file_get_contents(__DIR__.'/Fixtures/describe_env_vars.txt'), $tester->getDisplay(true)); } public function provideIgnoreBackslashWhenFindingService() diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Fixtures/describe_env_vars.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Fixtures/describe_env_vars.txt new file mode 100644 index 0000000000000..701e515ce1ad1 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Fixtures/describe_env_vars.txt @@ -0,0 +1,17 @@ +%env(float:key:2:json:JSON)% +---------------------------- + + ----------------- ----------------- + Default value "[1, "2.5", 3]" + Real value n/a + Processed value 3.0 + ----------------- ----------------- + +%env(int:key:2:json:JSON)% +-------------------------- + + ----------------- ----------------- + Default value "[1, "2.5", 3]" + Real value n/a + Processed value 3 + ----------------- ----------------- From 1bdf2af0da94bf2b570389197e581b46b935aa8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Fri, 10 May 2019 12:50:04 +0200 Subject: [PATCH 22/67] [Serializer] Fix BC break: DEPTH_KEY_PATTERN must be public --- .../Serializer/Normalizer/AbstractObjectNormalizer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php index 71e5db2dab5a4..e4cba584e7024 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php @@ -41,7 +41,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer /** * How to track the current depth in the context. */ - private const DEPTH_KEY_PATTERN = 'depth_%s::%s'; + public const DEPTH_KEY_PATTERN = 'depth_%s::%s'; /** * While denormalizing, we can verify that types match. From 42e0536d8f4cd6e746b8cdf326361f24a544b623 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 10 May 2019 13:30:14 -0400 Subject: [PATCH 23/67] Changing how RoutableMessageBus fallback bus works --- .../Resources/config/messenger.xml | 1 + .../Messenger/RoutableMessageBus.php | 24 +++++++++++++++--- .../Tests/RoutableMessageBusTest.php | 25 +++++++------------ 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml index 14ffd4d3827a2..85a1a432615d8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml @@ -106,6 +106,7 @@ + diff --git a/src/Symfony/Component/Messenger/RoutableMessageBus.php b/src/Symfony/Component/Messenger/RoutableMessageBus.php index cb1e2ae6273a6..c0f7eeca1b9a0 100644 --- a/src/Symfony/Component/Messenger/RoutableMessageBus.php +++ b/src/Symfony/Component/Messenger/RoutableMessageBus.php @@ -28,13 +28,15 @@ class RoutableMessageBus implements MessageBusInterface { private $busLocator; + private $fallbackBus; /** * @param ContainerInterface $busLocator A locator full of MessageBusInterface objects */ - public function __construct(ContainerInterface $busLocator) + public function __construct(ContainerInterface $busLocator, MessageBusInterface $fallbackBus = null) { $this->busLocator = $busLocator; + $this->fallbackBus = $fallbackBus; } public function dispatch($envelope, array $stamps = []): Envelope @@ -43,14 +45,28 @@ public function dispatch($envelope, array $stamps = []): Envelope throw new InvalidArgumentException('Messages passed to RoutableMessageBus::dispatch() must be inside an Envelope'); } - /** @var BusNameStamp $busNameStamp */ + return $this->getMessageBus($envelope)->dispatch($envelope, $stamps); + } + + private function getMessageBus(Envelope $envelope): MessageBusInterface + { + /** @var BusNameStamp|null $busNameStamp */ $busNameStamp = $envelope->last(BusNameStamp::class); - $busName = null !== $busNameStamp ? $busNameStamp->getBusName() : MessageBusInterface::class; + + if (null === $busNameStamp) { + if (null === $this->fallbackBus) { + throw new InvalidArgumentException(sprintf('Envelope is missing a BusNameStamp and no fallback message bus is configured on RoutableMessageBus.')); + } + + return $this->fallbackBus; + } + + $busName = $busNameStamp->getBusName(); if (!$this->busLocator->has($busName)) { throw new InvalidArgumentException(sprintf('Bus named "%s" does not exist.', $busName)); } - return $this->busLocator->get($busName)->dispatch($envelope, $stamps); + return $this->busLocator->get($busName); } } diff --git a/src/Symfony/Component/Messenger/Tests/RoutableMessageBusTest.php b/src/Symfony/Component/Messenger/Tests/RoutableMessageBusTest.php index c778fd7cbee12..ef970d3838c7b 100644 --- a/src/Symfony/Component/Messenger/Tests/RoutableMessageBusTest.php +++ b/src/Symfony/Component/Messenger/Tests/RoutableMessageBusTest.php @@ -50,41 +50,34 @@ public function testItRoutesToDefaultBus() ->willReturn($envelope); $container = $this->createMock(ContainerInterface::class); - $container->expects($this->once())->method('has')->with(MessageBusInterface::class) - ->willReturn(true); - $container->expects($this->once())->method('get')->with(MessageBusInterface::class) - ->willReturn($defaultBus); - $routableBus = new RoutableMessageBus($container); + $routableBus = new RoutableMessageBus($container, $defaultBus); $this->assertSame($envelope, $routableBus->dispatch($envelope, [$stamp])); } - public function testItExceptionOnDefaultBusNotFound() + public function testItExceptionOnBusNotFound() { $this->expectException(InvalidArgumentException::class); - $this->expectExceptionMessage(sprintf('Bus named "%s" does not exist.', MessageBusInterface::class)); + $this->expectExceptionMessage('Bus named "my_cool_bus" does not exist.'); - $envelope = new Envelope(new \stdClass()); + $envelope = new Envelope(new \stdClass(), [ + new BusNameStamp('my_cool_bus'), + ]); $container = $this->createMock(ContainerInterface::class); - $container->expects($this->once())->method('has')->with(MessageBusInterface::class) - ->willReturn(false); - $routableBus = new RoutableMessageBus($container); $routableBus->dispatch($envelope); } - public function testItExceptionOnBusNotFound() + public function testItExceptionOnDefaultBusNotFound() { $this->expectException(InvalidArgumentException::class); - $this->expectExceptionMessage(sprintf('Bus named "%s" does not exist.', 'foo_bus')); + $this->expectExceptionMessage('Envelope is missing a BusNameStamp and no fallback message bus is configured on RoutableMessageBus.'); - $envelope = new Envelope(new \stdClass(), [new BusNameStamp('foo_bus')]); + $envelope = new Envelope(new \stdClass()); $container = $this->createMock(ContainerInterface::class); - $container->expects($this->once())->method('has')->willReturn(false); - $routableBus = new RoutableMessageBus($container); $routableBus->dispatch($envelope); } From a7cf3f997aa14aa34def075077a3c9962ca7e9f5 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 10 May 2019 14:00:00 -0400 Subject: [PATCH 24/67] Fixing tests - passing pdo is not wrapped for some reason in dbal --- .../Tests/Transport/Doctrine/DoctrineIntegrationTest.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php index aca22cf6369b2..67707339640d8 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php @@ -37,11 +37,8 @@ public function cleanup() */ public function createConnection() { - if ($dsn = getenv('MESSENGER_DOCTRINE_DSN')) { - $this->driverConnection = DriverManager::getConnection(['url' => $dsn]); - } else { - $this->driverConnection = DriverManager::getConnection(['pdo' => new \PDO('sqlite:'.sys_get_temp_dir().'/symfony.messenger.sqlite')]); - } + $dsn = getenv('MESSENGER_DOCTRINE_DSN') ?: 'sqlite:///'.sys_get_temp_dir().'/symfony.messenger.sqlite'; + $this->driverConnection = DriverManager::getConnection(['url' => $dsn]); $this->connection = new Connection([], $this->driverConnection); // call send to auto-setup the table $this->connection->setup(); From 8bac3d6fa31908cbdd02b41e32f14467b228cd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20G=C3=B3mez=20Vilches?= Date: Fri, 10 May 2019 21:58:31 +0200 Subject: [PATCH 25/67] Allow set 'None' on samesite cookie flag Allow set samesite cookie flag to 'None' value --- src/Symfony/Component/HttpFoundation/Cookie.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpFoundation/Cookie.php b/src/Symfony/Component/HttpFoundation/Cookie.php index e61619aa6dd92..83a97087f1d99 100644 --- a/src/Symfony/Component/HttpFoundation/Cookie.php +++ b/src/Symfony/Component/HttpFoundation/Cookie.php @@ -28,6 +28,7 @@ class Cookie private $raw; private $sameSite; + const SAMESITE_NONE = 'none'; const SAMESITE_LAX = 'lax'; const SAMESITE_STRICT = 'strict'; @@ -128,7 +129,7 @@ public function __construct($name, $value = null, $expire = 0, $path = '/', $dom $sameSite = strtolower($sameSite); } - if (!\in_array($sameSite, [self::SAMESITE_LAX, self::SAMESITE_STRICT, null], true)) { + if (!\in_array($sameSite, [self::SAMESITE_LAX, self::SAMESITE_STRICT, self::SAMESITE_NONE, null], true)) { throw new \InvalidArgumentException('The "sameSite" parameter value is not valid.'); } From 4552b7f5b253141ebc3e42378f5d56afb5cf8998 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 10 May 2019 07:52:04 +0200 Subject: [PATCH 26/67] [Messenger] remove send_and_handle option which can be achieved with SyncTransport --- .../Bundle/FrameworkBundle/CHANGELOG.md | 2 + .../DependencyInjection/Configuration.php | 3 -- .../FrameworkExtension.php | 3 -- .../Resources/config/messenger.xml | 1 - .../Resources/config/schema/symfony-1.0.xsd | 1 - .../Fixtures/php/messenger_routing.php | 1 - .../Fixtures/xml/messenger_routing.xml | 2 +- .../Fixtures/yml/messenger_routing.yml | 1 - .../FrameworkExtensionTest.php | 8 --- src/Symfony/Component/Messenger/CHANGELOG.md | 1 + .../Middleware/SendMessageMiddleware.php | 14 ++---- .../Middleware/SendMessageMiddlewareTest.php | 50 +++++-------------- .../Transport/Sender/SendersLocator.php | 16 +----- .../Sender/SendersLocatorInterface.php | 5 +- 14 files changed, 23 insertions(+), 85 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md index 132e964cc1cba..d32da9541ac5b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md @@ -22,6 +22,8 @@ CHANGELOG `framework.messenger.default_serializer`, which holds the string service id and `framework.messenger.symfony_serializer`, which configures the options if you're using Symfony's serializer. + * [BC Break] Removed the `framework.messenger.routing.send_and_handle` configuration. + Instead of setting it to true, configure a `SyncTransport` and route messages to it. * Added information about deprecated aliases in `debug:autowiring` * Added php ini session options `sid_length` and `sid_bits_per_character` to the `session` section of the configuration diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index 43c24ddd2331d..44ed8213e916d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -1125,7 +1125,6 @@ private function addMessengerSection(ArrayNodeDefinition $rootNode) if (!\is_int($k)) { $newConfig[$k] = [ 'senders' => $v['senders'] ?? (\is_array($v) ? array_values($v) : [$v]), - 'send_and_handle' => $v['send_and_handle'] ?? false, ]; } else { $newConfig[$v['message-class']]['senders'] = array_map( @@ -1134,7 +1133,6 @@ function ($a) { }, array_values($v['sender']) ); - $newConfig[$v['message-class']]['send-and-handle'] = $v['send-and-handle'] ?? false; } } @@ -1147,7 +1145,6 @@ function ($a) { ->requiresAtLeastOneElement() ->prototype('scalar')->end() ->end() - ->booleanNode('send_and_handle')->defaultFalse()->end() ->end() ->end() ->end() diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index beac06980673b..e285aa9506ec8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -1744,7 +1744,6 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder } $messageToSendersMapping = []; - $messagesToSendAndHandle = []; foreach ($config['routing'] as $message => $messageConfiguration) { if ('*' !== $message && !class_exists($message) && !interface_exists($message, false)) { throw new LogicException(sprintf('Invalid Messenger routing configuration: class or interface "%s" not found.', $message)); @@ -1758,7 +1757,6 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder } $messageToSendersMapping[$message] = $messageConfiguration['senders']; - $messagesToSendAndHandle[$message] = $messageConfiguration['send_and_handle']; } $senderReferences = []; @@ -1769,7 +1767,6 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder $container->getDefinition('messenger.senders_locator') ->replaceArgument(0, $messageToSendersMapping) ->replaceArgument(1, ServiceLocatorTagPass::register($container, $senderReferences)) - ->replaceArgument(2, $messagesToSendAndHandle) ; $container->getDefinition('messenger.retry_strategy_locator') diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml index 85a1a432615d8..ed1612e7e8554 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml @@ -11,7 +11,6 @@ - diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd index fcba6ef6ce362..04157511dc1a4 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd @@ -434,7 +434,6 @@ - diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php index c8bddb1e8fcec..9badc0650597c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php @@ -10,7 +10,6 @@ 'Symfony\Component\Messenger\Tests\Fixtures\DummyMessage' => ['amqp', 'audit'], 'Symfony\Component\Messenger\Tests\Fixtures\SecondMessage' => [ 'senders' => ['amqp', 'audit'], - 'send_and_handle' => true, ], '*' => 'amqp', ], diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml index 2b895cb6e6b86..43be6fc709d00 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml @@ -13,7 +13,7 @@ - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing.yml index 84b6e2c0047ed..ae060529ffcc3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing.yml @@ -7,7 +7,6 @@ framework: 'Symfony\Component\Messenger\Tests\Fixtures\DummyMessage': [amqp, audit] 'Symfony\Component\Messenger\Tests\Fixtures\SecondMessage': senders: [amqp, audit] - send_and_handle: true '*': amqp transports: amqp: 'amqp://localhost/%2f/messages' diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index f1dade56c6083..c9ead951fa44e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -40,7 +40,6 @@ use Symfony\Component\HttpClient\ScopingHttpClient; use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass; use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; -use Symfony\Component\Messenger\Tests\Fixtures\SecondMessage; use Symfony\Component\Messenger\Transport\TransportFactory; use Symfony\Component\PropertyAccess\PropertyAccessor; use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader; @@ -715,13 +714,6 @@ public function testMessengerRouting() $container = $this->createContainerFromFile('messenger_routing'); $senderLocatorDefinition = $container->getDefinition('messenger.senders_locator'); - $messageToSendAndHandleMapping = [ - DummyMessage::class => false, - SecondMessage::class => true, - '*' => false, - ]; - - $this->assertSame($messageToSendAndHandleMapping, $senderLocatorDefinition->getArgument(2)); $sendersMapping = $senderLocatorDefinition->getArgument(0); $this->assertEquals([ 'amqp', diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md index e6aad77bf10b4..08a352032479a 100644 --- a/src/Symfony/Component/Messenger/CHANGELOG.md +++ b/src/Symfony/Component/Messenger/CHANGELOG.md @@ -6,6 +6,7 @@ CHANGELOG * [BC BREAK] `SendersLocatorInterface` has an additional method: `getSenderByAlias()`. + * Removed argument `?bool &$handle = false` from `SendersLocatorInterface::getSenders` * A new `ListableReceiverInterface` was added, which a receiver can implement (when applicable) to enable listing and fetching individual messages by id (used in the new "Failed Messages" commands). diff --git a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php index 3e87a160673e4..e7dc0baa2a9da 100644 --- a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php @@ -52,7 +52,6 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope 'class' => \get_class($envelope->getMessage()), ]; - $handle = false; $sender = null; try { @@ -65,7 +64,7 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope // dispatch event unless this is a redelivery $shouldDispatchEvent = null === $redeliveryStamp; - foreach ($this->getSenders($envelope, $handle, $redeliveryStamp) as $alias => $sender) { + foreach ($this->getSenders($envelope, $redeliveryStamp) as $alias => $sender) { if (null !== $this->eventDispatcher && $shouldDispatchEvent) { $event = new SendMessageToTransportsEvent($envelope); $this->eventDispatcher->dispatch($event); @@ -76,14 +75,9 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope $this->logger->info('Sending message "{class}" with "{sender}"', $context + ['sender' => \get_class($sender)]); $envelope = $sender->send($envelope->with(new SentStamp(\get_class($sender), \is_string($alias) ? $alias : null))); } - - // on a redelivery, only send back to queue: never call local handlers - if (null !== $redeliveryStamp) { - $handle = false; - } } - if (null === $sender || $handle) { + if (null === $sender) { return $stack->next()->handle($envelope, $stack); } } catch (\Throwable $e) { @@ -100,7 +94,7 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope /** * * @return iterable|SenderInterface[] */ - private function getSenders(Envelope $envelope, &$handle, ?RedeliveryStamp $redeliveryStamp): iterable + private function getSenders(Envelope $envelope, ?RedeliveryStamp $redeliveryStamp): iterable { if (null !== $redeliveryStamp) { return [ @@ -108,6 +102,6 @@ private function getSenders(Envelope $envelope, &$handle, ?RedeliveryStamp $rede ]; } - return $this->sendersLocator->getSenders($envelope, $handle); + return $this->sendersLocator->getSenders($envelope); } } diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/SendMessageMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/SendMessageMiddlewareTest.php index 66eb53ca714c4..a7c569345f3bb 100644 --- a/src/Symfony/Component/Messenger/Tests/Middleware/SendMessageMiddlewareTest.php +++ b/src/Symfony/Component/Messenger/Tests/Middleware/SendMessageMiddlewareTest.php @@ -92,11 +92,7 @@ public function testItSendsToOnlyOneSenderOnRedelivery() $sendersLocator = $this->createSendersLocator( [DummyMessage::class => ['foo', 'bar']], - ['foo' => $sender, 'bar' => $sender2], - [ - // normally, this class sends and handles (but not on retry) - DummyMessage::class => true, - ] + ['foo' => $sender, 'bar' => $sender2] ); $middleware = new SendMessageMiddleware($sendersLocator); @@ -126,68 +122,46 @@ public function testItSendsTheMessageToAssignedSenderWithPreWrappedMessage() $middleware->handle($envelope, $this->getStackMock(false)); } - public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageClass() - { - $message = new DummyMessage('Hey'); - $envelope = new Envelope($message); - $sender = $this->getMockBuilder(SenderInterface::class)->getMock(); - - $sendersLocator = $this->createSendersLocator(['*' => ['foo_sender']], ['foo_sender' => $sender], [ - DummyMessage::class => true, - ]); - $middleware = new SendMessageMiddleware($sendersLocator); - - $sender->expects($this->once())->method('send')->with($envelope->with(new SentStamp(\get_class($sender), 'foo_sender')))->willReturn($envelope); - - $middleware->handle($envelope, $this->getStackMock()); - } - - public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageParentClass() + public function testItSendsTheMessageBasedOnTheMessageParentClass() { $message = new ChildDummyMessage('Hey'); $envelope = new Envelope($message); $sender = $this->getMockBuilder(SenderInterface::class)->getMock(); - $sendersLocator = $this->createSendersLocator(['*' => ['foo_sender']], ['foo_sender' => $sender], [ - DummyMessage::class => true, - ]); + $sendersLocator = $this->createSendersLocator([DummyMessage::class => ['foo_sender']], ['foo_sender' => $sender]); $middleware = new SendMessageMiddleware($sendersLocator); $sender->expects($this->once())->method('send')->with($envelope->with(new SentStamp(\get_class($sender), 'foo_sender')))->willReturn($envelope); - $middleware->handle($envelope, $this->getStackMock()); + $middleware->handle($envelope, $this->getStackMock(false)); } - public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageInterface() + public function testItSendsTheMessageBasedOnTheMessageInterface() { $message = new DummyMessage('Hey'); $envelope = new Envelope($message); $sender = $this->getMockBuilder(SenderInterface::class)->getMock(); - $sendersLocator = $this->createSendersLocator(['*' => ['foo_sender']], ['foo_sender' => $sender], [ - DummyMessageInterface::class => true, - ]); + $sendersLocator = $this->createSendersLocator([DummyMessageInterface::class => ['foo_sender']], ['foo_sender' => $sender]); $middleware = new SendMessageMiddleware($sendersLocator); $sender->expects($this->once())->method('send')->with($envelope->with(new SentStamp(\get_class($sender), 'foo_sender')))->willReturn($envelope); - $middleware->handle($envelope, $this->getStackMock()); + $middleware->handle($envelope, $this->getStackMock(false)); } - public function testItAlsoCallsTheNextMiddlewareBasedOnWildcard() + public function testItSendsTheMessageBasedOnWildcard() { $message = new DummyMessage('Hey'); $envelope = new Envelope($message); $sender = $this->getMockBuilder(SenderInterface::class)->getMock(); - $sendersLocator = $this->createSendersLocator(['*' => ['foo_sender']], ['foo_sender' => $sender], [ - '*' => true, - ]); + $sendersLocator = $this->createSendersLocator(['*' => ['foo_sender']], ['foo_sender' => $sender]); $middleware = new SendMessageMiddleware($sendersLocator); $sender->expects($this->once())->method('send')->with($envelope->with(new SentStamp(\get_class($sender), 'foo_sender')))->willReturn($envelope); - $middleware->handle($envelope, $this->getStackMock()); + $middleware->handle($envelope, $this->getStackMock(false)); } public function testItCallsTheNextMiddlewareWhenNoSenderForThisMessage() @@ -267,7 +241,7 @@ public function testItDoesNotDispatchOnRedeliver() $middleware->handle($envelope, $this->getStackMock(false)); } - private function createSendersLocator(array $sendersMap, array $senders, array $sendAndHandle = []) + private function createSendersLocator(array $sendersMap, array $senders) { $container = $this->createMock(ContainerInterface::class); $container->expects($this->any()) @@ -281,6 +255,6 @@ private function createSendersLocator(array $sendersMap, array $senders, array $ return $senders[$id]; }); - return new SendersLocator($sendersMap, $container, $sendAndHandle); + return new SendersLocator($sendersMap, $container); } } diff --git a/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php b/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php index 815dbbc3f8a05..2f7a1e971dca3 100644 --- a/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php +++ b/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php @@ -30,14 +30,12 @@ class SendersLocator implements SendersLocatorInterface private $sendersMap; private $sendersLocator; private $useLegacyLookup = false; - private $sendAndHandle; /** * @param string[][] $sendersMap An array, keyed by "type", set to an array of sender aliases * @param ContainerInterface $sendersLocator Locator of senders, keyed by sender alias - * @param bool[] $sendAndHandle */ - public function __construct(array $sendersMap, /*ContainerInterface*/ $sendersLocator = null, array $sendAndHandle = []) + public function __construct(array $sendersMap, /*ContainerInterface*/ $sendersLocator = null) { $this->sendersMap = $sendersMap; @@ -45,21 +43,17 @@ public function __construct(array $sendersMap, /*ContainerInterface*/ $sendersLo @trigger_error(sprintf('"%s::__construct()" requires a "%s" as 2nd argument. Not doing so is deprecated since Symfony 4.3 and will be required in 5.0.', __CLASS__, ContainerInterface::class), E_USER_DEPRECATED); // "%s" requires a "%s" as 2nd argument. Not doing so is deprecated since Symfony 4.3 and will be required in 5.0.' $this->sendersLocator = new ServiceLocator([]); - $this->sendAndHandle = $sendersLocator; $this->useLegacyLookup = true; } else { $this->sendersLocator = $sendersLocator; - $this->sendAndHandle = $sendAndHandle; } } /** * {@inheritdoc} */ - public function getSenders(Envelope $envelope, ?bool &$handle = false): iterable + public function getSenders(Envelope $envelope): iterable { - $handle = false; - $sender = null; $seen = []; foreach (HandlersLocator::listTypes($envelope) as $type) { @@ -71,8 +65,6 @@ public function getSenders(Envelope $envelope, ?bool &$handle = false): iterable } } - $handle = $handle ?: $this->sendAndHandle[$type] ?? false; - continue; } @@ -87,11 +79,7 @@ public function getSenders(Envelope $envelope, ?bool &$handle = false): iterable yield $senderAlias => $sender; } } - - $handle = $handle ?: $this->sendAndHandle[$type] ?? false; } - - $handle = $handle || null === $sender; } public function getSenderByAlias(string $alias): SenderInterface diff --git a/src/Symfony/Component/Messenger/Transport/Sender/SendersLocatorInterface.php b/src/Symfony/Component/Messenger/Transport/Sender/SendersLocatorInterface.php index 1bcb8715f55d1..bc9a87b17740f 100644 --- a/src/Symfony/Component/Messenger/Transport/Sender/SendersLocatorInterface.php +++ b/src/Symfony/Component/Messenger/Transport/Sender/SendersLocatorInterface.php @@ -27,12 +27,9 @@ interface SendersLocatorInterface /** * Gets the senders for the given message name. * - * @param bool|null &$handle True after calling the method when the next middleware - * should also get the message; false otherwise - * * @return iterable|SenderInterface[] Indexed by sender alias if available */ - public function getSenders(Envelope $envelope, ?bool &$handle = false): iterable; + public function getSenders(Envelope $envelope): iterable; /** * Returns a specific sender by its alias. From 80b5df270f4ad968a1a34c17b9910e122cfc8038 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Wed, 8 May 2019 10:31:22 -0400 Subject: [PATCH 27/67] [Messenger] On failure retry, make message appear received from original sender --- .../FrameworkExtension.php | 1 + .../Resources/config/messenger.xml | 2 + .../FrameworkExtensionTest.php | 2 + .../Command/AbstractFailedMessagesCommand.php | 22 +- .../Command/FailedMessagesRetryCommand.php | 2 +- .../Command/FailedMessagesShowCommand.php | 10 +- ...ailedMessageToFailureTransportListener.php | 14 +- .../FailedMessageProcessingMiddleware.php | 38 +++ .../Messenger/Stamp/RedeliveryStamp.php | 27 +- .../Stamp/SentToFailureTransportStamp.php | 25 +- .../Command/FailedMessagesShowCommandTest.php | 10 +- ...dMessageToFailureTransportListenerTest.php | 17 +- .../Tests/FailureIntegrationTest.php | 281 ++++++++++++++++++ .../Messenger/Tests/RetryIntegrationTest.php | 4 +- .../Tests/Stamp/RedeliveryStampTest.php | 12 + .../Stamp/SentToFailureTransportStampTest.php | 13 +- 16 files changed, 410 insertions(+), 70 deletions(-) create mode 100644 src/Symfony/Component/Messenger/Middleware/FailedMessageProcessingMiddleware.php create mode 100644 src/Symfony/Component/Messenger/Tests/FailureIntegrationTest.php diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index beac06980673b..b5843ad957f0e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -1659,6 +1659,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder 'before' => [ ['id' => 'add_bus_name_stamp_middleware'], ['id' => 'dispatch_after_current_bus'], + ['id' => 'failed_message_processing_middleware'], ], 'after' => [ ['id' => 'send_message'], diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml index 14ffd4d3827a2..0cbd2d8423e3d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml @@ -48,6 +48,8 @@ + + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index f1dade56c6083..43e4a534c256a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -753,6 +753,7 @@ public function testMessengerWithMultipleBuses() $this->assertEquals([ ['id' => 'add_bus_name_stamp_middleware', 'arguments' => ['messenger.bus.commands']], ['id' => 'dispatch_after_current_bus'], + ['id' => 'failed_message_processing_middleware'], ['id' => 'send_message'], ['id' => 'handle_message'], ], $container->getParameter('messenger.bus.commands.middleware')); @@ -761,6 +762,7 @@ public function testMessengerWithMultipleBuses() $this->assertEquals([ ['id' => 'add_bus_name_stamp_middleware', 'arguments' => ['messenger.bus.events']], ['id' => 'dispatch_after_current_bus'], + ['id' => 'failed_message_processing_middleware'], ['id' => 'with_factory', 'arguments' => ['foo', true, ['bar' => 'baz']]], ['id' => 'send_message'], ['id' => 'handle_message'], diff --git a/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php b/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php index 854daba0e6288..194d42c109ac4 100644 --- a/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php +++ b/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php @@ -15,6 +15,7 @@ use Symfony\Component\Console\Helper\Dumper; use Symfony\Component\Console\Style\SymfonyStyle; use Symfony\Component\Messenger\Envelope; +use Symfony\Component\Messenger\Stamp\RedeliveryStamp; use Symfony\Component\Messenger\Stamp\SentToFailureTransportStamp; use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp; use Symfony\Component\Messenger\Transport\Receiver\MessageCountAwareInterface; @@ -59,8 +60,10 @@ protected function displaySingleMessage(Envelope $envelope, SymfonyStyle $io) { $io->title('Failed Message Details'); - /** @var SentToFailureTransportStamp $sentToFailureTransportStamp */ + /** @var SentToFailureTransportStamp|null $sentToFailureTransportStamp */ $sentToFailureTransportStamp = $envelope->last(SentToFailureTransportStamp::class); + /** @var RedeliveryStamp|null $lastRedeliveryStamp */ + $lastRedeliveryStamp = $envelope->last(RedeliveryStamp::class); $rows = [ ['Class', \get_class($envelope->getMessage())], @@ -70,25 +73,34 @@ protected function displaySingleMessage(Envelope $envelope, SymfonyStyle $io) $rows[] = ['Message Id', $id]; } + $flattenException = null === $lastRedeliveryStamp ? null : $lastRedeliveryStamp->getFlattenException(); if (null === $sentToFailureTransportStamp) { $io->warning('Message does not appear to have been sent to this transport after failing'); } else { $rows = array_merge($rows, [ - ['Failed at', $sentToFailureTransportStamp->getSentAt()->format('Y-m-d H:i:s')], - ['Error', $sentToFailureTransportStamp->getExceptionMessage()], - ['Error Class', $sentToFailureTransportStamp->getFlattenException() ? $sentToFailureTransportStamp->getFlattenException()->getClass() : '(unknown)'], + ['Failed at', null === $lastRedeliveryStamp ? '' : $lastRedeliveryStamp->getRedeliveredAt()->format('Y-m-d H:i:s')], + ['Error', null === $lastRedeliveryStamp ? '' : $lastRedeliveryStamp->getExceptionMessage()], + ['Error Class', null === $flattenException ? '(unknown)' : $flattenException->getClass()], ['Transport', $sentToFailureTransportStamp->getOriginalReceiverName()], ]); } $io->table([], $rows); + /** @var RedeliveryStamp[] $redeliveryStamps */ + $redeliveryStamps = $envelope->all(RedeliveryStamp::class); + $io->writeln(' Message history:'); + foreach ($redeliveryStamps as $redeliveryStamp) { + $io->writeln(sprintf(' * Message failed and redelivered to the %s transport at %s', $redeliveryStamp->getSenderClassOrAlias(), $redeliveryStamp->getRedeliveredAt()->format('Y-m-d H:i:s'))); + } + $io->newLine(); + if ($io->isVeryVerbose()) { $io->title('Message:'); $dump = new Dumper($io); $io->writeln($dump($envelope->getMessage())); $io->title('Exception:'); - $io->writeln($sentToFailureTransportStamp->getFlattenException()->getTraceAsString()); + $io->writeln(null === $flattenException ? '(no data)' : $flattenException->getTraceAsString()); } else { $io->writeln(' Re-run command with -vv to see more message & error details.'); } diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php index a2ebc290c179b..33686e6549dbe 100644 --- a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php +++ b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php @@ -154,7 +154,7 @@ private function runInteractive(SymfonyStyle $io, bool $shouldForce) } // avoid success message if nothing was processed - if (1 < $count) { + if (1 <= $count) { $io->success('All failed messages have been handled or removed!'); } } diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php index da49a4b7fe2c5..0444d79f447ff 100644 --- a/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php +++ b/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php @@ -18,7 +18,7 @@ use Symfony\Component\Console\Output\ConsoleOutputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; -use Symfony\Component\Messenger\Stamp\SentToFailureTransportStamp; +use Symfony\Component\Messenger\Stamp\RedeliveryStamp; use Symfony\Component\Messenger\Transport\Receiver\ListableReceiverInterface; /** @@ -83,14 +83,14 @@ private function listMessages(SymfonyStyle $io, int $max) $rows = []; foreach ($envelopes as $envelope) { - /** @var SentToFailureTransportStamp $sentToFailureTransportStamp */ - $sentToFailureTransportStamp = $envelope->last(SentToFailureTransportStamp::class); + /** @var RedeliveryStamp|null $lastRedeliveryStamp */ + $lastRedeliveryStamp = $envelope->last(RedeliveryStamp::class); $rows[] = [ $this->getMessageId($envelope), \get_class($envelope->getMessage()), - null === $sentToFailureTransportStamp ? '' : $sentToFailureTransportStamp->getSentAt()->format('Y-m-d H:i:s'), - null === $sentToFailureTransportStamp ? '' : $sentToFailureTransportStamp->getExceptionMessage(), + null === $lastRedeliveryStamp ? '' : $lastRedeliveryStamp->getRedeliveredAt()->format('Y-m-d H:i:s'), + null === $lastRedeliveryStamp ? '' : $lastRedeliveryStamp->getExceptionMessage(), ]; } diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php index d62a8ed799444..431d9ca97f2b8 100644 --- a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php +++ b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php @@ -16,9 +16,9 @@ use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent; use Symfony\Component\Messenger\Exception\HandlerFailedException; use Symfony\Component\Messenger\MessageBusInterface; +use Symfony\Component\Messenger\Stamp\DelayStamp; use Symfony\Component\Messenger\Stamp\ReceivedStamp; use Symfony\Component\Messenger\Stamp\RedeliveryStamp; -use Symfony\Component\Messenger\Stamp\SentStamp; use Symfony\Component\Messenger\Stamp\SentToFailureTransportStamp; use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp; @@ -51,11 +51,8 @@ public function onMessageFailed(WorkerMessageFailedEvent $event) $envelope = $event->getEnvelope(); // avoid re-sending to the failed sender - foreach ($envelope->all(SentStamp::class) as $sentStamp) { - /** @var SentStamp $sentStamp */ - if ($sentStamp->getSenderAlias() === $this->failureSenderAlias) { - return; - } + if (null !== $envelope->last(SentToFailureTransportStamp::class)) { + return; } // remove the received stamp so it's redelivered @@ -67,8 +64,9 @@ public function onMessageFailed(WorkerMessageFailedEvent $event) $flattenedException = \class_exists(FlattenException::class) ? FlattenException::createFromThrowable($throwable) : null; $envelope = $envelope->withoutAll(ReceivedStamp::class) ->withoutAll(TransportMessageIdStamp::class) - ->with(new SentToFailureTransportStamp($throwable->getMessage(), $event->getReceiverName(), $flattenedException)) - ->with(new RedeliveryStamp(0, $this->failureSenderAlias)); + ->with(new SentToFailureTransportStamp($event->getReceiverName())) + ->with(new DelayStamp(0)) + ->with(new RedeliveryStamp(0, $this->failureSenderAlias, $throwable->getMessage(), $flattenedException)); if (null !== $this->logger) { $this->logger->info('Rejected message {class} will be sent to the failure transport {transport}.', [ diff --git a/src/Symfony/Component/Messenger/Middleware/FailedMessageProcessingMiddleware.php b/src/Symfony/Component/Messenger/Middleware/FailedMessageProcessingMiddleware.php new file mode 100644 index 0000000000000..5d3f63fda6cb5 --- /dev/null +++ b/src/Symfony/Component/Messenger/Middleware/FailedMessageProcessingMiddleware.php @@ -0,0 +1,38 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Messenger\Middleware; + +use Symfony\Component\Messenger\Envelope; +use Symfony\Component\Messenger\Stamp\ReceivedStamp; +use Symfony\Component\Messenger\Stamp\SentToFailureTransportStamp; + +/** + * @author Ryan Weaver + * + * @experimental in 4.3 + */ +class FailedMessageProcessingMiddleware implements MiddlewareInterface +{ + public function handle(Envelope $envelope, StackInterface $stack): Envelope + { + // look for "received" messages decorated with the SentToFailureTransportStamp + /** @var SentToFailureTransportStamp|null $sentToFailureStamp */ + $sentToFailureStamp = $envelope->last(SentToFailureTransportStamp::class); + if (null !== $sentToFailureStamp && null !== $envelope->last(ReceivedStamp::class)) { + // mark the message as "received" from the original transport + // this guarantees the same behavior as when originally received + $envelope = $envelope->with(new ReceivedStamp($sentToFailureStamp->getOriginalReceiverName())); + } + + return $stack->next()->handle($envelope, $stack); + } +} diff --git a/src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php b/src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php index a0dd9b89d869e..265ee1a628f48 100644 --- a/src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php +++ b/src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Messenger\Stamp; +use Symfony\Component\Debug\Exception\FlattenException; + /** * Stamp applied when a messages needs to be redelivered. * @@ -20,14 +22,20 @@ class RedeliveryStamp implements StampInterface { private $retryCount; private $senderClassOrAlias; + private $redeliveredAt; + private $exceptionMessage; + private $flattenException; /** * @param string $senderClassOrAlias Alias from SendersLocator or just the class name */ - public function __construct(int $retryCount, string $senderClassOrAlias) + public function __construct(int $retryCount, string $senderClassOrAlias, string $exceptionMessage = null, FlattenException $flattenException = null) { $this->retryCount = $retryCount; $this->senderClassOrAlias = $senderClassOrAlias; + $this->exceptionMessage = $exceptionMessage; + $this->flattenException = $flattenException; + $this->redeliveredAt = new \DateTimeImmutable(); } public function getRetryCount(): int @@ -36,7 +44,7 @@ public function getRetryCount(): int } /** - * Needed for this class to serialize through Symfony's serializer. + * The target sender this should be redelivered to. * * @internal */ @@ -44,4 +52,19 @@ public function getSenderClassOrAlias(): string { return $this->senderClassOrAlias; } + + public function getExceptionMessage(): ?string + { + return $this->exceptionMessage; + } + + public function getFlattenException(): ?FlattenException + { + return $this->flattenException; + } + + public function getRedeliveredAt(): \DateTimeInterface + { + return $this->redeliveredAt; + } } diff --git a/src/Symfony/Component/Messenger/Stamp/SentToFailureTransportStamp.php b/src/Symfony/Component/Messenger/Stamp/SentToFailureTransportStamp.php index 222aa6a18dd6b..c11574f6e7134 100644 --- a/src/Symfony/Component/Messenger/Stamp/SentToFailureTransportStamp.php +++ b/src/Symfony/Component/Messenger/Stamp/SentToFailureTransportStamp.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Messenger\Stamp; -use Symfony\Component\Debug\Exception\FlattenException; - /** * Stamp applied when a message is sent to the failure transport. * @@ -22,36 +20,15 @@ */ class SentToFailureTransportStamp implements StampInterface { - private $exceptionMessage; private $originalReceiverName; - private $flattenException; - private $sentAt; - public function __construct(string $exceptionMessage, string $originalReceiverName, FlattenException $flattenException = null) + public function __construct(string $originalReceiverName) { - $this->exceptionMessage = $exceptionMessage; $this->originalReceiverName = $originalReceiverName; - $this->flattenException = $flattenException; - $this->sentAt = new \DateTimeImmutable(); - } - - public function getExceptionMessage(): string - { - return $this->exceptionMessage; } public function getOriginalReceiverName(): string { return $this->originalReceiverName; } - - public function getFlattenException(): ?FlattenException - { - return $this->flattenException; - } - - public function getSentAt(): \DateTimeInterface - { - return $this->sentAt; - } } diff --git a/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesShowCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesShowCommandTest.php index ad56462dbd655..48c34fcaea9ba 100644 --- a/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesShowCommandTest.php +++ b/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesShowCommandTest.php @@ -15,6 +15,7 @@ use Symfony\Component\Console\Tester\CommandTester; use Symfony\Component\Messenger\Command\FailedMessagesShowCommand; use Symfony\Component\Messenger\Envelope; +use Symfony\Component\Messenger\Stamp\RedeliveryStamp; use Symfony\Component\Messenger\Stamp\SentToFailureTransportStamp; use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp; use Symfony\Component\Messenger\Transport\Receiver\ListableReceiverInterface; @@ -26,10 +27,12 @@ class FailedMessagesShowCommandTest extends TestCase { public function testBasicRun() { - $sentToFailureStamp = new SentToFailureTransportStamp('Things are bad!', 'async'); + $sentToFailureStamp = new SentToFailureTransportStamp('async'); + $redeliveryStamp = new RedeliveryStamp(0, 'failure_receiver', 'Things are bad!'); $envelope = new Envelope(new \stdClass(), [ new TransportMessageIdStamp(15), $sentToFailureStamp, + $redeliveryStamp, ]); $receiver = $this->createMock(ListableReceiverInterface::class); $receiver->expects($this->once())->method('find')->with(15)->willReturn($envelope); @@ -48,10 +51,11 @@ public function testBasicRun() Message Id 15 Failed at %s Error Things are bad! - Error Class (unknown) + Error Class (unknown) + Transport async EOF , - $sentToFailureStamp->getSentAt()->format('Y-m-d H:i:s')), + $redeliveryStamp->getRedeliveredAt()->format('Y-m-d H:i:s')), $tester->getDisplay(true)); } } diff --git a/src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageToFailureTransportListenerTest.php b/src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageToFailureTransportListenerTest.php index 9f23e462c05f5..628a4be3ee7a9 100644 --- a/src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageToFailureTransportListenerTest.php +++ b/src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageToFailureTransportListenerTest.php @@ -19,7 +19,6 @@ use Symfony\Component\Messenger\MessageBusInterface; use Symfony\Component\Messenger\Stamp\ReceivedStamp; use Symfony\Component\Messenger\Stamp\RedeliveryStamp; -use Symfony\Component\Messenger\Stamp\SentStamp; use Symfony\Component\Messenger\Stamp\SentToFailureTransportStamp; use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp; @@ -35,13 +34,13 @@ public function testItDispatchesToTheFailureTransport() /** @var SentToFailureTransportStamp $sentToFailureTransportStamp */ $sentToFailureTransportStamp = $envelope->last(SentToFailureTransportStamp::class); $this->assertNotNull($sentToFailureTransportStamp); - $this->assertSame('no!', $sentToFailureTransportStamp->getExceptionMessage()); $this->assertSame('my_receiver', $sentToFailureTransportStamp->getOriginalReceiverName()); - $this->assertSame('no!', $sentToFailureTransportStamp->getFlattenException()->getMessage()); /** @var RedeliveryStamp $redeliveryStamp */ $redeliveryStamp = $envelope->last(RedeliveryStamp::class); $this->assertSame('failure_sender', $redeliveryStamp->getSenderClassOrAlias()); + $this->assertSame('no!', $redeliveryStamp->getExceptionMessage()); + $this->assertSame('no!', $redeliveryStamp->getFlattenException()->getMessage()); $this->assertNull($envelope->last(ReceivedStamp::class)); $this->assertNull($envelope->last(TransportMessageIdStamp::class)); @@ -65,11 +64,11 @@ public function testItGetsNestedHandlerFailedException() $bus = $this->createMock(MessageBusInterface::class); $bus->expects($this->once())->method('dispatch')->with($this->callback(function ($envelope) { /** @var Envelope $envelope */ - /** @var SentToFailureTransportStamp $sentToFailureTransportStamp */ - $sentToFailureTransportStamp = $envelope->last(SentToFailureTransportStamp::class); - $this->assertNotNull($sentToFailureTransportStamp); - $this->assertSame('I am inside!', $sentToFailureTransportStamp->getExceptionMessage()); - $this->assertSame('Exception', $sentToFailureTransportStamp->getFlattenException()->getClass()); + /** @var RedeliveryStamp $redeliveryStamp */ + $redeliveryStamp = $envelope->last(RedeliveryStamp::class); + $this->assertNotNull($redeliveryStamp); + $this->assertSame('I am inside!', $redeliveryStamp->getExceptionMessage()); + $this->assertSame('Exception', $redeliveryStamp->getFlattenException()->getClass()); return true; }))->willReturn(new Envelope(new \stdClass())); @@ -112,7 +111,7 @@ public function testDoNotRedeliverToFailed() ); $envelope = new Envelope(new \stdClass(), [ - new SentStamp('MySender', 'failure_sender'), + new SentToFailureTransportStamp('my_receiver'), ]); $event = new WorkerMessageFailedEvent($envelope, 'my_receiver', new \Exception(''), false); diff --git a/src/Symfony/Component/Messenger/Tests/FailureIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/FailureIntegrationTest.php new file mode 100644 index 0000000000000..abe78be759b82 --- /dev/null +++ b/src/Symfony/Component/Messenger/Tests/FailureIntegrationTest.php @@ -0,0 +1,281 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Messenger\Tests; + +use PHPUnit\Framework\TestCase; +use Psr\Container\ContainerInterface; +use Symfony\Component\DependencyInjection\Container; +use Symfony\Component\EventDispatcher\EventDispatcher; +use Symfony\Component\Messenger\Envelope; +use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent; +use Symfony\Component\Messenger\EventListener\SendFailedMessageToFailureTransportListener; +use Symfony\Component\Messenger\Exception\HandlerFailedException; +use Symfony\Component\Messenger\Handler\HandlerDescriptor; +use Symfony\Component\Messenger\Handler\HandlersLocator; +use Symfony\Component\Messenger\MessageBus; +use Symfony\Component\Messenger\Middleware\FailedMessageProcessingMiddleware; +use Symfony\Component\Messenger\Middleware\HandleMessageMiddleware; +use Symfony\Component\Messenger\Middleware\SendMessageMiddleware; +use Symfony\Component\Messenger\Retry\MultiplierRetryStrategy; +use Symfony\Component\Messenger\Stamp\RedeliveryStamp; +use Symfony\Component\Messenger\Stamp\SentToFailureTransportStamp; +use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; +use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface; +use Symfony\Component\Messenger\Transport\Sender\SenderInterface; +use Symfony\Component\Messenger\Transport\Sender\SendersLocator; +use Symfony\Component\Messenger\Worker; + +class FailureIntegrationTest extends TestCase +{ + public function testRequeMechanism() + { + $transport1 = new DummyFailureTestSenderAndReceiver(); + $transport2 = new DummyFailureTestSenderAndReceiver(); + $failureTransport = new DummyFailureTestSenderAndReceiver(); + $transports = [ + 'transport1' => $transport1, + 'transport2' => $transport2, + 'the_failure_transport' => $failureTransport, + ]; + + $locator = $this->createMock(ContainerInterface::class); + $locator->expects($this->any()) + ->method('has') + ->willReturn(true); + $locator->expects($this->any()) + ->method('get') + ->willReturnCallback(function ($transportName) use ($transports) { + return $transports[$transportName]; + }); + $senderLocator = new SendersLocator( + [DummyMessage::class => ['transport1', 'transport2']], + $locator + ); + + // using to so we can lazily get the bus later and avoid circular problem + $transport1HandlerThatFails = new DummyTestHandler(true); + $allTransportHandlerThatWorks = new DummyTestHandler(false); + $transport2HandlerThatWorks = new DummyTestHandler(false); + $container = new Container(); + $handlerLocator = new HandlersLocator([ + DummyMessage::class => [ + new HandlerDescriptor($transport1HandlerThatFails, [ + 'from_transport' => 'transport1', + 'alias' => 'handler_that_fails', + ]), + new HandlerDescriptor($allTransportHandlerThatWorks, [ + 'alias' => 'handler_that_works1', + ]), + new HandlerDescriptor($transport2HandlerThatWorks, [ + 'from_transport' => 'transport2', + 'alias' => 'handler_that_works2', + ]), + ], + ]); + + $dispatcher = new EventDispatcher(); + $bus = new MessageBus([ + new FailedMessageProcessingMiddleware(), + new SendMessageMiddleware($senderLocator), + new HandleMessageMiddleware($handlerLocator), + ]); + $container->set('bus', $bus); + $dispatcher->addSubscriber(new SendFailedMessageToFailureTransportListener($bus, 'the_failure_transport')); + + $runWorker = function (string $transportName, int $maxRetries) use ($transports, $bus, $dispatcher): ?\Throwable { + $throwable = null; + $failedListener = function (WorkerMessageFailedEvent $event) use (&$throwable) { + $throwable = $event->getThrowable(); + }; + $dispatcher->addListener(WorkerMessageFailedEvent::class, $failedListener); + + $worker = new Worker([$transportName => $transports[$transportName]], $bus, [$transportName => new MultiplierRetryStrategy($maxRetries)], $dispatcher); + + $worker->run([], function (?Envelope $envelope) use ($worker) { + // handle one envelope, then stop + if (null !== $envelope) { + $worker->stop(); + } + }); + + $dispatcher->removeListener(WorkerMessageFailedEvent::class, $failedListener); + + return $throwable; + }; + + // send the message + $envelope = new Envelope(new DummyMessage('API')); + $bus->dispatch($envelope); + + // message has been sent + $this->assertCount(1, $transport1->getMessagesWaitingToBeReceived()); + $this->assertCount(1, $transport2->getMessagesWaitingToBeReceived()); + $this->assertCount(0, $failureTransport->getMessagesWaitingToBeReceived()); + + // receive the message - one handler will fail and the message + // will be sent back to transport1 to be retried + /* + * Receive the message from "transport1" + */ + $throwable = $runWorker('transport1', 1); + // make sure this is failing for the reason we think + $this->assertInstanceOf(HandlerFailedException::class, $throwable); + // handler for transport1 and all transports were called + $this->assertSame(1, $transport1HandlerThatFails->getTimesCalled()); + $this->assertSame(1, $allTransportHandlerThatWorks->getTimesCalled()); + $this->assertSame(0, $transport2HandlerThatWorks->getTimesCalled()); + // one handler failed and the message is retried (resent to transport1) + $this->assertCount(1, $transport1->getMessagesWaitingToBeReceived()); + $this->assertEmpty($failureTransport->getMessagesWaitingToBeReceived()); + + /* + * Receive the message for a (final) retry + */ + $runWorker('transport1', 1); + // only the "failed" handler is called a 2nd time + $this->assertSame(2, $transport1HandlerThatFails->getTimesCalled()); + $this->assertSame(1, $allTransportHandlerThatWorks->getTimesCalled()); + // handling fails again, message is sent to failure transport + $this->assertCount(0, $transport1->getMessagesWaitingToBeReceived()); + $this->assertCount(1, $failureTransport->getMessagesWaitingToBeReceived()); + /** @var Envelope $failedEnvelope */ + $failedEnvelope = $failureTransport->getMessagesWaitingToBeReceived()[0]; + /** @var SentToFailureTransportStamp $sentToFailureStamp */ + $sentToFailureStamp = $failedEnvelope->last(SentToFailureTransportStamp::class); + $this->assertNotNull($sentToFailureStamp); + /** @var RedeliveryStamp $redeliveryStamp */ + $redeliveryStamp = $failedEnvelope->last(RedeliveryStamp::class); + $this->assertNotNull($redeliveryStamp); + $this->assertSame('Failure from call 2', $redeliveryStamp->getExceptionMessage()); + + /* + * Failed message is handled, fails, and sent for a retry + */ + $throwable = $runWorker('the_failure_transport', 1); + // make sure this is failing for the reason we think + $this->assertInstanceOf(HandlerFailedException::class, $throwable); + // only the "failed" handler is called a 3rd time + $this->assertSame(3, $transport1HandlerThatFails->getTimesCalled()); + $this->assertSame(1, $allTransportHandlerThatWorks->getTimesCalled()); + // handling fails again, message is retried + $this->assertCount(1, $failureTransport->getMessagesWaitingToBeReceived()); + // transport2 still only holds the original message + // a new message was never mistakenly delivered to it + $this->assertCount(1, $transport2->getMessagesWaitingToBeReceived()); + + /* + * Message is retried on failure transport then discarded + */ + $runWorker('the_failure_transport', 1); + // only the "failed" handler is called a 4th time + $this->assertSame(4, $transport1HandlerThatFails->getTimesCalled()); + $this->assertSame(1, $allTransportHandlerThatWorks->getTimesCalled()); + // handling fails again, message is discarded + $this->assertCount(0, $failureTransport->getMessagesWaitingToBeReceived()); + + /* + * Execute handlers on transport2 + */ + $runWorker('transport2', 1); + // transport1 handler is not called again + $this->assertSame(4, $transport1HandlerThatFails->getTimesCalled()); + // all transport handler is now called again + $this->assertSame(2, $allTransportHandlerThatWorks->getTimesCalled()); + // transport1 handler called for the first time + $this->assertSame(1, $transport2HandlerThatWorks->getTimesCalled()); + // all transport should be empty + $this->assertEmpty($transport1->getMessagesWaitingToBeReceived()); + $this->assertEmpty($transport2->getMessagesWaitingToBeReceived()); + $this->assertEmpty($failureTransport->getMessagesWaitingToBeReceived()); + + /* + * Dispatch the original message again + */ + $bus->dispatch($envelope); + // handle the message, but with no retries + $runWorker('transport1', 0); + // now make the handler work! + $transport1HandlerThatFails->setShouldThrow(false); + $runWorker('the_failure_transport', 1); + // the failure transport is empty because it worked + $this->assertEmpty($failureTransport->getMessagesWaitingToBeReceived()); + } +} + +class DummyFailureTestSenderAndReceiver implements ReceiverInterface, SenderInterface +{ + private $messagesWaiting = []; + + public function get(): iterable + { + $message = array_shift($this->messagesWaiting); + + if (null === $message) { + return []; + } + + return [$message]; + } + + public function ack(Envelope $envelope): void + { + } + + public function reject(Envelope $envelope): void + { + } + + public function send(Envelope $envelope): Envelope + { + $this->messagesWaiting[] = $envelope; + + return $envelope; + } + + /** + * @return Envelope[] + */ + public function getMessagesWaitingToBeReceived(): array + { + return $this->messagesWaiting; + } +} + +class DummyTestHandler +{ + private $timesCalled = 0; + private $shouldThrow; + + public function __construct(bool $shouldThrow) + { + $this->shouldThrow = $shouldThrow; + } + + public function __invoke() + { + ++$this->timesCalled; + + if ($this->shouldThrow) { + throw new \Exception('Failure from call '.$this->timesCalled); + } + } + + public function getTimesCalled(): int + { + return $this->timesCalled; + } + + public function setShouldThrow(bool $shouldThrow) + { + $this->shouldThrow = $shouldThrow; + } +} diff --git a/src/Symfony/Component/Messenger/Tests/RetryIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/RetryIntegrationTest.php index 71b9efcf50ea0..64ff20bae3d3e 100644 --- a/src/Symfony/Component/Messenger/Tests/RetryIntegrationTest.php +++ b/src/Symfony/Component/Messenger/Tests/RetryIntegrationTest.php @@ -38,8 +38,8 @@ public function testRetryMechanism() $senderLocator->method('get')->with('sender_alias')->willReturn($senderAndReceiver); $senderLocator = new SendersLocator([DummyMessage::class => ['sender_alias']], $senderLocator); - $handler = new DummyMessageHandlerFailingFirstTimes(0, 'A'); - $throwingHandler = new DummyMessageHandlerFailingFirstTimes(1, 'B'); + $handler = new DummyMessageHandlerFailingFirstTimes(0); + $throwingHandler = new DummyMessageHandlerFailingFirstTimes(1); $handlerLocator = new HandlersLocator([ DummyMessage::class => [ new HandlerDescriptor($handler, ['alias' => 'first']), diff --git a/src/Symfony/Component/Messenger/Tests/Stamp/RedeliveryStampTest.php b/src/Symfony/Component/Messenger/Tests/Stamp/RedeliveryStampTest.php index 6617abc8e5b31..ebff684b3d37f 100644 --- a/src/Symfony/Component/Messenger/Tests/Stamp/RedeliveryStampTest.php +++ b/src/Symfony/Component/Messenger/Tests/Stamp/RedeliveryStampTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Messenger\Tests\Stamp; use PHPUnit\Framework\TestCase; +use Symfony\Component\Debug\Exception\FlattenException; use Symfony\Component\Messenger\Stamp\RedeliveryStamp; class RedeliveryStampTest extends TestCase @@ -21,5 +22,16 @@ public function testGetters() $stamp = new RedeliveryStamp(10, 'sender_alias'); $this->assertSame(10, $stamp->getRetryCount()); $this->assertSame('sender_alias', $stamp->getSenderClassOrAlias()); + $this->assertInstanceOf(\DateTimeInterface::class, $stamp->getRedeliveredAt()); + $this->assertNull($stamp->getExceptionMessage()); + $this->assertNull($stamp->getFlattenException()); + } + + public function testGettersPopulated() + { + $flattenException = new FlattenException(); + $stamp = new RedeliveryStamp(10, 'sender_alias', 'exception message', $flattenException); + $this->assertSame('exception message', $stamp->getExceptionMessage()); + $this->assertSame($flattenException, $stamp->getFlattenException()); } } diff --git a/src/Symfony/Component/Messenger/Tests/Stamp/SentToFailureTransportStampTest.php b/src/Symfony/Component/Messenger/Tests/Stamp/SentToFailureTransportStampTest.php index 3b9579a6460ee..733555a6059ef 100644 --- a/src/Symfony/Component/Messenger/Tests/Stamp/SentToFailureTransportStampTest.php +++ b/src/Symfony/Component/Messenger/Tests/Stamp/SentToFailureTransportStampTest.php @@ -12,22 +12,13 @@ namespace Symfony\Component\Messenger\Tests\Stamp; use PHPUnit\Framework\TestCase; -use Symfony\Component\Debug\Exception\FlattenException; use Symfony\Component\Messenger\Stamp\SentToFailureTransportStamp; class SentToFailureTransportStampTest extends TestCase { - public function testGetters() + public function testGetOriginalReceiverName() { - $flattenException = new FlattenException(); - $stamp = new SentToFailureTransportStamp( - 'exception message', - 'original_receiver', - $flattenException - ); - $this->assertSame('exception message', $stamp->getExceptionMessage()); + $stamp = new SentToFailureTransportStamp('original_receiver'); $this->assertSame('original_receiver', $stamp->getOriginalReceiverName()); - $this->assertSame($flattenException, $stamp->getFlattenException()); - $this->assertInstanceOf(\DateTimeInterface::class, $stamp->getSentAt()); } } From 6583e5a1d7cb20e871828a0df2456e5c43b92281 Mon Sep 17 00:00:00 2001 From: Antoine Makdessi Date: Fri, 10 May 2019 19:57:29 +0430 Subject: [PATCH 28/67] Update WorkflowEvents.php --- src/Symfony/Component/Workflow/WorkflowEvents.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Workflow/WorkflowEvents.php b/src/Symfony/Component/Workflow/WorkflowEvents.php index 7262be5f7d3f8..44678dcb88b7d 100644 --- a/src/Symfony/Component/Workflow/WorkflowEvents.php +++ b/src/Symfony/Component/Workflow/WorkflowEvents.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Workflow; /** - * To learn more about how workflow events work check the documentation + * To learn more about how workflow events work, check the documentation * entry at {@link https://symfony.com/doc/current/workflow/usage.html#using-events}. */ final class WorkflowEvents @@ -43,7 +43,7 @@ final class WorkflowEvents const ENTERED = 'workflow.entered'; /** - * @Event("Symfony\Component\Workflow\Event\EnteredEvent") + * @Event("Symfony\Component\Workflow\Event\LeaveEvent") */ const LEAVE = 'workflow.leave'; From c8c3c56cc8e579801fc1acb36fba019a7afe5774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20J=2E=20Garc=C3=ADa=20Lagar?= Date: Thu, 9 May 2019 08:43:47 +0200 Subject: [PATCH 29/67] [Serializer] Fix denormalization of object with variadic constructor typed argument --- .../Normalizer/AbstractNormalizer.php | 8 +++++- .../VariadicConstructorTypedArgsDummy.php | 27 +++++++++++++++++++ .../Normalizer/AbstractNormalizerTest.php | 21 +++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 src/Symfony/Component/Serializer/Tests/Fixtures/VariadicConstructorTypedArgsDummy.php diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php index c5bd3ffd97202..00bd8a2a52faf 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php @@ -354,7 +354,13 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref throw new RuntimeException(sprintf('Cannot create an instance of %s from serialized data because the variadic parameter %s can only accept an array.', $class, $constructorParameter->name)); } - $params = array_merge($params, $data[$paramName]); + $variadicParameters = []; + foreach ($data[$paramName] as $parameterData) { + $variadicParameters[] = $this->denormalizeParameter($reflectionClass, $constructorParameter, $paramName, $parameterData, $context, $format); + } + + $params = array_merge($params, $variadicParameters); + unset($data[$key]); } } elseif ($allowed && !$ignored && (isset($data[$key]) || \array_key_exists($key, $data))) { $parameterData = $data[$key]; diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/VariadicConstructorTypedArgsDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/VariadicConstructorTypedArgsDummy.php new file mode 100644 index 0000000000000..9c6fd980a1524 --- /dev/null +++ b/src/Symfony/Component/Serializer/Tests/Fixtures/VariadicConstructorTypedArgsDummy.php @@ -0,0 +1,27 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Serializer\Tests\Fixtures; + +class VariadicConstructorTypedArgsDummy +{ + private $foo; + + public function __construct(Dummy ...$foo) + { + $this->foo = $foo; + } + + public function getFoo() + { + return $this->foo; + } +} diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php index 890cb27019309..cce383075a6fe 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php @@ -8,11 +8,15 @@ use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\Normalizer\ObjectNormalizer; +use Symfony\Component\Serializer\Normalizer\PropertyNormalizer; +use Symfony\Component\Serializer\Serializer; use Symfony\Component\Serializer\Tests\Fixtures\AbstractNormalizerDummy; +use Symfony\Component\Serializer\Tests\Fixtures\Dummy; use Symfony\Component\Serializer\Tests\Fixtures\NullableConstructorArgumentDummy; use Symfony\Component\Serializer\Tests\Fixtures\ProxyDummy; use Symfony\Component\Serializer\Tests\Fixtures\StaticConstructorDummy; use Symfony\Component\Serializer\Tests\Fixtures\StaticConstructorNormalizer; +use Symfony\Component\Serializer\Tests\Fixtures\VariadicConstructorTypedArgsDummy; /** * Provides a dummy Normalizer which extends the AbstractNormalizer. @@ -128,4 +132,21 @@ public function testObjectWithNullableConstructorArgument() $this->assertNull($dummy->getFoo()); } + + /** + * @requires PHP 5.6 + */ + public function testObjectWithVariadicConstructorTypedArguments() + { + $normalizer = new PropertyNormalizer(); + $normalizer->setSerializer(new Serializer([$normalizer])); + $data = ['foo' => [['foo' => 'Foo', 'bar' => 'Bar', 'baz' => 'Baz', 'qux' => 'Qux'], ['foo' => 'FOO', 'bar' => 'BAR', 'baz' => 'BAZ', 'qux' => 'QUX']]]; + $dummy = $normalizer->denormalize($data, VariadicConstructorTypedArgsDummy::class); + + $this->assertInstanceOf(VariadicConstructorTypedArgsDummy::class, $dummy); + $this->assertCount(2, $dummy->getFoo()); + foreach ($dummy->getFoo() as $foo) { + $this->assertInstanceOf(Dummy::class, $foo); + } + } } From 21ba3c07a063d02a2619b2b403407d7f5a6ff09a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Deuchnord?= Date: Thu, 9 May 2019 20:48:34 +0200 Subject: [PATCH 30/67] [Cache] Log a more readable error message when saving into cache fails --- src/Symfony/Component/Cache/Adapter/AbstractAdapter.php | 6 ++++-- .../Component/Cache/Adapter/AbstractTagAwareAdapter.php | 6 ++++-- src/Symfony/Component/Cache/Traits/ArrayTrait.php | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php index e8fc564ddd1ab..883a94ba9bae8 100644 --- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php @@ -164,7 +164,8 @@ public function commit() $ok = false; $v = $values[$id]; $type = \is_object($v) ? \get_class($v) : \gettype($v); - CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => substr($id, \strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null]); + $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.'); + CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null]); } } else { foreach ($values as $id => $v) { @@ -186,7 +187,8 @@ public function commit() } $ok = false; $type = \is_object($v) ? \get_class($v) : \gettype($v); - CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => substr($id, \strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null]); + $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.'); + CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null]); } } diff --git a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php index ddebdf19bbb07..1f922d0fbd5cb 100644 --- a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php @@ -178,7 +178,8 @@ public function commit() $ok = false; $v = $values[$id]; $type = \is_object($v) ? \get_class($v) : \gettype($v); - CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => substr($id, \strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null]); + $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.'); + CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null]); } } else { foreach ($values as $id => $v) { @@ -201,7 +202,8 @@ public function commit() } $ok = false; $type = \is_object($v) ? \get_class($v) : \gettype($v); - CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => substr($id, \strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null]); + $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.'); + CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null]); } } diff --git a/src/Symfony/Component/Cache/Traits/ArrayTrait.php b/src/Symfony/Component/Cache/Traits/ArrayTrait.php index e585c3d48cb52..182c74159edc0 100644 --- a/src/Symfony/Component/Cache/Traits/ArrayTrait.php +++ b/src/Symfony/Component/Cache/Traits/ArrayTrait.php @@ -128,7 +128,8 @@ private function freeze($value, $key) $serialized = serialize($value); } catch (\Exception $e) { $type = \is_object($value) ? \get_class($value) : \gettype($value); - CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => $key, 'type' => $type, 'exception' => $e]); + $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.'); + CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null]); return; } From 52e827c9cf1a087bd12c94414ac4836278fa1a74 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 10 May 2019 12:19:34 +0200 Subject: [PATCH 31/67] [DI] default to service id - *not* FQCN - when building tagged locators --- .../Argument/TaggedIteratorArgument.php | 16 +++-- .../Compiler/PriorityTaggedServiceTrait.php | 10 ++-- .../Tests/Compiler/IntegrationTest.php | 60 +++++++++++++------ 3 files changed, 58 insertions(+), 28 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php index f3b323ce4c2a0..c88b174169054 100644 --- a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php +++ b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php @@ -21,22 +21,26 @@ class TaggedIteratorArgument extends IteratorArgument private $tag; private $indexAttribute; private $defaultIndexMethod; - private $useFqcnAsFallback = false; + private $needsIndexes = false; /** * @param string $tag The name of the tag identifying the target services * @param string|null $indexAttribute The name of the attribute that defines the key referencing each service in the tagged collection * @param string|null $defaultIndexMethod The static method that should be called to get each service's key when their tag doesn't define the previous attribute - * @param bool $useFqcnAsFallback Whether the FQCN of the service should be used as index when neither the attribute nor the method are defined + * @param bool $needsIndexes Whether indexes are required and should be generated when computing the map */ - public function __construct(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null, bool $useFqcnAsFallback = false) + public function __construct(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null, bool $needsIndexes = false) { parent::__construct([]); + if (null === $indexAttribute && $needsIndexes) { + $indexAttribute = preg_match('/[^.]++$/', $tag, $m) ? $m[0] : $tag; + } + $this->tag = $tag; $this->indexAttribute = $indexAttribute; $this->defaultIndexMethod = $defaultIndexMethod ?: ('getDefault'.str_replace(' ', '', ucwords(preg_replace('/[^a-zA-Z0-9\x7f-\xff]++/', ' ', $indexAttribute ?? ''))).'Name'); - $this->useFqcnAsFallback = $useFqcnAsFallback; + $this->needsIndexes = $needsIndexes; } public function getTag() @@ -54,8 +58,8 @@ public function getDefaultIndexMethod(): ?string return $this->defaultIndexMethod; } - public function useFqcnAsFallback(): bool + public function needsIndexes(): bool { - return $this->useFqcnAsFallback; + return $this->needsIndexes; } } diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php index 3bf8e3be18be3..5f04eadef8279 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php @@ -41,12 +41,12 @@ trait PriorityTaggedServiceTrait */ private function findAndSortTaggedServices($tagName, ContainerBuilder $container) { - $indexAttribute = $defaultIndexMethod = $useFqcnAsFallback = null; + $indexAttribute = $defaultIndexMethod = $needsIndexes = null; if ($tagName instanceof TaggedIteratorArgument) { $indexAttribute = $tagName->getIndexAttribute(); $defaultIndexMethod = $tagName->getDefaultIndexMethod(); - $useFqcnAsFallback = $tagName->useFqcnAsFallback(); + $needsIndexes = $tagName->needsIndexes(); $tagName = $tagName->getTag(); } @@ -55,7 +55,7 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container foreach ($container->findTaggedServiceIds($tagName, true) as $serviceId => $attributes) { $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0; - if (null === $indexAttribute && !$useFqcnAsFallback) { + if (null === $indexAttribute && !$needsIndexes) { $services[$priority][] = new Reference($serviceId); continue; @@ -77,8 +77,8 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container $class = $r->name; if (!$r->hasMethod($defaultIndexMethod)) { - if ($useFqcnAsFallback) { - $services[$priority][$class] = new TypedReference($serviceId, $class); + if ($needsIndexes) { + $services[$priority][$serviceId] = new TypedReference($serviceId, $class); continue; } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php index feeb163edb023..83d3e23d3ba5a 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php @@ -292,22 +292,22 @@ public function testTaggedServiceWithIndexAttributeAndDefaultMethod() public function testTaggedServiceLocatorWithIndexAttribute() { $container = new ContainerBuilder(); - $container->register(BarTagClass::class) + $container->register('bar_tag', BarTagClass::class) ->setPublic(true) ->addTag('foo_bar', ['foo' => 'bar']) ; - $container->register(FooTagClass::class) + $container->register('foo_tag', FooTagClass::class) ->setPublic(true) ->addTag('foo_bar') ; - $container->register(FooBarTaggedClass::class) + $container->register('foo_bar_tagged', FooBarTaggedClass::class) ->addArgument(new ServiceLocatorArgument(new TaggedIteratorArgument('foo_bar', 'foo'))) ->setPublic(true) ; $container->compile(); - $s = $container->get(FooBarTaggedClass::class); + $s = $container->get('foo_bar_tagged'); /** @var ServiceLocator $serviceLocator */ $serviceLocator = $s->getParam(); @@ -317,28 +317,28 @@ public function testTaggedServiceLocatorWithIndexAttribute() 'bar' => $serviceLocator->get('bar'), 'foo_tag_class' => $serviceLocator->get('foo_tag_class'), ]; - $this->assertSame(['bar' => $container->get(BarTagClass::class), 'foo_tag_class' => $container->get(FooTagClass::class)], $same); + $this->assertSame(['bar' => $container->get('bar_tag'), 'foo_tag_class' => $container->get('foo_tag')], $same); } public function testTaggedServiceLocatorWithIndexAttributeAndDefaultMethod() { $container = new ContainerBuilder(); - $container->register(BarTagClass::class) + $container->register('bar_tag', BarTagClass::class) ->setPublic(true) ->addTag('foo_bar') ; - $container->register(FooTagClass::class) + $container->register('foo_tag', FooTagClass::class) ->setPublic(true) ->addTag('foo_bar', ['foo' => 'foo']) ; - $container->register(FooBarTaggedClass::class) + $container->register('foo_bar_tagged', FooBarTaggedClass::class) ->addArgument(new ServiceLocatorArgument(new TaggedIteratorArgument('foo_bar', 'foo', 'getFooBar'))) ->setPublic(true) ; $container->compile(); - $s = $container->get(FooBarTaggedClass::class); + $s = $container->get('foo_bar_tagged'); /** @var ServiceLocator $serviceLocator */ $serviceLocator = $s->getParam(); @@ -348,33 +348,59 @@ public function testTaggedServiceLocatorWithIndexAttributeAndDefaultMethod() 'bar_tab_class_with_defaultmethod' => $serviceLocator->get('bar_tab_class_with_defaultmethod'), 'foo' => $serviceLocator->get('foo'), ]; - $this->assertSame(['bar_tab_class_with_defaultmethod' => $container->get(BarTagClass::class), 'foo' => $container->get(FooTagClass::class)], $same); + $this->assertSame(['bar_tab_class_with_defaultmethod' => $container->get('bar_tag'), 'foo' => $container->get('foo_tag')], $same); } - public function testTaggedServiceLocatorWithFqcnFallback() + public function testTaggedServiceLocatorWithFallback() { $container = new ContainerBuilder(); - $container->register(BarTagClass::class) + $container->register('bar_tag', BarTagClass::class) ->setPublic(true) ->addTag('foo_bar') ; - $container->register(FooBarTaggedClass::class) + $container->register('foo_bar_tagged', FooBarTaggedClass::class) ->addArgument(new ServiceLocatorArgument(new TaggedIteratorArgument('foo_bar', null, null, true))) ->setPublic(true) ; $container->compile(); - $s = $container->get(FooBarTaggedClass::class); + $s = $container->get('foo_bar_tagged'); /** @var ServiceLocator $serviceLocator */ $serviceLocator = $s->getParam(); $this->assertTrue($s->getParam() instanceof ServiceLocator, sprintf('Wrong instance, should be an instance of ServiceLocator, %s given', \is_object($serviceLocator) ? \get_class($serviceLocator) : \gettype($serviceLocator))); - $same = [ - BarTagClass::class => $serviceLocator->get(BarTagClass::class), + $expected = [ + 'bar_tag' => $container->get('bar_tag'), + ]; + $this->assertSame($expected, ['bar_tag' => $serviceLocator->get('bar_tag')]); + } + + public function testTaggedServiceLocatorWithDefaultIndex() + { + $container = new ContainerBuilder(); + $container->register('bar_tag', BarTagClass::class) + ->setPublic(true) + ->addTag('app.foo_bar', ['foo_bar' => 'baz']) + ; + $container->register('foo_bar_tagged', FooBarTaggedClass::class) + ->addArgument(new ServiceLocatorArgument(new TaggedIteratorArgument('app.foo_bar', null, null, true))) + ->setPublic(true) + ; + + $container->compile(); + + $s = $container->get('foo_bar_tagged'); + + /** @var ServiceLocator $serviceLocator */ + $serviceLocator = $s->getParam(); + $this->assertTrue($s->getParam() instanceof ServiceLocator, sprintf('Wrong instance, should be an instance of ServiceLocator, %s given', \is_object($serviceLocator) ? \get_class($serviceLocator) : \gettype($serviceLocator))); + + $expected = [ + 'baz' => $container->get('bar_tag'), ]; - $this->assertSame([BarTagClass::class => $container->get(BarTagClass::class)], $same); + $this->assertSame($expected, ['baz' => $serviceLocator->get('baz')]); } } From 4443c2018cebe7cd6e1b8d9bd342c36d5c55fb07 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sat, 11 May 2019 20:03:05 +0200 Subject: [PATCH 32/67] [Cache] fix saving unrelated keys in recursive callback calls --- .../Cache/Tests/Adapter/AdapterTestCase.php | 20 +++++++++++++++++++ .../Tests/Adapter/PhpArrayAdapterTest.php | 1 + .../Component/Cache/Traits/ContractsTrait.php | 12 ++++++----- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php index 0eceb6e572b39..498c00ca643a4 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php @@ -59,6 +59,26 @@ public function testGet() $this->assertFalse($isHit); } + public function testRecursiveGet() + { + if (isset($this->skippedTests[__FUNCTION__])) { + $this->markTestSkipped($this->skippedTests[__FUNCTION__]); + } + + $cache = $this->createCachePool(0, __FUNCTION__); + + $v = $cache->get('k1', function () use (&$counter, $cache) { + $v = $cache->get('k2', function () use (&$counter) { return ++$counter; }); + $v = $cache->get('k2', function () use (&$counter) { return ++$counter; }); + + return $v; + }); + + $this->assertSame(1, $counter); + $this->assertSame(1, $v); + $this->assertSame(1, $cache->get('k2', function () { return 2; })); + } + public function testGetMetadata() { if (isset($this->skippedTests[__FUNCTION__])) { diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php index cee80ac196ec0..3a5904b10710d 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php @@ -23,6 +23,7 @@ class PhpArrayAdapterTest extends AdapterTestCase { protected $skippedTests = [ 'testGet' => 'PhpArrayAdapter is read-only.', + 'testRecursiveGet' => 'PhpArrayAdapter is read-only.', 'testBasicUsage' => 'PhpArrayAdapter is read-only.', 'testBasicUsageWithLongKey' => 'PhpArrayAdapter is read-only.', 'testClear' => 'PhpArrayAdapter is read-only.', diff --git a/src/Symfony/Component/Cache/Traits/ContractsTrait.php b/src/Symfony/Component/Cache/Traits/ContractsTrait.php index bd7be08dd5e8e..6d602dfece664 100644 --- a/src/Symfony/Component/Cache/Traits/ContractsTrait.php +++ b/src/Symfony/Component/Cache/Traits/ContractsTrait.php @@ -31,6 +31,7 @@ trait ContractsTrait } private $callbackWrapper = [LockRegistry::class, 'compute']; + private $computing = []; /** * Wraps the callback passed to ->get() in a callable. @@ -68,26 +69,27 @@ function (CacheItem $item, float $startTime, ?array &$metadata) { CacheItem::class ); - return $this->contractsGet($pool, $key, function (CacheItem $item, bool &$save) use ($pool, $callback, $setMetadata, &$metadata) { + return $this->contractsGet($pool, $key, function (CacheItem $item, bool &$save) use ($pool, $callback, $setMetadata, &$metadata, $key) { // don't wrap nor save recursive calls - if (null === $callbackWrapper = $this->callbackWrapper) { + if (isset($this->computing[$key])) { $value = $callback($item, $save); $save = false; return $value; } - $this->callbackWrapper = null; + + $this->computing[$key] = $key; $startTime = microtime(true); try { - $value = $callbackWrapper($callback, $item, $save, $pool, function (CacheItem $item) use ($setMetadata, $startTime, &$metadata) { + $value = ($this->callbackWrapper)($callback, $item, $save, $pool, function (CacheItem $item) use ($setMetadata, $startTime, &$metadata) { $setMetadata($item, $startTime, $metadata); }); $setMetadata($item, $startTime, $metadata); return $value; } finally { - $this->callbackWrapper = $callbackWrapper; + unset($this->computing[$key]); } }, $beta, $metadata); } From e7dc5e1045e047fae27356acd900e47be1b5fbd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Sun, 12 May 2019 11:42:24 +0200 Subject: [PATCH 33/67] [Validator] Autovalidation: skip readonly props --- .../Resources/config/validator.xml | 1 + .../Mapping/Loader/PropertyInfoLoader.php | 9 ++++++- .../Fixtures/PropertyInfoLoaderEntity.php | 2 ++ .../Mapping/Loader/PropertyInfoLoaderTest.php | 26 ++++++++++++++++--- 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml index 4100735230929..582f3951acc77 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml @@ -71,6 +71,7 @@ + diff --git a/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php index 58ed2669d6f2f..df3878d6e2bfc 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Validator\Mapping\Loader; +use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface; use Symfony\Component\PropertyInfo\PropertyListExtractorInterface; use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface; use Symfony\Component\PropertyInfo\Type as PropertyInfoType; @@ -29,12 +30,14 @@ final class PropertyInfoLoader implements LoaderInterface { private $listExtractor; private $typeExtractor; + private $accessExtractor; private $classValidatorRegexp; - public function __construct(PropertyListExtractorInterface $listExtractor, PropertyTypeExtractorInterface $typeExtractor, string $classValidatorRegexp = null) + public function __construct(PropertyListExtractorInterface $listExtractor, PropertyTypeExtractorInterface $typeExtractor, PropertyAccessExtractorInterface $accessExtractor, string $classValidatorRegexp = null) { $this->listExtractor = $listExtractor; $this->typeExtractor = $typeExtractor; + $this->accessExtractor = $accessExtractor; $this->classValidatorRegexp = $classValidatorRegexp; } @@ -53,6 +56,10 @@ public function loadClassMetadata(ClassMetadata $metadata) } foreach ($properties as $property) { + if (false === $this->accessExtractor->isWritable($className, $property)) { + continue; + } + $types = $this->typeExtractor->getTypes($className, $property); if (null === $types) { continue; diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/PropertyInfoLoaderEntity.php b/src/Symfony/Component/Validator/Tests/Fixtures/PropertyInfoLoaderEntity.php index 6e66c08b20365..42f048c5d8c49 100644 --- a/src/Symfony/Component/Validator/Tests/Fixtures/PropertyInfoLoaderEntity.php +++ b/src/Symfony/Component/Validator/Tests/Fixtures/PropertyInfoLoaderEntity.php @@ -46,4 +46,6 @@ class PropertyInfoLoaderEntity * }) */ public $alreadyPartiallyMappedCollection; + + public $readOnly; } diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/PropertyInfoLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/PropertyInfoLoaderTest.php index 87898341d29bb..71b2691ee5489 100644 --- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/PropertyInfoLoaderTest.php +++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/PropertyInfoLoaderTest.php @@ -45,6 +45,7 @@ public function testLoadClassMetadata() 'alreadyMappedNotNull', 'alreadyMappedNotBlank', 'alreadyPartiallyMappedCollection', + 'readOnly', ]) ; $propertyInfoStub @@ -58,11 +59,27 @@ public function testLoadClassMetadata() [new Type(Type::BUILTIN_TYPE_FLOAT, true)], // The existing constraint is float [new Type(Type::BUILTIN_TYPE_STRING, true)], [new Type(Type::BUILTIN_TYPE_STRING, true)], - [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true, null, new Type(Type::BUILTIN_TYPE_FLOAT))] + [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true, null, new Type(Type::BUILTIN_TYPE_FLOAT))], + [new Type(Type::BUILTIN_TYPE_STRING)] + )) + ; + $propertyInfoStub + ->method('isWritable') + ->will($this->onConsecutiveCalls( + true, + true, + true, + true, + true, + true, + true, + true, + true, + false )) ; - $propertyInfoLoader = new PropertyInfoLoader($propertyInfoStub, $propertyInfoStub); + $propertyInfoLoader = new PropertyInfoLoader($propertyInfoStub, $propertyInfoStub, $propertyInfoStub); $validator = Validation::createValidatorBuilder() ->enableAnnotationMapping() @@ -137,6 +154,9 @@ public function testLoadClassMetadata() $this->assertSame('string', $alreadyPartiallyMappedCollectionConstraints[0]->constraints[0]->type); $this->assertInstanceOf(Iban::class, $alreadyPartiallyMappedCollectionConstraints[0]->constraints[1]); $this->assertInstanceOf(NotNull::class, $alreadyPartiallyMappedCollectionConstraints[0]->constraints[2]); + + $readOnlyMetadata = $classMetadata->getPropertyMetadata('readOnly'); + $this->assertEmpty($readOnlyMetadata); } /** @@ -154,7 +174,7 @@ public function testClassValidator(bool $expected, string $classValidatorRegexp ->willReturn([new Type(Type::BUILTIN_TYPE_STRING)]) ; - $propertyInfoLoader = new PropertyInfoLoader($propertyInfoStub, $propertyInfoStub, $classValidatorRegexp); + $propertyInfoLoader = new PropertyInfoLoader($propertyInfoStub, $propertyInfoStub, $propertyInfoStub, $classValidatorRegexp); $classMetadata = new ClassMetadata(PropertyInfoLoaderEntity::class); $this->assertSame($expected, $propertyInfoLoader->loadClassMetadata($classMetadata)); From b1d3736c409ba5f6c85f2a12d388dad3571ed474 Mon Sep 17 00:00:00 2001 From: Valentin Date: Sat, 11 May 2019 14:25:26 +0300 Subject: [PATCH 34/67] [PropertyAccess] Add missing property to PropertyAccessor --- src/Symfony/Component/PropertyAccess/PropertyAccessor.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php index 6bf6e210968e6..2eb3d17ea9c04 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php @@ -62,6 +62,7 @@ class PropertyAccessor implements PropertyAccessorInterface */ private $cacheItemPool; + private $propertyPathCache = []; private $readPropertyCache = []; private $writePropertyCache = []; private static $resultProto = [self::VALUE => null]; @@ -795,7 +796,7 @@ private function getPropertyPath($propertyPath): PropertyPath * * @return AdapterInterface * - * @throws RuntimeException When the Cache Component isn't available + * @throws \LogicException When the Cache Component isn't available */ public static function createCache($namespace, $defaultLifetime, $version, LoggerInterface $logger = null) { From 6a542cd738c2e8e91c8b7a56d4fbedcd179286d1 Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Sun, 12 May 2019 16:09:02 +0100 Subject: [PATCH 35/67] Add transport in subscriber's phpdoc --- .../Component/Messenger/Handler/MessageSubscriberInterface.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Messenger/Handler/MessageSubscriberInterface.php b/src/Symfony/Component/Messenger/Handler/MessageSubscriberInterface.php index 4eb97ad2c9356..2b85d46471f0b 100644 --- a/src/Symfony/Component/Messenger/Handler/MessageSubscriberInterface.php +++ b/src/Symfony/Component/Messenger/Handler/MessageSubscriberInterface.php @@ -32,13 +32,14 @@ interface MessageSubscriberInterface extends MessageHandlerInterface * yield FirstMessage::class => ['priority' => 0]; * yield SecondMessage::class => ['priority => -10]; * - * It can also specify a method, a priority and/or a bus per message: + * It can also specify a method, a priority, a bus and/or a transport per message: * * yield FirstMessage::class => ['method' => 'firstMessageMethod']; * yield SecondMessage::class => [ * 'method' => 'secondMessageMethod', * 'priority' => 20, * 'bus' => 'my_bus_name', + * 'from_transport' => 'your_transport_name', * ]; * * The benefit of using `yield` instead of returning an array is that you can `yield` multiple times the From 4598235192e380f2e684ea206088fa09f4a72c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Sun, 12 May 2019 22:36:09 +0200 Subject: [PATCH 36/67] [Doctrine][PropertyInfo] Detect if the ID is writeable --- .../PropertyInfo/DoctrineExtractor.php | 53 ++++++++++++++----- .../PropertyInfo/DoctrineExtractorTest.php | 10 ++++ .../Fixtures/DoctrineGeneratedValue.php | 37 +++++++++++++ 3 files changed, 87 insertions(+), 13 deletions(-) create mode 100644 src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineGeneratedValue.php diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php index 49d10a486bfe8..f14c38b36252a 100644 --- a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php +++ b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php @@ -15,8 +15,10 @@ use Doctrine\Common\Persistence\Mapping\MappingException; use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\ORM\EntityManagerInterface; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\ORM\Mapping\MappingException as OrmMappingException; +use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface; use Symfony\Component\PropertyInfo\PropertyListExtractorInterface; use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface; use Symfony\Component\PropertyInfo\Type; @@ -26,7 +28,7 @@ * * @author Kévin Dunglas */ -class DoctrineExtractor implements PropertyListExtractorInterface, PropertyTypeExtractorInterface +class DoctrineExtractor implements PropertyListExtractorInterface, PropertyTypeExtractorInterface, PropertyAccessExtractorInterface { private $entityManager; private $classMetadataFactory; @@ -51,12 +53,8 @@ public function __construct($entityManager) */ public function getProperties($class, array $context = []) { - try { - $metadata = $this->entityManager ? $this->entityManager->getClassMetadata($class) : $this->classMetadataFactory->getMetadataFor($class); - } catch (MappingException $exception) { - return; - } catch (OrmMappingException $exception) { - return; + if (null === $metadata = $this->getMetadata($class)) { + return null; } $properties = array_merge($metadata->getFieldNames(), $metadata->getAssociationNames()); @@ -77,12 +75,8 @@ public function getProperties($class, array $context = []) */ public function getTypes($class, $property, array $context = []) { - try { - $metadata = $this->entityManager ? $this->entityManager->getClassMetadata($class) : $this->classMetadataFactory->getMetadataFor($class); - } catch (MappingException $exception) { - return; - } catch (OrmMappingException $exception) { - return; + if (null === $metadata = $this->getMetadata($class)) { + return null; } if ($metadata->hasAssociation($property)) { @@ -176,6 +170,39 @@ public function getTypes($class, $property, array $context = []) } } + /** + * {@inheritdoc} + */ + public function isReadable($class, $property, array $context = []) + { + return null; + } + + /** + * {@inheritdoc} + */ + public function isWritable($class, $property, array $context = []) + { + if ( + null === ($metadata = $this->getMetadata($class)) + || ClassMetadata::GENERATOR_TYPE_NONE === $metadata->generatorType + || !\in_array($property, $metadata->getIdentifierFieldNames(), true) + ) { + return null; + } + + return false; + } + + private function getMetadata(string $class): ?ClassMetadata + { + try { + return $this->entityManager ? $this->entityManager->getClassMetadata($class) : $this->classMetadataFactory->getMetadataFor($class); + } catch (MappingException | OrmMappingException $exception) { + return null; + } + } + /** * Determines whether an association is nullable. * diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php index ace1d447c2b61..dd5200117cfea 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php @@ -16,6 +16,7 @@ use Doctrine\ORM\Tools\Setup; use PHPUnit\Framework\TestCase; use Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor; +use Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineGeneratedValue; use Symfony\Component\PropertyInfo\Type; /** @@ -223,4 +224,13 @@ private function doTestGetTypesCatchException(bool $legacy) { $this->assertNull($this->createExtractor($legacy)->getTypes('Not\Exist', 'baz')); } + + public function testGeneratedValueNotWritable() + { + $extractor = $this->createExtractor(); + $this->assertFalse($extractor->isWritable(DoctrineGeneratedValue::class, 'id')); + $this->assertNull($extractor->isReadable(DoctrineGeneratedValue::class, 'id')); + $this->assertNull($extractor->isWritable(DoctrineGeneratedValue::class, 'foo')); + $this->assertNull($extractor->isReadable(DoctrineGeneratedValue::class, 'foo')); + } } diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineGeneratedValue.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineGeneratedValue.php new file mode 100644 index 0000000000000..8418b5e5912fb --- /dev/null +++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineGeneratedValue.php @@ -0,0 +1,37 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures; + +use Doctrine\ORM\Mapping\Column; +use Doctrine\ORM\Mapping\Entity; +use Doctrine\ORM\Mapping\GeneratedValue; +use Doctrine\ORM\Mapping\Id; + +/** + * @author Kévin Dunglas + * + * @Entity + */ +class DoctrineGeneratedValue +{ + /** + * @Id + * @GeneratedValue(strategy="AUTO") + * @Column(type="integer") + */ + public $id; + + /** + * @Column + */ + public $foo; +} From 79058633cab1ec0d162417b45942b481e877b5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pr=C3=A9vot?= Date: Sun, 12 May 2019 17:51:32 -1000 Subject: [PATCH 37/67] Drop useless executable bit The files were added as executable via #28477. --- src/Symfony/Component/Validator/Constraints/Json.php | 0 src/Symfony/Component/Validator/Constraints/JsonValidator.php | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/Symfony/Component/Validator/Constraints/Json.php mode change 100755 => 100644 src/Symfony/Component/Validator/Constraints/JsonValidator.php diff --git a/src/Symfony/Component/Validator/Constraints/Json.php b/src/Symfony/Component/Validator/Constraints/Json.php old mode 100755 new mode 100644 diff --git a/src/Symfony/Component/Validator/Constraints/JsonValidator.php b/src/Symfony/Component/Validator/Constraints/JsonValidator.php old mode 100755 new mode 100644 From 96f4626952a275760bd52744ab0173b5bed47511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pr=C3=A9vot?= Date: Sat, 11 May 2019 17:13:04 -1000 Subject: [PATCH 38/67] Update dependencies in the main component --- composer.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f260e752efa53..a5556fc5b284b 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,6 @@ "require": { "php": "^7.1.3", "ext-xml": "*", - "doctrine/collections": "~1.0", "doctrine/event-manager": "~1.0", "doctrine/persistence": "~1.0", "fig/link-util": "^1.0", @@ -27,7 +26,6 @@ "psr/container": "^1.0", "psr/link": "^1.0", "psr/log": "~1.0", - "psr/simple-cache": "^1.0", "symfony/contracts": "^1.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-icu": "~1.0", @@ -38,6 +36,7 @@ }, "replace": { "symfony/asset": "self.version", + "symfony/amazon-mailer": "self.version", "symfony/browser-kit": "self.version", "symfony/cache": "self.version", "symfony/config": "self.version", @@ -55,6 +54,7 @@ "symfony/finder": "self.version", "symfony/form": "self.version", "symfony/framework-bundle": "self.version", + "symfony/google-mailer": "self.version", "symfony/http-client": "self.version", "symfony/http-foundation": "self.version", "symfony/http-kernel": "self.version", @@ -62,10 +62,14 @@ "symfony/intl": "self.version", "symfony/ldap": "self.version", "symfony/lock": "self.version", + "symfony/mailchimp-mailer": "self.version", + "symfony/mailer": "self.version", + "symfony/mailgun-mailer": "self.version", "symfony/messenger": "self.version", "symfony/mime": "self.version", "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", + "symfony/postmark-mailer": "self.version", "symfony/process": "self.version", "symfony/property-access": "self.version", "symfony/property-info": "self.version", @@ -77,6 +81,7 @@ "symfony/security-guard": "self.version", "symfony/security-http": "self.version", "symfony/security-bundle": "self.version", + "symfony/sendgrid-mailer": "self.version", "symfony/serializer": "self.version", "symfony/stopwatch": "self.version", "symfony/templating": "self.version", @@ -96,6 +101,7 @@ "cache/integration-tests": "dev-master", "doctrine/annotations": "~1.0", "doctrine/cache": "~1.6", + "doctrine/collections": "~1.0", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", "doctrine/orm": "~2.4,>=2.4.5", @@ -107,6 +113,7 @@ "ocramius/proxy-manager": "~0.4|~1.0|~2.0", "predis/predis": "~1.1", "psr/http-client": "^1.0", + "psr/simple-cache": "^1.0", "egulias/email-validator": "~1.2,>=1.2.8|~2.0", "symfony/phpunit-bridge": "~3.4|~4.0", "symfony/security-acl": "~2.8|~3.0", From 17f6225d0f5d6da2f629cdb85afdc7e6e33d172e Mon Sep 17 00:00:00 2001 From: Alan Poulain Date: Thu, 9 May 2019 23:13:46 +0200 Subject: [PATCH 39/67] [FrameworkBundle] Add cache configuration for PropertyInfo --- .../FrameworkExtension.php | 19 ++++++------------- .../Resources/config/cache.xml | 4 ++++ .../Resources/config/property_info.xml | 5 +++++ .../Resources/config/serializer.xml | 5 +++++ .../FrameworkExtensionTest.php | 16 ++++++++++++++++ 5 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index b8f0864adc7a8..f49e337a39622 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -99,7 +99,6 @@ use Symfony\Component\Serializer\Encoder\DecoderInterface; use Symfony\Component\Serializer\Encoder\EncoderInterface; use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata; -use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory; use Symfony\Component\Serializer\Normalizer\ConstraintViolationListNormalizer; use Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; @@ -1505,18 +1504,8 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder $chainLoader->replaceArgument(0, $serializerLoaders); $container->getDefinition('serializer.mapping.cache_warmer')->replaceArgument(0, $serializerLoaders); - if (!$container->getParameter('kernel.debug')) { - $cacheMetadataFactory = new Definition( - CacheClassMetadataFactory::class, - [ - new Reference('serializer.mapping.cache_class_metadata_factory.inner'), - new Reference('serializer.mapping.cache.symfony'), - ] - ); - $cacheMetadataFactory->setPublic(false); - $cacheMetadataFactory->setDecoratedService('serializer.mapping.class_metadata_factory'); - - $container->setDefinition('serializer.mapping.cache_class_metadata_factory', $cacheMetadataFactory); + if ($container->getParameter('kernel.debug')) { + $container->removeDefinition('serializer.mapping.cache_class_metadata_factory'); } if (isset($config['name_converter']) && $config['name_converter']) { @@ -1551,6 +1540,10 @@ private function registerPropertyInfoConfiguration(ContainerBuilder $container, $definition->addTag('property_info.description_extractor', ['priority' => -1000]); $definition->addTag('property_info.type_extractor', ['priority' => -1001]); } + + if ($container->getParameter('kernel.debug')) { + $container->removeDefinition('property_info.cache'); + } } private function registerLockConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml index 4fd8b70fac7aa..a5060e2cd6b16 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml @@ -36,6 +36,10 @@ + + + + diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml index 4768cc98d46fe..cd78d7f95ea56 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml @@ -21,6 +21,11 @@ + + + + + diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml index eafb9b923289a..23da8b07bcb04 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml @@ -104,6 +104,11 @@ + + + + + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index 693c4de625dd4..25b7353523906 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -1357,6 +1357,22 @@ public function testPropertyInfoEnabled() $this->assertTrue($container->has('property_info')); } + public function testPropertyInfoCacheActivated() + { + $container = $this->createContainerFromFile('property_info'); + + $this->assertTrue($container->hasDefinition('property_info.cache')); + + $cache = $container->getDefinition('property_info.cache')->getArgument(1); + $this->assertEquals(new Reference('cache.property_info'), $cache); + } + + public function testPropertyInfoCacheDisabled() + { + $container = $this->createContainerFromFile('property_info', ['kernel.debug' => true, 'kernel.container_class' => __CLASS__]); + $this->assertFalse($container->hasDefinition('property_info.cache')); + } + public function testEventDispatcherService() { $container = $this->createContainer(['kernel.charset' => 'UTF-8', 'kernel.secret' => 'secret']); From 34e7781c5c395f21108f2ba4c5e44cbae5aaad80 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 10 May 2019 12:16:07 -0400 Subject: [PATCH 40/67] Adding a new NonSendableStampInterface to avoid sending certain stamps Fixes a bug where Symfony serialization of the AmqpReceivedStamp sometimes caused problems. --- src/Symfony/Component/Messenger/CHANGELOG.md | 3 ++ src/Symfony/Component/Messenger/Envelope.php | 16 ++++++++ .../Stamp/NonSendableStampInterface.php | 23 +++++++++++ .../Messenger/Tests/EnvelopeTest.php | 38 +++++++++++++++++++ .../Serialization/PhpSerializerTest.php | 17 +++++++++ .../Serialization/SerializerTest.php | 16 ++++++++ .../Transport/AmqpExt/AmqpReceivedStamp.php | 4 +- .../Doctrine/DoctrineReceivedStamp.php | 4 +- .../Transport/RedisExt/RedisReceivedStamp.php | 4 +- .../Transport/Serialization/PhpSerializer.php | 3 ++ .../Transport/Serialization/Serializer.php | 3 ++ .../Serialization/SerializerInterface.php | 3 ++ 12 files changed, 128 insertions(+), 6 deletions(-) create mode 100644 src/Symfony/Component/Messenger/Stamp/NonSendableStampInterface.php diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md index 08a352032479a..49d04feb1f276 100644 --- a/src/Symfony/Component/Messenger/CHANGELOG.md +++ b/src/Symfony/Component/Messenger/CHANGELOG.md @@ -4,6 +4,9 @@ CHANGELOG 4.3.0 ----- + * Added `NonSendableStampInterface` that a stamp can implement if + it should not be sent to a transport. Transport serializers + must now check for these stamps and not encode them. * [BC BREAK] `SendersLocatorInterface` has an additional method: `getSenderByAlias()`. * Removed argument `?bool &$handle = false` from `SendersLocatorInterface::getSenders` diff --git a/src/Symfony/Component/Messenger/Envelope.php b/src/Symfony/Component/Messenger/Envelope.php index 0be3355e2ee4d..825ebf79e4dc6 100644 --- a/src/Symfony/Component/Messenger/Envelope.php +++ b/src/Symfony/Component/Messenger/Envelope.php @@ -80,6 +80,22 @@ public function withoutAll(string $stampFqcn): self return $cloned; } + /** + * Removes all stamps that implement the given type. + */ + public function withoutStampsOfType(string $type): self + { + $cloned = clone $this; + + foreach ($cloned->stamps as $class => $stamps) { + if ($class === $type || \is_subclass_of($class, $type)) { + unset($cloned->stamps[$class]); + } + } + + return $cloned; + } + public function last(string $stampFqcn): ?StampInterface { return isset($this->stamps[$stampFqcn]) ? end($this->stamps[$stampFqcn]) : null; diff --git a/src/Symfony/Component/Messenger/Stamp/NonSendableStampInterface.php b/src/Symfony/Component/Messenger/Stamp/NonSendableStampInterface.php new file mode 100644 index 0000000000000..ca8c31078e79f --- /dev/null +++ b/src/Symfony/Component/Messenger/Stamp/NonSendableStampInterface.php @@ -0,0 +1,23 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Messenger\Stamp; + +/** + * A stamp that should not be included with the Envelope if sent to a transport. + * + * @author Ryan Weaver + * + * @experimental in 4.3 + */ +interface NonSendableStampInterface extends StampInterface +{ +} diff --git a/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php b/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php index 417d3dedc0f39..eb99c0a3b0d49 100644 --- a/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php +++ b/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php @@ -15,6 +15,7 @@ use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Stamp\DelayStamp; use Symfony\Component\Messenger\Stamp\ReceivedStamp; +use Symfony\Component\Messenger\Stamp\StampInterface; use Symfony\Component\Messenger\Stamp\ValidationStamp; use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; @@ -50,6 +51,30 @@ public function testWithoutAll() $this->assertCount(1, $envelope->all(DelayStamp::class)); } + public function testWithoutStampsOfType() + { + $envelope = new Envelope(new DummyMessage('dummy'), [ + new ReceivedStamp('transport1'), + new DelayStamp(5000), + new DummyExtendsDelayStamp(5000), + new DummyImplementsFooBarStampInterface(), + ]); + + $envelope2 = $envelope->withoutStampsOfType(DummyNothingImplementsMeStampInterface::class); + $this->assertEquals($envelope, $envelope2); + + $envelope3 = $envelope2->withoutStampsOfType(ReceivedStamp::class); + $this->assertEmpty($envelope3->all(ReceivedStamp::class)); + + $envelope4 = $envelope3->withoutStampsOfType(DelayStamp::class); + $this->assertEmpty($envelope4->all(DelayStamp::class)); + $this->assertEmpty($envelope4->all(DummyExtendsDelayStamp::class)); + + $envelope5 = $envelope4->withoutStampsOfType(DummyFooBarStampInterface::class); + $this->assertEmpty($envelope5->all(DummyImplementsFooBarStampInterface::class)); + $this->assertEmpty($envelope5->all()); + } + public function testLast() { $receivedStamp = new ReceivedStamp('transport'); @@ -92,3 +117,16 @@ public function testWrapWithEnvelope() $this->assertCount(1, $envelope->all(ReceivedStamp::class)); } } + +class DummyExtendsDelayStamp extends DelayStamp +{ +} +interface DummyFooBarStampInterface extends StampInterface +{ +} +interface DummyNothingImplementsMeStampInterface extends StampInterface +{ +} +class DummyImplementsFooBarStampInterface implements DummyFooBarStampInterface +{ +} diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Serialization/PhpSerializerTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Serialization/PhpSerializerTest.php index 6e508365e500a..c146d2619df5c 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/Serialization/PhpSerializerTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/Serialization/PhpSerializerTest.php @@ -14,6 +14,7 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Exception\MessageDecodingFailedException; +use Symfony\Component\Messenger\Stamp\NonSendableStampInterface; use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer; @@ -63,4 +64,20 @@ public function testDecodingFailsWithBadClass() 'body' => 'O:13:"ReceivedSt0mp":0:{}', ]); } + + public function testEncodedSkipsNonEncodeableStamps() + { + $serializer = new PhpSerializer(); + + $envelope = new Envelope(new DummyMessage('Hello'), [ + new DummyPhpSerializerNonSendableStamp(), + ]); + + $encoded = $serializer->encode($envelope); + $this->assertNotContains('DummyPhpSerializerNonSendableStamp', $encoded['body']); + } +} + +class DummyPhpSerializerNonSendableStamp implements NonSendableStampInterface +{ } diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php index 16e2c66a717f1..f43ad2efcb839 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php @@ -14,6 +14,7 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Exception\MessageDecodingFailedException; +use Symfony\Component\Messenger\Stamp\NonSendableStampInterface; use Symfony\Component\Messenger\Stamp\SerializerStamp; use Symfony\Component\Messenger\Stamp\ValidationStamp; use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; @@ -193,4 +194,19 @@ public function testDecodingFailsWithBadClass() 'headers' => ['type' => 'NonExistentClass'], ]); } + + public function testEncodedSkipsNonEncodeableStamps() + { + $serializer = new Serializer(); + + $envelope = new Envelope(new DummyMessage('Hello'), [ + new DummySymfonySerializerNonSendableStamp(), + ]); + + $encoded = $serializer->encode($envelope); + $this->assertNotContains('DummySymfonySerializerNonSendableStamp', print_r($encoded['headers'], true)); + } +} +class DummySymfonySerializerNonSendableStamp implements NonSendableStampInterface +{ } diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceivedStamp.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceivedStamp.php index 78ccb08add591..65c01739071b0 100644 --- a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceivedStamp.php +++ b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceivedStamp.php @@ -11,14 +11,14 @@ namespace Symfony\Component\Messenger\Transport\AmqpExt; -use Symfony\Component\Messenger\Stamp\StampInterface; +use Symfony\Component\Messenger\Stamp\NonSendableStampInterface; /** * Stamp applied when a message is received from Amqp. * * @experimental in 4.3 */ -class AmqpReceivedStamp implements StampInterface +class AmqpReceivedStamp implements NonSendableStampInterface { private $amqpEnvelope; private $queueName; diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineReceivedStamp.php b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineReceivedStamp.php index f11217a74afcb..536ecacd4cea2 100644 --- a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineReceivedStamp.php +++ b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineReceivedStamp.php @@ -11,14 +11,14 @@ namespace Symfony\Component\Messenger\Transport\Doctrine; -use Symfony\Component\Messenger\Stamp\StampInterface; +use Symfony\Component\Messenger\Stamp\NonSendableStampInterface; /** * @author Vincent Touzet * * @experimental in 4.3 */ -class DoctrineReceivedStamp implements StampInterface +class DoctrineReceivedStamp implements NonSendableStampInterface { private $id; diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/RedisReceivedStamp.php b/src/Symfony/Component/Messenger/Transport/RedisExt/RedisReceivedStamp.php index c0b6ad37bded9..2f6b5c2484d85 100644 --- a/src/Symfony/Component/Messenger/Transport/RedisExt/RedisReceivedStamp.php +++ b/src/Symfony/Component/Messenger/Transport/RedisExt/RedisReceivedStamp.php @@ -11,14 +11,14 @@ namespace Symfony\Component\Messenger\Transport\RedisExt; -use Symfony\Component\Messenger\Stamp\StampInterface; +use Symfony\Component\Messenger\Stamp\NonSendableStampInterface; /** * @author Alexander Schranz * * @experimental in 4.3 */ -class RedisReceivedStamp implements StampInterface +class RedisReceivedStamp implements NonSendableStampInterface { private $id; diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php index a916bf795c21d..b65c0fcf63418 100644 --- a/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php +++ b/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php @@ -13,6 +13,7 @@ use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Exception\MessageDecodingFailedException; +use Symfony\Component\Messenger\Stamp\NonSendableStampInterface; /** * @author Ryan Weaver @@ -40,6 +41,8 @@ public function decode(array $encodedEnvelope): Envelope */ public function encode(Envelope $envelope): array { + $envelope = $envelope->withoutStampsOfType(NonSendableStampInterface::class); + $body = addslashes(serialize($envelope)); return [ diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php index 371e3ce14ffd2..f009fb75518d3 100644 --- a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php +++ b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php @@ -14,6 +14,7 @@ use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Exception\LogicException; use Symfony\Component\Messenger\Exception\MessageDecodingFailedException; +use Symfony\Component\Messenger\Stamp\NonSendableStampInterface; use Symfony\Component\Messenger\Stamp\SerializerStamp; use Symfony\Component\Messenger\Stamp\StampInterface; use Symfony\Component\Serializer\Encoder\JsonEncoder; @@ -98,6 +99,8 @@ public function encode(Envelope $envelope): array $context = $serializerStamp->getContext() + $context; } + $envelope = $envelope->withoutStampsOfType(NonSendableStampInterface::class); + $headers = ['type' => \get_class($envelope->getMessage())] + $this->encodeStamps($envelope); return [ diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/SerializerInterface.php b/src/Symfony/Component/Messenger/Transport/Serialization/SerializerInterface.php index f534659f50af0..01a4abc16e4bf 100644 --- a/src/Symfony/Component/Messenger/Transport/Serialization/SerializerInterface.php +++ b/src/Symfony/Component/Messenger/Transport/Serialization/SerializerInterface.php @@ -39,6 +39,9 @@ public function decode(array $encodedEnvelope): Envelope; * Encodes an envelope content (message & stamps) to a common format understandable by transports. * The encoded array should only contain scalars and arrays. * + * Stamps that implement NonSendableStampInterface should + * not be encoded. + * * The most common keys of the encoded array are: * - `body` (string) - the message body * - `headers` (string) - a key/value pair of headers From 38cad41a0aecdb82a3b8c33df2fbe9efec8e813f Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Tue, 14 May 2019 15:44:14 +0200 Subject: [PATCH 41/67] [EventDispatcher] Fix interface name used in error messages --- .../Component/EventDispatcher/LegacyEventDispatcherProxy.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php b/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php index 86917b7d5438f..3ae3735e23e52 100644 --- a/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php +++ b/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php @@ -58,13 +58,13 @@ public function dispatch($event/*, string $eventName = null*/) if (\is_object($event)) { $eventName = $eventName ?? \get_class($event); } else { - @trigger_error(sprintf('Calling the "%s::dispatch()" method with the event name as first argument is deprecated since Symfony 4.3, pass it second and provide the event object first instead.', EventDispatcherInterface::class), E_USER_DEPRECATED); + @trigger_error(sprintf('Calling the "%s::dispatch()" method with the event name as first argument is deprecated since Symfony 4.3, pass it second and provide the event object first instead.', ContractsEventDispatcherInterface::class), E_USER_DEPRECATED); $swap = $event; $event = $eventName ?? new Event(); $eventName = $swap; if (!$event instanceof Event) { - throw new \TypeError(sprintf('Argument 1 passed to "%s::dispatch()" must be an instance of %s, %s given.', EventDispatcherInterface::class, Event::class, \is_object($event) ? \get_class($event) : \gettype($event))); + throw new \TypeError(sprintf('Argument 1 passed to "%s::dispatch()" must be an instance of %s, %s given.', ContractsEventDispatcherInterface::class, Event::class, \is_object($event) ? \get_class($event) : \gettype($event))); } } From 710f8a63676f514f1c15df0b6e0f3021baf08903 Mon Sep 17 00:00:00 2001 From: gauss Date: Tue, 14 May 2019 17:13:30 +0300 Subject: [PATCH 42/67] [Validator] Add the missing translations for the Danish ("da") locale --- .../Resources/translations/validators.da.xlf | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/src/Symfony/Component/Form/Resources/translations/validators.da.xlf b/src/Symfony/Component/Form/Resources/translations/validators.da.xlf index f52f4e0a30db9..346e7cf5746fd 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.da.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.da.xlf @@ -14,6 +14,122 @@ The CSRF token is invalid. Please try to resubmit the form. CSRF-token er ugyldig. + + This value is not a valid currency. + Denne værdi er ikke en gyldig valuta. + + + This value should be equal to {{ compared_value }}. + Denne værdi skal være lig med {{ compared_value }}. + + + This value should be greater than {{ compared_value }}. + Denne værdi skal være større end {{ compared_value }}. + + + This value should be greater than or equal to {{ compared_value }}. + Denne værdi skal være større end eller lig med {{ compared_value }}. + + + This value should be identical to {{ compared_value_type }} {{ compared_value }}. + Denne værdi skal være identisk med {{ compared_value_type }} {{ compared_value }}. + + + This value should be less than {{ compared_value }}. + Denne værdi skal være mindre end {{ compared_value }}. + + + This value should be less than or equal to {{ compared_value }}. + Denne værdi skal være mindre end eller lig med {{ compared_value }}. + + + This value should not be equal to {{ compared_value }}. + Denne værdi bør ikke være lig med {{ compared_value }}. + + + This value should not be identical to {{ compared_value_type }} {{ compared_value }}. + Denne værdi bør ikke være identisk med {{ compared_value_type }} {{ compared_value }}. + + + The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}. + Billedforholdet er for stort ({{ratio}}). Tilladt maksimumsforhold er {{ max_ratio }}. + + + The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}. + Billedforholdet er for lille ({{ ratio }}). Minimumsforventet forventet er {{ min_ratio }}. + + + The image is square ({{ width }}x{{ height }}px). Square images are not allowed. + Billedet er firkantet ({{ width }} x {{ height }} px). Firkantede billeder er ikke tilladt. + + + The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed. + Billedet er landskabsorienteret ({{width}} x {{height}} px). Landskabsorienterede billeder er ikke tilladt + + + The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed. + Billedet er portrætorienteret ({{ width }}x{{ height }}px). Portrætorienterede billeder er ikke tilladt. + + + An empty file is not allowed. + En tom fil er ikke tilladt. + + + The host could not be resolved. + Værten kunne ikke løses. + + + This value does not match the expected {{ charset }} charset. + Denne værdi stemmer ikke overens med den forventede {{ charset }} charset. + + + This is not a valid Business Identifier Code (BIC). + Dette er ikke en gyldig Business Identifier Code (BIC).a + + + This is not a valid UUID. + Dette er ikke en gyldig UUID. + + + This value should be a multiple of {{ compared_value }}. + Denne værdi skal være et flertal af {{ compared_value }}. + + + This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}. + Denne Business Identifier Code (BIC) er ikke forbundet med IBAN {{ iban }}. + + + This value should be valid JSON. + Denne værdi skal være gyldig JSON. + + + This collection should contain only unique elements. + Denne samling bør kun indeholde unikke elementer. + + + This value should be positive. + Denne værdi skal være positiv. + + + This value should be either positive or zero. + Denne værdi skal være enten positiv eller nul. + + + This value should be negative. + Denne værdi skal være negativ. + + + This value should be either negative or zero. + Denne værdi skal være enten negativ eller nul. + + + This value is not a valid timezone. + Denne værdi er ikke en gyldig tidszone. + + + This password has been leaked in a data breach, it must not be used. Please use another password. + Denne adgangskode er blevet lækket i et databrud, det må ikke bruges. Brug venligst en anden adgangskode. + From cb7790280537d0bc4f4d7ea6dbefaa7b8139ed94 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Tue, 9 Apr 2019 07:40:56 +0200 Subject: [PATCH 43/67] deprecate calling createChildContext without the format parameter --- .../Component/Serializer/Normalizer/AbstractNormalizer.php | 6 +++++- .../Serializer/Normalizer/AbstractObjectNormalizer.php | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php index 898963f5d2d95..44eb42bdf43d3 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php @@ -555,8 +555,12 @@ protected function denormalizeParameter(\ReflectionClass $class, \ReflectionPara * * @internal */ - protected function createChildContext(array $parentContext, $attribute/*, string $format = null */) + protected function createChildContext(array $parentContext, $attribute/*, ?string $format */) { + if (\func_num_args() < 3) { + @trigger_error(sprintf('Method "%s::%s()" will have a third "?string $format" argument in version 5.0; not defining it is deprecated since Symfony 4.3.', \get_class($this), __FUNCTION__), E_USER_DEPRECATED); + $format = null; + } if (isset($parentContext[self::ATTRIBUTES][$attribute])) { $parentContext[self::ATTRIBUTES] = $parentContext[self::ATTRIBUTES][$attribute]; } else { diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php index e4cba584e7024..7f22a1df1971e 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php @@ -559,18 +559,19 @@ private function isMaxDepthReached(array $attributesMetadata, string $class, str * We must not mix up the attribute cache between parent and children. * * {@inheritdoc} + * + * @param string|null $format */ - protected function createChildContext(array $parentContext, $attribute/*, string $format = null */) + protected function createChildContext(array $parentContext, $attribute/*, ?string $format */) { if (\func_num_args() >= 3) { $format = \func_get_arg(2); } else { - // will be deprecated in version 4 + @trigger_error(sprintf('Method "%s::%s()" will have a third "?string $format" argument in version 5.0; not defining it is deprecated since Symfony 4.3.', \get_class($this), __FUNCTION__), E_USER_DEPRECATED); $format = null; } $context = parent::createChildContext($parentContext, $attribute, $format); - // format is already included in the cache_key of the parent. $context['cache_key'] = $this->getCacheKey($format, $context); return $context; From 70fdafd79f9cc5249ad24f0eb27e4b35bafd3976 Mon Sep 17 00:00:00 2001 From: Amrouche Hamza Date: Wed, 15 May 2019 07:52:16 +0200 Subject: [PATCH 44/67] [WebProfilerBundle][Form] The form data collector return serialized object when profiler bundle attends object --- src/Symfony/Bundle/WebProfilerBundle/composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index bc15238fbc396..cbd0f38dd1fc6 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -32,7 +32,8 @@ "conflict": { "symfony/dependency-injection": "<3.4", "symfony/messenger": "<4.2", - "symfony/var-dumper": "<3.4" + "symfony/var-dumper": "<3.4", + "symfony/form": "<4.3" }, "autoload": { "psr-4": { "Symfony\\Bundle\\WebProfilerBundle\\": "" }, From 42d62721fd84c1b9004ea12c36b89f714c23d601 Mon Sep 17 00:00:00 2001 From: Konstantin Myakshin Date: Wed, 1 May 2019 00:27:11 +0300 Subject: [PATCH 45/67] Respect parent class contract in ContainerAwareDoctrineEventManager --- .../Doctrine/ContainerAwareEventManager.php | 89 ++++++++++--------- .../Tests/ContainerAwareEventManagerTest.php | 70 ++++++++++++--- 2 files changed, 106 insertions(+), 53 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php index 66b99ecf62065..4496d3ac9a3d9 100644 --- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php +++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php @@ -37,51 +37,49 @@ public function __construct(ContainerInterface $container) } /** - * Dispatches an event to all registered listeners. - * - * @param string $eventName The name of the event to dispatch. The name of the event is - * the name of the method that is invoked on listeners. - * @param EventArgs $eventArgs The event arguments to pass to the event handlers/listeners. - * If not supplied, the single empty EventArgs instance is used. - * - * @return bool + * {@inheritdoc} */ public function dispatchEvent($eventName, EventArgs $eventArgs = null) { - if (isset($this->listeners[$eventName])) { - $eventArgs = null === $eventArgs ? EventArgs::getEmptyInstance() : $eventArgs; + if (!isset($this->listeners[$eventName])) { + return; + } - $initialized = isset($this->initialized[$eventName]); + $eventArgs = null === $eventArgs ? EventArgs::getEmptyInstance() : $eventArgs; - foreach ($this->listeners[$eventName] as $hash => $listener) { - if (!$initialized && \is_string($listener)) { - $this->listeners[$eventName][$hash] = $listener = $this->container->get($listener); - } + if (!isset($this->initialized[$eventName])) { + $this->initializeListeners($eventName); + } - $listener->$eventName($eventArgs); - } - $this->initialized[$eventName] = true; + foreach ($this->listeners[$eventName] as $hash => $listener) { + $listener->$eventName($eventArgs); } } /** - * Gets the listeners of a specific event or all listeners. - * - * @param string $event The name of the event - * - * @return array The event listeners for the specified event, or all event listeners + * {@inheritdoc} */ public function getListeners($event = null) { - return $event ? $this->listeners[$event] : $this->listeners; + if (null !== $event) { + if (!isset($this->initialized[$event])) { + $this->initializeListeners($event); + } + + return $this->listeners[$event]; + } + + foreach ($this->listeners as $event => $listeners) { + if (!isset($this->initialized[$event])) { + $this->initializeListeners($event); + } + } + + return $this->listeners; } /** - * Checks whether an event has any registered listeners. - * - * @param string $event - * - * @return bool TRUE if the specified event has any listeners, FALSE otherwise + * {@inheritdoc} */ public function hasListeners($event) { @@ -89,20 +87,11 @@ public function hasListeners($event) } /** - * Adds an event listener that listens on the specified events. - * - * @param string|array $events The event(s) to listen on - * @param object|string $listener The listener object - * - * @throws \RuntimeException + * {@inheritdoc} */ public function addEventListener($events, $listener) { if (\is_string($listener)) { - if ($this->initialized) { - throw new \RuntimeException('Adding lazy-loading listeners after construction is not supported.'); - } - $hash = '_service_'.$listener; } else { // Picks the hash code related to that listener @@ -113,14 +102,15 @@ public function addEventListener($events, $listener) // Overrides listener if a previous one was associated already // Prevents duplicate listeners on same event (same instance only) $this->listeners[$event][$hash] = $listener; + + if (\is_string($listener)) { + unset($this->initialized[$event]); + } } } /** - * Removes an event listener from the specified events. - * - * @param string|array $events - * @param object|string $listener + * {@inheritdoc} */ public function removeEventListener($events, $listener) { @@ -138,4 +128,17 @@ public function removeEventListener($events, $listener) } } } + + /** + * @param string $eventName + */ + private function initializeListeners($eventName) + { + foreach ($this->listeners[$eventName] as $hash => $listener) { + if (\is_string($listener)) { + $this->listeners[$eventName][$hash] = $this->container->get($listener); + } + } + $this->initialized[$eventName] = true; + } } diff --git a/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php b/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php index 2e97edb1d2e14..b3fb8bc3ac94e 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php @@ -28,8 +28,8 @@ protected function setUp() public function testDispatchEvent() { - $this->container->set('foobar', $listener1 = new MyListener()); - $this->evm->addEventListener('foo', 'foobar'); + $this->container->set('lazy', $listener1 = new MyListener()); + $this->evm->addEventListener('foo', 'lazy'); $this->evm->addEventListener('foo', $listener2 = new MyListener()); $this->evm->dispatchEvent('foo'); @@ -38,19 +38,69 @@ public function testDispatchEvent() $this->assertTrue($listener2->called); } + public function testAddEventListenerAfterDispatchEvent() + { + $this->container->set('lazy1', $listener1 = new MyListener()); + $this->evm->addEventListener('foo', 'lazy1'); + $this->evm->addEventListener('foo', $listener2 = new MyListener()); + + $this->evm->dispatchEvent('foo'); + + $this->container->set('lazy2', $listener3 = new MyListener()); + $this->evm->addEventListener('foo', 'lazy2'); + $this->evm->addEventListener('foo', $listener4 = new MyListener()); + + $this->evm->dispatchEvent('foo'); + + $this->assertTrue($listener1->called); + $this->assertTrue($listener2->called); + $this->assertTrue($listener3->called); + $this->assertTrue($listener4->called); + } + + public function testGetListenersForEvent() + { + $this->container->set('lazy', $listener1 = new MyListener()); + $this->evm->addEventListener('foo', 'lazy'); + $this->evm->addEventListener('foo', $listener2 = new MyListener()); + + $this->assertSame([$listener1, $listener2], array_values($this->evm->getListeners('foo'))); + } + + public function testGetListeners() + { + $this->container->set('lazy', $listener1 = new MyListener()); + $this->evm->addEventListener('foo', 'lazy'); + $this->evm->addEventListener('foo', $listener2 = new MyListener()); + + $this->assertSame([$listener1, $listener2], array_values($this->evm->getListeners()['foo'])); + } + public function testRemoveEventListener() { - $this->evm->addEventListener('foo', 'bar'); - $this->evm->addEventListener('foo', $listener = new MyListener()); + $this->container->set('lazy', $listener1 = new MyListener()); + $this->evm->addEventListener('foo', 'lazy'); + $this->evm->addEventListener('foo', $listener2 = new MyListener()); + + $this->evm->removeEventListener('foo', $listener2); + $this->assertSame([$listener1], array_values($this->evm->getListeners('foo'))); - $listeners = ['foo' => ['_service_bar' => 'bar', spl_object_hash($listener) => $listener]]; - $this->assertSame($listeners, $this->evm->getListeners()); - $this->assertSame($listeners['foo'], $this->evm->getListeners('foo')); + $this->evm->removeEventListener('foo', 'lazy'); + $this->assertSame([], $this->evm->getListeners('foo')); + } + + public function testRemoveEventListenerAfterDispatchEvent() + { + $this->container->set('lazy', $listener1 = new MyListener()); + $this->evm->addEventListener('foo', 'lazy'); + $this->evm->addEventListener('foo', $listener2 = new MyListener()); + + $this->evm->dispatchEvent('foo'); - $this->evm->removeEventListener('foo', $listener); - $this->assertSame(['_service_bar' => 'bar'], $this->evm->getListeners('foo')); + $this->evm->removeEventListener('foo', $listener2); + $this->assertSame([$listener1], array_values($this->evm->getListeners('foo'))); - $this->evm->removeEventListener('foo', 'bar'); + $this->evm->removeEventListener('foo', 'lazy'); $this->assertSame([], $this->evm->getListeners('foo')); } } From 6b76c365ead7f28743c2262abb2076fe1f001759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Thu, 16 May 2019 11:52:39 +0200 Subject: [PATCH 46/67] Use the current working dir as default first arg in 'link' binary --- link | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/link b/link index 6a2ec15e22102..95a3142d2acda 100755 --- a/link +++ b/link @@ -23,14 +23,12 @@ use Symfony\Component\Filesystem\Filesystem; * @author Kévin Dunglas */ -if (2 !== $argc) { - echo 'Link dependencies to components to a local clone of the main symfony/symfony GitHub repository.'.PHP_EOL.PHP_EOL; - echo "Usage: $argv[0] /path/to/the/project".PHP_EOL; - exit(1); -} +$pathToProject = $argv[1] ?? getcwd(); -if (!is_dir("$argv[1]/vendor/symfony")) { - echo "The directory \"$argv[1]\" does not exist or the dependencies are not installed, did you forget to run \"composer install\" in your project?".PHP_EOL; +if (!is_dir("$pathToProject/vendor/symfony")) { + echo 'Link dependencies to components to a local clone of the main symfony/symfony GitHub repository.'.PHP_EOL.PHP_EOL; + echo "Usage: $argv[0] /path/to/the/project".PHP_EOL.PHP_EOL; + echo "The directory \"$pathToProject\" does not exist or the dependencies are not installed, did you forget to run \"composer install\" in your project?".PHP_EOL; exit(1); } @@ -48,7 +46,7 @@ foreach ($directories as $dir) { } } -foreach (glob("$argv[1]/vendor/symfony/*", GLOB_ONLYDIR | GLOB_NOSORT) as $dir) { +foreach (glob("$pathToProject/vendor/symfony/*", GLOB_ONLYDIR | GLOB_NOSORT) as $dir) { $package = 'symfony/'.basename($dir); if (is_link($dir)) { echo "\"$package\" is already a symlink, skipping.".PHP_EOL; @@ -66,6 +64,6 @@ foreach (glob("$argv[1]/vendor/symfony/*", GLOB_ONLYDIR | GLOB_NOSORT) as $dir) echo "\"$package\" has been linked to \"$sfPackages[$package]\".".PHP_EOL; } -foreach (glob("$argv[1]/var/cache/*") as $cacheDir) { +foreach (glob("$pathToProject/var/cache/*") as $cacheDir) { $filesystem->remove($cacheDir); } From 62894ed8b95834bd8c1e3d439fa45cb177b612cd Mon Sep 17 00:00:00 2001 From: Pablo Lozano Date: Thu, 16 May 2019 15:56:20 +0200 Subject: [PATCH 47/67] [PropertyInfo] Add missing documentation link in Readme --- src/Symfony/Component/PropertyInfo/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Component/PropertyInfo/README.md b/src/Symfony/Component/PropertyInfo/README.md index 5ac21f384e59b..1cf30318deb8b 100644 --- a/src/Symfony/Component/PropertyInfo/README.md +++ b/src/Symfony/Component/PropertyInfo/README.md @@ -7,6 +7,7 @@ of popular sources. Resources --------- + * [Documentation](https://symfony.com/doc/current/components/property_info.html) * [Contributing](https://symfony.com/doc/current/contributing/index.html) * [Report issues](https://github.com/symfony/symfony/issues) and [send Pull Requests](https://github.com/symfony/symfony/pulls) From d836c63b919aad261be315a75aa09b2b22e3c8f5 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Fri, 17 May 2019 13:55:16 +0200 Subject: [PATCH 48/67] prevent deprecation when filesize matches error code --- src/Symfony/Component/HttpFoundation/FileBag.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php index 14fbc7aa9d6b7..efd83ffeb8abd 100644 --- a/src/Symfony/Component/HttpFoundation/FileBag.php +++ b/src/Symfony/Component/HttpFoundation/FileBag.php @@ -84,7 +84,7 @@ protected function convertFileInformation($file) if (UPLOAD_ERR_NO_FILE == $file['error']) { $file = null; } else { - $file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['error']); + $file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['error'], false); } } else { $file = array_map([$this, 'convertFileInformation'], $file); From 20c587fc23a0fa62c6b68928c99435ae1b875935 Mon Sep 17 00:00:00 2001 From: Wojciech Skorodecki Date: Fri, 17 May 2019 15:28:19 +0200 Subject: [PATCH 49/67] [EventDispatcher] Removed "callable" type hint from WrappedListener constructor --- src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php index 34316b54c3429..3991c0165fbe2 100644 --- a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php +++ b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php @@ -38,7 +38,7 @@ class WrappedListener private $priority; private static $hasClassStub; - public function __construct(callable $listener, ?string $name, Stopwatch $stopwatch, EventDispatcherInterface $dispatcher = null) + public function __construct($listener, ?string $name, Stopwatch $stopwatch, EventDispatcherInterface $dispatcher = null) { $this->listener = $listener; $this->optimizedListener = $listener instanceof \Closure ? $listener : \Closure::fromCallable($listener); From afb6e1ec9ebe5e60cdcb660667ada2bc83fe6bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Sat, 18 May 2019 15:32:47 +0200 Subject: [PATCH 50/67] [Debug] Wrap call to require_once in a try/catch If the included file contains an error, it hides the real error. This makes debugging harder. How to reproduce: ``` composer create-project symfony/skeleton symfony-3.4 3.4 cd symfony-3.4 composer req monolog ``` Add to `monolog.yaml`: ```yaml elasticsearch: type: "elasticsearch" elasticsearch: host: 'elasticsearch' port: '9200' index: 'ep_php_logs_dev' level: 'debug' tags: 'monolog.logger' channels: ['!event'] ``` This will fail because the the \Elastica\Client class does not exist. But this error will be hidden by the `ClassNotFoundFatalErrorHandler` because it will try to load the `Symfony\Component\Kernel\Client` and this class extends `Symfony\Component\BrowserKit\Client`. The last one is a soft dependency... --- Before ``` Fatal error: Uncaught Error: Class 'Symfony\Component\BrowserKit\Client' not found in /tmp/symfony-3.4/vendor/symfony/http-kernel/Client.php:31 ``` After: ``` Fatal error: Uncaught Symfony\Component\Debug\Exception\ClassNotFoundException: Attempted to load class "Client" from namespace "Elastica". Did you forget a "use" statement for another namespace? in /tmp/symfony-es/var/cache/dev/ContainerWXN4mS9/srcApp_KernelDevDebugContainer.php:303 ``` --- .../FatalErrorHandler/ClassNotFoundFatalErrorHandler.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php index 1ac18ac8f5657..45dcc00d5cb67 100644 --- a/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php +++ b/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php @@ -185,7 +185,11 @@ private function convertFileToClass($path, $file, $prefix) } } - require_once $file; + try { + require_once $file; + } catch (\Throwable $e) { + return null; + } foreach ($candidates as $candidate) { if ($this->classExists($candidate)) { From c866efa61509e741d8e6216c429a572f079355ff Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 18 May 2019 18:33:51 +0200 Subject: [PATCH 51/67] fixed a phpdoc --- .../HttpFoundation/Session/Flash/FlashBagInterface.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php index 2bd1d62bdbf12..99e8074214b62 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php @@ -21,7 +21,7 @@ interface FlashBagInterface extends SessionBagInterface { /** - * Adds a flash message for type. + * Adds a flash message for the given type. * * @param string $type * @param mixed $message @@ -29,12 +29,12 @@ interface FlashBagInterface extends SessionBagInterface public function add($type, $message); /** - * Registers a message for a given type. + * Registers one or more messages for a given type. * * @param string $type - * @param string|array $message + * @param string|array $messages */ - public function set($type, $message); + public function set($type, $messages); /** * Gets flash messages for a given type. From 7ab52d3c36096a2e8b01b3e5df63305c0e91ab9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Bogusz?= Date: Wed, 8 May 2019 14:03:42 +0200 Subject: [PATCH 52/67] [Routing][AnnotationClassLoader] fix utf-8 encoding in default route name --- .../Routing/Loader/AnnotationClassLoader.php | 3 ++- .../AnnotatedClasses/EncodingClass.php | 10 +++++++++ .../Loader/AnnotationClassLoaderTest.php | 21 +++++++++++++++++++ .../Loader/AnnotationDirectoryLoaderTest.php | 3 ++- 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/EncodingClass.php diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php index 6a439e710acf5..6b8a50efb7317 100644 --- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php +++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php @@ -199,7 +199,8 @@ public function getResolver() */ protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method) { - $name = strtolower(str_replace('\\', '_', $class->name).'_'.$method->name); + $name = str_replace('\\', '_', $class->name).'_'.$method->name; + $name = \function_exists('mb_strtolower') && preg_match('//u', $name) ? mb_strtolower($name, 'UTF-8') : strtolower($name); if ($this->defaultRouteIndex > 0) { $name .= '_'.$this->defaultRouteIndex; } diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/EncodingClass.php b/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/EncodingClass.php new file mode 100644 index 0000000000000..dac72e3ddcfca --- /dev/null +++ b/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/EncodingClass.php @@ -0,0 +1,10 @@ +assertEquals(array_merge($classRouteData['methods'], $methodRouteData['methods']), $route->getMethods(), '->load merges class and method route methods'); } + /** + * @requires function mb_strtolower + */ + public function testDefaultRouteName() + { + $methodRouteData = [ + 'name' => null, + ]; + + $this->reader + ->expects($this->once()) + ->method('getMethodAnnotations') + ->will($this->returnValue([$this->getAnnotatedRoute($methodRouteData)])) + ; + + $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\EncodingClass'); + $defaultName = array_keys($routeCollection->all())[0]; + + $this->assertSame($defaultName, 'symfony_component_routing_tests_fixtures_annotatedclasses_encodingclass_routeàction'); + } + private function getAnnotatedRoute($data) { return new Route($data); diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php index ac25493481ef6..9465ef05df23c 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php +++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php @@ -29,7 +29,7 @@ protected function setUp() public function testLoad() { - $this->reader->expects($this->exactly(3))->method('getClassAnnotation'); + $this->reader->expects($this->exactly(4))->method('getClassAnnotation'); $this->reader ->expects($this->any()) @@ -52,6 +52,7 @@ public function testLoadIgnoresHiddenDirectories() 'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass', 'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass', 'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\FooClass', + 'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\EncodingClass', ]); $this->reader From a2191678b71de60764e3c0e45a951fdf40c7d8b7 Mon Sep 17 00:00:00 2001 From: Antoine Makdessi Date: Sun, 19 May 2019 00:39:11 +0200 Subject: [PATCH 53/67] [Workflow] use method marking store --- src/Symfony/Component/Workflow/StateMachine.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Workflow/StateMachine.php b/src/Symfony/Component/Workflow/StateMachine.php index c9f88a022bfe6..05f4c291daa7b 100644 --- a/src/Symfony/Component/Workflow/StateMachine.php +++ b/src/Symfony/Component/Workflow/StateMachine.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Workflow; use Symfony\Component\Workflow\MarkingStore\MarkingStoreInterface; -use Symfony\Component\Workflow\MarkingStore\SingleStateMarkingStore; +use Symfony\Component\Workflow\MarkingStore\MethodMarkingStore; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** @@ -22,6 +22,6 @@ class StateMachine extends Workflow { public function __construct(Definition $definition, MarkingStoreInterface $markingStore = null, EventDispatcherInterface $dispatcher = null, string $name = 'unnamed') { - parent::__construct($definition, $markingStore ?: new SingleStateMarkingStore(), $dispatcher, $name); + parent::__construct($definition, $markingStore ?: new MethodMarkingStore(true, 'marking'), $dispatcher, $name); } } From fd8d6b8187a1a70c64db5d23887273ae112db9d3 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Sun, 19 May 2019 16:33:13 +0200 Subject: [PATCH 54/67] [Messenger] Fix undefined index on read timeout --- .../Transport/RedisExt/ConnectionTest.php | 18 +++++++++++++++++- .../Transport/RedisExt/Connection.php | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php index fae72fa7819bd..c2654d326d0f5 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php @@ -115,7 +115,8 @@ public function testUnexpectedRedisError() public function testGetAfterReject() { - $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget'); + $redis = new \Redis(); + $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget', [], $redis); try { $connection->setup(); } catch (TransportException $e) { @@ -129,5 +130,20 @@ public function testGetAfterReject() $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget'); $this->assertNotNull($connection->get()); + + $redis->del('messenger-rejectthenget'); + } + + public function testBlockingTimeout() + { + $redis = new \Redis(); + $connection = Connection::fromDsn('redis://localhost/messenger-blockingtimeout', ['blocking_timeout' => 1], $redis); + try { + $connection->setup(); + } catch (TransportException $e) { + } + + $this->assertNull($connection->get()); + $redis->del('messenger-blockingtimeout'); } } diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php index 66dc9fe9d6437..566e3d6c62321 100644 --- a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php +++ b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php @@ -102,7 +102,7 @@ public function get(): ?array return $this->get(); } - foreach ($messages[$this->stream] as $key => $message) { + foreach ($messages[$this->stream] ?? [] as $key => $message) { $redisEnvelope = \json_decode($message['message'], true); return [ From 964acd9110ac4f44f6f8b28966f858815e48f76e Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sun, 19 May 2019 10:47:09 -0300 Subject: [PATCH 55/67] [HttpClient] add missing argument check --- src/Symfony/Component/HttpClient/ScopingHttpClient.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Symfony/Component/HttpClient/ScopingHttpClient.php b/src/Symfony/Component/HttpClient/ScopingHttpClient.php index 5b1da579bc0b5..cc5872b3e5bde 100644 --- a/src/Symfony/Component/HttpClient/ScopingHttpClient.php +++ b/src/Symfony/Component/HttpClient/ScopingHttpClient.php @@ -36,6 +36,10 @@ public function __construct(HttpClientInterface $client, array $defaultOptionsBy $this->client = $client; $this->defaultOptionsByRegexp = $defaultOptionsByRegexp; $this->defaultRegexp = $defaultRegexp; + + if (null !== $defaultRegexp && !isset($defaultOptionsByRegexp[$defaultRegexp])) { + throw new InvalidArgumentException(sprintf('No options are mapped to the provided "%s" default regexp.', $defaultRegexp)); + } } public static function forBaseUri(HttpClientInterface $client, string $baseUri, array $defaultOptions = [], $regexp = null): self From 5175f6fffc3fb07f7544a0d3d2856b7501e24343 Mon Sep 17 00:00:00 2001 From: Christopher Hertel Date: Mon, 20 May 2019 11:28:54 +0200 Subject: [PATCH 56/67] adding experimental note --- src/Symfony/Component/Mailer/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Symfony/Component/Mailer/README.md b/src/Symfony/Component/Mailer/README.md index 0f70cc30d74b2..d6fc297909994 100644 --- a/src/Symfony/Component/Mailer/README.md +++ b/src/Symfony/Component/Mailer/README.md @@ -3,6 +3,11 @@ Mailer Component The Mailer component helps sending emails. +**This Component is experimental**. +[Experimental features](https://symfony.com/doc/current/contributing/code/experimental.html) +are not covered by Symfony's +[Backward Compatibility Promise](https://symfony.com/doc/current/contributing/code/bc.html). + Resources --------- From e3739b1289fe2d10eacc92462e198271e4338216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20R?= Date: Mon, 20 May 2019 12:27:33 +0200 Subject: [PATCH 57/67] [Bridge\ProxyManager] isProxyCandidate() does not take into account interfaces When using factories it's common best practice to use interface as class name, especially in cases where you know impl can differ. Before this fix ProxyManager did not allow these to be lazy. In our case this has lead several to hard to debug issues on classes we need to mark as lazyi and often a need to add lazy on decorators if there are any or other workarounds. As we have had this issue, and still have on both 2.8 and 3.4 this is opened against 2.8. --- .../Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php | 2 +- .../ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php index 4ee40def66b15..7c12b7015e620 100644 --- a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php +++ b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php @@ -47,7 +47,7 @@ public function __construct($salt = '') */ public function isProxyCandidate(Definition $definition) { - return $definition->isLazy() && ($class = $definition->getClass()) && class_exists($class); + return $definition->isLazy() && ($class = $definition->getClass()) && (class_exists($class) || interface_exists($class)); } /** diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php index 2f7ee38cce2a0..f0822d4616422 100644 --- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php +++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php @@ -15,6 +15,7 @@ use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; +use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface; /** * Tests for {@see \Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper}. @@ -137,6 +138,7 @@ public function getProxyCandidates() $definitions = [ [new Definition(__CLASS__), true], [new Definition('stdClass'), true], + [new Definition(DumperInterface::class), true], [new Definition(uniqid('foo', true)), false], [new Definition(), false], ]; From c8636523d362ab1a5310a4a8d95f03282cbb954c Mon Sep 17 00:00:00 2001 From: Antoine Makdessi Date: Sat, 18 May 2019 23:50:26 +0200 Subject: [PATCH 58/67] [Workflow] Update MethodMarkingStore --- .../Component/Workflow/MarkingStore/MethodMarkingStore.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Workflow/MarkingStore/MethodMarkingStore.php b/src/Symfony/Component/Workflow/MarkingStore/MethodMarkingStore.php index 3e6294b0facfa..a2341aadbd2eb 100644 --- a/src/Symfony/Component/Workflow/MarkingStore/MethodMarkingStore.php +++ b/src/Symfony/Component/Workflow/MarkingStore/MethodMarkingStore.php @@ -20,7 +20,7 @@ * This store deals with a "single state" or "multiple state" Marking. * * "single state" Marking means a subject can be in one and only one state at - * the same time. Use it with state machine or specific workflow. + * the same time. Use it with state machine. * * "multiple state" Marking means a subject can be in many states at the same * time. Use it with workflow. From d08f195502190683b4b440ef579503ebc3e3edc1 Mon Sep 17 00:00:00 2001 From: Amrouche Hamza Date: Sat, 18 May 2019 09:12:43 +0200 Subject: [PATCH 59/67] minor: add some test in the ldap component --- .../Adapter/ExtLdap/EntryManagerTest.php | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/EntryManagerTest.php diff --git a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/EntryManagerTest.php b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/EntryManagerTest.php new file mode 100644 index 0000000000000..0617762ed6f08 --- /dev/null +++ b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/EntryManagerTest.php @@ -0,0 +1,35 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Ldap\Tests\Adapter\ExtLdap; + +use PHPUnit\Framework\TestCase; +use Symfony\Component\Ldap\Adapter\ExtLdap\Connection; +use Symfony\Component\Ldap\Adapter\ExtLdap\EntryManager; +use Symfony\Component\Ldap\Entry; + +class EntryManagerTest extends TestCase +{ + /** + * @expectedException \Symfony\Component\Ldap\Exception\NotBoundException + * @expectedExceptionMessage Query execution is not possible without binding the connection first. + */ + public function testGetResources() + { + $connection = $this->getMockBuilder(Connection::class)->getMock(); + $connection + ->expects($this->once()) + ->method('isBound')->willReturn(false); + + $entry = new Entry('$$$$$$'); + $entryManager = new EntryManager($connection); + $entryManager->update($entry); + } +} From 0abe32b08556829d58e3433e33b59ef5079e3eaa Mon Sep 17 00:00:00 2001 From: Amrouche Hamza Date: Mon, 20 May 2019 14:13:17 +0200 Subject: [PATCH 60/67] [Ldap] add a test on parsing the rdn --- .../Tests/Adapter/ExtLdap/EntryManagerTest.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/EntryManagerTest.php b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/EntryManagerTest.php index 0617762ed6f08..758ae78e49f35 100644 --- a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/EntryManagerTest.php +++ b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/EntryManagerTest.php @@ -17,6 +17,22 @@ class EntryManagerTest extends TestCase { + /** + * @expectedException \Symfony\Component\Ldap\Exception\LdapException + * @expectedExceptionMessage Entry "$$$$$$" malformed, could not parse RDN. + */ + public function testMove() + { + $connection = $this->createMock(Connection::class); + $connection + ->expects($this->once()) + ->method('isBound')->willReturn(true); + + $entry = new Entry('$$$$$$'); + $entryManager = new EntryManager($connection); + $entryManager->move($entry, 'a'); + } + /** * @expectedException \Symfony\Component\Ldap\Exception\NotBoundException * @expectedExceptionMessage Query execution is not possible without binding the connection first. From 229502a89abb176aa50e9306556432abdacd292f Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Sun, 19 May 2019 17:43:57 +0200 Subject: [PATCH 61/67] [Messenger] Make redis Connection::get() non blocking by default --- .../Transport/RedisExt/ConnectionTest.php | 20 +++++++++++-------- .../Transport/RedisExt/Connection.php | 7 ++----- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php index c2654d326d0f5..1a602f41f292b 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php @@ -46,9 +46,9 @@ public function testFromDsnWithOptions() 'host' => 'localhost', 'port' => 6379, ], [ - 'blocking_timeout' => 30, + 'serializer' => 2, ]), - Connection::fromDsn('redis://localhost/queue/group1/consumer1', ['blocking_timeout' => 30]) + Connection::fromDsn('redis://localhost/queue/group1/consumer1', ['serializer' => 2]) ); } @@ -59,9 +59,9 @@ public function testFromDsnWithQueryOptions() 'host' => 'localhost', 'port' => 6379, ], [ - 'blocking_timeout' => 30, + 'serializer' => 2, ]), - Connection::fromDsn('redis://localhost/queue/group1/consumer1?blocking_timeout=30') + Connection::fromDsn('redis://localhost/queue/group1/consumer1?serializer=2') ); } @@ -134,16 +134,20 @@ public function testGetAfterReject() $redis->del('messenger-rejectthenget'); } - public function testBlockingTimeout() + public function testGetNonBlocking() { $redis = new \Redis(); - $connection = Connection::fromDsn('redis://localhost/messenger-blockingtimeout', ['blocking_timeout' => 1], $redis); + + $connection = Connection::fromDsn('redis://localhost/messenger-getnonblocking', [], $redis); try { $connection->setup(); } catch (TransportException $e) { } - $this->assertNull($connection->get()); - $redis->del('messenger-blockingtimeout'); + $this->assertNull($connection->get()); // no message, should return null immediately + $connection->add('1', []); + $this->assertNotEmpty($message = $connection->get()); + $connection->reject($message['id']); + $redis->del('messenger-getnonblocking'); } } diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php index 566e3d6c62321..b190f3105d5aa 100644 --- a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php +++ b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php @@ -31,7 +31,6 @@ class Connection private $stream; private $group; private $consumer; - private $blockingTimeout; private $couldHavePendingMessages = true; public function __construct(array $configuration, array $connectionCredentials = [], array $redisOptions = [], \Redis $redis = null) @@ -42,7 +41,6 @@ public function __construct(array $configuration, array $connectionCredentials = $this->stream = $configuration['stream'] ?? '' ?: 'messages'; $this->group = $configuration['group'] ?? '' ?: 'symfony'; $this->consumer = $configuration['consumer'] ?? '' ?: 'consumer'; - $this->blockingTimeout = $redisOptions['blocking_timeout'] ?? null; } public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $redis = null): self @@ -83,8 +81,7 @@ public function get(): ?array $this->group, $this->consumer, [$this->stream => $messageId], - 1, - $this->blockingTimeout + 1 ); } catch (\RedisException $e) { } @@ -142,7 +139,7 @@ public function reject(string $id): void } } - public function add(string $body, array $headers) + public function add(string $body, array $headers): void { $e = null; try { From c4eca27149edd306b353ff21b88a3f62b12f3afb Mon Sep 17 00:00:00 2001 From: Konstantin Myakshin Date: Fri, 10 May 2019 03:45:46 +0300 Subject: [PATCH 62/67] Throws UnrecoverableMessageHandlingException when passed invalid entity manager name for Doctrine middlewares --- .../DoctrineCloseConnectionMiddleware.php | 10 +++++----- .../DoctrinePingConnectionMiddleware.php | 10 +++++----- .../Messenger/DoctrineTransactionMiddleware.php | 10 +++++----- .../DoctrineCloseConnectionMiddlewareTest.php | 16 ++++++++++++++++ .../DoctrinePingConnectionMiddlewareTest.php | 16 ++++++++++++++++ .../DoctrineTransactionMiddlewareTest.php | 16 ++++++++++++++++ src/Symfony/Bridge/Doctrine/composer.json | 4 ++-- 7 files changed, 65 insertions(+), 17 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineCloseConnectionMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineCloseConnectionMiddleware.php index 6520ac0a35952..0996859221d22 100644 --- a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineCloseConnectionMiddleware.php +++ b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineCloseConnectionMiddleware.php @@ -12,8 +12,8 @@ namespace Symfony\Bridge\Doctrine\Messenger; use Doctrine\Common\Persistence\ManagerRegistry; -use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\Messenger\Envelope; +use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException; use Symfony\Component\Messenger\Middleware\MiddlewareInterface; use Symfony\Component\Messenger\Middleware\StackInterface; @@ -40,10 +40,10 @@ public function __construct(ManagerRegistry $managerRegistry, string $entityMana */ public function handle(Envelope $envelope, StackInterface $stack): Envelope { - $entityManager = $this->managerRegistry->getManager($this->entityManagerName); - - if (!$entityManager instanceof EntityManagerInterface) { - throw new \InvalidArgumentException(sprintf('The ObjectManager with name "%s" must be an instance of EntityManagerInterface', $this->entityManagerName)); + try { + $entityManager = $this->managerRegistry->getManager($this->entityManagerName); + } catch (\InvalidArgumentException $e) { + throw new UnrecoverableMessageHandlingException($e->getMessage(), 0, $e); } try { diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrinePingConnectionMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrinePingConnectionMiddleware.php index 021d7a8392065..ca9f65d9debf0 100644 --- a/src/Symfony/Bridge/Doctrine/Messenger/DoctrinePingConnectionMiddleware.php +++ b/src/Symfony/Bridge/Doctrine/Messenger/DoctrinePingConnectionMiddleware.php @@ -12,8 +12,8 @@ namespace Symfony\Bridge\Doctrine\Messenger; use Doctrine\Common\Persistence\ManagerRegistry; -use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\Messenger\Envelope; +use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException; use Symfony\Component\Messenger\Middleware\MiddlewareInterface; use Symfony\Component\Messenger\Middleware\StackInterface; @@ -40,10 +40,10 @@ public function __construct(ManagerRegistry $managerRegistry, string $entityMana */ public function handle(Envelope $envelope, StackInterface $stack): Envelope { - $entityManager = $this->managerRegistry->getManager($this->entityManagerName); - - if (!$entityManager instanceof EntityManagerInterface) { - throw new \InvalidArgumentException(sprintf('The ObjectManager with name "%s" must be an instance of EntityManagerInterface', $this->entityManagerName)); + try { + $entityManager = $this->managerRegistry->getManager($this->entityManagerName); + } catch (\InvalidArgumentException $e) { + throw new UnrecoverableMessageHandlingException($e->getMessage(), 0, $e); } $connection = $entityManager->getConnection(); diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php index efab98d54f8f1..0c207567caf35 100644 --- a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php +++ b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php @@ -12,8 +12,8 @@ namespace Symfony\Bridge\Doctrine\Messenger; use Doctrine\Common\Persistence\ManagerRegistry; -use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\Messenger\Envelope; +use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException; use Symfony\Component\Messenger\Middleware\MiddlewareInterface; use Symfony\Component\Messenger\Middleware\StackInterface; @@ -40,10 +40,10 @@ public function __construct(ManagerRegistry $managerRegistry, string $entityMana */ public function handle(Envelope $envelope, StackInterface $stack): Envelope { - $entityManager = $this->managerRegistry->getManager($this->entityManagerName); - - if (!$entityManager instanceof EntityManagerInterface) { - throw new \InvalidArgumentException(sprintf('The ObjectManager with name "%s" must be an instance of EntityManagerInterface', $this->entityManagerName)); + try { + $entityManager = $this->managerRegistry->getManager($this->entityManagerName); + } catch (\InvalidArgumentException $e) { + throw new UnrecoverableMessageHandlingException($e->getMessage(), 0, $e); } $entityManager->getConnection()->beginTransaction(); diff --git a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineCloseConnectionMiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineCloseConnectionMiddlewareTest.php index 3036b42593401..df5414e3cc23a 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineCloseConnectionMiddlewareTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineCloseConnectionMiddlewareTest.php @@ -16,6 +16,7 @@ use Doctrine\ORM\EntityManagerInterface; use Symfony\Bridge\Doctrine\Messenger\DoctrineCloseConnectionMiddleware; use Symfony\Component\Messenger\Envelope; +use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException; use Symfony\Component\Messenger\Test\Middleware\MiddlewareTestCase; class DoctrineCloseConnectionMiddlewareTest extends MiddlewareTestCase @@ -50,4 +51,19 @@ public function testMiddlewareCloseConnection() $this->middleware->handle(new Envelope(new \stdClass()), $this->getStackMock()); } + + public function testInvalidEntityManagerThrowsException() + { + $managerRegistry = $this->createMock(ManagerRegistry::class); + $managerRegistry + ->method('getManager') + ->with('unknown_manager') + ->will($this->throwException(new \InvalidArgumentException())); + + $middleware = new DoctrineCloseConnectionMiddleware($managerRegistry, 'unknown_manager'); + + $this->expectException(UnrecoverableMessageHandlingException::class); + + $middleware->handle(new Envelope(new \stdClass()), $this->getStackMock(false)); + } } diff --git a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrinePingConnectionMiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrinePingConnectionMiddlewareTest.php index cc15625227983..ae71d0d168741 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrinePingConnectionMiddlewareTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrinePingConnectionMiddlewareTest.php @@ -16,6 +16,7 @@ use Doctrine\ORM\EntityManagerInterface; use Symfony\Bridge\Doctrine\Messenger\DoctrinePingConnectionMiddleware; use Symfony\Component\Messenger\Envelope; +use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException; use Symfony\Component\Messenger\Test\Middleware\MiddlewareTestCase; class DoctrinePingConnectionMiddlewareTest extends MiddlewareTestCase @@ -71,4 +72,19 @@ public function testMiddlewarePingResetEntityManager() $this->middleware->handle(new Envelope(new \stdClass()), $this->getStackMock()); } + + public function testInvalidEntityManagerThrowsException() + { + $managerRegistry = $this->createMock(ManagerRegistry::class); + $managerRegistry + ->method('getManager') + ->with('unknown_manager') + ->will($this->throwException(new \InvalidArgumentException())); + + $middleware = new DoctrinePingConnectionMiddleware($managerRegistry, 'unknown_manager'); + + $this->expectException(UnrecoverableMessageHandlingException::class); + + $middleware->handle(new Envelope(new \stdClass()), $this->getStackMock(false)); + } } diff --git a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php index 5927a993d1f4a..04fb86140ee37 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php @@ -16,6 +16,7 @@ use Doctrine\ORM\EntityManagerInterface; use Symfony\Bridge\Doctrine\Messenger\DoctrineTransactionMiddleware; use Symfony\Component\Messenger\Envelope; +use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException; use Symfony\Component\Messenger\Test\Middleware\MiddlewareTestCase; class DoctrineTransactionMiddlewareTest extends MiddlewareTestCase @@ -67,4 +68,19 @@ public function testTransactionIsRolledBackOnException() $this->middleware->handle(new Envelope(new \stdClass()), $this->getThrowingStackMock()); } + + public function testInvalidEntityManagerThrowsException() + { + $managerRegistry = $this->createMock(ManagerRegistry::class); + $managerRegistry + ->method('getManager') + ->with('unknown_manager') + ->will($this->throwException(new \InvalidArgumentException())); + + $middleware = new DoctrineTransactionMiddleware($managerRegistry, 'unknown_manager'); + + $this->expectException(UnrecoverableMessageHandlingException::class); + + $middleware->handle(new Envelope(new \stdClass()), $this->getStackMock(false)); + } } diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 265994893d2f5..4dfc1ec787ecb 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -29,7 +29,7 @@ "symfony/dependency-injection": "~3.4|~4.0", "symfony/form": "~4.3", "symfony/http-kernel": "~3.4|~4.0", - "symfony/messenger": "~4.2", + "symfony/messenger": "~4.3", "symfony/property-access": "~3.4|~4.0", "symfony/property-info": "~3.4|~4.0", "symfony/proxy-manager-bridge": "~3.4|~4.0", @@ -49,7 +49,7 @@ "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", "symfony/dependency-injection": "<3.4", "symfony/form": "<4.3", - "symfony/messenger": "<4.2" + "symfony/messenger": "<4.3" }, "suggest": { "symfony/form": "", From 1cbefd7fca0a88d9e313d1a230ce21c33e24815f Mon Sep 17 00:00:00 2001 From: Andriy Prokopenko Date: Tue, 23 Apr 2019 22:14:27 -0400 Subject: [PATCH 63/67] [HttpClient] Allow arrays as query parameters --- .../Component/HttpClient/HttpClientTrait.php | 21 +++++++++++-------- .../HttpClient/Tests/HttpClientTraitTest.php | 4 ++++ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php index abf7d86c80016..0023e3bbb0f5e 100644 --- a/src/Symfony/Component/HttpClient/HttpClientTrait.php +++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php @@ -481,17 +481,20 @@ private static function mergeQueryString(?string $queryString, array $queryArray } } - foreach ($queryArray as $k => $v) { - if (is_scalar($v)) { - $queryArray[$k] = rawurlencode($k).'='.rawurlencode($v); - } elseif (null === $v) { - unset($queryArray[$k]); - - if ($replace) { + if ($replace) { + foreach ($queryArray as $k => $v) { + if (null === $v) { unset($query[$k]); } - } else { - throw new InvalidArgumentException(sprintf('Unsupported value for query parameter "%s": scalar or null expected, %s given.', $k, \gettype($v))); + } + } + + $queryString = http_build_query($queryArray, '', '&', PHP_QUERY_RFC3986); + $queryArray = []; + + if ($queryString) { + foreach (explode('&', $queryString) as $v) { + $queryArray[rawurldecode(explode('=', $v, 2)[0])] = $v; } } diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php index 5a55ec424e3c2..056181e30ea1b 100644 --- a/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php +++ b/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php @@ -141,6 +141,10 @@ public function provideParseUrl() yield [[null, null, 'bar', '?a=1&c=c', null], 'bar?a=a&b=b', ['b' => null, 'c' => 'c', 'a' => 1]]; yield [[null, null, 'bar', '?a=b+c&b=b', null], 'bar?a=b+c', ['b' => 'b']]; yield [[null, null, 'bar', '?a=b%2B%20c', null], 'bar?a=b+c', ['a' => 'b+ c']]; + yield [[null, null, 'bar', '?a%5Bb%5D=c', null], 'bar', ['a' => ['b' => 'c']]]; + yield [[null, null, 'bar', '?a%5Bb%5Bc%5D=d', null], 'bar?a[b[c]=d', []]; + yield [[null, null, 'bar', '?a%5Bb%5D%5Bc%5D=dd', null], 'bar?a[b][c]=d&e[f]=g', ['a' => ['b' => ['c' => 'dd']], 'e[f]' => null]]; + yield [[null, null, 'bar', '?a=b&a%5Bb%20c%5D=d&e%3Df=%E2%9C%93', null], 'bar?a=b', ['a' => ['b c' => 'd'], 'e=f' => '✓']]; } /** From cd63446f9b42e0284b5e6765e72054840d0c42c3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 21 May 2019 21:22:42 +0200 Subject: [PATCH 64/67] [Security] fixed a fatal error when upgrading from 4.2 --- .../Core/Authentication/Token/AbstractToken.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php index f8f05a1ed80ec..b30d136821539 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php @@ -199,7 +199,15 @@ public function serialize() */ public function __unserialize(array $data): void { - [$this->user, $this->authenticated, $this->roles, $this->attributes, $this->roleNames] = $data; + [$this->user, $this->authenticated, $this->roles, $this->attributes] = $data; + + // migration path to 4.3+ + if (null === $this->roleNames = $data[4] ?? null) { + $this->roleNames = []; + foreach ($this->roles as $role) { + $this->roleNames[] = (string) $role; + } + } } /** From 4ea728313850750849deed28c9dfc5c3b3c61ab1 Mon Sep 17 00:00:00 2001 From: Gawain Lynch Date: Wed, 22 May 2019 06:50:01 +0200 Subject: [PATCH 65/67] [HttpClient] Only use CURLMOPT_MAX_HOST_CONNECTIONS & CURL_VERSION_HTTP2 if defined - CURLMOPT_MAX_HOST_CONNECTIONS is available since PHP 7.0.7 and cURL 7.30.0 - CURL_VERSION_HTTP2 is available since PHP 5.5.24 and 5.6.8 and cURL 7.33.0 --- src/Symfony/Component/HttpClient/CurlHttpClient.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php index e28ade68dc7ef..fd8ecbaeed25e 100644 --- a/src/Symfony/Component/HttpClient/CurlHttpClient.php +++ b/src/Symfony/Component/HttpClient/CurlHttpClient.php @@ -70,7 +70,9 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections if (\defined('CURLPIPE_MULTIPLEX')) { curl_multi_setopt($this->multi->handle, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX); } - curl_multi_setopt($this->multi->handle, CURLMOPT_MAX_HOST_CONNECTIONS, 0 < $maxHostConnections ? $maxHostConnections : PHP_INT_MAX); + if (\defined('CURLMOPT_MAX_HOST_CONNECTIONS')) { + curl_multi_setopt($this->multi->handle, CURLMOPT_MAX_HOST_CONNECTIONS, 0 < $maxHostConnections ? $maxHostConnections : PHP_INT_MAX); + } // Skip configuring HTTP/2 push when it's unsupported or buggy, see https://bugs.php.net/bug.php?id=77535 if (0 >= $maxPendingPushes || \PHP_VERSION_ID < 70217 || (\PHP_VERSION_ID >= 70300 && \PHP_VERSION_ID < 70304)) { @@ -188,7 +190,7 @@ public function request(string $method, string $url, array $options = []): Respo $curlopts[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0; } elseif (1.1 === (float) $options['http_version'] || 'https:' !== $scheme) { $curlopts[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1; - } elseif (CURL_VERSION_HTTP2 & curl_version()['features']) { + } elseif (\defined('CURL_VERSION_HTTP2') && CURL_VERSION_HTTP2 & curl_version()['features']) { $curlopts[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_2_0; } From 5942fc48e94e5cd6029657d70459c56c4d4c450a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 22 May 2019 11:37:08 +0200 Subject: [PATCH 66/67] updated CHANGELOG for 4.3.0-BETA2 --- CHANGELOG-4.3.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/CHANGELOG-4.3.md b/CHANGELOG-4.3.md index a045a58269496..26e086b34eee5 100644 --- a/CHANGELOG-4.3.md +++ b/CHANGELOG-4.3.md @@ -7,6 +7,51 @@ in 4.3 minor versions. To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v4.3.0...v4.3.1 +* 4.3.0-BETA2 (2019-05-22) + + * bug #31569 [HttpClient] Only use CURLMOPT_MAX_HOST_CONNECTIONS & CURL_VERSION_HTTP2 if defined (GawainLynch) + * bug #31566 [Security] fixed a fatal error when upgrading from 4.2 (fabpot) + * bug #31219 [HttpClient] Allow arrays as query parameters (sleepyboy) + * bug #31482 [Messenger][DoctrineBridge] Throws UnrecoverableMessageHandlingException when passed invalid entity manager name (Koc) + * feature #31471 [Messenger] Add "non sendable" stamps (weaverryan) + * bug #31545 [Messenger] Fix redis Connection::get() should be non blocking by default (chalasr) + * bug #31537 [Workflow] use method marking store (noniagriconomie) + * bug #31551 [ProxyManager] isProxyCandidate() does not take into account interfaces (andrerom) + * bug #31542 [HttpClient] add missing argument check (nicolas-grekas) + * bug #31544 [Messenger] Fix undefined index on read timeout (chalasr) + * bug #31335 [Doctrine] Respect parent class contract in ContainerAwareEventManager (Koc) + * bug #31421 [Routing][AnnotationClassLoader] fix utf-8 encoding in default route name (przemyslaw-bogusz) + * bug #31493 [EventDispatcher] Removed "callable" type hint from WrappedListener constructor (wskorodecki) + * bug #31502 [WebProfilerBundle][Form] The form data collector return serialized data (Simperfit) + * bug #31510 Use the current working dir as default first arg in 'link' binary (lyrixx) + * bug #31524 [HttpFoundation] prevent deprecation when filesize matches error code (xabbuh) + * bug #31535 [Debug] Wrap call to require_once in a try/catch (lyrixx) + * feature #31030 [Serializer] Deprecate calling createChildContext without the format parameter (dbu) + * bug #31459 Fix the interface incompatibility of EventDispatchers (keulinho) + * bug #31463 [DI] default to service id - *not* FQCN - when building tagged locators (nicolas-grekas) + * feature #31294 [Form] Add intl/choice_translation_locale option to TimezoneType (ro0NL) + * feature #31452 [FrameworkBundle] Add cache configuration for PropertyInfo (alanpoulain) + * feature #31486 [Doctrine][PropertyInfo] Detect if the ID is writeable (dunglas) + * bug #31481 [Validator] Autovalidation: skip readonly props (dunglas) + * bug #31480 Update dependencies in the main component (DavidPrevot) + * bug #31477 [PropertyAccess] Add missing property to PropertyAccessor (vudaltsov) + * bug #31479 [Cache] fix saving unrelated keys in recursive callback calls (nicolas-grekas) + * bug #30930 [FrameworkBundle] Fixed issue when a parameter contains a '' (lyrixx) + * bug #31438 [Serializer] Fix denormalization of object with variadic constructor typed argument (ajgarlag) + * bug #31445 [Messenger] Making cache rebuild correctly when message subscribers change (weaverryan) + * bug #31442 [Validator] Fix finding translator parent definition in compiler pass (deguif) + * bug #31475 [HttpFoundation] Allow set 'None' on samesite cookie flag (markitosgv) + * feature #31454 [Messenger] remove send_and_handle which can be achieved with SyncTransport (Tobion) + * bug #31425 [Messenger] On failure retry, make message appear received from original sender (weaverryan) + * bug #31472 [Messenger] Fix routable message bus default bus (weaverryan) + * bug #31465 [Serializer] Fix BC break: DEPTH_KEY_PATTERN must be public (dunglas) + * bug #31458 [TwigBundle] Fix Mailer integration in Twig (fabpot) + * bug #31456 Remove deprecated usage of some Twig features (fabpot) + * bug #31207 [Routing] Fixed unexpected 404 NoConfigurationException (yceruto) + * bug #31261 [Console] Commands with an alias should not be recognized as ambiguous when using register (Simperfit) + * bug #31371 [DI] Removes number of elements information in debug mode (jschaedl) + * bug #31418 [FrameworkBundle] clarify the possible class/interface of the cache (xabbuh) + * 4.3.0-BETA1 (2019-05-09) * feature #31249 [Translator] Set sources when extracting strings from php files (Stadly) From de658193998ceff0e6e7eb44bb8ccbfb9af87f64 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 22 May 2019 11:37:23 +0200 Subject: [PATCH 67/67] updated VERSION for 4.3.0-BETA2 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 0dcdc717d9b22..379d0b32c4657 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -73,12 +73,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private $requestStackSize = 0; private $resetServices = false; - const VERSION = '4.3.0-DEV'; + const VERSION = '4.3.0-BETA2'; const VERSION_ID = 40300; const MAJOR_VERSION = 4; const MINOR_VERSION = 3; const RELEASE_VERSION = 0; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = 'BETA2'; const END_OF_MAINTENANCE = '01/2020'; const END_OF_LIFE = '07/2020';