Skip to content

Commit

Permalink
Merge branch 'master' of github.com:onomojo/i18n-timezones
Browse files Browse the repository at this point in the history
  • Loading branch information
onomojo committed Jan 27, 2018
2 parents eaeca00 + 7e41a9a commit d69f0af
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 13 deletions.
4 changes: 1 addition & 3 deletions rails/locale/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ es:
"Bucharest": "Bucarest"
"Cairo": "El Cairo"
"Helsinki": "Helsinki"
"Kyev": "Kyev"
"Riga": "Riga"
"Sofia": "Sofía"
"Tallinn": "Tallin"
Expand Down Expand Up @@ -119,7 +118,6 @@ es:
"Taipei": "Taipei"
"Perth": "Perth"
"Irkutsk": "Irkutsk"
"Ulaan Bataar": "Ulán Bator"
"Seoul": "Seúl"
"Osaka": "Osaka"
"Sapporo": "Sapporo"
Expand Down Expand Up @@ -148,7 +146,7 @@ es:
"Kyiv": "Kiev"
"American Samoa": "Samoa Americana"
"Montevideo": "Montevideo"
"Ulaanbaatar": "Ulaanbaatar"
"Ulaanbaatar": "Ulán Bator"
"Chatham Is.": "Isla Chatham"
"Tokelau Is.": "Isla de Tokelau"
"Zurich": "Zúrich"
4 changes: 2 additions & 2 deletions rails/locale/he.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ he:
"Bucharest": "בוקרשט"
"Cairo": "קהיר"
"Helsinki": "הלסינקי"
"Kyev": "קייב"
"Kyiv": "קייב"
"Riga": "ריגה"
"Sofia": "סופיה"
"Tallinn": "טאלין"
Expand Down Expand Up @@ -119,7 +119,7 @@ he:
"Taipei": "טייפה"
"Perth": "פרת'"
"Irkutsk": "אירקוטסק"
"Ulaan Bataar": "אולאן באטאר"
"Ulaanbaatar": "אולאן באטאר"
"Seoul": "סיאול"
"Osaka": "אוסקה"
"Sapporo": "סאפורו"
Expand Down
2 changes: 1 addition & 1 deletion rails/locale/it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ it:
"Perth": "Perth"
"Singapore": "Singapore"
"Taipei": "Taipei"
"Ulaan Bataar": "Ulan Bator"
"Ulaanbaatar": "Ulan Bator"
"Urumqi": "Ürümqi"
"Irkutsk": "Irkutsk"
"Osaka": "Osaka"
Expand Down
2 changes: 1 addition & 1 deletion rails/locale/nl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ nl:
"Perth": "Perth"
"Singapore": "Singapore"
"Taipei": "Taipei"
"Ulaan Bataar": "Ulaan Bataar"
"Ulaanbaatar": "Ulaan Bataar"
"Urumqi": "Urumqi"
"Irkutsk": "Irkoetsk"
"Osaka": "Osaka"
Expand Down
2 changes: 1 addition & 1 deletion rails/locale/pt-BR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ pt-BR:
"Perth": "Perth"
"Singapore": "Cingapura"
"Taipei": "Taipei"
"Ulaan Bataar": "Ulaan Bataar"
"Ulaanbaatar": "Ulaan Bataar"
"Urumqi": "Urumqi"
"Irkutsk": "Irkutsk"
"Osaka": "Osaka"
Expand Down
2 changes: 1 addition & 1 deletion rails/locale/pt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ pt:
"Perth": "Perth"
"Singapore": "Cingapura"
"Taipei": "Taipei"
"Ulaan Bataar": "Ulaan Bataar"
"Ulaanbaatar": "Ulaan Bataar"
"Urumqi": "Urumqi"
"Irkutsk": "Irkutsk"
"Osaka": "Osaka"
Expand Down
2 changes: 1 addition & 1 deletion rails/locale/ru.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ ru:
"Kamchatka": "Камчатка" # +12:00
"Magadan": "Магадан" # +12:00
"Marshall Is.": "Маршалловы острова" # +12:00
"Solomon Is.": "Саломоновы острова" # +12:00
"Solomon Is.": "Соломоновы острова" # +12:00
"Wellington": "Веллингтон" # +12:00
"Nuku'alofa": "Нукуалофа" # +13:00
"Samoa": "Самоа" # +13:00
Expand Down
6 changes: 3 additions & 3 deletions rails/locale/zh-CN.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ zh-CN:
"Lisbon": "里斯本"
"London": "伦敦"
"Monrovia": "蒙罗维亚"
"UTC": "世界标準时间"
"UTC": "世界标准时间"
"Amsterdam": "阿姆斯特丹"
"Belgrade": "贝尔格勒"
"Berlin": "柏林"
Expand Down Expand Up @@ -70,7 +70,7 @@ zh-CN:
"Jerusalem": "耶路撒冷"
"Kyiv": "基辅"
"Pretoria": "普勒托利亚"
"Kaliningrad": "加里寧格勒"
"Kaliningrad": "加里宁格勒"
"Riga": "里加"
"Sofia": "索菲亚"
"Tallinn": "塔林"
Expand All @@ -88,7 +88,7 @@ zh-CN:
"St. Petersburg": "圣彼得堡"
"Tbilisi": "提比里斯"
"Volgograd": "伏尔加格勒"
"Samara": "薩馬拉"
"Samara": "萨马拉"
"Yerevan": "叶里温"
"Kabul": "喀布尔"
"Islamabad": "伊斯兰玛巴德"
Expand Down

0 comments on commit d69f0af

Please sign in to comment.