diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:20:34 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:20:34 +0000 |
| commit | a42bed2e9a78715889240ff900e2391bef923285 (patch) | |
| tree | 202c502b7e964384fb7f0639b756353374b0c045 /intl/icu/source/extra/uconv | |
| parent | 9a2224a97c7d258fc1f0e5fad30706987880ce22 (diff) | |
| parent | 276f6583e00edf2a217a3092471ca2aa3aab5a09 (diff) | |
| download | UXP-a42bed2e9a78715889240ff900e2391bef923285.tar UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.gz UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.lz UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.xz UXP-a42bed2e9a78715889240ff900e2391bef923285.zip | |
Merge branch 'master' into remove-unboxed
# Conflicts:
# js/src/jit/BaselineIC.cpp
# js/src/jsarray.cpp
Diffstat (limited to 'intl/icu/source/extra/uconv')
21 files changed, 21 insertions, 21 deletions
diff --git a/intl/icu/source/extra/uconv/resources/fr.txt b/intl/icu/source/extra/uconv/resources/fr.txt index 180fb9b67..727931875 100644 --- a/intl/icu/source/extra/uconv/resources/fr.txt +++ b/intl/icu/source/extra/uconv/resources/fr.txt @@ -1,4 +1,4 @@ -// -*- Coding: utf-8; -*- [all uconv resource files] +// -*- Coding: utf-8; -*- [all uconv resource files] // Copyright (C) 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html // diff --git a/intl/icu/source/extra/uconv/resources/root.txt b/intl/icu/source/extra/uconv/resources/root.txt index 9b241e08c..33707b246 100644 --- a/intl/icu/source/extra/uconv/resources/root.txt +++ b/intl/icu/source/extra/uconv/resources/root.txt @@ -1,4 +1,4 @@ -// -*- Coding: utf-8; -*- [all uconv resource files] +// -*- Coding: utf-8; -*- [all uconv resource files] // Copyright (C) 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html // diff --git a/intl/icu/source/extra/uconv/samples/utf8/armenian.txt b/intl/icu/source/extra/uconv/samples/utf8/armenian.txt index 21e2a7352..0cceb1bb6 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/armenian.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/armenian.txt @@ -1,4 +1,4 @@ -Աեցեհի իմ լավ ?ւղիե լավարար, +Աեցեհի իմ լավ ?ւղիե լավարար, Կյաեբս չտայի կասկածի մհգիե... Այեպհս կ?ւզհի մհկե իեծ ?ավատր, Այեպհս կ?ւզհի ?ավատալ մհկիե։ diff --git a/intl/icu/source/extra/uconv/samples/utf8/banviet.txt b/intl/icu/source/extra/uconv/samples/utf8/banviet.txt index 7d9cafe73..7e1f5cb07 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/banviet.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/banviet.txt @@ -1,4 +1,4 @@ -Bần chỉ là một anh nghèo xác, ngày ngày lang-thang +Bần chỉ là một anh nghèo xác, ngày ngày lang-thang khắp xóm này qua xóm khác xin ăn. Quần áo rách-mướp Bần cũng chả coi sao, chân không có giầy và đầu cũng chẳng có mũ. Giời nắng hay giời mưa Bần diff --git a/intl/icu/source/extra/uconv/samples/utf8/chinese-ulysses.txt b/intl/icu/source/extra/uconv/samples/utf8/chinese-ulysses.txt index d2d2c6cfe..94e366238 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/chinese-ulysses.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/chinese-ulysses.txt @@ -1,4 +1,4 @@ - 俺正和首都警署的老特洛伊在凉亭山街角那儿寒喧呢，该死的，冷不丁儿的来了一名扫烟囱的背时家伙，他那长玩意儿差点儿戳进了俺那眼睛里头去。俺转回脑袋，正打算狠々地教训他一顿，没曾想一眼看见石头斜墻街那儿来了个人，道是谁呢，原来是约・哈因斯。 + 俺正和首都警署的老特洛伊在凉亭山街角那儿寒喧呢，该死的，冷不丁儿的来了一名扫烟囱的背时家伙，他那长玩意儿差点儿戳进了俺那眼睛里头去。俺转回脑袋，正打算狠々地教训他一顿，没曾想一眼看见石头斜墻街那儿来了个人，道是谁呢，原来是约・哈因斯。 ___囉，约，俺说。你怎么样？那个扫烟囱的背时家伙，用他的长把儿刷子差点儿把我的眼睛捅掉。你看见了吗？ ___煤烟到，运气好，约说。你刚才说话的那个老小子是谁？ ___老特洛伊呗，俺说，原来是部队的。那家伙又是扫帚又是梯子，把交通都堵塞起来了，俺恨不得把他逮起来。 diff --git a/intl/icu/source/extra/uconv/samples/utf8/croat.txt b/intl/icu/source/extra/uconv/samples/utf8/croat.txt index 406e264c0..2500a40dd 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/croat.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/croat.txt @@ -1,2 +1,2 @@ -Dobar dan! Kako ste? Ja sam Marina +Dobar dan! Kako ste? Ja sam Marina Dodigović. Kako se Vi zovete? diff --git a/intl/icu/source/extra/uconv/samples/utf8/danish.txt b/intl/icu/source/extra/uconv/samples/utf8/danish.txt index 70111d290..4f02a6ea4 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/danish.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/danish.txt @@ -1,4 +1,4 @@ - Foto ______ det formodede fødehus, hjørnet ______ Hans Jensensstræde og Bangs Boder. + Foto ______ det formodede fødehus, hjørnet ______ Hans Jensensstræde og Bangs Boder. (H. C. Andersens Hus, Odense). BARNDOMSOMGIVELSERNE</b> diff --git a/intl/icu/source/extra/uconv/samples/utf8/greek.txt b/intl/icu/source/extra/uconv/samples/utf8/greek.txt index 383222ea1..473303faa 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/greek.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/greek.txt @@ -1,4 +1,4 @@ -<html lang="gr" dir="ltr"> +<html lang="gr" dir="ltr"> <head> <meta http-equiv="content-type" content="text/html; charset=UNICODE-1-1-UTF-8"> </head> diff --git a/intl/icu/source/extra/uconv/samples/utf8/hangul.txt b/intl/icu/source/extra/uconv/samples/utf8/hangul.txt index 3e8071c4a..7557f2c15 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/hangul.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/hangul.txt @@ -1,2 +1,2 @@ -도서관 +도서관 한국 diff --git a/intl/icu/source/extra/uconv/samples/utf8/hania.txt b/intl/icu/source/extra/uconv/samples/utf8/hania.txt index c7e36c6f7..ff133eac8 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/hania.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/hania.txt @@ -1,2 +1,2 @@ -圖書館 +圖書館 韓國
\ No newline at end of file diff --git a/intl/icu/source/extra/uconv/samples/utf8/jap.txt b/intl/icu/source/extra/uconv/samples/utf8/jap.txt index 47a6b3eca..7768896d4 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/jap.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/jap.txt @@ -1,4 +1,4 @@ -ウインカリッスの日本語 +ウインカリッスの日本語 「ユーザーフレンドリ」｜と｜呼ばれる｜ りゆうは、ごく ｜普通の｜人がごく｜ 関単に ｜使用 ｜方法を｜マスター｜でき、｜ diff --git a/intl/icu/source/extra/uconv/samples/utf8/korean.txt b/intl/icu/source/extra/uconv/samples/utf8/korean.txt index bc2c3dccb..9628ef687 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/korean.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/korean.txt @@ -1,4 +1,4 @@ -중앙일보 - 사건/사회 - 극지탐험 협회결 +중앙일보 - 사건/사회 - 극지탐험 협회결 극지탐험 협회결성 체계적 연구 지구상의 ３대 극지라 불리는 남극·북극·에베레스트를 한번이라 도 다녀와야 정회원으로 들어갈 수 있는 한국극지협회가 발족다 diff --git a/intl/icu/source/extra/uconv/samples/utf8/linji.txt b/intl/icu/source/extra/uconv/samples/utf8/linji.txt index 8eb0ec003..6fe5922a4 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/linji.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/linji.txt @@ -1,4 +1,4 @@ -*臨濟語錄 +*臨濟語錄 鎮州臨濟慧照禪師語錄序。 延康殿學士金紫光祿大夫真。 定府路安撫使兼馬步軍都總。 diff --git a/intl/icu/source/extra/uconv/samples/utf8/many.txt b/intl/icu/source/extra/uconv/samples/utf8/many.txt index 47af19648..730882428 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/many.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/many.txt @@ -1,4 +1,4 @@ -外国語の勉強と教え +外国語の勉強と教え Изучение и обучение иностранных языков 語文教學・语文教学 Enseñanza y estudio de idiomas diff --git a/intl/icu/source/extra/uconv/samples/utf8/maopoem.txt b/intl/icu/source/extra/uconv/samples/utf8/maopoem.txt index 6c27be8ba..61aeead1d 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/maopoem.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/maopoem.txt @@ -1,4 +1,4 @@ -和毛泽东 <<重上井冈山>>. 严永欣, 一九八八年 +和毛泽东 <<重上井冈山>>. 严永欣, 一九八八年 和毛泽东 <<重上井冈山>>. 严永欣, 一九八八年. 久有归天愿 diff --git a/intl/icu/source/extra/uconv/samples/utf8/russian.txt b/intl/icu/source/extra/uconv/samples/utf8/russian.txt index ce3a85cc0..53ca12644 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/russian.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/russian.txt @@ -1,4 +1,4 @@ -Американские суда находятся в международных водах. Япония +Американские суда находятся в международных водах. Япония выразила серьезное беспокойство советскими действиями. Пентагон беспокойства не проявил. США проводят подобное слеже- ние за советскими судами в Карибском море. Правда, количество diff --git a/intl/icu/source/extra/uconv/samples/utf8/simplechinese.txt b/intl/icu/source/extra/uconv/samples/utf8/simplechinese.txt index 79e89247c..70f7f6e40 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/simplechinese.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/simplechinese.txt @@ -1,4 +1,4 @@ -简介 +简介 CALIS 是一个专为语文教学而设计的电脑软件。在当今这个电脑时代，＂电脑辅助教学＂是一个极为教师与学生所喜欢的教学媒体。 diff --git a/intl/icu/source/extra/uconv/samples/utf8/turkish.txt b/intl/icu/source/extra/uconv/samples/utf8/turkish.txt index 88a28db92..733945dff 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/turkish.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/turkish.txt @@ -1,4 +1,4 @@ -Yukarda mavi gök, asağıda yağız yer yaratıldıkta; ikisinin arasında insan +Yukarda mavi gök, asağıda yağız yer yaratıldıkta; ikisinin arasında insan oğlu yaratılmış. İnsan oğulları üzerine ecdadım Bumın hakan, İstemi hakan tahta oturmuş; oturarak Türk milletinin ülkesini, türesini, idare edivermiş, tanzim edivermis. Dört taraf hep düşman imiş. Asker sevk edip dört taraftaki diff --git a/intl/icu/source/extra/uconv/samples/utf8/utf-8-demo.txt b/intl/icu/source/extra/uconv/samples/utf8/utf-8-demo.txt index fdc1d1c9d..54c04fd66 100644 --- a/intl/icu/source/extra/uconv/samples/utf8/utf-8-demo.txt +++ b/intl/icu/source/extra/uconv/samples/utf8/utf-8-demo.txt @@ -1,4 +1,4 @@ -UTF-8 encoded sample plain-text file +UTF-8 encoded sample plain-text file ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ This file is a place-holder. The original file is available from Markus Kuhn's website at http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-demo.txt. diff --git a/intl/icu/source/extra/uconv/uconv.vcxproj b/intl/icu/source/extra/uconv/uconv.vcxproj index dffa4c5b4..5660a7abc 100644 --- a/intl/icu/source/extra/uconv/uconv.vcxproj +++ b/intl/icu/source/extra/uconv/uconv.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
diff --git a/intl/icu/source/extra/uconv/uconv.vcxproj.filters b/intl/icu/source/extra/uconv/uconv.vcxproj.filters index 04ed73b5d..acf3adf13 100644 --- a/intl/icu/source/extra/uconv/uconv.vcxproj.filters +++ b/intl/icu/source/extra/uconv/uconv.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> |