mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge inbound to m-c. a=merge 

CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2015-07-08 14:33:24 -04:00
Родитель 778701a365 b2cec37c35
Коммит edce9d010f
530 изменённых файлов: 7474 добавлений и 148690 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
browser/base/content/browser.js
Просмотреть файл

@ -4091,10 +4091,6 @@ var XULBrowserWindow = {
return true;
},
shouldAddToSessionHistory: function(aDocShell, aURI) {
return aURI.spec != NewTabURL.get();
},
onProgressChange: function (aWebProgress, aRequest,
aCurSelfProgress, aMaxSelfProgress,
aCurTotalProgress, aMaxTotalProgress) {

210
build/automationutils.py
Просмотреть файл

@ -16,8 +16,6 @@ import tempfile
import mozinfo
__all__ = [
"dumpLeakLog",
"processLeakLog",
'dumpScreen',
"setAutomationLog",
]
@ -72,214 +70,6 @@ def printstatus(status, name = ""):
# This is probably a can't-happen condition on Unix, but let's be defensive
print "TEST-INFO | %s: undecodable exit status %04x\n" % (name, status)
def dumpLeakLog(leakLogFile, filter = False):
"""Process the leak log, without parsing it.
Use this function if you want the raw log only.
Use it preferably with the |XPCOM_MEM_LEAK_LOG| environment variable.
"""
# Don't warn (nor "info") if the log file is not there.
if not os.path.exists(leakLogFile):
return
with open(leakLogFile, "r") as leaks:
leakReport = leaks.read()
# Only |XPCOM_MEM_LEAK_LOG| reports can be actually filtered out.
# Only check whether an actual leak was reported.
if filter and not "0 TOTAL " in leakReport:
return
# Simply copy the log.
log.info(leakReport.rstrip("\n"))
def processSingleLeakFile(leakLogFileName, processType, leakThreshold, ignoreMissingLeaks):
"""Process a single leak log.
"""
# | |Per-Inst Leaked| Total Rem|
# 0 |TOTAL | 17 192| 419115886 2|
# 833 |nsTimerImpl | 60 120| 24726 2|
# 930 |Foo<Bar, Bar> | 32 8| 100 1|
lineRe = re.compile(r"^\s*\d+ \|"
r"(?P<name>[^|]+)\|"
r"\s*(?P<size>-?\d+)\s+(?P<bytesLeaked>-?\d+)\s*\|"
r"\s*-?\d+\s+(?P<numLeaked>-?\d+)")
# The class name can contain spaces. We remove trailing whitespace later.
processString = "%s process:" % processType
crashedOnPurpose = False
totalBytesLeaked = None
logAsWarning = False
leakAnalysis = []
leakedObjectAnalysis = []
leakedObjectNames = []
recordLeakedObjects = False
with open(leakLogFileName, "r") as leaks:
for line in leaks:
if line.find("purposefully crash") > -1:
crashedOnPurpose = True
matches = lineRe.match(line)
if not matches:
# eg: the leak table header row
log.info(line.rstrip())
continue
name = matches.group("name").rstrip()
size = int(matches.group("size"))
bytesLeaked = int(matches.group("bytesLeaked"))
numLeaked = int(matches.group("numLeaked"))
# Output the raw line from the leak log table if it is the TOTAL row,
# or is for an object row that has been leaked.
if numLeaked != 0 or name == "TOTAL":
log.info(line.rstrip())
# Analyse the leak log, but output later or it will interrupt the leak table
if name == "TOTAL":
# Multiple default processes can end up writing their bloat views into a single
# log, particularly on B2G. Eventually, these should be split into multiple
# logs (bug 1068869), but for now, we report the largest leak.
if totalBytesLeaked != None:
leakAnalysis.append("WARNING | leakcheck | %s multiple BloatView byte totals found"
% processString)
else:
totalBytesLeaked = 0
if bytesLeaked > totalBytesLeaked:
totalBytesLeaked = bytesLeaked
# Throw out the information we had about the previous bloat view.
leakedObjectNames = []
leakedObjectAnalysis = []
recordLeakedObjects = True
else:
recordLeakedObjects = False
if size < 0 or bytesLeaked < 0 or numLeaked < 0:
leakAnalysis.append("TEST-UNEXPECTED-FAIL | leakcheck | %s negative leaks caught!"
% processString)
logAsWarning = True
continue
if name != "TOTAL" and numLeaked != 0 and recordLeakedObjects:
leakedObjectNames.append(name)
leakedObjectAnalysis.append("TEST-INFO | leakcheck | %s leaked %d %s (%s bytes)"
% (processString, numLeaked, name, bytesLeaked))
leakAnalysis.extend(leakedObjectAnalysis)
if logAsWarning:
log.warning('\n'.join(leakAnalysis))
else:
log.info('\n'.join(leakAnalysis))
logAsWarning = False
if totalBytesLeaked is None:
# We didn't see a line with name 'TOTAL'
if crashedOnPurpose:
log.info("TEST-INFO | leakcheck | %s deliberate crash and thus no leak log"
% processString)
elif ignoreMissingLeaks:
log.info("TEST-INFO | leakcheck | %s ignoring missing output line for total leaks"
% processString)
else:
log.info("TEST-UNEXPECTED-FAIL | leakcheck | %s missing output line for total leaks!"
% processString)
log.info("TEST-INFO | leakcheck | missing output line from log file %s"
% leakLogFileName)
return
if totalBytesLeaked == 0:
log.info("TEST-PASS | leakcheck | %s no leaks detected!" % processString)
return
# totalBytesLeaked was seen and is non-zero.
if totalBytesLeaked > leakThreshold:
logAsWarning = True
# Fail the run if we're over the threshold (which defaults to 0)
prefix = "TEST-UNEXPECTED-FAIL"
else:
prefix = "WARNING"
# Create a comma delimited string of the first N leaked objects found,
# to aid with bug summary matching in TBPL. Note: The order of the objects
# had no significance (they're sorted alphabetically).
maxSummaryObjects = 5
leakedObjectSummary = ', '.join(leakedObjectNames[:maxSummaryObjects])
if len(leakedObjectNames) > maxSummaryObjects:
leakedObjectSummary += ', ...'
if logAsWarning:
log.warning("%s | leakcheck | %s %d bytes leaked (%s)"
% (prefix, processString, totalBytesLeaked, leakedObjectSummary))
else:
log.info("%s | leakcheck | %s %d bytes leaked (%s)"
% (prefix, processString, totalBytesLeaked, leakedObjectSummary))
def processLeakLog(leakLogFile, options):
"""Process the leak log, including separate leak logs created
by child processes.
Use this function if you want an additional PASS/FAIL summary.
It must be used with the |XPCOM_MEM_BLOAT_LOG| environment variable.
The base of leakLogFile for a non-default process needs to end with
_proctype_pid12345.log
"proctype" is a string denoting the type of the process, which should
be the result of calling XRE_ChildProcessTypeToString(). 12345 is
a series of digits that is the pid for the process. The .log is
optional.
All other file names are treated as being for default processes.
The options argument is checked for two optional attributes,
leakThresholds and ignoreMissingLeaks.
leakThresholds should be a dict mapping process types to leak thresholds,
in bytes. If a process type is not present in the dict the threshold
will be 0.
ignoreMissingLeaks should be a list of process types. If a process
creates a leak log without a TOTAL, then we report an error if it isn't
in the list ignoreMissingLeaks.
"""
if not os.path.exists(leakLogFile):
log.info("WARNING | leakcheck | refcount logging is off, so leaks can't be detected!")
return
leakThresholds = getattr(options, 'leakThresholds', {})
ignoreMissingLeaks = getattr(options, 'ignoreMissingLeaks', [])
# This list is based on kGeckoProcessTypeString. ipdlunittest processes likely
# are not going to produce leak logs we will ever see.
knownProcessTypes = ["default", "plugin", "tab", "geckomediaplugin"]
for processType in knownProcessTypes:
log.info("TEST-INFO | leakcheck | %s process: leak threshold set at %d bytes"
% (processType, leakThresholds.get(processType, 0)))
for processType in leakThresholds:
if not processType in knownProcessTypes:
log.info("TEST-UNEXPECTED-FAIL | leakcheck | Unknown process type %s in leakThresholds"
% processType)
(leakLogFileDir, leakFileBase) = os.path.split(leakLogFile)
if leakFileBase[-4:] == ".log":
leakFileBase = leakFileBase[:-4]
fileNameRegExp = re.compile(r"_([a-z]*)_pid\d*.log$")
else:
fileNameRegExp = re.compile(r"_([a-z]*)_pid\d*$")
for fileName in os.listdir(leakLogFileDir):
if fileName.find(leakFileBase) != -1:
thisFile = os.path.join(leakLogFileDir, fileName)
m = fileNameRegExp.search(fileName)
if m:
processType = m.group(1)
else:
processType = "default"
if not processType in knownProcessTypes:
log.info("TEST-UNEXPECTED-FAIL | leakcheck | Leak log with unknown process type %s"
% processType)
leakThreshold = leakThresholds.get(processType, 0)
processSingleLeakFile(thisFile, processType, leakThreshold,
processType in ignoreMissingLeaks)
def dumpScreen(utilityPath):
"""dumps a screenshot of the entire screen to a directory specified by
the MOZ_UPLOAD_DIR environment variable"""

1
build/mach_bootstrap.py
Просмотреть файл

@ -62,6 +62,7 @@ SEARCH_PATHS = [
'testing/mozbase/mozdevice',
'testing/mozbase/mozfile',
'testing/mozbase/mozhttpd',
'testing/mozbase/mozleak',
'testing/mozbase/mozlog',
'testing/mozbase/moznetwork',
'testing/mozbase/mozprocess',

12
docshell/base/nsDocShell.cpp
Просмотреть файл

@ -11751,21 +11751,11 @@ nsDocShell::ShouldAddToSessionHistory(nsIURI* aURI)
return false;
}
if (buf.EqualsLiteral("blank")) {
if (buf.EqualsLiteral("blank") || buf.EqualsLiteral("newtab")) {
return false;
}
}
// Check if the webbrowser chrome wants us to proceed - by default it ensures
// aURI is not the newtab URI.
nsCOMPtr<nsIWebBrowserChrome3> browserChrome3 = do_GetInterface(mTreeOwner);
if (browserChrome3) {
bool shouldAdd;
rv = browserChrome3->ShouldAddToSessionHistory(this, aURI, &shouldAdd);
NS_ENSURE_SUCCESS(rv, true);
return shouldAdd;
}
return true;
}

16
dom/base/nsDOMWindowUtils.cpp
Просмотреть файл

@ -101,6 +101,7 @@
#include "nsIContentIterator.h"
#include "nsIDOMStyleSheet.h"
#include "nsIStyleSheet.h"
#include "nsIStyleSheetService.h"
#include "nsContentPermissionHelper.h"
#include "nsNetUtil.h"
@ -3893,6 +3894,21 @@ nsDOMWindowUtils::LeaveChaosMode()
return NS_OK;
}
NS_IMETHODIMP
nsDOMWindowUtils::HasRuleProcessorUsedByMultipleStyleSets(uint32_t aSheetType,
bool* aRetVal)
{
MOZ_RELEASE_ASSERT(nsContentUtils::IsCallerChrome());
nsIPresShell* presShell = GetPresShell();
if (!presShell) {
return NS_ERROR_FAILURE;
}
return presShell->HasRuleProcessorUsedByMultipleStyleSets(aSheetType,
aRetVal);
}
NS_INTERFACE_MAP_BEGIN(nsTranslationNodeList)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_ENTRY(nsITranslationNodeList)

11
dom/interfaces/base/nsIDOMWindowUtils.idl
Просмотреть файл

@ -49,7 +49,7 @@ interface nsIJSRAIIHelper;
interface nsIContentPermissionRequest;
interface nsIObserver;
[scriptable, uuid(336a8683-5626-4512-a3d5-ec280c13e5c2)]
[scriptable, uuid(bbcb87fb-ce2e-4e05-906b-9258687664e2)]
interface nsIDOMWindowUtils : nsISupports {
/**
@ -1857,6 +1857,15 @@ interface nsIDOMWindowUtils : nsISupports {
* Decrease the chaos mode activation level. See enterChaosMode().
*/
void leaveChaosMode();
/**
* Returns whether the document's style set's rule processor for the
* specified level of the cascade is shared by multiple style sets.
* (Used by tests to ensure that certain optimizations do not regress.)
*
* @param aSheetType One of the nsIStyleSheetService.*_SHEET constants.
*/
bool hasRuleProcessorUsedByMultipleStyleSets(in unsigned long aSheetType);
};
[scriptable, uuid(c694e359-7227-4392-a138-33c0cc1f15a6)]

7
dom/ipc/ContentParent.cpp
Просмотреть файл

@ -2436,15 +2436,8 @@ ContentParent::InitInternal(ProcessPriority aInitialPriority,
DebugOnly<bool> opened = PCompositor::Open(this);
MOZ_ASSERT(opened);
#ifndef MOZ_WIDGET_GONK
if (gfxPrefs::AsyncVideoOOPEnabled()) {
opened = PImageBridge::Open(this);
MOZ_ASSERT(opened);
}
#else
opened = PImageBridge::Open(this);
MOZ_ASSERT(opened);
#endif
}
#ifdef MOZ_WIDGET_GONK
DebugOnly<bool> opened = PSharedBufferManager::Open(this);

2
dom/locales/en-US/chrome/dom/dom.properties
Просмотреть файл

@ -159,7 +159,7 @@ XMLDocumentLoadPrincipalMismatch=Use of document.load forbidden on Documents tha
# LOCALIZATION NOTE: Do not translate "IndexedDB".
IndexedDBTransactionAbortNavigation=An IndexedDB transaction that was not yet complete has been aborted due to page navigation.
# LOCALIZATION NOTE (WillChangeBudgetWarning): Do not translate Will-change, %1$S,%2$S,%3$S are numbers.
WillChangeBudgetWarning=Will-change memory consumption is too high. Surface area covers %1$S pixels, budget is the document surface area multiplied by %2$S (%3$S pixels). All occurences of will-change in the document are ignored when over budget.
WillChangeBudgetWarning=Will-change memory consumption is too high. Surface area covers %1$S pixels, budget is the document surface area multiplied by %2$S (%3$S pixels). Occurences of will-change over the budget will be ignored.
# LOCALIZATION NOTE: Do not translate "ServiceWorker".
HittingMaxWorkersPerDomain=A ServiceWorker could not be started immediately because other documents in the same origin are already using the maximum number of workers. The ServiceWorker is now queued and will be started after some of the other workers have completed.
# LOCALIZATION NOTE: Do no translate "setVelocity", "PannerNode", "AudioListener", "speedOfSound" and "dopplerFactor"

2
dom/media/gtest/TestMediaPromise.cpp
Просмотреть файл

@ -35,8 +35,6 @@ private:
class DelayedResolveOrReject : public nsRunnable
{
public:
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(DelayedResolveOrReject)
DelayedResolveOrReject(MediaTaskQueue* aTaskQueue,
TestPromise::Private* aPromise,
TestPromise::ResolveOrRejectValue aValue,

18
dom/media/systemservices/MediaSystemResourceManager.cpp
Просмотреть файл

@ -38,23 +38,6 @@ MediaSystemResourceManager::Shutdown()
}
}
/* static */ bool
MediaSystemResourceManager::IsMediaSystemResourceManagerEnabled()
{
#ifdef MOZ_WIDGET_GONK
return true;
#else
// XXX MediaSystemResourceManager is enabled only when ImageBridge is enabled.
// MediaSystemResourceManager uses ImageBridge's thread.
if (gfxPrefs::AsyncVideoOOPEnabled() &&
gfxPrefs::AsyncVideoEnabled()) {
return true;
} else {
return false;
}
#endif
}
class RunnableCallTask : public Task
{
public:
@ -72,7 +55,6 @@ protected:
/* static */ void
MediaSystemResourceManager::Init()
{
MOZ_ASSERT(IsMediaSystemResourceManagerEnabled());
if (!ImageBridgeChild::IsCreated()) {
NS_WARNING("ImageBridge does not exist");
return;

2
dom/media/systemservices/MediaSystemResourceManager.h
Просмотреть файл

@ -57,8 +57,6 @@ private:
MediaSystemResourceManager();
virtual ~MediaSystemResourceManager();
static bool IsMediaSystemResourceManagerEnabled();
void OpenIPC();
void CloseIPC();
bool IsIpcClosed();

22
dom/tests/mochitest/pointerlock/test_pointerlock-api.html
Просмотреть файл

@ -62,6 +62,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=633602
"file_allowPointerLockSandboxFlag.html"
];
var gDisableList = [
// Bug 1174323
{ file: "file_screenClientXYConst.html",
platform: "MacIntel" }
];
var gTestWindow = null;
var gTestIndex = 0;
@ -98,8 +104,22 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=633602
function runNextTest() {
if (gTestIndex < gTestFiles.length) {
gTestWindow = window.open(gTestFiles[gTestIndex], "", "width=500,height=500");
var file = gTestFiles[gTestIndex];
gTestIndex++;
var skipTest = false;
for (var item of gDisableList) {
if (item.file == file && navigator.platform == item.platform) {
skipTest = true;
break;
}
}
if (!skipTest) {
info(`Testing ${file}`);
gTestWindow = window.open(file, "", "width=500,height=500");
} else {
nextTest();
}
} else {
finish();
}

4
dom/workers/WorkerDebuggerManager.cpp
Просмотреть файл

@ -25,8 +25,6 @@ public:
: mManager(aManager), mDebugger(aDebugger), mHasListeners(aHasListeners)
{ }
NS_DECL_THREADSAFE_ISUPPORTS
private:
~RegisterDebuggerRunnable()
{ }
@ -40,8 +38,6 @@ private:
}
};
NS_IMPL_ISUPPORTS(RegisterDebuggerRunnable, nsIRunnable);
BEGIN_WORKERS_NAMESPACE
class WorkerDebuggerEnumerator final : public nsISimpleEnumerator

5
embedding/browser/nsIWebBrowserChrome3.idl
Просмотреть файл

@ -12,7 +12,7 @@ interface nsIInputStream;
/**
* nsIWebBrowserChrome3 is an extension to nsIWebBrowserChrome2.
*/
[scriptable, uuid(da646a9c-5788-4860-88a4-bd5d0ad853da)]
[scriptable, uuid(542b6625-35a9-426a-8257-c12a345383b0)]
interface nsIWebBrowserChrome3 : nsIWebBrowserChrome2
{
/**
@ -47,7 +47,4 @@ interface nsIWebBrowserChrome3 : nsIWebBrowserChrome2
bool shouldLoadURI(in nsIDocShell aDocShell,
in nsIURI aURI,
in nsIURI aReferrer);
bool shouldAddToSessionHistory(in nsIDocShell aDocShell,
in nsIURI aURI);
};

20
gfx/thebes/gfxFcPlatformFontList.cpp
Просмотреть файл

@ -279,7 +279,7 @@ gfxFontconfigFontEntry::gfxFontconfigFontEntry(const nsAString& aFaceName,
bool aItalic,
const uint8_t *aData,
FT_Face aFace)
: gfxFontEntry(aFaceName), mFontPattern(FcPatternCreate()),
: gfxFontEntry(aFaceName),
mFTFace(aFace), mFTFaceInitialized(true),
mAspect(0.0), mFontData(aData)
{
@ -288,6 +288,24 @@ gfxFontconfigFontEntry::gfxFontconfigFontEntry(const nsAString& aFaceName,
mStretch = aStretch;
mIsDataUserFont = true;
// Use fontconfig to fill out the pattern from the FTFace.
// The "file" argument cannot be nullptr (in fontconfig-2.6.0 at
// least). The dummy file passed here is removed below.
//
// When fontconfig scans the system fonts, FcConfigGetBlanks(nullptr)
// is passed as the "blanks" argument, which provides that unexpectedly
// blank glyphs are elided. Here, however, we pass nullptr for
// "blanks", effectively assuming that, if the font has a blank glyph,
// then the author intends any associated character to be rendered
// blank.
mFontPattern = FcFreeTypeQueryFace(mFTFace, ToFcChar8Ptr(""), 0, nullptr);
// given that we have a FT_Face, not really sure this is possible...
if (!mFontPattern) {
mFontPattern = FcPatternCreate();
}
FcPatternDel(mFontPattern, FC_FILE);
FcPatternDel(mFontPattern, FC_INDEX);
// Make a new pattern and store the face in it so that cairo uses
// that when creating a cairo font face.
FcPatternAddFTFace(mFontPattern, FC_FT_FACE, mFTFace);

8
gfx/thebes/gfxPlatform.cpp
Просмотреть файл

@ -716,14 +716,10 @@ gfxPlatform::InitLayersIPC()
if (XRE_IsParentProcess())
{
mozilla::layers::CompositorParent::StartUp();
#ifndef MOZ_WIDGET_GONK
if (gfxPrefs::AsyncVideoEnabled()) {
mozilla::layers::ImageBridgeChild::StartUp();
}
#else
mozilla::layers::ImageBridgeChild::StartUp();
#ifdef MOZ_WIDGET_GONK
SharedBufferManagerChild::StartUp();
#endif
mozilla::layers::ImageBridgeChild::StartUp();
}
}

2
gfx/thebes/gfxPrefs.h
Просмотреть файл

@ -284,8 +284,6 @@ private:
DECL_GFX_PREF(Once, "layers.acceleration.force-enabled", LayersAccelerationForceEnabled, bool, false);
DECL_GFX_PREF(Once, "layers.async-pan-zoom.enabled", AsyncPanZoomEnabledDoNotUseDirectly, bool, true);
DECL_GFX_PREF(Once, "layers.async-pan-zoom.separate-event-thread", AsyncPanZoomSeparateEventThread, bool, false);
DECL_GFX_PREF(Once, "layers.async-video.enabled", AsyncVideoEnabled, bool, true);
DECL_GFX_PREF(Once, "layers.async-video-oop.enabled", AsyncVideoOOPEnabled, bool, true);
DECL_GFX_PREF(Live, "layers.bench.enabled", LayersBenchEnabled, bool, false);
DECL_GFX_PREF(Once, "layers.bufferrotation.enabled", BufferRotationEnabled, bool, true);
#ifdef MOZ_GFX_OPTIMIZE_MOBILE

4
image/MultipartImage.cpp
Просмотреть файл

@ -131,8 +131,8 @@ MultipartImage::~MultipartImage()
}
NS_IMPL_QUERY_INTERFACE_INHERITED0(MultipartImage, ImageWrapper)
NS_IMPL_ADDREF(MultipartImage)
NS_IMPL_RELEASE(MultipartImage)
NS_IMPL_ADDREF_INHERITED(MultipartImage, ImageWrapper)
NS_IMPL_RELEASE_INHERITED(MultipartImage, ImageWrapper)
void
MultipartImage::BeginTransitionToPart(Image* aNextPart)

2
image/MultipartImage.h
Просмотреть файл

@ -25,7 +25,7 @@ class MultipartImage
{
public:
MOZ_DECLARE_REFCOUNTED_TYPENAME(MultipartImage)
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
void BeginTransitionToPart(Image* aNextPart);

1500
intl/icu/source/data/unit/af.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

11
intl/icu/source/data/unit/agq.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/agq.xml
// *
// ***************************************************************************
agq{
Version{"2.1.10.42"}
}

11
intl/icu/source/data/unit/ak.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ak.xml
// *
// ***************************************************************************
ak{
Version{"2.1.7.39"}
}

1505
intl/icu/source/data/unit/am.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

2620
intl/icu/source/data/unit/ar.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

11
intl/icu/source/data/unit/as.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/as.xml
// *
// ***************************************************************************
as{
Version{"2.1.7.39"}
}

11
intl/icu/source/data/unit/asa.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/asa.xml
// *
// ***************************************************************************
asa{
Version{"2.1.6.69"}
}

1513
intl/icu/source/data/unit/az.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

11
intl/icu/source/data/unit/az_AZ.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/icu-locale-deprecates.xml & build.xml
// *
// ***************************************************************************
az_AZ{
"%%ALIAS"{"az_Latn_AZ"}
}

12
intl/icu/source/data/unit/az_Cyrl.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az_Cyrl.xml
// *
// ***************************************************************************
az_Cyrl{
%%Parent{"root"}
Version{"2.1.10.34"}
}

11
intl/icu/source/data/unit/az_Latn.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az_Latn.xml
// *
// ***************************************************************************
az_Latn{
Version{"2.1.6.69"}
}

14
intl/icu/source/data/unit/az_Latn_AZ.txt
Просмотреть файл

@ -1,14 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/icu-locale-deprecates.xml & build.xml
// *
// ***************************************************************************
/**
* generated alias target
*/
az_Latn_AZ{
___{""}
}

11
intl/icu/source/data/unit/bas.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bas.xml
// *
// ***************************************************************************
bas{
Version{"2.1.6.69"}
}

57
intl/icu/source/data/unit/be.txt
Просмотреть файл

@ -1,57 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/be.xml
// *
// ***************************************************************************
be{
Version{"2.1.10.93"}
units{
duration{
day{
few{"{0} дні"}
many{"{0} дзён"}
one{"{0} дзень"}
other{"{0} дня"}
}
hour{
few{"{0} гадзіны"}
many{"{0} гадзін"}
one{"{0} гадзіна"}
other{"{0} гадзіны"}
}
minute{
few{"{0} хвіліны"}
many{"{0} хвілін"}
one{"{0} хвіліна"}
other{"{0} хвіліны"}
}
month{
few{"{0} месяца"}
many{"{0} месяцаў"}
one{"{0} месяц"}
other{"{0} месяца"}
}
second{
few{"{0} сэкунды"}
many{"{0} сэкунд"}
one{"{0} сэкунда"}
other{"{0} сэкунды"}
}
week{
few{"{0} тыдні"}
many{"{0} тыдняў"}
one{"{0} тыдзень"}
other{"{0} тыдня"}
}
year{
few{"{0} гады"}
many{"{0} гадоў"}
one{"{0} год"}
other{"{0} году"}
}
}
}
}

11
intl/icu/source/data/unit/bem.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bem.xml
// *
// ***************************************************************************
bem{
Version{"2.1.6.69"}
}

11
intl/icu/source/data/unit/bez.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bez.xml
// *
// ***************************************************************************
bez{
Version{"2.1.7.39"}
}

1500
intl/icu/source/data/unit/bg.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

11
intl/icu/source/data/unit/bm.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bm.xml
// *
// ***************************************************************************
bm{
Version{"2.1.10.42"}
}

11
intl/icu/source/data/unit/bm_Latn.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bm_Latn.xml
// *
// ***************************************************************************
bm_Latn{
Version{"2.1.6.69"}
}

1500
intl/icu/source/data/unit/bn.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

11
intl/icu/source/data/unit/bo.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bo.xml
// *
// ***************************************************************************
bo{
Version{"2.1.6.69"}
}

1606
intl/icu/source/data/unit/br.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

43
intl/icu/source/data/unit/brx.txt
Просмотреть файл

@ -1,43 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/brx.xml
// *
// ***************************************************************************
brx{
Version{"2.1.12.94"}
units{
duration{
day{
one{"{0} सान"}
other{"{0} सान"}
}
hour{
one{"{0} रिंगा"}
other{"{0} घंटे"}
}
minute{
one{"{0} मिन."}
other{"{0} मिन."}
}
month{
one{"{0} महीना"}
other{"{0} महीने"}
}
second{
one{"{0} सेकं."}
other{"{0} सेकं."}
}
week{
one{"{0} सप्ताह"}
other{"{0} सप्ताह"}
}
year{
one{"{0} साल"}
other{"{0} साल"}
}
}
}
}

1616
intl/icu/source/data/unit/bs.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

11
intl/icu/source/data/unit/bs_BA.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/icu-locale-deprecates.xml & build.xml
// *
// ***************************************************************************
bs_BA{
"%%ALIAS"{"bs_Latn_BA"}
}

90
intl/icu/source/data/unit/bs_Cyrl.txt
Просмотреть файл

@ -1,90 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs_Cyrl.xml
// *
// ***************************************************************************
bs_Cyrl{
%%Parent{"root"}
Version{"2.1.12.94"}
units{
duration{
day{
few{"{0} дана"}
one{"{0} дан"}
other{"{0} дан"}
}
hour{
few{"{0} сата"}
one{"{0} сат"}
other{"{0} сат"}
}
minute{
few{"{0} минута"}
one{"{0} минут"}
other{"{0} минут"}
}
month{
few{"{0} месеца"}
one{"{0} месец"}
other{"{0} месец"}
}
second{
few{"{0} секунде"}
one{"{0} секунда"}
other{"{0} секунда"}
}
week{
few{"{0} недеље"}
one{"{0} недеља"}
other{"{0} недеља"}
}
year{
few{"{0} године"}
one{"{0} година"}
other{"{0} година"}
}
}
}
unitsShort{
duration{
day{
few{"{0} дана"}
one{"{0} дан"}
other{"{0} дан"}
}
hour{
few{"{0} сата"}
one{"{0} сат"}
other{"{0} сат"}
}
minute{
few{"{0} мин"}
one{"{0} мин"}
other{"{0} мин"}
}
month{
few{"{0} мес"}
one{"{0} мес"}
other{"{0} мес"}
}
second{
few{"{0} сек"}
one{"{0} сек"}
other{"{0} сек"}
}
week{
few{"{0} нед"}
one{"{0} нед"}
other{"{0} нед"}
}
year{
few{"{0} год"}
one{"{0} год"}
other{"{0} год"}
}
}
}
}

11
intl/icu/source/data/unit/bs_Latn.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs_Latn.xml
// *
// ***************************************************************************
bs_Latn{
Version{"2.1.6.69"}
}

14
intl/icu/source/data/unit/bs_Latn_BA.txt
Просмотреть файл

@ -1,14 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/icu-locale-deprecates.xml & build.xml
// *
// ***************************************************************************
/**
* generated alias target
*/
bs_Latn_BA{
___{""}
}

1536
intl/icu/source/data/unit/ca.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

11
intl/icu/source/data/unit/cgg.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cgg.xml
// *
// ***************************************************************************
cgg{
Version{"2.1.7.39"}
}

55
intl/icu/source/data/unit/chr.txt
Просмотреть файл

@ -1,55 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/chr.xml
// *
// ***************************************************************************
chr{
Version{"2.1.6.69"}
units{
duration{
day{
one{"{0} ᏏᎦ"}
other{"{0} ᏧᏒᎯᏓ"}
}
hour{
one{"{0} ᏑᏣᎶᏓ"}
other{"{0} ᎢᏧᏣᎶᏓ"}
}
minute{
one{"{0} ᎢᏯᏔᏬᏍᏔᏅ"}
other{"{0} ᎢᏧᏔᏬᏍᏔᏅ"}
}
month{
one{"{0} ᏏᏅᏓ"}
other{"{0} ᎢᏯᏅᏓ"}
}
second{
one{"{0} ᎠᏎᏢ"}
other{"{0} ᏗᏎᏢ"}
}
week{
one{"{0} ᏒᎾᏙᏓᏆᏍᏗ"}
other{"{0} ᎢᏳᎾᏙᏓᏆᏍᏗ"}
}
year{
one{"{0} ᏑᏕᏘᏴᏓ"}
other{"{0} ᏧᏕᏘᏴᏓ"}
}
}
}
unitsNarrow{
temperature{
celsius{
one{"{0}°C"}
other{"{0}°C"}
}
fahrenheit{
one{"{0}°"}
other{"{0}°"}
}
}
}
}

2685
intl/icu/source/data/unit/cs.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

1330
intl/icu/source/data/unit/cy.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

1508
intl/icu/source/data/unit/da.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

11
intl/icu/source/data/unit/dav.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dav.xml
// *
// ***************************************************************************
dav{
Version{"2.1.6.69"}
}

1859
intl/icu/source/data/unit/de.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

41
intl/icu/source/data/unit/de_CH.txt
Просмотреть файл

@ -1,41 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/de_CH.xml
// *
// ***************************************************************************
de_CH{
Version{"2.1.11.70"}
units{
area{
square-foot{
dnam{"Quadratfuss"}
one{"{0} Quadratfuss"}
other{"{0} Quadratfuss"}
}
}
length{
foot{
dnam{"Fuss"}
one{"{0} Fuss"}
other{"{0} Fuss"}
}
}
volume{
cubic-foot{
dnam{"Kubikfuss"}
one{"{0} Kubikfuss"}
other{"{0} Kubikfuss"}
}
}
}
unitsShort{
length{
foot{
dnam{"Fuss"}
}
}
}
}

11
intl/icu/source/data/unit/dje.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dje.xml
// *
// ***************************************************************************
dje{
Version{"2.1.6.69"}
}

2051
intl/icu/source/data/unit/dsb.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

11
intl/icu/source/data/unit/dua.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dua.xml
// *
// ***************************************************************************
dua{
Version{"2.1.6.69"}
}

11
intl/icu/source/data/unit/dyo.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dyo.xml
// *
// ***************************************************************************
dyo{
Version{"2.1.6.69"}
}

36
intl/icu/source/data/unit/dz.txt
Просмотреть файл

@ -1,36 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dz.xml
// *
// ***************************************************************************
dz{
Version{"2.1.6.69"}
units{
duration{
day{
other{"ཉིན་ཞག་ {0}"}
}
hour{
other{"ཆུ་ཚོད་ {0}"}
}
minute{
other{"སྐར་མ་ {0}"}
}
month{
other{"ཟླཝ་ {0}"}
}
second{
other{"སྐར་ཆ་ {0}"}
}
week{
other{"བངུན་ཕྲག་ {0}"}
}
year{
other{"ལོ་འཁོར་ {0}"}
}
}
}
}

11
intl/icu/source/data/unit/ebu.txt
Просмотреть файл

@ -1,11 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ebu.xml
// *
// ***************************************************************************
ebu{
Version{"2.1.6.69"}
}

91
intl/icu/source/data/unit/ee.txt
Просмотреть файл

@ -1,91 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ee.xml
// *
// ***************************************************************************
ee{
Version{"2.1.12.94"}
units{
duration{
day{
one{"ŋkeke {0} wo"}
other{"ŋkeke {0} wo"}
}
hour{
one{"gaƒoƒo {0} wo"}
other{"gaƒoƒo {0} wo"}
}
minute{
one{"aɖabaƒoƒo {0} wo"}
other{"aɖabaƒoƒo {0} wo"}
}
month{
one{"ɣleti {0} wo"}
other{"ɣleti {0} wo"}
}
second{
one{"sekend {0} wo"}
other{"sekend {0} wo"}
}
week{
one{"kɔsiɖa {0} wo"}
other{"kɔsiɖa {0} wo"}
}
year{
one{"ƒe {0} wo"}
other{"ƒe {0} wo"}
}
}
}
unitsNarrow{
duration{
hour{
one{"g {0}"}
other{"g {0}"}
}
minute{
one{"a {0}"}
other{"a {0}"}
}
second{
one{"s {0}"}
other{"s {0}"}
}
}
}
unitsShort{
duration{
day{
one{"ŋkeke {0}"}
other{"ŋkeke {0}"}
}
hour{
one{"gaƒoƒo {0}"}
other{"gaƒoƒo {0}"}
}
minute{
one{"aɖabaƒoƒo {0}"}
other{"aɖabaƒoƒo {0}"}
}
month{
one{"ɣleti {0}"}
other{"ɣleti {0}"}
}
second{
one{"sekend {0}"}
other{"sekend {0}"}
}
week{
one{"kɔsiɖa {0}"}
other{"kɔsiɖa {0}"}
}
year{
one{"ƒe {0}"}
other{"ƒe {0}"}
}
}
}
}

1502
intl/icu/source/data/unit/el.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

1942
intl/icu/source/data/unit/en.txt
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

216
intl/icu/source/data/unit/en_001.txt
Просмотреть файл

@ -1,216 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_001.xml
// *
// ***************************************************************************
en_001{
Version{"2.1.12.90"}
units{
acceleration{
meter-per-second-squared{
dnam{"metres per second squared"}
one{"{0} metre per second squared"}
other{"{0} metres per second squared"}
}
}
area{
square-centimeter{
dnam{"square centimetres"}
one{"{0} square centimetre"}
other{"{0} square centimetres"}
}
square-kilometer{
dnam{"square kilometres"}
one{"{0} square kilometre"}
other{"{0} square kilometres"}
}
square-meter{
dnam{"square metres"}
one{"{0} square metre"}
other{"{0} square metres"}
}
}
consumption{
liter-per-kilometer{
dnam{"litres per kilometre"}
one{"{0} litre per kilometre"}
other{"{0} litres per kilometre"}
}
}
length{
centimeter{
dnam{"centimetres"}
one{"{0} centimetre"}
other{"{0} centimetres"}
}
decimeter{
dnam{"decimetre"}
one{"{0} decimetre"}
other{"{0} decimetres"}
}
kilometer{
dnam{"kilometres"}
one{"{0} kilometre"}
other{"{0} kilometres"}
}
meter{
dnam{"metres"}
one{"{0} metre"}
other{"{0} metres"}
}
micrometer{
dnam{"micrometre"}
one{"{0} micrometre"}
other{"{0} micrometres"}
}
millimeter{
dnam{"millimetres"}
one{"{0} millimetre"}
other{"{0} millimetres"}
}
nanometer{
dnam{"nanometres"}
one{"{0} nanometre"}
other{"{0} nanometres"}
}
picometer{
dnam{"picometres"}
one{"{0} picometre"}
other{"{0} picometres"}
}
}
pressure{
millimeter-of-mercury{
dnam{"millimetres of mercury"}
one{"{0} millimetre of mercury"}
other{"{0} millimetres of mercury"}
}
}
speed{
kilometer-per-hour{
dnam{"kilometres per hour"}
one{"{0} kilometre per hour"}
other{"{0} kilometres per hour"}
}
meter-per-second{
dnam{"metres per second"}
one{"{0} metre per second"}
other{"{0} metres per second"}
}
}
volume{
centiliter{
dnam{"centilitres"}
one{"{0} centilitre"}
other{"{0} centilitres"}
}
cubic-centimeter{
dnam{"cubic centimetres"}
one{"{0} cubic centimetre"}
other{"{0} cubic centimetres"}
}
cubic-kilometer{
dnam{"cubic kilometres"}
one{"{0} cubic kilometre"}
other{"{0} cubic kilometres"}
}
cubic-meter{
dnam{"cubic metres"}
one{"{0} cubic metre"}
other{"{0} cubic metres"}
}
deciliter{
dnam{"decilitres"}
one{"{0} decilitre"}
other{"{0} decilitres"}
}
hectoliter{
dnam{"hectolitres"}
one{"{0} hectolitre"}
other{"{0} hectolitres"}
}
liter{
dnam{"litres"}
one{"{0} litre"}
other{"{0} litres"}
}
megaliter{
dnam{"megalitres"}
one{"{0} megalitre"}
other{"{0} megalitres"}
}
milliliter{
dnam{"millilitres"}
one{"{0} millilitre"}
other{"{0} millilitres"}
}
}
}
unitsNarrow{
mass{
pound{
one{"{0}lb"}
other{"{0}lb"}
}
}
temperature{
celsius{
one{"{0}°"}
other{"{0}°"}
}
fahrenheit{
one{"{0}°F"}
other{"{0}°F"}
}
}
volume{
liter{
dnam{"litre"}
}
}
}
unitsShort{
acceleration{
meter-per-second-squared{
dnam{"metres/sec²"}
}
}
consumption{
liter-per-kilometer{
dnam{"litres/km"}
}
}
duration{
hour{
one{"{0} hr"}
other{"{0} hrs"}
}
minute{
one{"{0} min"}
other{"{0} mins"}
}
second{
one{"{0} sec"}
other{"{0} secs"}
}
}
length{
meter{
dnam{"metres"}
}
}
speed{
meter-per-second{
dnam{"metres/sec"}
}
}
volume{
liter{
dnam{"litres"}
}
}
}
}

12
intl/icu/source/data/unit/en_150.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_150.xml
// *
// ***************************************************************************
en_150{
%%Parent{"en_001"}
Version{"2.1.11.50"}
}

12
intl/icu/source/data/unit/en_AG.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_AG.xml
// *
// ***************************************************************************
en_AG{
%%Parent{"en_001"}
Version{"2.1.7.12"}
}

12
intl/icu/source/data/unit/en_AI.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_AI.xml
// *
// ***************************************************************************
en_AI{
%%Parent{"en_001"}
Version{"2.1.7.12"}
}

36
intl/icu/source/data/unit/en_AU.txt
Просмотреть файл

@ -1,36 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_AU.xml
// *
// ***************************************************************************
en_AU{
%%Parent{"en_001"}
Version{"2.1.11.59"}
units{
mass{
metric-ton{
dnam{"tonnes"}
one{"tonne"}
other{"{0} tonnes"}
}
}
}
unitsNarrow{
duration{
millisecond{
one{"{0} ms"}
other{"{0} ms"}
}
}
}
unitsShort{
length{
micrometer{
dnam{"µmetres"}
}
}
}
}

12
intl/icu/source/data/unit/en_BB.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BB.xml
// *
// ***************************************************************************
en_BB{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_BE.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BE.xml
// *
// ***************************************************************************
en_BE{
%%Parent{"en_001"}
Version{"2.1.11.50"}
}

12
intl/icu/source/data/unit/en_BM.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BM.xml
// *
// ***************************************************************************
en_BM{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

24
intl/icu/source/data/unit/en_BS.txt
Просмотреть файл

@ -1,24 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BS.xml
// *
// ***************************************************************************
en_BS{
%%Parent{"en_001"}
Version{"2.1.6.69"}
unitsNarrow{
temperature{
celsius{
one{"{0}°C"}
other{"{0}°C"}
}
fahrenheit{
one{"{0}°"}
other{"{0}°"}
}
}
}
}

12
intl/icu/source/data/unit/en_BW.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BW.xml
// *
// ***************************************************************************
en_BW{
%%Parent{"en_001"}
Version{"2.1.11.50"}
}

24
intl/icu/source/data/unit/en_BZ.txt
Просмотреть файл

@ -1,24 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BZ.xml
// *
// ***************************************************************************
en_BZ{
%%Parent{"en_001"}
Version{"2.1.11.50"}
unitsNarrow{
temperature{
celsius{
one{"{0}°C"}
other{"{0}°C"}
}
fahrenheit{
one{"{0}°"}
other{"{0}°"}
}
}
}
}

12
intl/icu/source/data/unit/en_CA.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_CA.xml
// *
// ***************************************************************************
en_CA{
%%Parent{"en_001"}
Version{"2.1.14.16"}
}

12
intl/icu/source/data/unit/en_CC.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_CC.xml
// *
// ***************************************************************************
en_CC{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_CK.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_CK.xml
// *
// ***************************************************************************
en_CK{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_CM.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_CM.xml
// *
// ***************************************************************************
en_CM{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_CX.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_CX.xml
// *
// ***************************************************************************
en_CX{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_DG.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_DG.xml
// *
// ***************************************************************************
en_DG{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_DM.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_DM.xml
// *
// ***************************************************************************
en_DM{
%%Parent{"en_001"}
Version{"2.1.7.12"}
}

12
intl/icu/source/data/unit/en_ER.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_ER.xml
// *
// ***************************************************************************
en_ER{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_FJ.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_FJ.xml
// *
// ***************************************************************************
en_FJ{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_FK.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_FK.xml
// *
// ***************************************************************************
en_FK{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_FM.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_FM.xml
// *
// ***************************************************************************
en_FM{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

20
intl/icu/source/data/unit/en_GB.txt
Просмотреть файл

@ -1,20 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GB.xml
// *
// ***************************************************************************
en_GB{
%%Parent{"en_001"}
Version{"2.1.11.59"}
unitsShort{
volume{
liter{
one{"{0} l"}
other{"{0} l"}
}
}
}
}

12
intl/icu/source/data/unit/en_GD.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GD.xml
// *
// ***************************************************************************
en_GD{
%%Parent{"en_001"}
Version{"2.1.7.12"}
}

12
intl/icu/source/data/unit/en_GG.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GG.xml
// *
// ***************************************************************************
en_GG{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_GH.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GH.xml
// *
// ***************************************************************************
en_GH{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_GI.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GI.xml
// *
// ***************************************************************************
en_GI{
%%Parent{"en_001"}
Version{"2.1.8.19"}
}

12
intl/icu/source/data/unit/en_GM.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GM.xml
// *
// ***************************************************************************
en_GM{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_GY.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GY.xml
// *
// ***************************************************************************
en_GY{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_HK.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_HK.xml
// *
// ***************************************************************************
en_HK{
%%Parent{"en_001"}
Version{"2.1.11.50"}
}

12
intl/icu/source/data/unit/en_IE.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_IE.xml
// *
// ***************************************************************************
en_IE{
%%Parent{"en_001"}
Version{"2.1.11.50"}
}

12
intl/icu/source/data/unit/en_IM.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_IM.xml
// *
// ***************************************************************************
en_IM{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_IN.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_IN.xml
// *
// ***************************************************************************
en_IN{
%%Parent{"en_001"}
Version{"2.1.13.23"}
}

12
intl/icu/source/data/unit/en_IO.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_IO.xml
// *
// ***************************************************************************
en_IO{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

12
intl/icu/source/data/unit/en_JE.txt
Просмотреть файл

@ -1,12 +0,0 @@
// ***************************************************************************
// *
// * Copyright (C) 2015 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_JE.xml
// *
// ***************************************************************************
en_JE{
%%Parent{"en_001"}
Version{"2.1.6.69"}
}

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше