ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity
13aca74be9
opt/qt5/qt-everywhere-opensource-src-5.15.13-kf5-1.patch

60654 lines
3.0 MiB
Raw Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

Submodule qtbase 4e158f6b..8d30c21c:
diff --git a/qtbase/mkspecs/common/android/qplatformdefs.h b/qtbase/mkspecs/common/android/qplatformdefs.h
index f75bc4093b..2bd59410d4 100644
--- a/qtbase/mkspecs/common/android/qplatformdefs.h
+++ b/qtbase/mkspecs/common/android/qplatformdefs.h
@@ -144,11 +144,7 @@
#define QT_SIGNAL_ARGS int
#define QT_SIGNAL_IGNORE SIG_IGN
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
#define QT_SOCKLEN_T socklen_t
-#else
-#define QT_SOCKLEN_T int
-#endif
#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
#define QT_SNPRINTF ::snprintf
diff --git a/qtbase/mkspecs/linux-clang/qplatformdefs.h b/qtbase/mkspecs/linux-clang/qplatformdefs.h
index a818d973f0..c1ab72fbc6 100644
--- a/qtbase/mkspecs/linux-clang/qplatformdefs.h
+++ b/qtbase/mkspecs/linux-clang/qplatformdefs.h
@@ -79,14 +79,6 @@
#define QT_USE_XOPEN_LFS_EXTENSIONS
#include "../common/posix/qplatformdefs.h"
-#undef QT_SOCKLEN_T
-
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
-#define QT_SOCKLEN_T socklen_t
-#else
-#define QT_SOCKLEN_T int
-#endif
-
#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
#define QT_SNPRINTF ::snprintf
#define QT_VSNPRINTF ::vsnprintf
diff --git a/qtbase/mkspecs/linux-g++/qplatformdefs.h b/qtbase/mkspecs/linux-g++/qplatformdefs.h
index 13523f0702..4d2750d9ec 100644
--- a/qtbase/mkspecs/linux-g++/qplatformdefs.h
+++ b/qtbase/mkspecs/linux-g++/qplatformdefs.h
@@ -79,14 +79,6 @@
#define QT_USE_XOPEN_LFS_EXTENSIONS
#include "../common/posix/qplatformdefs.h"
-#undef QT_SOCKLEN_T
-
-#if defined(__GLIBC__) && (__GLIBC__ < 2)
-#define QT_SOCKLEN_T int
-#else
-#define QT_SOCKLEN_T socklen_t
-#endif
-
#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
#define QT_SNPRINTF ::snprintf
#define QT_VSNPRINTF ::vsnprintf
diff --git a/qtbase/mkspecs/linux-llvm/qplatformdefs.h b/qtbase/mkspecs/linux-llvm/qplatformdefs.h
index dc750ab1ef..d3cc39b47f 100644
--- a/qtbase/mkspecs/linux-llvm/qplatformdefs.h
+++ b/qtbase/mkspecs/linux-llvm/qplatformdefs.h
@@ -80,14 +80,6 @@
#define QT_USE_XOPEN_LFS_EXTENSIONS
#include "../common/posix/qplatformdefs.h"
-#undef QT_SOCKLEN_T
-
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
-#define QT_SOCKLEN_T socklen_t
-#else
-#define QT_SOCKLEN_T int
-#endif
-
#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
#define QT_SNPRINTF ::snprintf
#define QT_VSNPRINTF ::vsnprintf
diff --git a/qtbase/mkspecs/linux-lsb-g++/qplatformdefs.h b/qtbase/mkspecs/linux-lsb-g++/qplatformdefs.h
index 4c4e53da2a..83baffb3e3 100644
--- a/qtbase/mkspecs/linux-lsb-g++/qplatformdefs.h
+++ b/qtbase/mkspecs/linux-lsb-g++/qplatformdefs.h
@@ -85,16 +85,9 @@
#include "../common/posix/qplatformdefs.h"
#undef QT_OPEN_LARGEFILE
-#undef QT_SOCKLEN_T
#define QT_OPEN_LARGEFILE 0
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
-#define QT_SOCKLEN_T socklen_t
-#else
-#define QT_SOCKLEN_T int
-#endif
-
#ifndef SIOCGIFBRDADDR
# define SIOCGIFBRDADDR 0x8919
#endif
diff --git a/qtbase/mkspecs/lynxos-g++/qplatformdefs.h b/qtbase/mkspecs/lynxos-g++/qplatformdefs.h
index 4339ea2b23..6007af0055 100644
--- a/qtbase/mkspecs/lynxos-g++/qplatformdefs.h
+++ b/qtbase/mkspecs/lynxos-g++/qplatformdefs.h
@@ -72,14 +72,6 @@
#include "../common/posix/qplatformdefs.h"
-#undef QT_SOCKLEN_T
-
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
-#define QT_SOCKLEN_T socklen_t
-#else
-#define QT_SOCKLEN_T int
-#endif
-
#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
#define QT_SNPRINTF ::snprintf
#define QT_VSNPRINTF ::vsnprintf
diff --git a/qtbase/src/3rdparty/angle/src/libANGLE/HandleAllocator.cpp b/qtbase/src/3rdparty/angle/src/libANGLE/HandleAllocator.cpp
index c3c184258f..32af3f8f29 100644
--- a/qtbase/src/3rdparty/angle/src/libANGLE/HandleAllocator.cpp
+++ b/qtbase/src/3rdparty/angle/src/libANGLE/HandleAllocator.cpp
@@ -10,6 +10,7 @@
#include "libANGLE/HandleAllocator.h"
#include <algorithm>
+#include <limits>
#include "common/debug.h"
diff --git a/qtbase/src/corelib/global/qglobal.cpp b/qtbase/src/corelib/global/qglobal.cpp
index 5ad82c259d..ecf7b1efaa 100644
--- a/qtbase/src/corelib/global/qglobal.cpp
+++ b/qtbase/src/corelib/global/qglobal.cpp
@@ -97,6 +97,10 @@
# include <private/qcore_mac_p.h>
#endif
+#if defined(Q_OS_MACOS)
+#include <QtCore/qversionnumber.h>
+#endif
+
#ifdef Q_OS_UNIX
#include <sys/utsname.h>
#include <private/qcore_unix_p.h>
@@ -2133,6 +2137,15 @@ QT_WARNING_POP
static const char *osVer_helper(QOperatingSystemVersion version = QOperatingSystemVersion::current())
{
#ifdef Q_OS_MACOS
+ if (version.majorVersion() == 13)
+ return "Ventura";
+ if (version.majorVersion() == 12)
+ return "Monterey";
+ // Compare against predefined constant to handle 10.16/11.0
+ if (QVersionNumber(QOperatingSystemVersion::MacOSBigSur.majorVersion(),
+ QOperatingSystemVersion::MacOSBigSur.minorVersion(), QOperatingSystemVersion::MacOSBigSur.microVersion()).isPrefixOf(
+ QVersionNumber(version.majorVersion(), version.minorVersion(), version.microVersion())))
+ return "Big Sur";
if (version.majorVersion() == 10) {
switch (version.minorVersion()) {
case 9:
@@ -2147,13 +2160,15 @@ static const char *osVer_helper(QOperatingSystemVersion version = QOperatingSyst
return "High Sierra";
case 14:
return "Mojave";
+ case 15:
+ return "Catalina";
}
}
// unknown, future version
#else
Q_UNUSED(version);
#endif
- return 0;
+ return nullptr;
}
#endif
@@ -2278,7 +2293,7 @@ static const char *osVer_helper(QOperatingSystemVersion version = QOperatingSyst
}
#undef Q_WINVER
// unknown, future version
- return 0;
+ return nullptr;
}
#endif
diff --git a/qtbase/src/corelib/global/qglobal.h b/qtbase/src/corelib/global/qglobal.h
index 450c1e586a..ff7167d9cc 100644
--- a/qtbase/src/corelib/global/qglobal.h
+++ b/qtbase/src/corelib/global/qglobal.h
@@ -307,6 +307,8 @@ typedef double qreal;
# define QT_DEPRECATED_CONSTRUCTOR
# undef Q_DECL_ENUMERATOR_DEPRECATED
# define Q_DECL_ENUMERATOR_DEPRECATED
+# undef Q_DECL_ENUMERATOR_DEPRECATED_X
+# define Q_DECL_ENUMERATOR_DEPRECATED_X(ignored)
#endif
#ifndef QT_DEPRECATED_WARNINGS_SINCE
diff --git a/qtbase/src/corelib/global/qlogging.cpp b/qtbase/src/corelib/global/qlogging.cpp
index 292116cc47..0f253d4a27 100644
--- a/qtbase/src/corelib/global/qlogging.cpp
+++ b/qtbase/src/corelib/global/qlogging.cpp
@@ -189,6 +189,17 @@ static int checked_var_value(const char *varname)
return ok ? value : 1;
}
+static bool is_fatal_count_down(QAtomicInt &n)
+{
+ // it's fatal if the current value is exactly 1,
+ // otherwise decrement if it's non-zero
+
+ int v = n.loadRelaxed();
+ while (v != 0 && !n.testAndSetRelaxed(v, v - 1, v))
+ ;
+ return v == 1; // we exited the loop, so either v == 0 or CAS succeeded to set n from v to v-1
+}
+
static bool isFatal(QtMsgType msgType)
{
if (msgType == QtFatalMsg)
@@ -196,18 +207,12 @@ static bool isFatal(QtMsgType msgType)
if (msgType == QtCriticalMsg) {
static QAtomicInt fatalCriticals = checked_var_value("QT_FATAL_CRITICALS");
-
- // it's fatal if the current value is exactly 1,
- // otherwise decrement if it's non-zero
- return fatalCriticals.loadRelaxed() && fatalCriticals.fetchAndAddRelaxed(-1) == 1;
+ return is_fatal_count_down(fatalCriticals);
}
if (msgType == QtWarningMsg || msgType == QtCriticalMsg) {
static QAtomicInt fatalWarnings = checked_var_value("QT_FATAL_WARNINGS");
-
- // it's fatal if the current value is exactly 1,
- // otherwise decrement if it's non-zero
- return fatalWarnings.loadRelaxed() && fatalWarnings.fetchAndAddRelaxed(-1) == 1;
+ return is_fatal_count_down(fatalWarnings);
}
return false;
diff --git a/qtbase/src/corelib/global/qnamespace.h b/qtbase/src/corelib/global/qnamespace.h
index deab11f729..486b63fa3f 100644
--- a/qtbase/src/corelib/global/qnamespace.h
+++ b/qtbase/src/corelib/global/qnamespace.h
@@ -1867,7 +1867,7 @@ public:
QT_Q_ENUM(TimerType)
QT_Q_ENUM(ScrollPhase)
QT_Q_ENUM(MouseEventSource)
- QT_Q_FLAG(MouseEventFlag)
+ QT_Q_FLAG(MouseEventFlags)
QT_Q_ENUM(ChecksumType)
QT_Q_ENUM(HighDpiScaleFactorRoundingPolicy)
QT_Q_ENUM(TabFocusBehavior)
diff --git a/qtbase/src/corelib/io/qfilesystemengine_win.cpp b/qtbase/src/corelib/io/qfilesystemengine_win.cpp
index 002f720926..e6f118a5c4 100644
--- a/qtbase/src/corelib/io/qfilesystemengine_win.cpp
+++ b/qtbase/src/corelib/io/qfilesystemengine_win.cpp
@@ -664,14 +664,14 @@ QFileSystemEntry QFileSystemEngine::absoluteName(const QFileSystemEntry &entry)
return QFileSystemEntry(ret, QFileSystemEntry::FromInternalPath());
}
-#if defined(Q_CC_MINGW) && WINVER < 0x0602 // Windows 8 onwards
+#if defined(Q_CC_MINGW) && WINVER < 0x0602 && _WIN32_WINNT < _WIN32_WINNT_WIN8 // Windows 8 onwards
typedef struct _FILE_ID_INFO {
ULONGLONG VolumeSerialNumber;
FILE_ID_128 FileId;
} FILE_ID_INFO, *PFILE_ID_INFO;
-#endif // if defined (Q_CC_MINGW) && WINVER < 0x0602
+#endif // if defined(Q_CC_MINGW) && WINVER < 0x0602 && _WIN32_WINNT < _WIN32_WINNT_WIN8
// File ID for Windows up to version 7 and FAT32 drives
static inline QByteArray fileId(HANDLE handle)
diff --git a/qtbase/src/corelib/io/qfilesystemwatcher_inotify.cpp b/qtbase/src/corelib/io/qfilesystemwatcher_inotify.cpp
index 94d9d06bcb..27e0b13b0b 100644
--- a/qtbase/src/corelib/io/qfilesystemwatcher_inotify.cpp
+++ b/qtbase/src/corelib/io/qfilesystemwatcher_inotify.cpp
@@ -366,7 +366,9 @@ void QInotifyFileSystemWatcherEngine::readFromInotify()
// qDebug("QInotifyFileSystemWatcherEngine::readFromInotify");
int buffSize = 0;
- ioctl(inotifyFd, FIONREAD, (char *) &buffSize);
+ if (ioctl(inotifyFd, FIONREAD, (char *) &buffSize) == -1 || buffSize == 0)
+ return;
+
QVarLengthArray<char, 4096> buffer(buffSize);
buffSize = read(inotifyFd, buffer.data(), buffSize);
char *at = buffer.data();
diff --git a/qtbase/src/corelib/io/qfsfileengine.cpp b/qtbase/src/corelib/io/qfsfileengine.cpp
index 3042eac2f0..a862ce9166 100644
--- a/qtbase/src/corelib/io/qfsfileengine.cpp
+++ b/qtbase/src/corelib/io/qfsfileengine.cpp
@@ -361,7 +361,7 @@ bool QFSFileEnginePrivate::openFd(QIODevice::OpenMode openMode, int fd)
// Seek to the end when in Append mode.
if (openMode & QFile::Append) {
- int ret;
+ QT_OFF_T ret;
do {
ret = QT_LSEEK(fd, 0, SEEK_END);
} while (ret == -1 && errno == EINTR);
diff --git a/qtbase/src/corelib/io/qfsfileengine_unix.cpp b/qtbase/src/corelib/io/qfsfileengine_unix.cpp
index 4610e9306c..65e921c15a 100644
--- a/qtbase/src/corelib/io/qfsfileengine_unix.cpp
+++ b/qtbase/src/corelib/io/qfsfileengine_unix.cpp
@@ -141,7 +141,7 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)
// Seek to the end when in Append mode.
if (flags & QFile::Append) {
- int ret;
+ QT_OFF_T ret;
do {
ret = QT_LSEEK(fd, 0, SEEK_END);
} while (ret == -1 && errno == EINTR);
diff --git a/qtbase/src/corelib/itemmodels/qabstractitemmodel.cpp b/qtbase/src/corelib/itemmodels/qabstractitemmodel.cpp
index 997a634e76..1c1ca7394d 100644
--- a/qtbase/src/corelib/itemmodels/qabstractitemmodel.cpp
+++ b/qtbase/src/corelib/itemmodels/qabstractitemmodel.cpp
@@ -52,6 +52,8 @@
#include <qdatetime.h>
#include <qloggingcategory.h>
+#include <functional>
+
#include <limits.h>
QT_BEGIN_NAMESPACE
@@ -213,7 +215,7 @@ bool QPersistentModelIndex::operator<(const QPersistentModelIndex &other) const
if (d && other.d)
return d->index < other.d->index;
- return d < other.d;
+ return std::less<>{}(d, other.d);
}
/*!
diff --git a/qtbase/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/qtbase/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index 3d7fe43cd3..f2871a2da7 100644
--- a/qtbase/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/qtbase/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -939,8 +939,9 @@ void QSortFilterProxyModelPrivate::insert_source_items(
q->beginInsertColumns(proxy_parent, proxy_start, proxy_end);
}
- for (int i = 0; i < source_items.size(); ++i)
- proxy_to_source.insert(proxy_start + i, source_items.at(i));
+ // TODO: use the range QList::insert() overload once it is implemented (QTBUG-58633).
+ proxy_to_source.insert(proxy_start, source_items.size(), 0);
+ std::copy(source_items.cbegin(), source_items.cend(), proxy_to_source.begin() + proxy_start);
build_source_to_proxy_mapping(proxy_to_source, source_to_proxy);
@@ -3131,8 +3132,9 @@ bool QSortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex &
if (d->filter_data.isEmpty())
return true;
+
+ int column_count = d->model->columnCount(source_parent);
if (d->filter_column == -1) {
- int column_count = d->model->columnCount(source_parent);
for (int column = 0; column < column_count; ++column) {
QModelIndex source_index = d->model->index(source_row, column, source_parent);
QString key = d->model->data(source_index, d->filter_role).toString();
@@ -3141,9 +3143,10 @@ bool QSortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex &
}
return false;
}
- QModelIndex source_index = d->model->index(source_row, d->filter_column, source_parent);
- if (!source_index.isValid()) // the column may not exist
+
+ if (d->filter_column >= column_count) // the column may not exist
return true;
+ QModelIndex source_index = d->model->index(source_row, d->filter_column, source_parent);
QString key = d->model->data(source_index, d->filter_role).toString();
return d->filter_data.hasMatch(key);
}
diff --git a/qtbase/src/corelib/kernel/qobject_p.h b/qtbase/src/corelib/kernel/qobject_p.h
index 13ffb88999..325a974f30 100644
--- a/qtbase/src/corelib/kernel/qobject_p.h
+++ b/qtbase/src/corelib/kernel/qobject_p.h
@@ -220,7 +220,7 @@ public:
s = s->previous;
}
}
- Sender *previous;
+ Sender *previous = nullptr;
QObject *receiver;
QObject *sender;
int signal;
diff --git a/qtbase/src/corelib/kernel/qtranslator.cpp b/qtbase/src/corelib/kernel/qtranslator.cpp
index bdcd016630..e4375e7e40 100644
--- a/qtbase/src/corelib/kernel/qtranslator.cpp
+++ b/qtbase/src/corelib/kernel/qtranslator.cpp
@@ -907,7 +907,7 @@ static QString getMessage(const uchar *m, const uchar *end, const char *context,
goto end;
case Tag_Translation: {
int len = read32(m);
- if (len % 1)
+ if (len & 1)
return QString();
m += 4;
if (!numerus--) {
diff --git a/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml b/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml
index d384ffb2d5..e73929c9bb 100644
--- a/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml
+++ b/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml
@@ -1,183 +1,177 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE mime-info [
- <!ELEMENT mime-info (mime-type)+>
- <!ATTLIST mime-info xmlns CDATA #FIXED "http://www.freedesktop.org/standards/shared-mime-info">
-
- <!ELEMENT mime-type (comment+, (acronym,expanded-acronym)? , (icon? | generic-icon? | glob | magic | treemagic | root-XML | alias | sub-class-of)*)>
- <!ATTLIST mime-type type CDATA #REQUIRED>
-
- <!-- a comment describing a document with the respective MIME type. Example: "WMV video" -->
- <!ELEMENT comment (#PCDATA)>
- <!ATTLIST comment xml:lang CDATA #IMPLIED>
-
- <!-- a comment describing the respective unexpanded MIME type acronym. Example: "WMV" -->
- <!ELEMENT acronym (#PCDATA)>
- <!ATTLIST acronym xml:lang CDATA #IMPLIED>
-
- <!-- a comment describing the respective expanded MIME type acronym. Example: "Windows Media Video" -->
- <!ELEMENT expanded-acronym (#PCDATA)>
- <!ATTLIST expanded-acronym xml:lang CDATA #IMPLIED>
-
- <!ELEMENT icon EMPTY>
- <!ATTLIST icon name CDATA #REQUIRED>
-
- <!-- a generic icon name as per the Icon Naming Specification, only required if computing
- it from the mime-type would not work, See "generic-icon" in the Shared Mime Specification -->
- <!ELEMENT generic-icon EMPTY>
- <!ATTLIST generic-icon name (application-x-executable|audio-x-generic|folder|font-x-generic|image-x-generic|package-x-generic|text-html|text-x-generic|text-x-generic-template|text-x-script|video-x-generic|x-office-address-book|x-office-calendar|x-office-document|x-office-presentation|x-office-spreadsheet) #REQUIRED>
-
- <!ELEMENT glob EMPTY>
- <!ATTLIST glob pattern CDATA #REQUIRED>
- <!ATTLIST glob weight CDATA "50">
- <!ATTLIST glob case-sensitive CDATA #IMPLIED>
-
- <!ELEMENT magic (match)+>
- <!ATTLIST magic priority CDATA "50">
-
- <!ELEMENT match (match)*>
- <!ATTLIST match offset CDATA #REQUIRED>
- <!ATTLIST match type (string|big16|big32|little16|little32|host16|host32|byte) #REQUIRED>
- <!ATTLIST match value CDATA #REQUIRED>
- <!ATTLIST match mask CDATA #IMPLIED>
-
- <!ELEMENT treemagic (treematch)+>
- <!ATTLIST treemagic priority CDATA "50">
+<!ELEMENT mime-info (mime-type)+>
+<!ATTLIST mime-info xmlns CDATA #FIXED "http://www.freedesktop.org/standards/shared-mime-info">
+<!ELEMENT mime-type (comment+ , (acronym , expanded-acronym)? , (icon | generic-icon | glob | magic | treemagic | root-XML | alias | sub-class-of)*)>
+<!ATTLIST mime-type type CDATA #REQUIRED>
+<!-- a comment describing a document with the respective MIME type. Example: "WMV video" --><!ELEMENT comment (#PCDATA)>
+<!ATTLIST comment xml:lang CDATA #IMPLIED>
+<!-- a comment describing the respective unexpanded MIME type acronym. Example: "WMV" --><!ELEMENT acronym (#PCDATA)>
+<!-- a comment describing the respective expanded MIME type acronym. Example: "Windows Media Video" --><!ELEMENT expanded-acronym (#PCDATA)>
+<!ELEMENT icon EMPTY>
+<!ATTLIST icon name CDATA #REQUIRED>
+<!-- a generic icon name as per the Icon Naming Specification, only required if computing
+ it from the mime-type would not work, See "generic-icon" in the Shared Mime Specification --><!ELEMENT generic-icon EMPTY>
+<!ATTLIST generic-icon name (application-x-executable | audio-x-generic | folder | font-x-generic | image-x-generic | package-x-generic | text-html | text-x-generic | text-x-generic-template | text-x-script | video-x-generic | x-office-address-book | x-office-calendar | x-office-document | x-office-presentation | x-office-spreadsheet) #REQUIRED>
+<!ELEMENT glob EMPTY>
+<!ATTLIST glob pattern CDATA #REQUIRED>
+<!ATTLIST glob weight CDATA "50">
+<!ATTLIST glob case-sensitive CDATA #IMPLIED>
+<!ELEMENT magic (match)+>
+<!ATTLIST magic priority CDATA "50">
+<!ELEMENT match (match)*>
+<!ATTLIST match offset CDATA #REQUIRED>
+<!ATTLIST match type (string | big16 | big32 | little16 | little32 | host16 | host32 | byte) #REQUIRED>
+<!ATTLIST match value CDATA #REQUIRED>
+<!ATTLIST match mask CDATA #IMPLIED>
+<!ELEMENT treemagic (treematch)+>
+<!ATTLIST treemagic priority CDATA "50">
+<!ELEMENT treematch (treematch)*>
+<!ATTLIST treematch path CDATA #REQUIRED>
+<!ATTLIST treematch type (file | directory | link) #IMPLIED>
+<!ATTLIST treematch match-case (true | false) #IMPLIED>
+<!ATTLIST treematch executable (true | false) #IMPLIED>
+<!ATTLIST treematch non-empty (true | false) #IMPLIED>
+<!ATTLIST treematch mimetype CDATA #IMPLIED>
+<!ELEMENT root-XML EMPTY>
+<!ATTLIST root-XML namespaceURI CDATA #REQUIRED>
+<!ATTLIST root-XML localName CDATA #REQUIRED>
+<!ELEMENT alias EMPTY>
+<!ATTLIST alias type CDATA #REQUIRED>
+<!ELEMENT sub-class-of EMPTY>
+<!ATTLIST sub-class-of type CDATA #REQUIRED>
+]>
+<!--
+The freedesktop.org shared MIME database (this file) was created by merging
+several existing MIME databases (all released under the GPL).
- <!ELEMENT treematch (treematch)*>
- <!ATTLIST treematch path CDATA #REQUIRED>
- <!ATTLIST treematch type (file|directory|link) #IMPLIED>
- <!ATTLIST treematch match-case (true|false) #IMPLIED>
- <!ATTLIST treematch executable (true|false) #IMPLIED>
- <!ATTLIST treematch non-empty (true|false) #IMPLIED>
- <!ATTLIST treematch mimetype CDATA #IMPLIED>
+It comes with ABSOLUTELY NO WARRANTY, to the extent permitted by law. You may
+redistribute copies of update-mime-database under the terms of the GNU General
+Public License. For more information about these matters, see the file named
+COPYING.
- <!ELEMENT root-XML EMPTY>
- <!ATTLIST root-XML namespaceURI CDATA #REQUIRED>
- <!ATTLIST root-XML localName CDATA #REQUIRED>
+The latest version is available from:
- <!ELEMENT alias EMPTY>
- <!ATTLIST alias type CDATA #REQUIRED>
+ http://www.freedesktop.org/wiki/Software/shared-mime-info/
- <!ELEMENT sub-class-of EMPTY>
- <!ATTLIST sub-class-of type CDATA #REQUIRED>
-]>
+To extend this database, users and applications should create additional
+XML files in the 'packages' directory and run the update-mime-database
+command to generate the output files.
+-->
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/x-atari-2600-rom">
- <comment>Atari 2600</comment>
- <comment xml:lang="ast">Atari 2600</comment>
- <comment xml:lang="ca">Atari 2600</comment>
- <comment xml:lang="cs">Atari 2600</comment>
- <comment xml:lang="da">Atari 2600</comment>
- <comment xml:lang="de">Atari 2600</comment>
- <comment xml:lang="en_GB">Atari 2600</comment>
- <comment xml:lang="es">Atari 2600</comment>
- <comment xml:lang="eu">Atari 2600</comment>
- <comment xml:lang="fi">Atari 2600</comment>
- <comment xml:lang="fr">Atari 2600</comment>
- <comment xml:lang="ga">Atari 2600</comment>
- <comment xml:lang="he">אטארי 2600</comment>
- <comment xml:lang="hr">Atari 2600</comment>
- <comment xml:lang="hu">Atari 2600</comment>
- <comment xml:lang="id">Atari 2600</comment>
- <comment xml:lang="it">Atari 2600</comment>
- <comment xml:lang="kk">Atari 2600</comment>
- <comment xml:lang="ko">Atari 2600</comment>
- <comment xml:lang="oc">Atari 2600</comment>
- <comment xml:lang="pl">Atari 2600</comment>
- <comment xml:lang="pt_BR">Atari 2600</comment>
- <comment xml:lang="ru">Atari 2600</comment>
- <comment xml:lang="sk">Atari 2600</comment>
- <comment xml:lang="sr">Атари 2600</comment>
- <comment xml:lang="sv">Atari 2600</comment>
- <comment xml:lang="tr">Atari 2600</comment>
- <comment xml:lang="uk">Atari 2600</comment>
- <comment xml:lang="zh_CN">雅达利 2600</comment>
- <comment xml:lang="zh_TW">Atari 2600</comment>
+ <comment>Atari 2600 ROM</comment>
+ <comment xml:lang="bg">ROM — Atari 2600</comment>
+ <comment xml:lang="ca">ROM d'Atari 2600</comment>
+ <comment xml:lang="da">Atari 2600-ROM</comment>
+ <comment xml:lang="de">Atari 2600 ROM</comment>
+ <comment xml:lang="en-GB">Atari 2600 ROM</comment>
+ <comment xml:lang="es">ROM de Atari 2600</comment>
+ <comment xml:lang="eu">Atari 2600 ROMa</comment>
+ <comment xml:lang="fi">Atari 2600 ROM</comment>
+ <comment xml:lang="fr">ROM Atari 2600</comment>
+ <comment xml:lang="fur">ROM Atari 2600</comment>
+ <comment xml:lang="hr">Atari 2600 ROM</comment>
+ <comment xml:lang="hu">Atari 2600 ROM</comment>
+ <comment xml:lang="id">Atari 2600 ROM</comment>
+ <comment xml:lang="it">ROM Atari 2600</comment>
+ <comment xml:lang="kk">Atari 2600 ROM</comment>
+ <comment xml:lang="ko">아타리 2600 롬</comment>
+ <comment xml:lang="pl">Plik ROM konsoli Atari 2600</comment>
+ <comment xml:lang="pt">ROM Atari 2600</comment>
+ <comment xml:lang="pt-BR">ROM do Atari 2600</comment>
+ <comment xml:lang="sl">Atari 2600 ROM</comment>
+ <comment xml:lang="sv">Atari 2600-rom</comment>
+ <comment xml:lang="tr">Atari 2600 ROM</comment>
+ <comment xml:lang="uk">Atari 2600 ROM</comment>
+ <comment xml:lang="zh-CN">雅达利 2600 ROM</comment>
+ <comment xml:lang="zh-TW">雅達利 2600 ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.a26"/>
</mime-type>
<mime-type type="application/x-atari-7800-rom">
- <comment>Atari 7800</comment>
- <comment xml:lang="ast">Atari 7800</comment>
- <comment xml:lang="ca">Atari 7800</comment>
- <comment xml:lang="cs">Atari 7800</comment>
- <comment xml:lang="da">Atari 7800</comment>
- <comment xml:lang="de">Atari 7800</comment>
- <comment xml:lang="en_GB">Atari 7800</comment>
- <comment xml:lang="es">Atari 7800</comment>
- <comment xml:lang="eu">Atari 7800</comment>
- <comment xml:lang="fi">Atari 7800</comment>
- <comment xml:lang="fr">Atari 7800</comment>
- <comment xml:lang="ga">Atari 7800</comment>
- <comment xml:lang="he">אטארי 7800</comment>
- <comment xml:lang="hr">Atari 7800</comment>
- <comment xml:lang="hu">Atari 7800</comment>
- <comment xml:lang="id">Atari 7800</comment>
- <comment xml:lang="it">Atari 7800</comment>
- <comment xml:lang="kk">Atari 7800</comment>
- <comment xml:lang="ko">Atari 7800</comment>
- <comment xml:lang="oc">Atari 7800</comment>
- <comment xml:lang="pl">Atari 7800</comment>
- <comment xml:lang="pt_BR">Atari 7800</comment>
- <comment xml:lang="ru">Atari 7800</comment>
- <comment xml:lang="sk">Atari 7800</comment>
- <comment xml:lang="sr">Атари 7800</comment>
- <comment xml:lang="sv">Atari 7800</comment>
- <comment xml:lang="tr">Atari 7800</comment>
- <comment xml:lang="uk">Atari 7800</comment>
- <comment xml:lang="zh_CN">雅达利 7800</comment>
- <comment xml:lang="zh_TW">Atari 7800</comment>
+ <comment>Atari 7800 ROM</comment>
+ <comment xml:lang="bg">ROM — Atari 7800</comment>
+ <comment xml:lang="ca">ROM d'Atari 7800</comment>
+ <comment xml:lang="da">Atari 7800-ROM</comment>
+ <comment xml:lang="de">Atari 7800 ROM</comment>
+ <comment xml:lang="en-GB">Atari 7800 ROM</comment>
+ <comment xml:lang="es">ROM de Atari 7800</comment>
+ <comment xml:lang="eu">Atari 7800 ROMa</comment>
+ <comment xml:lang="fi">Atari 7800 ROM</comment>
+ <comment xml:lang="fr">ROM Atari 7800</comment>
+ <comment xml:lang="fur">ROM Atari 7800</comment>
+ <comment xml:lang="hr">Atari 7800 ROM</comment>
+ <comment xml:lang="hu">Atari 7800 ROM</comment>
+ <comment xml:lang="id">Atari 7800 ROM</comment>
+ <comment xml:lang="it">ROM Atari 7800</comment>
+ <comment xml:lang="kk">Atari 7800 ROM</comment>
+ <comment xml:lang="ko">아타리 7800 롬</comment>
+ <comment xml:lang="pl">Plik ROM konsoli Atari 7800</comment>
+ <comment xml:lang="pt">ROM Atari 7800</comment>
+ <comment xml:lang="pt-BR">ROM do Atari 7800</comment>
+ <comment xml:lang="sl">Atari 7800 ROM</comment>
+ <comment xml:lang="sv">Atari 7800-rom</comment>
+ <comment xml:lang="tr">Atari 7800 ROM</comment>
+ <comment xml:lang="uk">Atari 7800 ROM</comment>
+ <comment xml:lang="zh-CN">雅达利 7800 ROM</comment>
+ <comment xml:lang="zh-TW">雅達利 7800 ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.a78"/>
<magic>
- <match value="ATARI7800" type="string" offset="1"/>
+ <match type="string" value="ATARI7800" offset="1"/>
</magic>
</mime-type>
<mime-type type="application/x-atari-lynx-rom">
- <comment>Atari Lynx</comment>
- <comment xml:lang="ast">Atari Lynx</comment>
- <comment xml:lang="ca">Atari Lynx</comment>
- <comment xml:lang="cs">Atari Lynx</comment>
- <comment xml:lang="de">Atari Lynx</comment>
- <comment xml:lang="en_GB">Atari Lynx</comment>
- <comment xml:lang="es">Atari Lynx</comment>
- <comment xml:lang="fi">Atari Lynx</comment>
- <comment xml:lang="hr">Atari Lynx</comment>
- <comment xml:lang="hu">Atari Lynx</comment>
- <comment xml:lang="id">Atari Lynx</comment>
- <comment xml:lang="it">Atari Lynx</comment>
- <comment xml:lang="kk">Atari Lynx</comment>
- <comment xml:lang="ko">Atari Lynx</comment>
- <comment xml:lang="pl">Atari Lynx</comment>
- <comment xml:lang="pt_BR">Atari Lynx</comment>
- <comment xml:lang="ru">Atari Lynx</comment>
- <comment xml:lang="sk">Atari Lynx</comment>
- <comment xml:lang="sv">Atari Lynx</comment>
- <comment xml:lang="uk">Atari Lynx</comment>
- <comment xml:lang="zh_CN">雅达利 Lynx</comment>
- <comment xml:lang="zh_TW">Atari Lynx</comment>
+ <comment>Atari Lynx ROM</comment>
+ <comment xml:lang="bg">ROM — Atari Lynx</comment>
+ <comment xml:lang="ca">ROM d'Atari Lynx</comment>
+ <comment xml:lang="da">Atari Lynx-ROM</comment>
+ <comment xml:lang="de">Atari Lynx ROM</comment>
+ <comment xml:lang="en-GB">Atari Lynx ROM</comment>
+ <comment xml:lang="es">ROM de Atari Lynx</comment>
+ <comment xml:lang="eu">Atari Lynx ROMa</comment>
+ <comment xml:lang="fi">Atari Lynx ROM</comment>
+ <comment xml:lang="fr">ROM Atari Lynx</comment>
+ <comment xml:lang="fur">ROM Atari Lynx</comment>
+ <comment xml:lang="hr">Atari Lynx ROM</comment>
+ <comment xml:lang="hu">Atari Lynx ROM</comment>
+ <comment xml:lang="id">Atari Lynx ROM</comment>
+ <comment xml:lang="it">ROM Atari Lynx</comment>
+ <comment xml:lang="kk">Atari Lynx ROM</comment>
+ <comment xml:lang="ko">아타리 링스 롬</comment>
+ <comment xml:lang="pl">Plik ROM konsoli Atari Lynx</comment>
+ <comment xml:lang="pt">ROM Atari Lynx</comment>
+ <comment xml:lang="pt-BR">ROM do Atari Lynx</comment>
+ <comment xml:lang="sl">Atari Lynx ROM</comment>
+ <comment xml:lang="sv">Atari Lynx-rom</comment>
+ <comment xml:lang="tr">Atari Lynx ROM</comment>
+ <comment xml:lang="uk">Atari Lynx ROM</comment>
+ <comment xml:lang="zh-CN">雅达利 Lynx ROM</comment>
+ <comment xml:lang="zh-TW">雅達利 Lynx ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.lnx"/>
<magic>
- <match value="LYNX" type="string" offset="0"/>
+ <match type="string" value="LYNX" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/andrew-inset">
<comment>ATK inset</comment>
<comment xml:lang="ar">شكل ATK</comment>
- <comment xml:lang="be@latin">Ustaŭka ATK</comment>
- <comment xml:lang="bg">Сбор — ATK</comment>
+ <comment xml:lang="be-Latn">Ustaŭka ATK</comment>
+ <comment xml:lang="bg">Притурка — ATK</comment>
<comment xml:lang="ca">ATK inset</comment>
<comment xml:lang="cs">vložka ATK</comment>
<comment xml:lang="da">ATK-indsættelse</comment>
<comment xml:lang="de">ATK-Inset</comment>
<comment xml:lang="el">Ένθετο ATK</comment>
- <comment xml:lang="en_GB">ATK inset</comment>
+ <comment xml:lang="en-GB">ATK inset</comment>
<comment xml:lang="es">inserción ATK</comment>
<comment xml:lang="eu">ATK sartzapena</comment>
<comment xml:lang="fi">ATK-osio</comment>
<comment xml:lang="fo">ATK innskot</comment>
<comment xml:lang="fr">encart ATK</comment>
+ <comment xml:lang="fur">inset ATK</comment>
<comment xml:lang="ga">intlis ATK</comment>
<comment xml:lang="gl">conxunto ATK</comment>
<comment xml:lang="he">תוספת ATK</comment>
@@ -197,7 +191,7 @@
<comment xml:lang="oc">encart ATK</comment>
<comment xml:lang="pl">Wstawka ATK</comment>
<comment xml:lang="pt">Suplemento ATK</comment>
- <comment xml:lang="pt_BR">Conjunto de entrada do ATK</comment>
+ <comment xml:lang="pt-BR">Conjunto de entrada do ATK</comment>
<comment xml:lang="ro">Inset ATK</comment>
<comment xml:lang="ru">Вкладка ATK</comment>
<comment xml:lang="sk">Vložka ATK</comment>
@@ -208,8 +202,8 @@
<comment xml:lang="tr">ATK iç metni</comment>
<comment xml:lang="uk">вкладка ATK</comment>
<comment xml:lang="vi">Bộ dát ATK</comment>
- <comment xml:lang="zh_CN">ATK 嵌入对象</comment>
- <comment xml:lang="zh_TW">ATK 內嵌</comment>
+ <comment xml:lang="zh-CN">ATK 嵌入对象</comment>
+ <comment xml:lang="zh-TW">ATK 內嵌</comment>
<acronym>ATK</acronym>
<expanded-acronym>Andrew Toolkit</expanded-acronym>
<generic-icon name="x-office-document"/>
@@ -217,21 +211,23 @@
</mime-type>
<mime-type type="application/epub+zip">
<comment>electronic book document</comment>
+ <comment xml:lang="af">elektronieseboekdokument</comment>
<comment xml:lang="ar">مستند كتاب إلكتروني</comment>
<comment xml:lang="ast">documentu de llibru electrónicu</comment>
- <comment xml:lang="be@latin">elektronnaja kniha</comment>
+ <comment xml:lang="be-Latn">elektronnaja kniha</comment>
<comment xml:lang="bg">Документ — електронна книга</comment>
<comment xml:lang="ca">document de llibre electrònic</comment>
<comment xml:lang="cs">dokument elektronické knihy</comment>
<comment xml:lang="da">elektronisk bogdokument</comment>
<comment xml:lang="de">Elektronisches Buch</comment>
<comment xml:lang="el">Έγγραφο ηλεκτρονικού βιβλίου</comment>
- <comment xml:lang="en_GB">electronic book document</comment>
+ <comment xml:lang="en-GB">electronic book document</comment>
<comment xml:lang="es">documento de libro electrónico</comment>
<comment xml:lang="eu">liburu elektronikoaren dokumentua</comment>
<comment xml:lang="fi">elektroninen kirja</comment>
<comment xml:lang="fo">elektroniskbóka skjal</comment>
<comment xml:lang="fr">document livre électronique</comment>
+ <comment xml:lang="fur">document libri eletronic</comment>
<comment xml:lang="ga">leabhar leictreonach</comment>
<comment xml:lang="gl">documento de libro electrónico</comment>
<comment xml:lang="he">מסמך מסוג ספר אלקטרוני</comment>
@@ -250,7 +246,7 @@
<comment xml:lang="oc">document libre electronic</comment>
<comment xml:lang="pl">Dokument książki elektronicznej</comment>
<comment xml:lang="pt">documento de livro eletrónico</comment>
- <comment xml:lang="pt_BR">Documento de livro eletrônico</comment>
+ <comment xml:lang="pt-BR">Documento de livro eletrônico</comment>
<comment xml:lang="ro">document carte electronică</comment>
<comment xml:lang="ru">Электронная книга</comment>
<comment xml:lang="sk">Dokument elektronickej knihy</comment>
@@ -261,45 +257,77 @@
<comment xml:lang="tr">elektronik kitap belgesi</comment>
<comment xml:lang="uk">документ електронної книги</comment>
<comment xml:lang="vi">tài liệu cuốn sách điện tử</comment>
- <comment xml:lang="zh_CN">电子书文档</comment>
- <comment xml:lang="zh_TW">電子書文件</comment>
+ <comment xml:lang="zh-CN">电子书文档</comment>
+ <comment xml:lang="zh-TW">電子書文件</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/epub+zip" type="string" offset="38"/>
- <match value="application/epub+zip" type="string" offset="43"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/epub+zip" offset="38"/>
+ <match type="string" value="application/epub+zip" offset="43"/>
</match>
</match>
</magic>
<glob pattern="*.epub"/>
</mime-type>
+ <mime-type type="application/vnd.amazon.mobi8-ebook">
+ <comment>Kindle book document</comment>
+ <comment xml:lang="ca">document de llibre Kindle</comment>
+ <comment xml:lang="da">Kindle-bogdokument</comment>
+ <comment xml:lang="de">Kindle-Buch-Dokument</comment>
+ <comment xml:lang="en-GB">Kindle book document</comment>
+ <comment xml:lang="es">documento de libro de Kindle</comment>
+ <comment xml:lang="fi">Kindle book -asiakirja</comment>
+ <comment xml:lang="fr">document livre Kindle</comment>
+ <comment xml:lang="hr">Dokument Kindle knjige</comment>
+ <comment xml:lang="hu">Kindle könyvdokumentum</comment>
+ <comment xml:lang="id">Dokumen buku Kindle</comment>
+ <comment xml:lang="it">Documento libro Kindle</comment>
+ <comment xml:lang="kk">Kindle кітап құжаты</comment>
+ <comment xml:lang="ko">Kindle 책 문서</comment>
+ <comment xml:lang="lt">Kindle knygos dokumentas</comment>
+ <comment xml:lang="pl">Dokument książki Kindle</comment>
+ <comment xml:lang="pt">documento de livro eletrónico do Kindle</comment>
+ <comment xml:lang="pt-BR">Documento livro do Kindle</comment>
+ <comment xml:lang="ru">Электронная книга Kindle</comment>
+ <comment xml:lang="sv">Kindle-bokdokument</comment>
+ <comment xml:lang="tr">Kindle kitap belgesi</comment>
+ <comment xml:lang="uk">документ книги Kindle</comment>
+ <comment xml:lang="zh-CN">Kindle 电子书文档</comment>
+ <comment xml:lang="zh-TW">Kindle 書文件</comment>
+ <sub-class-of type="application/x-mobipocket-ebook"/>
+ <glob pattern="*.azw3"/>
+ <glob pattern="*.kfx"/>
+ <alias type="application/x-mobi8-ebook"/>
+ </mime-type>
<mime-type type="application/illustrator">
<comment>Adobe Illustrator document</comment>
+ <comment xml:lang="af">Adobe Illustrator-dokument</comment>
<comment xml:lang="ar">مستند أدوبي المصور</comment>
<comment xml:lang="ast">Documentu d'Adobe Illustrator</comment>
- <comment xml:lang="be@latin">Dakument Adobe Illustrator</comment>
+ <comment xml:lang="be-Latn">Dakument Adobe Illustrator</comment>
<comment xml:lang="bg">Документ — Adobe Illustrator</comment>
<comment xml:lang="ca">document d'Adobe Illustrator</comment>
<comment xml:lang="cs">dokument Adobe Illustrator</comment>
<comment xml:lang="da">Adobe Illustrator-dokument</comment>
<comment xml:lang="de">Adobe-Illustrator-Dokument</comment>
<comment xml:lang="el">Έγγραφο Adobe Illustrator</comment>
- <comment xml:lang="en_GB">Adobe Illustrator document</comment>
+ <comment xml:lang="en-GB">Adobe Illustrator document</comment>
<comment xml:lang="eo">dokumento de Adobe Illustrator</comment>
<comment xml:lang="es">documento de Adobe Illustrator</comment>
<comment xml:lang="eu">Adobe Illustrator dokumentua</comment>
<comment xml:lang="fi">Adobe Illustrator -asiakirja</comment>
<comment xml:lang="fo">Adobe Illustrator skjal</comment>
<comment xml:lang="fr">document Adobe Illustrator</comment>
+ <comment xml:lang="fur">document Adobe Illustrator</comment>
<comment xml:lang="ga">cáipéis Adobe Illustrator</comment>
<comment xml:lang="gl">documento de Adobe Ilustrator</comment>
<comment xml:lang="he">מסמך Adobe Ill</comment>
<comment xml:lang="hr">Adobe Illustrator dokument</comment>
<comment xml:lang="hu">Adobe Illustrator-dokumentum</comment>
<comment xml:lang="ia">Documento Adobe Illustrator</comment>
- <comment xml:lang="id">dokumen Adobe Illustrator</comment>
+ <comment xml:lang="id">Dokumen Adobe Illustrator</comment>
<comment xml:lang="it">Documento Adobe Illustrator</comment>
<comment xml:lang="ja">Adobe Illustrator ドキュメント</comment>
<comment xml:lang="ka">Adobe Illustrator-ის დოკუმენტი</comment>
@@ -314,7 +342,7 @@
<comment xml:lang="oc">document Adobe Illustrator</comment>
<comment xml:lang="pl">Dokument Adobe Illustrator</comment>
<comment xml:lang="pt">documento Adobe Illustrator</comment>
- <comment xml:lang="pt_BR">Documento do Adobe Illustrator</comment>
+ <comment xml:lang="pt-BR">Documento do Adobe Illustrator</comment>
<comment xml:lang="ro">Document Adobe Illustrator</comment>
<comment xml:lang="ru">Документ Adobe Illustrator</comment>
<comment xml:lang="sk">Dokument Adobe Illustrator</comment>
@@ -325,18 +353,19 @@
<comment xml:lang="tr">Adobe Illustrator belgesi</comment>
<comment xml:lang="uk">документ Adobe Illustrator</comment>
<comment xml:lang="vi">Tài liệu Adobe Illustrator</comment>
- <comment xml:lang="zh_CN">Adobe Illustrator 文档</comment>
- <comment xml:lang="zh_TW">Adobe Illustrator 文件</comment>
+ <comment xml:lang="zh-CN">Adobe Illustrator 文档</comment>
+ <comment xml:lang="zh-TW">Adobe Illustrator 文件</comment>
<generic-icon name="image-x-generic"/>
<glob pattern="*.ai"/>
<alias type="application/vnd.adobe.illustrator"/>
</mime-type>
<mime-type type="application/mac-binhex40">
<comment>Macintosh BinHex-encoded file</comment>
+ <comment xml:lang="af">Macintosh BinHex-geënkodeerde lêer</comment>
<comment xml:lang="ar">ملف Macintosh BinHex مشفر</comment>
<comment xml:lang="ast">Ficheru codificáu en BinHex de Machintosh</comment>
<comment xml:lang="az">Macintosh BinHex-kodlanmış fayl</comment>
- <comment xml:lang="be@latin">Fajł Macintosh, BinHex-zakadavany</comment>
+ <comment xml:lang="be-Latn">Fajł Macintosh, BinHex-zakadavany</comment>
<comment xml:lang="bg">Файл — кодиран във формат BinHex за Macintosh</comment>
<comment xml:lang="ca">fitxer amb codificació BinHex de Macintosh</comment>
<comment xml:lang="cs">soubor kódovaný pomocí Macintosh BinHex</comment>
@@ -344,20 +373,21 @@
<comment xml:lang="da">Macintosh BinHex-kodet fil</comment>
<comment xml:lang="de">Macintosh-Datei (BinHex-kodiert)</comment>
<comment xml:lang="el">Αρχείο Macintosh κωδικοποίησης BinHex</comment>
- <comment xml:lang="en_GB">Macintosh BinHex-encoded file</comment>
+ <comment xml:lang="en-GB">Macintosh BinHex-encoded file</comment>
<comment xml:lang="eo">dosiero kodigita laŭ Macintosh BinHex</comment>
<comment xml:lang="es">archivo Macintosh codificado con BinHex</comment>
<comment xml:lang="eu">Macintosh BinHex-ekin kodetutako fitxategia</comment>
<comment xml:lang="fi">Macintosh BinHex -koodattu tiedosto</comment>
<comment xml:lang="fo">Macintosh BinHex-bronglað fíla</comment>
<comment xml:lang="fr">fichier codé Macintosh BinHex</comment>
+ <comment xml:lang="fur">file di Macintosh codificât BinHex</comment>
<comment xml:lang="ga">comhad ionchódaithe le Macintosh BinHex</comment>
<comment xml:lang="gl">ficheiro de Macintosh codificado con BinHex</comment>
<comment xml:lang="he">קובץ בקידוד Macintosh BinHex</comment>
<comment xml:lang="hr">Macintosh BinHex-kôdirana datoteka</comment>
<comment xml:lang="hu">Macintosh BinHex kódolású fájl</comment>
<comment xml:lang="ia">File codificate in BinHex de Macintosh</comment>
- <comment xml:lang="id">berkas tersandi Macintosh BinHex</comment>
+ <comment xml:lang="id">Berkas tersandi Macintosh BinHex</comment>
<comment xml:lang="it">File Macintosh codificato BinHex</comment>
<comment xml:lang="ja">Macintosh BinHex エンコードファイル</comment>
<comment xml:lang="kk">Macintosh BinHex кодталған файлы</comment>
@@ -371,7 +401,7 @@
<comment xml:lang="oc">fichièr encodat Macintosh BinHex</comment>
<comment xml:lang="pl">Zakodowany w BinHex plik Macintosh</comment>
<comment xml:lang="pt">ficheiro codificado em BinHex de Macintosh</comment>
- <comment xml:lang="pt_BR">Arquivo do Macintosh codificado com BinHex</comment>
+ <comment xml:lang="pt-BR">Arquivo do Macintosh codificado com BinHex</comment>
<comment xml:lang="ro">Fișier codat Macintosh BinHex</comment>
<comment xml:lang="ru">Файл (закодированный Macintosh BinHex)</comment>
<comment xml:lang="sk">Súbor kódovaný pomocou Macintosh BinHex</comment>
@@ -382,61 +412,40 @@
<comment xml:lang="tr">Macintosh BinHex-şifreli dosya</comment>
<comment xml:lang="uk">файл закодований Macintosh BinHex</comment>
<comment xml:lang="vi">Tập tin đã mã hoá BinHex của Macintosh</comment>
- <comment xml:lang="zh_CN">Macintosh BinHex 编码的文件</comment>
- <comment xml:lang="zh_TW">Macintosh BinHex 編碼檔</comment>
+ <comment xml:lang="zh-CN">Macintosh BinHex 编码的文件</comment>
+ <comment xml:lang="zh-TW">Macintosh BinHex 編碼檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="50">
- <match value="must be converted with BinHex" type="string" offset="11"/>
+ <match type="string" value="must be converted with BinHex" offset="11"/>
</magic>
</mime-type>
<mime-type type="application/mathematica">
- <comment>Mathematica Notebook</comment>
- <comment xml:lang="ar">مذكرة رياضيات</comment>
- <comment xml:lang="be@latin">Natatnik Mathematica</comment>
- <comment xml:lang="bg">Тетрадка — Mathematica</comment>
- <comment xml:lang="ca">llibreta de notes de Mathematica</comment>
- <comment xml:lang="cs">sešit Mathematica</comment>
- <comment xml:lang="da">Mathematica Notebook</comment>
- <comment xml:lang="de">Mathematica-Dokument</comment>
- <comment xml:lang="el">Σημειωματάριο Mathematica</comment>
- <comment xml:lang="en_GB">Mathematica Notebook</comment>
- <comment xml:lang="es">libreta de Mathematica</comment>
- <comment xml:lang="eu">Mathematica Notebook</comment>
- <comment xml:lang="fi">Mathematica-muistilehtiö</comment>
- <comment xml:lang="fo">Mathematica skriviblokkur</comment>
- <comment xml:lang="fr">carnet de notes Mathematica</comment>
- <comment xml:lang="ga">leabhar nótaí Mathematica</comment>
- <comment xml:lang="gl">notebook de Mathematica</comment>
- <comment xml:lang="he">מחברת מתמטיקה</comment>
- <comment xml:lang="hr">Matematička bilježnica</comment>
- <comment xml:lang="hu">Mathematica notesz</comment>
- <comment xml:lang="ia">Carnet de notas Mathematica</comment>
- <comment xml:lang="id">Mathematica Notebook</comment>
- <comment xml:lang="it">Notebook Mathematica</comment>
- <comment xml:lang="ja">Mathematica ノートブック</comment>
- <comment xml:lang="kk">Mathematica Notebook</comment>
- <comment xml:lang="ko">Mathematica 노트북</comment>
- <comment xml:lang="lt">Mathematica užrašinė</comment>
- <comment xml:lang="lv">Mathematica bloknots</comment>
- <comment xml:lang="nb">Mathematica notisblokk</comment>
- <comment xml:lang="nl">Mathematica-notitieboek</comment>
- <comment xml:lang="nn">Mathematica-notatbok</comment>
- <comment xml:lang="oc">quasernet de nòtas Mathematica</comment>
- <comment xml:lang="pl">Notatnik Mathematica</comment>
- <comment xml:lang="pt">Bloco notas Mathematica</comment>
- <comment xml:lang="pt_BR">Caderno do Mathematica</comment>
- <comment xml:lang="ro">Carnețel Mathematica</comment>
- <comment xml:lang="ru">Mathematica Notebook</comment>
- <comment xml:lang="sk">Zošit programu Mathematica</comment>
- <comment xml:lang="sl">Datoteka dokumenta Mathematica</comment>
- <comment xml:lang="sq">Notebook matematike</comment>
- <comment xml:lang="sr">бележница Математике</comment>
- <comment xml:lang="sv">Mathematica Notebook-dokument</comment>
- <comment xml:lang="tr">Mathematica Defteri</comment>
- <comment xml:lang="uk">математичний записник</comment>
- <comment xml:lang="vi">Cuốn vở Mathematica</comment>
- <comment xml:lang="zh_CN">Mathematica 笔记本</comment>
- <comment xml:lang="zh_TW">Mathematica Notebook</comment>
+ <comment>Mathematica Notebook file</comment>
+ <comment xml:lang="bg">Скицник — Mathematica</comment>
+ <comment xml:lang="ca">llibreta de Mathematica Notebook</comment>
+ <comment xml:lang="da">Mathematica Notebook-fil</comment>
+ <comment xml:lang="de">Mathematica-Notebook-Datei</comment>
+ <comment xml:lang="en-GB">Mathematica Notebook file</comment>
+ <comment xml:lang="es">archivo de Mathematica Notebook</comment>
+ <comment xml:lang="eu">Mathematica Notebook fitxategia</comment>
+ <comment xml:lang="fi">Mathematica Notebook -tiedosto</comment>
+ <comment xml:lang="fr">fichier carnet Mathematica</comment>
+ <comment xml:lang="hr">Mathematica Notebook datoteka</comment>
+ <comment xml:lang="hu">Mathematica munkafüzetfájl</comment>
+ <comment xml:lang="id">Berkas Mathematica Notebook</comment>
+ <comment xml:lang="it">File Mathematica Notebook</comment>
+ <comment xml:lang="kk">Mathematica блокнот файлы</comment>
+ <comment xml:lang="ko">매쓰매티카 기록장 파일</comment>
+ <comment xml:lang="pl">Plik notatnika Mathematica</comment>
+ <comment xml:lang="pt">ficheiro de Mathematica Notebook do Wolfram</comment>
+ <comment xml:lang="pt-BR">Arquivo Notebook do Mathematica</comment>
+ <comment xml:lang="ru">Файл Mathematica Notebook</comment>
+ <comment xml:lang="sl">Datoteka Mathematica Notebook</comment>
+ <comment xml:lang="sv">Mathematica-anteckningsboksfil</comment>
+ <comment xml:lang="tr">Mathematica Notebook dosyası</comment>
+ <comment xml:lang="uk">файл нотатника Mathematica</comment>
+ <comment xml:lang="zh-CN">Mathematica 笔记本文件</comment>
+ <comment xml:lang="zh-TW">Mathematica 筆記本檔案</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.nb"/>
@@ -449,10 +458,11 @@
</mime-type>
<mime-type type="application/mathml+xml">
<comment>MathML document</comment>
+ <comment xml:lang="af">MathML-dokument</comment>
<comment xml:lang="ar">مستند MathML</comment>
<comment xml:lang="ast">Documentu MathML</comment>
<comment xml:lang="az">MathML sənədi</comment>
- <comment xml:lang="be@latin">Dakument MathML</comment>
+ <comment xml:lang="be-Latn">Dakument MathML</comment>
<comment xml:lang="bg">Документ — MathML</comment>
<comment xml:lang="ca">document MathML</comment>
<comment xml:lang="cs">dokument MathML</comment>
@@ -460,20 +470,21 @@
<comment xml:lang="da">MathML-dokument</comment>
<comment xml:lang="de">MathML-Dokument</comment>
<comment xml:lang="el">Έγγραφο MathML</comment>
- <comment xml:lang="en_GB">MathML document</comment>
+ <comment xml:lang="en-GB">MathML document</comment>
<comment xml:lang="eo">MathML-dokumento</comment>
<comment xml:lang="es">documento MathML</comment>
<comment xml:lang="eu">MathML dokumentua</comment>
<comment xml:lang="fi">MathML-asiakirja</comment>
<comment xml:lang="fo">MathML skjal</comment>
<comment xml:lang="fr">document MathML</comment>
+ <comment xml:lang="fur">document MathML</comment>
<comment xml:lang="ga">cáipéis MathML</comment>
<comment xml:lang="gl">documento de MathML</comment>
<comment xml:lang="he">מסמך MathML</comment>
<comment xml:lang="hr">MathML dokument</comment>
<comment xml:lang="hu">MathML-dokumentum</comment>
<comment xml:lang="ia">Documento MathML</comment>
- <comment xml:lang="id">dokumen MathML</comment>
+ <comment xml:lang="id">Dokumen MathML</comment>
<comment xml:lang="it">Documento MathML</comment>
<comment xml:lang="ja">MathML ドキュメント</comment>
<comment xml:lang="ka">MathML-ის დოკუმენტი</comment>
@@ -488,7 +499,7 @@
<comment xml:lang="oc">document MathML</comment>
<comment xml:lang="pl">Dokument MathML</comment>
<comment xml:lang="pt">documento MathML</comment>
- <comment xml:lang="pt_BR">Documento do MathML</comment>
+ <comment xml:lang="pt-BR">Documento do MathML</comment>
<comment xml:lang="ro">Document MathML</comment>
<comment xml:lang="ru">Документ MathML</comment>
<comment xml:lang="sk">Dokument MathML</comment>
@@ -499,8 +510,8 @@
<comment xml:lang="tr">MathML belgesi</comment>
<comment xml:lang="uk">документ MathML</comment>
<comment xml:lang="vi">Tài liệu MathML</comment>
- <comment xml:lang="zh_CN">MathML 文档</comment>
- <comment xml:lang="zh_TW">MathML 文件</comment>
+ <comment xml:lang="zh-CN">MathML 文档</comment>
+ <comment xml:lang="zh-TW">MathML 文件</comment>
<acronym>MathML</acronym>
<expanded-acronym>Mathematical Markup Language</expanded-acronym>
<alias type="text/mathml"/>
@@ -510,20 +521,22 @@
</mime-type>
<mime-type type="application/mbox">
<comment>mailbox file</comment>
+ <comment xml:lang="af">mailbox-lêer</comment>
<comment xml:lang="ar">ملف صندوق البريد</comment>
- <comment xml:lang="be@latin">fajł paštovaj skryni</comment>
+ <comment xml:lang="be-Latn">fajł paštovaj skryni</comment>
<comment xml:lang="bg">Файл — Mailbox</comment>
<comment xml:lang="ca">fitxer mailbox</comment>
<comment xml:lang="cs">soubor mailbox</comment>
<comment xml:lang="da">postkassefil</comment>
<comment xml:lang="de">Mailbox-Datei</comment>
<comment xml:lang="el">Αρχείο mailbox</comment>
- <comment xml:lang="en_GB">mailbox file</comment>
+ <comment xml:lang="en-GB">mailbox file</comment>
<comment xml:lang="es">archivo de buzón de correo</comment>
<comment xml:lang="eu">mailbox fitxategia</comment>
<comment xml:lang="fi">mailbox-tiedosto</comment>
<comment xml:lang="fo">postkassafíla</comment>
<comment xml:lang="fr">fichier boîte aux lettres</comment>
+ <comment xml:lang="fur">file mailbox</comment>
<comment xml:lang="ga">comhad bhosca poist</comment>
<comment xml:lang="gl">ficheiro de caixa de correo</comment>
<comment xml:lang="he">קובץ תיבת-דואר</comment>
@@ -543,7 +556,7 @@
<comment xml:lang="oc">fichièr bóstia de letras</comment>
<comment xml:lang="pl">Plik poczty (Mailbox)</comment>
<comment xml:lang="pt">ficheiro de caixa de correio</comment>
- <comment xml:lang="pt_BR">Arquivo de caixa de correio</comment>
+ <comment xml:lang="pt-BR">Arquivo de caixa de correio</comment>
<comment xml:lang="ro">fișier căsuță poștală</comment>
<comment xml:lang="ru">Файл почтового ящика</comment>
<comment xml:lang="sk">Súbor mailbox</comment>
@@ -551,20 +564,21 @@
<comment xml:lang="sq">File mailbox</comment>
<comment xml:lang="sr">датотека поштанског сандучета</comment>
<comment xml:lang="sv">brevlådefil</comment>
- <comment xml:lang="tr">posta kutusu dosyası</comment>
+ <comment xml:lang="tr">mailbox dosyası</comment>
<comment xml:lang="uk">файл поштової скриньки</comment>
<comment xml:lang="vi">tập tin hộp thư</comment>
- <comment xml:lang="zh_CN">邮箱文件</comment>
- <comment xml:lang="zh_TW">郵箱檔</comment>
+ <comment xml:lang="zh-CN">邮箱文件</comment>
+ <comment xml:lang="zh-TW">郵箱檔</comment>
<generic-icon name="text-x-generic"/>
<sub-class-of type="text/plain"/>
<magic priority="20">
- <match value="From " type="string" offset="0"/>
+ <match type="string" value="From " offset="0"/>
</magic>
<glob pattern="*.mbox"/>
</mime-type>
<mime-type type="application/metalink+xml">
<comment>Metalink file</comment>
+ <comment xml:lang="af">Metalink-lêer</comment>
<comment xml:lang="ar">ملف ميتالنك</comment>
<comment xml:lang="ast">Ficheru d'enllaz meta</comment>
<comment xml:lang="bg">Изтегляне — Metalink</comment>
@@ -573,20 +587,21 @@
<comment xml:lang="da">Metahenvisningsfil</comment>
<comment xml:lang="de">Metalink-Datei</comment>
<comment xml:lang="el">Αρχείο Metalink</comment>
- <comment xml:lang="en_GB">Metalink file</comment>
+ <comment xml:lang="en-GB">Metalink file</comment>
<comment xml:lang="eo">Metalink-dosiero</comment>
<comment xml:lang="es">archivo de Metalink</comment>
<comment xml:lang="eu">Metaestekaren fitxategia</comment>
<comment xml:lang="fi">Metalink-tiedosto</comment>
<comment xml:lang="fo">Metalink fíla</comment>
<comment xml:lang="fr">fichier metalink</comment>
+ <comment xml:lang="fur">file Metalink</comment>
<comment xml:lang="ga">comhad Metalink</comment>
<comment xml:lang="gl">ficheiro Metalink</comment>
<comment xml:lang="he">קובץ Metalink</comment>
<comment xml:lang="hr">Datoteka meta poveznice</comment>
<comment xml:lang="hu">Metalink fájl</comment>
<comment xml:lang="ia">File Metalink</comment>
- <comment xml:lang="id">berkas Metalink</comment>
+ <comment xml:lang="id">Berkas Metalink</comment>
<comment xml:lang="it">File Metalink</comment>
<comment xml:lang="ja">Metalink ファイル</comment>
<comment xml:lang="kk">Metalink файлы</comment>
@@ -597,7 +612,7 @@
<comment xml:lang="oc">fichièr metalink</comment>
<comment xml:lang="pl">Plik Metalink</comment>
<comment xml:lang="pt">ficheiro Metalink</comment>
- <comment xml:lang="pt_BR">Arquivo Metalink</comment>
+ <comment xml:lang="pt-BR">Arquivo Metalink</comment>
<comment xml:lang="ro">Fișier Metalink</comment>
<comment xml:lang="ru">Файл Metalink</comment>
<comment xml:lang="sk">Súbor Metalink</comment>
@@ -606,17 +621,18 @@
<comment xml:lang="sv">Metalink-fil</comment>
<comment xml:lang="tr">Metalink dosyası</comment>
<comment xml:lang="uk">файл метапосилання</comment>
- <comment xml:lang="zh_CN">Metalink 文件</comment>
- <comment xml:lang="zh_TW">Metalink 檔案</comment>
+ <comment xml:lang="zh-CN">Metalink 文件</comment>
+ <comment xml:lang="zh-TW">Metalink 檔案</comment>
<sub-class-of type="application/xml"/>
<magic priority="50">
- <match value="&lt;metalink version=&quot;3.0&quot;" type="string" offset="0:256"/>
+ <match type="string" value="&lt;metalink version=&quot;3.0&quot;" offset="0:256"/>
</magic>
<glob pattern="*.metalink"/>
<root-XML namespaceURI="http://www.metalinker.org/" localName="metalink"/>
</mime-type>
<mime-type type="application/metalink4+xml">
<comment>Metalink file</comment>
+ <comment xml:lang="af">Metalink-lêer</comment>
<comment xml:lang="ar">ملف ميتالنك</comment>
<comment xml:lang="ast">Ficheru d'enllaz meta</comment>
<comment xml:lang="bg">Изтегляне — Metalink</comment>
@@ -625,20 +641,21 @@
<comment xml:lang="da">Metahenvisningsfil</comment>
<comment xml:lang="de">Metalink-Datei</comment>
<comment xml:lang="el">Αρχείο Metalink</comment>
- <comment xml:lang="en_GB">Metalink file</comment>
+ <comment xml:lang="en-GB">Metalink file</comment>
<comment xml:lang="eo">Metalink-dosiero</comment>
<comment xml:lang="es">archivo de Metalink</comment>
<comment xml:lang="eu">Metaestekaren fitxategia</comment>
<comment xml:lang="fi">Metalink-tiedosto</comment>
<comment xml:lang="fo">Metalink fíla</comment>
<comment xml:lang="fr">fichier metalink</comment>
+ <comment xml:lang="fur">file Metalink</comment>
<comment xml:lang="ga">comhad Metalink</comment>
<comment xml:lang="gl">ficheiro Metalink</comment>
<comment xml:lang="he">קובץ Metalink</comment>
<comment xml:lang="hr">Datoteka meta poveznice</comment>
<comment xml:lang="hu">Metalink fájl</comment>
<comment xml:lang="ia">File Metalink</comment>
- <comment xml:lang="id">berkas Metalink</comment>
+ <comment xml:lang="id">Berkas Metalink</comment>
<comment xml:lang="it">File Metalink</comment>
<comment xml:lang="ja">Metalink ファイル</comment>
<comment xml:lang="kk">Metalink файлы</comment>
@@ -649,7 +666,7 @@
<comment xml:lang="oc">fichièr metalink</comment>
<comment xml:lang="pl">Plik Metalink</comment>
<comment xml:lang="pt">ficheiro Metalink</comment>
- <comment xml:lang="pt_BR">Arquivo Metalink</comment>
+ <comment xml:lang="pt-BR">Arquivo Metalink</comment>
<comment xml:lang="ro">Fișier Metalink</comment>
<comment xml:lang="ru">Файл Metalink</comment>
<comment xml:lang="sk">Súbor Metalink</comment>
@@ -658,33 +675,35 @@
<comment xml:lang="sv">Metalink-fil</comment>
<comment xml:lang="tr">Metalink dosyası</comment>
<comment xml:lang="uk">файл метапосилання</comment>
- <comment xml:lang="zh_CN">Metalink 文件</comment>
- <comment xml:lang="zh_TW">Metalink 檔案</comment>
+ <comment xml:lang="zh-CN">Metalink 文件</comment>
+ <comment xml:lang="zh-TW">Metalink 檔案</comment>
<sub-class-of type="application/xml"/>
<magic priority="50">
- <match value="&lt;metalink xmlns=&quot;urn" type="string" offset="0:256"/>
+ <match type="string" value="&lt;metalink xmlns=&quot;urn" offset="0:256"/>
</magic>
<glob pattern="*.meta4"/>
<root-XML namespaceURI="urn:ietf:params:xml:ns:metalink" localName="metalink"/>
</mime-type>
<mime-type type="application/octet-stream">
<comment>unknown</comment>
+ <comment xml:lang="af">onbekend</comment>
<comment xml:lang="ar">مجهول</comment>
<comment xml:lang="ast">desconozse</comment>
- <comment xml:lang="be@latin">nieviadomy</comment>
+ <comment xml:lang="be-Latn">nieviadomy</comment>
<comment xml:lang="bg">Неизвестен тип</comment>
<comment xml:lang="ca">desconegut</comment>
<comment xml:lang="cs">neznámý</comment>
<comment xml:lang="da">ukendt</comment>
<comment xml:lang="de">unbekannt</comment>
<comment xml:lang="el">Άγνωστο</comment>
- <comment xml:lang="en_GB">unknown</comment>
+ <comment xml:lang="en-GB">unknown</comment>
<comment xml:lang="eo">nekonate</comment>
<comment xml:lang="es">desconocido</comment>
<comment xml:lang="eu">ezezaguna</comment>
<comment xml:lang="fi">tuntematon</comment>
<comment xml:lang="fo">ókent</comment>
<comment xml:lang="fr">inconnu</comment>
+ <comment xml:lang="fur">no cognossût</comment>
<comment xml:lang="ga">anaithnid</comment>
<comment xml:lang="gl">descoñecido</comment>
<comment xml:lang="he">לא ידוע</comment>
@@ -706,7 +725,7 @@
<comment xml:lang="oc">desconegut</comment>
<comment xml:lang="pl">Nieznany typ</comment>
<comment xml:lang="pt">desconhecido</comment>
- <comment xml:lang="pt_BR">Desconhecido</comment>
+ <comment xml:lang="pt-BR">Desconhecido</comment>
<comment xml:lang="ro">necunoscut</comment>
<comment xml:lang="ru">Неизвестно</comment>
<comment xml:lang="sk">Neznámy</comment>
@@ -717,22 +736,25 @@
<comment xml:lang="tr">bilinmeyen</comment>
<comment xml:lang="uk">невідомо</comment>
<comment xml:lang="vi">không rõ</comment>
- <comment xml:lang="zh_CN">未知</comment>
- <comment xml:lang="zh_TW">不明</comment>
+ <comment xml:lang="zh-CN">未知</comment>
+ <comment xml:lang="zh-TW">不明</comment>
</mime-type>
<mime-type type="application/x-partial-download">
<comment>Partially downloaded file</comment>
+ <comment xml:lang="af">Gedeeltelik afgelaaide lêer</comment>
<comment xml:lang="ast">Ficheru baxáu parcialmente</comment>
+ <comment xml:lang="bg">Частично изтеглен файл</comment>
<comment xml:lang="ca">fitxer baixat parcialment</comment>
<comment xml:lang="cs">částečně stažený soubor</comment>
- <comment xml:lang="da">Delvist hentet fil</comment>
+ <comment xml:lang="da">Delvist downloadet fil</comment>
<comment xml:lang="de">Teilweise heruntergeladene Datei</comment>
<comment xml:lang="el">Μερικώς ληφθέντο αρχείο</comment>
- <comment xml:lang="en_GB">Partially downloaded file</comment>
+ <comment xml:lang="en-GB">Partially downloaded file</comment>
<comment xml:lang="es">archivo descargado parcialmente</comment>
<comment xml:lang="eu">Partzialki deskargatutako fitxategia</comment>
<comment xml:lang="fi">Osittain ladattu tiedosto</comment>
<comment xml:lang="fr">fichier partiellement téléchargé</comment>
+ <comment xml:lang="fur">file no discjariât dal dut</comment>
<comment xml:lang="ga">Comhad leath-íoslódáilte</comment>
<comment xml:lang="gl">Ficheiro descargado parcialmente</comment>
<comment xml:lang="he">קובץ שהתקבל חלקית</comment>
@@ -743,10 +765,11 @@
<comment xml:lang="it">File parzialmente scaricato</comment>
<comment xml:lang="kk">Жартылай жүктелген файл</comment>
<comment xml:lang="ko">일부 다운로드한 파일</comment>
+ <comment xml:lang="lt">Dalinai atsiųstas failas</comment>
<comment xml:lang="oc">fichièr parcialament telecargat</comment>
<comment xml:lang="pl">Częściowo pobrany plik</comment>
- <comment xml:lang="pt">Ficheiro parcialmente transferido</comment>
- <comment xml:lang="pt_BR">Arquivo baixado parcialmente</comment>
+ <comment xml:lang="pt">ficheiro descarregado parcialmente</comment>
+ <comment xml:lang="pt-BR">Arquivo baixado parcialmente</comment>
<comment xml:lang="ru">Частично загруженный файл</comment>
<comment xml:lang="sk">Čiastočne stiahnutý súbor</comment>
<comment xml:lang="sl">Delno prenesena datoteka</comment>
@@ -754,8 +777,8 @@
<comment xml:lang="sv">Delvis hämtad fil</comment>
<comment xml:lang="tr">Kısmen indirilmiş dosya</comment>
<comment xml:lang="uk">частково отриманий файл</comment>
- <comment xml:lang="zh_CN">部分下载的文件</comment>
- <comment xml:lang="zh_TW">已部份下載的檔案</comment>
+ <comment xml:lang="zh-CN">部分下载的文件</comment>
+ <comment xml:lang="zh-TW">已部份下載的檔案</comment>
<generic-icon name="package-x-generic"/>
<glob pattern="*.wkdownload"/>
<glob pattern="*.crdownload"/>
@@ -763,10 +786,11 @@
</mime-type>
<mime-type type="application/oda">
<comment>ODA document</comment>
+ <comment xml:lang="af">ODA-dokument</comment>
<comment xml:lang="ar">مستند ODA</comment>
<comment xml:lang="ast">Documentu ODA</comment>
<comment xml:lang="az">ODA sənədi</comment>
- <comment xml:lang="be@latin">Dakument ODA</comment>
+ <comment xml:lang="be-Latn">Dakument ODA</comment>
<comment xml:lang="bg">Документ — ODA</comment>
<comment xml:lang="ca">document ODA</comment>
<comment xml:lang="cs">dokument ODA</comment>
@@ -774,13 +798,14 @@
<comment xml:lang="da">ODA-dokument</comment>
<comment xml:lang="de">ODA-Dokument</comment>
<comment xml:lang="el">Έγγραφο ODA</comment>
- <comment xml:lang="en_GB">ODA document</comment>
+ <comment xml:lang="en-GB">ODA document</comment>
<comment xml:lang="eo">ODA-dokumento</comment>
<comment xml:lang="es">documento ODA</comment>
<comment xml:lang="eu">ODA dokumentua</comment>
<comment xml:lang="fi">ODA-asiakirja</comment>
<comment xml:lang="fo">ODA skjal</comment>
<comment xml:lang="fr">document ODA</comment>
+ <comment xml:lang="fur">document ODA</comment>
<comment xml:lang="ga">cáipéis ODA</comment>
<comment xml:lang="gl">documento ODA</comment>
<comment xml:lang="he">מסמך ODA</comment>
@@ -802,7 +827,7 @@
<comment xml:lang="oc">document ODA</comment>
<comment xml:lang="pl">Dokument ODA</comment>
<comment xml:lang="pt">documento ODA</comment>
- <comment xml:lang="pt_BR">Documento ODA</comment>
+ <comment xml:lang="pt-BR">Documento ODA</comment>
<comment xml:lang="ro">Document ODA</comment>
<comment xml:lang="ru">Документ ODA</comment>
<comment xml:lang="sk">Dokument ODA</comment>
@@ -813,8 +838,8 @@
<comment xml:lang="tr">ODA belgesi</comment>
<comment xml:lang="uk">документ ODA</comment>
<comment xml:lang="vi">Tài liệu ODA</comment>
- <comment xml:lang="zh_CN">ODA 文档</comment>
- <comment xml:lang="zh_TW">ODA 文件</comment>
+ <comment xml:lang="zh-CN">ODA 文档</comment>
+ <comment xml:lang="zh-TW">ODA 文件</comment>
<acronym>ODA</acronym>
<expanded-acronym>Office Document Architecture</expanded-acronym>
<generic-icon name="x-office-document"/>
@@ -822,6 +847,7 @@
</mime-type>
<mime-type type="application/x-wwf">
<comment>WWF document</comment>
+ <comment xml:lang="af">WWF-dokument</comment>
<comment xml:lang="ast">Documentu WWF</comment>
<comment xml:lang="bg">Документ — WWF</comment>
<comment xml:lang="ca">document WWF</comment>
@@ -829,12 +855,13 @@
<comment xml:lang="da">WWF-dokument</comment>
<comment xml:lang="de">WWF-Dokument</comment>
<comment xml:lang="el">Έγγραφο WWF</comment>
- <comment xml:lang="en_GB">WWF document</comment>
+ <comment xml:lang="en-GB">WWF document</comment>
<comment xml:lang="eo">WWF-dokumento</comment>
<comment xml:lang="es">documento WWF</comment>
<comment xml:lang="eu">WWF dokumentua</comment>
<comment xml:lang="fi">WWF-asiakirja</comment>
<comment xml:lang="fr">document WWF</comment>
+ <comment xml:lang="fur">document WWF</comment>
<comment xml:lang="ga">cáipéis WWF</comment>
<comment xml:lang="gl">documento de WWF</comment>
<comment xml:lang="he">מסמך WWF</comment>
@@ -847,12 +874,13 @@
<comment xml:lang="ka">WWF დოკუმენტი</comment>
<comment xml:lang="kk">WWF құжаты</comment>
<comment xml:lang="ko">WWF 문서</comment>
+ <comment xml:lang="lt">WWF dokumentas</comment>
<comment xml:lang="lv">WWF dokuments</comment>
<comment xml:lang="nl">WWF document</comment>
<comment xml:lang="oc">document WWF</comment>
<comment xml:lang="pl">Dokument WWF</comment>
<comment xml:lang="pt">documento WWF</comment>
- <comment xml:lang="pt_BR">Documento WWF</comment>
+ <comment xml:lang="pt-BR">Documento WWF</comment>
<comment xml:lang="ru">Документ WWF</comment>
<comment xml:lang="sk">Dokument WWF</comment>
<comment xml:lang="sl">Dokument WWF</comment>
@@ -860,8 +888,8 @@
<comment xml:lang="sv">WWF-dokument</comment>
<comment xml:lang="tr">WWF belgesi</comment>
<comment xml:lang="uk">документ WWF</comment>
- <comment xml:lang="zh_CN">WWF</comment>
- <comment xml:lang="zh_TW">WWF 文件</comment>
+ <comment xml:lang="zh-CN">WWF</comment>
+ <comment xml:lang="zh-TW">WWF 文件</comment>
<generic-icon name="x-office-document"/>
<glob pattern="*.wwf"/>
<sub-class-of type="application/pdf"/>
@@ -869,9 +897,10 @@
</mime-type>
<mime-type type="application/pdf">
<comment>PDF document</comment>
+ <comment xml:lang="af">PDF-dokument</comment>
<comment xml:lang="ar">مستند PDF</comment>
<comment xml:lang="ast">Documentu PDF</comment>
- <comment xml:lang="be@latin">Dakument PDF</comment>
+ <comment xml:lang="be-Latn">Dakument PDF</comment>
<comment xml:lang="bg">Документ — PDF</comment>
<comment xml:lang="ca">document PDF</comment>
<comment xml:lang="cs">dokument PDF</comment>
@@ -879,13 +908,14 @@
<comment xml:lang="da">PDF-dokument</comment>
<comment xml:lang="de">PDF-Dokument</comment>
<comment xml:lang="el">Έγγραφο PDF</comment>
- <comment xml:lang="en_GB">PDF document</comment>
+ <comment xml:lang="en-GB">PDF document</comment>
<comment xml:lang="eo">PDF-dokumento</comment>
<comment xml:lang="es">documento PDF</comment>
<comment xml:lang="eu">PDF dokumentua</comment>
<comment xml:lang="fi">PDF-asiakirja</comment>
<comment xml:lang="fo">PDF skjal</comment>
<comment xml:lang="fr">document PDF</comment>
+ <comment xml:lang="fur">document PDF</comment>
<comment xml:lang="ga">cáipéis PDF</comment>
<comment xml:lang="gl">documento PDF</comment>
<comment xml:lang="he">מסמך PDF</comment>
@@ -906,7 +936,7 @@
<comment xml:lang="oc">document PDF</comment>
<comment xml:lang="pl">Dokument PDF</comment>
<comment xml:lang="pt">documento PDF</comment>
- <comment xml:lang="pt_BR">Documento PDF</comment>
+ <comment xml:lang="pt-BR">Documento PDF</comment>
<comment xml:lang="ro">Document PDF</comment>
<comment xml:lang="ru">Документ PDF</comment>
<comment xml:lang="sk">Dokument PDF</comment>
@@ -917,13 +947,13 @@
<comment xml:lang="tr">PDF belgesi</comment>
<comment xml:lang="uk">документ PDF</comment>
<comment xml:lang="vi">Tài liệu PDF</comment>
- <comment xml:lang="zh_CN">PDF 文档</comment>
- <comment xml:lang="zh_TW">PDF 文件</comment>
+ <comment xml:lang="zh-CN">PDF 文档</comment>
+ <comment xml:lang="zh-TW">PDF 文件</comment>
<acronym>PDF</acronym>
<expanded-acronym>Portable Document Format</expanded-acronym>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="%PDF-" type="string" offset="0:1024"/>
+ <match type="string" value="%PDF-" offset="0:1024"/>
</magic>
<glob pattern="*.pdf"/>
<alias type="application/x-pdf"/>
@@ -933,22 +963,24 @@
</mime-type>
<mime-type type="application/xspf+xml">
<comment>XSPF playlist</comment>
+ <comment xml:lang="af">XSPF-speellys</comment>
<comment xml:lang="ar">قائمة تشغيل XSPF</comment>
<comment xml:lang="ast">Llista de reproducción XSPF</comment>
- <comment xml:lang="be@latin">Śpis piesień XSPF</comment>
+ <comment xml:lang="be-Latn">Śpis piesień XSPF</comment>
<comment xml:lang="bg">Списък за изпълнение — XSPF</comment>
<comment xml:lang="ca">llista de reproducció XSPF</comment>
<comment xml:lang="cs">seznam k přehrání XSPF</comment>
<comment xml:lang="da">XSPF-afspilningsliste</comment>
<comment xml:lang="de">XSPF-Wiedergabeliste</comment>
<comment xml:lang="el">Λίστα αναπαραγωγής XSPF</comment>
- <comment xml:lang="en_GB">XSPF playlist</comment>
+ <comment xml:lang="en-GB">XSPF playlist</comment>
<comment xml:lang="eo">XSPF-ludlisto</comment>
<comment xml:lang="es">lista de reproducción XSPF</comment>
<comment xml:lang="eu">XSPF erreprodukzio-zerrenda</comment>
<comment xml:lang="fi">XSPF-soittolista</comment>
<comment xml:lang="fo">XSPF avspælingarlisti</comment>
<comment xml:lang="fr">liste de lecture XSPF</comment>
+ <comment xml:lang="fur">liste di riproduzion XSPF</comment>
<comment xml:lang="ga">seinmliosta XSPF</comment>
<comment xml:lang="gl">lista de reprodución XSPF</comment>
<comment xml:lang="he">רשימת נגינה XSPF</comment>
@@ -968,7 +1000,7 @@
<comment xml:lang="oc">lista de lectura XSPF</comment>
<comment xml:lang="pl">Lista odtwarzania XSPF</comment>
<comment xml:lang="pt">lista de reprodução XSPF</comment>
- <comment xml:lang="pt_BR">Lista de reprodução XSPF</comment>
+ <comment xml:lang="pt-BR">Lista de reprodução XSPF</comment>
<comment xml:lang="ro">Listă XSPF</comment>
<comment xml:lang="ru">Список воспроизведения XSPF</comment>
<comment xml:lang="sk">Zoznam skladieb XSPF</comment>
@@ -979,15 +1011,15 @@
<comment xml:lang="tr">XSPF çalma listesi</comment>
<comment xml:lang="uk">список програвання XSPF</comment>
<comment xml:lang="vi">Danh mục nhạc XSPF</comment>
- <comment xml:lang="zh_CN">XSPF 播放列表</comment>
- <comment xml:lang="zh_TW">XSPF 播放清單</comment>
+ <comment xml:lang="zh-CN">XSPF 播放列表</comment>
+ <comment xml:lang="zh-TW">XSPF 播放清單</comment>
<acronym>XSPF</acronym>
<expanded-acronym>XML Shareable Playlist Format</expanded-acronym>
<sub-class-of type="application/xml"/>
<generic-icon name="audio-x-generic"/>
<magic priority="50">
- <match value="&lt;playlist version=&quot;1" type="string" offset="0:64"/>
- <match value="&lt;playlist version='1" type="string" offset="0:64"/>
+ <match type="string" value="&lt;playlist version=&quot;1" offset="0:64"/>
+ <match type="string" value="&lt;playlist version='1" offset="0:64"/>
</magic>
<glob pattern="*.xspf"/>
<root-XML namespaceURI="http://xspf.org/ns/0/" localName="playlist"/>
@@ -995,6 +1027,7 @@
</mime-type>
<mime-type type="application/x-windows-themepack">
<comment>Microsoft Windows theme pack</comment>
+ <comment xml:lang="af">Microsoft Windows-temapak</comment>
<comment xml:lang="ar">حزمة سمات Microsoft Works</comment>
<comment xml:lang="ast">Paquete de temes de Microsoft Windows</comment>
<comment xml:lang="bg">Пакет с тема — Microsoft Windows</comment>
@@ -1003,12 +1036,13 @@
<comment xml:lang="da">Microsoft Windows-temapakke</comment>
<comment xml:lang="de">Microsoft-Windows-Themenpaket</comment>
<comment xml:lang="el">Πακέτο θέματος Microsoft Windows</comment>
- <comment xml:lang="en_GB">Microsoft Windows theme pack</comment>
+ <comment xml:lang="en-GB">Microsoft Windows theme pack</comment>
<comment xml:lang="es">paquete de tema para Microsoft Windows</comment>
<comment xml:lang="eu">Microsoft Windows-en gaiaren paketea</comment>
<comment xml:lang="fi">Microsoft Windows -teemapaketti</comment>
<comment xml:lang="fo">Microsoft Windows tema pakki</comment>
<comment xml:lang="fr">paquet de thèmes Microsoft Windows</comment>
+ <comment xml:lang="fur">pachet temis di Microsoft Windows</comment>
<comment xml:lang="ga">paca téamaí Microsoft Windows</comment>
<comment xml:lang="gl">paquete de tema de Microsoft Windows</comment>
<comment xml:lang="he">חבילת ערכות נושא של Microsoft Windows</comment>
@@ -1027,7 +1061,7 @@
<comment xml:lang="oc">paquet de tèmas Microsoft Windows</comment>
<comment xml:lang="pl">Pakiet motywu Microsoft Windows</comment>
<comment xml:lang="pt">pacote de tema Microsoft Windows</comment>
- <comment xml:lang="pt_BR">Pacote de temas do Microsoft Windows</comment>
+ <comment xml:lang="pt-BR">Pacote de temas do Microsoft Windows</comment>
<comment xml:lang="ro">Pachet de teme Microsoft Windows</comment>
<comment xml:lang="ru">Пакет темы Microsoft Windows</comment>
<comment xml:lang="sk">Balík tém Microsoft Windows</comment>
@@ -1036,24 +1070,28 @@
<comment xml:lang="sv">Microsoft Windows-temapaket</comment>
<comment xml:lang="tr">Microsoft Windows tema paketi</comment>
<comment xml:lang="uk">пакунок з темою Microsoft Windows</comment>
- <comment xml:lang="zh_CN">Microsoft Windows 主题包</comment>
- <comment xml:lang="zh_TW">微軟視窗佈景主題包</comment>
+ <comment xml:lang="zh-CN">Microsoft Windows 主题包</comment>
+ <comment xml:lang="zh-TW">微軟視窗佈景主題包</comment>
<sub-class-of type="application/vnd.ms-cab-compressed"/>
<generic-icon name="package-x-generic"/>
<glob pattern="*.themepack"/>
</mime-type>
<mime-type type="audio/x-amzxml">
<comment>AmazonMP3 download file</comment>
+ <comment xml:lang="af">AmazonMP3-aflaailêer</comment>
<comment xml:lang="ast">Ficheru de descarga AmazonMP3</comment>
+ <comment xml:lang="bg">Файл за изтегляне — AmazonMP3</comment>
<comment xml:lang="ca">fitxer baixat d'AmazonMP3</comment>
<comment xml:lang="cs">soubor stahování AmazonMP3</comment>
<comment xml:lang="da">AmazonMP3-downloadfil</comment>
<comment xml:lang="de">AmazonMP3-Herunterladedatei</comment>
<comment xml:lang="el">Αρχείο λήψης AmazonMP3</comment>
- <comment xml:lang="en_GB">AmazonMP3 download file</comment>
+ <comment xml:lang="en-GB">AmazonMP3 download file</comment>
<comment xml:lang="es">archivo de descarga de AmazonMP3</comment>
<comment xml:lang="eu">AmazonMP3 deskarga fitxategia</comment>
+ <comment xml:lang="fi">AmazonMP3-lataustiedosto</comment>
<comment xml:lang="fr">fichier téléchargé AmazonMP3</comment>
+ <comment xml:lang="fur">file discjariât AmazonMP3</comment>
<comment xml:lang="ga">comhad íoslódáilte AmazonMP3</comment>
<comment xml:lang="gl">Ficheiro de descarga de AmazonMP3</comment>
<comment xml:lang="he">קובץ הורדת AmazonMP3</comment>
@@ -1069,7 +1107,7 @@
<comment xml:lang="oc">fichièr telecargat AmazonMP3</comment>
<comment xml:lang="pl">Pobrany plik AmazonMP3</comment>
<comment xml:lang="pt">ficheiro transferido AmazonMP3</comment>
- <comment xml:lang="pt_BR">Arquivo de download AmazonMP3</comment>
+ <comment xml:lang="pt-BR">Arquivo de download AmazonMP3</comment>
<comment xml:lang="ru">Файл загрузки AmazonMP3</comment>
<comment xml:lang="sk">Stiahnutý súbor AmazonMP3 </comment>
<comment xml:lang="sl">Datoteka prenosa AmazonMP3</comment>
@@ -1077,12 +1115,13 @@
<comment xml:lang="sv">AmazonMP3-hämtningsfil</comment>
<comment xml:lang="tr">AmazonMP3 indirme dosyası</comment>
<comment xml:lang="uk">файл завантаження AmazonMP3</comment>
- <comment xml:lang="zh_CN">AmazonMP3 下载文件</comment>
- <comment xml:lang="zh_TW">AmazonMP3 下載檔</comment>
+ <comment xml:lang="zh-CN">AmazonMP3 下载文件</comment>
+ <comment xml:lang="zh-TW">AmazonMP3 下載檔</comment>
<glob pattern="*.amz"/>
</mime-type>
<mime-type type="audio/x-gsm">
<comment>GSM 06.10 audio</comment>
+ <comment xml:lang="af">GSM 06.10-oudio</comment>
<comment xml:lang="ar">GSM 06.10 سمعي</comment>
<comment xml:lang="ast">Audiu GSM 6.10</comment>
<comment xml:lang="bg">Аудио — GSM 06.10</comment>
@@ -1091,12 +1130,13 @@
<comment xml:lang="da">GSM 06.10-lyd</comment>
<comment xml:lang="de">GSM-06.10-Audio</comment>
<comment xml:lang="el">Ήχος GSM 06.10</comment>
- <comment xml:lang="en_GB">GSM 06.10 audio</comment>
- <comment xml:lang="es">sonido GSM 06.10</comment>
+ <comment xml:lang="en-GB">GSM 06.10 audio</comment>
+ <comment xml:lang="es">audio GSM 06.10</comment>
<comment xml:lang="eu">GSM 06.10 audioa</comment>
<comment xml:lang="fi">GSM 06.10 -ääni</comment>
<comment xml:lang="fo">GSM 06.10 ljóður</comment>
<comment xml:lang="fr">audio GSM 06.10</comment>
+ <comment xml:lang="fur">audio GSM 06.10</comment>
<comment xml:lang="ga">fuaim GSM 06.10</comment>
<comment xml:lang="gl">son de GSM 06.10</comment>
<comment xml:lang="he">שמע GSM 06.10</comment>
@@ -1115,7 +1155,7 @@
<comment xml:lang="oc">àudio GSM 06.10</comment>
<comment xml:lang="pl">Plik dźwiękowy GSM 06.10</comment>
<comment xml:lang="pt">áudio GSM 06.10</comment>
- <comment xml:lang="pt_BR">Áudio GSM 06.10</comment>
+ <comment xml:lang="pt-BR">Áudio GSM 06.10</comment>
<comment xml:lang="ro">GSM 06.10 audio</comment>
<comment xml:lang="ru">Аудио GSM 06.10</comment>
<comment xml:lang="sk">Zvuk GSM 06.10</comment>
@@ -1125,85 +1165,65 @@
<comment xml:lang="tr">GSM 06.10 ses dosyası</comment>
<comment xml:lang="uk">звук GSM 06.10</comment>
<comment xml:lang="vi">Âm thanh GSM 06.10</comment>
- <comment xml:lang="zh_CN">GSM 06.10 音频</comment>
- <comment xml:lang="zh_TW">GSM 06.10 音訊</comment>
+ <comment xml:lang="zh-CN">GSM 06.10 音频</comment>
+ <comment xml:lang="zh-TW">GSM 06.10 音訊</comment>
<acronym>GSM</acronym>
<expanded-acronym>Global System for Mobile communications</expanded-acronym>
<glob pattern="*.gsm"/>
</mime-type>
<mime-type type="audio/x-iriver-pla">
- <comment>iRiver Playlist</comment>
- <comment xml:lang="ar">قائمة تشغيل iRiver</comment>
- <comment xml:lang="ast">Llista de reproducción iRiver</comment>
- <comment xml:lang="be@latin">Śpis piesień iRiver</comment>
+ <comment>iRiver playlist</comment>
<comment xml:lang="bg">Списък за изпълнение — iRiver</comment>
<comment xml:lang="ca">llista de reproducció iRiver</comment>
- <comment xml:lang="cs">seznam k přehrání iRiver</comment>
<comment xml:lang="da">iRiver-afspilningsliste</comment>
<comment xml:lang="de">iRiver-Wiedergabeliste</comment>
- <comment xml:lang="el">Λίστα αναπαραγωγής iRiver</comment>
- <comment xml:lang="en_GB">iRiver Playlist</comment>
- <comment xml:lang="eo">iRiver-ludlisto</comment>
+ <comment xml:lang="en-GB">iRiver playlist</comment>
<comment xml:lang="es">lista de reproducción de iRiver</comment>
<comment xml:lang="eu">iRiver erreprodukzio-zerrenda</comment>
<comment xml:lang="fi">iRiver-soittolista</comment>
- <comment xml:lang="fo">iRiver avspælingarlisti</comment>
<comment xml:lang="fr">liste de lecture iRiver</comment>
- <comment xml:lang="ga">seinmliosta iRiver</comment>
- <comment xml:lang="gl">lista de reprodución de iRiver</comment>
- <comment xml:lang="he">רשימת נגינה של iRiver</comment>
<comment xml:lang="hr">iRiver popis izvođenja</comment>
<comment xml:lang="hu">iRiver lejátszólista</comment>
- <comment xml:lang="ia">Lista de selection iRiver</comment>
- <comment xml:lang="id">iRiver Playlist</comment>
+ <comment xml:lang="id">daftar putar iRiver</comment>
<comment xml:lang="it">Playlist iRiver</comment>
- <comment xml:lang="ja">iRiver 再生リスト</comment>
<comment xml:lang="kk">iRiver ойнау тізімі</comment>
- <comment xml:lang="ko">iRiver 재생 목록</comment>
- <comment xml:lang="lt">iRiver grojaraštis</comment>
- <comment xml:lang="lv">iRiver repertuārs</comment>
- <comment xml:lang="nb">iRiver-spilleliste</comment>
- <comment xml:lang="nl">iRiver-afspeellijst</comment>
- <comment xml:lang="nn">iRiver speleliste</comment>
- <comment xml:lang="oc">lista de lectura iRiver</comment>
+ <comment xml:lang="ko">아이리버 재생 목록</comment>
<comment xml:lang="pl">Lista odtwarzania iRiver</comment>
- <comment xml:lang="pt">lista de reprodução iRiver</comment>
- <comment xml:lang="pt_BR">Lista de reprodução do iRiver</comment>
- <comment xml:lang="ro">Listă iRiver</comment>
+ <comment xml:lang="pt">lista de reprodução do iRiver</comment>
+ <comment xml:lang="pt-BR">Lista de reprodução do iRiver</comment>
<comment xml:lang="ru">Список воспроизведения iRiver</comment>
<comment xml:lang="sk">Zoznam skladieb iRiver</comment>
<comment xml:lang="sl">Seznam predvajanja iRiver</comment>
- <comment xml:lang="sq">Listë titujsh iRiver</comment>
- <comment xml:lang="sr">иРивер списак нумера</comment>
<comment xml:lang="sv">iRiver-spellista</comment>
- <comment xml:lang="tr">iRiver Çalma Listesini</comment>
- <comment xml:lang="uk">список програвання iRiver</comment>
- <comment xml:lang="vi">danh mục nhạc iRiver</comment>
- <comment xml:lang="zh_CN">iRiver 播放列表</comment>
- <comment xml:lang="zh_TW">iRiver 播放清單</comment>
+ <comment xml:lang="tr">iRiver çalma listesi</comment>
+ <comment xml:lang="uk">список відтворення iRiver</comment>
+ <comment xml:lang="zh-CN">iRiver 播放列表</comment>
+ <comment xml:lang="zh-TW">iRiver 播放清單</comment>
<magic priority="50">
- <match value="iriver UMS PLA" type="string" offset="4"/>
+ <match type="string" value="iriver UMS PLA" offset="4"/>
</magic>
<glob pattern="*.pla"/>
</mime-type>
<mime-type type="application/pgp-encrypted">
<comment>PGP/MIME-encrypted message header</comment>
+ <comment xml:lang="af">Kop van PGP/MIME-geënkripteerde boodskap</comment>
<comment xml:lang="ar">ترويسة رسالة PGP/MIME-مشفرة</comment>
<comment xml:lang="ast">Testera de mensaxe cifrada en PGP/MIME</comment>
- <comment xml:lang="be@latin">Zahałovak paviedamleńnia, zašyfravany ŭ PGP/MIME</comment>
+ <comment xml:lang="be-Latn">Zahałovak paviedamleńnia, zašyfravany ŭ PGP/MIME</comment>
<comment xml:lang="bg">Заглавна част на шифрирано съобщение — PGP/MIME</comment>
<comment xml:lang="ca">capçalera de missatge amb xifrat PGP/MIME</comment>
<comment xml:lang="cs">záhlaví zprávy zašifrované pomocí PGP/MIME</comment>
<comment xml:lang="da">PGP-/MIME-krypteret meddelelseshoved</comment>
<comment xml:lang="de">PGP/MIME-verschlüsselter Nachrichtenkopf</comment>
<comment xml:lang="el">Κεφαλίδα μηνύματος κρυπτογραφημένου κατά PGP/MIME</comment>
- <comment xml:lang="en_GB">PGP/MIME-encrypted message header</comment>
+ <comment xml:lang="en-GB">PGP/MIME-encrypted message header</comment>
<comment xml:lang="eo">PGP/MIME-ĉifrita ĉapo de mesaĝo</comment>
<comment xml:lang="es">cabecera de mensaje cifrado PGP/MIME</comment>
- <comment xml:lang="eu">PGP/MIME enkriptatutako mezu-goiburua</comment>
+ <comment xml:lang="eu">PGP/MIME zifratutako mezu-goiburua</comment>
<comment xml:lang="fi">PGP/MIME-salattu viestiotsikko</comment>
<comment xml:lang="fo">PGP/MIME-encrypted boð tekshøvd</comment>
<comment xml:lang="fr">en-tête de message codé PGP/MIME</comment>
+ <comment xml:lang="fur">intestazion messaç cifrât in PGP/MIME</comment>
<comment xml:lang="ga">ceanntásc teachtaireachta ionchódaithe le PGP/MIME</comment>
<comment xml:lang="gl">cabeceira de mensaxe cifrado PGP/MIME</comment>
<comment xml:lang="he">כותר של קובץ מוצפן מסוג PGP/MIME</comment>
@@ -1224,7 +1244,7 @@
<comment xml:lang="oc">entèsta de messatge encodat PGP/MIME</comment>
<comment xml:lang="pl">Nagłówek listu zaszyfrowanego PGP/MIME</comment>
<comment xml:lang="pt">cabeçalho de mensagem encriptada com PGP/MIME</comment>
- <comment xml:lang="pt_BR">Cabeçalho de mensagem criptografada PGP/MIME</comment>
+ <comment xml:lang="pt-BR">Cabeçalho de mensagem criptografada PGP/MIME</comment>
<comment xml:lang="ro">Antet de mesaj encriptat PGP/MIME</comment>
<comment xml:lang="ru">Заголовок сообщения, зашифрованный PGP/MIME</comment>
<comment xml:lang="sk">Hlavičke správy zašifrovaná pomocou PGP/MIME</comment>
@@ -1235,24 +1255,25 @@
<comment xml:lang="tr">PGP/MIME-şifreli ileti başlığı</comment>
<comment xml:lang="uk">заголовок шифрованого PGP/MIME повідомлення</comment>
<comment xml:lang="vi">Phần đầu thông điệp đã mật mã bằng PGP/MIME</comment>
- <comment xml:lang="zh_CN">PGP/MIME 加密的信件头</comment>
- <comment xml:lang="zh_TW">PGP/MIME 加密訊息標頭</comment>
+ <comment xml:lang="zh-CN">PGP/MIME 加密的信件头</comment>
+ <comment xml:lang="zh-TW">PGP/MIME 加密訊息標頭</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<magic priority="50">
- <match value="-----BEGIN PGP MESSAGE-----" type="string" offset="0"/>
+ <match type="string" value="-----BEGIN PGP MESSAGE-----" offset="0"/>
</magic>
<glob pattern="*.pgp"/>
<glob pattern="*.gpg"/>
- <glob weight="10" pattern="*.asc"/>
+ <glob pattern="*.asc" weight="10"/>
<alias type="application/pgp"/>
</mime-type>
<mime-type type="application/pgp-keys">
<comment>PGP keys</comment>
+ <comment xml:lang="af">PGP-sleutels</comment>
<comment xml:lang="ar">مفاتيح PGP</comment>
<comment xml:lang="ast">Claves PGP</comment>
<comment xml:lang="az">PGP açarları</comment>
- <comment xml:lang="be@latin">Klučy PGP</comment>
+ <comment xml:lang="be-Latn">Klučy PGP</comment>
<comment xml:lang="bg">Ключове — PGP</comment>
<comment xml:lang="ca">claus PGP</comment>
<comment xml:lang="cs">klíče PGP</comment>
@@ -1260,13 +1281,14 @@
<comment xml:lang="da">PGP-nøgler</comment>
<comment xml:lang="de">PGP-Schlüssel</comment>
<comment xml:lang="el">Κλειδιά PGP</comment>
- <comment xml:lang="en_GB">PGP keys</comment>
+ <comment xml:lang="en-GB">PGP keys</comment>
<comment xml:lang="eo">PGP-ŝlosiloj</comment>
<comment xml:lang="es">claves PGP</comment>
<comment xml:lang="eu">PGP giltzak</comment>
<comment xml:lang="fi">PGP-avainrengas</comment>
<comment xml:lang="fo">PGP lyklar</comment>
<comment xml:lang="fr">clés PGP</comment>
+ <comment xml:lang="fur">clâfs PGP</comment>
<comment xml:lang="ga">eochracha PGP</comment>
<comment xml:lang="gl">Chaves PGP</comment>
<comment xml:lang="he">מפתחות PGP</comment>
@@ -1287,7 +1309,7 @@
<comment xml:lang="oc">claus PGP</comment>
<comment xml:lang="pl">Klucze PGP</comment>
<comment xml:lang="pt">chaves PGP</comment>
- <comment xml:lang="pt_BR">Chaves PGP</comment>
+ <comment xml:lang="pt-BR">Chaves PGP</comment>
<comment xml:lang="ro">Chei PGP</comment>
<comment xml:lang="ru">Ключи PGP</comment>
<comment xml:lang="sk">Kľúče PGP</comment>
@@ -1298,43 +1320,46 @@
<comment xml:lang="tr">PGP anahtarları</comment>
<comment xml:lang="uk">ключі PGP</comment>
<comment xml:lang="vi">Khoá PGP</comment>
- <comment xml:lang="zh_CN">PGP 密钥</comment>
- <comment xml:lang="zh_TW">PGP 鑰匙</comment>
+ <comment xml:lang="zh-CN">PGP 密钥</comment>
+ <comment xml:lang="zh-TW">PGP 金鑰</comment>
<acronym>PGP</acronym>
<expanded-acronym>Pretty Good Privacy</expanded-acronym>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<magic priority="50">
- <match value="-----BEGIN PGP PUBLIC KEY BLOCK-----" type="string" offset="0"/>
- <match value="-----BEGIN PGP PRIVATE KEY BLOCK-----" type="string" offset="0"/>
- <match value="0x9501" type="big16" offset="0"/>
- <match value="0x9500" type="big16" offset="0"/>
- <match value="0x9900" type="big16" offset="0"/>
- <match value="0x9901" type="big16" offset="0"/>
+ <match type="string" value="-----BEGIN PGP PUBLIC KEY BLOCK-----" offset="0"/>
+ <match type="string" value="-----BEGIN PGP PRIVATE KEY BLOCK-----" offset="0"/>
+ <match type="big16" value="0x9501" offset="0"/>
+ <match type="big16" value="0x9500" offset="0"/>
+ <match type="big16" value="0x9900" offset="0"/>
+ <match type="big16" value="0x9901" offset="0"/>
</magic>
<glob pattern="*.skr"/>
<glob pattern="*.pkr"/>
- <glob weight="10" pattern="*.asc"/>
+ <glob pattern="*.asc" weight="10"/>
<glob pattern="*.pgp"/>
<glob pattern="*.gpg"/>
+ <glob pattern="*.key"/>
</mime-type>
<mime-type type="application/pgp-signature">
<comment>detached OpenPGP signature</comment>
+ <comment xml:lang="af">losstaande OpenPGP-handtekening</comment>
<comment xml:lang="ar">إمضاء OpenPGP مفصول</comment>
- <comment xml:lang="be@latin">adłučany podpis OpenPGP</comment>
- <comment xml:lang="bg">Отделен подпис — OpenPGP</comment>
+ <comment xml:lang="be-Latn">adłučany podpis OpenPGP</comment>
+ <comment xml:lang="bg">Отделѐн подпис — OpenPGP</comment>
<comment xml:lang="ca">signatura OpenPGP abstreta</comment>
<comment xml:lang="cs">oddělený podpis OpenPGP</comment>
<comment xml:lang="da">frigjort OpenPGP-signatur</comment>
<comment xml:lang="de">isolierte OpenPGP-Signatur</comment>
<comment xml:lang="el">Αποκομμένη υπογραφή OpenPGP</comment>
- <comment xml:lang="en_GB">detached OpenPGP signature</comment>
+ <comment xml:lang="en-GB">detached OpenPGP signature</comment>
<comment xml:lang="eo">dekroĉa OpenPGP-subskribo</comment>
<comment xml:lang="es">firma OpenPGP separada</comment>
<comment xml:lang="eu">desuzturtako OpenPGP sinadura</comment>
<comment xml:lang="fi">erillinen OpenPGP-allekirjoitus</comment>
<comment xml:lang="fo">skild OpenPGP undirskrift</comment>
<comment xml:lang="fr">signature OpenPGP détachée</comment>
+ <comment xml:lang="fur">firme OpenPGP distacade</comment>
<comment xml:lang="ga">síniú OpenPGP scartha</comment>
<comment xml:lang="gl">sinatura de OpenPGP independente</comment>
<comment xml:lang="he">חתימת OpenPGP מנותקת</comment>
@@ -1355,7 +1380,7 @@
<comment xml:lang="oc">signatura OpenPGP destacada</comment>
<comment xml:lang="pl">Oddzielony podpis OpenPGP</comment>
<comment xml:lang="pt">assinatura OpenPGP solta</comment>
- <comment xml:lang="pt_BR">Assinatura OpenPGP destacada</comment>
+ <comment xml:lang="pt-BR">Assinatura OpenPGP destacada</comment>
<comment xml:lang="ro">semnătură OpenPGP detașată</comment>
<comment xml:lang="ru">Отсоединённая подпись OpenPGP</comment>
<comment xml:lang="sk">Oddelený podpis OpenPGP</comment>
@@ -1366,57 +1391,48 @@
<comment xml:lang="tr">müstakil OpenPGP imzası</comment>
<comment xml:lang="uk">відокремлений OpenPGP підпис</comment>
<comment xml:lang="vi">chữ ký OpenPGP tách rời</comment>
- <comment xml:lang="zh_CN">分离的 OpenPGP 签名</comment>
- <comment xml:lang="zh_TW">分離的 OpenPGP 簽章</comment>
+ <comment xml:lang="zh-CN">分离的 OpenPGP 签名</comment>
+ <comment xml:lang="zh-TW">分離的 OpenPGP 簽章</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<magic priority="50">
- <match value="-----BEGIN PGP SIGNATURE-----" type="string" offset="0"/>
+ <match type="string" value="-----BEGIN PGP SIGNATURE-----" offset="0"/>
</magic>
- <glob weight="10" pattern="*.asc"/>
+ <glob pattern="*.asc" weight="10"/>
<glob pattern="*.sig"/>
<glob pattern="*.pgp"/>
<glob pattern="*.gpg"/>
</mime-type>
-
+ <!-- defined in RFC 2311 -->
<mime-type type="application/pkcs7-mime">
- <comment>PKCS#7 Message or Certificate</comment>
- <comment xml:lang="ast">Mensaxe o certificáu PKCS#7</comment>
- <comment xml:lang="ca">missatge o certificat PKCS#7</comment>
- <comment xml:lang="cs">zpráva nebo certifikát PKCS#7</comment>
- <comment xml:lang="da">PKCS#7-besked eller certifikat</comment>
- <comment xml:lang="de">PKCS#7 Nachricht oder Zertifikat</comment>
- <comment xml:lang="el">Μήνυμα ή πιστοποιητικό PKCS#7</comment>
- <comment xml:lang="en_GB">PKCS#7 Message or Certificate</comment>
- <comment xml:lang="es">mensaje o certificado PKCS#7</comment>
- <comment xml:lang="eu">PKCS#7 mezu edo zertifikazioa</comment>
- <comment xml:lang="fi">PKCS#7-viesti tai -varmenne</comment>
- <comment xml:lang="fr">Message ou certificat PKCS#7</comment>
- <comment xml:lang="ga">Teachtaireacht nó Teastas PKCS#7</comment>
- <comment xml:lang="gl">Mensaxe ou certificado PKCS#7</comment>
- <comment xml:lang="he">הודעה או אישור מסוג PKCS#7</comment>
- <comment xml:lang="hr">PKCS#7 poruka ili vjerodajnica</comment>
- <comment xml:lang="hu">PKCS#7 üzenet vagy tanúsítvány</comment>
- <comment xml:lang="ia">Message o certificato PKCS#7</comment>
- <comment xml:lang="id">Sertifikat atau Pesan PKCS#7</comment>
- <comment xml:lang="it">Messaggio o certificato PKCS#7</comment>
- <comment xml:lang="ja">PKCS#7 メッセージまたは証明書</comment>
- <comment xml:lang="kk">PKCS#7 хабарламасы не сертификаты</comment>
- <comment xml:lang="ko">PKCS#7 메시지 또는 인증서</comment>
- <comment xml:lang="lv">PKCS#7 ziņojums vai sertifikāts</comment>
- <comment xml:lang="oc">Messatge o certificat PKCS#7</comment>
- <comment xml:lang="pl">Wiadomość lub certyfikat PKCS#7</comment>
- <comment xml:lang="pt">Mensagem ou certificado PKCS#7</comment>
- <comment xml:lang="pt_BR">Certificado ou Mensagem PKCS#7</comment>
- <comment xml:lang="ru">Сообщение или сертификат PKCS#7</comment>
- <comment xml:lang="sk">Správa alebo certifikát PKCS#7</comment>
- <comment xml:lang="sl">Sporočilo ali dovoljenje PKCS#7</comment>
- <comment xml:lang="sr">ПКЦС#7 порука или уверење</comment>
- <comment xml:lang="sv">PKCS#7-meddelande eller -certifikat</comment>
- <comment xml:lang="tr">PKCS#7 İletisi veya Sertifikası</comment>
- <comment xml:lang="uk">повідомлення або сертифікат PKCS#7</comment>
- <comment xml:lang="zh_CN">PKCS#7 消息或证书</comment>
- <comment xml:lang="zh_TW">PKCS#7 訊息或憑證</comment>
+ <comment>PKCS#7 file</comment>
+ <comment xml:lang="bg">Файл за PKCS#7</comment>
+ <comment xml:lang="ca">fitxer PKCS#7</comment>
+ <comment xml:lang="da">PKCS#7-fil</comment>
+ <comment xml:lang="de">PKCS#7-Datei</comment>
+ <comment xml:lang="en-GB">PKCS#7 file</comment>
+ <comment xml:lang="es">archivo PKCS#7</comment>
+ <comment xml:lang="eu">PKCS#7 fitxategia</comment>
+ <comment xml:lang="fi">PKCS#7-tiedosto</comment>
+ <comment xml:lang="fr">fichier PKCS#7</comment>
+ <comment xml:lang="hr">PKCS#7 datoteka</comment>
+ <comment xml:lang="hu">PKCS#7 fájl</comment>
+ <comment xml:lang="id">Berkas PKCS#7</comment>
+ <comment xml:lang="it">File PKCS#7</comment>
+ <comment xml:lang="kk">PKCS#7 файлы</comment>
+ <comment xml:lang="ko">PKCS#7 파일</comment>
+ <comment xml:lang="lt">PKCS#7 failas</comment>
+ <comment xml:lang="pl">Plik PKCS#7</comment>
+ <comment xml:lang="pt">ficheiro PKCS#7</comment>
+ <comment xml:lang="pt-BR">Arquivo PKCS#7</comment>
+ <comment xml:lang="ru">Файл PKCS#7</comment>
+ <comment xml:lang="sk">Súbor PKCS#7</comment>
+ <comment xml:lang="sl">Datoteka PKCS#7</comment>
+ <comment xml:lang="sv">PKCS#7-fil</comment>
+ <comment xml:lang="tr">PKCS#7 dosyası</comment>
+ <comment xml:lang="uk">файл PKCS#7</comment>
+ <comment xml:lang="zh-CN">PKCS#7 文件</comment>
+ <comment xml:lang="zh-TW">PKCS#7 檔案</comment>
<acronym>PKCS</acronym>
<expanded-acronym>Public-Key Cryptography Standards</expanded-acronym>
<generic-icon name="text-x-generic"/>
@@ -1425,21 +1441,23 @@
</mime-type>
<mime-type type="application/pkcs7-signature">
<comment>detached S/MIME signature</comment>
+ <comment xml:lang="af">losstaande S/MIME-handtekening</comment>
<comment xml:lang="ar">إمضاء S/MIME مفصول</comment>
- <comment xml:lang="be@latin">adłučany podpis S/MIME</comment>
- <comment xml:lang="bg">Отделен подпис — S/MIME</comment>
+ <comment xml:lang="be-Latn">adłučany podpis S/MIME</comment>
+ <comment xml:lang="bg">Отделѐн подпис — S/MIME</comment>
<comment xml:lang="ca">signatura S/MIME abstreta</comment>
<comment xml:lang="cs">oddělený podpis S/MIME</comment>
<comment xml:lang="da">frigjort S/MIME-signatur</comment>
<comment xml:lang="de">isolierte S/MIME-Signatur</comment>
<comment xml:lang="el">Αποκομμένη υπογραφή S/MIME</comment>
- <comment xml:lang="en_GB">detached S/MIME signature</comment>
+ <comment xml:lang="en-GB">detached S/MIME signature</comment>
<comment xml:lang="eo">dekroĉa S/MIME-subskribo</comment>
<comment xml:lang="es">firma S/MIME separada</comment>
<comment xml:lang="eu">desuzturtako S/MIME sinadura</comment>
<comment xml:lang="fi">erillinen S/MIME-allekirjoitus</comment>
<comment xml:lang="fo">skild S/MIME undirskrift</comment>
<comment xml:lang="fr">signature S/MIME détachée</comment>
+ <comment xml:lang="fur">firme S/MIME distacade</comment>
<comment xml:lang="ga">síniú S/MIME scartha</comment>
<comment xml:lang="gl">sinatura S/MIME independente</comment>
<comment xml:lang="he">חתימת S/MIME מנותקת</comment>
@@ -1460,7 +1478,7 @@
<comment xml:lang="oc">signatura S/MIME destacada</comment>
<comment xml:lang="pl">Oddzielony podpis S/MIME</comment>
<comment xml:lang="pt">assinatura S/MIME solta</comment>
- <comment xml:lang="pt_BR">Assinatura S/MIME destacada</comment>
+ <comment xml:lang="pt-BR">Assinatura S/MIME destacada</comment>
<comment xml:lang="ro">semnătură S/MIME detașată</comment>
<comment xml:lang="ru">Отсоединённая подпись S/MIME</comment>
<comment xml:lang="sk">Oddelený podpis S/MIME</comment>
@@ -1471,8 +1489,8 @@
<comment xml:lang="tr">müstakil S/MIME imzası</comment>
<comment xml:lang="uk">відокремлений S/MIME підпис</comment>
<comment xml:lang="vi">chữ ký S/MIME tách rời</comment>
- <comment xml:lang="zh_CN">分离的 S/MIME 签名</comment>
- <comment xml:lang="zh_TW">分離的 S/MIME 簽章</comment>
+ <comment xml:lang="zh-CN">分离的 S/MIME 签名</comment>
+ <comment xml:lang="zh-TW">分離的 S/MIME 簽章</comment>
<acronym>S/MIME</acronym>
<expanded-acronym>Secure/Multipurpose Internet Mail Extensions</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -1481,19 +1499,21 @@
</mime-type>
<mime-type type="application/pkcs8">
<comment>PKCS#8 private key</comment>
+ <comment xml:lang="af">PKCS#8- private sleutel</comment>
<comment xml:lang="ar">رزمة الشهادة PKCS#8</comment>
- <comment xml:lang="bg">Ключ, частен — PKCS#8</comment>
+ <comment xml:lang="bg">Ключ — PKCS#8, частен</comment>
<comment xml:lang="ca">clau privada PKCS#8</comment>
<comment xml:lang="cs">soukromý klíč PKCS#8</comment>
<comment xml:lang="da">PKCS#8-privat nøgle</comment>
- <comment xml:lang="de">PKCS#8 Geheimer Schlüssel</comment>
+ <comment xml:lang="de">PKCS#8 privater Schlüssel</comment>
<comment xml:lang="el">Ιδιωτικό κλειδί PKCS#8</comment>
- <comment xml:lang="en_GB">PKCS#8 private key</comment>
+ <comment xml:lang="en-GB">PKCS#8 private key</comment>
<comment xml:lang="es">clave privada PCKS#8</comment>
<comment xml:lang="eu">PKCS#8 gako pribatua</comment>
<comment xml:lang="fi">PKCS#8 yksityinen avain</comment>
<comment xml:lang="fo">PKCS#8 privatur lykil</comment>
<comment xml:lang="fr">clé privée PKCS#8</comment>
+ <comment xml:lang="fur">clâf privade PKCS#8</comment>
<comment xml:lang="ga">eochair phríobháideach PKCS#8</comment>
<comment xml:lang="gl">Chave privada PKCS#8</comment>
<comment xml:lang="he">מפתח פרטי של PKCS#8</comment>
@@ -1511,7 +1531,7 @@
<comment xml:lang="oc">clau privada PKCS#8</comment>
<comment xml:lang="pl">Klucz prywatny PKCS#8</comment>
<comment xml:lang="pt">chave privada PKCS#8</comment>
- <comment xml:lang="pt_BR">Chave privada PKCS#8</comment>
+ <comment xml:lang="pt-BR">Chave privada PKCS#8</comment>
<comment xml:lang="ro">Cheie privată PKCS#8</comment>
<comment xml:lang="ru">Личный ключ PKCS#8</comment>
<comment xml:lang="sk">Súkromný kľúč PKCS#8</comment>
@@ -1520,34 +1540,66 @@
<comment xml:lang="sv">Privat PKCS#8-nyckel</comment>
<comment xml:lang="tr">PKCS#8 özel anahtarı</comment>
<comment xml:lang="uk">закритий ключ PKCS#8</comment>
- <comment xml:lang="zh_CN">PKCS#8 私钥</comment>
- <comment xml:lang="zh_TW">PKCS#8 私人金鑰</comment>
+ <comment xml:lang="zh-CN">PKCS#8 私钥</comment>
+ <comment xml:lang="zh-TW">PKCS#8 私人金鑰</comment>
<acronym>PKCS</acronym>
<expanded-acronym>Public-Key Cryptography Standards</expanded-acronym>
<glob pattern="*.p8"/>
</mime-type>
<mime-type type="application/pkcs8-encrypted">
<comment>PKCS#8 private key (encrypted)</comment>
+ <comment xml:lang="af">PKCS#8- private sleutel (geënkripteer)</comment>
+ <comment xml:lang="bg">Ключ — PKCS#8, частен, шифриран</comment>
+ <comment xml:lang="ca">clau privada PKCS#8 (xifrada)</comment>
+ <comment xml:lang="cs">soukromý klíč PKCS#8 (zašifrovaný)</comment>
+ <comment xml:lang="da">PKCS#8-privat nøgle (krypteret)</comment>
+ <comment xml:lang="de">PKCS#8 privater Schlüssel (verschlüsselt)</comment>
+ <comment xml:lang="en-GB">PKCS#8 private key (encrypted)</comment>
+ <comment xml:lang="es">clave privada PKCS#8 (cifrada)</comment>
+ <comment xml:lang="eu">PKCS#8 gako pribatua (zifratua)</comment>
+ <comment xml:lang="fi">PKCS#8 yksityinen avain (salattu)</comment>
+ <comment xml:lang="fr">clé privée PKCS#8 (chiffrée)</comment>
+ <comment xml:lang="fur">clâf privade PKCS#8 (cifrade)</comment>
+ <comment xml:lang="ga">eochair phríobháideach PKCS#8 (criptithe)</comment>
+ <comment xml:lang="hr">PKCS#8 privatni ključ (šifriran)</comment>
+ <comment xml:lang="hu">PKCS#8 személyes kulcs (titkosított)</comment>
+ <comment xml:lang="id">Kunci privat PKCS#8 (terenkripsi)</comment>
+ <comment xml:lang="it">Chiave privata PKCS#8 (cifrata)</comment>
+ <comment xml:lang="kk">PKCS#8 жеке кілті (шифрленген)</comment>
+ <comment xml:lang="ko">PKCS#8 개인 키(암호화됨)</comment>
+ <comment xml:lang="pl">Klucz prywatny PKCS#8 (zaszyfrowany)</comment>
+ <comment xml:lang="pt">chave privada PKCS#8 (encriptada)</comment>
+ <comment xml:lang="pt-BR">Chave privada PKCS#8 (criptografada)</comment>
+ <comment xml:lang="ru">Личный ключ PKCS#8 (зашифрованный)</comment>
+ <comment xml:lang="sk">Súkromný kľúč PKCS#8 (šifrovaný)</comment>
+ <comment xml:lang="sl">Zasebni ključ PKCS#8 (širfirano)</comment>
+ <comment xml:lang="sv">Privat PKCS#8-nyckel (krypterad)</comment>
+ <comment xml:lang="tr">PKCS#8 özel anahtar (şifrelenmiş)</comment>
+ <comment xml:lang="uk">закритий ключ PKCS#8 (зашифрований)</comment>
+ <comment xml:lang="zh-CN">PKCS#8 私钥（已加密）</comment>
+ <comment xml:lang="zh-TW">PKCS#8 私人金鑰 (加密)</comment>
<acronym>PKCS</acronym>
<expanded-acronym>Public-Key Cryptography Standards</expanded-acronym>
<glob pattern="*.p8e"/>
</mime-type>
<mime-type type="application/pkcs10">
<comment>PKCS#10 certification request</comment>
+ <comment xml:lang="af">PKCS#10-sertifiseringsversoek</comment>
<comment xml:lang="ar">طلب شهادة PKCS#10</comment>
- <comment xml:lang="be@latin">Zapyt sertyfikacyi PKCS#10</comment>
+ <comment xml:lang="be-Latn">Zapyt sertyfikacyi PKCS#10</comment>
<comment xml:lang="bg">Заявка за сертификат — PKCS#10</comment>
<comment xml:lang="ca">sol·licitud de certificació PKCS#10</comment>
<comment xml:lang="cs">žádost o certifikát PKCS#10</comment>
<comment xml:lang="da">PKCS#10-certifikatanmodning</comment>
<comment xml:lang="de">PKCS#10-Zertifikatanfrage</comment>
<comment xml:lang="el">Αίτηση πιστοποίησης PKCS#10</comment>
- <comment xml:lang="en_GB">PKCS#10 certification request</comment>
+ <comment xml:lang="en-GB">PKCS#10 certification request</comment>
<comment xml:lang="es">petición de certificados PKCS#10</comment>
<comment xml:lang="eu">PKCS#10 ziurtagirien eskaera</comment>
<comment xml:lang="fi">PKCS#10-varmennepyyntö</comment>
<comment xml:lang="fo">PKCS#10 váttanarumbøn</comment>
<comment xml:lang="fr">requête de certification PKCS#10</comment>
+ <comment xml:lang="fur">richieste certificazion PKCS#10</comment>
<comment xml:lang="ga">iarratas dheimhniúchán PKCS#10</comment>
<comment xml:lang="gl">Solicitude de certificado PKCS#10</comment>
<comment xml:lang="he">בקשה מוסמכת PLCS#10</comment>
@@ -1567,7 +1619,7 @@
<comment xml:lang="oc">requèsta de certificacion PKCS#10</comment>
<comment xml:lang="pl">Żądanie certyfikatu PKCS#10</comment>
<comment xml:lang="pt">pedido de certificação PKCS#10</comment>
- <comment xml:lang="pt_BR">Pedido de certificação PKCS#12</comment>
+ <comment xml:lang="pt-BR">Pedido de certificação PKCS#12</comment>
<comment xml:lang="ro">Cerere de certificat PKCS#10</comment>
<comment xml:lang="ru">Запрос сертификации PKCS#10</comment>
<comment xml:lang="sk">Požiadavka na certifikát PKCS#10</comment>
@@ -1578,8 +1630,8 @@
<comment xml:lang="tr">PKCS#10 sertifika isteği</comment>
<comment xml:lang="uk">комплект сертифікатів PKCS#10</comment>
<comment xml:lang="vi">Yêu cầu chứng nhận PKCS#10</comment>
- <comment xml:lang="zh_CN">PKCS#10 认证请求</comment>
- <comment xml:lang="zh_TW">PKCS#10 憑證請求</comment>
+ <comment xml:lang="zh-CN">PKCS#10 认证请求</comment>
+ <comment xml:lang="zh-TW">PKCS#10 憑證請求</comment>
<acronym>PKCS</acronym>
<expanded-acronym>Public-Key Cryptography Standards</expanded-acronym>
<generic-icon name="text-x-generic"/>
@@ -1587,6 +1639,7 @@
</mime-type>
<mime-type type="application/pkix-cert">
<comment>X.509 certificate</comment>
+ <comment xml:lang="af">X.509-sertifikaat</comment>
<comment xml:lang="ar">شهادة X.509</comment>
<comment xml:lang="ast">Certificáu X.509</comment>
<comment xml:lang="bg">Сертификат — X.509</comment>
@@ -1595,12 +1648,13 @@
<comment xml:lang="da">X.509-certifikat</comment>
<comment xml:lang="de">X.509-Zertifikat</comment>
<comment xml:lang="el">Πιστοποιητικό X.509</comment>
- <comment xml:lang="en_GB">X.509 certificate</comment>
+ <comment xml:lang="en-GB">X.509 certificate</comment>
<comment xml:lang="es">certificado X.509</comment>
<comment xml:lang="eu">X.509 ziurtagiria</comment>
<comment xml:lang="fi">X.509-varmenne</comment>
<comment xml:lang="fo">X.509 prógv</comment>
<comment xml:lang="fr">certificat X.509</comment>
+ <comment xml:lang="fur">certificât X.509</comment>
<comment xml:lang="ga">teastas X.509</comment>
<comment xml:lang="gl">Certificado X.509</comment>
<comment xml:lang="he">אישור X.509</comment>
@@ -1618,7 +1672,7 @@
<comment xml:lang="oc">certificat X.509</comment>
<comment xml:lang="pl">Certyfikat X.509</comment>
<comment xml:lang="pt">certificado X.509</comment>
- <comment xml:lang="pt_BR">Certificado X.509</comment>
+ <comment xml:lang="pt-BR">Certificado X.509</comment>
<comment xml:lang="ro">Certificat X.509</comment>
<comment xml:lang="ru">Сертификат X.509</comment>
<comment xml:lang="sk">Certifikát X.509</comment>
@@ -1627,58 +1681,41 @@
<comment xml:lang="sv">X.509-certifikat</comment>
<comment xml:lang="tr">X.509 sertifikası</comment>
<comment xml:lang="uk">сертифікат X.509</comment>
- <comment xml:lang="zh_CN">X.509 证书</comment>
- <comment xml:lang="zh_TW">X.509 憑證</comment>
+ <comment xml:lang="zh-CN">X.509 证书</comment>
+ <comment xml:lang="zh-TW">X.509 憑證</comment>
<glob pattern="*.cer"/>
</mime-type>
<mime-type type="application/pkix-crl">
- <comment>Certificate revocation list</comment>
- <comment xml:lang="ar">قائمة إبطال الشهادات</comment>
- <comment xml:lang="ast">Llistáu de revocación de certificaos</comment>
+ <comment>certificate revocation list</comment>
<comment xml:lang="bg">Списък с отхвърлени сертификати</comment>
<comment xml:lang="ca">llista de revocació de certificats</comment>
- <comment xml:lang="cs">seznam odvolaných certifikátů</comment>
- <comment xml:lang="da">Certifikattilbagekaldelsesliste</comment>
- <comment xml:lang="de">Liste widerrufener Zertifikate</comment>
- <comment xml:lang="el">Λίστα ανάκλησης πιστοποιητικού</comment>
- <comment xml:lang="en_GB">Certificate revocation list</comment>
+ <comment xml:lang="da">certifikat tilbagetrækkelsesliste</comment>
+ <comment xml:lang="de">Zertifikatsperrliste</comment>
+ <comment xml:lang="en-GB">certificate revocation list</comment>
<comment xml:lang="es">lista de revocación de certificados</comment>
- <comment xml:lang="eu">Ziurtagiri-errebokatzeen zerrenda</comment>
+ <comment xml:lang="eu">ziurtagiri-errebokatzeen zerrenda</comment>
<comment xml:lang="fi">Varmenteiden sulkulista</comment>
- <comment xml:lang="fo">Prógv afturtøkulisti</comment>
<comment xml:lang="fr">liste de révocation de certificat</comment>
- <comment xml:lang="ga">Liosta teastas cúlghairmthe</comment>
- <comment xml:lang="gl">lista de certificados de revogación</comment>
- <comment xml:lang="he">רשימת אישורים מבוטלים</comment>
<comment xml:lang="hr">Popis opozvanih vjerodajnica</comment>
- <comment xml:lang="hu">Tanúsítvány-visszavonási lista</comment>
- <comment xml:lang="ia">Lista de revocation de certificatos</comment>
- <comment xml:lang="id">Daftar pencabutan sertificat (CRL)</comment>
+ <comment xml:lang="hu">tanúsítvány visszavonási lista</comment>
+ <comment xml:lang="id">daftar pencabutan sertifikat</comment>
<comment xml:lang="it">Elenco certificati di revoca</comment>
- <comment xml:lang="ja">証明書失効リスト</comment>
- <comment xml:lang="kk">Сертификатты қайта шақыру тізімі</comment>
+ <comment xml:lang="kk">сертификатты қайта шақыру тізімі</comment>
<comment xml:lang="ko">인증서 철회 목록</comment>
- <comment xml:lang="lt">Panaikintų liudijimų sąrašas</comment>
- <comment xml:lang="lv">Sertifikātu atsaukšanu saraksts</comment>
- <comment xml:lang="nl">Certificaat revocation lijst</comment>
- <comment xml:lang="oc">lista de revocacion de certificat</comment>
<comment xml:lang="pl">Lista unieważnień certyfikatów</comment>
<comment xml:lang="pt">lista de revogação de certificados</comment>
- <comment xml:lang="pt_BR">Lista de revogação de certificado</comment>
- <comment xml:lang="ro">Listă de revocare a certificatelor</comment>
- <comment xml:lang="ru">Список аннулирования сертификатов</comment>
- <comment xml:lang="sk">Zoznam zrušených certifikátov</comment>
- <comment xml:lang="sl">Datoteka seznama preklica potrdil</comment>
- <comment xml:lang="sr">списак повлачења уверења</comment>
- <comment xml:lang="sv">Spärrlista för certifikat</comment>
- <comment xml:lang="tr">Sertifika iptal listesi</comment>
+ <comment xml:lang="pt-BR">Lista de revogação de certificados</comment>
+ <comment xml:lang="ru">список аннулирования сертификатов</comment>
+ <comment xml:lang="sv">certifikatåterkallningslista</comment>
+ <comment xml:lang="tr">sertifika iptal listesi</comment>
<comment xml:lang="uk">список відкликання сертифікатів</comment>
- <comment xml:lang="zh_CN">证书吊销列表</comment>
- <comment xml:lang="zh_TW">憑證撤銷清單</comment>
+ <comment xml:lang="zh-CN">证书吊销列表</comment>
+ <comment xml:lang="zh-TW">憑證撤銷清單</comment>
<glob pattern="*.crl"/>
</mime-type>
<mime-type type="application/pkix-pkipath">
<comment>PkiPath certification path</comment>
+ <comment xml:lang="af">PkiPath-sertifiseringspad</comment>
<comment xml:lang="ar">مسار شهادة PkiPath</comment>
<comment xml:lang="ast">Camín de certificación PkiPath</comment>
<comment xml:lang="bg">Сертификационна верига — PkiPath</comment>
@@ -1687,12 +1724,13 @@
<comment xml:lang="da">PkiPath-certifikationssti</comment>
<comment xml:lang="de">PkiPath-Zertifikatspfad</comment>
<comment xml:lang="el">Διαδρομή πιστοποιητικού PkiPath</comment>
- <comment xml:lang="en_GB">PkiPath certification path</comment>
+ <comment xml:lang="en-GB">PkiPath certification path</comment>
<comment xml:lang="es">ruta de certificación PkiPath</comment>
<comment xml:lang="eu">PkiPath ziurtagirien bide-izena</comment>
<comment xml:lang="fi">PkiPath-varmennepolku</comment>
<comment xml:lang="fo">PkiPath váttanleið</comment>
<comment xml:lang="fr">chemin de certification PkiPath</comment>
+ <comment xml:lang="fur">percors di certificazion PkiPath</comment>
<comment xml:lang="ga">conair dheimhniúcháin PkiPath</comment>
<comment xml:lang="gl">Ruta de certificación PkiPath</comment>
<comment xml:lang="he">נתיב מאושר של PkiPath</comment>
@@ -1710,7 +1748,7 @@
<comment xml:lang="oc">camin de certificacion PkiPath</comment>
<comment xml:lang="pl">Ścieżka certyfikacji PkiPath</comment>
<comment xml:lang="pt">caminho de certificação PkiPath</comment>
- <comment xml:lang="pt_BR">Pedido de certificação PkiPath</comment>
+ <comment xml:lang="pt-BR">Pedido de certificação PkiPath</comment>
<comment xml:lang="ro">Cale certificare PkiPath</comment>
<comment xml:lang="ru">Путь сертификации PkiPath</comment>
<comment xml:lang="sk">Cesta k certifikátu PkiPath</comment>
@@ -1720,88 +1758,67 @@
<comment xml:lang="tr">PkiPath sertifika yolu</comment>
<comment xml:lang="uk">шлях сертифікації PkiPath</comment>
<comment xml:lang="vi">Đường dẫn cấp chứng nhận PkiPath</comment>
- <comment xml:lang="zh_CN">PkiPath 证书目录</comment>
- <comment xml:lang="zh_TW">PkiPath 憑證路徑</comment>
+ <comment xml:lang="zh-CN">PkiPath 证书目录</comment>
+ <comment xml:lang="zh-TW">PkiPath 憑證路徑</comment>
<glob pattern="*.pkipath"/>
</mime-type>
<mime-type type="application/postscript">
- <comment>PS document</comment>
- <comment xml:lang="ar">مستند PS</comment>
- <comment xml:lang="ast">Documentu PS</comment>
- <comment xml:lang="be@latin">Dakument PS</comment>
- <comment xml:lang="bg">Документ — PS</comment>
- <comment xml:lang="ca">document PS</comment>
- <comment xml:lang="cs">dokument PS</comment>
- <comment xml:lang="da">PS-dokument</comment>
- <comment xml:lang="de">PS-Dokument</comment>
- <comment xml:lang="el">Έγγραφο PS</comment>
- <comment xml:lang="en_GB">PS document</comment>
- <comment xml:lang="eo">PS-dokumento</comment>
- <comment xml:lang="es">documento PS</comment>
- <comment xml:lang="eu">PS dokumentua</comment>
- <comment xml:lang="fi">PS-asiakirja</comment>
- <comment xml:lang="fo">PS skjal</comment>
- <comment xml:lang="fr">document PS</comment>
- <comment xml:lang="ga">cáipéis PS</comment>
- <comment xml:lang="gl">documento PS</comment>
- <comment xml:lang="he">מסמך PS</comment>
- <comment xml:lang="hr">PS dokument</comment>
- <comment xml:lang="hu">PS dokumentum</comment>
- <comment xml:lang="ia">Documento PS</comment>
- <comment xml:lang="id">Dokumen PS</comment>
- <comment xml:lang="it">Documento PS</comment>
- <comment xml:lang="ja">PS ドキュメント</comment>
- <comment xml:lang="kk">PS құжаты</comment>
- <comment xml:lang="ko">PS 문서</comment>
- <comment xml:lang="lt">PS dokumentas</comment>
- <comment xml:lang="lv">PS dokuments</comment>
- <comment xml:lang="nb">PS-dokument</comment>
- <comment xml:lang="nl">PS-document</comment>
- <comment xml:lang="nn">PS-dokument</comment>
- <comment xml:lang="oc">document PS</comment>
- <comment xml:lang="pl">Dokument PS</comment>
- <comment xml:lang="pt">documento PS</comment>
- <comment xml:lang="pt_BR">Documento PS</comment>
- <comment xml:lang="ro">Document PS</comment>
- <comment xml:lang="ru">Документ PS</comment>
- <comment xml:lang="sk">Dokument PS</comment>
- <comment xml:lang="sl">Dokument PS</comment>
- <comment xml:lang="sq">Dokument PS</comment>
- <comment xml:lang="sr">ПС документ</comment>
- <comment xml:lang="sv">PS-dokument</comment>
- <comment xml:lang="tr">PS belgesi</comment>
- <comment xml:lang="uk">документ PS</comment>
- <comment xml:lang="vi">Tài liệu PS</comment>
- <comment xml:lang="zh_CN">PS 文档</comment>
- <comment xml:lang="zh_TW">Ps 文件</comment>
- <acronym>PS</acronym>
- <expanded-acronym>PostScript</expanded-acronym>
+ <comment>PostScript document</comment>
+ <comment xml:lang="bg">Документ — PostScrip</comment>
+ <comment xml:lang="ca">document PostScript</comment>
+ <comment xml:lang="da">PostScript-dokument</comment>
+ <comment xml:lang="de">PostScript-Dokument</comment>
+ <comment xml:lang="en-GB">PostScript document</comment>
+ <comment xml:lang="es">documento PostScript</comment>
+ <comment xml:lang="eu">PostScript dokumentua</comment>
+ <comment xml:lang="fi">PostScript-asiakirja</comment>
+ <comment xml:lang="fr">document PostScript</comment>
+ <comment xml:lang="hr">PostScript dokument</comment>
+ <comment xml:lang="hu">PostScript dokumentum</comment>
+ <comment xml:lang="id">Dokumen PostScript</comment>
+ <comment xml:lang="it">Documento PostScript</comment>
+ <comment xml:lang="kk">PostScript құжаты</comment>
+ <comment xml:lang="ko">포스트스크립트 문서</comment>
+ <comment xml:lang="lt">PostScript dokumentas</comment>
+ <comment xml:lang="pl">Dokument PostScript</comment>
+ <comment xml:lang="pt">documento PostScript</comment>
+ <comment xml:lang="pt-BR">Documento PostScript</comment>
+ <comment xml:lang="ru">Документ PostScript</comment>
+ <comment xml:lang="sk">Dokument PostScript</comment>
+ <comment xml:lang="sl">Dokument PostScript</comment>
+ <comment xml:lang="sv">Postscript-dokument</comment>
+ <comment xml:lang="tr">PostScript belgesi</comment>
+ <comment xml:lang="uk">документ PostScript</comment>
+ <comment xml:lang="zh-CN">PostScript 文档</comment>
+ <comment xml:lang="zh-TW">PostScript 文件</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="\004%!" type="string" offset="0"/>
- <match value="%!" type="string" offset="0"/>
+ <match type="string" value="\004%!" offset="0"/>
+ <match type="string" value="%!" offset="0"/>
</magic>
<glob pattern="*.ps"/>
</mime-type>
<mime-type type="application/prs.plucker">
<comment>Plucker document</comment>
+ <comment xml:lang="af">Plucker-dokument</comment>
<comment xml:lang="ar">مستند Plucker</comment>
<comment xml:lang="ast">Documentu Plucker</comment>
- <comment xml:lang="be@latin">Dakument Plucker</comment>
+ <comment xml:lang="be-Latn">Dakument Plucker</comment>
<comment xml:lang="bg">Документ — Plucker</comment>
<comment xml:lang="ca">document Plucker</comment>
<comment xml:lang="cs">dokument Plucker</comment>
<comment xml:lang="da">Pluckerdokument</comment>
<comment xml:lang="de">Plucker-Dokument</comment>
<comment xml:lang="el">Έγγραφο Plucker</comment>
- <comment xml:lang="en_GB">Plucker document</comment>
+ <comment xml:lang="en-GB">Plucker document</comment>
<comment xml:lang="eo">Plucker-dokumento</comment>
<comment xml:lang="es">documento de Plucker</comment>
<comment xml:lang="eu">Plucker dokumentua</comment>
<comment xml:lang="fi">Plucker-asiakirja</comment>
<comment xml:lang="fo">Plucker skjal</comment>
<comment xml:lang="fr">document Plucker</comment>
+ <comment xml:lang="fur">document Plucker</comment>
<comment xml:lang="ga">cáipéis Plucker</comment>
<comment xml:lang="gl">documento de Plucker</comment>
<comment xml:lang="he">מסמך של Plucker</comment>
@@ -1821,7 +1838,7 @@
<comment xml:lang="oc">document Plucker</comment>
<comment xml:lang="pl">Dokument Plucker</comment>
<comment xml:lang="pt">documento Plucker</comment>
- <comment xml:lang="pt_BR">Documento do Plucker</comment>
+ <comment xml:lang="pt-BR">Documento do Plucker</comment>
<comment xml:lang="ro">Document Plucker</comment>
<comment xml:lang="ru">Документ Plucker</comment>
<comment xml:lang="sk">Dokument Plucker</comment>
@@ -1832,54 +1849,61 @@
<comment xml:lang="tr">Plucker belgesi</comment>
<comment xml:lang="uk">документ Plucker</comment>
<comment xml:lang="vi">Tài liệu Plucker</comment>
- <comment xml:lang="zh_CN">Plucker 文档</comment>
- <comment xml:lang="zh_TW">Plucker 文件</comment>
+ <comment xml:lang="zh-CN">Plucker 文档</comment>
+ <comment xml:lang="zh-TW">Plucker 文件</comment>
<generic-icon name="x-office-document"/>
<magic priority="80">
- <match value="DataPlkr" type="string" offset="60"/>
+ <match type="string" value="DataPlkr" offset="60"/>
</magic>
</mime-type>
<mime-type type="application/raml+yaml">
<comment>RAML document</comment>
+ <comment xml:lang="af">RAML-dokument</comment>
<comment xml:lang="ast">Documentu RAML</comment>
+ <comment xml:lang="bg">Документ — RAML</comment>
<comment xml:lang="ca">document RAML</comment>
<comment xml:lang="cs">dokument RAML</comment>
<comment xml:lang="da">RAML-dokument</comment>
<comment xml:lang="de">RAML-Dokument</comment>
- <comment xml:lang="en_GB">RAML document</comment>
+ <comment xml:lang="en-GB">RAML document</comment>
<comment xml:lang="es">documento RAML</comment>
<comment xml:lang="eu">RAML dokumentua</comment>
<comment xml:lang="fi">RAML-asiakirja</comment>
<comment xml:lang="fr">document RAML</comment>
+ <comment xml:lang="fur">document RAML</comment>
<comment xml:lang="ga">cáipéis RAML</comment>
<comment xml:lang="he">מסמך RAML</comment>
<comment xml:lang="hr">RAML dokument</comment>
<comment xml:lang="hu">RAML dokumentum</comment>
- <comment xml:lang="id">dokumen RAML</comment>
+ <comment xml:lang="id">Dokumen RAML</comment>
<comment xml:lang="it">Documento RAML</comment>
<comment xml:lang="kk">RAML құжаты</comment>
<comment xml:lang="ko">RAML 문서</comment>
+ <comment xml:lang="lt">RAML dokumentas</comment>
<comment xml:lang="oc">Document RAML</comment>
<comment xml:lang="pl">Dokument RAML</comment>
- <comment xml:lang="pt_BR">Documento RAML</comment>
+ <comment xml:lang="pt">documento RAML</comment>
+ <comment xml:lang="pt-BR">Documento RAML</comment>
<comment xml:lang="ru">Документ RAML</comment>
<comment xml:lang="sk">Dokument RAML</comment>
+ <comment xml:lang="sl">Dokument RAML</comment>
<comment xml:lang="sr">РАМЛ документ</comment>
<comment xml:lang="sv">RAML-dokument</comment>
<comment xml:lang="tr">RAML belgesi</comment>
<comment xml:lang="uk">документ RAML</comment>
- <comment xml:lang="zh_CN">RAML 文档</comment>
- <comment xml:lang="zh_TW">RAML 文件</comment>
+ <comment xml:lang="zh-CN">RAML 文档</comment>
+ <comment xml:lang="zh-TW">RAML 文件</comment>
<acronym>RAML</acronym>
<expanded-acronym>RESTful API Modeling Language</expanded-acronym>
<sub-class-of type="application/x-yaml"/>
<magic>
- <match value="#%RAML " type="string" offset="0"/>
+ <match type="string" value="#%RAML " offset="0"/>
</magic>
<glob pattern="*.raml"/>
</mime-type>
<mime-type type="application/relax-ng-compact-syntax">
<comment>RELAX NG XML schema</comment>
+ <comment xml:lang="af">RELAX NG XML-skema</comment>
<comment xml:lang="ar">مخطط RELAX NG XML</comment>
<comment xml:lang="bg">Схема за XML — RELAX NG</comment>
<comment xml:lang="ca">esquema XML en RELAX NG</comment>
@@ -1887,11 +1911,12 @@
<comment xml:lang="da">RELAX NG XML-skema</comment>
<comment xml:lang="de">RELAX NG XML-Schema</comment>
<comment xml:lang="el">Σχήμα RELAX NG XML</comment>
- <comment xml:lang="en_GB">RELAX NG XML schema</comment>
+ <comment xml:lang="en-GB">RELAX NG XML schema</comment>
<comment xml:lang="es">esquema XML RELAX NG</comment>
<comment xml:lang="eu">RELAX NG XML eskema</comment>
<comment xml:lang="fi">RELAX NG XML-skeema</comment>
<comment xml:lang="fr">schéma XML RELAX NG</comment>
+ <comment xml:lang="fur">scheme XML RELAX NG</comment>
<comment xml:lang="ga">scéimre XML RELAX NG</comment>
<comment xml:lang="gl">Esquema XML RELAX NG</comment>
<comment xml:lang="he">סכנת RELAX NG XML</comment>
@@ -1909,7 +1934,7 @@
<comment xml:lang="oc">esquèma XML RELAX NG</comment>
<comment xml:lang="pl">Schemat XML RELAX NG</comment>
<comment xml:lang="pt">Esquema RELAX NG XML</comment>
- <comment xml:lang="pt_BR">Esquema XML de RELAX NG</comment>
+ <comment xml:lang="pt-BR">Esquema XML de RELAX NG</comment>
<comment xml:lang="ro">Schemă RELAX NG XML</comment>
<comment xml:lang="ru">XML-схема RELAX NG</comment>
<comment xml:lang="sk">XML schéma RELAX NG</comment>
@@ -1918,8 +1943,8 @@
<comment xml:lang="sv">RELAX NG XML-schema</comment>
<comment xml:lang="tr">RELAX NG XML şeması</comment>
<comment xml:lang="uk">XML-схема RELAX NG</comment>
- <comment xml:lang="zh_CN">RELAX NG XML 模式</comment>
- <comment xml:lang="zh_TW">RELAX NG XML schema</comment>
+ <comment xml:lang="zh-CN">RELAX NG XML 模式</comment>
+ <comment xml:lang="zh-TW">RELAX NG XML 綱要</comment>
<acronym>RELAX NG</acronym>
<expanded-acronym>REgular LAnguage for XML Next Generation</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -1929,22 +1954,24 @@
</mime-type>
<mime-type type="application/rtf">
<comment>RTF document</comment>
+ <comment xml:lang="af">RTF-dokument</comment>
<comment xml:lang="ar">مستند RTF</comment>
<comment xml:lang="ast">Documentu RTF</comment>
- <comment xml:lang="be@latin">Dakument RTF</comment>
+ <comment xml:lang="be-Latn">Dakument RTF</comment>
<comment xml:lang="bg">Документ — RTF</comment>
<comment xml:lang="ca">document RTF</comment>
<comment xml:lang="cs">dokument RTF</comment>
<comment xml:lang="da">RTF-dokument</comment>
<comment xml:lang="de">RTF-Dokument</comment>
<comment xml:lang="el">Έγγραφο RTF</comment>
- <comment xml:lang="en_GB">RTF document</comment>
+ <comment xml:lang="en-GB">RTF document</comment>
<comment xml:lang="eo">RTF-dokumento</comment>
<comment xml:lang="es">documento RTF</comment>
<comment xml:lang="eu">RTF dokumentua</comment>
<comment xml:lang="fi">RTF-asiakirja</comment>
<comment xml:lang="fo">RTF skjal</comment>
<comment xml:lang="fr">document RTF</comment>
+ <comment xml:lang="fur">document RTF</comment>
<comment xml:lang="ga">cáipéis RTF</comment>
<comment xml:lang="gl">documento RTF</comment>
<comment xml:lang="he">מסמך RTF</comment>
@@ -1964,7 +1991,7 @@
<comment xml:lang="oc">document RTF</comment>
<comment xml:lang="pl">Dokument RTF</comment>
<comment xml:lang="pt">documento RTF</comment>
- <comment xml:lang="pt_BR">Documento RTF</comment>
+ <comment xml:lang="pt-BR">Documento RTF</comment>
<comment xml:lang="ro">Document RTF</comment>
<comment xml:lang="ru">Документ RTF</comment>
<comment xml:lang="sk">Dokument RTF</comment>
@@ -1975,33 +2002,35 @@
<comment xml:lang="tr">RTF belgesi</comment>
<comment xml:lang="uk">документ RTF</comment>
<comment xml:lang="vi">Tài liệu RTF</comment>
- <comment xml:lang="zh_CN">RTF 文档</comment>
- <comment xml:lang="zh_TW">RTF 文件</comment>
+ <comment xml:lang="zh-CN">RTF 文档</comment>
+ <comment xml:lang="zh-TW">RTF 文件</comment>
<acronym>RTF</acronym>
<expanded-acronym>Rich Text Format</expanded-acronym>
<sub-class-of type="text/plain"/>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="{\\rtf" type="string" offset="0"/>
+ <match type="string" value="{\\rtf" offset="0"/>
</magic>
<glob pattern="*.rtf"/>
<alias type="text/rtf"/>
</mime-type>
<mime-type type="application/sieve">
<comment>Sieve mail filter script</comment>
+ <comment xml:lang="af">Sieve-posfiltreerskrip</comment>
<comment xml:lang="ar">سكربت مرشح بريد Sieve</comment>
- <comment xml:lang="be@latin">Skrypt filtravańnia pošty Sieve</comment>
+ <comment xml:lang="be-Latn">Skrypt filtravańnia pošty Sieve</comment>
<comment xml:lang="bg">Скрипт-филтър за пресяване на поща</comment>
<comment xml:lang="ca">script de filtre de correu Sieve</comment>
<comment xml:lang="cs">skript poštovního filtru Sieve</comment>
<comment xml:lang="da">Sieve e-post-filterprogram</comment>
<comment xml:lang="de">Sieve-E-Mail-Filterskript</comment>
<comment xml:lang="el">Δέσμη ενεργειών φιλτραρίσματος αλληλογραφίας Sieve</comment>
- <comment xml:lang="en_GB">Sieve mail filter script</comment>
+ <comment xml:lang="en-GB">Sieve mail filter script</comment>
<comment xml:lang="es">secuencia de órdenes de filtro en Sieve</comment>
<comment xml:lang="eu">Sieve posta-iragazki script-a</comment>
<comment xml:lang="fi">Sieve-postinsuodatuskomentotiedosto</comment>
<comment xml:lang="fr">script de filtrage de courriel Sieve</comment>
+ <comment xml:lang="fur">script filtri pueste Sieve</comment>
<comment xml:lang="ga">script scagaire r-phost Sieve</comment>
<comment xml:lang="gl">Script de filtro de correo Sieve</comment>
<comment xml:lang="he">תסריט סינון דואר של Sieve</comment>
@@ -2021,7 +2050,7 @@
<comment xml:lang="oc">escript de filtratge de corrièr electronic Sieve</comment>
<comment xml:lang="pl">Skrypt filtra poczty Sieve</comment>
<comment xml:lang="pt">Script de filtragem de correio Sieve</comment>
- <comment xml:lang="pt_BR">Script de filtro de mensagens do Sieve</comment>
+ <comment xml:lang="pt-BR">Script de filtro de mensagens do Sieve</comment>
<comment xml:lang="ro">Script filtrare email Sieve</comment>
<comment xml:lang="ru">Сценарий почтового фильтра Sieve</comment>
<comment xml:lang="sk">Skript poštového filtra Sieve</comment>
@@ -2029,33 +2058,35 @@
<comment xml:lang="sq">Script filtrim poste Sieve</comment>
<comment xml:lang="sr">Сјев скрипта пропусника поште</comment>
<comment xml:lang="sv">Sieve-epostfilterskript</comment>
- <comment xml:lang="tr">Sieve posta filtre betiği</comment>
+ <comment xml:lang="tr">Sieve posta süzgeç betiği</comment>
<comment xml:lang="uk">скрипт поштового фільтру Sieve</comment>
<comment xml:lang="vi">Văn lệnh lọc thư Sieve</comment>
- <comment xml:lang="zh_CN">Sieve 邮件过滤脚本</comment>
- <comment xml:lang="zh_TW">Sieve 郵件過濾指令稿</comment>
+ <comment xml:lang="zh-CN">Sieve 邮件过滤脚本</comment>
+ <comment xml:lang="zh-TW">Sieve 郵件篩選指令稿</comment>
<sub-class-of type="application/xml"/>
<generic-icon name="text-x-script"/>
<glob pattern="*.siv"/>
</mime-type>
<mime-type type="application/smil+xml">
<comment>SMIL document</comment>
+ <comment xml:lang="af">SMIL-dokument</comment>
<comment xml:lang="ar">مستند SMIL</comment>
<comment xml:lang="ast">Documentu SMIL</comment>
- <comment xml:lang="be@latin">Dakument SMIL</comment>
+ <comment xml:lang="be-Latn">Dakument SMIL</comment>
<comment xml:lang="bg">Документ — SMIL</comment>
<comment xml:lang="ca">document SMIL</comment>
<comment xml:lang="cs">dokument SMIL</comment>
<comment xml:lang="da">SMIL-dokument</comment>
<comment xml:lang="de">SMIL-Dokument</comment>
<comment xml:lang="el">Έγγραφο SMIL</comment>
- <comment xml:lang="en_GB">SMIL document</comment>
+ <comment xml:lang="en-GB">SMIL document</comment>
<comment xml:lang="eo">SMIL-dokumento</comment>
<comment xml:lang="es">documento SMIL</comment>
<comment xml:lang="eu">SMIL dokumentua</comment>
<comment xml:lang="fi">SMIL-asiakirja</comment>
<comment xml:lang="fo">SMIL skjal</comment>
<comment xml:lang="fr">document SMIL</comment>
+ <comment xml:lang="fur">document SMIL</comment>
<comment xml:lang="ga">cáipéis SMIL</comment>
<comment xml:lang="gl">documento SMIL</comment>
<comment xml:lang="he">מסמך SMIL</comment>
@@ -2075,7 +2106,7 @@
<comment xml:lang="oc">document SMIL</comment>
<comment xml:lang="pl">Dokument SMIL</comment>
<comment xml:lang="pt">documento SMIL</comment>
- <comment xml:lang="pt_BR">Documento SMIL</comment>
+ <comment xml:lang="pt-BR">Documento SMIL</comment>
<comment xml:lang="ro">Document SMIL</comment>
<comment xml:lang="ru">Документ SMIL</comment>
<comment xml:lang="sk">Dokument SMIL</comment>
@@ -2086,8 +2117,8 @@
<comment xml:lang="tr">SMIL belgesi</comment>
<comment xml:lang="uk">документ SMIL</comment>
<comment xml:lang="vi">Tài liệu SMIL</comment>
- <comment xml:lang="zh_CN">SMIL 文档</comment>
- <comment xml:lang="zh_TW">SMIL 文件</comment>
+ <comment xml:lang="zh-CN">SMIL 文档</comment>
+ <comment xml:lang="zh-TW">SMIL 文件</comment>
<acronym>SMIL</acronym>
<expanded-acronym>Synchronized Multimedia Integration Language</expanded-acronym>
<sub-class-of type="application/xml"/>
@@ -2098,7 +2129,7 @@
<glob pattern="*.sml"/>
<glob pattern="*.kino"/>
<magic priority="55">
- <match value="&lt;smil" type="string" offset="0:256"/>
+ <match type="string" value="&lt;smil" offset="0:256"/>
</magic>
<root-XML namespaceURI="http://www.w3.org/2001/SMIL20/Language" localName="smil"/>
<root-XML namespaceURI="http://www.w3.org/2005/SMIL21/Language" localName="smil"/>
@@ -2106,6 +2137,7 @@
</mime-type>
<mime-type type="application/vnd.ms-wpl">
<comment>WPL playlist</comment>
+ <comment xml:lang="af">WPL-speellys</comment>
<comment xml:lang="ar">قائمة تشغيل WPL</comment>
<comment xml:lang="bg">Списък за изпълнение — WPL</comment>
<comment xml:lang="ca">llista de reproducció WPL</comment>
@@ -2113,13 +2145,14 @@
<comment xml:lang="da">WPL-afspilningsliste</comment>
<comment xml:lang="de">WPL-Wiedergabeliste</comment>
<comment xml:lang="el">Λίστα αναπαραγωγής WPL</comment>
- <comment xml:lang="en_GB">WPL playlist</comment>
+ <comment xml:lang="en-GB">WPL playlist</comment>
<comment xml:lang="eo">WPL-ludlisto</comment>
<comment xml:lang="es">lista de reproducción WPL</comment>
<comment xml:lang="eu">WPL erreprodukzio-zerrenda</comment>
<comment xml:lang="fi">WPL-soittolista</comment>
<comment xml:lang="fo">WPL avspælingarlisti</comment>
<comment xml:lang="fr">liste de lecture WPL</comment>
+ <comment xml:lang="fur">liste di riproduzion WPL</comment>
<comment xml:lang="ga">seinmliosta WPL</comment>
<comment xml:lang="gl">lista de reprodución WPL</comment>
<comment xml:lang="he">רשימת נגינה WPL</comment>
@@ -2137,7 +2170,7 @@
<comment xml:lang="oc">lista de lectura WPL</comment>
<comment xml:lang="pl">Lista odtwarzania WPL</comment>
<comment xml:lang="pt">lista de reprodução WPL</comment>
- <comment xml:lang="pt_BR">Lista de reprodução do WPL</comment>
+ <comment xml:lang="pt-BR">Lista de reprodução do WPL</comment>
<comment xml:lang="ro">Listă redare WPL</comment>
<comment xml:lang="ru">Список воспроизведения WPL</comment>
<comment xml:lang="sk">Zoznam skladieb WPL</comment>
@@ -2147,33 +2180,35 @@
<comment xml:lang="tr">WPL çalma listesi</comment>
<comment xml:lang="uk">список відтворення WPL</comment>
<comment xml:lang="vi">Danh mục nhạc WPL</comment>
- <comment xml:lang="zh_CN">WPL 播放列表</comment>
- <comment xml:lang="zh_TW">WPL 播放清單</comment>
+ <comment xml:lang="zh-CN">WPL 播放列表</comment>
+ <comment xml:lang="zh-TW">WPL 播放清單</comment>
<acronym>WPL</acronym>
<expanded-acronym>Windows Media Player Playlist</expanded-acronym>
<generic-icon name="video-x-generic"/>
<glob pattern="*.wpl"/>
<magic priority="60">
- <match value="&lt;?wpl" type="string" offset="0:256"/>
+ <match type="string" value="&lt;?wpl" offset="0:256"/>
</magic>
</mime-type>
<mime-type type="application/x-sqlite2">
<comment>SQLite2 database</comment>
+ <comment xml:lang="af">SQLite2-databasis</comment>
<comment xml:lang="ar">قاعدة بيانات SQLite2</comment>
- <comment xml:lang="be@latin">Baza źviestak SQLite2</comment>
+ <comment xml:lang="be-Latn">Baza źviestak SQLite2</comment>
<comment xml:lang="bg">База от данни — SQLite2</comment>
<comment xml:lang="ca">base de dades SQLite2</comment>
<comment xml:lang="cs">databáze SQLite2</comment>
<comment xml:lang="da">SQLite2-database</comment>
<comment xml:lang="de">SQLite2-Datenbank</comment>
<comment xml:lang="el">Βάση δεδομένων SQLite2</comment>
- <comment xml:lang="en_GB">SQLite2 database</comment>
+ <comment xml:lang="en-GB">SQLite2 database</comment>
<comment xml:lang="eo">SQLite2-datumbazo</comment>
<comment xml:lang="es">base de datos SQLite2</comment>
<comment xml:lang="eu">SQLite2 datu-basea</comment>
<comment xml:lang="fi">SQLite2-tietokanta</comment>
<comment xml:lang="fo">SQLite2 dátustovnur</comment>
<comment xml:lang="fr">base de données SQLite2</comment>
+ <comment xml:lang="fur">base di dâts SQLite2</comment>
<comment xml:lang="ga">bunachar sonraí SQLite2</comment>
<comment xml:lang="gl">base de datos SQLite2</comment>
<comment xml:lang="he">מסד נתונים מסוג SQLite2</comment>
@@ -2193,7 +2228,7 @@
<comment xml:lang="oc">banca de donadas SQLite2</comment>
<comment xml:lang="pl">Baza danych SQLite2</comment>
<comment xml:lang="pt">base de dados SQLite2</comment>
- <comment xml:lang="pt_BR">Banco de dados SQLite2</comment>
+ <comment xml:lang="pt-BR">Banco de dados SQLite2</comment>
<comment xml:lang="ro">Bază de date SQLite2</comment>
<comment xml:lang="ru">База данных SQLite2</comment>
<comment xml:lang="sk">Databáza SQLite2</comment>
@@ -2201,33 +2236,35 @@
<comment xml:lang="sq">Bazë me të dhëna SQLite2</comment>
<comment xml:lang="sr">СКуЛајт2 база података</comment>
<comment xml:lang="sv">SQLite2-databas</comment>
- <comment xml:lang="tr">SQLite2 veritabanı</comment>
+ <comment xml:lang="tr">SQLite2 veri tabanı</comment>
<comment xml:lang="uk">База даних SQLite2</comment>
<comment xml:lang="vi">Cơ sở dữ liệu SQLite2</comment>
- <comment xml:lang="zh_CN">SQLite2 数据库</comment>
- <comment xml:lang="zh_TW">SQLite2 資料庫</comment>
+ <comment xml:lang="zh-CN">SQLite2 数据库</comment>
+ <comment xml:lang="zh-TW">SQLite2 資料庫</comment>
<glob pattern="*.sqlite2"/>
<magic>
- <match value="** This file contains an SQLite" type="string" offset="0"/>
+ <match type="string" value="** This file contains an SQLite" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/vnd.sqlite3">
<comment>SQLite3 database</comment>
+ <comment xml:lang="af">SQLite3-databasis</comment>
<comment xml:lang="ar">قاعدة بيانات SQLite3</comment>
- <comment xml:lang="be@latin">Baza źviestak SQLite3</comment>
+ <comment xml:lang="be-Latn">Baza źviestak SQLite3</comment>
<comment xml:lang="bg">База от данни — SQLite3</comment>
<comment xml:lang="ca">base de dades SQLite3</comment>
<comment xml:lang="cs">databáze SQLite3</comment>
<comment xml:lang="da">SQLite3-database</comment>
<comment xml:lang="de">SQLite3-Datenbank</comment>
<comment xml:lang="el">Βάση δεδομένων SQLite3</comment>
- <comment xml:lang="en_GB">SQLite3 database</comment>
+ <comment xml:lang="en-GB">SQLite3 database</comment>
<comment xml:lang="eo">SQLite3-datumbazo</comment>
<comment xml:lang="es">base de datos SQLite3</comment>
<comment xml:lang="eu">SQLite3 datu-basea</comment>
<comment xml:lang="fi">SQLite3-tietokanta</comment>
<comment xml:lang="fo">SQLite3 dátustovnur</comment>
<comment xml:lang="fr">base de données SQLite3</comment>
+ <comment xml:lang="fur">base di dâts SQLite3</comment>
<comment xml:lang="ga">bunachar sonraí SQLite3</comment>
<comment xml:lang="gl">base de datos SQLite3</comment>
<comment xml:lang="he">מסד נתונים מסוג SQLite3</comment>
@@ -2247,7 +2284,7 @@
<comment xml:lang="oc">banca de donadas SQLite3</comment>
<comment xml:lang="pl">Baza danych SQLite3</comment>
<comment xml:lang="pt">base de dados SQLite3</comment>
- <comment xml:lang="pt_BR">Banco de dados SQLite3</comment>
+ <comment xml:lang="pt-BR">Banco de dados SQLite3</comment>
<comment xml:lang="ro">Bază de date SQLite3</comment>
<comment xml:lang="ru">База данных SQLite3</comment>
<comment xml:lang="sk">Databáza SQLite3</comment>
@@ -2255,33 +2292,57 @@
<comment xml:lang="sq">Bazë me të dhëna SQLite3</comment>
<comment xml:lang="sr">СКуЛајт3 база података</comment>
<comment xml:lang="sv">SQLite3-databas</comment>
- <comment xml:lang="tr">SQLite3 veritabanı</comment>
+ <comment xml:lang="tr">SQLite3 veri tabanı</comment>
<comment xml:lang="uk">база даних SQLite3</comment>
<comment xml:lang="vi">Cơ sở dữ liệu SQLite3</comment>
- <comment xml:lang="zh_CN">SQLite3 数据库</comment>
- <comment xml:lang="zh_TW">SQLite3 資料庫</comment>
+ <comment xml:lang="zh-CN">SQLite3 数据库</comment>
+ <comment xml:lang="zh-TW">SQLite3 資料庫</comment>
<glob pattern="*.sqlite3"/>
<magic>
- <match value="SQLite format 3" type="string" offset="0"/>
+ <match type="string" value="SQLite format 3" offset="0"/>
</magic>
<alias type="application/x-sqlite3"/>
</mime-type>
+ <mime-type type="application/x-apple-systemprofiler+xml">
+ <comment>Apple System Profiler</comment>
+ <comment xml:lang="ca">System Profiler d'Apple</comment>
+ <comment xml:lang="da">Apple System Profiler</comment>
+ <comment xml:lang="de">Apple-Systeminformationen</comment>
+ <comment xml:lang="en-GB">Apple System Profiler</comment>
+ <comment xml:lang="es">perfil del sistema de Apple</comment>
+ <comment xml:lang="fi">Applen järjestelmän profiloija</comment>
+ <comment xml:lang="hr">Apple profiler sustava</comment>
+ <comment xml:lang="it">Profiler di sistema Apple</comment>
+ <comment xml:lang="pl">Profiler komputera Apple</comment>
+ <comment xml:lang="pt">Perfilador do sistema Apple</comment>
+ <comment xml:lang="sv">Apple Systeminformation</comment>
+ <comment xml:lang="uk">засіб профілювання системи Apple</comment>
+ <comment xml:lang="zh-CN">Apple 系统概述</comment>
+ <sub-class-of type="application/xml"/>
+ <magic priority="50">
+ <match type="string" value="&lt;plist version=&quot;1.0&quot;" offset="0:256"/>
+ </magic>
+ <glob pattern="*.spx" weight="40"/>
+ <root-XML namespaceURI="http://www.apple.com/DTDs/PropertyList-1.0.dtd" localName="plist"/>
+ </mime-type>
<mime-type type="application/x-gedcom">
<comment>GEDCOM family history</comment>
+ <comment xml:lang="af">GEDCOM-familiegeskiedenis</comment>
<comment xml:lang="ar">تاريخ عائلة GEDCOM</comment>
- <comment xml:lang="be@latin">Siamiejnaja historyja GEDCOM</comment>
+ <comment xml:lang="be-Latn">Siamiejnaja historyja GEDCOM</comment>
<comment xml:lang="bg">Родословно дърво — GEDCOM</comment>
<comment xml:lang="ca">antecedents familiars GEDCOM</comment>
<comment xml:lang="cs">rodokmen GEDCOM</comment>
<comment xml:lang="da">GEDCOM-familiehistorie</comment>
<comment xml:lang="de">GEDCOM-Stammbaum</comment>
<comment xml:lang="el">Οικογενειακό ιστορικό GEDCOM</comment>
- <comment xml:lang="en_GB">GEDCOM family history</comment>
+ <comment xml:lang="en-GB">GEDCOM family history</comment>
<comment xml:lang="es">historial familiar de GEDCOM</comment>
<comment xml:lang="eu">GEDCOM famili historia</comment>
<comment xml:lang="fi">GEDCOM-sukuhistoria</comment>
<comment xml:lang="fo">GEDCOM familjusøga</comment>
<comment xml:lang="fr">généalogie GEDCOM</comment>
+ <comment xml:lang="fur">gjenealogjie GEDCOM</comment>
<comment xml:lang="ga">stair theaghlach GEDCOM</comment>
<comment xml:lang="gl">historial de familia GEDCOM</comment>
<comment xml:lang="he">היסטוריה משפחתית של GEDCOM</comment>
@@ -2302,7 +2363,7 @@
<comment xml:lang="oc">genealogia GEDCOM</comment>
<comment xml:lang="pl">Plik historii rodziny GEDCOM</comment>
<comment xml:lang="pt">história familiar GEDCOM</comment>
- <comment xml:lang="pt_BR">Histórico familiar do GEDCOM</comment>
+ <comment xml:lang="pt-BR">Histórico familiar do GEDCOM</comment>
<comment xml:lang="ro">Tablou genealogic GEDCOM</comment>
<comment xml:lang="ru">История семьи GEDCOM</comment>
<comment xml:lang="sk">Rodokmeň GEDCOM</comment>
@@ -2313,13 +2374,13 @@
<comment xml:lang="tr">GEDCOM aile geçmişi</comment>
<comment xml:lang="uk">історія родини GEDCOM</comment>
<comment xml:lang="vi">Lịch sử gia đình GEDCOM</comment>
- <comment xml:lang="zh_CN">GEDCOM 家谱</comment>
- <comment xml:lang="zh_TW">GEDCOM 家族史</comment>
+ <comment xml:lang="zh-CN">GEDCOM 家谱</comment>
+ <comment xml:lang="zh-TW">GEDCOM 族譜</comment>
<acronym>GEDCOM</acronym>
<expanded-acronym>GEnealogical Data COMmunication</expanded-acronym>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="0 HEAD" type="string" offset="0"/>
+ <match type="string" value="0 HEAD" offset="0"/>
</magic>
<glob pattern="*.ged"/>
<glob pattern="*.gedcom"/>
@@ -2327,22 +2388,24 @@
</mime-type>
<mime-type type="video/x-flv">
<comment>Flash video</comment>
+ <comment xml:lang="af">Flash-video</comment>
<comment xml:lang="ar">Flash مرئي</comment>
<comment xml:lang="ast">Videu en Flash</comment>
- <comment xml:lang="be@latin">Videa Flash</comment>
+ <comment xml:lang="be-Latn">Videa Flash</comment>
<comment xml:lang="bg">Видео — Flash</comment>
<comment xml:lang="ca">vídeo de Flash</comment>
<comment xml:lang="cs">video Flash</comment>
<comment xml:lang="da">Flashvideo</comment>
<comment xml:lang="de">Flash-Video</comment>
<comment xml:lang="el">Βίντεο Flash</comment>
- <comment xml:lang="en_GB">Flash video</comment>
+ <comment xml:lang="en-GB">Flash video</comment>
<comment xml:lang="eo">Flash-video</comment>
<comment xml:lang="es">vídeo Flash</comment>
<comment xml:lang="eu">Flash bideoa</comment>
<comment xml:lang="fi">Flash-video</comment>
<comment xml:lang="fo">Flash video</comment>
<comment xml:lang="fr">vidéo Flash</comment>
+ <comment xml:lang="fur">video Flash</comment>
<comment xml:lang="ga">físeán Flash</comment>
<comment xml:lang="gl">vídeo Flash</comment>
<comment xml:lang="he">וידאו של פלאש</comment>
@@ -2363,7 +2426,7 @@
<comment xml:lang="oc">vidèo Flash</comment>
<comment xml:lang="pl">Plik wideo Flash</comment>
<comment xml:lang="pt">vídeo Flash</comment>
- <comment xml:lang="pt_BR">Vídeo Flash</comment>
+ <comment xml:lang="pt-BR">Vídeo Flash</comment>
<comment xml:lang="ro">Video Flash</comment>
<comment xml:lang="ru">Видео Flash</comment>
<comment xml:lang="sk">Video Flash</comment>
@@ -2374,11 +2437,11 @@
<comment xml:lang="tr">Flash video</comment>
<comment xml:lang="uk">відеокліп Flash</comment>
<comment xml:lang="vi">Ảnh động Flash</comment>
- <comment xml:lang="zh_CN">Flash 视频</comment>
- <comment xml:lang="zh_TW">Flash 視訊</comment>
+ <comment xml:lang="zh-CN">Flash 视频</comment>
+ <comment xml:lang="zh-TW">Flash 視訊</comment>
<generic-icon name="video-x-generic"/>
<magic priority="50">
- <match value="FLV" type="string" offset="0"/>
+ <match type="string" value="FLV" offset="0"/>
</magic>
<glob pattern="*.flv"/>
<alias type="application/x-flash-video"/>
@@ -2387,6 +2450,7 @@
</mime-type>
<mime-type type="video/x-javafx">
<comment>JavaFX video</comment>
+ <comment xml:lang="af">JavaFX-video</comment>
<comment xml:lang="ast">Videu en JavaFX</comment>
<comment xml:lang="bg">Видео — JavaFX</comment>
<comment xml:lang="ca">vídeo de JavaFX</comment>
@@ -2394,13 +2458,14 @@
<comment xml:lang="da">JavaFX-video</comment>
<comment xml:lang="de">JavaFX-Video</comment>
<comment xml:lang="el">Βίντεο JavaFX</comment>
- <comment xml:lang="en_GB">JavaFX video</comment>
+ <comment xml:lang="en-GB">JavaFX video</comment>
<comment xml:lang="eo">JavaFX-video</comment>
<comment xml:lang="es">vídeo JavaFX</comment>
<comment xml:lang="eu">JavaFX bideoa</comment>
<comment xml:lang="fi">JavaFX-video</comment>
<comment xml:lang="fo">JavaFX video</comment>
<comment xml:lang="fr">vidéo JavaFX</comment>
+ <comment xml:lang="fur">video JavaFX</comment>
<comment xml:lang="ga">físeán JavaFX</comment>
<comment xml:lang="gl">vídeo JavaFX</comment>
<comment xml:lang="he">וידאו JavaFX</comment>
@@ -2412,12 +2477,13 @@
<comment xml:lang="ja">JavaFX 動画</comment>
<comment xml:lang="kk">JavaFX аудиосы</comment>
<comment xml:lang="ko">JavaFX 동영상</comment>
+ <comment xml:lang="lt">JavaFX vaizdo įrašas</comment>
<comment xml:lang="lv">JavaFX video</comment>
<comment xml:lang="nl">JavaFX video</comment>
<comment xml:lang="oc">vidèo JavaFX</comment>
<comment xml:lang="pl">Plik wideo JavaFX</comment>
<comment xml:lang="pt">vídeo JavaFX</comment>
- <comment xml:lang="pt_BR">Vídeo JavaFX</comment>
+ <comment xml:lang="pt-BR">Vídeo JavaFX</comment>
<comment xml:lang="ro">Video JavaFX</comment>
<comment xml:lang="ru">Видео JavaFX</comment>
<comment xml:lang="sk">Video JavaFX</comment>
@@ -2426,32 +2492,36 @@
<comment xml:lang="sv">JavaFX-video</comment>
<comment xml:lang="tr">JavaFX video</comment>
<comment xml:lang="uk">відеокліп JavaFX</comment>
- <comment xml:lang="zh_CN">JavaFX 视频</comment>
- <comment xml:lang="zh_TW">JavaFX 視訊</comment>
+ <comment xml:lang="zh-CN">JavaFX 视频</comment>
+ <comment xml:lang="zh-TW">JavaFX 視訊</comment>
<generic-icon name="video-x-generic"/>
<magic priority="40">
- <match value="FLV" type="string" offset="0"/>
+ <match type="string" value="FLV" offset="0"/>
</magic>
<glob pattern="*.fxm"/>
<sub-class-of type="video/x-flv"/>
</mime-type>
<mime-type type="application/x-go-sgf">
-
+ <!-- translators: a record is in this context a description of a board game
+ that has been played, and that can be played back again:
+ http://www.red-bean.com/sgf/ -->
<comment>SGF record</comment>
+ <comment xml:lang="af">SGF-rekord</comment>
<comment xml:lang="ar">تسجيلة SGF</comment>
- <comment xml:lang="be@latin">Zapisanaja hulnia SGF</comment>
+ <comment xml:lang="be-Latn">Zapisanaja hulnia SGF</comment>
<comment xml:lang="bg">Запис — SGF</comment>
<comment xml:lang="ca">registre SGF</comment>
<comment xml:lang="cs">nahrávka SGF</comment>
<comment xml:lang="da">SGF-optagelse</comment>
<comment xml:lang="de">SGF-Aufzeichnung</comment>
<comment xml:lang="el">Εγγραφή SGF</comment>
- <comment xml:lang="en_GB">SGF record</comment>
+ <comment xml:lang="en-GB">SGF record</comment>
<comment xml:lang="es">grabación SGF</comment>
<comment xml:lang="eu">SGF erregistroa</comment>
<comment xml:lang="fi">SGF-nauhoitus</comment>
<comment xml:lang="fo">SGF met</comment>
<comment xml:lang="fr">partie SGF</comment>
+ <comment xml:lang="fur">regjistrazion SGF</comment>
<comment xml:lang="ga">taifead SGF</comment>
<comment xml:lang="gl">Grabación SGF</comment>
<comment xml:lang="he">הקלטת SGF</comment>
@@ -2471,7 +2541,7 @@
<comment xml:lang="oc">partida SGF</comment>
<comment xml:lang="pl">Zapis gry SGF</comment>
<comment xml:lang="pt">gravação SGF</comment>
- <comment xml:lang="pt_BR">Gravação SGF</comment>
+ <comment xml:lang="pt-BR">Gravação SGF</comment>
<comment xml:lang="ro">Înregistrare SGF</comment>
<comment xml:lang="ru">Запись SGF</comment>
<comment xml:lang="sk">Záznam SGF</comment>
@@ -2482,35 +2552,37 @@
<comment xml:lang="tr">SGF kaydı</comment>
<comment xml:lang="uk">запис SGF</comment>
<comment xml:lang="vi">Mục ghi SGF</comment>
- <comment xml:lang="zh_CN">SGF 记录</comment>
- <comment xml:lang="zh_TW">SGF 紀錄</comment>
+ <comment xml:lang="zh-CN">SGF 记录</comment>
+ <comment xml:lang="zh-TW">SGF 紀錄</comment>
<acronym>SGF</acronym>
<expanded-acronym>Smart Game Format</expanded-acronym>
<generic-icon name="text-x-generic"/>
<glob pattern="*.sgf"/>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="(;FF[3]" type="string" offset="0"/>
- <match value="(;FF[4]" type="string" offset="0"/>
+ <match type="string" value="(;FF[3]" offset="0"/>
+ <match type="string" value="(;FF[4]" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/xliff+xml">
<comment>XLIFF translation file</comment>
+ <comment xml:lang="af">XLIFF-vertaallêer</comment>
<comment xml:lang="ar">ملف ترجمة XLIFF</comment>
<comment xml:lang="ast">Ficheru de traducciones XLIFF</comment>
- <comment xml:lang="be@latin">Fajł pierakładu XLIFF</comment>
+ <comment xml:lang="be-Latn">Fajł pierakładu XLIFF</comment>
<comment xml:lang="bg">Превод — XLIFF</comment>
<comment xml:lang="ca">fitxer de traducció XLIFF</comment>
<comment xml:lang="cs">soubor překladu XLIFF</comment>
<comment xml:lang="da">XLIFF-oversættelsesfil</comment>
<comment xml:lang="de">XLIFF-Übersetzung</comment>
<comment xml:lang="el">Αρχείο μετάφρασης XLIFF</comment>
- <comment xml:lang="en_GB">XLIFF translation file</comment>
+ <comment xml:lang="en-GB">XLIFF translation file</comment>
<comment xml:lang="es">archivo de traducción XLIFF</comment>
<comment xml:lang="eu">XLIFF itzulpen-fitxategia</comment>
<comment xml:lang="fi">XLIFF-käännöstiedosto</comment>
<comment xml:lang="fo">XLIFF týðingarfíla</comment>
<comment xml:lang="fr">fichier de traduction XLIFF</comment>
+ <comment xml:lang="fur">file di traduzion XLIFF</comment>
<comment xml:lang="ga">comhad aistriúcháin XLIFF</comment>
<comment xml:lang="gl">ficheiro de tradución XLIFF</comment>
<comment xml:lang="he">קובץ תרגום CLIFF</comment>
@@ -2530,7 +2602,7 @@
<comment xml:lang="oc">fichièr de traduccion XLIFF</comment>
<comment xml:lang="pl">Plik tłumaczenia XLIFF</comment>
<comment xml:lang="pt">ficheiro de tradução XLIFF</comment>
- <comment xml:lang="pt_BR">Arquivo de tradução XLIFF</comment>
+ <comment xml:lang="pt-BR">Arquivo de tradução XLIFF</comment>
<comment xml:lang="ro">Fișier de traducere XLIFF</comment>
<comment xml:lang="ru">Файл перевода XLIFF</comment>
<comment xml:lang="sk">Súbor prekladu XLIFF</comment>
@@ -2541,8 +2613,8 @@
<comment xml:lang="tr">XLIFF çeviri dosyası</comment>
<comment xml:lang="uk">файл перекладу XLIFF</comment>
<comment xml:lang="vi">Tập tin dịch XLIFF</comment>
- <comment xml:lang="zh_CN">XLIFF 翻译文件</comment>
- <comment xml:lang="zh_TW">XLIFF 翻譯檔</comment>
+ <comment xml:lang="zh-CN">XLIFF 翻译文件</comment>
+ <comment xml:lang="zh-TW">XLIFF 翻譯檔</comment>
<acronym>XLIFF</acronym>
<expanded-acronym>XML Localization Interchange File Format</expanded-acronym>
<sub-class-of type="application/xml"/>
@@ -2550,13 +2622,14 @@
<glob pattern="*.xlf"/>
<glob pattern="*.xliff"/>
<magic priority="80">
- <match value="&lt;xliff" type="string" offset="0:256"/>
+ <match type="string" value="&lt;xliff" offset="0:256"/>
</magic>
- <root-XML namespaceURI='urn:oasis:names:tc:xliff:document:1.1' localName='xliff'/>
+ <root-XML namespaceURI="urn:oasis:names:tc:xliff:document:1.1" localName="xliff"/>
<alias type="application/x-xliff"/>
</mime-type>
<mime-type type="application/x-yaml">
<comment>YAML document</comment>
+ <comment xml:lang="af">YAML-dokument</comment>
<comment xml:lang="ar">مستند YAML</comment>
<comment xml:lang="ast">Documentu YAML</comment>
<comment xml:lang="bg">Документ — YAML</comment>
@@ -2565,13 +2638,14 @@
<comment xml:lang="da">YAML-dokument</comment>
<comment xml:lang="de">YAML-Dokument</comment>
<comment xml:lang="el">Έγγραφο YAML</comment>
- <comment xml:lang="en_GB">YAML document</comment>
+ <comment xml:lang="en-GB">YAML document</comment>
<comment xml:lang="eo">YAML-dokumento</comment>
<comment xml:lang="es">documento YAML</comment>
<comment xml:lang="eu">YAML dokumentua</comment>
<comment xml:lang="fi">YAML-asiakirja</comment>
<comment xml:lang="fo">YAML skjal</comment>
<comment xml:lang="fr">document YAML</comment>
+ <comment xml:lang="fur">document YAML</comment>
<comment xml:lang="ga">cáipéis YAML</comment>
<comment xml:lang="gl">documento YAML</comment>
<comment xml:lang="he">מסמך YAML</comment>
@@ -2589,7 +2663,7 @@
<comment xml:lang="oc">document YAML</comment>
<comment xml:lang="pl">Dokument YAML</comment>
<comment xml:lang="pt">documento YAML</comment>
- <comment xml:lang="pt_BR">Documento YAML</comment>
+ <comment xml:lang="pt-BR">Documento YAML</comment>
<comment xml:lang="ro">Document YAML</comment>
<comment xml:lang="ru">Документ YAML</comment>
<comment xml:lang="sk">Dokument YAML</comment>
@@ -2598,14 +2672,14 @@
<comment xml:lang="sv">YAML-dokument</comment>
<comment xml:lang="tr">YAML belgesi</comment>
<comment xml:lang="uk">документ YAML</comment>
- <comment xml:lang="zh_CN">YAML 文档</comment>
- <comment xml:lang="zh_TW">YAML 文件</comment>
+ <comment xml:lang="zh-CN">YAML 文档</comment>
+ <comment xml:lang="zh-TW">YAML 文件</comment>
<acronym>YAML</acronym>
<expanded-acronym>YAML Ain't Markup Language</expanded-acronym>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<magic>
- <match value="%YAML" type="string" offset="0"/>
+ <match type="string" value="%YAML" offset="0"/>
</magic>
<glob pattern="*.yaml"/>
<glob pattern="*.yml"/>
@@ -2614,10 +2688,11 @@
</mime-type>
<mime-type type="application/vnd.corel-draw">
<comment>Corel Draw drawing</comment>
+ <comment xml:lang="af">Corel Draw-tekening</comment>
<comment xml:lang="ar">تصميم Corel Draw</comment>
<comment xml:lang="ast">Dibuxu de Corel Draw</comment>
<comment xml:lang="az">Corel Draw çəkimi</comment>
- <comment xml:lang="be@latin">Rysunak Corel Draw</comment>
+ <comment xml:lang="be-Latn">Rysunak Corel Draw</comment>
<comment xml:lang="bg">Чертеж — Corel Draw</comment>
<comment xml:lang="ca">dibuix de Corel Draw</comment>
<comment xml:lang="cs">kresba Corel Draw</comment>
@@ -2625,13 +2700,14 @@
<comment xml:lang="da">Corel Draw-tegning</comment>
<comment xml:lang="de">Corel-Draw-Zeichnung</comment>
<comment xml:lang="el">Σχέδιο Corel Draw </comment>
- <comment xml:lang="en_GB">Corel Draw drawing</comment>
+ <comment xml:lang="en-GB">Corel Draw drawing</comment>
<comment xml:lang="eo">grafikaĵo de Corel Draw</comment>
<comment xml:lang="es">dibujo de Corel Draw</comment>
<comment xml:lang="eu">Corel Draw-eko marrazkia</comment>
<comment xml:lang="fi">Corel Draw -piirros</comment>
<comment xml:lang="fo">Corel Draw tekning</comment>
<comment xml:lang="fr">dessin Corel Draw</comment>
+ <comment xml:lang="fur">dissen Corel Draw</comment>
<comment xml:lang="ga">líníocht Corel Draw</comment>
<comment xml:lang="gl">debuxo de Corel Draw</comment>
<comment xml:lang="he">ציור של Corel Draw</comment>
@@ -2643,7 +2719,7 @@
<comment xml:lang="ja">Corel Draw ドロー</comment>
<comment xml:lang="ka">Corel Draw-ის ნახაზი</comment>
<comment xml:lang="kk">Corel Draw суреті</comment>
- <comment xml:lang="ko">코렐 드로우 드로잉</comment>
+ <comment xml:lang="ko">Corel Draw 드로잉</comment>
<comment xml:lang="lt">Corel Draw piešinys</comment>
<comment xml:lang="lv">Corel Draw zīmējums</comment>
<comment xml:lang="ms">Lukisan Corel Draw</comment>
@@ -2653,7 +2729,7 @@
<comment xml:lang="oc">dessenh Corel Draw</comment>
<comment xml:lang="pl">Rysunek Corel Draw</comment>
<comment xml:lang="pt">desenho Corel Drawdesenho Corel Draw</comment>
- <comment xml:lang="pt_BR">Desenho do Corel Draw</comment>
+ <comment xml:lang="pt-BR">Desenho do Corel Draw</comment>
<comment xml:lang="ro">Desen Corel Draw</comment>
<comment xml:lang="ru">Рисунок Corel Draw</comment>
<comment xml:lang="sk">Kresba Corel Draw</comment>
@@ -2664,11 +2740,11 @@
<comment xml:lang="tr">Corel Draw çizimi</comment>
<comment xml:lang="uk">малюнок Corel Draw</comment>
<comment xml:lang="vi">Bản vẽ Corel Draw</comment>
- <comment xml:lang="zh_CN">Corel Draw 绘图</comment>
- <comment xml:lang="zh_TW">Corel Draw 繪圖</comment>
+ <comment xml:lang="zh-CN">Corel Draw 绘图</comment>
+ <comment xml:lang="zh-TW">Corel Draw 繪圖</comment>
<generic-icon name="image-x-generic"/>
<magic priority="80">
- <match value="CDRXvrsn" type="string" offset="8" mask="0xffffff00ffffffff"/>
+ <match type="string" value="CDRXvrsn" mask="0xffffff00ffffffff" offset="8"/>
</magic>
<glob pattern="*.cdr"/>
<alias type="application/cdr"/>
@@ -2681,22 +2757,24 @@
</mime-type>
<mime-type type="application/vnd.hp-hpgl">
<comment>HPGL file</comment>
+ <comment xml:lang="af">HPGL-lêer</comment>
<comment xml:lang="ar">ملف HPGL</comment>
<comment xml:lang="ast">Ficheru HPGL</comment>
- <comment xml:lang="be@latin">Fajł HPGL</comment>
+ <comment xml:lang="be-Latn">Fajł HPGL</comment>
<comment xml:lang="bg">Файл — HPGL</comment>
<comment xml:lang="ca">fitxer HPGL</comment>
<comment xml:lang="cs">soubor HPGL</comment>
<comment xml:lang="da">HPGL-fil</comment>
<comment xml:lang="de">HPGL-Datei</comment>
<comment xml:lang="el">Αρχείο HPGL</comment>
- <comment xml:lang="en_GB">HPGL file</comment>
+ <comment xml:lang="en-GB">HPGL file</comment>
<comment xml:lang="eo">HPGL-dosiero</comment>
<comment xml:lang="es">archivo HPGL</comment>
<comment xml:lang="eu">HPGL fitxategia</comment>
<comment xml:lang="fi">HPGL-tiedosto</comment>
<comment xml:lang="fo">HPGL fíla</comment>
<comment xml:lang="fr">fichier HPGL</comment>
+ <comment xml:lang="fur">file HPGL</comment>
<comment xml:lang="ga">comhad HPGL</comment>
<comment xml:lang="gl">ficheiro HPGL</comment>
<comment xml:lang="he">קובץ HGPL</comment>
@@ -2716,7 +2794,7 @@
<comment xml:lang="oc">fichièr HPGL</comment>
<comment xml:lang="pl">Plik HPGL</comment>
<comment xml:lang="pt">ficheiro HPGL</comment>
- <comment xml:lang="pt_BR">Arquivo HPGL</comment>
+ <comment xml:lang="pt-BR">Arquivo HPGL</comment>
<comment xml:lang="ro">Fișier HPGL</comment>
<comment xml:lang="ru">Файл HPGL</comment>
<comment xml:lang="sk">Súbor HPGL</comment>
@@ -2727,8 +2805,8 @@
<comment xml:lang="tr">HPGL dosyası</comment>
<comment xml:lang="uk">файл HPGL</comment>
<comment xml:lang="vi">Tập tin HPGL</comment>
- <comment xml:lang="zh_CN">HPGL 文件</comment>
- <comment xml:lang="zh_TW">HPGL 檔案</comment>
+ <comment xml:lang="zh-CN">HPGL 文件</comment>
+ <comment xml:lang="zh-TW">HPGL 檔案</comment>
<acronym>HPGL</acronym>
<expanded-acronym>HP Graphics Language</expanded-acronym>
<generic-icon name="image-x-generic"/>
@@ -2736,22 +2814,24 @@
</mime-type>
<mime-type type="application/vnd.hp-pcl">
<comment>PCL file</comment>
+ <comment xml:lang="af">PCL-lêer</comment>
<comment xml:lang="ar">ملف PCL</comment>
<comment xml:lang="ast">FIcheru PCL</comment>
- <comment xml:lang="be@latin">Fajł PCL</comment>
+ <comment xml:lang="be-Latn">Fajł PCL</comment>
<comment xml:lang="bg">Файл — PCL</comment>
<comment xml:lang="ca">fitxer PCL</comment>
<comment xml:lang="cs">soubor PCL</comment>
<comment xml:lang="da">PCL-fil</comment>
<comment xml:lang="de">PCL-Datei</comment>
<comment xml:lang="el">Αρχείο PCL</comment>
- <comment xml:lang="en_GB">PCL file</comment>
+ <comment xml:lang="en-GB">PCL file</comment>
<comment xml:lang="eo">PCL-dosiero</comment>
<comment xml:lang="es">archivo PCL</comment>
<comment xml:lang="eu">PCL fitxategia</comment>
<comment xml:lang="fi">PCL-tiedosto</comment>
<comment xml:lang="fo">PCL fíla</comment>
<comment xml:lang="fr">fichier PCL</comment>
+ <comment xml:lang="fur">file PCL</comment>
<comment xml:lang="ga">comhad PCL</comment>
<comment xml:lang="gl">ficheiro PCL</comment>
<comment xml:lang="he">קובץ PCL</comment>
@@ -2771,7 +2851,7 @@
<comment xml:lang="oc">fichièr PCL</comment>
<comment xml:lang="pl">Plik PCL</comment>
<comment xml:lang="pt">ficheiro PCL</comment>
- <comment xml:lang="pt_BR">Arquivo PCL</comment>
+ <comment xml:lang="pt-BR">Arquivo PCL</comment>
<comment xml:lang="ro">Fișier PCL</comment>
<comment xml:lang="ru">Файл PCL</comment>
<comment xml:lang="sk">Súbor PCL</comment>
@@ -2782,8 +2862,8 @@
<comment xml:lang="tr">PCL dosyası</comment>
<comment xml:lang="uk">файл PCL</comment>
<comment xml:lang="vi">Tập tin PCL</comment>
- <comment xml:lang="zh_CN">PCL 文件</comment>
- <comment xml:lang="zh_TW">PCL 檔</comment>
+ <comment xml:lang="zh-CN">PCL 文件</comment>
+ <comment xml:lang="zh-TW">PCL 檔</comment>
<acronym>PCL</acronym>
<expanded-acronym>HP Printer Control Language</expanded-acronym>
<generic-icon name="image-x-generic"/>
@@ -2791,10 +2871,11 @@
</mime-type>
<mime-type type="application/vnd.lotus-1-2-3">
<comment>Lotus 1-2-3 spreadsheet</comment>
+ <comment xml:lang="af">Lotus 1-2-3 sigblad</comment>
<comment xml:lang="ar">جدول Lotus 1-2-3</comment>
<comment xml:lang="ast">Fueya de cálculu de Lotus 1-2-3</comment>
<comment xml:lang="az">Lotus 1-2-3 hesab cədvəli</comment>
- <comment xml:lang="be@latin">Raźlikovy arkuš Lotus 1-2-3</comment>
+ <comment xml:lang="be-Latn">Raźlikovy arkuš Lotus 1-2-3</comment>
<comment xml:lang="bg">Таблица — Lotus 1-2-3</comment>
<comment xml:lang="ca">full de càlcul de Lotus 1-2-3</comment>
<comment xml:lang="cs">sešit Lotus 1-2-3</comment>
@@ -2802,13 +2883,14 @@
<comment xml:lang="da">Lotus 1-2-3-regneark</comment>
<comment xml:lang="de">Lotus-1-2-3-Tabelle</comment>
<comment xml:lang="el">Λογιστικό φύλλο Lotus 1-2-3</comment>
- <comment xml:lang="en_GB">Lotus 1-2-3 spreadsheet</comment>
+ <comment xml:lang="en-GB">Lotus 1-2-3 spreadsheet</comment>
<comment xml:lang="eo">Kalkultabelo de Lotus 1-2-3</comment>
<comment xml:lang="es">hoja de cálculo de Lotus 1-2-3</comment>
<comment xml:lang="eu">Lotus 1-2-3 kalkulu-orria</comment>
<comment xml:lang="fi">Lotus 1-2-3 -taulukko</comment>
<comment xml:lang="fo">Lotus 1-2-3 rokniark</comment>
<comment xml:lang="fr">feuille de calcul Lotus 1-2-3</comment>
+ <comment xml:lang="fur">sfuei di calcul Lotus 1-2-3</comment>
<comment xml:lang="ga">scarbhileog Lotus 1-2-3</comment>
<comment xml:lang="gl">folla de cálculo de Lotus 1-2-3</comment>
<comment xml:lang="he">גיליון נתונים של Lotus 1-2-3</comment>
@@ -2829,7 +2911,7 @@
<comment xml:lang="oc">fuèlh de calcul Lotus 1-2-3</comment>
<comment xml:lang="pl">Arkusz Lotus 1-2-3</comment>
<comment xml:lang="pt">folha de cálculo Lotus 1-2-3</comment>
- <comment xml:lang="pt_BR">Planilha do Lotus 1-2-3</comment>
+ <comment xml:lang="pt-BR">Planilha do Lotus 1-2-3</comment>
<comment xml:lang="ro">Foaie de calcul Lotus 1-2-3</comment>
<comment xml:lang="ru">Электронная таблица Lotus 1-2-3</comment>
<comment xml:lang="sk">Zošit Lotus 1-2-3</comment>
@@ -2837,14 +2919,14 @@
<comment xml:lang="sq">Fletë llogaritjesh Lotus 1-2-3</comment>
<comment xml:lang="sr">Лотусова 1-2-3 табела</comment>
<comment xml:lang="sv">Lotus 1-2-3-kalkylblad</comment>
- <comment xml:lang="tr">Lotus 1-2-3 hesap tablosu</comment>
+ <comment xml:lang="tr">Lotus 1-2-3 hesap çizelgesi</comment>
<comment xml:lang="uk">ел. таблиця Lotus 1-2-3</comment>
<comment xml:lang="vi">Bảng tính Lotus 1-2-3</comment>
- <comment xml:lang="zh_CN">Lotus 1-2-3 电子表格</comment>
- <comment xml:lang="zh_TW">Lotus 1-2-3 試算表</comment>
+ <comment xml:lang="zh-CN">Lotus 1-2-3 电子表格</comment>
+ <comment xml:lang="zh-TW">Lotus 1-2-3 試算表</comment>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
- <match value="\x00\x00\x02\x00\x06\x04\x06\x00\x08\x00\x00\x00\x00\x00" type="string" offset="0"/>
+ <match type="string" value="\x00\x00\x02\x00\x06\x04\x06\x00\x08\x00\x00\x00\x00\x00" offset="0"/>
</magic>
<glob pattern="*.123"/>
<glob pattern="*.wk1"/>
@@ -2858,67 +2940,59 @@
<alias type="zz-application/zz-winassoc-123"/>
</mime-type>
<mime-type type="application/vnd.lotus-wordpro">
- <comment>Lotus Word Pro</comment>
- <comment xml:lang="ast">Lotus Word Pro</comment>
- <comment xml:lang="ca">Lotus Word Pro</comment>
- <comment xml:lang="cs">Lotus Word Pro</comment>
- <comment xml:lang="da">Lotus Word Pro</comment>
- <comment xml:lang="de">Lotus Word Pro</comment>
- <comment xml:lang="el">Lotus Word Pro</comment>
- <comment xml:lang="en_GB">Lotus Word Pro</comment>
- <comment xml:lang="es">Lotus Word Pro</comment>
- <comment xml:lang="eu">Lotus Word Pro</comment>
- <comment xml:lang="fi">Lotus Word Pro</comment>
- <comment xml:lang="fr">Lotus Word Pro</comment>
- <comment xml:lang="ga">Lotus Word Pro</comment>
- <comment xml:lang="gl">Lotus Word Pro</comment>
- <comment xml:lang="he">Lotus Word Pro</comment>
- <comment xml:lang="hr">Lotus Word Pro</comment>
- <comment xml:lang="hu">Lotus Word Pro</comment>
- <comment xml:lang="ia">Lotus Word Pro</comment>
- <comment xml:lang="id">Lotus Word Pro</comment>
- <comment xml:lang="it">Lotus Word Pro</comment>
- <comment xml:lang="ja">Lotus Word Pro</comment>
- <comment xml:lang="kk">Lotus Word Pro</comment>
- <comment xml:lang="ko">Lotus Word Pro</comment>
- <comment xml:lang="lv">Lotus Word Pro</comment>
- <comment xml:lang="oc">Lotus Word Pro</comment>
- <comment xml:lang="pl">Lotus Word Pro</comment>
- <comment xml:lang="pt">Lotus Word Pro</comment>
- <comment xml:lang="pt_BR">Lotus Word Pro</comment>
- <comment xml:lang="ru">Lotus Word Pro</comment>
- <comment xml:lang="sk">Lotus Word Pro</comment>
- <comment xml:lang="sl">Lotus Word Pro</comment>
- <comment xml:lang="sr">Лотусов Писац Про</comment>
- <comment xml:lang="sv">Lotus Word Pro</comment>
- <comment xml:lang="tr">Lotus Word Pro</comment>
- <comment xml:lang="uk">Lotus Word Pro</comment>
- <comment xml:lang="zh_CN">Lotus Word Pro</comment>
- <comment xml:lang="zh_TW">Lotus Word Pro</comment>
+ <comment>Lotus Word Pro document</comment>
+ <comment xml:lang="bg">Документ — Lotus Word Pro</comment>
+ <comment xml:lang="ca">document de Lotus Word Pro</comment>
+ <comment xml:lang="da">Lotus Word Pro-dokument</comment>
+ <comment xml:lang="de">Lotus-Word-Pro-Dokument</comment>
+ <comment xml:lang="en-GB">Lotus Word Pro document</comment>
+ <comment xml:lang="es">documento de Lotus Word Pro</comment>
+ <comment xml:lang="eu">Lotus Word Pro dokumentua</comment>
+ <comment xml:lang="fi">Lotus Word Pro -asiakirja</comment>
+ <comment xml:lang="fr">document Lotus Word Pro</comment>
+ <comment xml:lang="hr">Lotus Word Pro dokument</comment>
+ <comment xml:lang="hu">Lotus Word Pro dokumentum</comment>
+ <comment xml:lang="id">Dokumen Lotus Word Pro</comment>
+ <comment xml:lang="it">Documento Lotus Word Pro</comment>
+ <comment xml:lang="kk">Lotus Word Pro құжаты</comment>
+ <comment xml:lang="ko">로투스 워드 프로 문서</comment>
+ <comment xml:lang="pl">Dokument Lotus Word Pro</comment>
+ <comment xml:lang="pt">documento Lotus Word Pro</comment>
+ <comment xml:lang="pt-BR">Documento do Lotus Word Pro</comment>
+ <comment xml:lang="ru">Документ Lotus Word Pro</comment>
+ <comment xml:lang="sk">Dokument Lotus Word Pro</comment>
+ <comment xml:lang="sl">Dokument Lotus Word Pro</comment>
+ <comment xml:lang="sv">Lotus Word Pro-dokument</comment>
+ <comment xml:lang="tr">Lotus Word Pro belgesi</comment>
+ <comment xml:lang="uk">документ Lotus Word Pro</comment>
+ <comment xml:lang="zh-CN">Lotus Word Pro 文档</comment>
+ <comment xml:lang="zh-TW">Lotus Word Pro 文件</comment>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="WordPro" type="string" offset="0"/>
+ <match type="string" value="WordPro" offset="0"/>
</magic>
<glob pattern="*.lwp"/>
</mime-type>
<mime-type type="application/vnd.ms-access">
<comment>JET database</comment>
+ <comment xml:lang="af">JET-databasis</comment>
<comment xml:lang="ar">قاعدة بيانات JET</comment>
<comment xml:lang="ast">Base de datos JETº</comment>
- <comment xml:lang="be@latin">Baza źviestak JET</comment>
+ <comment xml:lang="be-Latn">Baza źviestak JET</comment>
<comment xml:lang="bg">База от данни — JET</comment>
<comment xml:lang="ca">base de dades JET</comment>
<comment xml:lang="cs">databáze JET</comment>
<comment xml:lang="da">JET-database</comment>
<comment xml:lang="de">JET-Datenbank</comment>
<comment xml:lang="el">Βάση δεδομένων JET</comment>
- <comment xml:lang="en_GB">JET database</comment>
+ <comment xml:lang="en-GB">JET database</comment>
<comment xml:lang="eo">JET-datumbazo</comment>
<comment xml:lang="es">base de datos JET</comment>
<comment xml:lang="eu">JET datu-basea</comment>
<comment xml:lang="fi">JET-tietokanta</comment>
<comment xml:lang="fo">JET dátustovnur</comment>
<comment xml:lang="fr">base de données JET</comment>
+ <comment xml:lang="fur">base di dâts JET</comment>
<comment xml:lang="ga">bunachar sonraí JET</comment>
<comment xml:lang="gl">base de datos JET</comment>
<comment xml:lang="he">מסד נתונים מסוג JET</comment>
@@ -2938,7 +3012,7 @@
<comment xml:lang="oc">banca de donadas JET</comment>
<comment xml:lang="pl">Baza Danych JET</comment>
<comment xml:lang="pt">base de dados JET</comment>
- <comment xml:lang="pt_BR">Banco de dados JET</comment>
+ <comment xml:lang="pt-BR">Banco de dados JET</comment>
<comment xml:lang="ro">Bază de date JET</comment>
<comment xml:lang="ru">База данных JET</comment>
<comment xml:lang="sk">Databáza JET</comment>
@@ -2946,19 +3020,18 @@
<comment xml:lang="sq">Bazë me të dhëna JET</comment>
<comment xml:lang="sr">ЈЕТ база података</comment>
<comment xml:lang="sv">JET-databas</comment>
- <comment xml:lang="tr">JET veritabanı</comment>
+ <comment xml:lang="tr">JET veri tabanı</comment>
<comment xml:lang="uk">База даних JET</comment>
<comment xml:lang="vi">Cơ sở dữ liệu JET</comment>
- <comment xml:lang="zh_CN">JET 数据库</comment>
- <comment xml:lang="zh_TW">JET 資料庫</comment>
+ <comment xml:lang="zh-CN">JET 数据库</comment>
+ <comment xml:lang="zh-TW">JET 資料庫</comment>
<acronym>JET</acronym>
<expanded-acronym>Joint Engine Technology</expanded-acronym>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="\x00\x01\x00\x00Standard Jet DB" type="string" offset="0"/>
+ <match offset="0" type="string" value="\x00\x01\x00\x00Standard Jet DB"/>
</magic>
<glob pattern="*.mdb"/>
- <alias type="application/x-msaccess"/>
<alias type="application/msaccess"/>
<alias type="application/vnd.msaccess"/>
<alias type="application/x-msaccess"/>
@@ -2968,6 +3041,7 @@
</mime-type>
<mime-type type="application/vnd.ms-cab-compressed">
<comment>Microsoft Cabinet archive</comment>
+ <comment xml:lang="af">Microsoft Cabinet-argief</comment>
<comment xml:lang="ar">أرشيف Microsoft Cabinet</comment>
<comment xml:lang="bg">Архив — Microsoft Cabinet</comment>
<comment xml:lang="ca">arxiu de Microsoft Cabinet</comment>
@@ -2975,12 +3049,13 @@
<comment xml:lang="da">Microsoft Cabinet-arkiv</comment>
<comment xml:lang="de">Microsoft-Cabinet-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Microsoft Cabinet</comment>
- <comment xml:lang="en_GB">Microsoft Cabinet archive</comment>
+ <comment xml:lang="en-GB">Microsoft Cabinet archive</comment>
<comment xml:lang="es">archivador Cabinet de Microsoft</comment>
<comment xml:lang="eu">Microsoft Cabinet artxiboa</comment>
<comment xml:lang="fi">Microsoft Cabinet -arkisto</comment>
<comment xml:lang="fo">Microsoft Cabinet skjalasavn</comment>
<comment xml:lang="fr">archive Cab Microsoft</comment>
+ <comment xml:lang="fur">archivi Cabinet Microsoft</comment>
<comment xml:lang="ga">cartlann Microsoft Cabinet</comment>
<comment xml:lang="gl">arquivo de Microsoft Cabinet</comment>
<comment xml:lang="he">ארכיון CAB (מיקרוסופט)</comment>
@@ -2992,14 +3067,14 @@
<comment xml:lang="ja">Microsoft Cabinet アーカイブ</comment>
<comment xml:lang="ka">Microsoft-ის Cabinet არქივი</comment>
<comment xml:lang="kk">Microsoft Cabinet архиві</comment>
- <comment xml:lang="ko">Microsoft Cabinte 압축 파일</comment>
+ <comment xml:lang="ko">Microsoft Cabinet 압축 파일</comment>
<comment xml:lang="lt">Microsoft Cabinet archyvas</comment>
<comment xml:lang="lv">Microsoft kabineta arhīvs</comment>
<comment xml:lang="nl">Microsoft Cabinet-archief</comment>
<comment xml:lang="oc">archiu Cab Microsoft</comment>
<comment xml:lang="pl">Archiwum Microsoft Cabinet</comment>
<comment xml:lang="pt">arquivo Microsoft Cabinet</comment>
- <comment xml:lang="pt_BR">Pacote Cabinet da Microsoft</comment>
+ <comment xml:lang="pt-BR">Pacote Cabinet da Microsoft</comment>
<comment xml:lang="ro">Arhivă Microsoft Cabinet</comment>
<comment xml:lang="ru">Архив Microsoft Cabinet</comment>
<comment xml:lang="sk">Archív Microsoft Cabinet</comment>
@@ -3009,32 +3084,34 @@
<comment xml:lang="tr">Microsoft Cabinet arşivi</comment>
<comment xml:lang="uk">архів Cabinet Microsoft</comment>
<comment xml:lang="vi">Kho lưu Cabinet Microsoft</comment>
- <comment xml:lang="zh_CN">Microsoft Cabinet 归档文件</comment>
- <comment xml:lang="zh_TW">微軟 Cabinet 封存檔</comment>
+ <comment xml:lang="zh-CN">Microsoft Cabinet 归档文件</comment>
+ <comment xml:lang="zh-TW">微軟 Cabinet 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="MSCF\0\0\0\0" type="string" offset="0"/>
+ <match offset="0" type="string" value="MSCF\0\0\0\0"/>
</magic>
<glob pattern="*.cab"/>
<alias type="zz-application/zz-winassoc-cab"/>
</mime-type>
<mime-type type="application/vnd.ms-excel">
<comment>Excel spreadsheet</comment>
+ <comment xml:lang="af">Excel-sigblad</comment>
<comment xml:lang="ar">جدول Excel</comment>
- <comment xml:lang="be@latin">Raźlikovy akruš Excel</comment>
+ <comment xml:lang="be-Latn">Raźlikovy akruš Excel</comment>
<comment xml:lang="bg">Таблица — Excel</comment>
<comment xml:lang="ca">full de càlcul d'Excel</comment>
<comment xml:lang="cs">sešit Excel</comment>
<comment xml:lang="da">Excelregneark</comment>
<comment xml:lang="de">Excel-Tabelle</comment>
<comment xml:lang="el">Λογιστικό φύλλο Excel</comment>
- <comment xml:lang="en_GB">Excel spreadsheet</comment>
+ <comment xml:lang="en-GB">Excel spreadsheet</comment>
<comment xml:lang="eo">Excel-kalkultabelo</comment>
<comment xml:lang="es">hoja de cálculo de Excel</comment>
<comment xml:lang="eu">Excel kalkulu-orria</comment>
<comment xml:lang="fi">Excel-taulukko</comment>
<comment xml:lang="fo">Excel rokniark</comment>
<comment xml:lang="fr">feuille de calcul Excel</comment>
+ <comment xml:lang="fur">sfuei di calcul Excel</comment>
<comment xml:lang="ga">scarbhileog Excel</comment>
<comment xml:lang="gl">folla de cálculo de Excel</comment>
<comment xml:lang="he">גליון נתונים של Excel</comment>
@@ -3055,7 +3132,7 @@
<comment xml:lang="oc">fuèlh de calcul Excel</comment>
<comment xml:lang="pl">Arkusz Excel</comment>
<comment xml:lang="pt">folha de cálculo Excel</comment>
- <comment xml:lang="pt_BR">Planilha do Excel</comment>
+ <comment xml:lang="pt-BR">Planilha do Excel</comment>
<comment xml:lang="ro">Foaie de calcul Excel</comment>
<comment xml:lang="ru">Электронная таблица Excel</comment>
<comment xml:lang="sk">Zošit Excel</comment>
@@ -3063,14 +3140,14 @@
<comment xml:lang="sq">Fletë llogaritje Excel</comment>
<comment xml:lang="sr">Екселова табела</comment>
<comment xml:lang="sv">Excel-kalkylblad</comment>
- <comment xml:lang="tr">Excel çalışma sayfası</comment>
+ <comment xml:lang="tr">Excel hesap çizelgesi</comment>
<comment xml:lang="uk">ел. таблиця Excel</comment>
<comment xml:lang="vi">Bảng tính Excel</comment>
- <comment xml:lang="zh_CN">Excel 电子表格</comment>
- <comment xml:lang="zh_TW">Excel 試算表</comment>
+ <comment xml:lang="zh-CN">Excel 电子表格</comment>
+ <comment xml:lang="zh-TW">Excel 試算表</comment>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
- <match value="Microsoft Excel 5.0 Worksheet" type="string" offset="2080"/>
+ <match type="string" value="Microsoft Excel 5.0 Worksheet" offset="2080"/>
</magic>
<glob pattern="*.xls"/>
<glob pattern="*.xlc"/>
@@ -3086,17 +3163,19 @@
</mime-type>
<mime-type type="application/vnd.ms-excel.addin.macroEnabled.12">
<comment>Excel add-in</comment>
+ <comment xml:lang="af">Excel-byvoeging</comment>
<comment xml:lang="bg">Приставка — Excel</comment>
<comment xml:lang="ca">complement d'Excel</comment>
<comment xml:lang="cs">doplněk aplikace Excel</comment>
<comment xml:lang="da">Excel-tilføjelse</comment>
<comment xml:lang="de">Excel Add-in</comment>
<comment xml:lang="el">Πρόσθετο Excel</comment>
- <comment xml:lang="en_GB">Excel add-in</comment>
+ <comment xml:lang="en-GB">Excel add-in</comment>
<comment xml:lang="es">complemento de Excel</comment>
<comment xml:lang="eu">Excel gehigarria</comment>
<comment xml:lang="fi">Excel-lisäosa</comment>
<comment xml:lang="fr">complément Excel</comment>
+ <comment xml:lang="fur">zonte Excel</comment>
<comment xml:lang="ga">breiseán Excel</comment>
<comment xml:lang="gl">complemento de Excel</comment>
<comment xml:lang="he">תוסף של Excel</comment>
@@ -3114,7 +3193,7 @@
<comment xml:lang="oc">complement Excel</comment>
<comment xml:lang="pl">Dodatek Excel</comment>
<comment xml:lang="pt">Extensão Excel</comment>
- <comment xml:lang="pt_BR">Suplemento do Excel</comment>
+ <comment xml:lang="pt-BR">Suplemento do Excel</comment>
<comment xml:lang="ru">Дополнение Excel</comment>
<comment xml:lang="sk">Doplnok aplikácie Excel</comment>
<comment xml:lang="sl">Vstavek Excel</comment>
@@ -3122,25 +3201,27 @@
<comment xml:lang="sv">Excel-tillägg</comment>
<comment xml:lang="tr">Excel eklentisi</comment>
<comment xml:lang="uk">додаток Excel</comment>
- <comment xml:lang="zh_CN">Excel 外接程序</comment>
- <comment xml:lang="zh_TW">Excel 增益集</comment>
+ <comment xml:lang="zh-CN">Excel 外接程序</comment>
+ <comment xml:lang="zh-TW">Excel 增益集</comment>
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.xlam"/>
<sub-class-of type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"/>
</mime-type>
<mime-type type="application/vnd.ms-excel.sheet.binary.macroEnabled.12">
<comment>Excel 2007 binary spreadsheet</comment>
+ <comment xml:lang="af">Excel 2007 binêre sigblad</comment>
<comment xml:lang="bg">Таблица — Excel 2007, двоична</comment>
<comment xml:lang="ca">full de càlcul binari d'Excel 2007</comment>
<comment xml:lang="cs">binární formát sešitu Excel 2007</comment>
<comment xml:lang="da">Binært Excel 2007-regneark</comment>
<comment xml:lang="de">Excel-2007-Tabelle (binär)</comment>
<comment xml:lang="el">Δυαδικό λογιστικό φύλλο Excel 2007</comment>
- <comment xml:lang="en_GB">Excel 2007 binary spreadsheet</comment>
+ <comment xml:lang="en-GB">Excel 2007 binary spreadsheet</comment>
<comment xml:lang="es">hoja de cálculo binaria de Excel 2007</comment>
<comment xml:lang="eu">Excel 2007 kalkulu-orri binarioa</comment>
<comment xml:lang="fi">Excel 2007:n binaarinen taulukko</comment>
<comment xml:lang="fr">feuille de calcul binaire Excel 2007</comment>
+ <comment xml:lang="fur">sfuei di calcul binari Excel 2007</comment>
<comment xml:lang="ga">scarbhileog dhénártha Excel 2007</comment>
<comment xml:lang="gl">ficheiro binario de folla de cálculo Excel 2007</comment>
<comment xml:lang="he">גיליון נתונים בינרי של Excel 2007</comment>
@@ -3158,37 +3239,39 @@
<comment xml:lang="oc">fuèlh de calcul binaire Excel 2007</comment>
<comment xml:lang="pl">Binarny arkusz Excel 2007</comment>
<comment xml:lang="pt">folha de cálculo binária Excel 2007</comment>
- <comment xml:lang="pt_BR">Planilha binária do Excel 2007</comment>
+ <comment xml:lang="pt-BR">Planilha binária do Excel 2007</comment>
<comment xml:lang="ru">Двоичная электронная таблица Excel 2007</comment>
<comment xml:lang="sk">Binárny zošit Excel 2007</comment>
<comment xml:lang="sl">Binarna preglednica Excel 2007</comment>
<comment xml:lang="sr">Ексел 2007 бинарна табела</comment>
<comment xml:lang="sv">Binärt Excel 2007-kalkylblad</comment>
- <comment xml:lang="tr">Excel 2007 ikilik çalışma sayfası</comment>
+ <comment xml:lang="tr">Excel 2007 ikilik hesap çizelgesi</comment>
<comment xml:lang="uk">бінарна електронна таблиця Excel 2007</comment>
- <comment xml:lang="zh_CN">Excel 2007 二进制电子表格</comment>
- <comment xml:lang="zh_TW">Excel 2007 二進位試算表</comment>
+ <comment xml:lang="zh-CN">Excel 2007 二进制电子表格</comment>
+ <comment xml:lang="zh-TW">Excel 2007 二進位試算表</comment>
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.xlsb"/>
<sub-class-of type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"/>
</mime-type>
<mime-type type="application/vnd.ms-excel.sheet.macroEnabled.12">
<comment>Excel spreadsheet</comment>
+ <comment xml:lang="af">Excel-sigblad</comment>
<comment xml:lang="ar">جدول Excel</comment>
- <comment xml:lang="be@latin">Raźlikovy akruš Excel</comment>
+ <comment xml:lang="be-Latn">Raźlikovy akruš Excel</comment>
<comment xml:lang="bg">Таблица — Excel</comment>
<comment xml:lang="ca">full de càlcul d'Excel</comment>
<comment xml:lang="cs">sešit Excel</comment>
<comment xml:lang="da">Excelregneark</comment>
<comment xml:lang="de">Excel-Tabelle</comment>
<comment xml:lang="el">Λογιστικό φύλλο Excel</comment>
- <comment xml:lang="en_GB">Excel spreadsheet</comment>
+ <comment xml:lang="en-GB">Excel spreadsheet</comment>
<comment xml:lang="eo">Excel-kalkultabelo</comment>
<comment xml:lang="es">hoja de cálculo de Excel</comment>
<comment xml:lang="eu">Excel kalkulu-orria</comment>
<comment xml:lang="fi">Excel-taulukko</comment>
<comment xml:lang="fo">Excel rokniark</comment>
<comment xml:lang="fr">feuille de calcul Excel</comment>
+ <comment xml:lang="fur">sfuei di calcul Excel</comment>
<comment xml:lang="ga">scarbhileog Excel</comment>
<comment xml:lang="gl">folla de cálculo de Excel</comment>
<comment xml:lang="he">גליון נתונים של Excel</comment>
@@ -3209,7 +3292,7 @@
<comment xml:lang="oc">fuèlh de calcul Excel</comment>
<comment xml:lang="pl">Arkusz Excel</comment>
<comment xml:lang="pt">folha de cálculo Excel</comment>
- <comment xml:lang="pt_BR">Planilha do Excel</comment>
+ <comment xml:lang="pt-BR">Planilha do Excel</comment>
<comment xml:lang="ro">Foaie de calcul Excel</comment>
<comment xml:lang="ru">Электронная таблица Excel</comment>
<comment xml:lang="sk">Zošit Excel</comment>
@@ -3217,27 +3300,30 @@
<comment xml:lang="sq">Fletë llogaritje Excel</comment>
<comment xml:lang="sr">Екселова табела</comment>
<comment xml:lang="sv">Excel-kalkylblad</comment>
- <comment xml:lang="tr">Excel çalışma sayfası</comment>
+ <comment xml:lang="tr">Excel hesap çizelgesi</comment>
<comment xml:lang="uk">ел. таблиця Excel</comment>
<comment xml:lang="vi">Bảng tính Excel</comment>
- <comment xml:lang="zh_CN">Excel 电子表格</comment>
- <comment xml:lang="zh_TW">Excel 試算表</comment>
+ <comment xml:lang="zh-CN">Excel 电子表格</comment>
+ <comment xml:lang="zh-TW">Excel 試算表</comment>
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.xlsm"/>
<sub-class-of type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"/>
</mime-type>
<mime-type type="application/vnd.ms-excel.template.macroEnabled.12">
<comment>Excel spreadsheet template</comment>
+ <comment xml:lang="af">Excel-sigbladsjabloon</comment>
+ <comment xml:lang="bg">Шаблон за таблица — Excel</comment>
<comment xml:lang="ca">plantilla de full de càlcul d'Excel</comment>
<comment xml:lang="cs">šablona tabulky Excel</comment>
<comment xml:lang="da">Excel-regnearksskabelon</comment>
<comment xml:lang="de">Excel-Tabellenvorlage</comment>
<comment xml:lang="el">Πρότυπο λογιστικού φύλλου Excel</comment>
- <comment xml:lang="en_GB">Excel spreadsheet template</comment>
- <comment xml:lang="es">plantilla de libro de Excel</comment>
+ <comment xml:lang="en-GB">Excel spreadsheet template</comment>
+ <comment xml:lang="es">plantilla de hoja de cálculo de Excel</comment>
<comment xml:lang="eu">Excel kalkulu-orri txantiloia</comment>
<comment xml:lang="fi">Excel-taulukkomalli</comment>
<comment xml:lang="fr">modèle de feuille de calcul Excel</comment>
+ <comment xml:lang="fur">model sfuei di calcul Excel</comment>
<comment xml:lang="ga">teimpléad scarbhileoige Excel</comment>
<comment xml:lang="he">תבנית גיליון נתונים של Excel</comment>
<comment xml:lang="hr">Predložak Excel proračunske tablice</comment>
@@ -3249,37 +3335,40 @@
<comment xml:lang="ko">Excel 스프레드시트 서식</comment>
<comment xml:lang="oc">Modèl de fuèlh de calcul Excel</comment>
<comment xml:lang="pl">Szablon arkusza Excel</comment>
- <comment xml:lang="pt">modelo de folha de cálculo Excel</comment>
- <comment xml:lang="pt_BR">Modelo de planilha do Excel</comment>
+ <comment xml:lang="pt">predefinição da folha de cálculo Excel</comment>
+ <comment xml:lang="pt-BR">Modelo de planilha do Excel</comment>
<comment xml:lang="ru">Шаблон таблицы Excel</comment>
<comment xml:lang="sk">Šablóna tabuľky aplikácie Excel</comment>
+ <comment xml:lang="sl">Predloga preglednice Excel</comment>
<comment xml:lang="sr">Екселов шаблон табеле</comment>
<comment xml:lang="sv">Excel-kalkylarksmall</comment>
- <comment xml:lang="tr">Excel hesap tablosu şablonu</comment>
+ <comment xml:lang="tr">Excel hesap çizelgesi şablonu</comment>
<comment xml:lang="uk">шаблон електронної таблиці Excel</comment>
- <comment xml:lang="zh_CN">Excel 电子表格模板</comment>
- <comment xml:lang="zh_TW">Excel 試算表範本</comment>
+ <comment xml:lang="zh-CN">Excel 电子表格模板</comment>
+ <comment xml:lang="zh-TW">Excel 試算表範本</comment>
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.xltm"/>
<sub-class-of type="application/vnd.openxmlformats-officedocument.spreadsheetml.template"/>
</mime-type>
<mime-type type="application/vnd.ms-powerpoint">
<comment>PowerPoint presentation</comment>
+ <comment xml:lang="af">PowerPoint-voorlegging</comment>
<comment xml:lang="ar">عرض تقديمي PowerPoint</comment>
- <comment xml:lang="be@latin">Prezentacyja PowerPoint</comment>
+ <comment xml:lang="be-Latn">Prezentacyja PowerPoint</comment>
<comment xml:lang="bg">Презентация — PowerPoint</comment>
<comment xml:lang="ca">presentació de PowerPoint</comment>
<comment xml:lang="cs">prezentace PowerPoint</comment>
<comment xml:lang="da">PowerPoint-præsentation</comment>
<comment xml:lang="de">PowerPoint-Präsentation</comment>
<comment xml:lang="el">Παρουσίαση PowerPoint</comment>
- <comment xml:lang="en_GB">PowerPoint presentation</comment>
+ <comment xml:lang="en-GB">PowerPoint presentation</comment>
<comment xml:lang="eo">PowerPoint-prezentaĵo</comment>
<comment xml:lang="es">presentación de PowerPoint</comment>
<comment xml:lang="eu">PowerPoint aurkezpena</comment>
<comment xml:lang="fi">PowerPoint-esitys</comment>
<comment xml:lang="fo">PowerPoint framløga</comment>
<comment xml:lang="fr">présentation PowerPoint</comment>
+ <comment xml:lang="fur">presentazion PowerPoint</comment>
<comment xml:lang="ga">láithreoireacht PowerPoint</comment>
<comment xml:lang="gl">presentación de PowerPoint</comment>
<comment xml:lang="he">מצגת PowerPoint</comment>
@@ -3299,7 +3388,7 @@
<comment xml:lang="oc">presentacion PowerPoint</comment>
<comment xml:lang="pl">Prezentacja PowerPoint</comment>
<comment xml:lang="pt">apresentação PowerPoint</comment>
- <comment xml:lang="pt_BR">Apresentação do PowerPoint</comment>
+ <comment xml:lang="pt-BR">Apresentação do PowerPoint</comment>
<comment xml:lang="ro">Prezentare PowerPoint</comment>
<comment xml:lang="ru">Презентация PowerPoint</comment>
<comment xml:lang="sk">Prezentácia PowerPoint</comment>
@@ -3310,8 +3399,8 @@
<comment xml:lang="tr">PowerPoint sunumu</comment>
<comment xml:lang="uk">презентація PowerPoint</comment>
<comment xml:lang="vi">Trình diễn PowerPoint</comment>
- <comment xml:lang="zh_CN">PowerPoint 演示文稿</comment>
- <comment xml:lang="zh_TW">PowerPoint 簡報</comment>
+ <comment xml:lang="zh-CN">PowerPoint 演示文稿</comment>
+ <comment xml:lang="zh-TW">PowerPoint 簡報</comment>
<generic-icon name="x-office-presentation"/>
<glob pattern="*.ppz"/>
<glob pattern="*.ppt"/>
@@ -3323,17 +3412,19 @@
</mime-type>
<mime-type type="application/vnd.ms-powerpoint.addin.macroEnabled.12">
<comment>PowerPoint add-in</comment>
+ <comment xml:lang="af">PowerPoint-byvoeging</comment>
<comment xml:lang="bg">Приставка — PowerPoint</comment>
<comment xml:lang="ca">complement de PowerPoint</comment>
<comment xml:lang="cs">doplněk PowerPoint</comment>
<comment xml:lang="da">PowerPoint-tilføjelse</comment>
<comment xml:lang="de">PowerPoint Add-in</comment>
<comment xml:lang="el">Πρόσθετο PowerPoint</comment>
- <comment xml:lang="en_GB">PowerPoint add-in</comment>
+ <comment xml:lang="en-GB">PowerPoint add-in</comment>
<comment xml:lang="es">complemento de PowerPoint</comment>
<comment xml:lang="eu">PowerPoint gehigarria</comment>
<comment xml:lang="fi">PowerPoint-lisäosa</comment>
<comment xml:lang="fr">complément PowerPoint</comment>
+ <comment xml:lang="fur">zonte PowerPoint</comment>
<comment xml:lang="ga">breiseán PowerPoint</comment>
<comment xml:lang="gl">complemento de PowerPoint</comment>
<comment xml:lang="he">תוסף של PowerPoint</comment>
@@ -3351,7 +3442,7 @@
<comment xml:lang="oc">complement PowerPoint</comment>
<comment xml:lang="pl">Dodatek PowerPoint</comment>
<comment xml:lang="pt">extensão PowerPoint</comment>
- <comment xml:lang="pt_BR">Suplemento do PowerPoint</comment>
+ <comment xml:lang="pt-BR">Suplemento do PowerPoint</comment>
<comment xml:lang="ru">Дополнение PowerPoint</comment>
<comment xml:lang="sk">Doplnok aplikácie PowerPoint </comment>
<comment xml:lang="sl">Vstavek PowerPoint</comment>
@@ -3359,28 +3450,30 @@
<comment xml:lang="sv">PowerPoint-tillägg</comment>
<comment xml:lang="tr">PowerPoint eklentisi</comment>
<comment xml:lang="uk">додаток PowerPoint</comment>
- <comment xml:lang="zh_CN">PowerPoint 外接程序</comment>
- <comment xml:lang="zh_TW">PowerPoint 增益集</comment>
+ <comment xml:lang="zh-CN">PowerPoint 外接程序</comment>
+ <comment xml:lang="zh-TW">PowerPoint 增益集</comment>
<generic-icon name="x-office-presentation"/>
<glob pattern="*.ppam"/>
</mime-type>
<mime-type type="application/vnd.ms-powerpoint.presentation.macroEnabled.12">
<comment>PowerPoint presentation</comment>
+ <comment xml:lang="af">PowerPoint-voorlegging</comment>
<comment xml:lang="ar">عرض تقديمي PowerPoint</comment>
- <comment xml:lang="be@latin">Prezentacyja PowerPoint</comment>
+ <comment xml:lang="be-Latn">Prezentacyja PowerPoint</comment>
<comment xml:lang="bg">Презентация — PowerPoint</comment>
<comment xml:lang="ca">presentació de PowerPoint</comment>
<comment xml:lang="cs">prezentace PowerPoint</comment>
<comment xml:lang="da">PowerPoint-præsentation</comment>
<comment xml:lang="de">PowerPoint-Präsentation</comment>
<comment xml:lang="el">Παρουσίαση PowerPoint</comment>
- <comment xml:lang="en_GB">PowerPoint presentation</comment>
+ <comment xml:lang="en-GB">PowerPoint presentation</comment>
<comment xml:lang="eo">PowerPoint-prezentaĵo</comment>
<comment xml:lang="es">presentación de PowerPoint</comment>
<comment xml:lang="eu">PowerPoint aurkezpena</comment>
<comment xml:lang="fi">PowerPoint-esitys</comment>
<comment xml:lang="fo">PowerPoint framløga</comment>
<comment xml:lang="fr">présentation PowerPoint</comment>
+ <comment xml:lang="fur">presentazion PowerPoint</comment>
<comment xml:lang="ga">láithreoireacht PowerPoint</comment>
<comment xml:lang="gl">presentación de PowerPoint</comment>
<comment xml:lang="he">מצגת PowerPoint</comment>
@@ -3400,7 +3493,7 @@
<comment xml:lang="oc">presentacion PowerPoint</comment>
<comment xml:lang="pl">Prezentacja PowerPoint</comment>
<comment xml:lang="pt">apresentação PowerPoint</comment>
- <comment xml:lang="pt_BR">Apresentação do PowerPoint</comment>
+ <comment xml:lang="pt-BR">Apresentação do PowerPoint</comment>
<comment xml:lang="ro">Prezentare PowerPoint</comment>
<comment xml:lang="ru">Презентация PowerPoint</comment>
<comment xml:lang="sk">Prezentácia PowerPoint</comment>
@@ -3411,25 +3504,28 @@
<comment xml:lang="tr">PowerPoint sunumu</comment>
<comment xml:lang="uk">презентація PowerPoint</comment>
<comment xml:lang="vi">Trình diễn PowerPoint</comment>
- <comment xml:lang="zh_CN">PowerPoint 演示文稿</comment>
- <comment xml:lang="zh_TW">PowerPoint 簡報</comment>
+ <comment xml:lang="zh-CN">PowerPoint 演示文稿</comment>
+ <comment xml:lang="zh-TW">PowerPoint 簡報</comment>
<generic-icon name="x-office-presentation"/>
<glob pattern="*.pptm"/>
<sub-class-of type="application/vnd.openxmlformats-officedocument.presentationml.presentation"/>
</mime-type>
<mime-type type="application/vnd.ms-powerpoint.slide.macroEnabled.12">
<comment>PowerPoint slide</comment>
+ <comment xml:lang="af">PowerPoint-skyfie</comment>
<comment xml:lang="ast">Diapositiva de PowerPoint</comment>
+ <comment xml:lang="bg">Кадър — PowerPoint</comment>
<comment xml:lang="ca">dispositiva de PowerPoint</comment>
<comment xml:lang="cs">promítání PowerPoint</comment>
<comment xml:lang="da">PowerPoint-dias</comment>
<comment xml:lang="de">PowerPoint-Folie</comment>
<comment xml:lang="el">Διαφάνεια PowerPoint</comment>
- <comment xml:lang="en_GB">PowerPoint slide</comment>
+ <comment xml:lang="en-GB">PowerPoint slide</comment>
<comment xml:lang="es">diapositiva de PowerPoint</comment>
<comment xml:lang="eu">PowerPoint diapositiba</comment>
<comment xml:lang="fi">PowerPoint-dia</comment>
<comment xml:lang="fr">diapositive PowerPoint</comment>
+ <comment xml:lang="fur">diapositive PowerPoint</comment>
<comment xml:lang="ga">sleamhnán PowerPoint</comment>
<comment xml:lang="he">שקופית של PowerPoint</comment>
<comment xml:lang="hr">PowerPoint prezentacija</comment>
@@ -3438,40 +3534,43 @@
<comment xml:lang="id">Salindia PowerPoint</comment>
<comment xml:lang="it">Diapositiva PowerPoint</comment>
<comment xml:lang="kk">PowerPoint слайды</comment>
- <comment xml:lang="ko">파워포인트 슬라이드</comment>
+ <comment xml:lang="ko">PowerPoint 슬라이드</comment>
<comment xml:lang="oc">Diapositiva PowerPoint</comment>
<comment xml:lang="pl">Slajd PowerPoint</comment>
<comment xml:lang="pt">diapositivo PowerPoint</comment>
- <comment xml:lang="pt_BR">Slide do PowerPoint</comment>
+ <comment xml:lang="pt-BR">Slide do PowerPoint</comment>
<comment xml:lang="ru">Слайд PowerPoint</comment>
<comment xml:lang="sk">Snímka aplikácie PowerPoint</comment>
+ <comment xml:lang="sl">Prosojnica PowerPoint</comment>
<comment xml:lang="sr">Пауер поинт слајд</comment>
<comment xml:lang="sv">PowerPoint-bildspel</comment>
<comment xml:lang="tr">PowerPoint sunusu</comment>
<comment xml:lang="uk">слайд PowerPoint</comment>
- <comment xml:lang="zh_CN">PowerPoint 幻灯片</comment>
- <comment xml:lang="zh_TW">PowerPoint 投影片</comment>
+ <comment xml:lang="zh-CN">PowerPoint 幻灯片</comment>
+ <comment xml:lang="zh-TW">PowerPoint 投影片</comment>
<generic-icon name="x-office-presentation"/>
<glob pattern="*.sldm"/>
<sub-class-of type="application/vnd.openxmlformats-officedocument.presentationml.slide"/>
</mime-type>
<mime-type type="application/vnd.ms-powerpoint.slideshow.macroEnabled.12">
<comment>PowerPoint presentation</comment>
+ <comment xml:lang="af">PowerPoint-voorlegging</comment>
<comment xml:lang="ar">عرض تقديمي PowerPoint</comment>
- <comment xml:lang="be@latin">Prezentacyja PowerPoint</comment>
+ <comment xml:lang="be-Latn">Prezentacyja PowerPoint</comment>
<comment xml:lang="bg">Презентация — PowerPoint</comment>
<comment xml:lang="ca">presentació de PowerPoint</comment>
<comment xml:lang="cs">prezentace PowerPoint</comment>
<comment xml:lang="da">PowerPoint-præsentation</comment>
<comment xml:lang="de">PowerPoint-Präsentation</comment>
<comment xml:lang="el">Παρουσίαση PowerPoint</comment>
- <comment xml:lang="en_GB">PowerPoint presentation</comment>
+ <comment xml:lang="en-GB">PowerPoint presentation</comment>
<comment xml:lang="eo">PowerPoint-prezentaĵo</comment>
<comment xml:lang="es">presentación de PowerPoint</comment>
<comment xml:lang="eu">PowerPoint aurkezpena</comment>
<comment xml:lang="fi">PowerPoint-esitys</comment>
<comment xml:lang="fo">PowerPoint framløga</comment>
<comment xml:lang="fr">présentation PowerPoint</comment>
+ <comment xml:lang="fur">presentazion PowerPoint</comment>
<comment xml:lang="ga">láithreoireacht PowerPoint</comment>
<comment xml:lang="gl">presentación de PowerPoint</comment>
<comment xml:lang="he">מצגת PowerPoint</comment>
@@ -3491,7 +3590,7 @@
<comment xml:lang="oc">presentacion PowerPoint</comment>
<comment xml:lang="pl">Prezentacja PowerPoint</comment>
<comment xml:lang="pt">apresentação PowerPoint</comment>
- <comment xml:lang="pt_BR">Apresentação do PowerPoint</comment>
+ <comment xml:lang="pt-BR">Apresentação do PowerPoint</comment>
<comment xml:lang="ro">Prezentare PowerPoint</comment>
<comment xml:lang="ru">Презентация PowerPoint</comment>
<comment xml:lang="sk">Prezentácia PowerPoint</comment>
@@ -3502,25 +3601,28 @@
<comment xml:lang="tr">PowerPoint sunumu</comment>
<comment xml:lang="uk">презентація PowerPoint</comment>
<comment xml:lang="vi">Trình diễn PowerPoint</comment>
- <comment xml:lang="zh_CN">PowerPoint 演示文稿</comment>
- <comment xml:lang="zh_TW">PowerPoint 簡報</comment>
+ <comment xml:lang="zh-CN">PowerPoint 演示文稿</comment>
+ <comment xml:lang="zh-TW">PowerPoint 簡報</comment>
<generic-icon name="x-office-presentation"/>
<glob pattern="*.ppsm"/>
<sub-class-of type="application/vnd.openxmlformats-officedocument.presentationml.slideshow"/>
</mime-type>
<mime-type type="application/vnd.ms-powerpoint.template.macroEnabled.12">
<comment>PowerPoint presentation template</comment>
+ <comment xml:lang="af">PowerPoint-voorleggingsjabloon</comment>
<comment xml:lang="ast">Plantía de presentaciones de PowerPoint</comment>
+ <comment xml:lang="bg">Шаблон за презентация — PowerPoint</comment>
<comment xml:lang="ca">plantilla de presentació de PowerPoint</comment>
<comment xml:lang="cs">šablona prezentace PowerPoint</comment>
<comment xml:lang="da">PowerPoint-præsentationsskabelon</comment>
<comment xml:lang="de">PowerPoint-Präsentationsvorlage</comment>
<comment xml:lang="el">Πρότυπο παρουσίασης PowerPoint</comment>
- <comment xml:lang="en_GB">PowerPoint presentation template</comment>
+ <comment xml:lang="en-GB">PowerPoint presentation template</comment>
<comment xml:lang="es">plantilla de presentación de PowerPoint</comment>
<comment xml:lang="eu">PowerPoint aurkezpen txantiloia</comment>
<comment xml:lang="fi">PowerPoint-esitysmalli</comment>
<comment xml:lang="fr">modèle de présentation PowerPoint</comment>
+ <comment xml:lang="fur">model di presentazion PowerPoint</comment>
<comment xml:lang="ga">teimpléad láithreoireachta PowerPoint</comment>
<comment xml:lang="he">תבנית מצגת PowerPoint</comment>
<comment xml:lang="hr">Predložak PowerPoint prezentacije</comment>
@@ -3529,255 +3631,230 @@
<comment xml:lang="id">Templat presentasi PowerPoint</comment>
<comment xml:lang="it">Modello presentazione PowerPoint</comment>
<comment xml:lang="kk">PowerPoint презентация үлгісі</comment>
- <comment xml:lang="ko">PowerPoint 프리젠테이션 서식</comment>
+ <comment xml:lang="ko">PowerPoint 프레젠테이션 서식</comment>
<comment xml:lang="oc">Modèl de presentacion PowerPoint</comment>
<comment xml:lang="pl">Szablon prezentacji PowerPoint</comment>
- <comment xml:lang="pt">modelo de apresentação PowerPoint</comment>
- <comment xml:lang="pt_BR">Modelo de apresentação do PowerPoint</comment>
+ <comment xml:lang="pt">predefinição de apresentação PowerPoint</comment>
+ <comment xml:lang="pt-BR">Modelo de apresentação do PowerPoint</comment>
<comment xml:lang="ru">Шаблон презентации PowerPoint</comment>
<comment xml:lang="sk">Šablóna prezentácie aplikácie PowerPoint</comment>
+ <comment xml:lang="sl">Predloga predstavitve PowerPoint</comment>
<comment xml:lang="sr">Шаблон презентације Пауер поинта</comment>
<comment xml:lang="sv">PowerPoint-presentationsmall</comment>
<comment xml:lang="tr">PowerPoint sunum şablonu</comment>
<comment xml:lang="uk">шаблон презентації PowerPoint</comment>
- <comment xml:lang="zh_CN">PowerPoint 演示文稿模板</comment>
- <comment xml:lang="zh_TW">PowerPoint 簡報範本</comment>
+ <comment xml:lang="zh-CN">PowerPoint 演示文稿模板</comment>
+ <comment xml:lang="zh-TW">PowerPoint 簡報範本</comment>
<generic-icon name="x-office-presentation"/>
<glob pattern="*.potm"/>
<sub-class-of type="application/vnd.openxmlformats-officedocument.presentationml.template"/>
</mime-type>
<mime-type type="application/vnd.ms-visio.drawing.main+xml">
- <comment>Office Open XML Visio Drawing</comment>
+ <comment>Office Open XML Visio drawing</comment>
+ <comment xml:lang="bg">Чертеж — Office Open XML Visio</comment>
<comment xml:lang="ca">dibuix en Office Open XML de Visio</comment>
- <comment xml:lang="cs">kresba Office Open XML Visio</comment>
<comment xml:lang="da">Office Open XML Visio-tegning</comment>
<comment xml:lang="de">Office-Open-XML-Visio-Zeichnung</comment>
- <comment xml:lang="el">Σχέδιο Office Open XML Visio</comment>
- <comment xml:lang="en_GB">Office Open XML Visio Drawing</comment>
- <comment xml:lang="es">dibujo en OOXML de Visio</comment>
+ <comment xml:lang="en-GB">Office Open XML Visio drawing</comment>
+ <comment xml:lang="es">dibujo Office Open XML de Visio</comment>
<comment xml:lang="eu">Office Open XML Visio marrazkia</comment>
<comment xml:lang="fi">Office Open XML Visio -piirros</comment>
<comment xml:lang="fr">dessin Visio Office Open XML</comment>
- <comment xml:lang="ga">Líníocht Office Open XML Visio</comment>
- <comment xml:lang="he">ציור Visio ב־Open XML מבית Office</comment>
<comment xml:lang="hr">Office Open XML Visio crtež</comment>
<comment xml:lang="hu">Office Open XML Visio rajz</comment>
- <comment xml:lang="ia">Designo Office Open XML Visio</comment>
- <comment xml:lang="id">Gambar Visio Office Open XML</comment>
+ <comment xml:lang="id">Gambar Office Open XML Visio</comment>
<comment xml:lang="it">Disegno Visio Office Open XML</comment>
<comment xml:lang="kk">Office Open XML Visio суреті</comment>
<comment xml:lang="ko">오피스 오픈 XML 비지오 드로잉</comment>
<comment xml:lang="pl">Rysunek Office Open XML Visio</comment>
- <comment xml:lang="pt">desenho Office Open XML Visio</comment>
- <comment xml:lang="pt_BR">Desenho do Visio em Office Open XML</comment>
+ <comment xml:lang="pt">desenho Visio do Open Office XML</comment>
+ <comment xml:lang="pt-BR">Desenho do Office Open XML Visio</comment>
<comment xml:lang="ru">Рисунок Visio формата Office Open XML</comment>
- <comment xml:lang="sk">Kresba aplikácie Visio Office Open XML</comment>
- <comment xml:lang="sr">Офисов отворени ИксМЛ Визио цртеж</comment>
- <comment xml:lang="sv">Office Open XML Visio-teckning</comment>
- <comment xml:lang="tr">Office Open XML Visio Çizimi</comment>
- <comment xml:lang="uk">схема VIisio у форматі Office Open XML</comment>
- <comment xml:lang="zh_CN">Office Open XML Visio 绘图</comment>
- <comment xml:lang="zh_TW">Office Open XML Visio 繪圖</comment>
+ <comment xml:lang="sk">Kresba aplikácie Office Open XML Visio</comment>
+ <comment xml:lang="sl">Risba Office Open XML Visio</comment>
+ <comment xml:lang="sv">Office Open XML Visio-ritning</comment>
+ <comment xml:lang="tr">Office Open XML Visio çizimi</comment>
+ <comment xml:lang="uk">малюнок Visio Office Open у XML</comment>
+ <comment xml:lang="zh-CN">Office Open XML Visio 绘图</comment>
+ <comment xml:lang="zh-TW">Office Open XML Visio 繪圖</comment>
<generic-icon name="image-x-generic"/>
<glob pattern="*.vsdx"/>
<sub-class-of type="application/zip"/>
</mime-type>
<mime-type type="application/vnd.ms-visio.template.main+xml">
- <comment>Office Open XML Visio Template</comment>
+ <comment>Office Open XML Visio template</comment>
+ <comment xml:lang="bg">Шаблон за чертеж — Office Open XML Visio</comment>
<comment xml:lang="ca">plantilla en Office Open XML de Visio</comment>
- <comment xml:lang="cs">šablona Office Open XML Visio</comment>
<comment xml:lang="da">Office Open XML Visio-skabelon</comment>
<comment xml:lang="de">Office-Open-XML-Visio-Vorlage</comment>
- <comment xml:lang="el">Πρότυπο Office Open XML Visio</comment>
- <comment xml:lang="en_GB">Office Open XML Visio Template</comment>
- <comment xml:lang="es">plantilla en OOXML de Visio</comment>
+ <comment xml:lang="en-GB">Office Open XML Visio template</comment>
+ <comment xml:lang="es">plantilla Office Open XML de Visio</comment>
<comment xml:lang="eu">Office Open XML Visio txantiloia</comment>
<comment xml:lang="fi">Office Open XML Visio -malli</comment>
<comment xml:lang="fr">modèle Visio Office Open XML</comment>
- <comment xml:lang="ga">Teimpléad Office Open XML Visio</comment>
- <comment xml:lang="he">תבנית Visio ב־Open XML מבית Office</comment>
- <comment xml:lang="hr">Predložak Office Open XML Visio</comment>
+ <comment xml:lang="hr">Office Open XML Visio predložak</comment>
<comment xml:lang="hu">Office Open XML Visio sablon</comment>
- <comment xml:lang="ia">Patrono Office Open XML Visio</comment>
- <comment xml:lang="id">Templat Visio Office Open XML</comment>
+ <comment xml:lang="id">Templat Office Open XML Visio</comment>
<comment xml:lang="it">Modello Visio Office Open XML</comment>
<comment xml:lang="kk">Office Open XML Visio үлгісі</comment>
- <comment xml:lang="ko">오피스 오픈 XML 비지오 서식</comment>
+ <comment xml:lang="ko">오피스 오픈 XML 비지오 양식</comment>
<comment xml:lang="pl">Szablon Office Open XML Visio</comment>
- <comment xml:lang="pt">modelo Office Open XML Visio</comment>
- <comment xml:lang="pt_BR">Modelo do Visio em Office Open XML</comment>
+ <comment xml:lang="pt">predefinição Visio do Open Office XML</comment>
+ <comment xml:lang="pt-BR">Modelo Office Open XML Visio</comment>
<comment xml:lang="ru">Шаблон Visio формата Office Open XML</comment>
- <comment xml:lang="sk">Šablóna aplikácie Visio Office Open XML</comment>
- <comment xml:lang="sr">Офисов отворени ИксМЛ Визио шаблон</comment>
+ <comment xml:lang="sk">Šablóna aplikácie Office Open XML Visio</comment>
+ <comment xml:lang="sl">Predloga Office Open XML Visio</comment>
<comment xml:lang="sv">Office Open XML Visio-mall</comment>
- <comment xml:lang="tr">Office Open XML Visio Şablonu</comment>
- <comment xml:lang="uk">шаблон Visio у форматі Office Open XML</comment>
- <comment xml:lang="zh_CN">Office Open XML Visio 模板</comment>
- <comment xml:lang="zh_TW">Office Open XML Visio 範本</comment>
+ <comment xml:lang="tr">Office Open XML Visio şablonu</comment>
+ <comment xml:lang="uk">шаблон Visio Office Open у XML</comment>
+ <comment xml:lang="zh-CN">Office Open XML Visio 模板</comment>
+ <comment xml:lang="zh-TW">Office Open XML Visio 範本</comment>
<generic-icon name="image-x-generic"/>
<glob pattern="*.vstx"/>
<sub-class-of type="application/zip"/>
</mime-type>
<mime-type type="application/vnd.ms-visio.stencil.main+xml">
- <comment>Office Open XML Visio Stencil</comment>
+ <comment>Office Open XML Visio stencil</comment>
+ <comment xml:lang="bg">Образци — Office Open XML Visio</comment>
<comment xml:lang="ca">patró en Office Open XML de Visio</comment>
- <comment xml:lang="cs">objekty Office Open XML Visio</comment>
<comment xml:lang="da">Office Open XML Visio-stencil</comment>
<comment xml:lang="de">Office-Open-XML-Visio-Schablone</comment>
- <comment xml:lang="en_GB">Office Open XML Visio Stencil</comment>
- <comment xml:lang="es">esténcil en OOXML de Visio</comment>
+ <comment xml:lang="en-GB">Office Open XML Visio stencil</comment>
+ <comment xml:lang="es">galería de símbolos Office Open XML de Visio</comment>
<comment xml:lang="eu">Office Open XML Visio txantiloia</comment>
- <comment xml:lang="fi">Office Open XML Visio -kaavio</comment>
+ <comment xml:lang="fi">Office Open XML Visio -malli</comment>
<comment xml:lang="fr">stencil Visio Office Open XML</comment>
- <comment xml:lang="ga">Stionsal Office Open XML Visio</comment>
- <comment xml:lang="he">דגם ל־Visio ב־Open XML מבית Office</comment>
<comment xml:lang="hr">Office Open XML Visio šablona</comment>
<comment xml:lang="hu">Office Open XML Visio stencil</comment>
- <comment xml:lang="ia">Stencil Office Open XML Visio</comment>
- <comment xml:lang="id">Stensil Visio Office Open XML</comment>
+ <comment xml:lang="id">Stensil Office Open XML Visio</comment>
<comment xml:lang="it">Stencil Visio Office Open XML</comment>
- <comment xml:lang="kk">Office Open XML пішімінің Visio трафареті</comment>
+ <comment xml:lang="kk">Office Open XML Visio трафареті</comment>
<comment xml:lang="ko">오피스 오픈 XML 비지오 스텐실</comment>
<comment xml:lang="pl">Wzór Office Open XML Visio</comment>
- <comment xml:lang="pt">Stencil Office Open XML Visio</comment>
- <comment xml:lang="pt_BR">Estêncil do Visio em Office Open XML</comment>
+ <comment xml:lang="pt">estêncil Visio do Open Office XML</comment>
+ <comment xml:lang="pt-BR">Estêncil do Office Open XML Visio</comment>
<comment xml:lang="ru">Трафарет Visio формата Office Open XML</comment>
- <comment xml:lang="sk">Objekt aplikácie Visio Office Open XML</comment>
- <comment xml:lang="sr">Офисов отворени ИксМЛ Визио шаблон</comment>
<comment xml:lang="sv">Office Open XML Visio-stencil</comment>
- <comment xml:lang="tr">Office Open XML Visio Kalıbı</comment>
- <comment xml:lang="uk">трафарет Visio у форматі Office Open XML</comment>
- <comment xml:lang="zh_CN">Office Open XML Visio 模具</comment>
- <comment xml:lang="zh_TW">Office Open XML Visio 圖形樣本</comment>
+ <comment xml:lang="tr">Office Open XML Visio kalıbı</comment>
+ <comment xml:lang="uk">трафарет Visio Office Open у XML</comment>
+ <comment xml:lang="zh-CN">Office Open XML Visio 模具</comment>
<generic-icon name="image-x-generic"/>
<glob pattern="*.vssx"/>
<sub-class-of type="application/zip"/>
</mime-type>
<mime-type type="application/vnd.ms-visio.drawing.macroEnabled.main+xml">
- <comment>Office Open XML Visio Drawing</comment>
+ <comment>Office Open XML Visio drawing</comment>
+ <comment xml:lang="bg">Чертеж — Office Open XML Visio</comment>
<comment xml:lang="ca">dibuix en Office Open XML de Visio</comment>
- <comment xml:lang="cs">kresba Office Open XML Visio</comment>
<comment xml:lang="da">Office Open XML Visio-tegning</comment>
<comment xml:lang="de">Office-Open-XML-Visio-Zeichnung</comment>
- <comment xml:lang="el">Σχέδιο Office Open XML Visio</comment>
- <comment xml:lang="en_GB">Office Open XML Visio Drawing</comment>
- <comment xml:lang="es">dibujo en OOXML de Visio</comment>
+ <comment xml:lang="en-GB">Office Open XML Visio drawing</comment>
+ <comment xml:lang="es">dibujo Office Open XML de Visio</comment>
<comment xml:lang="eu">Office Open XML Visio marrazkia</comment>
<comment xml:lang="fi">Office Open XML Visio -piirros</comment>
<comment xml:lang="fr">dessin Visio Office Open XML</comment>
- <comment xml:lang="ga">Líníocht Office Open XML Visio</comment>
- <comment xml:lang="he">ציור Visio ב־Open XML מבית Office</comment>
<comment xml:lang="hr">Office Open XML Visio crtež</comment>
<comment xml:lang="hu">Office Open XML Visio rajz</comment>
- <comment xml:lang="ia">Designo Office Open XML Visio</comment>
- <comment xml:lang="id">Gambar Visio Office Open XML</comment>
+ <comment xml:lang="id">Gambar Office Open XML Visio</comment>
<comment xml:lang="it">Disegno Visio Office Open XML</comment>
<comment xml:lang="kk">Office Open XML Visio суреті</comment>
<comment xml:lang="ko">오피스 오픈 XML 비지오 드로잉</comment>
<comment xml:lang="pl">Rysunek Office Open XML Visio</comment>
- <comment xml:lang="pt">desenho Office Open XML Visio</comment>
- <comment xml:lang="pt_BR">Desenho do Visio em Office Open XML</comment>
+ <comment xml:lang="pt">desenho Visio do Open Office XML</comment>
+ <comment xml:lang="pt-BR">Desenho do Office Open XML Visio</comment>
<comment xml:lang="ru">Рисунок Visio формата Office Open XML</comment>
- <comment xml:lang="sk">Kresba aplikácie Visio Office Open XML</comment>
- <comment xml:lang="sr">Офисов отворени ИксМЛ Визио цртеж</comment>
- <comment xml:lang="sv">Office Open XML Visio-teckning</comment>
- <comment xml:lang="tr">Office Open XML Visio Çizimi</comment>
- <comment xml:lang="uk">схема VIisio у форматі Office Open XML</comment>
- <comment xml:lang="zh_CN">Office Open XML Visio 绘图</comment>
- <comment xml:lang="zh_TW">Office Open XML Visio 繪圖</comment>
+ <comment xml:lang="sk">Kresba aplikácie Office Open XML Visio</comment>
+ <comment xml:lang="sl">Risba Office Open XML Visio</comment>
+ <comment xml:lang="sv">Office Open XML Visio-ritning</comment>
+ <comment xml:lang="tr">Office Open XML Visio çizimi</comment>
+ <comment xml:lang="uk">малюнок Visio Office Open у XML</comment>
+ <comment xml:lang="zh-CN">Office Open XML Visio 绘图</comment>
+ <comment xml:lang="zh-TW">Office Open XML Visio 繪圖</comment>
<generic-icon name="image-x-generic"/>
<glob pattern="*.vsdm"/>
<sub-class-of type="application/zip"/>
</mime-type>
<mime-type type="application/vnd.ms-visio.template.macroEnabled.main+xml">
- <comment>Office Open XML Visio Template</comment>
+ <comment>Office Open XML Visio template</comment>
+ <comment xml:lang="bg">Шаблон за чертеж — Office Open XML Visio</comment>
<comment xml:lang="ca">plantilla en Office Open XML de Visio</comment>
- <comment xml:lang="cs">šablona Office Open XML Visio</comment>
<comment xml:lang="da">Office Open XML Visio-skabelon</comment>
<comment xml:lang="de">Office-Open-XML-Visio-Vorlage</comment>
- <comment xml:lang="el">Πρότυπο Office Open XML Visio</comment>
- <comment xml:lang="en_GB">Office Open XML Visio Template</comment>
- <comment xml:lang="es">plantilla en OOXML de Visio</comment>
+ <comment xml:lang="en-GB">Office Open XML Visio template</comment>
+ <comment xml:lang="es">plantilla Office Open XML de Visio</comment>
<comment xml:lang="eu">Office Open XML Visio txantiloia</comment>
<comment xml:lang="fi">Office Open XML Visio -malli</comment>
<comment xml:lang="fr">modèle Visio Office Open XML</comment>
- <comment xml:lang="ga">Teimpléad Office Open XML Visio</comment>
- <comment xml:lang="he">תבנית Visio ב־Open XML מבית Office</comment>
- <comment xml:lang="hr">Predložak Office Open XML Visio</comment>
+ <comment xml:lang="hr">Office Open XML Visio predložak</comment>
<comment xml:lang="hu">Office Open XML Visio sablon</comment>
- <comment xml:lang="ia">Patrono Office Open XML Visio</comment>
- <comment xml:lang="id">Templat Visio Office Open XML</comment>
+ <comment xml:lang="id">Templat Office Open XML Visio</comment>
<comment xml:lang="it">Modello Visio Office Open XML</comment>
<comment xml:lang="kk">Office Open XML Visio үлгісі</comment>
- <comment xml:lang="ko">오피스 오픈 XML 비지오 서식</comment>
+ <comment xml:lang="ko">오피스 오픈 XML 비지오 양식</comment>
<comment xml:lang="pl">Szablon Office Open XML Visio</comment>
- <comment xml:lang="pt">modelo Office Open XML Visio</comment>
- <comment xml:lang="pt_BR">Modelo do Visio em Office Open XML</comment>
+ <comment xml:lang="pt">predefinição Visio do Open Office XML</comment>
+ <comment xml:lang="pt-BR">Modelo Office Open XML Visio</comment>
<comment xml:lang="ru">Шаблон Visio формата Office Open XML</comment>
- <comment xml:lang="sk">Šablóna aplikácie Visio Office Open XML</comment>
- <comment xml:lang="sr">Офисов отворени ИксМЛ Визио шаблон</comment>
+ <comment xml:lang="sk">Šablóna aplikácie Office Open XML Visio</comment>
+ <comment xml:lang="sl">Predloga Office Open XML Visio</comment>
<comment xml:lang="sv">Office Open XML Visio-mall</comment>
- <comment xml:lang="tr">Office Open XML Visio Şablonu</comment>
- <comment xml:lang="uk">шаблон Visio у форматі Office Open XML</comment>
- <comment xml:lang="zh_CN">Office Open XML Visio 模板</comment>
- <comment xml:lang="zh_TW">Office Open XML Visio 範本</comment>
+ <comment xml:lang="tr">Office Open XML Visio şablonu</comment>
+ <comment xml:lang="uk">шаблон Visio Office Open у XML</comment>
+ <comment xml:lang="zh-CN">Office Open XML Visio 模板</comment>
+ <comment xml:lang="zh-TW">Office Open XML Visio 範本</comment>
<generic-icon name="image-x-generic"/>
<glob pattern="*.vstm"/>
<sub-class-of type="application/zip"/>
</mime-type>
<mime-type type="application/vnd.ms-visio.stencil.macroEnabled.main+xml">
- <comment>Office Open XML Visio Stencil</comment>
+ <comment>Office Open XML Visio stencil</comment>
+ <comment xml:lang="bg">Образци — Office Open XML Visio</comment>
<comment xml:lang="ca">patró en Office Open XML de Visio</comment>
- <comment xml:lang="cs">objekty Office Open XML Visio</comment>
<comment xml:lang="da">Office Open XML Visio-stencil</comment>
<comment xml:lang="de">Office-Open-XML-Visio-Schablone</comment>
- <comment xml:lang="en_GB">Office Open XML Visio Stencil</comment>
- <comment xml:lang="es">esténcil en OOXML de Visio</comment>
+ <comment xml:lang="en-GB">Office Open XML Visio stencil</comment>
+ <comment xml:lang="es">galería de símbolos Office Open XML de Visio</comment>
<comment xml:lang="eu">Office Open XML Visio txantiloia</comment>
- <comment xml:lang="fi">Office Open XML Visio -kaavio</comment>
+ <comment xml:lang="fi">Office Open XML Visio -malli</comment>
<comment xml:lang="fr">stencil Visio Office Open XML</comment>
- <comment xml:lang="ga">Stionsal Office Open XML Visio</comment>
- <comment xml:lang="he">דגם ל־Visio ב־Open XML מבית Office</comment>
<comment xml:lang="hr">Office Open XML Visio šablona</comment>
<comment xml:lang="hu">Office Open XML Visio stencil</comment>
- <comment xml:lang="ia">Stencil Office Open XML Visio</comment>
- <comment xml:lang="id">Stensil Visio Office Open XML</comment>
+ <comment xml:lang="id">Stensil Office Open XML Visio</comment>
<comment xml:lang="it">Stencil Visio Office Open XML</comment>
- <comment xml:lang="kk">Office Open XML пішімінің Visio трафареті</comment>
+ <comment xml:lang="kk">Office Open XML Visio трафареті</comment>
<comment xml:lang="ko">오피스 오픈 XML 비지오 스텐실</comment>
<comment xml:lang="pl">Wzór Office Open XML Visio</comment>
- <comment xml:lang="pt">Stencil Office Open XML Visio</comment>
- <comment xml:lang="pt_BR">Estêncil do Visio em Office Open XML</comment>
+ <comment xml:lang="pt">estêncil Visio do Open Office XML</comment>
+ <comment xml:lang="pt-BR">Estêncil do Office Open XML Visio</comment>
<comment xml:lang="ru">Трафарет Visio формата Office Open XML</comment>
- <comment xml:lang="sk">Objekt aplikácie Visio Office Open XML</comment>
- <comment xml:lang="sr">Офисов отворени ИксМЛ Визио шаблон</comment>
<comment xml:lang="sv">Office Open XML Visio-stencil</comment>
- <comment xml:lang="tr">Office Open XML Visio Kalıbı</comment>
- <comment xml:lang="uk">трафарет Visio у форматі Office Open XML</comment>
- <comment xml:lang="zh_CN">Office Open XML Visio 模具</comment>
- <comment xml:lang="zh_TW">Office Open XML Visio 圖形樣本</comment>
+ <comment xml:lang="tr">Office Open XML Visio kalıbı</comment>
+ <comment xml:lang="uk">трафарет Visio Office Open у XML</comment>
+ <comment xml:lang="zh-CN">Office Open XML Visio 模具</comment>
<generic-icon name="image-x-generic"/>
<glob pattern="*.vssm"/>
<sub-class-of type="application/zip"/>
</mime-type>
<mime-type type="application/vnd.ms-word.document.macroEnabled.12">
<comment>Word document</comment>
+ <comment xml:lang="af">Word-dokument</comment>
<comment xml:lang="ar">مستند Word</comment>
<comment xml:lang="ast">Documentu de Word</comment>
- <comment xml:lang="be@latin">Dakument Word</comment>
+ <comment xml:lang="be-Latn">Dakument Word</comment>
<comment xml:lang="bg">Документ — Word</comment>
<comment xml:lang="ca">document Word</comment>
<comment xml:lang="cs">dokument Word</comment>
<comment xml:lang="da">Worddokument</comment>
<comment xml:lang="de">Word-Dokument</comment>
<comment xml:lang="el">Έγγραφο Word</comment>
- <comment xml:lang="en_GB">Word document</comment>
+ <comment xml:lang="en-GB">Word document</comment>
<comment xml:lang="eo">Word-dokumento</comment>
<comment xml:lang="es">documento de Word</comment>
<comment xml:lang="eu">Word dokumentua</comment>
<comment xml:lang="fi">Word-asiakirja</comment>
<comment xml:lang="fo">Word skjal</comment>
<comment xml:lang="fr">document Word</comment>
+ <comment xml:lang="fur">document Word</comment>
<comment xml:lang="ga">cáipéis Word</comment>
<comment xml:lang="gl">documento de Word</comment>
<comment xml:lang="he">מסמך Word</comment>
@@ -3797,7 +3874,7 @@
<comment xml:lang="oc">document Word</comment>
<comment xml:lang="pl">Dokument Word</comment>
<comment xml:lang="pt">documento Word</comment>
- <comment xml:lang="pt_BR">Documento do Word</comment>
+ <comment xml:lang="pt-BR">Documento do Word</comment>
<comment xml:lang="ro">Document Word</comment>
<comment xml:lang="ru">Документ Word</comment>
<comment xml:lang="sk">Dokument Word</comment>
@@ -3808,25 +3885,28 @@
<comment xml:lang="tr">Word belgesi</comment>
<comment xml:lang="uk">документ Word</comment>
<comment xml:lang="vi">Tài liệu Word</comment>
- <comment xml:lang="zh_CN">Word 文档</comment>
- <comment xml:lang="zh_TW">Word 文件</comment>
+ <comment xml:lang="zh-CN">Word 文档</comment>
+ <comment xml:lang="zh-TW">Word 文件</comment>
<generic-icon name="x-office-document"/>
<glob pattern="*.docm"/>
<sub-class-of type="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
</mime-type>
<mime-type type="application/vnd.ms-word.template.macroEnabled.12">
<comment>Word document template</comment>
+ <comment xml:lang="af">Word-dokumentsjabloon</comment>
<comment xml:lang="ast">Plantía de documentu de Word</comment>
+ <comment xml:lang="bg">Шаблон за документ — Word</comment>
<comment xml:lang="ca">plantilla de document Word</comment>
<comment xml:lang="cs">šablona dokumentu Word</comment>
<comment xml:lang="da">Word-dokumentskabelon</comment>
<comment xml:lang="de">Word-Dokumentvorlage</comment>
<comment xml:lang="el">Πρότυπο έγγραφο Word</comment>
- <comment xml:lang="en_GB">Word document template</comment>
+ <comment xml:lang="en-GB">Word document template</comment>
<comment xml:lang="es">plantilla de documento de Word</comment>
<comment xml:lang="eu">Word dokumentuaren txantiloia</comment>
<comment xml:lang="fi">Word-asiakirjamalli</comment>
<comment xml:lang="fr">modèle de document Word</comment>
+ <comment xml:lang="fur">model di document Word</comment>
<comment xml:lang="ga">teimpléad Word</comment>
<comment xml:lang="he">תבנית מסמך Word</comment>
<comment xml:lang="hr">Predložak Word dokumenta</comment>
@@ -3839,37 +3919,48 @@
<comment xml:lang="oc">modèl de document Word</comment>
<comment xml:lang="pl">Szablon dokumentu Word</comment>
<comment xml:lang="pt">modelo de documento Word</comment>
- <comment xml:lang="pt_BR">Modelo de documento do Word</comment>
+ <comment xml:lang="pt-BR">Modelo de documento do Word</comment>
<comment xml:lang="ru">Шаблон документа Word</comment>
<comment xml:lang="sk">Šablóna dokumentu aplikácie Word</comment>
+ <comment xml:lang="sl">Predloga dokumenta Word</comment>
<comment xml:lang="sr">Шаблон Ворд документа</comment>
<comment xml:lang="sv">Word-dokumentmall</comment>
<comment xml:lang="tr">Word belgesi şablonu</comment>
<comment xml:lang="uk">шаблон документа Word</comment>
- <comment xml:lang="zh_CN">Word 文档模板</comment>
- <comment xml:lang="zh_TW">Word 文件範本</comment>
+ <comment xml:lang="zh-CN">Word 文档模板</comment>
+ <comment xml:lang="zh-TW">Word 文件範本</comment>
<generic-icon name="x-office-document"/>
<glob pattern="*.dotm"/>
<sub-class-of type="application/vnd.openxmlformats-officedocument.wordprocessingml.template"/>
</mime-type>
<mime-type type="application/oxps">
+ <comment>OpenXPS document</comment>
+ <acronym>OpenXPS</acronym>
+ <expanded-acronym>Open XML Paper Specification</expanded-acronym>
+ <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-document"/>
+ <glob pattern="*.oxps"/>
+ </mime-type>
+ <mime-type type="application/vnd.ms-xpsdocument">
<comment>XPS document</comment>
+ <comment xml:lang="af">XPS-dokument</comment>
<comment xml:lang="ar">مستند XPS</comment>
<comment xml:lang="ast">Documentu XPS</comment>
- <comment xml:lang="be@latin">Dakument XPS</comment>
+ <comment xml:lang="be-Latn">Dakument XPS</comment>
<comment xml:lang="bg">Документ — XPS</comment>
<comment xml:lang="ca">document XPS</comment>
<comment xml:lang="cs">dokument XPS</comment>
<comment xml:lang="da">XPS-dokument</comment>
<comment xml:lang="de">XPS-Dokument</comment>
<comment xml:lang="el">Έγγραφο XPS</comment>
- <comment xml:lang="en_GB">XPS document</comment>
+ <comment xml:lang="en-GB">XPS document</comment>
<comment xml:lang="eo">XPS-dokumento</comment>
<comment xml:lang="es">documento XPS</comment>
<comment xml:lang="eu">XPS dokumentua</comment>
<comment xml:lang="fi">XPS-asiakirja</comment>
<comment xml:lang="fo">XPS skjal</comment>
<comment xml:lang="fr">document XPS</comment>
+ <comment xml:lang="fur">document XPS</comment>
<comment xml:lang="ga">cáipéis XPS</comment>
<comment xml:lang="gl">documento XPS</comment>
<comment xml:lang="he">מסמך XPS</comment>
@@ -3889,7 +3980,7 @@
<comment xml:lang="oc">document XPS</comment>
<comment xml:lang="pl">Dokument XPS</comment>
<comment xml:lang="pt">documento XPS</comment>
- <comment xml:lang="pt_BR">Documento XPS</comment>
+ <comment xml:lang="pt-BR">Documento XPS</comment>
<comment xml:lang="ro">Document XPS</comment>
<comment xml:lang="ru">Документ XPS</comment>
<comment xml:lang="sk">Dokument XPS</comment>
@@ -3900,34 +3991,34 @@
<comment xml:lang="tr">XPS belgesi</comment>
<comment xml:lang="uk">документ XPS</comment>
<comment xml:lang="vi">Tài liệu XPS</comment>
- <comment xml:lang="zh_CN">XPS 文档</comment>
- <comment xml:lang="zh_TW">XPS 文件</comment>
+ <comment xml:lang="zh-CN">XPS 文档</comment>
+ <comment xml:lang="zh-TW">XPS 文件</comment>
<acronym>XPS</acronym>
- <expanded-acronym>Open XML Paper Specification</expanded-acronym>
+ <expanded-acronym>XML Paper Specification</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
- <glob pattern="*.oxps"/>
<glob pattern="*.xps"/>
- <alias type="application/vnd.ms-xpsdocument"/>
<alias type="application/xps"/>
</mime-type>
<mime-type type="application/vnd.ms-works">
<comment>Microsoft Works document</comment>
+ <comment xml:lang="af">Microsoft Works-dokument</comment>
<comment xml:lang="ar">مستند Microsoft Works</comment>
<comment xml:lang="ast">Documentu de Microsoft Works</comment>
- <comment xml:lang="be@latin">Dakument Microsoft Works</comment>
+ <comment xml:lang="be-Latn">Dakument Microsoft Works</comment>
<comment xml:lang="bg">Документ — Microsoft Works</comment>
<comment xml:lang="ca">document de Microsoft Works</comment>
<comment xml:lang="cs">dokument Microsoft Works</comment>
<comment xml:lang="da">Microsoft Works-dokument</comment>
<comment xml:lang="de">Microsoft-Works-Dokument</comment>
<comment xml:lang="el">Έγγραφο Microsoft Works</comment>
- <comment xml:lang="en_GB">Microsoft Works document</comment>
+ <comment xml:lang="en-GB">Microsoft Works document</comment>
<comment xml:lang="es">documento de Microsoft Works</comment>
<comment xml:lang="eu">Microsoft Works dokumentua</comment>
<comment xml:lang="fi">Microsoft Works -asiakirja</comment>
<comment xml:lang="fo">Microsoft Works skjal</comment>
<comment xml:lang="fr">document Microsoft Works</comment>
+ <comment xml:lang="fur">document Microsoft Works</comment>
<comment xml:lang="ga">cáipéis Microsoft Works</comment>
<comment xml:lang="gl">documento de Microsoft Works</comment>
<comment xml:lang="he">מסמך Microsoft Works</comment>
@@ -3948,7 +4039,7 @@
<comment xml:lang="oc">document Microsoft Works</comment>
<comment xml:lang="pl">Dokument Microsoft Works</comment>
<comment xml:lang="pt">documento Microsoft Works</comment>
- <comment xml:lang="pt_BR">Documento do Microsoft Works</comment>
+ <comment xml:lang="pt-BR">Documento do Microsoft Works</comment>
<comment xml:lang="ro">Document Microsoft Works</comment>
<comment xml:lang="ru">Документ Microsoft Works</comment>
<comment xml:lang="sk">Dokument Microsoft Works</comment>
@@ -3959,8 +4050,8 @@
<comment xml:lang="tr">Microsoft Works belgesi</comment>
<comment xml:lang="uk">документ Microsoft Works</comment>
<comment xml:lang="vi">Tài liệu Microsoft Works</comment>
- <comment xml:lang="zh_CN">Microsoft Works 文档</comment>
- <comment xml:lang="zh_TW">微軟 Works 文件</comment>
+ <comment xml:lang="zh-CN">Microsoft Works 文档</comment>
+ <comment xml:lang="zh-TW">微軟 Works 文件</comment>
<sub-class-of type="application/x-ole-storage"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.wcm"/>
@@ -3971,6 +4062,7 @@
</mime-type>
<mime-type type="application/vnd.visio">
<comment>Microsoft Visio document</comment>
+ <comment xml:lang="af">Microsoft Visio-dokument</comment>
<comment xml:lang="ast">Documentu de Microsoft Visio</comment>
<comment xml:lang="bg">Документ — Microsoft Visio</comment>
<comment xml:lang="ca">document de Microsoft Visio</comment>
@@ -3978,11 +4070,12 @@
<comment xml:lang="da">Microsoft Visio-dokument</comment>
<comment xml:lang="de">Microsoft-Visio-Dokument</comment>
<comment xml:lang="el">Έγγραφο Microsoft Visio</comment>
- <comment xml:lang="en_GB">Microsoft Visio document</comment>
+ <comment xml:lang="en-GB">Microsoft Visio document</comment>
<comment xml:lang="es">documento de Microsoft Visio</comment>
<comment xml:lang="eu">Microsoft Visio dokumentua</comment>
<comment xml:lang="fi">Microsoft Visio -asiakirja</comment>
<comment xml:lang="fr">document Microsoft Visio</comment>
+ <comment xml:lang="fur">document Microsoft Visio</comment>
<comment xml:lang="ga">cáipéis Microsoft Visio</comment>
<comment xml:lang="gl">Documento de Microsoft Visio</comment>
<comment xml:lang="he">מסמך </comment>
@@ -4000,7 +4093,7 @@
<comment xml:lang="oc">document Microsoft Visio</comment>
<comment xml:lang="pl">Dokument Microsoft Visio</comment>
<comment xml:lang="pt">documento Microsoft Visio</comment>
- <comment xml:lang="pt_BR">Documento do Microsoft Visio</comment>
+ <comment xml:lang="pt-BR">Documento do Microsoft Visio</comment>
<comment xml:lang="ru">Документ Microsoft Visio</comment>
<comment xml:lang="sk">Dokument Microsoft Visio</comment>
<comment xml:lang="sl">Dokument Microsoft Visio</comment>
@@ -4008,8 +4101,8 @@
<comment xml:lang="sv">Microsoft Visio-dokument</comment>
<comment xml:lang="tr">Microsoft Visio belgesi</comment>
<comment xml:lang="uk">документ Microsoft Visio</comment>
- <comment xml:lang="zh_CN">Microsoft Visio 文档</comment>
- <comment xml:lang="zh_TW">Microsoft Visio文件</comment>
+ <comment xml:lang="zh-CN">Microsoft Visio 文档</comment>
+ <comment xml:lang="zh-TW">微軟 Visio 文件</comment>
<sub-class-of type="application/x-ole-storage"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.vsd"/>
@@ -4019,22 +4112,24 @@
</mime-type>
<mime-type type="application/msword">
<comment>Word document</comment>
+ <comment xml:lang="af">Word-dokument</comment>
<comment xml:lang="ar">مستند Word</comment>
<comment xml:lang="ast">Documentu de Word</comment>
- <comment xml:lang="be@latin">Dakument Word</comment>
+ <comment xml:lang="be-Latn">Dakument Word</comment>
<comment xml:lang="bg">Документ — Word</comment>
<comment xml:lang="ca">document Word</comment>
<comment xml:lang="cs">dokument Word</comment>
<comment xml:lang="da">Worddokument</comment>
<comment xml:lang="de">Word-Dokument</comment>
<comment xml:lang="el">Έγγραφο Word</comment>
- <comment xml:lang="en_GB">Word document</comment>
+ <comment xml:lang="en-GB">Word document</comment>
<comment xml:lang="eo">Word-dokumento</comment>
<comment xml:lang="es">documento de Word</comment>
<comment xml:lang="eu">Word dokumentua</comment>
<comment xml:lang="fi">Word-asiakirja</comment>
<comment xml:lang="fo">Word skjal</comment>
<comment xml:lang="fr">document Word</comment>
+ <comment xml:lang="fur">document Word</comment>
<comment xml:lang="ga">cáipéis Word</comment>
<comment xml:lang="gl">documento de Word</comment>
<comment xml:lang="he">מסמך Word</comment>
@@ -4054,7 +4149,7 @@
<comment xml:lang="oc">document Word</comment>
<comment xml:lang="pl">Dokument Word</comment>
<comment xml:lang="pt">documento Word</comment>
- <comment xml:lang="pt_BR">Documento do Word</comment>
+ <comment xml:lang="pt-BR">Documento do Word</comment>
<comment xml:lang="ro">Document Word</comment>
<comment xml:lang="ru">Документ Word</comment>
<comment xml:lang="sk">Dokument Word</comment>
@@ -4065,20 +4160,20 @@
<comment xml:lang="tr">Word belgesi</comment>
<comment xml:lang="uk">документ Word</comment>
<comment xml:lang="vi">Tài liệu Word</comment>
- <comment xml:lang="zh_CN">Word 文档</comment>
- <comment xml:lang="zh_TW">Word 文件</comment>
+ <comment xml:lang="zh-CN">Word 文档</comment>
+ <comment xml:lang="zh-TW">Word 文件</comment>
<sub-class-of type="application/x-ole-storage"/>
<generic-icon name="x-office-document"/>
<magic priority="60">
- <match value="\x31\xbe\x00\x00" type="string" offset="0"/>
- <match value="PO^Q`" type="string" offset="0"/>
- <match value="\376\067\0\043" type="string" offset="0"/>
- <match value="\333\245-\0\0\0" type="string" offset="0"/>
- <match value="MSWordDoc" type="string" offset="2112"/>
- <match value="MSWordDoc" type="string" offset="2108"/>
- <match value="Microsoft Word document data" type="string" offset="2112"/>
- <match value="bjbj" type="string" offset="546"/>
- <match value="jbjb" type="string" offset="546"/>
+ <match type="string" value="\x31\xbe\x00\x00" offset="0"/>
+ <match type="string" value="PO^Q`" offset="0"/>
+ <match type="string" value="\376\067\0\043" offset="0"/>
+ <match type="string" value="\333\245-\0\0\0" offset="0"/>
+ <match type="string" value="MSWordDoc" offset="2112"/>
+ <match type="string" value="MSWordDoc" offset="2108"/>
+ <match type="string" value="Microsoft Word document data" offset="2112"/>
+ <match type="string" value="bjbj" offset="546"/>
+ <match type="string" value="jbjb" offset="546"/>
</magic>
<glob pattern="*.doc"/>
<alias type="application/vnd.ms-word"/>
@@ -4087,22 +4182,24 @@
</mime-type>
<mime-type type="application/msword-template">
<comment>Word template</comment>
+ <comment xml:lang="af">Word-sjabloon</comment>
<comment xml:lang="ar">قالب Word</comment>
<comment xml:lang="ast">Plantía de Word</comment>
- <comment xml:lang="be@latin">Šablon Word</comment>
+ <comment xml:lang="be-Latn">Šablon Word</comment>
<comment xml:lang="bg">Шаблон за документи — Word</comment>
<comment xml:lang="ca">plantilla de Word</comment>
<comment xml:lang="cs">šablona Word</comment>
<comment xml:lang="da">Wordskabelon</comment>
<comment xml:lang="de">Word-Vorlage</comment>
<comment xml:lang="el">Πρότυπο έγγραφο Word</comment>
- <comment xml:lang="en_GB">Word template</comment>
+ <comment xml:lang="en-GB">Word template</comment>
<comment xml:lang="eo">Word-ŝablono</comment>
<comment xml:lang="es">plantilla de Word</comment>
<comment xml:lang="eu">Word txantiloia</comment>
<comment xml:lang="fi">Word-malli</comment>
<comment xml:lang="fo">Word formur</comment>
<comment xml:lang="fr">modèle Word</comment>
+ <comment xml:lang="fur">model Word</comment>
<comment xml:lang="ga">teimpléad Word</comment>
<comment xml:lang="gl">Plantilla de Word</comment>
<comment xml:lang="he">תבנית Word</comment>
@@ -4122,7 +4219,7 @@
<comment xml:lang="oc">modèl Word</comment>
<comment xml:lang="pl">Szablon Word</comment>
<comment xml:lang="pt">modelo Word</comment>
- <comment xml:lang="pt_BR">Modelo do Word</comment>
+ <comment xml:lang="pt-BR">Modelo do Word</comment>
<comment xml:lang="ro">Șablon Word</comment>
<comment xml:lang="ru">Шаблон Word</comment>
<comment xml:lang="sk">Šablóna Word</comment>
@@ -4133,25 +4230,28 @@
<comment xml:lang="tr">Word şablonu</comment>
<comment xml:lang="uk">шаблон Word</comment>
<comment xml:lang="vi">Mẫu Word</comment>
- <comment xml:lang="zh_CN">Word 模板</comment>
- <comment xml:lang="zh_TW">Word 範本</comment>
+ <comment xml:lang="zh-CN">Word 模板</comment>
+ <comment xml:lang="zh-TW">Word 範本</comment>
<sub-class-of type="application/msword"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.dot"/>
</mime-type>
<mime-type type="application/gml+xml">
<comment>GML document</comment>
+ <comment xml:lang="af">GML-dokument</comment>
<comment xml:lang="ast">Documentu GML</comment>
+ <comment xml:lang="bg">Документ — GML</comment>
<comment xml:lang="ca">document GML</comment>
<comment xml:lang="cs">dokument GML</comment>
<comment xml:lang="da">GML-dokument</comment>
<comment xml:lang="de">GML-Dokument</comment>
<comment xml:lang="el">Έγγραφο GML</comment>
- <comment xml:lang="en_GB">GML document</comment>
+ <comment xml:lang="en-GB">GML document</comment>
<comment xml:lang="es">documento GML</comment>
<comment xml:lang="eu">GML dokumentua</comment>
<comment xml:lang="fi">GML-asiakirja</comment>
<comment xml:lang="fr">document GML</comment>
+ <comment xml:lang="fur">document GML</comment>
<comment xml:lang="ga">cáipéis GML</comment>
<comment xml:lang="gl">Documento GML</comment>
<comment xml:lang="he">מסמך GML</comment>
@@ -4163,11 +4263,12 @@
<comment xml:lang="ja">GML ドキュメント</comment>
<comment xml:lang="kk">GML құжаты</comment>
<comment xml:lang="ko">GML 문서</comment>
+ <comment xml:lang="lt">GML dokumentas</comment>
<comment xml:lang="lv">GML dokuments</comment>
<comment xml:lang="oc">document GML</comment>
<comment xml:lang="pl">Dokument GML</comment>
<comment xml:lang="pt">documento GML</comment>
- <comment xml:lang="pt_BR">Documento GML</comment>
+ <comment xml:lang="pt-BR">Documento GML</comment>
<comment xml:lang="ru">Документ GML</comment>
<comment xml:lang="sk">Dokument GML</comment>
<comment xml:lang="sl">Dokument GML</comment>
@@ -4175,8 +4276,8 @@
<comment xml:lang="sv">GML-dokument</comment>
<comment xml:lang="tr">GML belgesi</comment>
<comment xml:lang="uk">документ GML</comment>
- <comment xml:lang="zh_CN">GML 文档</comment>
- <comment xml:lang="zh_TW">GML 文件</comment>
+ <comment xml:lang="zh-CN">GML 文档</comment>
+ <comment xml:lang="zh-TW">GML 文件</comment>
<acronym>GML</acronym>
<expanded-acronym>Geography Markup Language</expanded-acronym>
<glob pattern="*.gml"/>
@@ -4185,20 +4286,22 @@
</mime-type>
<mime-type type="application/gnunet-directory">
<comment>GNUnet search file</comment>
+ <comment xml:lang="af">GNUnet-soeklêer</comment>
<comment xml:lang="ar">ملف بحث GNUnet</comment>
- <comment xml:lang="be@latin">fajł pošuku GNUnet</comment>
+ <comment xml:lang="be-Latn">fajł pošuku GNUnet</comment>
<comment xml:lang="bg">Указател за търсене — GNUnet</comment>
<comment xml:lang="ca">fitxer de cerca GNUnet</comment>
<comment xml:lang="cs">vyhledávací soubor GNUnet</comment>
<comment xml:lang="da">GNunet-søgefil</comment>
<comment xml:lang="de">GNUnet-Suchdatei</comment>
<comment xml:lang="el">Αρχείο αναζήτησης GNUnet</comment>
- <comment xml:lang="en_GB">GNUnet search file</comment>
+ <comment xml:lang="en-GB">GNUnet search file</comment>
<comment xml:lang="es">archivo de búsqueda GNUnet</comment>
<comment xml:lang="eu">GNUnet bilaketako fitxategia</comment>
<comment xml:lang="fi">GNUnet-hakutiedosto</comment>
<comment xml:lang="fo">GNUnet leitifíla</comment>
<comment xml:lang="fr">fichier de recherche GNUnet</comment>
+ <comment xml:lang="fur">file di ricercje GNUnet</comment>
<comment xml:lang="ga">comhad cuardaigh GNUnet</comment>
<comment xml:lang="gl">ficheiro de busca de GNUnet</comment>
<comment xml:lang="he">קובץ חיפוש של GNUnet</comment>
@@ -4219,7 +4322,7 @@
<comment xml:lang="oc">fichièr de recèrca GNUnet</comment>
<comment xml:lang="pl">Plik wyszukiwania GNUnet</comment>
<comment xml:lang="pt">ficheiro de procura GNUnet</comment>
- <comment xml:lang="pt_BR">Arquivo de pesquisa do GNUnet</comment>
+ <comment xml:lang="pt-BR">Arquivo de pesquisa do GNUnet</comment>
<comment xml:lang="ro">Fișier căutare GNUnet</comment>
<comment xml:lang="ru">Файл поиска GNUnet</comment>
<comment xml:lang="sk">Vyhľadávací súbor GNUnet</comment>
@@ -4230,30 +4333,32 @@
<comment xml:lang="tr">GNUnet arama dosyası</comment>
<comment xml:lang="uk">файл пошуку GNUnet</comment>
<comment xml:lang="vi">Tập tin tìm kiếm GNUnet</comment>
- <comment xml:lang="zh_CN">GNUnet 搜索文件</comment>
- <comment xml:lang="zh_TW">GNUnet 搜尋檔案</comment>
+ <comment xml:lang="zh-CN">GNUnet 搜索文件</comment>
+ <comment xml:lang="zh-TW">GNUnet 搜尋檔案</comment>
<magic priority="50">
- <match value="\211GND\r\n\032\n" type="string" offset="0"/>
+ <match type="string" value="\211GND\r\n\032\n" offset="0"/>
</magic>
<glob pattern="*.gnd"/>
</mime-type>
<mime-type type="application/vnd.ms-tnef">
<comment>TNEF message</comment>
+ <comment xml:lang="af">TNEF-boodskap</comment>
<comment xml:lang="ar">رسالة TNEF</comment>
<comment xml:lang="ast">Mensaxe TNEF</comment>
- <comment xml:lang="be@latin">List TNEF</comment>
+ <comment xml:lang="be-Latn">List TNEF</comment>
<comment xml:lang="bg">Съобщение — TNEF</comment>
<comment xml:lang="ca">missatge TNEF</comment>
<comment xml:lang="cs">zpráva TNEF</comment>
<comment xml:lang="da">TNEF-meddelelse</comment>
<comment xml:lang="de">TNEF-Nachricht</comment>
<comment xml:lang="el">Μήνυμα TNEF</comment>
- <comment xml:lang="en_GB">TNEF message</comment>
+ <comment xml:lang="en-GB">TNEF message</comment>
<comment xml:lang="es">mensaje TNEF</comment>
<comment xml:lang="eu">TNEF mezua</comment>
<comment xml:lang="fi">TNEF-viesti</comment>
<comment xml:lang="fo">TNEF boð</comment>
<comment xml:lang="fr">message TNEF</comment>
+ <comment xml:lang="fur">messaç TNEF</comment>
<comment xml:lang="ga">teachtaireacht TNEF</comment>
<comment xml:lang="gl">mensaxe TNEF</comment>
<comment xml:lang="he">הודעת TNEF</comment>
@@ -4273,7 +4378,7 @@
<comment xml:lang="oc">messatge TNEF</comment>
<comment xml:lang="pl">Wiadomość TNEF</comment>
<comment xml:lang="pt">mensagem TNEF</comment>
- <comment xml:lang="pt_BR">Mensagem TNEF</comment>
+ <comment xml:lang="pt-BR">Mensagem TNEF</comment>
<comment xml:lang="ro">Mesaj TNEF</comment>
<comment xml:lang="ru">Сообщение TNEF</comment>
<comment xml:lang="sk">Správa TNEF</comment>
@@ -4284,12 +4389,12 @@
<comment xml:lang="tr">TNEF iletisi</comment>
<comment xml:lang="uk">повідомлення TNEF</comment>
<comment xml:lang="vi">Thông điệp TNEF</comment>
- <comment xml:lang="zh_CN">TNEF 信件</comment>
- <comment xml:lang="zh_TW">TNEF 訊息</comment>
+ <comment xml:lang="zh-CN">TNEF 信件</comment>
+ <comment xml:lang="zh-TW">TNEF 訊息</comment>
<acronym>TNEF</acronym>
<expanded-acronym>Transport Neutral Encapsulation Format</expanded-acronym>
<magic priority="50">
- <match value="0x223e9f78" type="little32" offset="0"/>
+ <match type="little32" value="0x223e9f78" offset="0"/>
</magic>
<glob pattern="*.tnef"/>
<glob pattern="*.tnf"/>
@@ -4298,9 +4403,10 @@
</mime-type>
<mime-type type="application/vnd.stardivision.calc">
<comment>StarCalc spreadsheet</comment>
+ <comment xml:lang="af">StarCalc-sigblad</comment>
<comment xml:lang="ar">جدول StarCalc</comment>
<comment xml:lang="az">StarCalc hesab cədvəli</comment>
- <comment xml:lang="be@latin">Raźlikovy arkuš StarCalc</comment>
+ <comment xml:lang="be-Latn">Raźlikovy arkuš StarCalc</comment>
<comment xml:lang="bg">Таблица — StarCalc</comment>
<comment xml:lang="ca">full de càlcul de StarCalc</comment>
<comment xml:lang="cs">sešit StarCalc</comment>
@@ -4308,13 +4414,14 @@
<comment xml:lang="da">StarCalc-regneark</comment>
<comment xml:lang="de">StarCalc-Tabelle</comment>
<comment xml:lang="el">Λογιστικό φύλλο StarCalc</comment>
- <comment xml:lang="en_GB">StarCalc spreadsheet</comment>
+ <comment xml:lang="en-GB">StarCalc spreadsheet</comment>
<comment xml:lang="eo">StarCalc-kalkultabelo</comment>
<comment xml:lang="es">hoja de cálculo de StarCalc</comment>
<comment xml:lang="eu">StarCalc kalkulu-orria</comment>
<comment xml:lang="fi">StarCalc-taulukko</comment>
<comment xml:lang="fo">StarCalc rokniark</comment>
<comment xml:lang="fr">feuille de calcul StarCalc</comment>
+ <comment xml:lang="fur">sfuei di calcul StarCalc</comment>
<comment xml:lang="ga">scarbhileog StarCalc</comment>
<comment xml:lang="gl">folla de cálculo de StarCalc</comment>
<comment xml:lang="he">גליון נתונים של StarCalc</comment>
@@ -4335,7 +4442,7 @@
<comment xml:lang="oc">fuèlh de calcul StarCalc</comment>
<comment xml:lang="pl">Arkusz StarCalc</comment>
<comment xml:lang="pt">folha de cálculo do StarCalc</comment>
- <comment xml:lang="pt_BR">Planilha do StarCalc</comment>
+ <comment xml:lang="pt-BR">Planilha do StarCalc</comment>
<comment xml:lang="ro">Foaie de calcul StarCalc</comment>
<comment xml:lang="ru">Электронная таблица StarCalc</comment>
<comment xml:lang="sk">Zošit StarCalc</comment>
@@ -4343,19 +4450,20 @@
<comment xml:lang="sq">Fletë llogaritjesh StarCalc</comment>
<comment xml:lang="sr">Стар калк табела</comment>
<comment xml:lang="sv">StarCalc-kalkylblad</comment>
- <comment xml:lang="tr">StarCalc çalışma sayfası</comment>
+ <comment xml:lang="tr">StarCalc hesap çizelgesi</comment>
<comment xml:lang="uk">ел. таблиця StarCalc</comment>
<comment xml:lang="vi">Bảng tính StarCalc</comment>
- <comment xml:lang="zh_CN">StarCalc 电子表格</comment>
- <comment xml:lang="zh_TW">StarCalc 試算表</comment>
+ <comment xml:lang="zh-CN">StarCalc 电子表格</comment>
+ <comment xml:lang="zh-TW">StarCalc 試算表</comment>
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.sdc"/>
</mime-type>
<mime-type type="application/vnd.stardivision.chart">
<comment>StarChart chart</comment>
+ <comment xml:lang="af">StarChart-grafiek</comment>
<comment xml:lang="ar">مخطط StarChart</comment>
<comment xml:lang="az">StarChart cədvəli</comment>
- <comment xml:lang="be@latin">Dyjahrama StarChart</comment>
+ <comment xml:lang="be-Latn">Dyjahrama StarChart</comment>
<comment xml:lang="bg">Диаграма — StarChart</comment>
<comment xml:lang="ca">diagrama de StarChart</comment>
<comment xml:lang="cs">graf StarChart</comment>
@@ -4363,13 +4471,14 @@
<comment xml:lang="da">StarChart-diagram</comment>
<comment xml:lang="de">StarChart-Diagramm</comment>
<comment xml:lang="el">Γράφημα StarChart</comment>
- <comment xml:lang="en_GB">StarChart chart</comment>
+ <comment xml:lang="en-GB">StarChart chart</comment>
<comment xml:lang="eo">StarChart-diagramo</comment>
<comment xml:lang="es">gráfico de StarChart</comment>
<comment xml:lang="eu">StarChart diagrama</comment>
<comment xml:lang="fi">StarChart-kaavio</comment>
<comment xml:lang="fo">StarChart strikumynd</comment>
<comment xml:lang="fr">graphique StarChart</comment>
+ <comment xml:lang="fur">grafic StarChart</comment>
<comment xml:lang="ga">cairt StarChart</comment>
<comment xml:lang="gl">gráfica de StarChart</comment>
<comment xml:lang="he">טבלה של StarChart</comment>
@@ -4390,7 +4499,7 @@
<comment xml:lang="oc">grafic StarChart</comment>
<comment xml:lang="pl">Wykres StarChart</comment>
<comment xml:lang="pt">gráfico do StarChart</comment>
- <comment xml:lang="pt_BR">Gráfico do StarChart</comment>
+ <comment xml:lang="pt-BR">Gráfico do StarChart</comment>
<comment xml:lang="ro">Diagramă StarChart</comment>
<comment xml:lang="ru">Диаграмма StarChart</comment>
<comment xml:lang="sk">Graf StarChart</comment>
@@ -4398,19 +4507,20 @@
<comment xml:lang="sq">Grafik StarChart</comment>
<comment xml:lang="sr">График Стар Графика</comment>
<comment xml:lang="sv">StarChart-diagram</comment>
- <comment xml:lang="tr">StarChart çizgelgesi</comment>
+ <comment xml:lang="tr">StarChart çizgesi</comment>
<comment xml:lang="uk">діаграма StarChart</comment>
<comment xml:lang="vi">Đồ thị StarChart</comment>
- <comment xml:lang="zh_CN">StarCalc 图表</comment>
- <comment xml:lang="zh_TW">StarChart 圖表</comment>
+ <comment xml:lang="zh-CN">StarCalc 图表</comment>
+ <comment xml:lang="zh-TW">StarChart 圖表</comment>
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.sds"/>
</mime-type>
<mime-type type="application/vnd.stardivision.draw">
<comment>StarDraw drawing</comment>
+ <comment xml:lang="af">StarDraw-tekening</comment>
<comment xml:lang="ar">تصميم StarDraw</comment>
<comment xml:lang="az">StarDraw çəkimi</comment>
- <comment xml:lang="be@latin">Rysunak StarDraw</comment>
+ <comment xml:lang="be-Latn">Rysunak StarDraw</comment>
<comment xml:lang="bg">Чертеж — StarDraw</comment>
<comment xml:lang="ca">dibuix de StarDraw</comment>
<comment xml:lang="cs">kresba StarDraw</comment>
@@ -4418,13 +4528,14 @@
<comment xml:lang="da">StarDraw-tegning</comment>
<comment xml:lang="de">StarDraw-Zeichnung</comment>
<comment xml:lang="el">Σχέδιο StarDraw</comment>
- <comment xml:lang="en_GB">StarDraw drawing</comment>
+ <comment xml:lang="en-GB">StarDraw drawing</comment>
<comment xml:lang="eo">StarDraw-grafikaĵo</comment>
<comment xml:lang="es">dibujo de StarDraw</comment>
<comment xml:lang="eu">StarDraw marrazkia</comment>
<comment xml:lang="fi">StarDraw-piirros</comment>
<comment xml:lang="fo">StarDraw tekning</comment>
<comment xml:lang="fr">dessin StarDraw</comment>
+ <comment xml:lang="fur">dissen StarDraw</comment>
<comment xml:lang="ga">líníocht StarDraw</comment>
<comment xml:lang="gl">debuxo de StarDraw</comment>
<comment xml:lang="he">ציור של StarDrawing</comment>
@@ -4445,7 +4556,7 @@
<comment xml:lang="oc">dessenh StarDraw</comment>
<comment xml:lang="pl">Rysunek StarDraw</comment>
<comment xml:lang="pt">desenho do StarDraw</comment>
- <comment xml:lang="pt_BR">Desenho do StarDraw</comment>
+ <comment xml:lang="pt-BR">Desenho do StarDraw</comment>
<comment xml:lang="ro">Desen StarDraw</comment>
<comment xml:lang="ru">Рисунок StarDraw</comment>
<comment xml:lang="sk">Kresba StarDraw</comment>
@@ -4456,16 +4567,17 @@
<comment xml:lang="tr">StarDraw çizimi</comment>
<comment xml:lang="uk">малюнок StarDraw</comment>
<comment xml:lang="vi">Bản vẽ StarDraw</comment>
- <comment xml:lang="zh_CN">StarDraw 绘图</comment>
- <comment xml:lang="zh_TW">StarDraw 繪圖</comment>
+ <comment xml:lang="zh-CN">StarDraw 绘图</comment>
+ <comment xml:lang="zh-TW">StarDraw 繪圖</comment>
<generic-icon name="image-x-generic"/>
<glob pattern="*.sda"/>
</mime-type>
<mime-type type="application/vnd.stardivision.impress">
<comment>StarImpress presentation</comment>
+ <comment xml:lang="af">StarImpress-voorlegging</comment>
<comment xml:lang="ar">عرض تقديمي StarImpress</comment>
<comment xml:lang="az">StarImpress təqdimatı</comment>
- <comment xml:lang="be@latin">Prezentacyja StarImpress</comment>
+ <comment xml:lang="be-Latn">Prezentacyja StarImpress</comment>
<comment xml:lang="bg">Презентация — StarImpress</comment>
<comment xml:lang="ca">presentació de StarImpress</comment>
<comment xml:lang="cs">prezentace StarImpress</comment>
@@ -4473,13 +4585,14 @@
<comment xml:lang="da">StarImpress-præsentation</comment>
<comment xml:lang="de">StarImpress-Präsentation</comment>
<comment xml:lang="el">Παρουσίαση StarImpress</comment>
- <comment xml:lang="en_GB">StarImpress presentation</comment>
+ <comment xml:lang="en-GB">StarImpress presentation</comment>
<comment xml:lang="eo">StarImpress-prezentaĵo</comment>
<comment xml:lang="es">presentación de StarImpress</comment>
<comment xml:lang="eu">StarImpress aurkezpena</comment>
<comment xml:lang="fi">StarImpress-esitys</comment>
<comment xml:lang="fo">StarImpress framløga</comment>
<comment xml:lang="fr">présentation StarImpress</comment>
+ <comment xml:lang="fur">presentazion StarImpress</comment>
<comment xml:lang="ga">láithreoireacht StarImpress</comment>
<comment xml:lang="gl">presentación de StarImpress</comment>
<comment xml:lang="he">מצגת של StarImpress</comment>
@@ -4500,7 +4613,7 @@
<comment xml:lang="oc">presentacion StarImpress</comment>
<comment xml:lang="pl">Prezentacja StarImpress</comment>
<comment xml:lang="pt">apresentação do StarImpress</comment>
- <comment xml:lang="pt_BR">Apresentação do StarImpress</comment>
+ <comment xml:lang="pt-BR">Apresentação do StarImpress</comment>
<comment xml:lang="ro">Prezentare StarImpress</comment>
<comment xml:lang="ru">Презентация StarImpress</comment>
<comment xml:lang="sk">Prezentácia StarImpress</comment>
@@ -4511,29 +4624,31 @@
<comment xml:lang="tr">StarImpress sunumu</comment>
<comment xml:lang="uk">презентація StarImpress</comment>
<comment xml:lang="vi">Trình diễn StarImpress</comment>
- <comment xml:lang="zh_CN">StarImpress 演示文稿</comment>
- <comment xml:lang="zh_TW">StarImpress 簡報檔</comment>
+ <comment xml:lang="zh-CN">StarImpress 演示文稿</comment>
+ <comment xml:lang="zh-TW">StarImpress 簡報</comment>
<generic-icon name="x-office-presentation"/>
<glob pattern="*.sdd"/>
<glob pattern="*.sdp"/>
</mime-type>
<mime-type type="application/vnd.stardivision.mail">
<comment>StarMail email</comment>
+ <comment xml:lang="af">StarMail-e-pos</comment>
<comment xml:lang="ar">بريد StarMail الإلكتروني</comment>
- <comment xml:lang="be@latin">Email StarMail</comment>
+ <comment xml:lang="be-Latn">Email StarMail</comment>
<comment xml:lang="bg">Електронно писмо — StarMail</comment>
<comment xml:lang="ca">correu electrònic de StarMail</comment>
<comment xml:lang="cs">e-mail StarMail</comment>
<comment xml:lang="da">StarMail-e-brev</comment>
<comment xml:lang="de">StarMail-E-Mail</comment>
<comment xml:lang="el">Ηλ. μήνυμα StarMail</comment>
- <comment xml:lang="en_GB">StarMail email</comment>
+ <comment xml:lang="en-GB">StarMail email</comment>
<comment xml:lang="eo">StarMail-retpoŝto</comment>
<comment xml:lang="es">correo electrónico de StarMail</comment>
<comment xml:lang="eu">StarMail helb.el.</comment>
<comment xml:lang="fi">StarMail-sähköposti</comment>
<comment xml:lang="fo">StarMail t-postur</comment>
<comment xml:lang="fr">courriel StarMail</comment>
+ <comment xml:lang="fur">e-mail StarMail</comment>
<comment xml:lang="ga">ríomhphost StarMail</comment>
<comment xml:lang="gl">Correo electrónico de StarMail</comment>
<comment xml:lang="he">דוא״ל של StarMail</comment>
@@ -4554,7 +4669,7 @@
<comment xml:lang="oc">corrièr electronic StarMail</comment>
<comment xml:lang="pl">E-Mail StarMail</comment>
<comment xml:lang="pt">email do StarMail</comment>
- <comment xml:lang="pt_BR">E-mail do StarMail</comment>
+ <comment xml:lang="pt-BR">E-mail do StarMail</comment>
<comment xml:lang="ro">Email StarEmail</comment>
<comment xml:lang="ru">Электронное письмо StarMail</comment>
<comment xml:lang="sk">E-mail StarMail</comment>
@@ -4565,27 +4680,29 @@
<comment xml:lang="tr">StarMail epostası</comment>
<comment xml:lang="uk">поштове повідомлення StarMail</comment>
<comment xml:lang="vi">Thư điện tử StarMail</comment>
- <comment xml:lang="zh_CN">StarMail 电子邮件</comment>
- <comment xml:lang="zh_TW">StarMail 郵件</comment>
+ <comment xml:lang="zh-CN">StarMail 电子邮件</comment>
+ <comment xml:lang="zh-TW">StarMail 郵件</comment>
<glob pattern="*.smd"/>
</mime-type>
<mime-type type="application/vnd.stardivision.math">
<comment>StarMath formula</comment>
+ <comment xml:lang="af">StarMath-formule</comment>
<comment xml:lang="ar">صيغة StarMath</comment>
- <comment xml:lang="be@latin">Formuła StarMath</comment>
+ <comment xml:lang="be-Latn">Formuła StarMath</comment>
<comment xml:lang="bg">Формула — StarMath</comment>
<comment xml:lang="ca">fórmula de StarMath</comment>
<comment xml:lang="cs">vzorec StarMath</comment>
<comment xml:lang="da">StarMath-formel</comment>
<comment xml:lang="de">StarMath-Formel</comment>
<comment xml:lang="el">Μαθηματικός τύπος StarMath</comment>
- <comment xml:lang="en_GB">StarMath formula</comment>
+ <comment xml:lang="en-GB">StarMath formula</comment>
<comment xml:lang="eo">StarMath-formulo</comment>
<comment xml:lang="es">fórmula de StarMath</comment>
<comment xml:lang="eu">StarMath formula</comment>
<comment xml:lang="fi">StarMath-kaava</comment>
<comment xml:lang="fo">StarMath frymil</comment>
<comment xml:lang="fr">formule StarMath</comment>
+ <comment xml:lang="fur">formule StarMath</comment>
<comment xml:lang="ga">foirmle StarMath</comment>
<comment xml:lang="gl">fórmula de StarMath</comment>
<comment xml:lang="he">נוסחה של StarMath</comment>
@@ -4606,7 +4723,7 @@
<comment xml:lang="oc">formula StarMath</comment>
<comment xml:lang="pl">Formuła StarMath</comment>
<comment xml:lang="pt">fórmula do StarMath</comment>
- <comment xml:lang="pt_BR">Fórmula do StarMath</comment>
+ <comment xml:lang="pt-BR">Fórmula do StarMath</comment>
<comment xml:lang="ro">Formulă StarMath</comment>
<comment xml:lang="ru">Формула StarMath</comment>
<comment xml:lang="sk">Vzorec StarMath</comment>
@@ -4617,17 +4734,18 @@
<comment xml:lang="tr">StarMath formülü</comment>
<comment xml:lang="uk">формула StarMath</comment>
<comment xml:lang="vi">Công thức StarMath</comment>
- <comment xml:lang="zh_CN">StarMath 公式</comment>
- <comment xml:lang="zh_TW">StarMath 公式</comment>
+ <comment xml:lang="zh-CN">StarMath 公式</comment>
+ <comment xml:lang="zh-TW">StarMath 公式</comment>
<generic-icon name="x-office-document"/>
<glob pattern="*.smf"/>
</mime-type>
<mime-type type="application/vnd.stardivision.writer">
<comment>StarWriter document</comment>
+ <comment xml:lang="af">StarWriter-dokument</comment>
<comment xml:lang="ar">مستند StarWriter</comment>
<comment xml:lang="ast">Documentu de StarWriter</comment>
<comment xml:lang="az">StarWriter sənədi</comment>
- <comment xml:lang="be@latin">Dakument StarWriter</comment>
+ <comment xml:lang="be-Latn">Dakument StarWriter</comment>
<comment xml:lang="bg">Документ — StarWriter</comment>
<comment xml:lang="ca">document StarWriter</comment>
<comment xml:lang="cs">dokument StarWriter</comment>
@@ -4635,13 +4753,14 @@
<comment xml:lang="da">StarWriter-dokument</comment>
<comment xml:lang="de">StarWriter-Dokument</comment>
<comment xml:lang="el">Έγγραφο StarWriter</comment>
- <comment xml:lang="en_GB">StarWriter document</comment>
+ <comment xml:lang="en-GB">StarWriter document</comment>
<comment xml:lang="eo">StarWriter-dokumento</comment>
<comment xml:lang="es">documento de StarWriter</comment>
<comment xml:lang="eu">StarWriter dokumentua</comment>
<comment xml:lang="fi">StarWriter-asiakirja</comment>
<comment xml:lang="fo">StarWriter skjal</comment>
<comment xml:lang="fr">document StarWriter</comment>
+ <comment xml:lang="fur">document StarWriter</comment>
<comment xml:lang="ga">cáipéis StarWriter</comment>
<comment xml:lang="gl">documento de StarWriter</comment>
<comment xml:lang="he">מסמך של StarWriter</comment>
@@ -4662,7 +4781,7 @@
<comment xml:lang="oc">document StarWriter</comment>
<comment xml:lang="pl">Dokument StarWriter</comment>
<comment xml:lang="pt">documento do StarWriter</comment>
- <comment xml:lang="pt_BR">Documento do StarWriter</comment>
+ <comment xml:lang="pt-BR">Documento do StarWriter</comment>
<comment xml:lang="ro">Document StarWriter</comment>
<comment xml:lang="ru">Документ StarWriter</comment>
<comment xml:lang="sk">Dokument StarWriter</comment>
@@ -4673,33 +4792,35 @@
<comment xml:lang="tr">StarWriter belgesi</comment>
<comment xml:lang="uk">документ StarWriter</comment>
<comment xml:lang="vi">Tài liệu StarWriter</comment>
- <comment xml:lang="zh_CN">StarWriter 文档</comment>
- <comment xml:lang="zh_TW">StarWriter 文件</comment>
+ <comment xml:lang="zh-CN">StarWriter 文档</comment>
+ <comment xml:lang="zh-TW">StarWriter 文件</comment>
<generic-icon name="x-office-document"/>
<glob pattern="*.sdw"/>
<glob pattern="*.vor"/>
<glob pattern="*.sgl"/>
<magic priority="90">
- <match value="StarWriter" type="string" offset="2089"/>
+ <match type="string" value="StarWriter" offset="2089"/>
</magic>
<alias type="application/vnd.stardivision.writer-global"/>
</mime-type>
<mime-type type="application/vnd.sun.xml.calc">
<comment>OpenOffice Calc spreadsheet</comment>
+ <comment xml:lang="af">OpenOffice Calc-sigblad</comment>
<comment xml:lang="ar">جدول Calc المكتب المفتوح</comment>
- <comment xml:lang="be@latin">Raźlikovy arkuš OpenOffice Calc</comment>
+ <comment xml:lang="be-Latn">Raźlikovy arkuš OpenOffice Calc</comment>
<comment xml:lang="bg">Таблица — OpenOffice Calc</comment>
<comment xml:lang="ca">full de càlcul d'OpenOffice Calc</comment>
<comment xml:lang="cs">sešit OpenOffice Calc</comment>
<comment xml:lang="da">OpenOffice Calc-regneark</comment>
<comment xml:lang="de">OpenOffice-Calc-Tabelle</comment>
<comment xml:lang="el">Λογιστικό φύλλο OpenOffice Calc</comment>
- <comment xml:lang="en_GB">OpenOffice Calc spreadsheet</comment>
- <comment xml:lang="es">hoja de cálculo de OpenOffice Calc</comment>
+ <comment xml:lang="en-GB">OpenOffice Calc spreadsheet</comment>
+ <comment xml:lang="es">hoja de cálculo de LibreOffice Calc</comment>
<comment xml:lang="eu">OpenOffice.org Calc kalkulu-orria</comment>
<comment xml:lang="fi">OpenOffice Calc -taulukko</comment>
<comment xml:lang="fo">OpenOffice Calc rokniark</comment>
<comment xml:lang="fr">feuille de calcul OpenOffice Calc</comment>
+ <comment xml:lang="fur">sfuei di calcul OpenOffice Calc</comment>
<comment xml:lang="ga">scarbhileog OpenOffice Calc</comment>
<comment xml:lang="gl">folla de cálculo de OpenOffice Calc</comment>
<comment xml:lang="he">גליון נתונים של OpenOffice Calc</comment>
@@ -4718,9 +4839,9 @@
<comment xml:lang="nl">OpenOffice.org Calc-rekenblad</comment>
<comment xml:lang="nn">OpenOffice Calc-rekneark</comment>
<comment xml:lang="oc">fuèlh de calcul OpenOffice Calc</comment>
- <comment xml:lang="pl">Arkusz kalkulacyjny OpenOffice.org Calc</comment>
+ <comment xml:lang="pl">Arkusz OpenOffice.org Calc</comment>
<comment xml:lang="pt">folha de cálculo OpenOffice Calc</comment>
- <comment xml:lang="pt_BR">Planilha do OpenOffice Calc</comment>
+ <comment xml:lang="pt-BR">Planilha do OpenOffice Calc</comment>
<comment xml:lang="ro">Foaie de calcul OpenOffice Calc</comment>
<comment xml:lang="ru">Электронная таблица OpenOffice Calc</comment>
<comment xml:lang="sk">Zošit OpenOffice Calc</comment>
@@ -4728,17 +4849,17 @@
<comment xml:lang="sq">Fletë llogaritjesh OpenOffice Calc</comment>
<comment xml:lang="sr">Табела Опен Офис Рачуна</comment>
<comment xml:lang="sv">OpenOffice Calc-kalkylblad</comment>
- <comment xml:lang="tr">OpenOffice Calc çalışma sayfası</comment>
+ <comment xml:lang="tr">OpenOffice Calc hesap çizelgesi</comment>
<comment xml:lang="uk">ел. таблиця OpenOffice Calc</comment>
<comment xml:lang="vi">Bảng tính Calc của OpenOffice.org</comment>
- <comment xml:lang="zh_CN">OpenOffice Calc 电子表格</comment>
- <comment xml:lang="zh_TW">OpenOffice Calc 試算表</comment>
+ <comment xml:lang="zh-CN">OpenOffice Calc 电子表格</comment>
+ <comment xml:lang="zh-TW">OpenOffice Calc 試算表</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.sun.xml.calc" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" offset="38" value="application/vnd.sun.xml.calc"/>
</match>
</match>
</magic>
@@ -4746,20 +4867,22 @@
</mime-type>
<mime-type type="application/vnd.sun.xml.calc.template">
<comment>OpenOffice Calc template</comment>
+ <comment xml:lang="af">OpenOffice Calc-sjabloon</comment>
<comment xml:lang="ar">قالب Calc المكتب المفتوح</comment>
- <comment xml:lang="be@latin">Šablon OpenOffice Calc</comment>
+ <comment xml:lang="be-Latn">Šablon OpenOffice Calc</comment>
<comment xml:lang="bg">Шаблон за таблици — OpenOffice Calc</comment>
<comment xml:lang="ca">plantilla d'OpenOffice Calc</comment>
<comment xml:lang="cs">šablona OpenOffice Calc</comment>
<comment xml:lang="da">OpenOffice Calc-skabelon</comment>
<comment xml:lang="de">OpenOffice-Calc-Vorlage</comment>
<comment xml:lang="el">Πρότυπο OpenOffice Calc</comment>
- <comment xml:lang="en_GB">OpenOffice Calc template</comment>
- <comment xml:lang="es">plantilla de OpenOffice Calc</comment>
+ <comment xml:lang="en-GB">OpenOffice Calc template</comment>
+ <comment xml:lang="es">plantilla de LibreOffice Calc</comment>
<comment xml:lang="eu">OpenOffice Calc txantiloia</comment>
<comment xml:lang="fi">OpenOffice Calc -malli</comment>
<comment xml:lang="fo">OpenOffice Calc formur</comment>
<comment xml:lang="fr">modèle OpenOffice Calc</comment>
+ <comment xml:lang="fur">model OpenOffice Calc</comment>
<comment xml:lang="ga">teimpléad OpenOffice Calc</comment>
<comment xml:lang="gl">modelo de OpenOffice Calc</comment>
<comment xml:lang="he">תבנית של OpenOffice Calc</comment>
@@ -4780,7 +4903,7 @@
<comment xml:lang="oc">modèl OpenOffice Calc</comment>
<comment xml:lang="pl">Szablon arkusza OpenOffice.org Calc</comment>
<comment xml:lang="pt">modelo OpenOffice Calc</comment>
- <comment xml:lang="pt_BR">Modelo do OpenOffice Calc</comment>
+ <comment xml:lang="pt-BR">Modelo do OpenOffice Calc</comment>
<comment xml:lang="ro">Șablon OpenOffice Calc</comment>
<comment xml:lang="ru">Шаблон OpenOffice Calc</comment>
<comment xml:lang="sk">Šablóna OpenOffice Calc</comment>
@@ -4791,14 +4914,14 @@
<comment xml:lang="tr">OpenOffice Calc şablonu</comment>
<comment xml:lang="uk">шаблон ел.таблиці OpenOffice Calc</comment>
<comment xml:lang="vi">Mẫu bảng tính Calc của OpenOffice.org</comment>
- <comment xml:lang="zh_CN">OpenOffice Calc 模板</comment>
- <comment xml:lang="zh_TW">OpenOffice Calc 範本</comment>
+ <comment xml:lang="zh-CN">OpenOffice Calc 模板</comment>
+ <comment xml:lang="zh-TW">OpenOffice Calc 範本</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.sun.xml.calc" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" offset="38" value="application/vnd.sun.xml.calc"/>
</match>
</match>
</magic>
@@ -4806,20 +4929,22 @@
</mime-type>
<mime-type type="application/vnd.sun.xml.draw">
<comment>OpenOffice Draw drawing</comment>
+ <comment xml:lang="af">OpenOffice Draw-tekening</comment>
<comment xml:lang="ar">تصميم Draw المكتب المفتوح</comment>
- <comment xml:lang="be@latin">Rysunak OpenOffice Draw</comment>
+ <comment xml:lang="be-Latn">Rysunak OpenOffice Draw</comment>
<comment xml:lang="bg">Чертеж — OpenOffice Draw</comment>
<comment xml:lang="ca">dibuix d'OpenOffice Draw</comment>
<comment xml:lang="cs">kresba OpenOffice Draw</comment>
<comment xml:lang="da">OpenOffice Draw-tegning</comment>
<comment xml:lang="de">OpenOffice-Draw-Zeichnung</comment>
<comment xml:lang="el">Σχέδιο OpenOffice Draw</comment>
- <comment xml:lang="en_GB">OpenOffice Draw drawing</comment>
- <comment xml:lang="es">dibujo de OpenOffice Draw</comment>
+ <comment xml:lang="en-GB">OpenOffice Draw drawing</comment>
+ <comment xml:lang="es">dibujo de LibreOffice Draw</comment>
<comment xml:lang="eu">OpenOffice.org Draw marrazkia</comment>
<comment xml:lang="fi">OpenOffice Draw -piirros</comment>
<comment xml:lang="fo">OpenOffice Draw tekning</comment>
<comment xml:lang="fr">dessin OpenOffice Draw</comment>
+ <comment xml:lang="fur">dissen OpenOffice Draw</comment>
<comment xml:lang="ga">líníocht OpenOffice Draw</comment>
<comment xml:lang="gl">debuxo de OpenOffice Draw</comment>
<comment xml:lang="he">ציור של OpenOffice Draw</comment>
@@ -4840,7 +4965,7 @@
<comment xml:lang="oc">dessenh OpenOffice Draw</comment>
<comment xml:lang="pl">Rysunek OpenOffice.org Draw</comment>
<comment xml:lang="pt">desenho OpenOffice Draw</comment>
- <comment xml:lang="pt_BR">Desenho do OpenOffice Draw</comment>
+ <comment xml:lang="pt-BR">Desenho do OpenOffice Draw</comment>
<comment xml:lang="ro">Desen OpenOffice Draw</comment>
<comment xml:lang="ru">Рисунок OpenOffice Draw</comment>
<comment xml:lang="sk">Kresba OpenOffice Draw</comment>
@@ -4851,14 +4976,14 @@
<comment xml:lang="tr">OpenOffice Draw çizimi</comment>
<comment xml:lang="uk">малюнок OpenOffice Draw</comment>
<comment xml:lang="vi">Bản vẽ Draw của OpenOffice.org</comment>
- <comment xml:lang="zh_CN">OpenOffice Draw 绘图</comment>
- <comment xml:lang="zh_TW">OpenOffice Draw 繪圖</comment>
+ <comment xml:lang="zh-CN">OpenOffice Draw 绘图</comment>
+ <comment xml:lang="zh-TW">OpenOffice Draw 繪圖</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="image-x-generic"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.sun.xml.draw" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" offset="38" value="application/vnd.sun.xml.draw"/>
</match>
</match>
</magic>
@@ -4866,20 +4991,22 @@
</mime-type>
<mime-type type="application/vnd.sun.xml.draw.template">
<comment>OpenOffice Draw template</comment>
+ <comment xml:lang="af">OpenOffice Draw-sjabloon</comment>
<comment xml:lang="ar">قالب Draw المكتب المفتوح</comment>
- <comment xml:lang="be@latin">Šablon OpenOffice Draw</comment>
+ <comment xml:lang="be-Latn">Šablon OpenOffice Draw</comment>
<comment xml:lang="bg">Шаблон за чертежи — OpenOffice Draw</comment>
<comment xml:lang="ca">plantilla d'OpenOffice Draw</comment>
<comment xml:lang="cs">šablona OpenOffice Draw</comment>
<comment xml:lang="da">OpenOffice Draw-skabelon</comment>
<comment xml:lang="de">OpenOffice-Draw-Vorlage</comment>
<comment xml:lang="el">Πρότυπο OpenOffice Draw</comment>
- <comment xml:lang="en_GB">OpenOffice Draw template</comment>
- <comment xml:lang="es">plantilla de OpenOffice Draw</comment>
+ <comment xml:lang="en-GB">OpenOffice Draw template</comment>
+ <comment xml:lang="es">plantilla de LibreOffice Draw</comment>
<comment xml:lang="eu">OpenOffice Draw txantiloia</comment>
<comment xml:lang="fi">OpenOffice Draw -malli</comment>
<comment xml:lang="fo">OpenOffice Draw formur</comment>
<comment xml:lang="fr">modèle OpenOffice Draw</comment>
+ <comment xml:lang="fur">model OpenOffice Draw </comment>
<comment xml:lang="ga">teimpléad OpenOffice Draw</comment>
<comment xml:lang="gl">modelo de OpenOffice Draw</comment>
<comment xml:lang="he">תבנית של OpenOffice Draw</comment>
@@ -4900,7 +5027,7 @@
<comment xml:lang="oc">modèl OpenOffice Draw</comment>
<comment xml:lang="pl">Szablon rysunku OpenOffice.org Draw</comment>
<comment xml:lang="pt">modelo OpenOffice Draw</comment>
- <comment xml:lang="pt_BR">Modelo do OpenOffice Draw</comment>
+ <comment xml:lang="pt-BR">Modelo do OpenOffice Draw</comment>
<comment xml:lang="ro">Șablon OpenOffice Draw</comment>
<comment xml:lang="ru">Шаблон OpenOffice Draw</comment>
<comment xml:lang="sk">Šablóna OpenOffice Draw</comment>
@@ -4911,14 +5038,14 @@
<comment xml:lang="tr">OpenOffice Draw şablonu</comment>
<comment xml:lang="uk">шаблон малюнку OpenOffice Draw</comment>
<comment xml:lang="vi">Mẫu bản vẽ Draw của OpenOffice.org</comment>
- <comment xml:lang="zh_CN">OpenOffice Draw 模板</comment>
- <comment xml:lang="zh_TW">OpenOffice Draw 範本</comment>
+ <comment xml:lang="zh-CN">OpenOffice Draw 模板</comment>
+ <comment xml:lang="zh-TW">OpenOffice Draw 範本</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="image-x-generic"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.sun.xml.draw" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" offset="38" value="application/vnd.sun.xml.draw"/>
</match>
</match>
</magic>
@@ -4926,9 +5053,10 @@
</mime-type>
<mime-type type="application/vnd.sun.xml.impress">
<comment>OpenOffice Impress presentation</comment>
+ <comment xml:lang="af">OpenOffice Impress-voorlegging</comment>
<comment xml:lang="ar">عرض تقديمي Impress المكتب المفتوح</comment>
<comment xml:lang="az">OpenOffice Impress sənədi</comment>
- <comment xml:lang="be@latin">Prezentacyja OpenOffice Impress</comment>
+ <comment xml:lang="be-Latn">Prezentacyja OpenOffice Impress</comment>
<comment xml:lang="bg">Презентация — OpenOffice Impress</comment>
<comment xml:lang="ca">presentació d'OpenOffice Impress</comment>
<comment xml:lang="cs">prezentace OpenOffice Impress</comment>
@@ -4936,12 +5064,13 @@
<comment xml:lang="da">OpenOffice Impress-præsentation</comment>
<comment xml:lang="de">OpenOffice-Impress-Vorlage</comment>
<comment xml:lang="el">Παρουσίαση OpenOffice Impress</comment>
- <comment xml:lang="en_GB">OpenOffice Impress presentation</comment>
- <comment xml:lang="es">presentación de OpenOffice Impress</comment>
+ <comment xml:lang="en-GB">OpenOffice Impress presentation</comment>
+ <comment xml:lang="es">presentación de LibreOffice Impress</comment>
<comment xml:lang="eu">OpenOffice.org Impress aurkezpena</comment>
<comment xml:lang="fi">OpenOffice Impress -esitys</comment>
<comment xml:lang="fo">OpenOffice Impress framløga</comment>
<comment xml:lang="fr">présentation OpenOffice Impress</comment>
+ <comment xml:lang="fur">presentazion OpenOffice Impress</comment>
<comment xml:lang="ga">láithreoireacht OpenOffice Impress</comment>
<comment xml:lang="gl">presentación de de OpenOffice Impress</comment>
<comment xml:lang="he">מצגת של OpenOffice Impress</comment>
@@ -4962,7 +5091,7 @@
<comment xml:lang="oc">presentacion OpenOffice Impress</comment>
<comment xml:lang="pl">Prezentacja OpenOffice.org Impress</comment>
<comment xml:lang="pt">apresentação OpenOffice Impress</comment>
- <comment xml:lang="pt_BR">Apresentação do OpenOffice Impress</comment>
+ <comment xml:lang="pt-BR">Apresentação do OpenOffice Impress</comment>
<comment xml:lang="ro">Prezentare OpenOffice Impress</comment>
<comment xml:lang="ru">Презентация OpenOffice Impress</comment>
<comment xml:lang="sk">Prezentácia OpenOffice Impress</comment>
@@ -4973,14 +5102,14 @@
<comment xml:lang="tr">OpenOffice Impress sunumu</comment>
<comment xml:lang="uk">презентація OpenOffice Impress</comment>
<comment xml:lang="vi">Trình diễn Impress của OpenOffice.org</comment>
- <comment xml:lang="zh_CN">OpenOffice Impress 演示文稿</comment>
- <comment xml:lang="zh_TW">OpenOffice Impress 簡報</comment>
+ <comment xml:lang="zh-CN">OpenOffice Impress 演示文稿</comment>
+ <comment xml:lang="zh-TW">OpenOffice Impress 簡報</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-presentation"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.sun.xml.impress" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" offset="38" value="application/vnd.sun.xml.impress"/>
</match>
</match>
</magic>
@@ -4988,20 +5117,22 @@
</mime-type>
<mime-type type="application/vnd.sun.xml.impress.template">
<comment>OpenOffice Impress template</comment>
+ <comment xml:lang="af">OpenOffice Impress-sjabloon</comment>
<comment xml:lang="ar">قالب Impress المكتب المفتوح</comment>
- <comment xml:lang="be@latin">Šablon OpenOffice Impress</comment>
+ <comment xml:lang="be-Latn">Šablon OpenOffice Impress</comment>
<comment xml:lang="bg">Шаблон за презентации — OpenOffice Impress</comment>
<comment xml:lang="ca">plantilla d'OpenOffice Impress</comment>
<comment xml:lang="cs">šablona OpenOffice Impress</comment>
<comment xml:lang="da">OpenOffice Impress-skabelon</comment>
<comment xml:lang="de">OpenOffice-Impress-Vorlage</comment>
<comment xml:lang="el">Πρότυπο OpenOffice Impress</comment>
- <comment xml:lang="en_GB">OpenOffice Impress template</comment>
- <comment xml:lang="es">plantilla de OpenOffice Impress</comment>
+ <comment xml:lang="en-GB">OpenOffice Impress template</comment>
+ <comment xml:lang="es">plantilla de LibreOffice Impress</comment>
<comment xml:lang="eu">OpenOffice Impress txantiloia</comment>
<comment xml:lang="fi">OpenOffice Impress -malli</comment>
<comment xml:lang="fo">OpenOffice Impress formur</comment>
<comment xml:lang="fr">modèle OpenOffice Impress</comment>
+ <comment xml:lang="fur">model OpenOffice Impress</comment>
<comment xml:lang="ga">teimpléad OpenOffice Impress</comment>
<comment xml:lang="gl">modelo de OpenOffice Impress</comment>
<comment xml:lang="he">תבנית של OpenOffice Impress</comment>
@@ -5022,7 +5153,7 @@
<comment xml:lang="oc">modèl OpenOffice Impress</comment>
<comment xml:lang="pl">Szablon prezentacji OpenOffice.org Impress</comment>
<comment xml:lang="pt">modelo OpenOffice Impress</comment>
- <comment xml:lang="pt_BR">Modelo do OpenOffice Impress</comment>
+ <comment xml:lang="pt-BR">Modelo do OpenOffice Impress</comment>
<comment xml:lang="ro">Șablon OpenOffice Impress</comment>
<comment xml:lang="ru">Шаблон OpenOffice Impress</comment>
<comment xml:lang="sk">Šablóna OpenOffice Impress</comment>
@@ -5033,14 +5164,14 @@
<comment xml:lang="tr">OpenOffice Impress şablonu</comment>
<comment xml:lang="uk">шаблон презентації OpenOffice Impress</comment>
<comment xml:lang="vi">Mẫu trình diễn Impress của OpenOffice.org</comment>
- <comment xml:lang="zh_CN">OpenOffice Impress 模板</comment>
- <comment xml:lang="zh_TW">OpenOffice Impress 範本</comment>
+ <comment xml:lang="zh-CN">OpenOffice Impress 模板</comment>
+ <comment xml:lang="zh-TW">OpenOffice Impress 範本</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-presentation"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.sun.xml.impress" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" offset="38" value="application/vnd.sun.xml.impress"/>
</match>
</match>
</magic>
@@ -5048,20 +5179,22 @@
</mime-type>
<mime-type type="application/vnd.sun.xml.math">
<comment>OpenOffice Math formula</comment>
+ <comment xml:lang="af">OpenOffice Math-formule</comment>
<comment xml:lang="ar">صيغة Math المكتب المفتوح</comment>
- <comment xml:lang="be@latin">Formuła OpenOffice Math</comment>
+ <comment xml:lang="be-Latn">Formuła OpenOffice Math</comment>
<comment xml:lang="bg">Формула — OpenOffice Math</comment>
<comment xml:lang="ca">fórmula d'OpenOffice Math</comment>
<comment xml:lang="cs">vzorec OpenOffice Math</comment>
<comment xml:lang="da">OpenOffice Math-formel</comment>
<comment xml:lang="de">OpenOffice-Math-Formel</comment>
<comment xml:lang="el">Μαθηματικός τύπος OpenOffice Math</comment>
- <comment xml:lang="en_GB">OpenOffice Math formula</comment>
- <comment xml:lang="es">fórmula de OpenOffice Math</comment>
+ <comment xml:lang="en-GB">OpenOffice Math formula</comment>
+ <comment xml:lang="es">fórmula de LibreOffice Math</comment>
<comment xml:lang="eu">OpenOffice.org Math formula</comment>
<comment xml:lang="fi">OpenOffice Math -kaava</comment>
<comment xml:lang="fo">OpenOffice Math frymil</comment>
<comment xml:lang="fr">formule OpenOffice Math</comment>
+ <comment xml:lang="fur">formule OpenOffice Math</comment>
<comment xml:lang="ga">foirmle OpenOffice Math</comment>
<comment xml:lang="gl">fórmula de OpenOffice Math</comment>
<comment xml:lang="he">נוסחה של OpenOffice Math</comment>
@@ -5082,7 +5215,7 @@
<comment xml:lang="oc">formula OpenOffice Math</comment>
<comment xml:lang="pl">Formuła OpenOffice.org Math</comment>
<comment xml:lang="pt">fórmula OpenOffice Math</comment>
- <comment xml:lang="pt_BR">Fórmula do OpenOffice Math</comment>
+ <comment xml:lang="pt-BR">Fórmula do OpenOffice Math</comment>
<comment xml:lang="ro">Formulă OpenOffice Math</comment>
<comment xml:lang="ru">Формула OpenOffice Math</comment>
<comment xml:lang="sk">Vzorec OpenOffice Math</comment>
@@ -5093,14 +5226,14 @@
<comment xml:lang="tr">OpenOffice Math formülü</comment>
<comment xml:lang="uk">формула OpenOffice Math</comment>
<comment xml:lang="vi">Công thức Math của OpenOffice.org</comment>
- <comment xml:lang="zh_CN">OpenOffice Math 公式</comment>
- <comment xml:lang="zh_TW">OpenOffice Math 公式</comment>
+ <comment xml:lang="zh-CN">OpenOffice Math 公式</comment>
+ <comment xml:lang="zh-TW">OpenOffice Math 公式</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.sun.xml.math" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" offset="38" value="application/vnd.sun.xml.math"/>
</match>
</match>
</magic>
@@ -5108,10 +5241,11 @@
</mime-type>
<mime-type type="application/vnd.sun.xml.writer">
<comment>OpenOffice Writer document</comment>
+ <comment xml:lang="af">OpenOffice Writer-dokument</comment>
<comment xml:lang="ar">مستند Writer المكتب المفتوح</comment>
<comment xml:lang="ast">Documentu d'OpenOffice Writer</comment>
<comment xml:lang="az">OpenOffice Writer sənədi</comment>
- <comment xml:lang="be@latin">Dakument OpenOffice Writer</comment>
+ <comment xml:lang="be-Latn">Dakument OpenOffice Writer</comment>
<comment xml:lang="bg">Документ — OpenOffice Writer</comment>
<comment xml:lang="ca">document d'OpenOffice Writer</comment>
<comment xml:lang="cs">dokument OpenOffice Writer</comment>
@@ -5119,12 +5253,13 @@
<comment xml:lang="da">OpenOffice Writer-dokument</comment>
<comment xml:lang="de">OpenOffice-Writer-Dokument</comment>
<comment xml:lang="el">Έγγραφο OpenOffice Writer</comment>
- <comment xml:lang="en_GB">OpenOffice Writer document</comment>
- <comment xml:lang="es">documento de OpenOffice Writer</comment>
+ <comment xml:lang="en-GB">OpenOffice Writer document</comment>
+ <comment xml:lang="es">documento de LibreOffice Writer</comment>
<comment xml:lang="eu">OpenOffice.org Writer dokumentua</comment>
<comment xml:lang="fi">OpenOffice Writer -asiakirja</comment>
<comment xml:lang="fo">OpenOffice Writer skjal</comment>
<comment xml:lang="fr">document OpenOffice Writer</comment>
+ <comment xml:lang="fur">document OpenOffice Writer</comment>
<comment xml:lang="ga">cáipéis OpenOffice Writer</comment>
<comment xml:lang="gl">documento de OpenOffice Writer</comment>
<comment xml:lang="he">מסמך של OpenOffice Writer</comment>
@@ -5145,7 +5280,7 @@
<comment xml:lang="oc">document OpenOffice Writer</comment>
<comment xml:lang="pl">Dokument OpenOffice.org Writer</comment>
<comment xml:lang="pt">documento OpenOffice Writer</comment>
- <comment xml:lang="pt_BR">Documento do OpenOffice Writer</comment>
+ <comment xml:lang="pt-BR">Documento do OpenOffice Writer</comment>
<comment xml:lang="ro">Document OpenOffice Writer</comment>
<comment xml:lang="ru">Документ OpenOffice Writer</comment>
<comment xml:lang="sk">Dokument OpenOffice Writer</comment>
@@ -5156,14 +5291,14 @@
<comment xml:lang="tr">OpenOffice Writer belgesi</comment>
<comment xml:lang="uk">документ OpenOffice Writer</comment>
<comment xml:lang="vi">Tài liệu Writer của OpenOffice.org</comment>
- <comment xml:lang="zh_CN">OpenOffice Writer 文档</comment>
- <comment xml:lang="zh_TW">OpenOffice Writer 文件</comment>
+ <comment xml:lang="zh-CN">OpenOffice Writer 文档</comment>
+ <comment xml:lang="zh-TW">OpenOffice Writer 文件</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.sun.xml.writer" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" offset="38" value="application/vnd.sun.xml.writer"/>
</match>
</match>
</magic>
@@ -5171,23 +5306,25 @@
</mime-type>
<mime-type type="application/vnd.sun.xml.writer.global">
<comment>OpenOffice Writer global document</comment>
+ <comment xml:lang="af">OpenOffice Writer globale dokument</comment>
<comment xml:lang="ar">مستند المكتب المفتوح Writer العالمي</comment>
<comment xml:lang="ast">Documentu global d'OpenOffice Writer</comment>
<comment xml:lang="az">OpenOffice Writer qlobal sənədi</comment>
- <comment xml:lang="be@latin">Hlabalny dakument OpenOffice Writer</comment>
- <comment xml:lang="bg">Документ - глобален — OpenOffice Writer</comment>
+ <comment xml:lang="be-Latn">Hlabalny dakument OpenOffice Writer</comment>
+ <comment xml:lang="bg">Глобален документ — OpenOffice Writer</comment>
<comment xml:lang="ca">document global d'OpenOffice Writer</comment>
<comment xml:lang="cs">globální dokument OpenOffice Writer</comment>
<comment xml:lang="cy">Dogfen eang OpenOffice (Writer)</comment>
<comment xml:lang="da">OpenOffice Writer-globalt dokument</comment>
<comment xml:lang="de">OpenOffice-Writer-Globaldokument</comment>
<comment xml:lang="el">Καθολικό έγγραφο OpenOffice Writer</comment>
- <comment xml:lang="en_GB">OpenOffice Writer global document</comment>
- <comment xml:lang="es">documento global de OpenOffice Writer</comment>
+ <comment xml:lang="en-GB">OpenOffice Writer global document</comment>
+ <comment xml:lang="es">documento global de LibreOffice Writer</comment>
<comment xml:lang="eu">OpenOffice.org Writer dokumentu globala</comment>
<comment xml:lang="fi">OpenOffice Writer - yleinen asiakirja</comment>
<comment xml:lang="fo">OpenOffice Writer heiltøkt skjal</comment>
<comment xml:lang="fr">document global OpenOffice Writer</comment>
+ <comment xml:lang="fur">document globâl OpenOffice Writer</comment>
<comment xml:lang="ga">cáipéis chomhchoiteann OpenOffice Writer</comment>
<comment xml:lang="gl">documento global de OpenOffice Writer</comment>
<comment xml:lang="he">מסמך גלובלי של OpenOffice Writer</comment>
@@ -5208,7 +5345,7 @@
<comment xml:lang="oc">document global OpenOffice Writer</comment>
<comment xml:lang="pl">Globalny dokument OpenOffice.org Writer</comment>
<comment xml:lang="pt">documento global OpenOffice Writer</comment>
- <comment xml:lang="pt_BR">Documento global do OpenOffice Writer</comment>
+ <comment xml:lang="pt-BR">Documento global do OpenOffice Writer</comment>
<comment xml:lang="ro">Document global OpenOffice Writer</comment>
<comment xml:lang="ru">Основной документ OpenOffice Writer</comment>
<comment xml:lang="sk">Globálny dokument OpenOffice Writer</comment>
@@ -5219,14 +5356,14 @@
<comment xml:lang="tr">OpenOffice Writer global belgesi</comment>
<comment xml:lang="uk">загальний документ OpenOffice Writer</comment>
<comment xml:lang="vi">Tài liệu toàn cục Writer của OpenOffice.org</comment>
- <comment xml:lang="zh_CN">OpenOffice Writer 全局文档</comment>
- <comment xml:lang="zh_TW">OpenOffice Writer 主控文件</comment>
+ <comment xml:lang="zh-CN">OpenOffice Writer 全局文档</comment>
+ <comment xml:lang="zh-TW">OpenOffice Writer 主控文件</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.sun.xml.writer" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" offset="38" value="application/vnd.sun.xml.writer"/>
</match>
</match>
</magic>
@@ -5234,9 +5371,10 @@
</mime-type>
<mime-type type="application/vnd.sun.xml.writer.template">
<comment>OpenOffice Writer template</comment>
+ <comment xml:lang="af">OpenOffice Writer-sjabloon</comment>
<comment xml:lang="ar">قالب Writer المكتب المفتوح</comment>
<comment xml:lang="az">OpenOffice Writer şablonu</comment>
- <comment xml:lang="be@latin">Šablon OpenOffice Writer</comment>
+ <comment xml:lang="be-Latn">Šablon OpenOffice Writer</comment>
<comment xml:lang="bg">Шаблон за документи — OpenOffice Writer</comment>
<comment xml:lang="ca">plantilla d'OpenOffice Writer</comment>
<comment xml:lang="cs">šablona OpenOffice Writer</comment>
@@ -5244,12 +5382,13 @@
<comment xml:lang="da">OpenOffice Writer-skabelon</comment>
<comment xml:lang="de">OpenOffice-Writer-Vorlage</comment>
<comment xml:lang="el">Πρότυπο OpenOffice Writer</comment>
- <comment xml:lang="en_GB">OpenOffice Writer template</comment>
- <comment xml:lang="es">plantilla de OpenOffice Writer</comment>
+ <comment xml:lang="en-GB">OpenOffice Writer template</comment>
+ <comment xml:lang="es">plantilla de LibreOffice Writer</comment>
<comment xml:lang="eu">OpenOffice Writer txantiloia</comment>
<comment xml:lang="fi">OpenOffice Writer -malli</comment>
<comment xml:lang="fo">OpenOffice Writer formur</comment>
<comment xml:lang="fr">modèle OpenOffice Writer</comment>
+ <comment xml:lang="fur">model OpenOffice Writer</comment>
<comment xml:lang="ga">teimpléad OpenOffice Writer</comment>
<comment xml:lang="gl">modelo de OpenOffice Writer</comment>
<comment xml:lang="he">תסנית של OpenOffice Writer</comment>
@@ -5271,7 +5410,7 @@
<comment xml:lang="oc">modèl OpenOffice Writer</comment>
<comment xml:lang="pl">Szablon dokumentu OpenOffice.org Writer</comment>
<comment xml:lang="pt">modelo OpenOffice Writer</comment>
- <comment xml:lang="pt_BR">Modelo do OpenOffice Writer</comment>
+ <comment xml:lang="pt-BR">Modelo do OpenOffice Writer</comment>
<comment xml:lang="ro">Șablon OpenOffice Writer</comment>
<comment xml:lang="ru">Шаблон OpenOffice Writer</comment>
<comment xml:lang="sk">Šablóna OpenOffice Writer</comment>
@@ -5282,14 +5421,14 @@
<comment xml:lang="tr">OpenOffice Writer şablonu</comment>
<comment xml:lang="uk">шаблон документа OpenOffice Writer</comment>
<comment xml:lang="vi">Mẫu tài liệu Writer của OpenOffice.org</comment>
- <comment xml:lang="zh_CN">OpenOffice Writer 模板</comment>
- <comment xml:lang="zh_TW">OpenOffice Writer 範本</comment>
+ <comment xml:lang="zh-CN">OpenOffice Writer 模板</comment>
+ <comment xml:lang="zh-TW">OpenOffice Writer 範本</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.sun.xml.writer" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" offset="38" value="application/vnd.sun.xml.writer"/>
</match>
</match>
</magic>
@@ -5297,22 +5436,24 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.text">
<comment>ODT document</comment>
+ <comment xml:lang="af">ODT-dokument</comment>
<comment xml:lang="ar">مستند ODT</comment>
<comment xml:lang="ast">Documentu ODT</comment>
- <comment xml:lang="be@latin">Dakument ODT</comment>
+ <comment xml:lang="be-Latn">Dakument ODT</comment>
<comment xml:lang="bg">Документ — ODT</comment>
<comment xml:lang="ca">document ODT</comment>
<comment xml:lang="cs">dokument ODT</comment>
<comment xml:lang="da">ODT-dokument</comment>
<comment xml:lang="de">ODT-Dokument</comment>
<comment xml:lang="el">Έγγραφο ODT</comment>
- <comment xml:lang="en_GB">ODT document</comment>
+ <comment xml:lang="en-GB">ODT document</comment>
<comment xml:lang="eo">ODT-dokumento</comment>
<comment xml:lang="es">documento ODT</comment>
<comment xml:lang="eu">ODT dokumentua</comment>
<comment xml:lang="fi">ODT-asiakirja</comment>
<comment xml:lang="fo">ODT skjal</comment>
<comment xml:lang="fr">document ODT</comment>
+ <comment xml:lang="fur">document ODT</comment>
<comment xml:lang="ga">cáipéis ODT</comment>
<comment xml:lang="gl">documento ODT</comment>
<comment xml:lang="he">מסמך ODT</comment>
@@ -5333,7 +5474,7 @@
<comment xml:lang="oc">document ODT</comment>
<comment xml:lang="pl">Dokument ODT</comment>
<comment xml:lang="pt">documento ODT</comment>
- <comment xml:lang="pt_BR">Documento ODT</comment>
+ <comment xml:lang="pt-BR">Documento ODT</comment>
<comment xml:lang="ro">Document ODT</comment>
<comment xml:lang="ru">Документ ODT</comment>
<comment xml:lang="sk">Dokument ODT</comment>
@@ -5344,16 +5485,16 @@
<comment xml:lang="tr">ODT belgesi</comment>
<comment xml:lang="uk">документ ODT</comment>
<comment xml:lang="vi">Tài liệu ODT</comment>
- <comment xml:lang="zh_CN">ODT 文档</comment>
- <comment xml:lang="zh_TW">ODT 文件</comment>
+ <comment xml:lang="zh-CN">ODT 文档</comment>
+ <comment xml:lang="zh-TW">ODT 文件</comment>
<acronym>ODT</acronym>
<expanded-acronym>OpenDocument Text</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.text" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.text" offset="38"/>
</match>
</match>
</magic>
@@ -5361,6 +5502,7 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.text-flat-xml">
<comment>ODT document (Flat XML)</comment>
+ <comment xml:lang="af">ODT-dokument (plat XML)</comment>
<comment xml:lang="ar">مستند ODT (Flat XML)</comment>
<comment xml:lang="ast">Documentu ODT (XML planu)</comment>
<comment xml:lang="bg">Документ — ODT (само XML)</comment>
@@ -5369,12 +5511,13 @@
<comment xml:lang="da">ODT-dokument (flad XML)</comment>
<comment xml:lang="de">ODT-Dokument (Unkomprimiertes XML)</comment>
<comment xml:lang="el">Έγγραφο ODT (Flat XML)</comment>
- <comment xml:lang="en_GB">ODT document (Flat XML)</comment>
+ <comment xml:lang="en-GB">ODT document (Flat XML)</comment>
<comment xml:lang="es">documento ODT (XML plano)</comment>
<comment xml:lang="eu">ODT dokumentua (XML soila)</comment>
<comment xml:lang="fi">ODT-asiakirja (Flat XML)</comment>
<comment xml:lang="fo">ODT skjal (Flat XML)</comment>
<comment xml:lang="fr">document ODT (XML plat)</comment>
+ <comment xml:lang="fur">document ODT (XML sempliç)</comment>
<comment xml:lang="ga">cáipéis ODT (XML cothrom)</comment>
<comment xml:lang="gl">documento ODT (XML plano)</comment>
<comment xml:lang="he">מסמך ODT‏ (Flat XML)</comment>
@@ -5393,7 +5536,7 @@
<comment xml:lang="oc">document ODT (XML plat)</comment>
<comment xml:lang="pl">Dokument ODT (prosty XML)</comment>
<comment xml:lang="pt">documento ODT (XML plano)</comment>
- <comment xml:lang="pt_BR">Documento ODT (Flat XML)</comment>
+ <comment xml:lang="pt-BR">Documento ODT (Flat XML)</comment>
<comment xml:lang="ro">Document ODT (XML simplu)</comment>
<comment xml:lang="ru">Документ ODT (простой XML)</comment>
<comment xml:lang="sk">Dokument ODT (čisté XML)</comment>
@@ -5402,8 +5545,8 @@
<comment xml:lang="sv">ODT-dokument (platt XML)</comment>
<comment xml:lang="tr">ODT belgesi (Düz XML)</comment>
<comment xml:lang="uk">документ ODT (Flat XML)</comment>
- <comment xml:lang="zh_CN">ODT 文档（Flat XML）</comment>
- <comment xml:lang="zh_TW">ODT 文件 (Flat XML)</comment>
+ <comment xml:lang="zh-CN">ODT 文档（Flat XML）</comment>
+ <comment xml:lang="zh-TW">ODT 文件 (Flat XML)</comment>
<acronym>FODT</acronym>
<expanded-acronym>OpenDocument Text (Flat XML)</expanded-acronym>
<sub-class-of type="application/xml"/>
@@ -5412,21 +5555,23 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.text-template">
<comment>ODT template</comment>
+ <comment xml:lang="af">ODT-sjabloon</comment>
<comment xml:lang="ar">قالب ODT</comment>
- <comment xml:lang="be@latin">Šablon ODT</comment>
+ <comment xml:lang="be-Latn">Šablon ODT</comment>
<comment xml:lang="bg">Шаблон за документи — ODT</comment>
<comment xml:lang="ca">plantilla ODT</comment>
<comment xml:lang="cs">šablona ODT</comment>
<comment xml:lang="da">ODT-skabelon</comment>
<comment xml:lang="de">ODT-Vorlage</comment>
<comment xml:lang="el">Πρότυπο ODT</comment>
- <comment xml:lang="en_GB">ODT template</comment>
+ <comment xml:lang="en-GB">ODT template</comment>
<comment xml:lang="eo">ODT-ŝablono</comment>
<comment xml:lang="es">plantilla ODT</comment>
<comment xml:lang="eu">ODT txantiloia</comment>
<comment xml:lang="fi">ODT-malli</comment>
<comment xml:lang="fo">ODT formur</comment>
<comment xml:lang="fr">modèle ODT</comment>
+ <comment xml:lang="fur">model ODT</comment>
<comment xml:lang="ga">teimpléad ODT</comment>
<comment xml:lang="gl">modelo ODT</comment>
<comment xml:lang="he">תבנית ODT</comment>
@@ -5447,7 +5592,7 @@
<comment xml:lang="oc">modèl ODT</comment>
<comment xml:lang="pl">Szablon ODT</comment>
<comment xml:lang="pt">modelo ODT</comment>
- <comment xml:lang="pt_BR">Modelo ODT</comment>
+ <comment xml:lang="pt-BR">Modelo ODT</comment>
<comment xml:lang="ro">Șablon ODT</comment>
<comment xml:lang="ru">Шаблон ODT</comment>
<comment xml:lang="sk">Šablóna ODT</comment>
@@ -5458,16 +5603,16 @@
<comment xml:lang="tr">ODT şablonu</comment>
<comment xml:lang="uk">шаблон ODT</comment>
<comment xml:lang="vi">Mẫu ODT</comment>
- <comment xml:lang="zh_CN">ODT 模板</comment>
- <comment xml:lang="zh_TW">ODT 範本</comment>
+ <comment xml:lang="zh-CN">ODT 模板</comment>
+ <comment xml:lang="zh-TW">ODT 範本</comment>
<acronym>ODT</acronym>
<expanded-acronym>OpenDocument Text</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.text-template" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.text-template" offset="38"/>
</match>
</match>
</magic>
@@ -5475,21 +5620,23 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.text-web">
<comment>OTH template</comment>
+ <comment xml:lang="af">OTH-sjabloon</comment>
<comment xml:lang="ar">قالب OTH</comment>
- <comment xml:lang="be@latin">Šablon OTH</comment>
+ <comment xml:lang="be-Latn">Šablon OTH</comment>
<comment xml:lang="bg">Шаблон за страници — OTH</comment>
<comment xml:lang="ca">plantilla OTH</comment>
<comment xml:lang="cs">šablona OTH</comment>
<comment xml:lang="da">OTH-skabelon</comment>
<comment xml:lang="de">OTH-Vorlage</comment>
<comment xml:lang="el">Πρότυπο OTH</comment>
- <comment xml:lang="en_GB">OTH template</comment>
+ <comment xml:lang="en-GB">OTH template</comment>
<comment xml:lang="eo">OTH-ŝablono</comment>
<comment xml:lang="es">plantilla OTH</comment>
<comment xml:lang="eu">OTH txantiloia</comment>
<comment xml:lang="fi">OTH-malli</comment>
<comment xml:lang="fo">OTH formur</comment>
<comment xml:lang="fr">modèle OTH</comment>
+ <comment xml:lang="fur">model OTH</comment>
<comment xml:lang="ga">teimpléad OTH</comment>
<comment xml:lang="gl">modelo OTH</comment>
<comment xml:lang="he">תבנית OTH</comment>
@@ -5510,7 +5657,7 @@
<comment xml:lang="oc">modèl OTH</comment>
<comment xml:lang="pl">Szablon OTH</comment>
<comment xml:lang="pt">modelo OTH</comment>
- <comment xml:lang="pt_BR">Modelo OTH</comment>
+ <comment xml:lang="pt-BR">Modelo OTH</comment>
<comment xml:lang="ro">Șablon OTH</comment>
<comment xml:lang="ru">Шаблон OTH</comment>
<comment xml:lang="sk">Šablóna OTH</comment>
@@ -5521,16 +5668,16 @@
<comment xml:lang="tr">OTH şablonu</comment>
<comment xml:lang="uk">шаблон OTH</comment>
<comment xml:lang="vi">Mẫu ODH</comment>
- <comment xml:lang="zh_CN">OTH 模板</comment>
- <comment xml:lang="zh_TW">OTH 範本</comment>
+ <comment xml:lang="zh-CN">OTH 模板</comment>
+ <comment xml:lang="zh-TW">OTH 範本</comment>
<acronym>OTH</acronym>
<expanded-acronym>OpenDocument HTML</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="text-html"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.text-web" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.text-web" offset="38"/>
</match>
</match>
</magic>
@@ -5538,22 +5685,24 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.text-master">
<comment>ODM document</comment>
+ <comment xml:lang="af">ODM-dokument</comment>
<comment xml:lang="ar">مستند ODM</comment>
<comment xml:lang="ast">Documentu ODM</comment>
- <comment xml:lang="be@latin">Dakument ODM</comment>
+ <comment xml:lang="be-Latn">Dakument ODM</comment>
<comment xml:lang="bg">Документ — ODM</comment>
<comment xml:lang="ca">document ODM</comment>
<comment xml:lang="cs">dokument ODM</comment>
<comment xml:lang="da">ODM-dokument</comment>
<comment xml:lang="de">ODM-Dokument</comment>
<comment xml:lang="el">Έγγραφο ODM</comment>
- <comment xml:lang="en_GB">ODM document</comment>
+ <comment xml:lang="en-GB">ODM document</comment>
<comment xml:lang="eo">ODM-dokumento</comment>
<comment xml:lang="es">documento ODM</comment>
<comment xml:lang="eu">ODM dokumentua</comment>
<comment xml:lang="fi">ODM-asiakirja</comment>
<comment xml:lang="fo">ODM skjal</comment>
<comment xml:lang="fr">document ODM</comment>
+ <comment xml:lang="fur">document ODM</comment>
<comment xml:lang="ga">cáipéis ODM</comment>
<comment xml:lang="gl">documento ODM</comment>
<comment xml:lang="he">מסמך ODM</comment>
@@ -5574,7 +5723,7 @@
<comment xml:lang="oc">document ODM</comment>
<comment xml:lang="pl">Dokument ODM</comment>
<comment xml:lang="pt">documento ODM</comment>
- <comment xml:lang="pt_BR">Documento ODM</comment>
+ <comment xml:lang="pt-BR">Documento ODM</comment>
<comment xml:lang="ro">Document ODM</comment>
<comment xml:lang="ru">Документ ODM</comment>
<comment xml:lang="sk">Dokument ODM</comment>
@@ -5585,16 +5734,16 @@
<comment xml:lang="tr">ODM belgesi</comment>
<comment xml:lang="uk">документ ODM</comment>
<comment xml:lang="vi">Tài liệu ODM</comment>
- <comment xml:lang="zh_CN">ODM 文档</comment>
- <comment xml:lang="zh_TW">ODM 文件</comment>
+ <comment xml:lang="zh-CN">ODM 文档</comment>
+ <comment xml:lang="zh-TW">ODM 文件</comment>
<acronym>ODM</acronym>
<expanded-acronym>OpenDocument Master</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.text-master" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.text-master" offset="38"/>
</match>
</match>
</magic>
@@ -5602,21 +5751,23 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.graphics">
<comment>ODG drawing</comment>
+ <comment xml:lang="af">ODG-tekening</comment>
<comment xml:lang="ar">تصميم ODG</comment>
- <comment xml:lang="be@latin">Rysunak ODG</comment>
+ <comment xml:lang="be-Latn">Rysunak ODG</comment>
<comment xml:lang="bg">Чертеж — ODG</comment>
<comment xml:lang="ca">dibuix ODG</comment>
<comment xml:lang="cs">kresba ODG</comment>
<comment xml:lang="da">ODG-tegning</comment>
<comment xml:lang="de">ODG-Zeichnung</comment>
<comment xml:lang="el">Σχέδιο ODG</comment>
- <comment xml:lang="en_GB">ODG drawing</comment>
+ <comment xml:lang="en-GB">ODG drawing</comment>
<comment xml:lang="eo">ODG-desegnaĵo</comment>
<comment xml:lang="es">dibujo ODG</comment>
<comment xml:lang="eu">ODG marrazkia</comment>
<comment xml:lang="fi">ODG-piirros</comment>
<comment xml:lang="fo">ODG tekning</comment>
<comment xml:lang="fr">dessin ODG</comment>
+ <comment xml:lang="fur">dissen ODG</comment>
<comment xml:lang="ga">líníocht ODG</comment>
<comment xml:lang="gl">debuxo ODG</comment>
<comment xml:lang="he">ציור ODG</comment>
@@ -5637,7 +5788,7 @@
<comment xml:lang="oc">dessenh ODG</comment>
<comment xml:lang="pl">Rysunek ODG</comment>
<comment xml:lang="pt">desenho ODG</comment>
- <comment xml:lang="pt_BR">Desenho ODG</comment>
+ <comment xml:lang="pt-BR">Desenho ODG</comment>
<comment xml:lang="ro">Desen ODG</comment>
<comment xml:lang="ru">Рисунок ODG</comment>
<comment xml:lang="sk">Kresba ODG</comment>
@@ -5648,16 +5799,16 @@
<comment xml:lang="tr">ODG çizimi</comment>
<comment xml:lang="uk">малюнок ODG</comment>
<comment xml:lang="vi">Bản vẽ ODG</comment>
- <comment xml:lang="zh_CN">ODG 绘图</comment>
- <comment xml:lang="zh_TW">ODG 繪圖</comment>
+ <comment xml:lang="zh-CN">ODG 绘图</comment>
+ <comment xml:lang="zh-TW">ODG 繪圖</comment>
<acronym>ODG</acronym>
<expanded-acronym>OpenDocument Drawing</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="image-x-generic"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.graphics" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.graphics" offset="38"/>
</match>
</match>
</magic>
@@ -5665,6 +5816,7 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.graphics-flat-xml">
<comment>ODG drawing (Flat XML)</comment>
+ <comment xml:lang="af">ODG-tekening (plat XML)</comment>
<comment xml:lang="ar">رسمة ODG (Flat XML)</comment>
<comment xml:lang="bg">Чертеж — ODG (само XML)</comment>
<comment xml:lang="ca">dibuix ODG (XML pla) </comment>
@@ -5672,12 +5824,13 @@
<comment xml:lang="da">ODG-tegning (flad XML)</comment>
<comment xml:lang="de">ODG-Zeichnung (Unkomprimiertes XML)</comment>
<comment xml:lang="el">Σχέδιο ODG (Flat XML)</comment>
- <comment xml:lang="en_GB">ODG drawing (Flat XML)</comment>
+ <comment xml:lang="en-GB">ODG drawing (Flat XML)</comment>
<comment xml:lang="es">dibujo ODG (XML plano)</comment>
<comment xml:lang="eu">ODG marrazkia (XML soila)</comment>
<comment xml:lang="fi">ODG-piirros (Flat XML)</comment>
<comment xml:lang="fo">ODG tekning (Flat XML)</comment>
<comment xml:lang="fr">dessin ODG (XML plat)</comment>
+ <comment xml:lang="fur">dissen ODG (XML sempliç)</comment>
<comment xml:lang="ga">líníocht ODG (XML cothrom)</comment>
<comment xml:lang="gl">debuxo ODB (XML plano)</comment>
<comment xml:lang="he">ציור ODG (Flat XML(</comment>
@@ -5696,7 +5849,7 @@
<comment xml:lang="oc">dessenh ODG (XML plat)</comment>
<comment xml:lang="pl">Rysunek ODG (prosty XML)</comment>
<comment xml:lang="pt">desenho ODG (XML plano)</comment>
- <comment xml:lang="pt_BR">Desenho ODG (Flat XML)</comment>
+ <comment xml:lang="pt-BR">Desenho ODG (Flat XML)</comment>
<comment xml:lang="ro">Desen ODG (XML simplu)</comment>
<comment xml:lang="ru">Рисунок ODG (простой XML)</comment>
<comment xml:lang="sk">Kresba ODG (čisté XML)</comment>
@@ -5704,9 +5857,9 @@
<comment xml:lang="sr">ОДГ цртеж (Обичан ИксМЛ)</comment>
<comment xml:lang="sv">ODG-teckning (platt XML)</comment>
<comment xml:lang="tr">ODG çizimi (Düz XML)</comment>
- <comment xml:lang="uk">малюнок ODG (Flat XML)</comment>
- <comment xml:lang="zh_CN">ODG 绘图（Flat XML）</comment>
- <comment xml:lang="zh_TW">ODG 繪圖 (Flat XML)</comment>
+ <comment xml:lang="uk">малюнок ODG (простий XML)</comment>
+ <comment xml:lang="zh-CN">ODG 绘图（Flat XML）</comment>
+ <comment xml:lang="zh-TW">ODG 繪圖 (Flat XML)</comment>
<acronym>FODG</acronym>
<expanded-acronym>OpenDocument Drawing (Flat XML)</expanded-acronym>
<sub-class-of type="application/xml"/>
@@ -5715,21 +5868,23 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.graphics-template">
<comment>ODG template</comment>
+ <comment xml:lang="af">ODG-sjabloon</comment>
<comment xml:lang="ar">قالب ODG</comment>
- <comment xml:lang="be@latin">Šablon ODG</comment>
+ <comment xml:lang="be-Latn">Šablon ODG</comment>
<comment xml:lang="bg">Шаблон за чертежи — ODG</comment>
<comment xml:lang="ca">plantilla ODG</comment>
<comment xml:lang="cs">šablona ODG</comment>
<comment xml:lang="da">ODG-skabelon</comment>
<comment xml:lang="de">ODG-Vorlage</comment>
<comment xml:lang="el">Πρότυπο ODG</comment>
- <comment xml:lang="en_GB">ODG template</comment>
+ <comment xml:lang="en-GB">ODG template</comment>
<comment xml:lang="eo">ODG-ŝablono</comment>
<comment xml:lang="es">plantilla ODG</comment>
<comment xml:lang="eu">ODG txantiloia</comment>
<comment xml:lang="fi">ODG-malli</comment>
<comment xml:lang="fo">ODG formur</comment>
<comment xml:lang="fr">modèle ODG</comment>
+ <comment xml:lang="fur">model ODG</comment>
<comment xml:lang="ga">teimpléad ODG</comment>
<comment xml:lang="gl">modelo ODG</comment>
<comment xml:lang="he">תבנית ODG</comment>
@@ -5750,7 +5905,7 @@
<comment xml:lang="oc">modèl ODG</comment>
<comment xml:lang="pl">Szablon ODG</comment>
<comment xml:lang="pt">modelo ODG</comment>
- <comment xml:lang="pt_BR">Modelo ODG</comment>
+ <comment xml:lang="pt-BR">Modelo ODG</comment>
<comment xml:lang="ro">Șablon ODG</comment>
<comment xml:lang="ru">Шаблон ODG</comment>
<comment xml:lang="sk">Šablóna ODG</comment>
@@ -5761,16 +5916,16 @@
<comment xml:lang="tr">ODG şablonu</comment>
<comment xml:lang="uk">шаблон ODG</comment>
<comment xml:lang="vi">Mẫu ODG</comment>
- <comment xml:lang="zh_CN">ODG 模板</comment>
- <comment xml:lang="zh_TW">ODG 範本</comment>
+ <comment xml:lang="zh-CN">ODG 模板</comment>
+ <comment xml:lang="zh-TW">ODG 範本</comment>
<acronym>ODG</acronym>
<expanded-acronym>OpenDocument Drawing</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="image-x-generic"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.graphics-template" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.graphics-template" offset="38"/>
</match>
</match>
</magic>
@@ -5778,21 +5933,23 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.presentation">
<comment>ODP presentation</comment>
+ <comment xml:lang="af">ODP-voorlegging</comment>
<comment xml:lang="ar">عرض تقديمي ODP</comment>
- <comment xml:lang="be@latin">Prezentacyja ODP</comment>
+ <comment xml:lang="be-Latn">Prezentacyja ODP</comment>
<comment xml:lang="bg">Презентация — ODP</comment>
<comment xml:lang="ca">presentació ODP</comment>
<comment xml:lang="cs">prezentace ODP</comment>
<comment xml:lang="da">ODP-præsentation</comment>
<comment xml:lang="de">ODP-Präsentation</comment>
<comment xml:lang="el">Παρουσίαση ODP</comment>
- <comment xml:lang="en_GB">ODP presentation</comment>
+ <comment xml:lang="en-GB">ODP presentation</comment>
<comment xml:lang="eo">ODP-prezentaĵo</comment>
<comment xml:lang="es">presentación ODP</comment>
<comment xml:lang="eu">ODP aurkezpena</comment>
<comment xml:lang="fi">ODP-esitys</comment>
<comment xml:lang="fo">ODP framløga</comment>
<comment xml:lang="fr">présentation ODP</comment>
+ <comment xml:lang="fur">presentazion ODP</comment>
<comment xml:lang="ga">láithreoireacht ODP</comment>
<comment xml:lang="gl">presentación ODP</comment>
<comment xml:lang="he">מצגת ODP</comment>
@@ -5813,7 +5970,7 @@
<comment xml:lang="oc">presentacion ODP</comment>
<comment xml:lang="pl">Prezentacja ODP</comment>
<comment xml:lang="pt">apresentação ODP</comment>
- <comment xml:lang="pt_BR">Apresentação ODP</comment>
+ <comment xml:lang="pt-BR">Apresentação ODP</comment>
<comment xml:lang="ro">Prezentare ODP</comment>
<comment xml:lang="ru">Презентация ODP</comment>
<comment xml:lang="sk">Prezentácia ODP</comment>
@@ -5824,16 +5981,16 @@
<comment xml:lang="tr">ODP sunumu</comment>
<comment xml:lang="uk">презентація ODP</comment>
<comment xml:lang="vi">Trình diễn ODM</comment>
- <comment xml:lang="zh_CN">ODP 演示文稿</comment>
- <comment xml:lang="zh_TW">ODP 簡報</comment>
+ <comment xml:lang="zh-CN">ODP 演示文稿</comment>
+ <comment xml:lang="zh-TW">ODP 簡報</comment>
<acronym>ODP</acronym>
<expanded-acronym>OpenDocument Presentation</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-presentation"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.presentation" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.presentation" offset="38"/>
</match>
</match>
</magic>
@@ -5841,6 +5998,7 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.presentation-flat-xml">
<comment>ODP presentation (Flat XML)</comment>
+ <comment xml:lang="af">ODP-voorlegging (plat XML)</comment>
<comment xml:lang="ar">عرض ODP (Flat XML)</comment>
<comment xml:lang="bg">Презентация — ODP (само XML)</comment>
<comment xml:lang="ca">presentació ODP (XML pla)</comment>
@@ -5848,12 +6006,13 @@
<comment xml:lang="da">ODP-præsentation (flad XML)</comment>
<comment xml:lang="de">ODP-Präsentation (Unkomprimiertes XML)</comment>
<comment xml:lang="el">Παρουσίαση ODP (Flat XML)</comment>
- <comment xml:lang="en_GB">ODP presentation (Flat XML)</comment>
+ <comment xml:lang="en-GB">ODP presentation (Flat XML)</comment>
<comment xml:lang="es">presentación ODP (XML plano)</comment>
<comment xml:lang="eu">ODP aurkezpena (XML soila)</comment>
<comment xml:lang="fi">ODP-esitys (Flat XML)</comment>
<comment xml:lang="fo">ODP framløga (Flat XML)</comment>
<comment xml:lang="fr">présentation ODP (XML plat)</comment>
+ <comment xml:lang="fur">presentazion ODP (XML sempliç)</comment>
<comment xml:lang="ga">láithreoireacht ODP (XML cothrom)</comment>
<comment xml:lang="gl">presentación ODP (XML plano)</comment>
<comment xml:lang="he">מצגת ODP‏ (Flat XML)</comment>
@@ -5872,7 +6031,7 @@
<comment xml:lang="oc">presentacion ODP (XML plat)</comment>
<comment xml:lang="pl">Prezentacja ODP (prosty XML)</comment>
<comment xml:lang="pt">apresentação ODP (XML plano)</comment>
- <comment xml:lang="pt_BR">Apresentação ODP (Flat XML)</comment>
+ <comment xml:lang="pt-BR">Apresentação ODP (Flat XML)</comment>
<comment xml:lang="ro">Prezentare ODP (XML simplu)</comment>
<comment xml:lang="ru">Презентация ODP (простой XML)</comment>
<comment xml:lang="sk">Prezentácia ODP (čisté XML)</comment>
@@ -5881,8 +6040,8 @@
<comment xml:lang="sv">ODP-presentation (platt XML)</comment>
<comment xml:lang="tr">ODP sunumu (Düz XML)</comment>
<comment xml:lang="uk">презентація ODP (Flat XML)</comment>
- <comment xml:lang="zh_CN">ODP 演示文稿（Flat XML）</comment>
- <comment xml:lang="zh_TW">ODP 範本 (Flat XML)</comment>
+ <comment xml:lang="zh-CN">ODP 演示文稿（Flat XML）</comment>
+ <comment xml:lang="zh-TW">ODP 範本 (Flat XML)</comment>
<acronym>FODP</acronym>
<expanded-acronym>OpenDocument Presentation (Flat XML)</expanded-acronym>
<sub-class-of type="application/xml"/>
@@ -5891,21 +6050,23 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.presentation-template">
<comment>ODP template</comment>
+ <comment xml:lang="af">ODP-sjabloon</comment>
<comment xml:lang="ar">قالب ODP</comment>
- <comment xml:lang="be@latin">Šablon ODP</comment>
+ <comment xml:lang="be-Latn">Šablon ODP</comment>
<comment xml:lang="bg">Шаблон за презентации — ODP</comment>
<comment xml:lang="ca">plantilla ODP</comment>
<comment xml:lang="cs">šablona ODP</comment>
<comment xml:lang="da">ODP-skabelon</comment>
<comment xml:lang="de">ODP-Vorlage</comment>
<comment xml:lang="el">Πρότυπο ODP</comment>
- <comment xml:lang="en_GB">ODP template</comment>
+ <comment xml:lang="en-GB">ODP template</comment>
<comment xml:lang="eo">ODP-ŝablono</comment>
<comment xml:lang="es">plantilla ODP</comment>
<comment xml:lang="eu">ODP txantiloia</comment>
<comment xml:lang="fi">ODP-malli</comment>
<comment xml:lang="fo">ODP formur</comment>
<comment xml:lang="fr">modèle ODP</comment>
+ <comment xml:lang="fur">model ODP</comment>
<comment xml:lang="ga">teimpléad ODP</comment>
<comment xml:lang="gl">modelo ODP</comment>
<comment xml:lang="he">תבנית ODP</comment>
@@ -5926,7 +6087,7 @@
<comment xml:lang="oc">modèl ODP</comment>
<comment xml:lang="pl">Szablon ODP</comment>
<comment xml:lang="pt">modelo ODP</comment>
- <comment xml:lang="pt_BR">Modelo ODP</comment>
+ <comment xml:lang="pt-BR">Modelo ODP</comment>
<comment xml:lang="ro">Șablon ODP</comment>
<comment xml:lang="ru">Шаблон ODP</comment>
<comment xml:lang="sk">Šablóna ODP</comment>
@@ -5937,16 +6098,16 @@
<comment xml:lang="tr">ODP şablonu</comment>
<comment xml:lang="uk">шаблон ODP</comment>
<comment xml:lang="vi">Mẫu ODP</comment>
- <comment xml:lang="zh_CN">ODP 模板</comment>
- <comment xml:lang="zh_TW">ODP 範本</comment>
+ <comment xml:lang="zh-CN">ODP 模板</comment>
+ <comment xml:lang="zh-TW">ODP 範本</comment>
<acronym>ODP</acronym>
<expanded-acronym>OpenDocument Presentation</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-presentation"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.presentation-template" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.presentation-template" offset="38"/>
</match>
</match>
</magic>
@@ -5954,21 +6115,23 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.spreadsheet">
<comment>ODS spreadsheet</comment>
+ <comment xml:lang="af">ODS-sigblad</comment>
<comment xml:lang="ar">جدول ODS</comment>
- <comment xml:lang="be@latin">Raźlikovy arkuš ODS</comment>
+ <comment xml:lang="be-Latn">Raźlikovy arkuš ODS</comment>
<comment xml:lang="bg">Таблица — ODS</comment>
<comment xml:lang="ca">full de càlcul ODS</comment>
<comment xml:lang="cs">sešit ODS</comment>
<comment xml:lang="da">ODS-regneark</comment>
<comment xml:lang="de">ODS-Tabelle</comment>
<comment xml:lang="el">Λογιστικό φύλλο ODS</comment>
- <comment xml:lang="en_GB">ODS spreadsheet</comment>
+ <comment xml:lang="en-GB">ODS spreadsheet</comment>
<comment xml:lang="eo">ODS-kalkultabelo</comment>
<comment xml:lang="es">hoja de cálculo ODS</comment>
<comment xml:lang="eu">ODS kalkulu-orria</comment>
<comment xml:lang="fi">ODS-taulukko</comment>
<comment xml:lang="fo">ODS rokniark</comment>
<comment xml:lang="fr">feuille de calcul ODS</comment>
+ <comment xml:lang="fur">sfuei di calcul ODS</comment>
<comment xml:lang="ga">scarbhileog ODS</comment>
<comment xml:lang="gl">folla de cálculo ODS</comment>
<comment xml:lang="he">גליון נתונים ODS</comment>
@@ -5989,7 +6152,7 @@
<comment xml:lang="oc">fuèlh de calcul ODS</comment>
<comment xml:lang="pl">Arkusz ODS</comment>
<comment xml:lang="pt">folha de cálculo ODS</comment>
- <comment xml:lang="pt_BR">Planilha ODS</comment>
+ <comment xml:lang="pt-BR">Planilha ODS</comment>
<comment xml:lang="ro">Foaie de calcul ODS</comment>
<comment xml:lang="ru">Электронная таблица ODS</comment>
<comment xml:lang="sk">Zošit ODS</comment>
@@ -5997,19 +6160,19 @@
<comment xml:lang="sq">Fletë llogaritjesh ODS</comment>
<comment xml:lang="sr">ОДС табела</comment>
<comment xml:lang="sv">ODS-kalkylblad</comment>
- <comment xml:lang="tr">ODS çalışma sayfası</comment>
+ <comment xml:lang="tr">ODS hesap çizelgesi</comment>
<comment xml:lang="uk">ел. таблиця ODS</comment>
<comment xml:lang="vi">Bảng tính ODS</comment>
- <comment xml:lang="zh_CN">ODS 电子表格</comment>
- <comment xml:lang="zh_TW">ODS 試算表</comment>
+ <comment xml:lang="zh-CN">ODS 电子表格</comment>
+ <comment xml:lang="zh-TW">ODS 試算表</comment>
<acronym>ODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.spreadsheet" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.spreadsheet" offset="38"/>
</match>
</match>
</magic>
@@ -6017,6 +6180,7 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.spreadsheet-flat-xml">
<comment>ODS spreadsheet (Flat XML)</comment>
+ <comment xml:lang="af">ODS-sigblad (plat XML)</comment>
<comment xml:lang="ar">جدول ODS (Flat XML)</comment>
<comment xml:lang="bg">Таблица — ODS (само XML)</comment>
<comment xml:lang="ca">full de càlcul ODS (XML pla)</comment>
@@ -6024,12 +6188,13 @@
<comment xml:lang="da">ODS-regneark (flad XML)</comment>
<comment xml:lang="de">ODS-Tabelle (Unkomprimiertes XML)</comment>
<comment xml:lang="el">Λογιστικό φύλλο ODS (Flat XML)</comment>
- <comment xml:lang="en_GB">ODS spreadsheet (Flat XML)</comment>
+ <comment xml:lang="en-GB">ODS spreadsheet (Flat XML)</comment>
<comment xml:lang="es">hoja de cálculo ODS (XML plano)</comment>
<comment xml:lang="eu">ODS kalkulu-orria (XML soila)</comment>
<comment xml:lang="fi">ODS-laskentataulukko (Flat XML)</comment>
<comment xml:lang="fo">ODS rokniark (Flat XML)</comment>
<comment xml:lang="fr">feuille de calcul ODS (XML plat)</comment>
+ <comment xml:lang="fur">sfuei di calcul ODS (XML sempliç)</comment>
<comment xml:lang="ga">scarbhileog ODS (XML cothrom)</comment>
<comment xml:lang="gl">folla de cálculo ODS (XML plano)</comment>
<comment xml:lang="he">גליון נתונים ODS‏ (XML פשוט)</comment>
@@ -6048,17 +6213,17 @@
<comment xml:lang="oc">fuèlh de calcul ODS (XML plat)</comment>
<comment xml:lang="pl">Arkusz ODS (prosty XML)</comment>
<comment xml:lang="pt">folha de cálculo ODS (XML plano)</comment>
- <comment xml:lang="pt_BR">Planilha ODS (Flat XML)</comment>
+ <comment xml:lang="pt-BR">Planilha ODS (Flat XML)</comment>
<comment xml:lang="ro">Foaie de calcul ODS (XML simplu)</comment>
<comment xml:lang="ru">Электронная таблица ODS (простой XML)</comment>
<comment xml:lang="sk">Zošit ODS (čisté XML)</comment>
<comment xml:lang="sl">Preglednica ODS (nepovezan XML)</comment>
<comment xml:lang="sr">ОДС табела (обични ИксМЛ)</comment>
<comment xml:lang="sv">ODS-kalkylblad (platt XML)</comment>
- <comment xml:lang="tr">ODS sunumu (Düz XML)</comment>
+ <comment xml:lang="tr">ODS hesap çizelgesi (Düz XML)</comment>
<comment xml:lang="uk">ел. таблиця ODS (Flat XML)</comment>
- <comment xml:lang="zh_CN">ODS 电子表格 (Flat XML)</comment>
- <comment xml:lang="zh_TW">ODS 試算表 (Flat XML)</comment>
+ <comment xml:lang="zh-CN">ODS 电子表格 (Flat XML)</comment>
+ <comment xml:lang="zh-TW">ODS 試算表 (Flat XML)</comment>
<acronym>FODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet (Flat XML)</expanded-acronym>
<sub-class-of type="application/xml"/>
@@ -6067,21 +6232,23 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.spreadsheet-template">
<comment>ODS template</comment>
+ <comment xml:lang="af">ODS-sjabloon</comment>
<comment xml:lang="ar">قالب ODS</comment>
- <comment xml:lang="be@latin">Šablon ODS</comment>
+ <comment xml:lang="be-Latn">Šablon ODS</comment>
<comment xml:lang="bg">Шаблон за таблици — ODS</comment>
<comment xml:lang="ca">plantilla ODS</comment>
<comment xml:lang="cs">šablona ODS</comment>
<comment xml:lang="da">ODS-skabelon</comment>
<comment xml:lang="de">ODS-Vorlage</comment>
<comment xml:lang="el">Πρότυπο ODS</comment>
- <comment xml:lang="en_GB">ODS template</comment>
+ <comment xml:lang="en-GB">ODS template</comment>
<comment xml:lang="eo">ODS-ŝablono</comment>
<comment xml:lang="es">plantilla ODS</comment>
<comment xml:lang="eu">ODS txantiloia</comment>
<comment xml:lang="fi">ODS-malli</comment>
<comment xml:lang="fo">ODS formur</comment>
<comment xml:lang="fr">modèle ODS</comment>
+ <comment xml:lang="fur">model ODS</comment>
<comment xml:lang="ga">teimpléad ODS</comment>
<comment xml:lang="gl">modelo ODS</comment>
<comment xml:lang="he">תבנית ODS</comment>
@@ -6102,7 +6269,7 @@
<comment xml:lang="oc">modèl ODS</comment>
<comment xml:lang="pl">Szablon ODS</comment>
<comment xml:lang="pt">modelo ODS</comment>
- <comment xml:lang="pt_BR">Modelo ODS</comment>
+ <comment xml:lang="pt-BR">Modelo ODS</comment>
<comment xml:lang="ro">Șablon ODS</comment>
<comment xml:lang="ru">Шаблон ODS</comment>
<comment xml:lang="sk">Šablóna ODS</comment>
@@ -6113,16 +6280,16 @@
<comment xml:lang="tr">ODS şablonu</comment>
<comment xml:lang="uk">шаблон ODS</comment>
<comment xml:lang="vi">Mẫu ODS</comment>
- <comment xml:lang="zh_CN">ODS 模板</comment>
- <comment xml:lang="zh_TW">ODS 範本</comment>
+ <comment xml:lang="zh-CN">ODS 模板</comment>
+ <comment xml:lang="zh-TW">ODS 範本</comment>
<acronym>ODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.spreadsheet-template" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.spreadsheet-template" offset="38"/>
</match>
</match>
</magic>
@@ -6130,21 +6297,23 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.chart">
<comment>ODC chart</comment>
+ <comment xml:lang="af">ODC-grafiek</comment>
<comment xml:lang="ar">مخطط ODC</comment>
- <comment xml:lang="be@latin">Dyjahrama ODC</comment>
+ <comment xml:lang="be-Latn">Dyjahrama ODC</comment>
<comment xml:lang="bg">Диаграма — ODC</comment>
<comment xml:lang="ca">diagrama ODC</comment>
<comment xml:lang="cs">graf ODC</comment>
<comment xml:lang="da">ODC-diagram</comment>
<comment xml:lang="de">ODC-Diagramm</comment>
<comment xml:lang="el">Διάγραμμα ODC</comment>
- <comment xml:lang="en_GB">ODC chart</comment>
+ <comment xml:lang="en-GB">ODC chart</comment>
<comment xml:lang="eo">ODC-diagramo</comment>
<comment xml:lang="es">gráfico ODC</comment>
<comment xml:lang="eu">ODC diagrama</comment>
<comment xml:lang="fi">ODC-kaavio</comment>
<comment xml:lang="fo">ODC strikumynd</comment>
<comment xml:lang="fr">graphique ODC</comment>
+ <comment xml:lang="fur">grafic ODC</comment>
<comment xml:lang="ga">cairt ODC</comment>
<comment xml:lang="gl">gráfica ODC</comment>
<comment xml:lang="he">תו ODC</comment>
@@ -6164,7 +6333,7 @@
<comment xml:lang="oc">grafic ODC</comment>
<comment xml:lang="pl">Wykres ODC</comment>
<comment xml:lang="pt">gráfico ODC</comment>
- <comment xml:lang="pt_BR">Gráfico ODC</comment>
+ <comment xml:lang="pt-BR">Gráfico ODC</comment>
<comment xml:lang="ro">Diagramă ODC</comment>
<comment xml:lang="ru">Диаграмма ODC</comment>
<comment xml:lang="sk">Graf ODC</comment>
@@ -6172,19 +6341,19 @@
<comment xml:lang="sq">Grafik ODC</comment>
<comment xml:lang="sr">ОДЦ график</comment>
<comment xml:lang="sv">ODC-diagram</comment>
- <comment xml:lang="tr">ODC çizelgesi</comment>
+ <comment xml:lang="tr">ODC çizgesi</comment>
<comment xml:lang="uk">діаграма ODC</comment>
<comment xml:lang="vi">Sơ đồ ODC</comment>
- <comment xml:lang="zh_CN">ODC 图表</comment>
- <comment xml:lang="zh_TW">ODC 圖表</comment>
+ <comment xml:lang="zh-CN">ODC 图表</comment>
+ <comment xml:lang="zh-TW">ODC 圖表</comment>
<acronym>ODC</acronym>
<expanded-acronym>OpenDocument Chart</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.chart" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.chart" offset="38"/>
</match>
</match>
</magic>
@@ -6192,6 +6361,7 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.chart-template">
<comment>ODC template</comment>
+ <comment xml:lang="af">ODC-sjabloon</comment>
<comment xml:lang="ar">قالب ODC</comment>
<comment xml:lang="bg">Шаблон за диаграми — ODC</comment>
<comment xml:lang="ca">plantilla ODC</comment>
@@ -6199,13 +6369,14 @@
<comment xml:lang="da">ODC-skabelon</comment>
<comment xml:lang="de">ODC-Vorlage</comment>
<comment xml:lang="el">Πρότυπο ODC</comment>
- <comment xml:lang="en_GB">ODC template</comment>
+ <comment xml:lang="en-GB">ODC template</comment>
<comment xml:lang="eo">ODC-ŝablono</comment>
<comment xml:lang="es">plantilla ODC</comment>
<comment xml:lang="eu">ODC txantiloia</comment>
<comment xml:lang="fi">ODC-malli</comment>
<comment xml:lang="fo">ODC formur</comment>
<comment xml:lang="fr">modèle ODC</comment>
+ <comment xml:lang="fur">model ODC</comment>
<comment xml:lang="ga">teimpléad ODC</comment>
<comment xml:lang="gl">modelo ODC</comment>
<comment xml:lang="he">תבנית ODC</comment>
@@ -6224,7 +6395,7 @@
<comment xml:lang="oc">modèl ODC</comment>
<comment xml:lang="pl">Szablon ODC</comment>
<comment xml:lang="pt">modelo ODC</comment>
- <comment xml:lang="pt_BR">Modelo ODC</comment>
+ <comment xml:lang="pt-BR">Modelo ODC</comment>
<comment xml:lang="ro">Șablon ODC</comment>
<comment xml:lang="ru">Шаблон ODC</comment>
<comment xml:lang="sk">Šablóna ODC</comment>
@@ -6234,16 +6405,16 @@
<comment xml:lang="tr">ODC şablonu</comment>
<comment xml:lang="uk">шаблон ODC</comment>
<comment xml:lang="vi">Mẫu ODC</comment>
- <comment xml:lang="zh_CN">ODC 模板</comment>
- <comment xml:lang="zh_TW">ODC 範本</comment>
+ <comment xml:lang="zh-CN">ODC 模板</comment>
+ <comment xml:lang="zh-TW">ODC 範本</comment>
<acronym>ODC</acronym>
<expanded-acronym>OpenDocument Chart</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.chart-template" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.chart-template" offset="38"/>
</match>
</match>
</magic>
@@ -6251,21 +6422,23 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.formula">
<comment>ODF formula</comment>
+ <comment xml:lang="af">ODF-formule</comment>
<comment xml:lang="ar">صيغة ODF</comment>
- <comment xml:lang="be@latin">Formuła ODF</comment>
+ <comment xml:lang="be-Latn">Formuła ODF</comment>
<comment xml:lang="bg">Формула — ODF</comment>
<comment xml:lang="ca">fórmula ODF</comment>
<comment xml:lang="cs">vzorec ODF</comment>
<comment xml:lang="da">ODF-formel</comment>
<comment xml:lang="de">ODF-Formel</comment>
<comment xml:lang="el">Μαθηματικός τύπος ODF</comment>
- <comment xml:lang="en_GB">ODF formula</comment>
+ <comment xml:lang="en-GB">ODF formula</comment>
<comment xml:lang="eo">ODF-formulo</comment>
<comment xml:lang="es">fórmula ODF</comment>
<comment xml:lang="eu">ODF formula</comment>
<comment xml:lang="fi">ODF-kaava</comment>
<comment xml:lang="fo">ODF frymil</comment>
<comment xml:lang="fr">formule ODF</comment>
+ <comment xml:lang="fur">formule ODF</comment>
<comment xml:lang="ga">foirmle ODF</comment>
<comment xml:lang="gl">Fórula ODF</comment>
<comment xml:lang="he">נוסחת ODF</comment>
@@ -6286,7 +6459,7 @@
<comment xml:lang="oc">formula ODF</comment>
<comment xml:lang="pl">Formuła ODF</comment>
<comment xml:lang="pt">fórmula ODF</comment>
- <comment xml:lang="pt_BR">Fórmula ODF</comment>
+ <comment xml:lang="pt-BR">Fórmula ODF</comment>
<comment xml:lang="ro">Formulă ODF</comment>
<comment xml:lang="ru">Формула ODF</comment>
<comment xml:lang="sk">Vzorec ODF</comment>
@@ -6297,16 +6470,16 @@
<comment xml:lang="tr">ODF formülü</comment>
<comment xml:lang="uk">формула ODF</comment>
<comment xml:lang="vi">Công thức ODF</comment>
- <comment xml:lang="zh_CN">ODF 公式</comment>
- <comment xml:lang="zh_TW">ODF 公式</comment>
+ <comment xml:lang="zh-CN">ODF 公式</comment>
+ <comment xml:lang="zh-TW">ODF 公式</comment>
<acronym>ODF</acronym>
<expanded-acronym>OpenDocument Formula</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.formula" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.formula" offset="38"/>
</match>
</match>
</magic>
@@ -6314,6 +6487,7 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.formula-template">
<comment>ODF template</comment>
+ <comment xml:lang="af">ODF-sjabloon</comment>
<comment xml:lang="ar">قالب ODF</comment>
<comment xml:lang="bg">Шаблон за формули — ODF</comment>
<comment xml:lang="ca">plantilla ODF</comment>
@@ -6321,13 +6495,14 @@
<comment xml:lang="da">ODF-skabelon</comment>
<comment xml:lang="de">ODF-Vorlage</comment>
<comment xml:lang="el">Πρότυπο ODF</comment>
- <comment xml:lang="en_GB">ODF template</comment>
+ <comment xml:lang="en-GB">ODF template</comment>
<comment xml:lang="eo">ODF-ŝablono</comment>
<comment xml:lang="es">plantilla ODF</comment>
<comment xml:lang="eu">ODF txantiloia</comment>
<comment xml:lang="fi">ODF-malli</comment>
<comment xml:lang="fo">ODF formur</comment>
<comment xml:lang="fr">modèle ODF</comment>
+ <comment xml:lang="fur">model ODF</comment>
<comment xml:lang="ga">teimpléad ODF</comment>
<comment xml:lang="gl">modelo ODF</comment>
<comment xml:lang="he">תבנית ODF</comment>
@@ -6346,7 +6521,7 @@
<comment xml:lang="oc">modèl ODF</comment>
<comment xml:lang="pl">Szablon ODF</comment>
<comment xml:lang="pt">modelo ODF</comment>
- <comment xml:lang="pt_BR">Modelo ODF</comment>
+ <comment xml:lang="pt-BR">Modelo ODF</comment>
<comment xml:lang="ro">Șablon ODF</comment>
<comment xml:lang="ru">Шаблон ODF</comment>
<comment xml:lang="sk">Šablóna ODF</comment>
@@ -6356,16 +6531,16 @@
<comment xml:lang="tr">ODF şablonu</comment>
<comment xml:lang="uk">шаблон ODF</comment>
<comment xml:lang="vi">Mẫu ODF</comment>
- <comment xml:lang="zh_CN">ODF 模板</comment>
- <comment xml:lang="zh_TW">ODF 範本</comment>
+ <comment xml:lang="zh-CN">ODF 模板</comment>
+ <comment xml:lang="zh-TW">ODF 範本</comment>
<acronym>ODF</acronym>
<expanded-acronym>OpenDocument Formula</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.formula-template" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.formula-template" offset="38"/>
</match>
</match>
</magic>
@@ -6373,21 +6548,23 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.database">
<comment>ODB database</comment>
+ <comment xml:lang="af">ODB-databasis</comment>
<comment xml:lang="ar">قاعدة بيانات ODB</comment>
- <comment xml:lang="be@latin">Baza źviestak ODB</comment>
+ <comment xml:lang="be-Latn">Baza źviestak ODB</comment>
<comment xml:lang="bg">База от данни — ODB</comment>
<comment xml:lang="ca">base de dades ODB</comment>
<comment xml:lang="cs">databáze ODB</comment>
<comment xml:lang="da">ODB-database</comment>
<comment xml:lang="de">ODB-Datenbank</comment>
<comment xml:lang="el">Βάση δεδομένων ODB</comment>
- <comment xml:lang="en_GB">ODB database</comment>
+ <comment xml:lang="en-GB">ODB database</comment>
<comment xml:lang="eo">ODB-datumbazo</comment>
<comment xml:lang="es">base de datos ODB</comment>
<comment xml:lang="eu">ODB datu-basea</comment>
<comment xml:lang="fi">ODB-tietokanta</comment>
<comment xml:lang="fo">ODB dátustovnur</comment>
<comment xml:lang="fr">base de données ODB</comment>
+ <comment xml:lang="fur">base di dâts ODB</comment>
<comment xml:lang="ga">bunachar sonraí ODB</comment>
<comment xml:lang="gl">base de datos ODB</comment>
<comment xml:lang="he">מסד נתונים ODB</comment>
@@ -6408,7 +6585,7 @@
<comment xml:lang="oc">banca de donadas ODB</comment>
<comment xml:lang="pl">Baza danych ODB</comment>
<comment xml:lang="pt">base de dados ODB</comment>
- <comment xml:lang="pt_BR">Banco de dados ODB</comment>
+ <comment xml:lang="pt-BR">Banco de dados ODB</comment>
<comment xml:lang="ro">Bază de date ODB</comment>
<comment xml:lang="ru">База данных ODB</comment>
<comment xml:lang="sk">Databáza ODB</comment>
@@ -6416,19 +6593,19 @@
<comment xml:lang="sq">Bazë me të dhëna ODB</comment>
<comment xml:lang="sr">ОДБ база података</comment>
<comment xml:lang="sv">ODB-databas</comment>
- <comment xml:lang="tr">ODB veritabanı</comment>
+ <comment xml:lang="tr">ODB veri tabanı</comment>
<comment xml:lang="uk">база даних ODB</comment>
<comment xml:lang="vi">Cơ sở dữ liệu ODB</comment>
- <comment xml:lang="zh_CN">ODB 数据库</comment>
- <comment xml:lang="zh_TW">ODB 資料庫</comment>
+ <comment xml:lang="zh-CN">ODB 数据库</comment>
+ <comment xml:lang="zh-TW">ODB 資料庫</comment>
<acronym>ODB</acronym>
<expanded-acronym>OpenDocument Database</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.base" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.base" offset="38"/>
</match>
</match>
</magic>
@@ -6437,22 +6614,24 @@
</mime-type>
<mime-type type="application/vnd.oasis.opendocument.image">
<comment>ODI image</comment>
+ <comment xml:lang="af">ODI-beeld</comment>
<comment xml:lang="ar">صورة ODI</comment>
<comment xml:lang="ast">Imaxe ODI</comment>
- <comment xml:lang="be@latin">Vyjava ODI</comment>
+ <comment xml:lang="be-Latn">Vyjava ODI</comment>
<comment xml:lang="bg">Изображение — ODI</comment>
<comment xml:lang="ca">imatge ODI</comment>
<comment xml:lang="cs">obrázek ODI</comment>
<comment xml:lang="da">ODI-billede</comment>
<comment xml:lang="de">ODI-Bild</comment>
<comment xml:lang="el">Εικόνα ODI</comment>
- <comment xml:lang="en_GB">ODI image</comment>
+ <comment xml:lang="en-GB">ODI image</comment>
<comment xml:lang="eo">ODI-bildo</comment>
<comment xml:lang="es">imagen ODI</comment>
<comment xml:lang="eu">ODI irudia</comment>
<comment xml:lang="fi">ODI-kuva</comment>
<comment xml:lang="fo">ODI mynd</comment>
<comment xml:lang="fr">image ODI</comment>
+ <comment xml:lang="fur">imagjin ODI</comment>
<comment xml:lang="ga">íomhá ODI</comment>
<comment xml:lang="gl">imaxe ODI</comment>
<comment xml:lang="he">תמונת ODI</comment>
@@ -6473,7 +6652,7 @@
<comment xml:lang="oc">imatge ODI</comment>
<comment xml:lang="pl">Obraz ODI</comment>
<comment xml:lang="pt">imagem ODI</comment>
- <comment xml:lang="pt_BR">Imagem ODI</comment>
+ <comment xml:lang="pt-BR">Imagem ODI</comment>
<comment xml:lang="ro">Imagine ODI</comment>
<comment xml:lang="ru">Изображение ODI</comment>
<comment xml:lang="sk">Obrázok ODI</comment>
@@ -6484,16 +6663,16 @@
<comment xml:lang="tr">ODI görüntüsü</comment>
<comment xml:lang="uk">зображення ODI</comment>
<comment xml:lang="vi">Ảnh ODI</comment>
- <comment xml:lang="zh_CN">ODI 图像</comment>
- <comment xml:lang="zh_TW">ODI 影像</comment>
+ <comment xml:lang="zh-CN">ODI 图像</comment>
+ <comment xml:lang="zh-TW">ODI 影像</comment>
<acronym>ODI</acronym>
<expanded-acronym>OpenDocument Image</expanded-acronym>
<sub-class-of type="application/zip"/>
<generic-icon name="image-x-generic"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/vnd.oasis.opendocument.image" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/vnd.oasis.opendocument.image" offset="38"/>
</match>
</match>
</magic>
@@ -6501,21 +6680,23 @@
</mime-type>
<mime-type type="application/vnd.openofficeorg.extension">
<comment>OpenOffice.org extension</comment>
+ <comment xml:lang="af">OpenOffice.org-uitbreiding</comment>
<comment xml:lang="ar">امتداد OpenOffice.org</comment>
<comment xml:lang="ast">Estensión d'OpenOffice.org</comment>
- <comment xml:lang="be@latin">Pašyreńnie OpenOffice.org</comment>
- <comment xml:lang="bg">Разширение — OpenOffice</comment>
+ <comment xml:lang="be-Latn">Pašyreńnie OpenOffice.org</comment>
+ <comment xml:lang="bg">Приставка — OpenOffice</comment>
<comment xml:lang="ca">extensió d'OpenOffice.org</comment>
<comment xml:lang="cs">rozšíření OpenOffice.org</comment>
<comment xml:lang="da">OpenOffice.org-udvidelse</comment>
<comment xml:lang="de">OpenOffice.org-Erweiterung</comment>
<comment xml:lang="el">Επέκταση OpenOffice.org</comment>
- <comment xml:lang="en_GB">OpenOffice.org extension</comment>
+ <comment xml:lang="en-GB">OpenOffice.org extension</comment>
<comment xml:lang="es">extensión de LibreOffice</comment>
<comment xml:lang="eu">OpenOffice.org luzapena</comment>
<comment xml:lang="fi">OpenOffice.org-laajennus</comment>
<comment xml:lang="fo">OpenOffice.org víðkan</comment>
<comment xml:lang="fr">extension OpenOffice.org</comment>
+ <comment xml:lang="fur">estension OpenOffice.org</comment>
<comment xml:lang="ga">eisínteacht OpenOffice.org</comment>
<comment xml:lang="gl">Extensión de OpenOffice.org</comment>
<comment xml:lang="he">הרחבה של OpenOffice.org</comment>
@@ -6535,7 +6716,7 @@
<comment xml:lang="oc">extension OpenOffice.org</comment>
<comment xml:lang="pl">Rozszerzenie OpenOffice.org</comment>
<comment xml:lang="pt">extensão OpenOffice.org</comment>
- <comment xml:lang="pt_BR">Extensão do OpenOffice</comment>
+ <comment xml:lang="pt-BR">Extensão do OpenOffice</comment>
<comment xml:lang="ro">Extensie OpenOffice.org</comment>
<comment xml:lang="ru">Расширение OpenOffice.org</comment>
<comment xml:lang="sk">Rozšírenie OpenOffice.org</comment>
@@ -6546,14 +6727,15 @@
<comment xml:lang="tr">OpenOffice.org eklentisi</comment>
<comment xml:lang="uk">розширення OpenOffice.org</comment>
<comment xml:lang="vi">Phần mở rộng của OpenOffice.org</comment>
- <comment xml:lang="zh_CN">OpenOffice.org 扩展</comment>
- <comment xml:lang="zh_TW">OpenOffice.org 擴充套件</comment>
+ <comment xml:lang="zh-CN">OpenOffice.org 扩展</comment>
+ <comment xml:lang="zh-TW">OpenOffice.org 擴充套件</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.oxt"/>
</mime-type>
<mime-type type="application/vnd.android.package-archive">
<comment>Android package</comment>
+ <comment xml:lang="af">Android-pakket</comment>
<comment xml:lang="ast">Paquete d'Android</comment>
<comment xml:lang="bg">Пакет — Android</comment>
<comment xml:lang="ca">paquet d'Android</comment>
@@ -6561,12 +6743,13 @@
<comment xml:lang="da">Android-pakke</comment>
<comment xml:lang="de">Android-Paket</comment>
<comment xml:lang="el">Πακέτο Android</comment>
- <comment xml:lang="en_GB">Android package</comment>
+ <comment xml:lang="en-GB">Android package</comment>
<comment xml:lang="eo">Android-pakaĵo</comment>
<comment xml:lang="es">paquete de Android</comment>
<comment xml:lang="eu">Android paketea</comment>
<comment xml:lang="fi">Android-paketti</comment>
<comment xml:lang="fr">paquet Android</comment>
+ <comment xml:lang="fur">pachet Android</comment>
<comment xml:lang="ga">pacáiste Android</comment>
<comment xml:lang="gl">paquete de Android</comment>
<comment xml:lang="he">חבילת אנדרויד</comment>
@@ -6579,12 +6762,13 @@
<comment xml:lang="ka">Android-ის პაკეტი</comment>
<comment xml:lang="kk">Android дестесі</comment>
<comment xml:lang="ko">Android 패키지</comment>
+ <comment xml:lang="lt">Android paketas</comment>
<comment xml:lang="lv">Android pakotne</comment>
<comment xml:lang="nl">Android pakket</comment>
<comment xml:lang="oc">paquet Android</comment>
<comment xml:lang="pl">Pakiet Androida</comment>
<comment xml:lang="pt">pacote Android</comment>
- <comment xml:lang="pt_BR">Pacote do Android</comment>
+ <comment xml:lang="pt-BR">Pacote do Android</comment>
<comment xml:lang="ru">Пакет Android</comment>
<comment xml:lang="sk">Balík Android</comment>
<comment xml:lang="sl">Paket Android</comment>
@@ -6592,29 +6776,31 @@
<comment xml:lang="sv">Android-paket</comment>
<comment xml:lang="tr">Android paketi</comment>
<comment xml:lang="uk">пакунок Android</comment>
- <comment xml:lang="zh_CN">Android 应用包</comment>
- <comment xml:lang="zh_TW">Android 軟體包</comment>
+ <comment xml:lang="zh-CN">Android 应用包</comment>
+ <comment xml:lang="zh-TW">Android 軟體包</comment>
<sub-class-of type="application/x-java-archive"/>
<glob pattern="*.apk"/>
</mime-type>
<mime-type type="application/vnd.symbian.install">
<comment>SIS package</comment>
+ <comment xml:lang="af">SIS-pakket</comment>
<comment xml:lang="ar">حزمة SIS</comment>
<comment xml:lang="ast">Paquete SIS</comment>
- <comment xml:lang="be@latin">Pakunak SIS</comment>
+ <comment xml:lang="be-Latn">Pakunak SIS</comment>
<comment xml:lang="bg">Пакет — SIS</comment>
<comment xml:lang="ca">paquet SIS</comment>
<comment xml:lang="cs">balíček SIS</comment>
<comment xml:lang="da">SIS-pakke</comment>
<comment xml:lang="de">SIS-Paket</comment>
<comment xml:lang="el">Πακέτο SIS</comment>
- <comment xml:lang="en_GB">SIS package</comment>
+ <comment xml:lang="en-GB">SIS package</comment>
<comment xml:lang="eo">SIS-pakaĵo</comment>
<comment xml:lang="es">paquete SIS</comment>
<comment xml:lang="eu">SIS paketea</comment>
<comment xml:lang="fi">SIS-paketti</comment>
<comment xml:lang="fo">SIS pakki</comment>
<comment xml:lang="fr">paquet SIS</comment>
+ <comment xml:lang="fur">pachet SIS</comment>
<comment xml:lang="ga">pacáiste SIS</comment>
<comment xml:lang="gl">paquete SIS</comment>
<comment xml:lang="he">חבילת SIS</comment>
@@ -6634,7 +6820,7 @@
<comment xml:lang="oc">paquet SIS</comment>
<comment xml:lang="pl">Pakiet SIS</comment>
<comment xml:lang="pt">pacote SIS</comment>
- <comment xml:lang="pt_BR">Pacote SIS</comment>
+ <comment xml:lang="pt-BR">Pacote SIS</comment>
<comment xml:lang="ro">Pachet SIS</comment>
<comment xml:lang="ru">Пакет SIS</comment>
<comment xml:lang="sk">Balíček SIS</comment>
@@ -6645,34 +6831,36 @@
<comment xml:lang="tr">SIS paketi</comment>
<comment xml:lang="uk">пакунок SIS</comment>
<comment xml:lang="vi">Gói SIS</comment>
- <comment xml:lang="zh_CN">SIS 软件包</comment>
- <comment xml:lang="zh_TW">SIS 軟體包</comment>
+ <comment xml:lang="zh-CN">SIS 软件包</comment>
+ <comment xml:lang="zh-TW">SIS 軟體包</comment>
<acronym>SIS</acronym>
<expanded-acronym>Symbian Installation File</expanded-acronym>
<generic-icon name="package-x-generic"/>
<magic priority="50">
- <match value="0x10000419" type="little32" offset="8"/>
+ <match type="little32" value="0x10000419" offset="8"/>
</magic>
<glob pattern="*.sis"/>
</mime-type>
<mime-type type="x-epoc/x-sisx-app">
<comment>SISX package</comment>
+ <comment xml:lang="af">SISX-pakket</comment>
<comment xml:lang="ar">حزمة SISX</comment>
<comment xml:lang="ast">Paquete SISX</comment>
- <comment xml:lang="be@latin">Pakunak SISX</comment>
+ <comment xml:lang="be-Latn">Pakunak SISX</comment>
<comment xml:lang="bg">Пакет — SISX</comment>
<comment xml:lang="ca">paquet SISX</comment>
<comment xml:lang="cs">balíček SISX</comment>
<comment xml:lang="da">SISX-pakke</comment>
<comment xml:lang="de">SISX-Paket</comment>
<comment xml:lang="el">Πακέτο SISX</comment>
- <comment xml:lang="en_GB">SISX package</comment>
+ <comment xml:lang="en-GB">SISX package</comment>
<comment xml:lang="eo">SISX-pakaĵo</comment>
<comment xml:lang="es">paquete SISX</comment>
<comment xml:lang="eu">SISX paketea</comment>
<comment xml:lang="fi">SISX-paketti</comment>
<comment xml:lang="fo">SISX pakki</comment>
<comment xml:lang="fr">paquet SISX</comment>
+ <comment xml:lang="fur">pachet SISX</comment>
<comment xml:lang="ga">pacáiste SISX</comment>
<comment xml:lang="gl">paquete SISX</comment>
<comment xml:lang="he">חבילת SISX</comment>
@@ -6692,7 +6880,7 @@
<comment xml:lang="oc">paquet SISX</comment>
<comment xml:lang="pl">Pakiet SISX</comment>
<comment xml:lang="pt">pacote SISX</comment>
- <comment xml:lang="pt_BR">Pacote SISX</comment>
+ <comment xml:lang="pt-BR">Pacote SISX</comment>
<comment xml:lang="ro">Pachet SISX</comment>
<comment xml:lang="ru">Пакет SISX</comment>
<comment xml:lang="sk">Balíček SISX</comment>
@@ -6703,59 +6891,44 @@
<comment xml:lang="tr">SISX paketi</comment>
<comment xml:lang="uk">пакунок SISX</comment>
<comment xml:lang="vi">Gói SISX</comment>
- <comment xml:lang="zh_CN">SISX 软件包</comment>
- <comment xml:lang="zh_TW">SISX 軟體包</comment>
+ <comment xml:lang="zh-CN">SISX 软件包</comment>
+ <comment xml:lang="zh-TW">SISX 軟體包</comment>
<acronym>SIS</acronym>
<expanded-acronym>Symbian Installation File</expanded-acronym>
<generic-icon name="package-x-generic"/>
<magic priority="50">
- <match value="0x10201a7a" type="little32" offset="0"/>
+ <match type="little32" value="0x10201a7a" offset="0"/>
</magic>
<glob pattern="*.sisx"/>
</mime-type>
<mime-type type="application/vnd.tcpdump.pcap">
- <comment>Network Packet Capture</comment>
- <comment xml:lang="bg">Прихванати пакети по мрежата</comment>
+ <comment>network packet capture</comment>
+ <comment xml:lang="bg">Прихванати мрежови пакети</comment>
<comment xml:lang="ca">captura de paquets de xarxa</comment>
- <comment xml:lang="cs">Network Packet Capture</comment>
- <comment xml:lang="da">Netværkspakkeoptegnelse</comment>
- <comment xml:lang="de">Netzwerk-Paketmitschnitt</comment>
- <comment xml:lang="el">Σύλληψη πακέτων δικτύου</comment>
- <comment xml:lang="en_GB">Network Packet Capture</comment>
- <comment xml:lang="es">captura de paquete de red</comment>
- <comment xml:lang="eu">Sareko pakete kaptura</comment>
- <comment xml:lang="fi">Verkkopakettien kaappaus</comment>
+ <comment xml:lang="da">Netværkspakkeoptagelse</comment>
+ <comment xml:lang="de">Netzwerkpaketmitschnitt</comment>
+ <comment xml:lang="en-GB">network packet capture</comment>
+ <comment xml:lang="es">captura de paquetes de red</comment>
+ <comment xml:lang="eu">sareko pakete kaptura</comment>
+ <comment xml:lang="fi">verkkopakettien kaappaus</comment>
<comment xml:lang="fr">capture de paquet réseau</comment>
- <comment xml:lang="ga">Gabháltas Paicéid Líonra</comment>
- <comment xml:lang="gl">Captura de Network Packet</comment>
- <comment xml:lang="he">לכידה של מנות נתונים ברשת</comment>
<comment xml:lang="hr">Mrežno hvatanje paketa</comment>
- <comment xml:lang="hu">Hálózati csomagelfogás</comment>
- <comment xml:lang="ia">Captura de pacchettos de rete</comment>
- <comment xml:lang="id">Tangkapan Paket Jaringan</comment>
+ <comment xml:lang="hu">hálózaticsomag-rögzítés</comment>
+ <comment xml:lang="id">tangkapan paket jaringan</comment>
<comment xml:lang="it">Cattura pacchetti rete</comment>
- <comment xml:lang="ja">ネットワークパケットキャプチャー</comment>
- <comment xml:lang="ka">ქსელური პაკეტის ანაბეჭდი</comment>
<comment xml:lang="kk">ұсталған желілік пакеттер</comment>
<comment xml:lang="ko">네트워크 패킷 캡처</comment>
- <comment xml:lang="lv">Network Packet Capture</comment>
- <comment xml:lang="nl">Network Packet Capture</comment>
- <comment xml:lang="oc">captura de paquet ret</comment>
<comment xml:lang="pl">Przechwycenie pakietu sieciowego</comment>
- <comment xml:lang="pt">captura Network Packet</comment>
- <comment xml:lang="pt_BR">Pacote de captura de rede</comment>
- <comment xml:lang="ru">Захваченные сетевые пакеты</comment>
- <comment xml:lang="sk">Zachytené sieťové pakety</comment>
- <comment xml:lang="sl">Zajem omrežnih paketov</comment>
- <comment xml:lang="sr">Снимање мрежног пакета</comment>
- <comment xml:lang="sv">Fångst av nätverkspaket</comment>
- <comment xml:lang="tr">Ağ Paket Yakalaması</comment>
- <comment xml:lang="uk">перехоплені дані мережевих пакетів</comment>
- <comment xml:lang="zh_CN">网络包抓取</comment>
- <comment xml:lang="zh_TW">網路封包捕捉</comment>
- <magic priority="50">
- <match value="0xa1b2c3d4" type="host32" offset="0"/>
- <match value="0xd4c3b2a1" type="host32" offset="0"/>
+ <comment xml:lang="pt">captura dos pacotes de rede</comment>
+ <comment xml:lang="pt-BR">Captura de pacotes de rede</comment>
+ <comment xml:lang="ru">захваченные сетевые пакеты</comment>
+ <comment xml:lang="sv">nätverkspaketsspårning</comment>
+ <comment xml:lang="tr">ağ paket yakalaması</comment>
+ <comment xml:lang="uk">перехоплення мережевого пакета</comment>
+ <comment xml:lang="zh-CN">网络数据包抓取</comment>
+ <magic priority="50">
+ <match type="host32" value="0xa1b2c3d4" offset="0"/>
+ <match type="host32" value="0xd4c3b2a1" offset="0"/>
</magic>
<glob pattern="*.pcap"/>
<glob pattern="*.cap"/>
@@ -6765,10 +6938,11 @@
</mime-type>
<mime-type type="application/vnd.wordperfect">
<comment>WordPerfect document</comment>
+ <comment xml:lang="af">WordPerfect-dokument</comment>
<comment xml:lang="ar">مستند WordPerfect</comment>
<comment xml:lang="ast">Documentu de WordPerfect</comment>
<comment xml:lang="az">WordPerfect sənədi</comment>
- <comment xml:lang="be@latin">Dakument WordPerfect</comment>
+ <comment xml:lang="be-Latn">Dakument WordPerfect</comment>
<comment xml:lang="bg">Документ — WordPerfect</comment>
<comment xml:lang="ca">document WordPerfect</comment>
<comment xml:lang="cs">dokument WordPerfect</comment>
@@ -6776,13 +6950,14 @@
<comment xml:lang="da">WordPerfect-dokument</comment>
<comment xml:lang="de">WordPerfect-Dokument</comment>
<comment xml:lang="el">Έγγραφο WordPerfect</comment>
- <comment xml:lang="en_GB">WordPerfect document</comment>
+ <comment xml:lang="en-GB">WordPerfect document</comment>
<comment xml:lang="eo">WordPerfect-dokumento</comment>
<comment xml:lang="es">documento de WordPerfect</comment>
<comment xml:lang="eu">WordPerfect dokumentua</comment>
<comment xml:lang="fi">WordPerfect-asiakirja</comment>
<comment xml:lang="fo">WordPerfect skjal</comment>
<comment xml:lang="fr">document WordPerfect</comment>
+ <comment xml:lang="fur">document WordPerfect</comment>
<comment xml:lang="ga">cáipéis WordPerfect</comment>
<comment xml:lang="gl">documento de WordPerfect</comment>
<comment xml:lang="he">מסמך WordPerfect</comment>
@@ -6803,7 +6978,7 @@
<comment xml:lang="oc">document WordPerfect</comment>
<comment xml:lang="pl">Dokument WordPerfect</comment>
<comment xml:lang="pt">documento WordPerfect</comment>
- <comment xml:lang="pt_BR">Documento do WordPerfect</comment>
+ <comment xml:lang="pt-BR">Documento do WordPerfect</comment>
<comment xml:lang="ro">Document WordPerfect</comment>
<comment xml:lang="ru">Документ WordPerfect</comment>
<comment xml:lang="sk">Dokument WordPerfect</comment>
@@ -6814,14 +6989,14 @@
<comment xml:lang="tr">WordPerfect belgesi</comment>
<comment xml:lang="uk">документ WordPerfect</comment>
<comment xml:lang="vi">Tài liệu WordPerfect</comment>
- <comment xml:lang="zh_CN">WordPerfect 文档</comment>
- <comment xml:lang="zh_TW">WordPerfect 文件</comment>
+ <comment xml:lang="zh-CN">WordPerfect 文档</comment>
+ <comment xml:lang="zh-TW">WordPerfect 文件</comment>
<alias type="application/x-wordperfect"/>
<alias type="application/wordperfect"/>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="WPC" type="string" offset="1"/>
-
+ <match type="string" value="WPC" offset="1"/>
+ <!-- <match type="big32" value="0xff575053c405" offset="0"/> -->
</magic>
<glob pattern="*.wp"/>
<glob pattern="*.wp4"/>
@@ -6831,126 +7006,125 @@
<glob pattern="*.wpp"/>
</mime-type>
<mime-type type="application/vnd.youtube.yt">
- <comment>YouTube Media Archive</comment>
+ <comment>YouTube media archive</comment>
+ <comment xml:lang="bg">Медиен архив — YouTube</comment>
+ <comment xml:lang="ca">arxiu de mitjans de YouTube</comment>
+ <comment xml:lang="da">YouTube-mediearkiv</comment>
+ <comment xml:lang="de">YouTube-Medienarchiv</comment>
+ <comment xml:lang="en-GB">YouTube media archive</comment>
+ <comment xml:lang="es">archivador multimedia de YouTube</comment>
+ <comment xml:lang="eu">YouTube media fitxategia</comment>
+ <comment xml:lang="fi">YouTube-media-arkisto</comment>
+ <comment xml:lang="fr">archive média YouTube</comment>
+ <comment xml:lang="hr">YouTube medijska arhiva</comment>
+ <comment xml:lang="hu">YouTube médiaarchívum</comment>
+ <comment xml:lang="id">Arsip media YouTube</comment>
+ <comment xml:lang="it">Archivio multimediale YouTube</comment>
+ <comment xml:lang="kk">YouTube медиа архиві</comment>
+ <comment xml:lang="ko">유튜브 미디어 저장 파일</comment>
+ <comment xml:lang="pl">Archiwum multimediów YouTube</comment>
+ <comment xml:lang="pt">arquivo multimédia do YouTube</comment>
+ <comment xml:lang="pt-BR">Arquivo de mídia do Youtube</comment>
+ <comment xml:lang="ru">Медиа-архив YouTube</comment>
+ <comment xml:lang="sk">Archív médií YouTube</comment>
+ <comment xml:lang="sv">YouTube-mediaarkiv</comment>
+ <comment xml:lang="tr">YouTube ortam arşivi</comment>
+ <comment xml:lang="uk">мультимедійний архів YouTube</comment>
+ <comment xml:lang="zh-CN">YouTube 媒体存档</comment>
<generic-icon name="video-x-generic"/>
<glob pattern="*.yt"/>
<sub-class-of type="application/zip"/>
</mime-type>
<mime-type type="application/x-spss-por">
- <comment>SPSS Portable Data File</comment>
- <comment xml:lang="ar">ملف بيانات SPSS متنقلة</comment>
+ <comment>SPSS portable data file</comment>
<comment xml:lang="bg">Данни — SPSS, преносими</comment>
<comment xml:lang="ca">fitxer de dades portables SPSS</comment>
- <comment xml:lang="cs">soubor přenositelných dat SPSS</comment>
- <comment xml:lang="da">Portabel SPSS-datafil</comment>
+ <comment xml:lang="da">SPSS portable data-fil</comment>
<comment xml:lang="de">SPSS portable Datendatei</comment>
- <comment xml:lang="el">Φορητό αρχείο δεδομένων SPSS</comment>
- <comment xml:lang="en_GB">SPSS Portable Data File</comment>
- <comment xml:lang="es">archivo de datos portátil de SPSS</comment>
- <comment xml:lang="eu">SPSS datuen fitxategi eramangarria</comment>
- <comment xml:lang="fo">SPSS flytifør dátufíla</comment>
+ <comment xml:lang="en-GB">SPSS portable data file</comment>
+ <comment xml:lang="es">archivo de datos portátiles de SPSS</comment>
+ <comment xml:lang="eu">SPSS datu fitxategi eramangarria</comment>
+ <comment xml:lang="fi">Siirrettävä SPSS-tiedosto</comment>
<comment xml:lang="fr">fichier portable de données SPSS</comment>
- <comment xml:lang="ga">comhad iniompartha sonraí SPSS</comment>
- <comment xml:lang="gl">ficheiro de datos portábel SPSS</comment>
- <comment xml:lang="he">קובץ מידע נייד SPSS</comment>
<comment xml:lang="hr">SPSS prenosiva podatkovna datoteka</comment>
<comment xml:lang="hu">SPSS hordozható adatfájl</comment>
- <comment xml:lang="ia">File portabile de datos SPSS</comment>
- <comment xml:lang="id">Berkas Data Portabel SPSS</comment>
+ <comment xml:lang="id">Berkas data portabel SPSS</comment>
<comment xml:lang="it">File dati SPSS Portable</comment>
- <comment xml:lang="ja">SPSS ポータブルデータファイル</comment>
- <comment xml:lang="kk">SPSS тасымалы ақпарат файлы</comment>
- <comment xml:lang="ko">SPSS 이동식 데이터 파일</comment>
- <comment xml:lang="lt">SPSS perkeliamų duomenų failas</comment>
- <comment xml:lang="lv">SPSS pārvietojamu datu datne</comment>
- <comment xml:lang="nl">SPSS Portable Databestand</comment>
- <comment xml:lang="oc">fichièr portable de donadas SPSS</comment>
+ <comment xml:lang="kk">SPSS тасымалы деректер файлы</comment>
+ <comment xml:lang="ko">SPSS 휴대 데이터 파일</comment>
<comment xml:lang="pl">Plik przenośnych danych SPSS</comment>
<comment xml:lang="pt">ficheiro de dados portátil SPSS</comment>
- <comment xml:lang="pt_BR">Arquivo de Dados Portáteis SPSS</comment>
- <comment xml:lang="ro">Fișier portabil de date SPSS</comment>
+ <comment xml:lang="pt-BR">Arquivo de dados portáteis SPSS</comment>
<comment xml:lang="ru">Файл переносимых данных SPSS</comment>
- <comment xml:lang="sk">Súbor prenosných dát SPSS</comment>
- <comment xml:lang="sl">Prenosna podatkovna datoteka SPSS</comment>
- <comment xml:lang="sr">СПСС датотека преносних података</comment>
- <comment xml:lang="sv">Portabel SPSS-datafil</comment>
- <comment xml:lang="tr">SPSS Taşınabilir Veri Dosyası</comment>
- <comment xml:lang="uk">файл даних SPSS Portable</comment>
- <comment xml:lang="zh_CN">SPSS 便携式数据文件</comment>
- <comment xml:lang="zh_TW">SPSS 可攜式資料檔</comment>
+ <comment xml:lang="sk">Súbor prenosných údajov SPSS</comment>
+ <comment xml:lang="sv">SPSS portabel datafil</comment>
+ <comment xml:lang="tr">SPSS taşınabilir veri dosyası</comment>
+ <comment xml:lang="uk">портативний файл даних SPSS</comment>
+ <comment xml:lang="zh-CN">SPSS 便携式数据文件</comment>
+ <comment xml:lang="zh-TW">SPSS 可攜資料檔</comment>
+ <acronym>SPSS</acronym>
+ <expanded-acronym>Statistical Package for the Social Sciences</expanded-acronym>
<magic priority="50">
- <match value="ASCII SPSS PORT FILE" type="string" offset="40"/>
+ <match type="string" offset="40" value="ASCII SPSS PORT FILE"/>
</magic>
<glob pattern="*.por"/>
</mime-type>
<mime-type type="application/x-spss-sav">
- <comment>SPSS Data File</comment>
- <comment xml:lang="ar">ملف بيانات SPSS</comment>
+ <comment>SPSS data file</comment>
<comment xml:lang="bg">Данни — SPSS</comment>
<comment xml:lang="ca">fitxer de dades SPSS</comment>
- <comment xml:lang="cs">datový soubor SPSS</comment>
- <comment xml:lang="da">SPSS-datafil</comment>
+ <comment xml:lang="da">SPSS data-fil</comment>
<comment xml:lang="de">SPSS-Datendatei</comment>
- <comment xml:lang="el">Αρχείο δεδομένων SPSS</comment>
- <comment xml:lang="en_GB">SPSS Data File</comment>
- <comment xml:lang="es">archivo de datos SPSS</comment>
- <comment xml:lang="eu">SPSS datuen fitxategia</comment>
+ <comment xml:lang="en-GB">SPSS data file</comment>
+ <comment xml:lang="es">archivo de datos de SPSS</comment>
+ <comment xml:lang="eu">SPSS datu fitxategia</comment>
<comment xml:lang="fi">SPSS-datatiedosto</comment>
- <comment xml:lang="fo">SPSS dátufíla</comment>
<comment xml:lang="fr">fichier de données SPSS</comment>
- <comment xml:lang="ga">comhad sonraí SPSS</comment>
- <comment xml:lang="gl">ficheiro de datos SPSS</comment>
- <comment xml:lang="he">קובץ מידע SPSS</comment>
<comment xml:lang="hr">SPSS podatkovna datoteka</comment>
<comment xml:lang="hu">SPSS adatfájl</comment>
- <comment xml:lang="ia">File de datos SPSS</comment>
- <comment xml:lang="id">Berkas Data SPSS</comment>
+ <comment xml:lang="id">Berkas data SPSS</comment>
<comment xml:lang="it">File dati SPSS</comment>
- <comment xml:lang="ja">SPSS データファイル</comment>
- <comment xml:lang="kk">SPSS ақпарат файлы</comment>
+ <comment xml:lang="kk">SPSS деректер файлы</comment>
<comment xml:lang="ko">SPSS 데이터 파일</comment>
- <comment xml:lang="lt">SPSS duomenų failas</comment>
- <comment xml:lang="lv">SPSS datu datne</comment>
- <comment xml:lang="nl">SPSS Databstand</comment>
- <comment xml:lang="oc">fichièr de donadas SPSS</comment>
<comment xml:lang="pl">Plik danych SPSS</comment>
<comment xml:lang="pt">ficheiro de dados SPSS</comment>
- <comment xml:lang="pt_BR">Arquivo de dados SPSS</comment>
- <comment xml:lang="ro">Fișier date SPSS</comment>
+ <comment xml:lang="pt-BR">Arquivo de dados SPSS</comment>
<comment xml:lang="ru">Файл данных SPSS</comment>
- <comment xml:lang="sk">Dátový súbor SPSS</comment>
- <comment xml:lang="sl">Podatkovna datoteka SPSS</comment>
- <comment xml:lang="sr">СПСС датотека података</comment>
+ <comment xml:lang="sk">Súbor údajov SPSS</comment>
<comment xml:lang="sv">SPSS-datafil</comment>
- <comment xml:lang="tr">SPSS Veri Dosyası</comment>
+ <comment xml:lang="tr">SPSS veri dosyası</comment>
<comment xml:lang="uk">файл даних SPSS</comment>
- <comment xml:lang="zh_CN">SPSS 数据文件</comment>
- <comment xml:lang="zh_TW">SPSS 資料檔</comment>
+ <comment xml:lang="zh-CN">SPSS 数据文件</comment>
+ <comment xml:lang="zh-TW">SPSS 資料檔</comment>
+ <acronym>SPSS</acronym>
+ <expanded-acronym>Statistical Package for the Social Sciences</expanded-acronym>
<alias type="application/x-spss-savefile"/>
<magic priority="50">
- <match value="$FL2" type="string" offset="0"/>
- <match value="$FL3" type="string" offset="0"/>
+ <match type="string" offset="0" value="$FL2"/>
+ <match type="string" offset="0" value="$FL3"/>
</magic>
<glob pattern="*.sav"/>
<glob pattern="*.zsav"/>
</mime-type>
<mime-type type="application/x-xbel">
<comment>XBEL bookmarks</comment>
+ <comment xml:lang="af">XBEL-boekmerke</comment>
<comment xml:lang="ar">علامات XBEL</comment>
- <comment xml:lang="be@latin">Zakładki XBEL</comment>
+ <comment xml:lang="be-Latn">Zakładki XBEL</comment>
<comment xml:lang="bg">Отметки — XBEL</comment>
<comment xml:lang="ca">llista d'adreces d'interès XBEL</comment>
<comment xml:lang="cs">záložky XBEL</comment>
<comment xml:lang="da">XBEL-bogmærker</comment>
<comment xml:lang="de">XBEL-Lesezeichen</comment>
<comment xml:lang="el">Σελιδοδείκτες XBEL</comment>
- <comment xml:lang="en_GB">XBEL bookmarks</comment>
+ <comment xml:lang="en-GB">XBEL bookmarks</comment>
<comment xml:lang="eo">XBEL-legosignoj</comment>
<comment xml:lang="es">marcadores XBEL</comment>
<comment xml:lang="eu">XBEL laster-markak</comment>
<comment xml:lang="fi">XBEL-kirjanmerkit</comment>
<comment xml:lang="fo">XBEL bókamerki</comment>
<comment xml:lang="fr">marque-pages XBEL</comment>
+ <comment xml:lang="fur">segnelibris XBEL</comment>
<comment xml:lang="ga">leabharmharcanna XBEL</comment>
<comment xml:lang="gl">Marcadores XBEL</comment>
<comment xml:lang="he">סימניית XBEL</comment>
@@ -6971,7 +7145,7 @@
<comment xml:lang="oc">marcapaginas XBEL</comment>
<comment xml:lang="pl">Zakładki XBEL</comment>
<comment xml:lang="pt">marcadores XBEL</comment>
- <comment xml:lang="pt_BR">Marcadores do XBEL</comment>
+ <comment xml:lang="pt-BR">Marcadores do XBEL</comment>
<comment xml:lang="ro">Semne de carte XBEL</comment>
<comment xml:lang="ru">Закладки XBEL</comment>
<comment xml:lang="sk">Záložky XBEL</comment>
@@ -6982,35 +7156,37 @@
<comment xml:lang="tr">XBEL yer imleri</comment>
<comment xml:lang="uk">закладки XBEL</comment>
<comment xml:lang="vi">Liên kết đã lưu XBEL</comment>
- <comment xml:lang="zh_CN">XBEL 书签</comment>
- <comment xml:lang="zh_TW">XBEL 格式書籤</comment>
+ <comment xml:lang="zh-CN">XBEL 书签</comment>
+ <comment xml:lang="zh-TW">XBEL 格式書籤</comment>
<acronym>XBEL</acronym>
<expanded-acronym>XML Bookmark Exchange Language</expanded-acronym>
<sub-class-of type="application/xml"/>
<generic-icon name="text-html"/>
<magic priority="50">
- <match value="&lt;!DOCTYPE\ xbel" type="string" offset="0:256"/>
+ <match type="string" value="&lt;!DOCTYPE\ xbel" offset="0:256"/>
</magic>
<glob pattern="*.xbel"/>
</mime-type>
<mime-type type="application/x-7z-compressed">
<comment>7-zip archive</comment>
+ <comment xml:lang="af">7-zip-argief</comment>
<comment xml:lang="ar">أرشيف 7-zip</comment>
<comment xml:lang="ast">Archivu 7-zip</comment>
- <comment xml:lang="be@latin">Archiŭ 7-zip</comment>
+ <comment xml:lang="be-Latn">Archiŭ 7-zip</comment>
<comment xml:lang="bg">Архив — 7-zip</comment>
<comment xml:lang="ca">arxiu 7-zip</comment>
<comment xml:lang="cs">archiv 7-zip</comment>
<comment xml:lang="da">7-zip-arkiv</comment>
<comment xml:lang="de">7zip-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο 7-zip</comment>
- <comment xml:lang="en_GB">7-zip archive</comment>
+ <comment xml:lang="en-GB">7-zip archive</comment>
<comment xml:lang="eo">7z-arkivo</comment>
<comment xml:lang="es">archivador 7-zip</comment>
<comment xml:lang="eu">7-zip artxiboa</comment>
<comment xml:lang="fi">7-zip-arkisto</comment>
<comment xml:lang="fo">7-zip skjalasavn</comment>
<comment xml:lang="fr">archive 7-zip</comment>
+ <comment xml:lang="fur">archivi 7-zip</comment>
<comment xml:lang="ga">cartlann 7-zip</comment>
<comment xml:lang="gl">arquivo 7-zip</comment>
<comment xml:lang="he">ארכיון 7-zip</comment>
@@ -7031,7 +7207,7 @@
<comment xml:lang="oc">archiu 7-zip</comment>
<comment xml:lang="pl">Archiwum 7-zip</comment>
<comment xml:lang="pt">arquivo 7-zip</comment>
- <comment xml:lang="pt_BR">Pacote 7-Zip</comment>
+ <comment xml:lang="pt-BR">Pacote 7-Zip</comment>
<comment xml:lang="ro">Arhivă 7-zip</comment>
<comment xml:lang="ru">Архив 7-zip</comment>
<comment xml:lang="sk">Archív 7-zip</comment>
@@ -7042,32 +7218,34 @@
<comment xml:lang="tr">7-Zip arşivi</comment>
<comment xml:lang="uk">архів 7-zip</comment>
<comment xml:lang="vi">Kho nén 7-zip</comment>
- <comment xml:lang="zh_CN">7-zip 归档文件</comment>
- <comment xml:lang="zh_TW">7-zip 封存檔</comment>
+ <comment xml:lang="zh-CN">7-zip 归档文件</comment>
+ <comment xml:lang="zh-TW">7-zip 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="7z\274\257\047\034" type="string" offset="0"/>
+ <match type="string" value="7z\274\257\047\034" offset="0"/>
</magic>
<glob pattern="*.7z"/>
</mime-type>
<mime-type type="application/x-abiword">
<comment>AbiWord document</comment>
+ <comment xml:lang="af">AbiWord-dokument</comment>
<comment xml:lang="ar">مستند آبي وورد</comment>
<comment xml:lang="ast">Documentu d'AbiWord</comment>
- <comment xml:lang="be@latin">Dakument AbiWord</comment>
+ <comment xml:lang="be-Latn">Dakument AbiWord</comment>
<comment xml:lang="bg">Документ — AbiWord</comment>
<comment xml:lang="ca">document AbiWord</comment>
<comment xml:lang="cs">dokument AbiWord</comment>
<comment xml:lang="da">AbiWord-dokument</comment>
<comment xml:lang="de">AbiWord-Dokument</comment>
<comment xml:lang="el">Έγγραφο AbiWord</comment>
- <comment xml:lang="en_GB">AbiWord document</comment>
+ <comment xml:lang="en-GB">AbiWord document</comment>
<comment xml:lang="eo">AbiWord-dokumento</comment>
<comment xml:lang="es">documento de Abiword</comment>
<comment xml:lang="eu">AbiWord dokumentua</comment>
<comment xml:lang="fi">AbiWord-asiakirja</comment>
<comment xml:lang="fo">AbiWord skjal</comment>
<comment xml:lang="fr">document AbiWord</comment>
+ <comment xml:lang="fur">document AbiWord</comment>
<comment xml:lang="ga">cáipéis AbiWord</comment>
<comment xml:lang="gl">documento de AbiWord</comment>
<comment xml:lang="he">מסמך AbiWord</comment>
@@ -7089,7 +7267,7 @@
<comment xml:lang="oc">document AbiWord</comment>
<comment xml:lang="pl">Dokument AbiWord</comment>
<comment xml:lang="pt">documento AbiWord</comment>
- <comment xml:lang="pt_BR">Documento do AbiWord</comment>
+ <comment xml:lang="pt-BR">Documento do AbiWord</comment>
<comment xml:lang="ro">Document AbiWord</comment>
<comment xml:lang="ru">Документ AbiWord</comment>
<comment xml:lang="sk">Dokument AbiWord</comment>
@@ -7100,13 +7278,13 @@
<comment xml:lang="tr">AbiWord belgesi</comment>
<comment xml:lang="uk">документ AbiWord</comment>
<comment xml:lang="vi">Tài liệu AbiWord</comment>
- <comment xml:lang="zh_CN">AbiWord 文档</comment>
- <comment xml:lang="zh_TW">AbiWord 文件</comment>
+ <comment xml:lang="zh-CN">AbiWord 文档</comment>
+ <comment xml:lang="zh-TW">AbiWord 文件</comment>
<sub-class-of type="application/xml"/>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="&lt;abiword" type="string" offset="0:256"/>
- <match value="&lt;!DOCTYPE abiword" type="string" offset="0:256"/>
+ <match type="string" value="&lt;abiword" offset="0:256"/>
+ <match type="string" value="&lt;!DOCTYPE abiword" offset="0:256"/>
</magic>
<glob pattern="*.abw"/>
<glob pattern="*.abw.CRASHED"/>
@@ -7117,18 +7295,19 @@
<mime-type type="application/x-cue">
<comment>CD image cuesheet</comment>
<comment xml:lang="ar">صفيحة صورة الـCD جديلة</comment>
- <comment xml:lang="be@latin">Infarmacyjny arkuš vyjavy CD</comment>
- <comment xml:lang="bg">Описание на изображение на CD</comment>
+ <comment xml:lang="be-Latn">Infarmacyjny arkuš vyjavy CD</comment>
+ <comment xml:lang="bg">Съдържание на CD</comment>
<comment xml:lang="ca">«cuesheet» d'imatge de CD</comment>
<comment xml:lang="cs">rozvržení stop obrazu CD</comment>
<comment xml:lang="da">Cd-aftrykscuesheet</comment>
<comment xml:lang="de">CD-Abbild-Cuesheet</comment>
<comment xml:lang="el">Φύλλο cue εικόνας CD</comment>
- <comment xml:lang="en_GB">CD image cuesheet</comment>
+ <comment xml:lang="en-GB">CD image cuesheet</comment>
<comment xml:lang="es">hoja CUE de imagen de CD</comment>
<comment xml:lang="eu">CD irudiaren CUE orria</comment>
<comment xml:lang="fi">CD-vedos cuesheet</comment>
<comment xml:lang="fr">index de pistes de CD</comment>
+ <comment xml:lang="fur">sfuei-brivade CUE de imagjin CD</comment>
<comment xml:lang="ga">bileog chiúála íomhá CD</comment>
<comment xml:lang="gl">cue sheet dunha imaxe de CD</comment>
<comment xml:lang="he">גליון נתונים לתמונת דיסק</comment>
@@ -7147,8 +7326,8 @@
<comment xml:lang="nn">CD-bilete-indeksfil</comment>
<comment xml:lang="oc">indèx de pistas de CD</comment>
<comment xml:lang="pl">Obraz cuesheet płyty CD</comment>
- <comment xml:lang="pt">índice de CD de imagem</comment>
- <comment xml:lang="pt_BR">Índice de Imagem de CD</comment>
+ <comment xml:lang="pt">índice de imagem do CD</comment>
+ <comment xml:lang="pt-BR">Índice de Imagem de CD</comment>
<comment xml:lang="ro">Imagine CD cuesheet</comment>
<comment xml:lang="ru">Таблица содержания образа CD</comment>
<comment xml:lang="sk">Rozvrhnutie stôp obrazu CD</comment>
@@ -7156,21 +7335,22 @@
<comment xml:lang="sq">Cuesheet imazhi CD</comment>
<comment xml:lang="sr">Кју лист ЦД одраза</comment>
<comment xml:lang="sv">Indexblad för cd-avbild</comment>
- <comment xml:lang="tr">CD görüntüsü belgesi</comment>
+ <comment xml:lang="tr">CD görüntüsü çizelgesi</comment>
<comment xml:lang="uk">таблиця CUE образу CD</comment>
<comment xml:lang="vi">Tờ tín hiệu báo ảnh CD</comment>
- <comment xml:lang="zh_CN">CD 映像标记文件</comment>
- <comment xml:lang="zh_TW">CD 映像指示表</comment>
+ <comment xml:lang="zh-CN">CD 映像标记文件</comment>
+ <comment xml:lang="zh-TW">CD 映像指示表</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<glob pattern="*.cue"/>
</mime-type>
<mime-type type="application/x-amipro">
<comment>Lotus AmiPro document</comment>
+ <comment xml:lang="af">Lotus AmiPro-dokument</comment>
<comment xml:lang="ar">مستند Lotus AmiPro</comment>
<comment xml:lang="ast">Documentu de Lotus AmiPro</comment>
<comment xml:lang="az">Lotus AmiPro sənədi</comment>
- <comment xml:lang="be@latin">Dakument Lotus AmiPro</comment>
+ <comment xml:lang="be-Latn">Dakument Lotus AmiPro</comment>
<comment xml:lang="bg">Документ — Lotus AmiPro</comment>
<comment xml:lang="ca">document de Lotus AmiPro</comment>
<comment xml:lang="cs">dokument Lotus AmiPro</comment>
@@ -7178,13 +7358,14 @@
<comment xml:lang="da">Lotus AmiPro-dokument</comment>
<comment xml:lang="de">Lotus-AmiPro-Dokument</comment>
<comment xml:lang="el">Έγγραφο Lotus AmiPro</comment>
- <comment xml:lang="en_GB">Lotus AmiPro document</comment>
+ <comment xml:lang="en-GB">Lotus AmiPro document</comment>
<comment xml:lang="eo">dokumento de Lotus AmiPro</comment>
<comment xml:lang="es">documento de Lotus AmiPro</comment>
<comment xml:lang="eu">Lotus AmiPro dokumentua</comment>
<comment xml:lang="fi">Lotus AmiPro -asiakirja</comment>
<comment xml:lang="fo">Lotus AmiPro skjal</comment>
<comment xml:lang="fr">document Lotus AmiPro</comment>
+ <comment xml:lang="fur">document Lotus AmiPro</comment>
<comment xml:lang="ga">cáipéis Lotus AmiPro</comment>
<comment xml:lang="gl">documento de Lotus AmiPro</comment>
<comment xml:lang="he">מסמך של Lotus AmiPro</comment>
@@ -7205,7 +7386,7 @@
<comment xml:lang="oc">document Lotus AmiPro</comment>
<comment xml:lang="pl">Dokument Lotus AmiPro</comment>
<comment xml:lang="pt">documento Lotus AmiPro</comment>
- <comment xml:lang="pt_BR">Documento do Lotus AmiPro</comment>
+ <comment xml:lang="pt-BR">Documento do Lotus AmiPro</comment>
<comment xml:lang="ro">Document Lotus AmiPro</comment>
<comment xml:lang="ru">Документ Lotus AmiPro</comment>
<comment xml:lang="sk">Dokument Lotus AmiPro</comment>
@@ -7216,13 +7397,14 @@
<comment xml:lang="tr">Lotus AmiPro belgesi</comment>
<comment xml:lang="uk">документ Lotus AmiPro</comment>
<comment xml:lang="vi">Tài liệu Lotus AmiPro</comment>
- <comment xml:lang="zh_CN">Lotus AmiPro 文档</comment>
- <comment xml:lang="zh_TW">Lotus AmiPro 文件</comment>
+ <comment xml:lang="zh-CN">Lotus AmiPro 文档</comment>
+ <comment xml:lang="zh-TW">Lotus AmiPro 文件</comment>
<generic-icon name="x-office-document"/>
<glob pattern="*.sam"/>
</mime-type>
<mime-type type="application/x-aportisdoc">
<comment>AportisDoc document</comment>
+ <comment xml:lang="af">AportisDoc-dokument</comment>
<comment xml:lang="ar">مستند AportisDoc</comment>
<comment xml:lang="ast">Documentu d'AportisDoc</comment>
<comment xml:lang="bg">Документ — AportisDoc</comment>
@@ -7231,13 +7413,14 @@
<comment xml:lang="da">AportisDoc-dokument</comment>
<comment xml:lang="de">AportisDoc-Dokument</comment>
<comment xml:lang="el">Έγγραφο AportisDoc</comment>
- <comment xml:lang="en_GB">AportisDoc document</comment>
+ <comment xml:lang="en-GB">AportisDoc document</comment>
<comment xml:lang="eo">AportisDoc-dokumento</comment>
<comment xml:lang="es">documento de AportisDoc</comment>
<comment xml:lang="eu">AportisDoc dokumentua</comment>
<comment xml:lang="fi">AportisDoc-asiakirja</comment>
<comment xml:lang="fo">AportisDoc skjal</comment>
<comment xml:lang="fr">document AportisDoc</comment>
+ <comment xml:lang="fur">document AportisDoc</comment>
<comment xml:lang="ga">cáipéis AportisDoc</comment>
<comment xml:lang="gl">documento de AportiDoc</comment>
<comment xml:lang="he">מסמך AportisDoc</comment>
@@ -7256,7 +7439,7 @@
<comment xml:lang="oc">document AportisDoc</comment>
<comment xml:lang="pl">Dokument AportisDoc</comment>
<comment xml:lang="pt">documento AportisDoc</comment>
- <comment xml:lang="pt_BR">Documento do AportisDoc</comment>
+ <comment xml:lang="pt-BR">Documento do AportisDoc</comment>
<comment xml:lang="ro">Document AportisDoc</comment>
<comment xml:lang="ru">Документ AportisDoc</comment>
<comment xml:lang="sk">Dokument AportisDoc</comment>
@@ -7266,34 +7449,36 @@
<comment xml:lang="tr">AportisDoc belgesi</comment>
<comment xml:lang="uk">документ AportisDoc</comment>
<comment xml:lang="vi">Tài liệu AportisDoc</comment>
- <comment xml:lang="zh_CN">AportisDoc 文档</comment>
- <comment xml:lang="zh_TW">AportisDoc 文件</comment>
+ <comment xml:lang="zh-CN">AportisDoc 文档</comment>
+ <comment xml:lang="zh-TW">AportisDoc 文件</comment>
<sub-class-of type="application/vnd.palm"/>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="TEXtREAd" type="string" offset="60"/>
- <match value="TEXtTlDc" type="string" offset="60"/>
+ <match type="string" value="TEXtREAd" offset="60"/>
+ <match type="string" value="TEXtTlDc" offset="60"/>
</magic>
<glob pattern="*.pdb"/>
<glob pattern="*.pdc"/>
</mime-type>
<mime-type type="application/x-applix-spreadsheet">
<comment>Applix Spreadsheets spreadsheet</comment>
+ <comment xml:lang="af">Applix Spreadsheets-sigblad</comment>
<comment xml:lang="ar">جداول بيانات Applix</comment>
- <comment xml:lang="be@latin">Raźlikovy arkuš Applix Spreadsheets</comment>
+ <comment xml:lang="be-Latn">Raźlikovy arkuš Applix Spreadsheets</comment>
<comment xml:lang="bg">Таблица — Applix Spreadsheets</comment>
<comment xml:lang="ca">full de càlcul d'Applix Spreadsheets</comment>
<comment xml:lang="cs">sešit Applix Spreadsheets</comment>
<comment xml:lang="da">Applix Spreadsheets-regneark</comment>
<comment xml:lang="de">Applix-Spreadsheets-Tabelle</comment>
<comment xml:lang="el">Λογιστικό φύλλο Applix Spreadsheets</comment>
- <comment xml:lang="en_GB">Applix Spreadsheets spreadsheet</comment>
+ <comment xml:lang="en-GB">Applix Spreadsheets spreadsheet</comment>
<comment xml:lang="eo">sterntabelo de Applix Spreadsheets</comment>
<comment xml:lang="es">hoja de cálculo de Applix Spreadsheets</comment>
<comment xml:lang="eu">Applix Spreadsheets kalkulu-orria</comment>
<comment xml:lang="fi">Applix Spreadsheets -taulukko</comment>
<comment xml:lang="fo">Applix Spreadsheets rokniark</comment>
<comment xml:lang="fr">feuille de calcul Applix</comment>
+ <comment xml:lang="fur">sfuei di calcul Applix Spreadsheets</comment>
<comment xml:lang="ga">scarbhileog Applix Spreadsheets</comment>
<comment xml:lang="gl">folla de cálculo de Applix</comment>
<comment xml:lang="he">גליון נתונים של Applix Spreadsheets</comment>
@@ -7315,7 +7500,7 @@
<comment xml:lang="oc">fuèlh de calcul Applix</comment>
<comment xml:lang="pl">Arkusz Applix Spreadsheets</comment>
<comment xml:lang="pt">folha de cálculo Applix Spreadsheets</comment>
- <comment xml:lang="pt_BR">Planilha do Applix Spreadsheets</comment>
+ <comment xml:lang="pt-BR">Planilha do Applix Spreadsheets</comment>
<comment xml:lang="ro">Foaie de calcul Applix</comment>
<comment xml:lang="ru">Электронная таблица Applix Spreadsheets</comment>
<comment xml:lang="sk">Zošit Applix Spreadsheets</comment>
@@ -7323,26 +7508,27 @@
<comment xml:lang="sq">Fletë llogaritjesh Applix Spreadsheets</comment>
<comment xml:lang="sr">документ Апликсове Табеле</comment>
<comment xml:lang="sv">Applix Spreadsheets-kalkylblad</comment>
- <comment xml:lang="tr">Applix Spreadsheets çalışma sayfası</comment>
+ <comment xml:lang="tr">Applix Spreadsheets hesap çizelgesi</comment>
<comment xml:lang="uk">ел. таблиця Applix Spreadsheets</comment>
<comment xml:lang="vi">Bảng tính Applix Spreadsheets</comment>
- <comment xml:lang="zh_CN">Applix Spreadsheets 电子表格</comment>
- <comment xml:lang="zh_TW">Applix Spreadsheets 試算表</comment>
+ <comment xml:lang="zh-CN">Applix Spreadsheets 电子表格</comment>
+ <comment xml:lang="zh-TW">Applix Spreadsheets 試算表</comment>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
- <match value="*BEGIN SPREADSHEETS" type="string" offset="0"/>
- <match value="*BEGIN" type="string" offset="0">
- <match value="SPREADSHEETS" type="string" offset="7"/>
+ <match type="string" value="*BEGIN SPREADSHEETS" offset="0"/>
+ <match type="string" value="*BEGIN" offset="0">
+ <match type="string" value="SPREADSHEETS" offset="7"/>
</match>
</magic>
<glob pattern="*.as"/>
</mime-type>
<mime-type type="application/x-applix-word">
<comment>Applix Words document</comment>
+ <comment xml:lang="af">Applix Words-dokument</comment>
<comment xml:lang="ar">مستند كلمات Applix</comment>
<comment xml:lang="ast">Documentu d'Applix Words</comment>
<comment xml:lang="az">Applix Words sənədi</comment>
- <comment xml:lang="be@latin">Dakument Applix Words</comment>
+ <comment xml:lang="be-Latn">Dakument Applix Words</comment>
<comment xml:lang="bg">Документ — Applix Words</comment>
<comment xml:lang="ca">document d'Applix Words</comment>
<comment xml:lang="cs">dokument Applix Words</comment>
@@ -7350,13 +7536,14 @@
<comment xml:lang="da">Applix Words-dokument</comment>
<comment xml:lang="de">Applix-Words-Dokument</comment>
<comment xml:lang="el">Έγγραφο Applix Words</comment>
- <comment xml:lang="en_GB">Applix Words document</comment>
+ <comment xml:lang="en-GB">Applix Words document</comment>
<comment xml:lang="eo">dokumento de Applix Words</comment>
<comment xml:lang="es">documento de Applix Words</comment>
<comment xml:lang="eu">Applix Words dokumentua</comment>
<comment xml:lang="fi">Applix Words -asiakirja</comment>
<comment xml:lang="fo">Applix Words skjal</comment>
<comment xml:lang="fr">document Applix Words</comment>
+ <comment xml:lang="fur">document Applix Words</comment>
<comment xml:lang="ga">cáipéis Applix Words</comment>
<comment xml:lang="gl">documento de Applix Words</comment>
<comment xml:lang="he">מסמך של Applix Words</comment>
@@ -7378,7 +7565,7 @@
<comment xml:lang="oc">document Applix Words</comment>
<comment xml:lang="pl">Dokument Applix Words</comment>
<comment xml:lang="pt">documento Applix Words</comment>
- <comment xml:lang="pt_BR">Documento do Applix Words</comment>
+ <comment xml:lang="pt-BR">Documento do Applix Words</comment>
<comment xml:lang="ro">Document Applix Words</comment>
<comment xml:lang="ru">Документ Applix Words</comment>
<comment xml:lang="sk">Dokument Applix Words</comment>
@@ -7389,33 +7576,35 @@
<comment xml:lang="tr">Applix Words belgesi</comment>
<comment xml:lang="uk">документ Applix Words</comment>
<comment xml:lang="vi">Tài liệu Applix Words</comment>
- <comment xml:lang="zh_CN">Applix Words 文档</comment>
- <comment xml:lang="zh_TW">Applix Words 文件</comment>
+ <comment xml:lang="zh-CN">Applix Words 文档</comment>
+ <comment xml:lang="zh-TW">Applix Words 文件</comment>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="*BEGIN" type="string" offset="0">
- <match value="WORDS" type="string" offset="7"/>
+ <match type="string" value="*BEGIN" offset="0">
+ <match type="string" value="WORDS" offset="7"/>
</match>
</magic>
<glob pattern="*.aw"/>
</mime-type>
<mime-type type="application/x-arc">
<comment>ARC archive</comment>
+ <comment xml:lang="af">ARC-argief</comment>
<comment xml:lang="ar">أرشيف ARC</comment>
- <comment xml:lang="be@latin">Archiŭ ARC</comment>
+ <comment xml:lang="be-Latn">Archiŭ ARC</comment>
<comment xml:lang="bg">Архив — ARC</comment>
<comment xml:lang="ca">arxiu ARC</comment>
<comment xml:lang="cs">archiv ARC</comment>
<comment xml:lang="da">ARC-arkiv</comment>
<comment xml:lang="de">ARC-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο ARC</comment>
- <comment xml:lang="en_GB">ARC archive</comment>
+ <comment xml:lang="en-GB">ARC archive</comment>
<comment xml:lang="eo">ARC-arkivo</comment>
<comment xml:lang="es">archivador ARC</comment>
<comment xml:lang="eu">ARC artxiboa</comment>
<comment xml:lang="fi">ARC-arkisto</comment>
<comment xml:lang="fo">ARC skjalasavn</comment>
<comment xml:lang="fr">archive ARC</comment>
+ <comment xml:lang="fur">archivi ARC</comment>
<comment xml:lang="ga">cartlann ARC</comment>
<comment xml:lang="gl">arquivo ARC</comment>
<comment xml:lang="he">ארכיון ARC</comment>
@@ -7436,7 +7625,7 @@
<comment xml:lang="oc">archiu ARC</comment>
<comment xml:lang="pl">Archiwum ARC</comment>
<comment xml:lang="pt">arquivo ARC</comment>
- <comment xml:lang="pt_BR">Pacote ARC</comment>
+ <comment xml:lang="pt-BR">Pacote ARC</comment>
<comment xml:lang="ro">Arhivă ARC</comment>
<comment xml:lang="ru">Архив ARC</comment>
<comment xml:lang="sk">Archív ARC</comment>
@@ -7447,35 +7636,37 @@
<comment xml:lang="tr">ARC arşivi</comment>
<comment xml:lang="uk">архів ARC</comment>
<comment xml:lang="vi">Kho nén ARC</comment>
- <comment xml:lang="zh_CN">ARC 归档文件</comment>
- <comment xml:lang="zh_TW">ARC 封存檔</comment>
+ <comment xml:lang="zh-CN">ARC 归档文件</comment>
+ <comment xml:lang="zh-TW">ARC 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="0x0000081a" type="little32" offset="0" mask="0x8080ffff"/>
- <match value="0x0000091a" type="little32" offset="0" mask="0x8080ffff"/>
- <match value="0x0000021a" type="little32" offset="0" mask="0x8080ffff"/>
- <match value="0x0000031a" type="little32" offset="0" mask="0x8080ffff"/>
- <match value="0x0000041a" type="little32" offset="0" mask="0x8080ffff"/>
- <match value="0x0000061a" type="little32" offset="0" mask="0x8080ffff"/>
+ <match type="little32" mask="0x8080ffff" value="0x0000081a" offset="0"/>
+ <match type="little32" mask="0x8080ffff" value="0x0000091a" offset="0"/>
+ <match type="little32" mask="0x8080ffff" value="0x0000021a" offset="0"/>
+ <match type="little32" mask="0x8080ffff" value="0x0000031a" offset="0"/>
+ <match type="little32" mask="0x8080ffff" value="0x0000041a" offset="0"/>
+ <match type="little32" mask="0x8080ffff" value="0x0000061a" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-archive">
<comment>AR archive</comment>
+ <comment xml:lang="af">AR-argief</comment>
<comment xml:lang="ar">أرشيف AR</comment>
- <comment xml:lang="be@latin">Archiŭ AR</comment>
+ <comment xml:lang="be-Latn">Archiŭ AR</comment>
<comment xml:lang="bg">Архив — AR</comment>
<comment xml:lang="ca">arxiu AR</comment>
<comment xml:lang="cs">archiv AR</comment>
<comment xml:lang="da">AR-arkiv</comment>
<comment xml:lang="de">AR-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο AR</comment>
- <comment xml:lang="en_GB">AR archive</comment>
+ <comment xml:lang="en-GB">AR archive</comment>
<comment xml:lang="eo">AR-arkivo</comment>
<comment xml:lang="es">archivador AR</comment>
<comment xml:lang="eu">AR artxiboa</comment>
<comment xml:lang="fi">AR-arkisto</comment>
<comment xml:lang="fo">AR skjalasavn</comment>
<comment xml:lang="fr">archive AR</comment>
+ <comment xml:lang="fur">archivi AR</comment>
<comment xml:lang="ga">cartlann AR</comment>
<comment xml:lang="gl">arquivo AR</comment>
<comment xml:lang="he">ארכיון AR</comment>
@@ -7497,7 +7688,7 @@
<comment xml:lang="oc">archiu AR</comment>
<comment xml:lang="pl">Archiwum AR</comment>
<comment xml:lang="pt">arquivo AR</comment>
- <comment xml:lang="pt_BR">Pacote AR</comment>
+ <comment xml:lang="pt-BR">Pacote AR</comment>
<comment xml:lang="ro">Arhivă AR</comment>
<comment xml:lang="ru">Архив AR</comment>
<comment xml:lang="sk">Archív AR</comment>
@@ -7508,21 +7699,22 @@
<comment xml:lang="tr">AR arşivi</comment>
<comment xml:lang="uk">архів AR</comment>
<comment xml:lang="vi">Kho nén AR</comment>
- <comment xml:lang="zh_CN">AR 归档文件</comment>
- <comment xml:lang="zh_TW">AR 封存檔</comment>
+ <comment xml:lang="zh-CN">AR 归档文件</comment>
+ <comment xml:lang="zh-TW">AR 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="45">
- <match value="&lt;ar&gt;" type="string" offset="0"/>
- <match value="!&lt;arch&gt;" type="string" offset="0"/>
+ <match type="string" value="&lt;ar&gt;" offset="0"/>
+ <match type="string" value="!&lt;arch&gt;" offset="0"/>
</magic>
<glob pattern="*.a"/>
<glob pattern="*.ar"/>
</mime-type>
<mime-type type="application/x-arj">
<comment>ARJ archive</comment>
+ <comment xml:lang="af">ARJ-argief</comment>
<comment xml:lang="ar">أرشيف ARJ</comment>
<comment xml:lang="az">ARJ arxivi</comment>
- <comment xml:lang="be@latin">Archiŭ ARJ</comment>
+ <comment xml:lang="be-Latn">Archiŭ ARJ</comment>
<comment xml:lang="bg">Архив — ARJ</comment>
<comment xml:lang="ca">arxiu ARJ</comment>
<comment xml:lang="cs">archiv ARJ</comment>
@@ -7530,13 +7722,14 @@
<comment xml:lang="da">ARJ-arkiv</comment>
<comment xml:lang="de">ARJ-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο ARJ</comment>
- <comment xml:lang="en_GB">ARJ archive</comment>
+ <comment xml:lang="en-GB">ARJ archive</comment>
<comment xml:lang="eo">ARJ-arkivo</comment>
<comment xml:lang="es">archivador ARJ</comment>
<comment xml:lang="eu">ARJ artxiboa</comment>
<comment xml:lang="fi">ARJ-arkisto</comment>
<comment xml:lang="fo">ARJ skjalasavn</comment>
<comment xml:lang="fr">archive ARJ</comment>
+ <comment xml:lang="fur">archivi ARJ</comment>
<comment xml:lang="ga">cartlann ARJ</comment>
<comment xml:lang="gl">arquivo ARJ</comment>
<comment xml:lang="he">ארכיון ARJ</comment>
@@ -7558,7 +7751,7 @@
<comment xml:lang="oc">archiu ARJ</comment>
<comment xml:lang="pl">Archiwum ARJ</comment>
<comment xml:lang="pt">arquivo ARJ</comment>
- <comment xml:lang="pt_BR">Pacote ARJ</comment>
+ <comment xml:lang="pt-BR">Pacote ARJ</comment>
<comment xml:lang="ro">Arhivă ARJ</comment>
<comment xml:lang="ru">Архив ARJ</comment>
<comment xml:lang="sk">Archív ARJ</comment>
@@ -7569,34 +7762,36 @@
<comment xml:lang="tr">ARJ arşivi</comment>
<comment xml:lang="uk">архів ARJ</comment>
<comment xml:lang="vi">Kho nén ARJ</comment>
- <comment xml:lang="zh_CN">ARJ 归档文件</comment>
- <comment xml:lang="zh_TW">ARJ 封存檔</comment>
+ <comment xml:lang="zh-CN">ARJ 归档文件</comment>
+ <comment xml:lang="zh-TW">ARJ 封存檔</comment>
<acronym>ARJ</acronym>
<expanded-acronym>Archived by Robert Jung</expanded-acronym>
<generic-icon name="package-x-generic"/>
<magic priority="50">
- <match value="0xea60" type="little16" offset="0"/>
+ <match type="little16" value="0xea60" offset="0"/>
</magic>
<glob pattern="*.arj"/>
</mime-type>
<mime-type type="application/x-asp">
<comment>ASP page</comment>
+ <comment xml:lang="af">ASP-bladsy</comment>
<comment xml:lang="ar">صفحة ASP</comment>
<comment xml:lang="ast">Páxina ASP</comment>
- <comment xml:lang="be@latin">Staronka ASP</comment>
+ <comment xml:lang="be-Latn">Staronka ASP</comment>
<comment xml:lang="bg">Страница — ASP</comment>
<comment xml:lang="ca">pàgina ASP</comment>
<comment xml:lang="cs">stránka ASP</comment>
<comment xml:lang="da">ASP-side</comment>
<comment xml:lang="de">ASP-Seite</comment>
<comment xml:lang="el">Σελίδα ASP</comment>
- <comment xml:lang="en_GB">ASP page</comment>
+ <comment xml:lang="en-GB">ASP page</comment>
<comment xml:lang="eo">ASP-paĝo</comment>
<comment xml:lang="es">página ASP</comment>
<comment xml:lang="eu">ASP orria</comment>
<comment xml:lang="fi">ASP-sivu</comment>
<comment xml:lang="fo">ASP síða</comment>
<comment xml:lang="fr">page ASP</comment>
+ <comment xml:lang="fur">pagjine ASP</comment>
<comment xml:lang="ga">leathanach ASP</comment>
<comment xml:lang="gl">páxina ASP</comment>
<comment xml:lang="he">עמוד ASP</comment>
@@ -7617,7 +7812,7 @@
<comment xml:lang="oc">pagina ASP</comment>
<comment xml:lang="pl">Strona ASP</comment>
<comment xml:lang="pt">página ASP</comment>
- <comment xml:lang="pt_BR">Página ASP</comment>
+ <comment xml:lang="pt-BR">Página ASP</comment>
<comment xml:lang="ro">Pagină ASP</comment>
<comment xml:lang="ru">Страница ASP</comment>
<comment xml:lang="sk">Stránka ASP</comment>
@@ -7628,8 +7823,8 @@
<comment xml:lang="tr">ASP sayfası</comment>
<comment xml:lang="uk">сторінка ASP</comment>
<comment xml:lang="vi">Trang ASP</comment>
- <comment xml:lang="zh_CN">ASP 页面</comment>
- <comment xml:lang="zh_TW">ASP 頁面</comment>
+ <comment xml:lang="zh-CN">ASP 页面</comment>
+ <comment xml:lang="zh-TW">ASP 頁面</comment>
<acronym>ASP</acronym>
<expanded-acronym>Active Server Page</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -7638,10 +7833,11 @@
</mime-type>
<mime-type type="application/x-awk">
<comment>AWK script</comment>
+ <comment xml:lang="af">AWK-skrip</comment>
<comment xml:lang="ar">سكربت AWK</comment>
<comment xml:lang="ast">Script AWK</comment>
<comment xml:lang="az">AWK skripti</comment>
- <comment xml:lang="be@latin">Skrypt AWK</comment>
+ <comment xml:lang="be-Latn">Skrypt AWK</comment>
<comment xml:lang="bg">Скрипт — AWK</comment>
<comment xml:lang="ca">script AWK</comment>
<comment xml:lang="cs">skript AWK</comment>
@@ -7649,13 +7845,14 @@
<comment xml:lang="da">AWK-program</comment>
<comment xml:lang="de">AWK-Skript</comment>
<comment xml:lang="el">Δέσμη ενεργειών AWK</comment>
- <comment xml:lang="en_GB">AWK script</comment>
+ <comment xml:lang="en-GB">AWK script</comment>
<comment xml:lang="eo">AWK-skripto</comment>
<comment xml:lang="es">secuencia de órdenes en AWK</comment>
<comment xml:lang="eu">AWK script-a</comment>
<comment xml:lang="fi">AWK-komentotiedosto</comment>
<comment xml:lang="fo">AWK boðrøð</comment>
<comment xml:lang="fr">script AWK</comment>
+ <comment xml:lang="fur">script AWK</comment>
<comment xml:lang="ga">script AWK</comment>
<comment xml:lang="gl">script de AWK</comment>
<comment xml:lang="he">תסריט AWK</comment>
@@ -7677,7 +7874,7 @@
<comment xml:lang="oc">escript AWK</comment>
<comment xml:lang="pl">Skrypt AWK</comment>
<comment xml:lang="pt">script AWK</comment>
- <comment xml:lang="pt_BR">Script AWK</comment>
+ <comment xml:lang="pt-BR">Script AWK</comment>
<comment xml:lang="ro">Script AWK</comment>
<comment xml:lang="ru">Сценарий AWK</comment>
<comment xml:lang="sk">Skript AWK</comment>
@@ -7688,31 +7885,32 @@
<comment xml:lang="tr">AWK betiği</comment>
<comment xml:lang="uk">скрипт AWK</comment>
<comment xml:lang="vi">Văn lệnh AWK</comment>
- <comment xml:lang="zh_CN">AWK 脚本</comment>
- <comment xml:lang="zh_TW">AWK 指令稿</comment>
+ <comment xml:lang="zh-CN">AWK 脚本</comment>
+ <comment xml:lang="zh-TW">AWK 指令稿</comment>
<sub-class-of type="application/x-executable"/>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-script"/>
<magic priority="50">
- <match value="#!/bin/gawk" type="string" offset="0"/>
- <match value="#! /bin/gawk" type="string" offset="0"/>
- <match value="#!/usr/bin/gawk" type="string" offset="0"/>
- <match value="#! /usr/bin/gawk" type="string" offset="0"/>
- <match value="#!/usr/local/bin/gawk" type="string" offset="0"/>
- <match value="#! /usr/local/bin/gawk" type="string" offset="0"/>
- <match value="#!/bin/awk" type="string" offset="0"/>
- <match value="#! /bin/awk" type="string" offset="0"/>
- <match value="#!/usr/bin/awk" type="string" offset="0"/>
- <match value="#! /usr/bin/awk" type="string" offset="0"/>
+ <match type="string" value="#!/bin/gawk" offset="0"/>
+ <match type="string" value="#! /bin/gawk" offset="0"/>
+ <match type="string" value="#!/usr/bin/gawk" offset="0"/>
+ <match type="string" value="#! /usr/bin/gawk" offset="0"/>
+ <match type="string" value="#!/usr/local/bin/gawk" offset="0"/>
+ <match type="string" value="#! /usr/local/bin/gawk" offset="0"/>
+ <match type="string" value="#!/bin/awk" offset="0"/>
+ <match type="string" value="#! /bin/awk" offset="0"/>
+ <match type="string" value="#!/usr/bin/awk" offset="0"/>
+ <match type="string" value="#! /usr/bin/awk" offset="0"/>
</magic>
<glob pattern="*.awk"/>
</mime-type>
<mime-type type="application/x-bcpio">
<comment>BCPIO document</comment>
+ <comment xml:lang="af">BCPIO-dokument</comment>
<comment xml:lang="ar">مستند BCPIO</comment>
<comment xml:lang="ast">Documentu BCPIO</comment>
<comment xml:lang="az">BCPIO sənədi</comment>
- <comment xml:lang="be@latin">Dakument BCPIO</comment>
+ <comment xml:lang="be-Latn">Dakument BCPIO</comment>
<comment xml:lang="bg">Документ — BCPIO</comment>
<comment xml:lang="ca">document BCPIO</comment>
<comment xml:lang="cs">dokument BCPIO</comment>
@@ -7720,13 +7918,14 @@
<comment xml:lang="da">BCPIO-dokument</comment>
<comment xml:lang="de">BCPIO-Dokument</comment>
<comment xml:lang="el">Έγγραφο BCPIO</comment>
- <comment xml:lang="en_GB">BCPIO document</comment>
+ <comment xml:lang="en-GB">BCPIO document</comment>
<comment xml:lang="eo">BCPIO-dokumento</comment>
<comment xml:lang="es">documento BCPIO</comment>
<comment xml:lang="eu">BCPIO dokumentua</comment>
<comment xml:lang="fi">BCPIO-asiakirja</comment>
<comment xml:lang="fo">BCPIO skjal</comment>
<comment xml:lang="fr">document BCPIO</comment>
+ <comment xml:lang="fur">document BCPIO</comment>
<comment xml:lang="ga">cáipéis BCPIO</comment>
<comment xml:lang="gl">documento BCPIO</comment>
<comment xml:lang="he">מסמך של BCPO</comment>
@@ -7748,7 +7947,7 @@
<comment xml:lang="oc">document BCPIO</comment>
<comment xml:lang="pl">Dokument BCPIO</comment>
<comment xml:lang="pt">documento BCPIO</comment>
- <comment xml:lang="pt_BR">Documento BCPIO</comment>
+ <comment xml:lang="pt-BR">Documento BCPIO</comment>
<comment xml:lang="ro">Document BCPIO</comment>
<comment xml:lang="ru">Документ BCPIO</comment>
<comment xml:lang="sk">Dokument BCPIO</comment>
@@ -7759,8 +7958,8 @@
<comment xml:lang="tr">BCPIO belgesi</comment>
<comment xml:lang="uk">документ BCPIO</comment>
<comment xml:lang="vi">Tài liệu BCPIO</comment>
- <comment xml:lang="zh_CN">BCPIO 文档</comment>
- <comment xml:lang="zh_TW">BCPIO 文件</comment>
+ <comment xml:lang="zh-CN">BCPIO 文档</comment>
+ <comment xml:lang="zh-TW">BCPIO 文件</comment>
<acronym>BCPIO</acronym>
<expanded-acronym>Binary CPIO</expanded-acronym>
<generic-icon name="package-x-generic"/>
@@ -7768,9 +7967,10 @@
</mime-type>
<mime-type type="application/x-bittorrent">
<comment>BitTorrent seed file</comment>
+ <comment xml:lang="af">BitTorrent-saadlêer</comment>
<comment xml:lang="ar">ملف باذر البت تورنت</comment>
<comment xml:lang="az">BitTorrent seed faylı</comment>
- <comment xml:lang="be@latin">Fajł krynicy BitTorrent</comment>
+ <comment xml:lang="be-Latn">Fajł krynicy BitTorrent</comment>
<comment xml:lang="bg">Файл-източник — BitTorrent</comment>
<comment xml:lang="ca">fitxer de llavor BitTorrent</comment>
<comment xml:lang="cs">soubor BitTorrent</comment>
@@ -7778,13 +7978,14 @@
<comment xml:lang="da">BitTorrent-frøfil</comment>
<comment xml:lang="de">BitTorrent-Seed-Datei</comment>
<comment xml:lang="el">Αρχείο BitTorrent seed</comment>
- <comment xml:lang="en_GB">BitTorrent seed file</comment>
+ <comment xml:lang="en-GB">BitTorrent seed file</comment>
<comment xml:lang="eo">BitTorrent-semdosiero</comment>
<comment xml:lang="es">archivo semilla de BitTorrent</comment>
<comment xml:lang="eu">BitTorrent hazi-fitxategia</comment>
<comment xml:lang="fi">BitTorrent-siementiedosto</comment>
<comment xml:lang="fo">BitTorrent seed fíla</comment>
<comment xml:lang="fr">fichier graine BitTorrent</comment>
+ <comment xml:lang="fur">file semence di BitTorrent</comment>
<comment xml:lang="ga">comhad síl BitTorrent</comment>
<comment xml:lang="gl">ficheiro de orixe BitTorrent</comment>
<comment xml:lang="he">קובץ זריעה של BitTorrent</comment>
@@ -7805,7 +8006,7 @@
<comment xml:lang="oc">fichièr grana BitTorrent</comment>
<comment xml:lang="pl">Plik ziarna BitTorrent</comment>
<comment xml:lang="pt">ficheiro de semente BitTorrent</comment>
- <comment xml:lang="pt_BR">Arquivo semente BitTorrent</comment>
+ <comment xml:lang="pt-BR">Arquivo semente BitTorrent</comment>
<comment xml:lang="ro">Fișier sursă-completă BitTorrent</comment>
<comment xml:lang="ru">Файл источника BitTorrent</comment>
<comment xml:lang="sk">Súbor BitTorrent</comment>
@@ -7816,31 +8017,33 @@
<comment xml:lang="tr">BitTorrent tohum dosyası</comment>
<comment xml:lang="uk">файл поширення BitTorrent</comment>
<comment xml:lang="vi">Tải tập hạt BitTorrent</comment>
- <comment xml:lang="zh_CN">BitTorrent 种子文件</comment>
- <comment xml:lang="zh_TW">BitTorrent 種子檔</comment>
+ <comment xml:lang="zh-CN">BitTorrent 种子文件</comment>
+ <comment xml:lang="zh-TW">BitTorrent 種子檔</comment>
<magic priority="50">
- <match value="d8:announce" type="string" offset="0"/>
+ <match type="string" value="d8:announce" offset="0"/>
</magic>
<glob pattern="*.torrent"/>
</mime-type>
<mime-type type="application/x-blender">
<comment>Blender scene</comment>
+ <comment xml:lang="af">Blender-toneel</comment>
<comment xml:lang="ar">مشهد بلندر</comment>
<comment xml:lang="ast">Escena de Blender</comment>
- <comment xml:lang="be@latin">Scena Blender</comment>
+ <comment xml:lang="be-Latn">Scena Blender</comment>
<comment xml:lang="bg">Сцена — Blender</comment>
<comment xml:lang="ca">escena de Blender</comment>
<comment xml:lang="cs">scéna Blender</comment>
<comment xml:lang="da">Blenderscene</comment>
<comment xml:lang="de">Blender-Szene</comment>
<comment xml:lang="el">Σκηνή Blender</comment>
- <comment xml:lang="en_GB">Blender scene</comment>
+ <comment xml:lang="en-GB">Blender scene</comment>
<comment xml:lang="eo">Blender-sceno</comment>
<comment xml:lang="es">escena de Blender</comment>
<comment xml:lang="eu">Blender-eko fitxategia</comment>
<comment xml:lang="fi">Blender-näkymä</comment>
<comment xml:lang="fo">Blender leikmynd</comment>
<comment xml:lang="fr">scène Blender</comment>
+ <comment xml:lang="fur">sene Blender</comment>
<comment xml:lang="ga">radharc Blender</comment>
<comment xml:lang="gl">escena de Blender</comment>
<comment xml:lang="he">סצנת Blender</comment>
@@ -7862,7 +8065,7 @@
<comment xml:lang="oc">scèna Blender</comment>
<comment xml:lang="pl">Scena programu Blender</comment>
<comment xml:lang="pt">cenário Blender</comment>
- <comment xml:lang="pt_BR">Cena do Blender</comment>
+ <comment xml:lang="pt-BR">Cena do Blender</comment>
<comment xml:lang="ro">Scenă Blender</comment>
<comment xml:lang="ru">Сцена Blender</comment>
<comment xml:lang="sk">Scéna Blender</comment>
@@ -7873,38 +8076,40 @@
<comment xml:lang="tr">Blender sahnesi</comment>
<comment xml:lang="uk">сцена Blender</comment>
<comment xml:lang="vi">Cảnh Blender</comment>
- <comment xml:lang="zh_CN">Blender 场景</comment>
- <comment xml:lang="zh_TW">Blender 場景</comment>
+ <comment xml:lang="zh-CN">Blender 场景</comment>
+ <comment xml:lang="zh-TW">Blender 場景</comment>
<generic-icon name="image-x-generic"/>
<glob pattern="*.blender"/>
<glob pattern="*.blend"/>
<glob pattern="*.BLEND"/>
<magic priority="50">
- <match value="BLENDER" type="string" offset="0"/>
+ <match type="string" value="BLENDER" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-bzdvi">
<comment>TeX DVI document (bzip-compressed)</comment>
+ <comment xml:lang="af">TeX DVI-dokument (bzip-saamgepers)</comment>
<comment xml:lang="ar">مستند TeX DVI (مضغوط-bzip)</comment>
<comment xml:lang="ast">Documentu Tex DVI (comprimíu en bzip)</comment>
- <comment xml:lang="be@latin">Dakument TeX DVI (bzip-skampresavany)</comment>
+ <comment xml:lang="be-Latn">Dakument TeX DVI (bzip-skampresavany)</comment>
<comment xml:lang="bg">Документ — TeX DVI, компресиран с bzip</comment>
<comment xml:lang="ca">document de TeX DVI (amb compressió bzip)</comment>
<comment xml:lang="cs">dokument TeX DVI (komprimovaný pomocí bzip)</comment>
<comment xml:lang="da">TeX DVI-dokument (bzip-komprimeret)</comment>
<comment xml:lang="de">TeX-DVI-Dokument (bzip-komprimiert)</comment>
<comment xml:lang="el">Αρχείο TeX DVI (συμπιεσμένο με bzip)</comment>
- <comment xml:lang="en_GB">TeX DVI document (bzip-compressed)</comment>
+ <comment xml:lang="en-GB">TeX DVI document (bzip-compressed)</comment>
<comment xml:lang="es">documento DVI de TeX (comprimido con bzip)</comment>
<comment xml:lang="eu">TeX DVI dokumentua (bzip-ekin konprimitua)</comment>
<comment xml:lang="fi">TeX DVI -asiakirja (bzip-pakattu)</comment>
<comment xml:lang="fo">TeX DVI skjal (bzip-stappað)</comment>
<comment xml:lang="fr">document DVI TeX (compressé bzip)</comment>
+ <comment xml:lang="fur">document DVI TeX (comprimût cun bzip)</comment>
<comment xml:lang="ga">cáipéis DVI TeX (comhbhrúite le bzip)</comment>
<comment xml:lang="gl">documento DVI de TeX (comprimido con bzip)</comment>
<comment xml:lang="he">מסמך מסוג TeX DVI (מכווץ ע״י bzip)</comment>
<comment xml:lang="hr">TeX DVI dokument (bzip sažeto)</comment>
- <comment xml:lang="hu">TeX DVI dokumentum (bzip-pel tömörítve)</comment>
+ <comment xml:lang="hu">TeX DVI dokumentum (bzip tömörítésű)</comment>
<comment xml:lang="ia">Documento TeX DVI (comprimite con bzip)</comment>
<comment xml:lang="id">Dokumen TeX DVI (terkompresi bzip)</comment>
<comment xml:lang="it">Documento TeX DVI (compresso con bzip)</comment>
@@ -7919,7 +8124,7 @@
<comment xml:lang="oc">document DVI TeX (compressat bzip)</comment>
<comment xml:lang="pl">Dokument TeX DVI (kompresja bzip)</comment>
<comment xml:lang="pt">documento TeX DVI (compressão bzip)</comment>
- <comment xml:lang="pt_BR">Documento DVI TeX (compactado com bzip)</comment>
+ <comment xml:lang="pt-BR">Documento DVI TeX (compactado com bzip)</comment>
<comment xml:lang="ro">Document TeX DVI (comprimat bzip)</comment>
<comment xml:lang="ru">Документ TeX DVI (сжатый bzip)</comment>
<comment xml:lang="sk">Dokument TeX DVI (komprimovaný pomocou bzip)</comment>
@@ -7930,30 +8135,32 @@
<comment xml:lang="tr">TeX DVI belgesi (bzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">документ TeX DVI (стиснений bzip)</comment>
<comment xml:lang="vi">Tài liệu DVI TeX (đã nén bzip)</comment>
- <comment xml:lang="zh_CN">TeX DVI 文档（gzip 压缩）</comment>
- <comment xml:lang="zh_TW">TeX DVI 文件 (bzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">TeX DVI 文档（gzip 压缩）</comment>
+ <comment xml:lang="zh-TW">TeX DVI 文件 (bzip 壓縮)</comment>
<sub-class-of type="application/x-bzip"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.dvi.bz2"/>
</mime-type>
<mime-type type="application/x-bzip">
<comment>Bzip archive</comment>
+ <comment xml:lang="af">Bzip-argief</comment>
<comment xml:lang="ar">أرشيف Bzip</comment>
<comment xml:lang="ast">Archivu Bzip</comment>
- <comment xml:lang="be@latin">Archiŭ bzip</comment>
+ <comment xml:lang="be-Latn">Archiŭ bzip</comment>
<comment xml:lang="bg">Архив — bzip</comment>
<comment xml:lang="ca">arxiu bzip</comment>
<comment xml:lang="cs">archiv bzip</comment>
<comment xml:lang="da">Bzip-arkiv</comment>
<comment xml:lang="de">Bzip-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Bzip</comment>
- <comment xml:lang="en_GB">Bzip archive</comment>
+ <comment xml:lang="en-GB">Bzip archive</comment>
<comment xml:lang="eo">Bzip-arkivo</comment>
<comment xml:lang="es">archivador Bzip</comment>
<comment xml:lang="eu">Bzip artxiboa</comment>
<comment xml:lang="fi">Bzip-arkisto</comment>
<comment xml:lang="fo">Bzip skjalasavn</comment>
<comment xml:lang="fr">archive bzip</comment>
+ <comment xml:lang="fur">archivi Bzip</comment>
<comment xml:lang="ga">cartlann Bzip</comment>
<comment xml:lang="gl">arquivo Bzip</comment>
<comment xml:lang="he">ארכיון Bzip</comment>
@@ -7974,10 +8181,10 @@
<comment xml:lang="oc">archiu bzip</comment>
<comment xml:lang="pl">Archiwum bzip</comment>
<comment xml:lang="pt">arquivo Bzip</comment>
- <comment xml:lang="pt_BR">Pacote Bzip</comment>
+ <comment xml:lang="pt-BR">Pacote Bzip</comment>
<comment xml:lang="ro">Arhivă Bzip</comment>
<comment xml:lang="ru">Архив BZIP</comment>
- <comment xml:lang="sk">Archív bzip</comment>
+ <comment xml:lang="sk">Archív Bzip</comment>
<comment xml:lang="sl">Datoteka arhiva Bzip</comment>
<comment xml:lang="sq">Arkiv bzip</comment>
<comment xml:lang="sr">Бзип архива</comment>
@@ -7985,38 +8192,41 @@
<comment xml:lang="tr">Bzip arşivi</comment>
<comment xml:lang="uk">архів bzip</comment>
<comment xml:lang="vi">Kho nén bzip</comment>
- <comment xml:lang="zh_CN">Bzip 归档文件</comment>
- <comment xml:lang="zh_TW">Bzip 封存檔</comment>
+ <comment xml:lang="zh-CN">Bzip 归档文件</comment>
+ <comment xml:lang="zh-TW">Bzip 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="50">
- <match value="BZh" type="string" offset="0"/>
+ <match type="string" value="BZh" offset="0"/>
</magic>
<glob pattern="*.bz2"/>
<glob pattern="*.bz"/>
<alias type="application/x-bzip2"/>
+ <alias type="application/bzip2"/>
</mime-type>
<mime-type type="application/x-bzip-compressed-tar">
<comment>Tar archive (bzip-compressed)</comment>
+ <comment xml:lang="af">Tar-argief (bzip-saamgepers)</comment>
<comment xml:lang="ar">أرشيف Tar (مضغوط-bzip)</comment>
<comment xml:lang="ast">Archivu Tar (comprimíu en bzip)</comment>
- <comment xml:lang="be@latin">Archiŭ tar (bzip-skampresavany)</comment>
+ <comment xml:lang="be-Latn">Archiŭ tar (bzip-skampresavany)</comment>
<comment xml:lang="bg">Архив — tar, компресиран с bzip</comment>
<comment xml:lang="ca">arxiu tar (amb compressió bzip)</comment>
<comment xml:lang="cs">archiv Tar (komprimovaný pomocí bzip)</comment>
<comment xml:lang="da">Tar-arkiv (bzip-komprimeret)</comment>
<comment xml:lang="de">Tar-Archiv (bzip-komprimiert)</comment>
<comment xml:lang="el">Αρχείο Tar (συμπιεσμένο με bzip)</comment>
- <comment xml:lang="en_GB">Tar archive (bzip-compressed)</comment>
+ <comment xml:lang="en-GB">Tar archive (bzip-compressed)</comment>
<comment xml:lang="es">archivador Tar (comprimido con bzip)</comment>
<comment xml:lang="eu">Tar artxiboa (bzip-ekin konprimitua)</comment>
<comment xml:lang="fi">Tar-arkisto (bzip-pakattu)</comment>
<comment xml:lang="fo">Tar skjalasavn (bzip-stappað)</comment>
<comment xml:lang="fr">archive tar (compressée bzip)</comment>
+ <comment xml:lang="fur">archivi Tar (comprimût cun bzip)</comment>
<comment xml:lang="ga">cartlann Tar (comhbhrúite le bzip)</comment>
<comment xml:lang="gl">arquivo Tar (comprimido con bzip)</comment>
<comment xml:lang="he">ארכיון Tar (מכווץ ע״י bzip)</comment>
<comment xml:lang="hr">Tar arhiva (bzip sažeto)</comment>
- <comment xml:lang="hu">Tar archívum (bzip-pel tömörítve)</comment>
+ <comment xml:lang="hu">Tar archívum (bzip tömörítésű)</comment>
<comment xml:lang="ia">Archivo Tar (comprimite con bzip)</comment>
<comment xml:lang="id">Arsip Tar (terkompresi bzip)</comment>
<comment xml:lang="it">Archivio tar (compresso con bzip)</comment>
@@ -8031,10 +8241,10 @@
<comment xml:lang="oc">archiu tar (compressat bzip)</comment>
<comment xml:lang="pl">Archiwum tar (kompresja bzip)</comment>
<comment xml:lang="pt">arquivo Tar (compressão bzip)</comment>
- <comment xml:lang="pt_BR">Pacote Tar (compactado com bzip)</comment>
+ <comment xml:lang="pt-BR">Pacote Tar (compactado com bzip)</comment>
<comment xml:lang="ro">Arhivă Tar (comprimată bzip)</comment>
<comment xml:lang="ru">Архив TAR (сжатый bzip)</comment>
- <comment xml:lang="sk">Archív tar (komprimovaný pomocou bzip)</comment>
+ <comment xml:lang="sk">Archív Tar (komprimovaný pomocou bzip)</comment>
<comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z bzip)</comment>
<comment xml:lang="sq">Arkiv tar (i kompresuar me bzip)</comment>
<comment xml:lang="sr">Тар архива (запакована бзипом)</comment>
@@ -8042,8 +8252,8 @@
<comment xml:lang="tr">Tar arşivi (bzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">архів tar (стиснений bzip)</comment>
<comment xml:lang="vi">Kho nén tar (đã nén bzip)</comment>
- <comment xml:lang="zh_CN">Tar 归档文件（bzip 压缩）</comment>
- <comment xml:lang="zh_TW">Tar 封存檔 (bzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">Tar 归档文件（bzip 压缩）</comment>
+ <comment xml:lang="zh-TW">Tar 封存檔 (bzip 壓縮)</comment>
<generic-icon name="package-x-generic"/>
<sub-class-of type="application/x-bzip"/>
<glob pattern="*.tar.bz2"/>
@@ -8054,26 +8264,28 @@
</mime-type>
<mime-type type="application/x-bzpdf">
<comment>PDF document (bzip-compressed)</comment>
+ <comment xml:lang="af">PDF-dokument (bzip-saamgepers)</comment>
<comment xml:lang="ar">مستند PDF (مضغوط-bzip)</comment>
<comment xml:lang="ast">Documentu PDF (comprimíu en bzip)</comment>
- <comment xml:lang="be@latin">Dakument PDF (bzip-skampresavany)</comment>
+ <comment xml:lang="be-Latn">Dakument PDF (bzip-skampresavany)</comment>
<comment xml:lang="bg">Документ — PDF, компресиран с bzip</comment>
<comment xml:lang="ca">document PDF (amb compressió bzip)</comment>
<comment xml:lang="cs">dokument PDF (komprimovaný pomocí bzip)</comment>
<comment xml:lang="da">PDF-dokument (bzip-komprimeret)</comment>
<comment xml:lang="de">PDF-Dokument (bzip-komprimiert)</comment>
<comment xml:lang="el">Έγγραφο PDF (συμπιεσμένο με bzip)</comment>
- <comment xml:lang="en_GB">PDF document (bzip-compressed)</comment>
+ <comment xml:lang="en-GB">PDF document (bzip-compressed)</comment>
<comment xml:lang="es">documento PDF (comprimido con bzip)</comment>
<comment xml:lang="eu">PostScript dokumentua (bzip-ekin konprimitua)</comment>
<comment xml:lang="fi">PDF-asiakirja (bzip-pakattu)</comment>
<comment xml:lang="fo">PDF skjal (bzip-stappað)</comment>
<comment xml:lang="fr">document PDF (compressé bzip)</comment>
+ <comment xml:lang="fur">document PDF (comprimût cun bzip)</comment>
<comment xml:lang="ga">cáipéis PDF (comhbhrúite le bzip)</comment>
<comment xml:lang="gl">documento PDF (comprimido en bzip)</comment>
<comment xml:lang="he">מסמך PDF (מכווץ ע״י bzip)</comment>
<comment xml:lang="hr">PDF dokument (bzip sažet)</comment>
- <comment xml:lang="hu">PDF dokumentum (bzip-tömörítésű)</comment>
+ <comment xml:lang="hu">PDF dokumentum (bzip tömörítésű)</comment>
<comment xml:lang="ia">Documento PDF (comprimite con bzip)</comment>
<comment xml:lang="id">Dokumen PDF (terkompresi bzip)</comment>
<comment xml:lang="it">Documento PDF (compresso con bzip)</comment>
@@ -8088,7 +8300,7 @@
<comment xml:lang="oc">document PDF (compressat bzip)</comment>
<comment xml:lang="pl">Dokument PDF (kompresja bzip)</comment>
<comment xml:lang="pt">documento PDF (compressão bzip)</comment>
- <comment xml:lang="pt_BR">Documento PDF (compactado com bzip)</comment>
+ <comment xml:lang="pt-BR">Documento PDF (compactado com bzip)</comment>
<comment xml:lang="ro">Document PDF (comprimat bzip)</comment>
<comment xml:lang="ru">Документ PDF (сжатый bzip)</comment>
<comment xml:lang="sk">Dokument PDF (komprimovaný pomocou bzip)</comment>
@@ -8099,34 +8311,36 @@
<comment xml:lang="tr">PDF belgesi (bzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">документ PDF (стиснений bzip)</comment>
<comment xml:lang="vi">Tài liệu PDF (đã nén bzip)</comment>
- <comment xml:lang="zh_CN">PDF 文档（bzip 压缩）</comment>
- <comment xml:lang="zh_TW">PDF 文件 (bzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">PDF 文档（bzip 压缩）</comment>
+ <comment xml:lang="zh-TW">PDF 文件 (bzip 壓縮)</comment>
<sub-class-of type="application/x-bzip"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.pdf.bz2"/>
</mime-type>
<mime-type type="application/x-bzpostscript">
<comment>PostScript document (bzip-compressed)</comment>
+ <comment xml:lang="af">PostScript-dokument (bzip-saamgepers)</comment>
<comment xml:lang="ar">مستند PostScript (مضغوط-bzip)</comment>
<comment xml:lang="ast">Documentu PostScript (comprimíu en bzip)</comment>
- <comment xml:lang="be@latin">Dakument PostScript (bzip-skampresavany)</comment>
+ <comment xml:lang="be-Latn">Dakument PostScript (bzip-skampresavany)</comment>
<comment xml:lang="bg">Документ — PostScript, компресиран с bzip</comment>
<comment xml:lang="ca">document PostScript (amb compressió bzip)</comment>
<comment xml:lang="cs">dokument PostScript (komprimovaný pomocí bzip)</comment>
<comment xml:lang="da">PostScript-dokument (bzip-komprimeret)</comment>
<comment xml:lang="de">PostScript-Dokument (bzip-komprimiert)</comment>
<comment xml:lang="el">Έγγραφο PostScript (συμπιεσμένο με bzip)</comment>
- <comment xml:lang="en_GB">PostScript document (bzip-compressed)</comment>
+ <comment xml:lang="en-GB">PostScript document (bzip-compressed)</comment>
<comment xml:lang="es">documento PostScript (comprimido con bzip)</comment>
<comment xml:lang="eu">PostScript dokumentua (bzip-ekin konprimitua)</comment>
<comment xml:lang="fi">PostScript-asiakirja (bzip-pakattu)</comment>
<comment xml:lang="fo">PostScript skjal (bzip-stappað)</comment>
<comment xml:lang="fr">document PostScript (compressé bzip)</comment>
+ <comment xml:lang="fur">document PostScript (comprimût cun bzip)</comment>
<comment xml:lang="ga">cáipéis PostScript (comhbhrúite le bzip)</comment>
<comment xml:lang="gl">documento PostScript (comprimido con bzip)</comment>
<comment xml:lang="he">מסמך PostDcript (מכווץ ע״י bzip)</comment>
<comment xml:lang="hr">PostScript dokument (bzip sažet)</comment>
- <comment xml:lang="hu">PostScript dokumentum (bzip-tömörítésű)</comment>
+ <comment xml:lang="hu">PostScript dokumentum (bzip tömörítésű)</comment>
<comment xml:lang="ia">Documento PostScript (comprimite con bzip)</comment>
<comment xml:lang="id">Dokumen PostScript (terkompresi bzip)</comment>
<comment xml:lang="it">Documento PostScript (compresso con bzip)</comment>
@@ -8139,9 +8353,9 @@
<comment xml:lang="nl">PostScript-document (ingepakt met bzip)</comment>
<comment xml:lang="nn">PostScript-dokument (pakka med bzip)</comment>
<comment xml:lang="oc">document PostEscript (compressat bzip)</comment>
- <comment xml:lang="pl">Dokument Postscript (kompresja bzip)</comment>
+ <comment xml:lang="pl">Dokument PostScript (kompresja bzip)</comment>
<comment xml:lang="pt">documento PostScript (compressão bzip)</comment>
- <comment xml:lang="pt_BR">Documento PostScript (compactado com bzip)</comment>
+ <comment xml:lang="pt-BR">Documento PostScript (compactado com bzip)</comment>
<comment xml:lang="ro">Document PostScript (comprimat bzip)</comment>
<comment xml:lang="ru">Документ PostScript (сжатый bzip)</comment>
<comment xml:lang="sk">Dokument PostScript (komprimovaný pomocou bzip)</comment>
@@ -8152,28 +8366,30 @@
<comment xml:lang="tr">PostScript belgesi (bzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">документ PostScript (стиснене bzip)</comment>
<comment xml:lang="vi">Tài liệu PostScript (đã nén bzip)</comment>
- <comment xml:lang="zh_CN">PostScript 文档（bzip 压缩）</comment>
- <comment xml:lang="zh_TW">PostScript 文件 (bzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">PostScript 文档（bzip 压缩）</comment>
+ <comment xml:lang="zh-TW">PostScript 文件 (bzip 壓縮)</comment>
<sub-class-of type="application/x-bzip"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.ps.bz2"/>
</mime-type>
<mime-type type="application/vnd.comicbook-rar">
<comment>comic book archive</comment>
+ <comment xml:lang="af">strokiesprent-argief</comment>
<comment xml:lang="ar">أرشيف comic book</comment>
- <comment xml:lang="be@latin">archiŭ komiksaŭ</comment>
+ <comment xml:lang="be-Latn">archiŭ komiksaŭ</comment>
<comment xml:lang="bg">Архив — комикси</comment>
<comment xml:lang="ca">arxiu comic book</comment>
<comment xml:lang="cs">archiv knihy komiksů</comment>
<comment xml:lang="da">comic book-arkiv</comment>
<comment xml:lang="de">Comic-Book-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο κόμικ</comment>
- <comment xml:lang="en_GB">comic book archive</comment>
+ <comment xml:lang="en-GB">comic book archive</comment>
<comment xml:lang="es">archivador de libro de cómic</comment>
<comment xml:lang="eu">komiki artxiboa</comment>
<comment xml:lang="fi">sarjakuva-arkisto</comment>
<comment xml:lang="fo">teknisøgubóka skjalasavn</comment>
<comment xml:lang="fr">archive Comic Book</comment>
+ <comment xml:lang="fur">archivi di fumets</comment>
<comment xml:lang="ga">cartlann chartúin</comment>
<comment xml:lang="gl">ficheiro de libro de banda deseñada</comment>
<comment xml:lang="he">ארכיון ספר קומי</comment>
@@ -8193,7 +8409,7 @@
<comment xml:lang="oc">archiu Comic Book</comment>
<comment xml:lang="pl">Archiwum komiksu</comment>
<comment xml:lang="pt">arquivo de banda desenhada</comment>
- <comment xml:lang="pt_BR">Pacote de histórias em quadrinhos</comment>
+ <comment xml:lang="pt-BR">Pacote de histórias em quadrinhos</comment>
<comment xml:lang="ro">arhivă benzi desenate</comment>
<comment xml:lang="ru">Архив комиксов</comment>
<comment xml:lang="sk">Archív knihy komiksov</comment>
@@ -8204,8 +8420,8 @@
<comment xml:lang="tr">çizgi roman arşivi</comment>
<comment xml:lang="uk">архів коміксів</comment>
<comment xml:lang="vi">Kho nén sách tranh chuyện vui</comment>
- <comment xml:lang="zh_CN">漫画书归档文件</comment>
- <comment xml:lang="zh_TW">漫畫書封存檔</comment>
+ <comment xml:lang="zh-CN">漫画书归档文件</comment>
+ <comment xml:lang="zh-TW">漫畫書封存檔</comment>
<sub-class-of type="application/vnd.rar"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.cbr"/>
@@ -8213,20 +8429,22 @@
</mime-type>
<mime-type type="application/x-cb7">
<comment>comic book archive</comment>
+ <comment xml:lang="af">strokiesprent-argief</comment>
<comment xml:lang="ar">أرشيف comic book</comment>
- <comment xml:lang="be@latin">archiŭ komiksaŭ</comment>
+ <comment xml:lang="be-Latn">archiŭ komiksaŭ</comment>
<comment xml:lang="bg">Архив — комикси</comment>
<comment xml:lang="ca">arxiu comic book</comment>
<comment xml:lang="cs">archiv knihy komiksů</comment>
<comment xml:lang="da">comic book-arkiv</comment>
<comment xml:lang="de">Comic-Book-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο κόμικ</comment>
- <comment xml:lang="en_GB">comic book archive</comment>
+ <comment xml:lang="en-GB">comic book archive</comment>
<comment xml:lang="es">archivador de libro de cómic</comment>
<comment xml:lang="eu">komiki artxiboa</comment>
<comment xml:lang="fi">sarjakuva-arkisto</comment>
<comment xml:lang="fo">teknisøgubóka skjalasavn</comment>
<comment xml:lang="fr">archive Comic Book</comment>
+ <comment xml:lang="fur">archivi di fumets</comment>
<comment xml:lang="ga">cartlann chartúin</comment>
<comment xml:lang="gl">ficheiro de libro de banda deseñada</comment>
<comment xml:lang="he">ארכיון ספר קומי</comment>
@@ -8246,7 +8464,7 @@
<comment xml:lang="oc">archiu Comic Book</comment>
<comment xml:lang="pl">Archiwum komiksu</comment>
<comment xml:lang="pt">arquivo de banda desenhada</comment>
- <comment xml:lang="pt_BR">Pacote de histórias em quadrinhos</comment>
+ <comment xml:lang="pt-BR">Pacote de histórias em quadrinhos</comment>
<comment xml:lang="ro">arhivă benzi desenate</comment>
<comment xml:lang="ru">Архив комиксов</comment>
<comment xml:lang="sk">Archív knihy komiksov</comment>
@@ -8257,28 +8475,30 @@
<comment xml:lang="tr">çizgi roman arşivi</comment>
<comment xml:lang="uk">архів коміксів</comment>
<comment xml:lang="vi">Kho nén sách tranh chuyện vui</comment>
- <comment xml:lang="zh_CN">漫画书归档文件</comment>
- <comment xml:lang="zh_TW">漫畫書封存檔</comment>
+ <comment xml:lang="zh-CN">漫画书归档文件</comment>
+ <comment xml:lang="zh-TW">漫畫書封存檔</comment>
<sub-class-of type="application/x-7z-compressed"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.cb7"/>
</mime-type>
<mime-type type="application/x-cbt">
<comment>comic book archive</comment>
+ <comment xml:lang="af">strokiesprent-argief</comment>
<comment xml:lang="ar">أرشيف comic book</comment>
- <comment xml:lang="be@latin">archiŭ komiksaŭ</comment>
+ <comment xml:lang="be-Latn">archiŭ komiksaŭ</comment>
<comment xml:lang="bg">Архив — комикси</comment>
<comment xml:lang="ca">arxiu comic book</comment>
<comment xml:lang="cs">archiv knihy komiksů</comment>
<comment xml:lang="da">comic book-arkiv</comment>
<comment xml:lang="de">Comic-Book-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο κόμικ</comment>
- <comment xml:lang="en_GB">comic book archive</comment>
+ <comment xml:lang="en-GB">comic book archive</comment>
<comment xml:lang="es">archivador de libro de cómic</comment>
<comment xml:lang="eu">komiki artxiboa</comment>
<comment xml:lang="fi">sarjakuva-arkisto</comment>
<comment xml:lang="fo">teknisøgubóka skjalasavn</comment>
<comment xml:lang="fr">archive Comic Book</comment>
+ <comment xml:lang="fur">archivi di fumets</comment>
<comment xml:lang="ga">cartlann chartúin</comment>
<comment xml:lang="gl">ficheiro de libro de banda deseñada</comment>
<comment xml:lang="he">ארכיון ספר קומי</comment>
@@ -8298,7 +8518,7 @@
<comment xml:lang="oc">archiu Comic Book</comment>
<comment xml:lang="pl">Archiwum komiksu</comment>
<comment xml:lang="pt">arquivo de banda desenhada</comment>
- <comment xml:lang="pt_BR">Pacote de histórias em quadrinhos</comment>
+ <comment xml:lang="pt-BR">Pacote de histórias em quadrinhos</comment>
<comment xml:lang="ro">arhivă benzi desenate</comment>
<comment xml:lang="ru">Архив комиксов</comment>
<comment xml:lang="sk">Archív knihy komiksov</comment>
@@ -8309,28 +8529,30 @@
<comment xml:lang="tr">çizgi roman arşivi</comment>
<comment xml:lang="uk">архів коміксів</comment>
<comment xml:lang="vi">Kho nén sách tranh chuyện vui</comment>
- <comment xml:lang="zh_CN">漫画书归档文件</comment>
- <comment xml:lang="zh_TW">漫畫書封存檔</comment>
+ <comment xml:lang="zh-CN">漫画书归档文件</comment>
+ <comment xml:lang="zh-TW">漫畫書封存檔</comment>
<sub-class-of type="application/x-tar"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.cbt"/>
</mime-type>
<mime-type type="application/vnd.comicbook+zip">
<comment>comic book archive</comment>
+ <comment xml:lang="af">strokiesprent-argief</comment>
<comment xml:lang="ar">أرشيف comic book</comment>
- <comment xml:lang="be@latin">archiŭ komiksaŭ</comment>
+ <comment xml:lang="be-Latn">archiŭ komiksaŭ</comment>
<comment xml:lang="bg">Архив — комикси</comment>
<comment xml:lang="ca">arxiu comic book</comment>
<comment xml:lang="cs">archiv knihy komiksů</comment>
<comment xml:lang="da">comic book-arkiv</comment>
<comment xml:lang="de">Comic-Book-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο κόμικ</comment>
- <comment xml:lang="en_GB">comic book archive</comment>
+ <comment xml:lang="en-GB">comic book archive</comment>
<comment xml:lang="es">archivador de libro de cómic</comment>
<comment xml:lang="eu">komiki artxiboa</comment>
<comment xml:lang="fi">sarjakuva-arkisto</comment>
<comment xml:lang="fo">teknisøgubóka skjalasavn</comment>
<comment xml:lang="fr">archive Comic Book</comment>
+ <comment xml:lang="fur">archivi di fumets</comment>
<comment xml:lang="ga">cartlann chartúin</comment>
<comment xml:lang="gl">ficheiro de libro de banda deseñada</comment>
<comment xml:lang="he">ארכיון ספר קומי</comment>
@@ -8350,7 +8572,7 @@
<comment xml:lang="oc">archiu Comic Book</comment>
<comment xml:lang="pl">Archiwum komiksu</comment>
<comment xml:lang="pt">arquivo de banda desenhada</comment>
- <comment xml:lang="pt_BR">Pacote de histórias em quadrinhos</comment>
+ <comment xml:lang="pt-BR">Pacote de histórias em quadrinhos</comment>
<comment xml:lang="ro">arhivă benzi desenate</comment>
<comment xml:lang="ru">Архив комиксов</comment>
<comment xml:lang="sk">Archív knihy komiksov</comment>
@@ -8361,8 +8583,8 @@
<comment xml:lang="tr">çizgi roman arşivi</comment>
<comment xml:lang="uk">архів коміксів</comment>
<comment xml:lang="vi">Kho nén sách tranh chuyện vui</comment>
- <comment xml:lang="zh_CN">漫画书归档文件</comment>
- <comment xml:lang="zh_TW">漫畫書封存檔</comment>
+ <comment xml:lang="zh-CN">漫画书归档文件</comment>
+ <comment xml:lang="zh-TW">漫畫書封存檔</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.cbz"/>
@@ -8370,6 +8592,7 @@
</mime-type>
<mime-type type="application/x-lrzip">
<comment>Lrzip archive</comment>
+ <comment xml:lang="af">Lrzip-argief</comment>
<comment xml:lang="ar">أرشيف Lrzip</comment>
<comment xml:lang="bg">Архив — lrzip</comment>
<comment xml:lang="ca">arxiu lrzip</comment>
@@ -8377,13 +8600,14 @@
<comment xml:lang="da">Lrzip-arkiv</comment>
<comment xml:lang="de">Lrzip-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Lrzip</comment>
- <comment xml:lang="en_GB">Lrzip archive</comment>
+ <comment xml:lang="en-GB">Lrzip archive</comment>
<comment xml:lang="eo">Lrzip-arkivo</comment>
<comment xml:lang="es">archivador Lrzip</comment>
<comment xml:lang="eu">Lrzip artxiboa</comment>
<comment xml:lang="fi">Lrzip-arkisto</comment>
<comment xml:lang="fo">Lrzip skjalasavn</comment>
<comment xml:lang="fr">archive lrzip</comment>
+ <comment xml:lang="fur">archivi Lrzip</comment>
<comment xml:lang="ga">cartlann Lrzip</comment>
<comment xml:lang="gl">arquivo Lrzip</comment>
<comment xml:lang="he">ארכיון Lrzip</comment>
@@ -8401,7 +8625,7 @@
<comment xml:lang="oc">archiu lrzip</comment>
<comment xml:lang="pl">Archiwum lrzip</comment>
<comment xml:lang="pt">arquivo Lrzip</comment>
- <comment xml:lang="pt_BR">Pacote Lrzip</comment>
+ <comment xml:lang="pt-BR">Pacote Lrzip</comment>
<comment xml:lang="ro">Arhivă Lrzip</comment>
<comment xml:lang="ru">Архив LRZIP</comment>
<comment xml:lang="sk">Archív Lrzip</comment>
@@ -8410,16 +8634,17 @@
<comment xml:lang="sv">Lrzip-arkiv</comment>
<comment xml:lang="tr">Lrzip arşivi</comment>
<comment xml:lang="uk">архів lrzip</comment>
- <comment xml:lang="zh_CN">Lrzip 归档文件</comment>
- <comment xml:lang="zh_TW">Lrzip 封存檔</comment>
+ <comment xml:lang="zh-CN">Lrzip 归档文件</comment>
+ <comment xml:lang="zh-TW">Lrzip 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="LRZI" type="string" offset="0"/>
+ <match type="string" value="LRZI" offset="0"/>
</magic>
<glob pattern="*.lrz"/>
</mime-type>
<mime-type type="application/x-lrzip-compressed-tar">
<comment>Tar archive (lrzip-compressed)</comment>
+ <comment xml:lang="af">Tar-argief (lrzip-saamgepers)</comment>
<comment xml:lang="ar">أرشيف Tar (مضغوط-lrzip)</comment>
<comment xml:lang="bg">Архив — tar, компресиран с lrzip</comment>
<comment xml:lang="ca">arxiu tar (amb compressió lrzip)</comment>
@@ -8427,17 +8652,18 @@
<comment xml:lang="da">Tar-arkiv (lrzip-komprimeret)</comment>
<comment xml:lang="de">Tar-Archiv (lrzip-komprimiert)</comment>
<comment xml:lang="el">Αρχείο Tar (συμπιεσμένο με lrzip)</comment>
- <comment xml:lang="en_GB">Tar archive (lrzip-compressed)</comment>
+ <comment xml:lang="en-GB">Tar archive (lrzip-compressed)</comment>
<comment xml:lang="es">archivador Tar (comprimido con lrzip)</comment>
<comment xml:lang="eu">Tar artxiboa (lrzip-ekin konprimitua)</comment>
<comment xml:lang="fi">Tar-arkisto (lrzip-pakattu)</comment>
<comment xml:lang="fo">Tar skjalasavn (lrzip-stappað)</comment>
<comment xml:lang="fr">archive tar (compressée lrzip)</comment>
+ <comment xml:lang="fur">archivi Tar (comprimût cun lrzip)</comment>
<comment xml:lang="ga">cartlann Tar (comhbhrúite le lrzip)</comment>
<comment xml:lang="gl">arquivo Tar (comprimido con lrzip)</comment>
<comment xml:lang="he">ארכיון Tar (מכווץ ע״י lrzip)</comment>
<comment xml:lang="hr">Tar arhiva (lrzip sažeta)</comment>
- <comment xml:lang="hu">Tar archívum (lrzip-pel tömörítve)</comment>
+ <comment xml:lang="hu">Tar archívum (lrzip tömörítésű)</comment>
<comment xml:lang="ia">Archivo Tar (comprimite con lrzip)</comment>
<comment xml:lang="id">Arsip Tar (terkompresi lrzip)</comment>
<comment xml:lang="it">Archivio tar (compresso con lrzip)</comment>
@@ -8450,17 +8676,17 @@
<comment xml:lang="oc">archiu tar (compressat lrzip)</comment>
<comment xml:lang="pl">Archiwum tar (kompresja lrzip)</comment>
<comment xml:lang="pt">arquivo Tar (compressão Lrzip)</comment>
- <comment xml:lang="pt_BR">Pacote Tar (compactado com lrzip)</comment>
+ <comment xml:lang="pt-BR">Pacote Tar (compactado com lrzip)</comment>
<comment xml:lang="ro">Arhivă Tar (comprimată lrzip)</comment>
<comment xml:lang="ru">Архив TAR (сжатый lrzip)</comment>
- <comment xml:lang="sk">Archív tar (komprimovaný pomocou lrzip)</comment>
+ <comment xml:lang="sk">Archív Tar (komprimovaný pomocou lrzip)</comment>
<comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z lrzip)</comment>
<comment xml:lang="sr">Тар архива (запакована лрзипом)</comment>
<comment xml:lang="sv">Tar-arkiv (lrzip-komprimerat)</comment>
<comment xml:lang="tr">Tar arşivi (lrzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">архів tar (стиснений lrzip)</comment>
- <comment xml:lang="zh_CN">Tar 归档文件（lrzip 压缩）</comment>
- <comment xml:lang="zh_TW">Tar 封存檔 (lrzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">Tar 归档文件（lrzip 压缩）</comment>
+ <comment xml:lang="zh-TW">Tar 封存檔 (lrzip 格式壓縮)</comment>
<generic-icon name="package-x-generic"/>
<sub-class-of type="application/x-lrzip"/>
<glob pattern="*.tar.lrz"/>
@@ -8468,6 +8694,7 @@
</mime-type>
<mime-type type="application/x-apple-diskimage">
<comment>Apple disk image</comment>
+ <comment xml:lang="af">Apple-skyfbeeldlêer</comment>
<comment xml:lang="ast">Imaxe de discu d'Apple</comment>
<comment xml:lang="bg">Диск — Apple</comment>
<comment xml:lang="ca">imatge de disc d'Apple</comment>
@@ -8475,11 +8702,12 @@
<comment xml:lang="da">Apple-diskaftryk</comment>
<comment xml:lang="de">Apple-Datenträgerabbild</comment>
<comment xml:lang="el">Εικόνα δίσκου Apple</comment>
- <comment xml:lang="en_GB">Apple disk image</comment>
+ <comment xml:lang="en-GB">Apple disk image</comment>
<comment xml:lang="es">imagen de disco de Apple</comment>
<comment xml:lang="eu">Apple disko irudia</comment>
<comment xml:lang="fi">Apple-levytiedosto</comment>
<comment xml:lang="fr">image disque Apple</comment>
+ <comment xml:lang="fur">imagjin disc Apple</comment>
<comment xml:lang="ga">íomhá diosca Apple</comment>
<comment xml:lang="gl">imaxe de disco de Appl</comment>
<comment xml:lang="he">תמונת כונן Apple</comment>
@@ -8497,7 +8725,7 @@
<comment xml:lang="oc">imatge disc Apple</comment>
<comment xml:lang="pl">Obraz dysku Apple</comment>
<comment xml:lang="pt">imagem de disco Apple</comment>
- <comment xml:lang="pt_BR">Imagem de disco Apple</comment>
+ <comment xml:lang="pt-BR">Imagem de disco Apple</comment>
<comment xml:lang="ru">Образ диска Apple Mac OS X</comment>
<comment xml:lang="sk">Obraz disku Apple</comment>
<comment xml:lang="sl">Odtis diska Apple</comment>
@@ -8505,23 +8733,26 @@
<comment xml:lang="sv">Apple-diskavbild</comment>
<comment xml:lang="tr">Apple disk görüntüsü</comment>
<comment xml:lang="uk">образ диска Apple</comment>
- <comment xml:lang="zh_CN">Apple 磁盘映像</comment>
- <comment xml:lang="zh_TW">Apple 磁碟映像檔</comment>
+ <comment xml:lang="zh-CN">Apple 磁盘映像</comment>
+ <comment xml:lang="zh-TW">Apple 磁碟映像檔</comment>
<glob pattern="*.dmg"/>
</mime-type>
<mime-type type="application/x-raw-disk-image">
<comment>Raw disk image</comment>
+ <comment xml:lang="af">Rou skyfbeeldlêer</comment>
<comment xml:lang="ast">Imaxe de discu en bruto</comment>
+ <comment xml:lang="bg">Диск — raw</comment>
<comment xml:lang="ca">imatge de disc RAW</comment>
<comment xml:lang="cs">surový obraz disku</comment>
- <comment xml:lang="da">Rå diskaftryk</comment>
+ <comment xml:lang="da">Raw-diskaftryk</comment>
<comment xml:lang="de">Rohes Datenträgerabbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα δίσκου</comment>
- <comment xml:lang="en_GB">Raw disk image</comment>
+ <comment xml:lang="en-GB">Raw disk image</comment>
<comment xml:lang="es">imagen de disco en bruto</comment>
<comment xml:lang="eu">Disko gordinaren irudia</comment>
<comment xml:lang="fi">Raaka levytiedosto</comment>
<comment xml:lang="fr">image disque Raw</comment>
+ <comment xml:lang="fur">imagjin disc grese</comment>
<comment xml:lang="ga">Amhíomha diosca</comment>
<comment xml:lang="gl">Imaxe de disco en bruto</comment>
<comment xml:lang="he">דמות גולמית של כונן</comment>
@@ -8535,21 +8766,50 @@
<comment xml:lang="oc">imatge disc Raw</comment>
<comment xml:lang="pl">Surowy obraz dysku</comment>
<comment xml:lang="pt">imagem de disco Raw</comment>
- <comment xml:lang="pt_BR">Imagem bruta de disco</comment>
+ <comment xml:lang="pt-BR">Imagem bruta de disco</comment>
<comment xml:lang="ru">Необработанный образ диска</comment>
<comment xml:lang="sk">Obraz disku</comment>
<comment xml:lang="sl">Surovi odtis diska</comment>
<comment xml:lang="sr">сиров одраз диска</comment>
<comment xml:lang="sv">Rå diskavbild</comment>
- <comment xml:lang="tr">İşlem görmemiş disk imajı</comment>
+ <comment xml:lang="tr">Ham disk görüntüsü</comment>
<comment xml:lang="uk">простий образ диска</comment>
- <comment xml:lang="zh_CN">原始磁盘映像</comment>
- <comment xml:lang="zh_TW">原生磁碟映像檔</comment>
+ <comment xml:lang="zh-CN">原始磁盘映像</comment>
+ <comment xml:lang="zh-TW">原始磁碟映像檔</comment>
<glob pattern="*.raw-disk-image"/>
<glob pattern="*.img"/>
</mime-type>
<mime-type type="application/x-raw-floppy-disk-image">
<comment>Floppy disk image</comment>
+ <comment xml:lang="af">Disket-skyfbeeldlêer</comment>
+ <comment xml:lang="bg">Диск — флопи</comment>
+ <comment xml:lang="ca">imatge de disquet</comment>
+ <comment xml:lang="cs">obraz diskety</comment>
+ <comment xml:lang="da">Floppy-diskaftryk</comment>
+ <comment xml:lang="de">Diskettenabbild</comment>
+ <comment xml:lang="en-GB">Floppy disk image</comment>
+ <comment xml:lang="es">imagen de disquete</comment>
+ <comment xml:lang="eu">Diskete disko irudia</comment>
+ <comment xml:lang="fi">Disketin levykuva</comment>
+ <comment xml:lang="fr">image disquette</comment>
+ <comment xml:lang="fur">imagjin disc floppy</comment>
+ <comment xml:lang="ga">íomhá diosca fhlapaigh</comment>
+ <comment xml:lang="hr">Slika diskete</comment>
+ <comment xml:lang="hu">Flopi lemezkép</comment>
+ <comment xml:lang="id">Image disk floppy</comment>
+ <comment xml:lang="it">Immagine disco floppy</comment>
+ <comment xml:lang="kk">Иілгіш диск бейнесі</comment>
+ <comment xml:lang="ko">플로피 디스크 이미지</comment>
+ <comment xml:lang="pl">Obraz dyskietki</comment>
+ <comment xml:lang="pt">imagem da disquete</comment>
+ <comment xml:lang="pt-BR">Imagem de disco flexível</comment>
+ <comment xml:lang="ru">Образ гибкого диска</comment>
+ <comment xml:lang="sk">Obraz pružného disku</comment>
+ <comment xml:lang="sv">Diskettavbild</comment>
+ <comment xml:lang="tr">Disket görüntüsü</comment>
+ <comment xml:lang="uk">образ дискети</comment>
+ <comment xml:lang="zh-CN">软盘映像</comment>
+ <comment xml:lang="zh-TW">Floppy 軟碟映像檔</comment>
<sub-class-of type="application/x-raw-disk-image"/>
<alias type="application/x-fd-file"/>
<glob pattern="*.fd"/>
@@ -8557,22 +8817,25 @@
</mime-type>
<mime-type type="application/x-raw-disk-image-xz-compressed">
<comment>Raw disk image (XZ-compressed)</comment>
+ <comment xml:lang="af">Rou skyfbeeldlêer (XZ-saamgepers)</comment>
<comment xml:lang="ast">Imaxe de discu en bruto (comprimida en XZ)</comment>
+ <comment xml:lang="bg">Диск — raw, компресиран с xz</comment>
<comment xml:lang="ca">imatge de disc RAW (amb compressió XZ)</comment>
<comment xml:lang="cs">surový obraz disku (komprimovaný pomocí XZ)</comment>
- <comment xml:lang="da">Rå diskaftryk (XZ-komprimeret)</comment>
+ <comment xml:lang="da">Raw-diskaftryk (XZ-komprimeret)</comment>
<comment xml:lang="de">Rohes Datenträgerabbild (XZ-komprimiert)</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα δίσκου (συμπιεσμένη XZ)</comment>
- <comment xml:lang="en_GB">Raw disk image (XZ-compressed)</comment>
+ <comment xml:lang="en-GB">Raw disk image (XZ-compressed)</comment>
<comment xml:lang="es">imagen de disco en bruto (comprimida con XZ)</comment>
<comment xml:lang="eu">Disko gordinaren irudia (XZ-rekin konprimitua)</comment>
<comment xml:lang="fi">Raaka levytiedosto (XZ-pakattu)</comment>
<comment xml:lang="fr">image disque Raw (compression XZ)</comment>
+ <comment xml:lang="fur">imagjin disc grese (comprimude cun XZ)</comment>
<comment xml:lang="ga">Amhíomhá (comhbhrúite le XZ)</comment>
<comment xml:lang="gl">Imaxe de disco en bruto (comprimida en XZ)</comment>
<comment xml:lang="he">דמות גולמית של כונן (בדחיסת XZ)</comment>
<comment xml:lang="hr">Osnovna slika diska (XZ sažeta)</comment>
- <comment xml:lang="hu">Nyers lemezkép (XZ-vel tömörítve)</comment>
+ <comment xml:lang="hu">Nyers lemezkép (XZ tömörítésű)</comment>
<comment xml:lang="ia">Imagine de disco crude (comprimite con XZ)</comment>
<comment xml:lang="id">Image disk mentah (terkompresi XZ)</comment>
<comment xml:lang="it">Immagine disco raw (compressa XZ)</comment>
@@ -8581,38 +8844,40 @@
<comment xml:lang="oc">imatge disc Raw (compression XZ)</comment>
<comment xml:lang="pl">Surowy obraz dysku (kompresja XZ)</comment>
<comment xml:lang="pt">imagem de disco Raw (compressão XZ)</comment>
- <comment xml:lang="pt_BR">Imagem bruta de disco (compactada com XZ)</comment>
+ <comment xml:lang="pt-BR">Imagem bruta de disco (compactada com XZ)</comment>
<comment xml:lang="ru">Необработанный образ диска (сжатый xz)</comment>
<comment xml:lang="sk">Obraz disku (komprimovaný pomocou XZ)</comment>
<comment xml:lang="sl">Surovi odtis diska (stisnjeno z XZ)</comment>
<comment xml:lang="sr">сиров одраз диска (запакована ИксЗ-ом)</comment>
<comment xml:lang="sv">Rå diskavbild (XZ-komprimerad)</comment>
- <comment xml:lang="tr">İşlem görmemiş disk imajı (XZ ile sıkıştırılmış)</comment>
+ <comment xml:lang="tr">Ham disk görüntüsü (XZ ile sıkıştırılmış)</comment>
<comment xml:lang="uk">простий образ диска (стиснений XZ)</comment>
- <comment xml:lang="zh_CN">原始磁盘映像（XZ 压缩）</comment>
- <comment xml:lang="zh_TW">原生磁碟映像 (XZ 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">原始磁盘映像（XZ 压缩）</comment>
+ <comment xml:lang="zh-TW">原始磁碟映像檔 (XZ 壓縮)</comment>
<sub-class-of type="application/x-xz"/>
<glob pattern="*.raw-disk-image.xz"/>
<glob pattern="*.img.xz"/>
</mime-type>
<mime-type type="application/x-cd-image">
<comment>raw CD image</comment>
+ <comment xml:lang="af">rou CD-beeldlêer</comment>
<comment xml:lang="ar">صورة CD خامة</comment>
<comment xml:lang="ast">imaxe de CD en bruto</comment>
- <comment xml:lang="be@latin">suvoraja vyjava CD</comment>
- <comment xml:lang="bg">Изображение — raw CD</comment>
+ <comment xml:lang="be-Latn">suvoraja vyjava CD</comment>
+ <comment xml:lang="bg">Диск — raw CD</comment>
<comment xml:lang="ca">imatge de CD en cru</comment>
<comment xml:lang="cs">surový obraz CD</comment>
- <comment xml:lang="da">rå cd-aftryk</comment>
+ <comment xml:lang="da">raw cd-aftryk</comment>
<comment xml:lang="de">CD-Roh-Abbild</comment>
<comment xml:lang="el">Εικόνα περιεχομένου ψηφιακού δίσκου</comment>
- <comment xml:lang="en_GB">raw CD image</comment>
+ <comment xml:lang="en-GB">raw CD image</comment>
<comment xml:lang="eo">kruda lumdiskbildo</comment>
<comment xml:lang="es">imagen de CD en bruto</comment>
<comment xml:lang="eu">CD gordinaren irudia </comment>
<comment xml:lang="fi">raaka CD-vedos</comment>
<comment xml:lang="fo">rá CD mynd</comment>
<comment xml:lang="fr">image CD brute</comment>
+ <comment xml:lang="fur">imagjin CD grese</comment>
<comment xml:lang="ga">amhíomhá dhlúthdhiosca</comment>
<comment xml:lang="gl">imaxe de CD en bruto</comment>
<comment xml:lang="he">תמונת דיסק גולמית</comment>
@@ -8633,7 +8898,7 @@
<comment xml:lang="oc">imatge CD brut</comment>
<comment xml:lang="pl">Surowy obraz CD</comment>
<comment xml:lang="pt">imagem em bruto de CD</comment>
- <comment xml:lang="pt_BR">Imagem bruta de CD</comment>
+ <comment xml:lang="pt-BR">Imagem bruta de CD</comment>
<comment xml:lang="ro">imagine de CD brută</comment>
<comment xml:lang="ru">Необработанный образ компакт-диска</comment>
<comment xml:lang="sk">Surový obraz CD</comment>
@@ -8641,48 +8906,64 @@
<comment xml:lang="sq">Imazh raw CD</comment>
<comment xml:lang="sr">сиров одраз ЦД-а</comment>
<comment xml:lang="sv">rå cd-avbild</comment>
- <comment xml:lang="tr">Ham CD görüntüsü</comment>
+ <comment xml:lang="tr">ham CD görüntüsü</comment>
<comment xml:lang="uk">образ raw CD</comment>
<comment xml:lang="vi">ảnh đĩa CD thô</comment>
- <comment xml:lang="zh_CN">原始 CD 映像</comment>
- <comment xml:lang="zh_TW">原生 CD 映像檔</comment>
+ <comment xml:lang="zh-CN">原始 CD 映像</comment>
+ <comment xml:lang="zh-TW">原生 CD 映像檔</comment>
<sub-class-of type="application/x-raw-disk-image"/>
<alias type="application/x-iso9660-image"/>
-
- <glob weight="80" pattern="*.iso"/>
+ <!-- No magic, see https://bugs.freedesktop.org/show_bug.cgi?id=10049 -->
+ <glob pattern="*.iso" weight="80"/>
<glob pattern="*.iso9660"/>
</mime-type>
+ <mime-type type="application/x-compressed-iso">
+ <comment>Compressed CD image</comment>
+ <comment xml:lang="ca">imatge de CD amb compressió</comment>
+ <comment xml:lang="fi">Pakattu CD-levykuva</comment>
+ <comment xml:lang="it">Immagine CD compressa</comment>
+ <comment xml:lang="pl">Skompresowany obraz płyty CD</comment>
+ <comment xml:lang="uk">стиснений образ CD</comment>
+ <magic priority="50">
+ <match value="CISO" type="string" offset="0"/>
+ </magic>
+ <glob pattern="*.cso"/>
+ </mime-type>
<mime-type type="application/x-iso9660-appimage">
<comment>AppImage application bundle</comment>
+ <comment xml:lang="af">AppImage-toepassingsbundel</comment>
+ <comment xml:lang="bg">Програмен пакет — AppImage</comment>
<comment xml:lang="ca">paquet d'aplicació AppImage</comment>
<comment xml:lang="cs">balíček AppImage s aplikací</comment>
- <comment xml:lang="da">Applmage-programsamling</comment>
+ <comment xml:lang="da">AppImage-programsamling</comment>
<comment xml:lang="de">AppImage-Anwendungspaket</comment>
- <comment xml:lang="en_GB">AppImage application bundle</comment>
+ <comment xml:lang="en-GB">AppImage application bundle</comment>
<comment xml:lang="es">paquete de aplicación AppImage</comment>
<comment xml:lang="eu">AppImage aplikazio bilduma</comment>
<comment xml:lang="fi">AppImage-sovelluspaketti</comment>
<comment xml:lang="fr">lot applicatif AppImage</comment>
+ <comment xml:lang="fur">côl di aplicazions AppImage</comment>
<comment xml:lang="ga">burla feidhmchláir AppImage</comment>
<comment xml:lang="he">חבילת יישומי AppImage</comment>
<comment xml:lang="hr">AppImage paket aplikacije</comment>
<comment xml:lang="hu">AppImage alkalmazáscsomag</comment>
- <comment xml:lang="id">bundel aplikasi AppImage</comment>
+ <comment xml:lang="id">Bundel aplikasi AppImage</comment>
<comment xml:lang="it">Bundle applicazione AppImage</comment>
<comment xml:lang="kk">AppImage қолданбалар дестесі</comment>
<comment xml:lang="ko">AppImage 프로그램 번들</comment>
<comment xml:lang="pl">Pakiet programu AppImage</comment>
- <comment xml:lang="pt_BR">Pacote de aplicativo AppImage</comment>
+ <comment xml:lang="pt">pacote de aplicação AppImage</comment>
+ <comment xml:lang="pt-BR">Pacote de aplicativo AppImage</comment>
<comment xml:lang="ru">Пакет приложения AppImage</comment>
<comment xml:lang="sk">Balík aplikácií AppImage</comment>
<comment xml:lang="sr">скуп програма Ап-слике</comment>
<comment xml:lang="sv">AppImage-programbunt</comment>
<comment xml:lang="tr">AppImage uygulama paketi</comment>
<comment xml:lang="uk">пакунок із програмами AppImage</comment>
- <comment xml:lang="zh_CN">AppImage 应用组合包</comment>
- <comment xml:lang="zh_TW">AppImage 應用程式套組</comment>
+ <comment xml:lang="zh-CN">AppImage 应用组合包</comment>
+ <comment xml:lang="zh-TW">AppImage 應用程式套組</comment>
<sub-class-of type="application/x-executable"/>
- <sub-class-of type="application/x-iso9660-image"/>
+ <sub-class-of type="application/x-cd-image"/>
<generic-icon name="application-x-executable"/>
<magic priority="50">
<match value="ELF" type="string" offset="1">
@@ -8697,20 +8978,22 @@
</mime-type>
<mime-type type="application/x-cdrdao-toc">
<comment>CD Table Of Contents</comment>
+ <comment xml:lang="af">CD-inhoudsopgawe</comment>
<comment xml:lang="ar">جدول محتويات الـ CD</comment>
- <comment xml:lang="be@latin">Źmieściva CD</comment>
+ <comment xml:lang="be-Latn">Źmieściva CD</comment>
<comment xml:lang="bg">Съдържание на CD</comment>
<comment xml:lang="ca">taula de continguts de CD</comment>
<comment xml:lang="cs">obsah CD</comment>
- <comment xml:lang="da">Cd-indholdsfotegnelse</comment>
+ <comment xml:lang="da">Cd-indholdsfortegnelse</comment>
<comment xml:lang="de">CD-Inhaltsverzeichnis</comment>
<comment xml:lang="el">Πίνακας περιεχομένων CD</comment>
- <comment xml:lang="en_GB">CD Table Of Contents</comment>
+ <comment xml:lang="en-GB">CD Table Of Contents</comment>
<comment xml:lang="es">índice de contenido de CD</comment>
<comment xml:lang="eu">CDaren edukien aurkibidea</comment>
<comment xml:lang="fi">CD-sisällysluettelo</comment>
<comment xml:lang="fo">CD innihaldsyvurlit</comment>
<comment xml:lang="fr">table des matières de CD</comment>
+ <comment xml:lang="fur">tabele dai contignûts di CD</comment>
<comment xml:lang="ga">clár ábhar dlúthdhiosca</comment>
<comment xml:lang="gl">táboa de contidos de CD</comment>
<comment xml:lang="he">תוכן עניינים של דיסק</comment>
@@ -8730,7 +9013,7 @@
<comment xml:lang="oc">ensenhador de CD</comment>
<comment xml:lang="pl">Plik zawartości płyty CD</comment>
<comment xml:lang="pt">Tabela de conteúdos de CD</comment>
- <comment xml:lang="pt_BR">Sumário de CD</comment>
+ <comment xml:lang="pt-BR">Sumário de CD</comment>
<comment xml:lang="ro">Tabel conținut CD</comment>
<comment xml:lang="ru">Таблица содержания CD</comment>
<comment xml:lang="sk">Obsah CD</comment>
@@ -8741,37 +9024,64 @@
<comment xml:lang="tr">CD İçindekiler Tablosu</comment>
<comment xml:lang="uk">зміст CD</comment>
<comment xml:lang="vi">Mục Lục của đĩa CD</comment>
- <comment xml:lang="zh_CN">CD 索引</comment>
- <comment xml:lang="zh_TW">CD 內容目錄</comment>
+ <comment xml:lang="zh-CN">CD 索引</comment>
+ <comment xml:lang="zh-TW">CD 內容目錄</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<magic priority="50">
- <match value="CD_ROM\n" type="string" offset="0"/>
- <match value="CD_DA\n" type="string" offset="0"/>
- <match value="CD_ROM_XA\n" type="string" offset="0"/>
- <match value="CD_TEXT " type="string" offset="0"/>
- <match value="CATALOG &quot;" type="string" offset="0">
- <match value="&quot;" type="string" offset="22"/>
+ <match type="string" value="CD_ROM\n" offset="0"/>
+ <match type="string" value="CD_DA\n" offset="0"/>
+ <match type="string" value="CD_ROM_XA\n" offset="0"/>
+ <match type="string" value="CD_TEXT " offset="0"/>
+ <match type="string" value="CATALOG &quot;" offset="0">
+ <match type="string" value="&quot;" offset="22"/>
</match>
</magic>
<glob pattern="*.toc"/>
</mime-type>
+ <mime-type type="application/x-gd-rom-cue">
+ <comment>GD-ROM image cuesheet</comment>
+ <comment xml:lang="ca">«cuesheet» d'imatge de GD-ROM</comment>
+ <comment xml:lang="fi">GD-ROM levykuvan taulukko</comment>
+ <comment xml:lang="it">Cuesheet immagine GD-ROM</comment>
+ <comment xml:lang="pl">Obraz cuesheet płyty GD-ROM</comment>
+ <comment xml:lang="uk">таблиця CUE образу GD-ROM</comment>
+ <!-- It is a non-standard cuesheet used only for Dreamcast GD-ROM images, it
+ is typically surrounded by the .bin and .raw files it lists, each one
+ matching a disc track.
+ The first file should have the application/x-dreamcast-rom type. -->
+ <sub-class-of type="text/plain"/>
+ <generic-icon name="text-x-generic"/>
+ <glob pattern="*.gdi"/>
+ </mime-type>
+ <mime-type type="application/x-discjuggler-cd-image">
+ <comment>Padus DiscJuggler CD image</comment>
+ <comment xml:lang="ca">imatge de CD de Padus DiscJuggler</comment>
+ <comment xml:lang="fi">Padus DiscJuggler CD-levykuva</comment>
+ <comment xml:lang="it">Immagine CD DiscJuggler Padus</comment>
+ <comment xml:lang="pl">Obraz płyty CD programu Padus DiscJuggler</comment>
+ <comment xml:lang="pt-BR">Imagem de CD do Padus DiscJuggler</comment>
+ <comment xml:lang="uk">образ CD Padus DiscJuggler</comment>
+ <glob pattern="*.cdi"/>
+ </mime-type>
<mime-type type="application/vnd.chess-pgn">
<comment>PGN chess game notation</comment>
+ <comment xml:lang="af">PGN-skaakspelnotasie</comment>
<comment xml:lang="ar">تدوينة لعبة الشطرنج PGN</comment>
- <comment xml:lang="be@latin">Zaciem ab šachmatnaj partyi PGN</comment>
+ <comment xml:lang="be-Latn">Zaciem ab šachmatnaj partyi PGN</comment>
<comment xml:lang="bg">Игра шах — PGN</comment>
<comment xml:lang="ca">notació de joc d'escacs PGN</comment>
<comment xml:lang="cs">šachová notace PGN</comment>
<comment xml:lang="da">PGN-skakspilsnotation</comment>
<comment xml:lang="de">PGN-Schachspielnotation</comment>
<comment xml:lang="el">Σημειογραφία παιχνιδιού σκακιού PGN</comment>
- <comment xml:lang="en_GB">PGN chess game notation</comment>
+ <comment xml:lang="en-GB">PGN chess game notation</comment>
<comment xml:lang="es">notación para juegos de ajedrez PGN</comment>
<comment xml:lang="eu">PGN xake jokoaren notazioa</comment>
<comment xml:lang="fi">PGN-šakkipelinotaatio</comment>
<comment xml:lang="fo">PGN talv teknskipan</comment>
<comment xml:lang="fr">notation de jeu d'échecs PGN</comment>
+ <comment xml:lang="fur">notazion par zûc di scacs PGN</comment>
<comment xml:lang="ga">nodaireacht chluiche ficheall PGN</comment>
<comment xml:lang="gl">Notación de xogo de xadrez PGN</comment>
<comment xml:lang="he">סימון משחק שח PGN</comment>
@@ -8791,7 +9101,7 @@
<comment xml:lang="oc">notacion de jòc d'escacs PGN</comment>
<comment xml:lang="pl">Plik PGN notacji gry w szachy</comment>
<comment xml:lang="pt">notação de jogo de xadrez PGN</comment>
- <comment xml:lang="pt_BR">Notação de jogo de xadrez PGN</comment>
+ <comment xml:lang="pt-BR">Notação de jogo de xadrez PGN</comment>
<comment xml:lang="ro">Notație joc șah PGN</comment>
<comment xml:lang="ru">Шахматная партия PGN</comment>
<comment xml:lang="sk">Šachová notácia PGN</comment>
@@ -8802,36 +9112,38 @@
<comment xml:lang="tr">PGN satranç oyun gösterimi</comment>
<comment xml:lang="uk">запис гри у шахи PGN</comment>
<comment xml:lang="vi">Cách ghi lượt chơi cờ PGN</comment>
- <comment xml:lang="zh_CN">PGN 象棋游戏注记</comment>
- <comment xml:lang="zh_TW">PGN 國際象棋棋譜</comment>
+ <comment xml:lang="zh-CN">PGN 象棋游戏注记</comment>
+ <comment xml:lang="zh-TW">PGN 國際象棋棋譜</comment>
<acronym>PGN</acronym>
<expanded-acronym>Portable Game Notation</expanded-acronym>
<generic-icon name="text-x-generic"/>
<glob pattern="*.pgn"/>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="[Event " type="string" offset="0"/>
+ <match type="string" value="[Event " offset="0"/>
</magic>
<alias type="application/x-chess-pgn"/>
</mime-type>
<mime-type type="application/vnd.ms-htmlhelp">
<comment>CHM document</comment>
+ <comment xml:lang="af">CHM-dokument</comment>
<comment xml:lang="ar">مستند CHM</comment>
<comment xml:lang="ast">Documentu CHM</comment>
- <comment xml:lang="be@latin">Dakument CHM</comment>
+ <comment xml:lang="be-Latn">Dakument CHM</comment>
<comment xml:lang="bg">Документ — CHM</comment>
<comment xml:lang="ca">document CHM</comment>
<comment xml:lang="cs">dokument CHM</comment>
<comment xml:lang="da">CHM-dokument</comment>
<comment xml:lang="de">CHM-Dokument</comment>
<comment xml:lang="el">Έγγραφο CHM</comment>
- <comment xml:lang="en_GB">CHM document</comment>
+ <comment xml:lang="en-GB">CHM document</comment>
<comment xml:lang="eo">CHM-dokumento</comment>
<comment xml:lang="es">documento CHM</comment>
<comment xml:lang="eu">CHM dokumentua</comment>
<comment xml:lang="fi">CHM-asiakirja</comment>
<comment xml:lang="fo">CHM skjal</comment>
<comment xml:lang="fr">document CHM</comment>
+ <comment xml:lang="fur">document CHM</comment>
<comment xml:lang="ga">cáipéis CHM</comment>
<comment xml:lang="gl">documento CHM</comment>
<comment xml:lang="he">מסמך CHM</comment>
@@ -8852,7 +9164,7 @@
<comment xml:lang="oc">document CHM</comment>
<comment xml:lang="pl">Dokument CHM</comment>
<comment xml:lang="pt">documento CHM</comment>
- <comment xml:lang="pt_BR">Documento CHM</comment>
+ <comment xml:lang="pt-BR">Documento CHM</comment>
<comment xml:lang="ro">Document CHM</comment>
<comment xml:lang="ru">Документ CHM</comment>
<comment xml:lang="sk">Dokument CHM</comment>
@@ -8863,8 +9175,8 @@
<comment xml:lang="tr">CHM belgesi</comment>
<comment xml:lang="uk">документ CHM</comment>
<comment xml:lang="vi">Tài liệu CHM</comment>
- <comment xml:lang="zh_CN">CHM 文档</comment>
- <comment xml:lang="zh_TW">CHM 文件</comment>
+ <comment xml:lang="zh-CN">CHM 文档</comment>
+ <comment xml:lang="zh-TW">CHM 文件</comment>
<acronym>CHM</acronym>
<expanded-acronym>Compiled Help Modules</expanded-acronym>
<generic-icon name="x-office-document"/>
@@ -8873,23 +9185,25 @@
</mime-type>
<mime-type type="application/x-class-file">
<comment>Java byte code</comment>
+ <comment xml:lang="af">Java binêre kode</comment>
<comment xml:lang="ar">رمز بايت الـJava</comment>
<comment xml:lang="az">Java bayt kodu</comment>
- <comment xml:lang="be@latin">Bajtavy kod Java</comment>
+ <comment xml:lang="be-Latn">Bajtavy kod Java</comment>
<comment xml:lang="bg">Байт код за Java</comment>
- <comment xml:lang="ca">Bytecode de Java</comment>
+ <comment xml:lang="ca">bytecode de Java</comment>
<comment xml:lang="cs">bajtový kód Java</comment>
<comment xml:lang="cy">Côd beit Java</comment>
- <comment xml:lang="da">Javabytekode</comment>
+ <comment xml:lang="da">Java-bytekode</comment>
<comment xml:lang="de">Java-Bytecode</comment>
<comment xml:lang="el">Συμβολοκώδικας Java</comment>
- <comment xml:lang="en_GB">Java byte code</comment>
+ <comment xml:lang="en-GB">Java byte code</comment>
<comment xml:lang="eo">Java-bajtkodo</comment>
<comment xml:lang="es">bytecode de Java</comment>
<comment xml:lang="eu">Java byte-kodea</comment>
<comment xml:lang="fi">Java-tavukoodi</comment>
<comment xml:lang="fo">Java býtkota</comment>
<comment xml:lang="fr">code Java binaire</comment>
+ <comment xml:lang="fur">bytecode di Java</comment>
<comment xml:lang="ga">beartchód Java</comment>
<comment xml:lang="gl">byte code de Java</comment>
<comment xml:lang="he">קוד Java byte</comment>
@@ -8910,7 +9224,7 @@
<comment xml:lang="oc">còde Java binari</comment>
<comment xml:lang="pl">Kod bajtowy Java</comment>
<comment xml:lang="pt">byte-code Java</comment>
- <comment xml:lang="pt_BR">Código compilado Java</comment>
+ <comment xml:lang="pt-BR">Código compilado Java</comment>
<comment xml:lang="ro">Bytecode Java</comment>
<comment xml:lang="ru">Байт-код Java</comment>
<comment xml:lang="sk">Bajtový kód Java</comment>
@@ -8921,31 +9235,33 @@
<comment xml:lang="tr">Java derlenmiş kodu</comment>
<comment xml:lang="uk">Байт-код Java</comment>
<comment xml:lang="vi">Mã byte Java</comment>
- <comment xml:lang="zh_CN">Java 字节码</comment>
- <comment xml:lang="zh_TW">Java 位元組碼</comment>
+ <comment xml:lang="zh-CN">Java 字节码</comment>
+ <comment xml:lang="zh-TW">Java 位元組碼</comment>
</mime-type>
<mime-type type="application/x-compress">
<comment>UNIX-compressed file</comment>
+ <comment xml:lang="af">UNIX-saamgepersde lêer</comment>
<comment xml:lang="ar">ملف يونكس-مضغوط</comment>
- <comment xml:lang="be@latin">Skampresavany UNIX-fajł</comment>
+ <comment xml:lang="be-Latn">Skampresavany UNIX-fajł</comment>
<comment xml:lang="bg">Файл — компресиран за UNIX</comment>
<comment xml:lang="ca">fitxer amb compressió UNIX</comment>
<comment xml:lang="cs">soubor komprimovaný v Unixu</comment>
<comment xml:lang="da">UNIX-komprimeret fil</comment>
<comment xml:lang="de">UNIX-komprimierte Datei</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο UNIX</comment>
- <comment xml:lang="en_GB">UNIX-compressed file</comment>
+ <comment xml:lang="en-GB">UNIX-compressed file</comment>
<comment xml:lang="eo">UNIX-kunpremita dosiero</comment>
<comment xml:lang="es">archivo comprimido de Unix</comment>
<comment xml:lang="eu">UNIX-en konprimitutako fitxategia</comment>
<comment xml:lang="fi">UNIX-pakattu tiedosto</comment>
<comment xml:lang="fo">UNIX-stappað fíla</comment>
<comment xml:lang="fr">fichier compressé UNIX</comment>
+ <comment xml:lang="fur">file comprimût di UNIX</comment>
<comment xml:lang="ga">comhad UNIX-comhbhrúite</comment>
<comment xml:lang="gl">ficheiro comprimido de UNIX</comment>
<comment xml:lang="he">קובץ בכיווץ UNIX</comment>
<comment xml:lang="hr">UNIX sažeta datoteka</comment>
- <comment xml:lang="hu">Tömörített UNIX-fájl</comment>
+ <comment xml:lang="hu">UNIX tömörítésű fájl</comment>
<comment xml:lang="ia">File comprimite de UNIX</comment>
<comment xml:lang="id">Berkas terkompresi UNIX</comment>
<comment xml:lang="it">File compresso-UNIX</comment>
@@ -8961,7 +9277,7 @@
<comment xml:lang="oc">fichièr compressat UNIX</comment>
<comment xml:lang="pl">Skompresowany plik systemu UNIX</comment>
<comment xml:lang="pt">ficheiro comprimido UNIX</comment>
- <comment xml:lang="pt_BR">Arquivo compactado do UNIX</comment>
+ <comment xml:lang="pt-BR">Arquivo compactado do UNIX</comment>
<comment xml:lang="ro">Fișier comprimat UNIX</comment>
<comment xml:lang="ru">Файл (UNIX-сжатый)</comment>
<comment xml:lang="sk">Súbor komprimovaný v Unixe</comment>
@@ -8972,35 +9288,37 @@
<comment xml:lang="tr">UNIX-sıkıştırılmış dosyası</comment>
<comment xml:lang="uk">стиснений файл UNIX</comment>
<comment xml:lang="vi">Tập tin đã nén UNIX</comment>
- <comment xml:lang="zh_CN">UNIX 压缩文件</comment>
- <comment xml:lang="zh_TW">UNIX 格式壓縮檔</comment>
+ <comment xml:lang="zh-CN">UNIX 压缩文件</comment>
+ <comment xml:lang="zh-TW">UNIX 壓縮檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="50">
- <match value="\037\235" type="string" offset="0"/>
+ <match type="string" value="\037\235" offset="0"/>
</magic>
<glob pattern="*.Z"/>
</mime-type>
<mime-type type="application/x-compressed-tar">
<comment>Tar archive (gzip-compressed)</comment>
+ <comment xml:lang="af">Tar-argief (gzip-saamgepers)</comment>
<comment xml:lang="ar">أرشيف Tar (مضغوط-gzip)</comment>
- <comment xml:lang="be@latin">Archiŭ tar (gzip-skampresavany)</comment>
+ <comment xml:lang="be-Latn">Archiŭ tar (gzip-skampresavany)</comment>
<comment xml:lang="bg">Архив — tar, компресиран с gzip</comment>
<comment xml:lang="ca">arxiu tar (amb compressió gzip)</comment>
<comment xml:lang="cs">archiv tar (komprimovaný pomocí gzip)</comment>
<comment xml:lang="da">Tar-arkiv (gzip-komprimeret)</comment>
<comment xml:lang="de">Tar-Archiv (gzip-komprimiert)</comment>
<comment xml:lang="el">Αρχείο Tar (συμπιεσμένο με gzip)</comment>
- <comment xml:lang="en_GB">Tar archive (gzip-compressed)</comment>
+ <comment xml:lang="en-GB">Tar archive (gzip-compressed)</comment>
<comment xml:lang="es">archivador Tar (comprimido con gzip)</comment>
<comment xml:lang="eu">Tar artxiboa (gzip-ekin konprimitua)</comment>
<comment xml:lang="fi">Tar-arkisto (gzip-pakattu)</comment>
<comment xml:lang="fo">Tar skjalasavn (gzip-stappað)</comment>
<comment xml:lang="fr">archive tar (compressée gzip)</comment>
+ <comment xml:lang="fur">archivi Tar (comprimût cun gzip)</comment>
<comment xml:lang="ga">cartlann Tar (comhbhrúite le gzip)</comment>
<comment xml:lang="gl">arquivo Tar (comprimido con gzip)</comment>
<comment xml:lang="he">ארכיון Tar (מכווץ ע״י gzip)</comment>
<comment xml:lang="hr">Tar arhiva (gzip sažeta)</comment>
- <comment xml:lang="hu">Tar archívum (gzip-pel tömörítve)</comment>
+ <comment xml:lang="hu">Tar archívum (gzip tömörítésű)</comment>
<comment xml:lang="ia">Archivo Tar (comprimite con gzip)</comment>
<comment xml:lang="id">Arsip Tar (terkompresi gzip)</comment>
<comment xml:lang="it">Archivio tar (compresso con gzip)</comment>
@@ -9015,10 +9333,10 @@
<comment xml:lang="oc">archiu tar (compressat gzip)</comment>
<comment xml:lang="pl">Archiwum tar (kompresja gzip)</comment>
<comment xml:lang="pt">arquivo Tar (compressão gzip)</comment>
- <comment xml:lang="pt_BR">Pacote Tar (compactado com gzip)</comment>
+ <comment xml:lang="pt-BR">Pacote Tar (compactado com gzip)</comment>
<comment xml:lang="ro">Arhivă Tar (comprimată gzip)</comment>
<comment xml:lang="ru">Архив TAR (сжатый gzip)</comment>
- <comment xml:lang="sk">Archív tar (komprimovaný pomocou gzip)</comment>
+ <comment xml:lang="sk">Archív Tar (komprimovaný pomocou gzip)</comment>
<comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z gzip)</comment>
<comment xml:lang="sq">Arkiv tar (i kompresuar me gzip)</comment>
<comment xml:lang="sr">Тар архива (запакована гзипом)</comment>
@@ -9026,8 +9344,8 @@
<comment xml:lang="tr">Tar arşivi (gzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">архів tar (стиснений gzip)</comment>
<comment xml:lang="vi">Kho nén tar (đã nén gzip)</comment>
- <comment xml:lang="zh_CN">Tar 归档文件（gzip 压缩）</comment>
- <comment xml:lang="zh_TW">Tar 封存檔 (gzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">Tar 归档文件（gzip 压缩）</comment>
+ <comment xml:lang="zh-TW">Tar 封存檔 (gzip 壓縮)</comment>
<sub-class-of type="application/gzip"/>
<generic-icon name="package-x-generic"/>
<glob pattern="*.tar.gz"/>
@@ -9035,21 +9353,23 @@
</mime-type>
<mime-type type="application/x-core">
<comment>program crash data</comment>
+ <comment xml:lang="af">programomvaldata</comment>
<comment xml:lang="ar">معلومات انهيار البرنامج</comment>
- <comment xml:lang="be@latin">źviestki złamanaj prahramy</comment>
+ <comment xml:lang="be-Latn">źviestki złamanaj prahramy</comment>
<comment xml:lang="bg">Данни от забиване на програма</comment>
<comment xml:lang="ca">dades de fallada de programa</comment>
<comment xml:lang="cs">data o pádu programu</comment>
<comment xml:lang="da">programnedbrudsdata</comment>
<comment xml:lang="de">Daten zu Programmabsturz</comment>
<comment xml:lang="el">δεδομένα από την κατάρρευση προγράμματος</comment>
- <comment xml:lang="en_GB">program crash data</comment>
+ <comment xml:lang="en-GB">program crash data</comment>
<comment xml:lang="eo">datumo pri kraŝo de programo</comment>
<comment xml:lang="es">datos de cuelgue de programa</comment>
<comment xml:lang="eu">programaren kraskaduraren datuak</comment>
<comment xml:lang="fi">ohjelman kaatumistiedot</comment>
<comment xml:lang="fo">forrits sordáta</comment>
<comment xml:lang="fr">données de plantage de programme</comment>
+ <comment xml:lang="fur">dâts di colàs di program</comment>
<comment xml:lang="ga">sonraí tuairte ríomhchláir</comment>
<comment xml:lang="gl">datos de colgue do programa</comment>
<comment xml:lang="he">מידע מקריסת תכנית</comment>
@@ -9070,7 +9390,7 @@
<comment xml:lang="oc">donadas de plantage de programa</comment>
<comment xml:lang="pl">Dane awarii programu</comment>
<comment xml:lang="pt">dados de rebentamento de aplicação</comment>
- <comment xml:lang="pt_BR">Dados de travamento de programa</comment>
+ <comment xml:lang="pt-BR">Dados de travamento de programa</comment>
<comment xml:lang="ro">date eroare program</comment>
<comment xml:lang="ru">Данные аварийного завершения программы</comment>
<comment xml:lang="sk">Údaje o páde programu</comment>
@@ -9081,31 +9401,32 @@
<comment xml:lang="tr">program çökme verisi</comment>
<comment xml:lang="uk">аварійні дані про програму</comment>
<comment xml:lang="vi">dữ liệu sụp đổ chương trình</comment>
- <comment xml:lang="zh_CN">程序崩溃数据</comment>
- <comment xml:lang="zh_TW">程式當掉資料</comment>
+ <comment xml:lang="zh-CN">程序崩溃数据</comment>
+ <comment xml:lang="zh-TW">程式當掉資料</comment>
<magic priority="50">
- <match value="\177ELF \004" type="string" offset="0" mask="0xffffffff000000000000000000000000ff"/>
- <match value="\177ELF" type="string" offset="0">
- <match value="1" type="byte" offset="5">
- <match value="4" type="little16" offset="16"/>
+ <match type="string" mask="0xffffffff000000000000000000000000ff" value="\177ELF \004" offset="0"/>
+ <match type="string" value="\177ELF" offset="0">
+ <match type="byte" value="1" offset="5">
+ <match type="little16" value="4" offset="16"/>
</match>
</match>
- <match value="\177ELF" type="string" offset="0">
- <match value="2" type="byte" offset="5">
- <match value="4" type="big16" offset="16"/>
+ <match type="string" value="\177ELF" offset="0">
+ <match type="byte" value="2" offset="5">
+ <match type="big16" value="4" offset="16"/>
</match>
</match>
- <match value="Core\001" type="string" offset="0"/>
- <match value="Core\002" type="string" offset="0"/>
+ <match type="string" value="Core\001" offset="0"/>
+ <match type="string" value="Core\002" offset="0"/>
</magic>
<glob pattern="core" case-sensitive="true"/>
</mime-type>
<mime-type type="application/x-cpio">
<comment>CPIO archive</comment>
+ <comment xml:lang="af">CPIO-argief</comment>
<comment xml:lang="ar">أرشيف CPIO</comment>
<comment xml:lang="ast">Archivu CPIO</comment>
<comment xml:lang="az">CPIO arxivi</comment>
- <comment xml:lang="be@latin">Archiŭ CPIO</comment>
+ <comment xml:lang="be-Latn">Archiŭ CPIO</comment>
<comment xml:lang="bg">Архив — CPIO</comment>
<comment xml:lang="ca">arxiu CPIO</comment>
<comment xml:lang="cs">archiv CPIO</comment>
@@ -9113,13 +9434,14 @@
<comment xml:lang="da">CPIO-arkiv</comment>
<comment xml:lang="de">CPIO-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο CPIO</comment>
- <comment xml:lang="en_GB">CPIO archive</comment>
+ <comment xml:lang="en-GB">CPIO archive</comment>
<comment xml:lang="eo">CPIO-arkivo</comment>
<comment xml:lang="es">archivador CPIO</comment>
<comment xml:lang="eu">CPIO artxiboa</comment>
<comment xml:lang="fi">CPIO-arkisto</comment>
<comment xml:lang="fo">CPIO skjalasavn</comment>
<comment xml:lang="fr">archive CPIO</comment>
+ <comment xml:lang="fur">archivi CPIO</comment>
<comment xml:lang="ga">cartlann CPIO</comment>
<comment xml:lang="gl">arquivo CPIO</comment>
<comment xml:lang="he">ארכיון CPIO</comment>
@@ -9141,7 +9463,7 @@
<comment xml:lang="oc">archiu CPIO</comment>
<comment xml:lang="pl">Archiwum CPIO</comment>
<comment xml:lang="pt">arquivo CPIO</comment>
- <comment xml:lang="pt_BR">Pacote CPIO</comment>
+ <comment xml:lang="pt-BR">Pacote CPIO</comment>
<comment xml:lang="ro">Arhivă CPIO</comment>
<comment xml:lang="ru">Архив CPIO</comment>
<comment xml:lang="sk">Archív CPIO</comment>
@@ -9152,22 +9474,23 @@
<comment xml:lang="tr">CPIO arşivi</comment>
<comment xml:lang="uk">архів CPIO</comment>
<comment xml:lang="vi">Kho nén CPIO</comment>
- <comment xml:lang="zh_CN">CPIO 归档文件</comment>
- <comment xml:lang="zh_TW">CPIO 封存檔</comment>
+ <comment xml:lang="zh-CN">CPIO 归档文件</comment>
+ <comment xml:lang="zh-TW">CPIO 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="070707" type="host16" offset="0"/>
- <match value="070701" type="string" offset="0"/>
- <match value="070702" type="string" offset="0"/>
- <match value="0143561" type="host16" offset="0"/>
+ <match type="host16" value="070707" offset="0"/>
+ <match type="string" value="070701" offset="0"/>
+ <match type="string" value="070702" offset="0"/>
+ <match type="host16" value="0143561" offset="0"/>
</magic>
<glob pattern="*.cpio"/>
</mime-type>
<mime-type type="application/x-cpio-compressed">
<comment>CPIO archive (gzip-compressed)</comment>
+ <comment xml:lang="af">CPIO-argief (gzip-saamgepers)</comment>
<comment xml:lang="ar">أرشيف CPIO (مضغوط-gzip)</comment>
<comment xml:lang="az">CPIO arxivi (gzip ilə sıxışdırılmış)</comment>
- <comment xml:lang="be@latin">Archiŭ CPIO (gzip-skampresavany)</comment>
+ <comment xml:lang="be-Latn">Archiŭ CPIO (gzip-skampresavany)</comment>
<comment xml:lang="bg">Архив — CPIO, компресиран с gzip</comment>
<comment xml:lang="ca">arxiu CPIO (amb compressió gzip)</comment>
<comment xml:lang="cs">archiv CPIO (komprimovaný pomocí gzip)</comment>
@@ -9175,18 +9498,19 @@
<comment xml:lang="da">CPIO-arkiv (gzip-komprimeret)</comment>
<comment xml:lang="de">CPIO-Archiv (gzip-komprimiert)</comment>
<comment xml:lang="el">Αρχείο CPIO (συμπιεσμένο με gzip)</comment>
- <comment xml:lang="en_GB">CPIO archive (gzip-compressed)</comment>
+ <comment xml:lang="en-GB">CPIO archive (gzip-compressed)</comment>
<comment xml:lang="eo">CPIO-arkivo (kunpremita per gzip)</comment>
<comment xml:lang="es">archivador CPIO (comprimido con gzip)</comment>
<comment xml:lang="eu">CPIO artxiboa (gzip-ekin konprimitua)</comment>
<comment xml:lang="fi">CPIO-arkisto (gzip-pakattu)</comment>
<comment xml:lang="fo">CPIO skjalasavn (gzip-stappað)</comment>
<comment xml:lang="fr">archive CPIO (compressé gzip)</comment>
+ <comment xml:lang="fur">archivi CPIO (comprimût cun gzip)</comment>
<comment xml:lang="ga">cartlann CPIO (comhbhrúite le gzip)</comment>
<comment xml:lang="gl">arquivo CPIO (comprimido con gzip)</comment>
<comment xml:lang="he">ארכיון CPIO (מכווץ ע״י gzip)</comment>
<comment xml:lang="hr">CPIO arhiva (gzip sažeta)</comment>
- <comment xml:lang="hu">CPIO-archívum (gzip-pel tömörítve)</comment>
+ <comment xml:lang="hu">CPIO archívum (gzip tömörítésű)</comment>
<comment xml:lang="ia">Archivo CPIO (comprimite con gzip)</comment>
<comment xml:lang="id">Arsip CPIO (terkompresi gzip)</comment>
<comment xml:lang="it">Archivio CPIO (compresso con gzip)</comment>
@@ -9203,7 +9527,7 @@
<comment xml:lang="oc">archiu CPIO (compressat gzip)</comment>
<comment xml:lang="pl">Archiwum CPIO (kompresja gzip)</comment>
<comment xml:lang="pt">arquivo CPIO (compressão gzip)</comment>
- <comment xml:lang="pt_BR">Pacote CPIO (compactado com gzip)</comment>
+ <comment xml:lang="pt-BR">Pacote CPIO (compactado com gzip)</comment>
<comment xml:lang="ro">Arhivă CPIO (compresie gzip)</comment>
<comment xml:lang="ru">Архив CPIO (сжатый gzip)</comment>
<comment xml:lang="sk">Archív CPIO (komprimovaný pomocou gzip)</comment>
@@ -9214,17 +9538,18 @@
<comment xml:lang="tr">CPIO arşivi (gzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">архів CPIO (стиснений gzip)</comment>
<comment xml:lang="vi">Kho nén CPIO (đã nén gzip)</comment>
- <comment xml:lang="zh_CN">CPIO 归档文件（gzip 压缩）</comment>
- <comment xml:lang="zh_TW">CPIO 封存檔 (gzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">CPIO 归档文件（gzip 压缩）</comment>
+ <comment xml:lang="zh-TW">CPIO 封存檔 (gzip 壓縮)</comment>
<sub-class-of type="application/gzip"/>
<generic-icon name="package-x-generic"/>
<glob pattern="*.cpio.gz"/>
</mime-type>
<mime-type type="application/x-csh">
<comment>C shell script</comment>
+ <comment xml:lang="af">C shell-skrip</comment>
<comment xml:lang="ar">سكربت شِل سي</comment>
<comment xml:lang="az">C qabıq skripti</comment>
- <comment xml:lang="be@latin">Skrypt abałonki C</comment>
+ <comment xml:lang="be-Latn">Skrypt abałonki C</comment>
<comment xml:lang="bg">Скрипт — обвивка C</comment>
<comment xml:lang="ca">script C shell</comment>
<comment xml:lang="cs">skript shellu C</comment>
@@ -9232,13 +9557,14 @@
<comment xml:lang="da">C-skalprogram</comment>
<comment xml:lang="de">C-Shell-Skript</comment>
<comment xml:lang="el">Δέσμη ενεργειών κελύφους C</comment>
- <comment xml:lang="en_GB">C shell script</comment>
+ <comment xml:lang="en-GB">C shell script</comment>
<comment xml:lang="eo">skripto de C-ŝelo</comment>
<comment xml:lang="es">secuencia de órdenes de consola en C</comment>
<comment xml:lang="eu">C shell script-a</comment>
<comment xml:lang="fi">Csh-komentotiedosto</comment>
<comment xml:lang="fo">C skel boðrøð</comment>
<comment xml:lang="fr">script C shell</comment>
+ <comment xml:lang="fur">script di shell in C</comment>
<comment xml:lang="ga">script bhlaoisce C</comment>
<comment xml:lang="gl">script de C shell</comment>
<comment xml:lang="he">תסריט מעטפת C</comment>
@@ -9259,7 +9585,7 @@
<comment xml:lang="oc">escript C shell</comment>
<comment xml:lang="pl">Skrypt powłoki C</comment>
<comment xml:lang="pt">script de terminal C</comment>
- <comment xml:lang="pt_BR">Script de shell C</comment>
+ <comment xml:lang="pt-BR">Script de shell C</comment>
<comment xml:lang="ro">Script C shell</comment>
<comment xml:lang="ru">Сценарий C shell</comment>
<comment xml:lang="sk">Skript shellu C</comment>
@@ -9270,37 +9596,39 @@
<comment xml:lang="tr">C kabuk betiği</comment>
<comment xml:lang="uk">скрипт оболонки C</comment>
<comment xml:lang="vi">Văn lệnh trình bao C</comment>
- <comment xml:lang="zh_CN">C shell 脚本</comment>
- <comment xml:lang="zh_TW">C shell 指令稿</comment>
+ <comment xml:lang="zh-CN">C shell 脚本</comment>
+ <comment xml:lang="zh-TW">C shell 指令稿</comment>
<sub-class-of type="application/x-shellscript"/>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-script"/>
<magic>
- <match value="/bin/tcsh" type="string" offset="2:16"/>
- <match value="/bin/csh" type="string" offset="2:16"/>
- <match value="/bin/env csh" type="string" offset="2:16"/>
- <match value="/bin/env tcsh" type="string" offset="2:16"/>
+ <match type="string" value="/bin/tcsh" offset="2:16"/>
+ <match type="string" value="/bin/csh" offset="2:16"/>
+ <match type="string" value="/bin/env csh" offset="2:16"/>
+ <match type="string" value="/bin/env tcsh" offset="2:16"/>
</magic>
<glob pattern="*.csh"/>
</mime-type>
<mime-type type="application/x-dbf">
<comment>Xbase document</comment>
+ <comment xml:lang="af">Xbase-dokument</comment>
<comment xml:lang="ar">مستند Xbase</comment>
<comment xml:lang="ast">Documentu Xbase</comment>
- <comment xml:lang="be@latin">Dakument Xbase</comment>
+ <comment xml:lang="be-Latn">Dakument Xbase</comment>
<comment xml:lang="bg">Документ — Xbase</comment>
<comment xml:lang="ca">document Xbase</comment>
<comment xml:lang="cs">dokument Xbase</comment>
<comment xml:lang="da">Xbasedokument</comment>
<comment xml:lang="de">Xbase-Dokument</comment>
<comment xml:lang="el">Έγγραφο Xbase</comment>
- <comment xml:lang="en_GB">Xbase document</comment>
+ <comment xml:lang="en-GB">Xbase document</comment>
<comment xml:lang="eo">Xbase-dokumento</comment>
<comment xml:lang="es">documento Xbase</comment>
<comment xml:lang="eu">Xbase dokumentua</comment>
<comment xml:lang="fi">Xbase-asiakirja</comment>
<comment xml:lang="fo">Xbase skjal</comment>
<comment xml:lang="fr">document Xbase</comment>
+ <comment xml:lang="fur">document Xbase</comment>
<comment xml:lang="ga">cáipéis Xbase</comment>
<comment xml:lang="gl">documento Xbase</comment>
<comment xml:lang="he">מסמך Xbase</comment>
@@ -9320,7 +9648,7 @@
<comment xml:lang="oc">document Xbase</comment>
<comment xml:lang="pl">Dokument Xbase</comment>
<comment xml:lang="pt">documento Xbase</comment>
- <comment xml:lang="pt_BR">Documento do Xbase</comment>
+ <comment xml:lang="pt-BR">Documento do Xbase</comment>
<comment xml:lang="ro">Document Xbase</comment>
<comment xml:lang="ru">Документ Xbase</comment>
<comment xml:lang="sk">Dokument Xbase</comment>
@@ -9331,8 +9659,8 @@
<comment xml:lang="tr">Xbase belgesi</comment>
<comment xml:lang="uk">документ Xbase</comment>
<comment xml:lang="vi">Tài liệu Xbase</comment>
- <comment xml:lang="zh_CN">Xbase 文档</comment>
- <comment xml:lang="zh_TW">Xbase 文件</comment>
+ <comment xml:lang="zh-CN">Xbase 文档</comment>
+ <comment xml:lang="zh-TW">Xbase 文件</comment>
<generic-icon name="x-office-document"/>
<glob pattern="*.dbf"/>
<alias type="application/x-dbase"/>
@@ -9341,20 +9669,22 @@
</mime-type>
<mime-type type="application/ecmascript">
<comment>ECMAScript program</comment>
+ <comment xml:lang="af">ECMAScript-program</comment>
<comment xml:lang="ar">برنامج ECMAScript</comment>
- <comment xml:lang="be@latin">Prahrama ECMAScript</comment>
+ <comment xml:lang="be-Latn">Prahrama ECMAScript</comment>
<comment xml:lang="bg">Програма — ECMAScript</comment>
<comment xml:lang="ca">programa ECMAScript</comment>
<comment xml:lang="cs">program v jazyce ECMAScript</comment>
- <comment xml:lang="da">ECMA-program</comment>
+ <comment xml:lang="da">ECMAScript-program</comment>
<comment xml:lang="de">ECMAScript-Programm</comment>
<comment xml:lang="el">Πρόγραμμα ECMAScript</comment>
- <comment xml:lang="en_GB">ECMAScript program</comment>
+ <comment xml:lang="en-GB">ECMAScript program</comment>
<comment xml:lang="es">programa en ECMAScript</comment>
<comment xml:lang="eu">ECMAScript programa</comment>
<comment xml:lang="fi">ECMAScript-ohjelma</comment>
<comment xml:lang="fo">ECMAScript forrit</comment>
<comment xml:lang="fr">programme ECMAScript</comment>
+ <comment xml:lang="fur">program ECMAScript</comment>
<comment xml:lang="ga">ríomhchlár ECMAScript</comment>
<comment xml:lang="gl">programa en ECMAScript</comment>
<comment xml:lang="he">תכנית EMCAScript</comment>
@@ -9375,7 +9705,7 @@
<comment xml:lang="oc">programa ECMAEscript</comment>
<comment xml:lang="pl">Pogram ECMAScript</comment>
<comment xml:lang="pt">programa ECMAScript</comment>
- <comment xml:lang="pt_BR">Programa ECMAScript</comment>
+ <comment xml:lang="pt-BR">Programa ECMAScript</comment>
<comment xml:lang="ro">Program ECMAScript</comment>
<comment xml:lang="ru">Программа ECMAScript</comment>
<comment xml:lang="sk">Program ECMAScript</comment>
@@ -9386,105 +9716,131 @@
<comment xml:lang="tr">ECMAScript programı</comment>
<comment xml:lang="uk">програма мовою ECMAScript</comment>
<comment xml:lang="vi">Chương trình ECMAScript</comment>
- <comment xml:lang="zh_CN">ECMAScript 程序</comment>
- <comment xml:lang="zh_TW">ECMAScript 程式</comment>
+ <comment xml:lang="zh-CN">ECMAScript 程序</comment>
+ <comment xml:lang="zh-TW">ECMAScript 程式</comment>
<alias type="text/ecmascript"/>
- <sub-class-of type='application/x-executable'/>
+ <sub-class-of type="application/x-executable"/>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-script"/>
<glob pattern="*.es"/>
</mime-type>
+ <mime-type type="application/x-mame-chd">
+ <comment>MAME compressed hard disk image</comment>
+ <comment xml:lang="ca">imatge de disc dur MAME amb compressió</comment>
+ <comment xml:lang="fi">MAME-pakatun kiintolevyn levykuva</comment>
+ <comment xml:lang="it">Immagine disco MAME compressa</comment>
+ <comment xml:lang="pl">Skompresowany obraz dysku twardego MAME</comment>
+ <comment xml:lang="uk">стиснений образ жорсткого диска MAME</comment>
+ <generic-icon name="application-x-executable"/>
+ <magic priority="50">
+ <match type="string" value="MComprHD" offset="0"/>
+ </magic>
+ <glob pattern="*.chd"/>
+ </mime-type>
<mime-type type="application/x-sega-cd-rom">
-
+ <!-- Translate this to Mega-CD if the console was known as such in your locale
+ Should be Mega-CD in all but en_US, Mexico, Canada and Brazil: https://en.wikipedia.org/wiki/Sega_CD -->
<comment>Sega CD disc image</comment>
+ <comment xml:lang="af">Mega CD-skyfbeeldlêer</comment>
<comment xml:lang="ast">Imaxe de discu de Sega CD</comment>
+ <comment xml:lang="bg">Диск — Mega-CD (Sega)</comment>
<comment xml:lang="ca">imatge de disc de Sega CD</comment>
<comment xml:lang="cs">obraz disku CD pro Sega</comment>
<comment xml:lang="da">Sega CD-diskaftryk</comment>
<comment xml:lang="de">Sega-CD-Datenträgerabbild</comment>
- <comment xml:lang="en_GB">Sega CD disc image</comment>
+ <comment xml:lang="en-GB">Sega CD disc image</comment>
<comment xml:lang="es">imagen de disco CD de Sega</comment>
<comment xml:lang="eu">Sega CD disko irudia</comment>
<comment xml:lang="fi">Sega CD -levykuva</comment>
<comment xml:lang="fr">image disque Sega CD</comment>
+ <comment xml:lang="fur">imagjin disc CD Sega</comment>
<comment xml:lang="ga">íomhá dlúthdhiosca Sega</comment>
<comment xml:lang="he">דמות כונן Sega CD</comment>
<comment xml:lang="hr">Sega CD slika diska</comment>
<comment xml:lang="hu">Sega CD-lemezkép</comment>
- <comment xml:lang="id">image cakram CD Sega</comment>
+ <comment xml:lang="id">Image cakram CD Sega</comment>
<comment xml:lang="it">Immagine disco Sega Mega CD</comment>
<comment xml:lang="kk">Sega CD диск бейнесі</comment>
<comment xml:lang="ko">세가 CD 디스크 이미지</comment>
<comment xml:lang="pl">Obraz płyty konsoli Mega-CD</comment>
- <comment xml:lang="pt_BR">Imagem de disco Sega CD</comment>
+ <comment xml:lang="pt">imagem de disco Mega-CD</comment>
+ <comment xml:lang="pt-BR">Imagem de disco Sega CD</comment>
<comment xml:lang="ru">Образ диска CD Sega</comment>
<comment xml:lang="sk">Obraz disku CD Sega</comment>
<comment xml:lang="sr">одраз диска Сега ЦД-а</comment>
<comment xml:lang="sv">Mega-CD-skivavbild</comment>
- <comment xml:lang="tr">Sega CD disk kalıbı</comment>
+ <comment xml:lang="tr">Sega CD disk görüntüsü</comment>
<comment xml:lang="uk">образ диска Sega CD</comment>
- <comment xml:lang="zh_CN">Sega CD 光盘映像</comment>
- <comment xml:lang="zh_TW">Sega CD 光碟映像檔</comment>
+ <comment xml:lang="zh-CN">Sega CD 光盘映像</comment>
+ <comment xml:lang="zh-TW">Sega CD 光碟映像檔</comment>
<generic-icon name="application-x-executable"/>
-
+ <!-- Also matches the application/x-genesis-rom magic values, hence the higher priority -->
<magic priority="60">
- <match value="SEGADISCSYSTEM" type="string" offset="0">
- <match value="SEGA" type="string" offset="256"/>
+ <match type="string" value="SEGADISCSYSTEM" offset="0">
+ <match type="string" value="SEGA" offset="256"/>
</match>
- <match value="SEGADISCSYSTEM" type="string" offset="16">
- <match value="SEGA" type="string" offset="272"/>
+ <match type="string" value="SEGADISCSYSTEM" offset="16">
+ <match type="string" value="SEGA" offset="272"/>
</match>
</magic>
- <glob pattern="*.bin"/>
<glob pattern="*.iso"/>
</mime-type>
<mime-type type="application/x-sega-pico-rom">
-
+ <!-- Translate this to Kids Computer Pico if the console was known as such in your locale
+ Should be Sega Pico in all but Japan: https://en.wikipedia.org/wiki/Sega_Pico -->
<comment>Sega Pico ROM</comment>
<comment xml:lang="ast">ROM de Sega Pico</comment>
+ <comment xml:lang="bg">ROM — Sega Pico</comment>
<comment xml:lang="ca">ROM de Sega Pico</comment>
<comment xml:lang="cs">ROM pro Sega Pico</comment>
+ <comment xml:lang="da">Sega Pico-ROM</comment>
<comment xml:lang="de">Sega Pico ROM</comment>
- <comment xml:lang="en_GB">Sega Pico ROM</comment>
+ <comment xml:lang="en-GB">Sega Pico ROM</comment>
<comment xml:lang="es">ROM de Sega Pico</comment>
<comment xml:lang="eu">Sega Pico ROM</comment>
<comment xml:lang="fi">Sega Pico ROM</comment>
<comment xml:lang="fr">ROM Sega Pico</comment>
+ <comment xml:lang="fur">ROM Sega Pico</comment>
<comment xml:lang="ga">ROM Sega Pico</comment>
<comment xml:lang="hr">Sega Pico ROM</comment>
<comment xml:lang="hu">Sega Pico ROM</comment>
<comment xml:lang="id">ROM Sega Pico</comment>
<comment xml:lang="it">ROM Sega Pico</comment>
<comment xml:lang="kk">Sega Pico ROM</comment>
- <comment xml:lang="ko">세카 피코 롬</comment>
+ <comment xml:lang="ko">세가 피코 롬</comment>
<comment xml:lang="pl">Plik ROM konsoli Sega Pico</comment>
- <comment xml:lang="pt_BR">ROM de Sega Pico</comment>
+ <comment xml:lang="pt">ROM Sega Pico</comment>
+ <comment xml:lang="pt-BR">ROM de Sega Pico</comment>
<comment xml:lang="ru">Sega Pico ROM</comment>
<comment xml:lang="sk">ROM pre Sega Pico</comment>
<comment xml:lang="sr">Сега Пико РОМ</comment>
<comment xml:lang="sv">Sega Pico-rom</comment>
<comment xml:lang="tr">Sega Pico ROM</comment>
<comment xml:lang="uk">ППП Sega Pico</comment>
- <comment xml:lang="zh_CN">Sega Pico ROM</comment>
- <comment xml:lang="zh_TW">Sega Pico ROM</comment>
+ <comment xml:lang="zh-CN">Sega Pico ROM</comment>
+ <comment xml:lang="zh-TW">Sega Pico ROM</comment>
<generic-icon name="application-x-executable"/>
<magic priority="50">
- <match value="SEGA PICO" type="string" offset="256"/>
+ <match type="string" value="SEGA PICO" offset="256"/>
</magic>
+ <glob pattern="*.iso"/>
</mime-type>
<mime-type type="application/x-saturn-rom">
<comment>Sega Saturn disc image</comment>
+ <comment xml:lang="af">Sega Saturn-skyfbeeldlêer</comment>
<comment xml:lang="ast">Imaxe de discu de Sega Saturn</comment>
+ <comment xml:lang="bg">Диск — Sega Saturn</comment>
<comment xml:lang="ca">imatge de disc de Sega Saturn</comment>
<comment xml:lang="cs">obraz disku pro Sega Saturn</comment>
<comment xml:lang="da">Sega Saturn-diskaftryk</comment>
<comment xml:lang="de">Sega-Saturn-Datenträgerabbild</comment>
<comment xml:lang="el">Εικόνα δίσκου Sega Saturn</comment>
- <comment xml:lang="en_GB">Sega Saturn disc image</comment>
+ <comment xml:lang="en-GB">Sega Saturn disc image</comment>
<comment xml:lang="es">imagen de disco de Sega Saturn</comment>
<comment xml:lang="eu">Sega Saturn disko irudia</comment>
<comment xml:lang="fi">Sega Saturn -levykuva</comment>
<comment xml:lang="fr">image disque Sega Saturn</comment>
+ <comment xml:lang="fur">imagjin disc Sega Saturn</comment>
<comment xml:lang="ga">íomhá diosca Sega Saturn</comment>
<comment xml:lang="he">דמות כונן Sega Saturn</comment>
<comment xml:lang="hr">Sega Saturn slika diska</comment>
@@ -9497,76 +9853,73 @@
<comment xml:lang="oc">imatge disc Sega Saturn</comment>
<comment xml:lang="pl">Obraz płyty konsoli Sega Saturn</comment>
<comment xml:lang="pt">imagem de disco Sega Saturn</comment>
- <comment xml:lang="pt_BR">Imagem de disco do Sega Saturn</comment>
+ <comment xml:lang="pt-BR">Imagem de disco do Sega Saturn</comment>
<comment xml:lang="ru">Образ диска Sega Saturn</comment>
<comment xml:lang="sk">Obraz disku Sega Saturn</comment>
<comment xml:lang="sr">одраз диска Сега Сатурна</comment>
<comment xml:lang="sv">Sega Saturn-skivavbild</comment>
- <comment xml:lang="tr">Sega Saturn disk kalıbı</comment>
+ <comment xml:lang="tr">Sega Saturn disk görüntüsü</comment>
<comment xml:lang="uk">образ диска Sega Saturn</comment>
- <comment xml:lang="zh_CN">Sega Saturn 光盘映像</comment>
- <comment xml:lang="zh_TW">Sega Saturn 光碟映像檔</comment>
+ <comment xml:lang="zh-CN">Sega Saturn 光盘映像</comment>
+ <comment xml:lang="zh-TW">Sega Saturn 光碟映像檔</comment>
<generic-icon name="application-x-executable"/>
<magic priority="50">
- <match value="SEGA SEGASATURN" type="string" offset="0"/>
- <match value="SEGA SEGASATURN" type="string" offset="16"/>
+ <match type="string" value="SEGA SEGASATURN" offset="0"/>
+ <match type="string" value="SEGA SEGASATURN" offset="16"/>
</magic>
- <glob pattern="*.bin"/>
<glob pattern="*.iso"/>
</mime-type>
- <mime-type type="application/x-dc-rom">
- <comment>Dreamcast GD-ROM</comment>
- <comment xml:lang="ast">GD-ROM de Dreamcast</comment>
- <comment xml:lang="ca">GD-ROM de Dreamcast</comment>
- <comment xml:lang="cs">GD-ROM pro Dreamcast</comment>
- <comment xml:lang="da">Dreamcast GD-ROM</comment>
- <comment xml:lang="de">Dreamcast GD-ROM</comment>
- <comment xml:lang="el">Dreamcast GD-ROM</comment>
- <comment xml:lang="en_GB">Dreamcast GD-ROM</comment>
- <comment xml:lang="es">GD-ROM de Dreamcast</comment>
- <comment xml:lang="eu">Dreamcast GD-ROM</comment>
- <comment xml:lang="fr">GD-ROM Dreamcast</comment>
- <comment xml:lang="ga">GD-ROM Dreamcast</comment>
- <comment xml:lang="he">Dreamcast GD-ROM</comment>
- <comment xml:lang="hr">Dreamcast GD-ROM</comment>
- <comment xml:lang="hu">Dreamcast GD-ROM</comment>
- <comment xml:lang="ia">GD-ROM Dreamcast</comment>
- <comment xml:lang="id">GD-ROM Dreamcast</comment>
- <comment xml:lang="it">GD-ROM Dreamcast</comment>
- <comment xml:lang="kk">Dreamcast GD-ROM</comment>
- <comment xml:lang="ko">드림캐스트 GD-ROM</comment>
- <comment xml:lang="oc">GD-ROM Dreamcast</comment>
- <comment xml:lang="pl">Plik GD-ROM konsoli Dreamcast</comment>
- <comment xml:lang="pt">GD-ROM Dreamcast</comment>
- <comment xml:lang="pt_BR">GD-ROM de Dreamcast</comment>
- <comment xml:lang="ru">Dreamcast GD-ROM</comment>
- <comment xml:lang="sk">Dreamcast GD-ROM</comment>
- <comment xml:lang="sr">Дримкаст ГД-РОМ</comment>
- <comment xml:lang="sv">Dreamcast-gd-rom</comment>
- <comment xml:lang="tr">Dreamcast GD-ROM</comment>
- <comment xml:lang="uk">GD-ROM Dreamcast</comment>
- <comment xml:lang="zh_CN">Dreamcast CD-ROM</comment>
- <comment xml:lang="zh_TW">Dreamcast GD-ROM</comment>
+ <mime-type type="application/x-dreamcast-rom">
+ <comment>Dreamcast disc image</comment>
+ <comment xml:lang="bg">Диск — Dreamcast</comment>
+ <comment xml:lang="ca">imatge de disc de Dreamcast</comment>
+ <comment xml:lang="da">Dreamcast-diskaftryk</comment>
+ <comment xml:lang="de">Dreamcast-Datenträgerabbild</comment>
+ <comment xml:lang="en-GB">Dreamcast disc image</comment>
+ <comment xml:lang="es">imagen de disco de Dreamcast</comment>
+ <comment xml:lang="eu">Dreamcast disko irudia</comment>
+ <comment xml:lang="fi">Dreamcast-levykuva</comment>
+ <comment xml:lang="fr">image disque Dreamcast</comment>
+ <comment xml:lang="hr">Dreamcast slika disa</comment>
+ <comment xml:lang="hu">Dreamcast lemezkép</comment>
+ <comment xml:lang="id">Image cakram Dreamcast</comment>
+ <comment xml:lang="it">Immagine disco Dreamcast</comment>
+ <comment xml:lang="kk">Dreamcast диск бейнесі</comment>
+ <comment xml:lang="ko">드림캐스트 디스크 이미지</comment>
+ <comment xml:lang="pl">Obraz płyty konsoli Dreamcast</comment>
+ <comment xml:lang="pt">imagem de disco Dreamcast</comment>
+ <comment xml:lang="pt-BR">Imagem de disco do Dreamcast</comment>
+ <comment xml:lang="ru">Образ диска Dreamcast</comment>
+ <comment xml:lang="sk">Obraz disku Dreamcast</comment>
+ <comment xml:lang="sv">Dreamcast-skivavbild</comment>
+ <comment xml:lang="tr">Dreamcast disk görüntüsü</comment>
+ <comment xml:lang="uk">образ диска Dreamcast</comment>
+ <comment xml:lang="zh-CN">Dreamcast 光盘映像</comment>
+ <comment xml:lang="zh-TW">Dreamcast 光碟映像檔</comment>
<generic-icon name="application-x-executable"/>
- <glob pattern="*.dc"/>
+ <magic priority="50">
+ <match type="string" value="SEGA SEGAKATANA" offset="16"/>
+ </magic>
+ <glob pattern="*.iso"/>
</mime-type>
<mime-type type="application/x-nintendo-ds-rom">
<comment>Nintendo DS ROM</comment>
<comment xml:lang="ar">Nintendo DS ROM</comment>
<comment xml:lang="ast">ROM de Nintendo DS</comment>
- <comment xml:lang="be@latin">Nintendo DS ROM</comment>
+ <comment xml:lang="be-Latn">Nintendo DS ROM</comment>
<comment xml:lang="bg">ROM — Nintendo DS</comment>
<comment xml:lang="ca">ROM de Nintendo DS</comment>
<comment xml:lang="cs">ROM pro Nintendo DS</comment>
- <comment xml:lang="da">Nintendo DS-rom</comment>
+ <comment xml:lang="da">Nintendo DS-ROM</comment>
<comment xml:lang="de">Nintendo DS ROM</comment>
<comment xml:lang="el">Nintendo DS ROM</comment>
- <comment xml:lang="en_GB">Nintendo DS ROM</comment>
+ <comment xml:lang="en-GB">Nintendo DS ROM</comment>
<comment xml:lang="es">ROM de Nintendo DS</comment>
<comment xml:lang="eu">Nintendo DS-ko ROMa</comment>
<comment xml:lang="fi">Nintendo DS-ROM</comment>
<comment xml:lang="fo">Nintendo DS ROM</comment>
<comment xml:lang="fr">ROM Nintendo DS</comment>
+ <comment xml:lang="fur">ROM Nintendo DS</comment>
<comment xml:lang="ga">ROM Nintendo DS</comment>
<comment xml:lang="gl">ROM de Nintendo DS</comment>
<comment xml:lang="he">ROM של Nintendo</comment>
@@ -9586,7 +9939,7 @@
<comment xml:lang="oc">ROM Nintendo DS</comment>
<comment xml:lang="pl">Plik ROM konsoli Nintendo DS</comment>
<comment xml:lang="pt">ROM Nintendo DS</comment>
- <comment xml:lang="pt_BR">ROM de Nintendo DS</comment>
+ <comment xml:lang="pt-BR">ROM de Nintendo DS</comment>
<comment xml:lang="ro">ROM Nintendo DS</comment>
<comment xml:lang="ru">Nintendo DS ROM</comment>
<comment xml:lang="sk">ROM pre Nintendo DS</comment>
@@ -9597,24 +9950,54 @@
<comment xml:lang="tr">Nintendo DS ROM</comment>
<comment xml:lang="uk">ППП Nintendo</comment>
<comment xml:lang="vi">ROM DS Nintendo</comment>
- <comment xml:lang="zh_CN">任天堂 DS ROM</comment>
- <comment xml:lang="zh_TW">任天堂 DS ROM</comment>
+ <comment xml:lang="zh-CN">任天堂 DS ROM</comment>
+ <comment xml:lang="zh-TW">任天堂 DS ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.nds"/>
</mime-type>
+ <mime-type type="application/x-nintendo-3ds-rom">
+ <comment>Nintendo 3DS ROM</comment>
+ <comment xml:lang="ca">ROM de Nintendo 3DS</comment>
+ <comment xml:lang="fi">Nintendo 3DS ROM</comment>
+ <comment xml:lang="it">ROM Nintendo 3DS</comment>
+ <comment xml:lang="pl">Plik ROM konsoli Nintendo 3DS</comment>
+ <comment xml:lang="pt-BR">ROM do Nintendo 3DS</comment>
+ <comment xml:lang="uk">ППП Nintendo 3DS</comment>
+ <generic-icon name="application-x-executable"/>
+ <glob pattern="*.3ds"/>
+ <glob pattern="*.cci"/>
+ <magic>
+ <match offset="256" type="string" value="NCSD"/>
+ </magic>
+ </mime-type>
+ <mime-type type="application/x-nintendo-3ds-executable">
+ <comment>Nintendo 3DS Executable</comment>
+ <comment xml:lang="ca">executable de Nintendo 3DS</comment>
+ <comment xml:lang="fi">Nintendo 3DS suoritettava</comment>
+ <comment xml:lang="it">Eseguibile Nintendo 3DS</comment>
+ <comment xml:lang="pl">Plik wykonywalny konsoli Nintendo 3DS</comment>
+ <comment xml:lang="uk">виконуваний файл Nintendo 3DS</comment>
+ <generic-icon name="application-x-executable"/>
+ <glob pattern="*.3dsx"/>
+ <magic priority="40">
+ <match offset="0" type="string" value="3DSX"/>
+ </magic>
+ </mime-type>
<mime-type type="application/x-pc-engine-rom">
<comment>PC Engine ROM</comment>
<comment xml:lang="ast">ROM de PC Engine</comment>
+ <comment xml:lang="bg">ROM — PC Engine</comment>
<comment xml:lang="ca">ROM de PC Engine</comment>
<comment xml:lang="cs">ROM pro PC Engine</comment>
- <comment xml:lang="da">PC Engine ROM</comment>
+ <comment xml:lang="da">PC Engine-ROM</comment>
<comment xml:lang="de">PC Engine ROM</comment>
<comment xml:lang="el">PC Engine ROM</comment>
- <comment xml:lang="en_GB">PC Engine ROM</comment>
+ <comment xml:lang="en-GB">PC Engine ROM</comment>
<comment xml:lang="es">ROM de PC Engine</comment>
<comment xml:lang="eu">PC Engine ROM</comment>
<comment xml:lang="fi">PC Engine ROM</comment>
<comment xml:lang="fr">ROM PC Engine</comment>
+ <comment xml:lang="fur">ROM PC Engine</comment>
<comment xml:lang="ga">ROM PC Engine</comment>
<comment xml:lang="gl">ROM de máquina de PC</comment>
<comment xml:lang="he">ROM של PC Engine</comment>
@@ -9628,7 +10011,7 @@
<comment xml:lang="oc">ROM PC Engine</comment>
<comment xml:lang="pl">Plik ROM konsoli PC Engine</comment>
<comment xml:lang="pt">ROM PC Engine</comment>
- <comment xml:lang="pt_BR">ROM de PC Engine</comment>
+ <comment xml:lang="pt-BR">ROM de PC Engine</comment>
<comment xml:lang="ru">PC Engine ROM</comment>
<comment xml:lang="sk">PC Engine ROM</comment>
<comment xml:lang="sl">Pomnilnik PC Engine ROM</comment>
@@ -9636,24 +10019,27 @@
<comment xml:lang="sv">PC Engine-rom</comment>
<comment xml:lang="tr">PC Engine ROM</comment>
<comment xml:lang="uk">ROM для рушія на ПК</comment>
- <comment xml:lang="zh_CN">PC Engine ROM</comment>
- <comment xml:lang="zh_TW">PC Engine ROM</comment>
+ <comment xml:lang="zh-CN">PC Engine ROM</comment>
+ <comment xml:lang="zh-TW">PC Engine ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.pce"/>
</mime-type>
<mime-type type="application/x-wii-rom">
<comment>Wii disc image</comment>
+ <comment xml:lang="af">Wii-skyfbeeldlêer</comment>
<comment xml:lang="ast">Imaxe de discu de Wii</comment>
+ <comment xml:lang="bg">Диск — Wii</comment>
<comment xml:lang="ca">imatge de disc de Wii</comment>
<comment xml:lang="cs">obraz disku pro Wii</comment>
<comment xml:lang="da">Wii-diskaftryk</comment>
<comment xml:lang="de">Wii-Datenträgerabbild</comment>
<comment xml:lang="el">Εικόνα δίσκου Wii</comment>
- <comment xml:lang="en_GB">Wii disc image</comment>
+ <comment xml:lang="en-GB">Wii disc image</comment>
<comment xml:lang="es">imagen de disco de Wii</comment>
<comment xml:lang="eu">Wii disko irudia</comment>
<comment xml:lang="fi">Wii-levykuva</comment>
<comment xml:lang="fr">image disque Wii</comment>
+ <comment xml:lang="fur">imagjin disc Wii</comment>
<comment xml:lang="ga">íomhá diosca Wii</comment>
<comment xml:lang="gl">Imaxe de disco de Wii</comment>
<comment xml:lang="he">דמות כונן Wii</comment>
@@ -9667,7 +10053,7 @@
<comment xml:lang="oc">imatge disc Wii</comment>
<comment xml:lang="pl">Obraz płyty konsoli Wii</comment>
<comment xml:lang="pt">imagem de disco Wii</comment>
- <comment xml:lang="pt_BR">Imagem de disco Wii</comment>
+ <comment xml:lang="pt-BR">Imagem de disco Wii</comment>
<comment xml:lang="ru">Образ диска Wii</comment>
<comment xml:lang="sk">Obraz disku Wii</comment>
<comment xml:lang="sl">Odtis diska Wii</comment>
@@ -9675,29 +10061,33 @@
<comment xml:lang="sv">Wii-skivavbild</comment>
<comment xml:lang="tr">Wii disk görüntüsü</comment>
<comment xml:lang="uk">образ диска Wii</comment>
- <comment xml:lang="zh_CN">Wii 光盘映像</comment>
- <comment xml:lang="zh_TW">Wii 光碟映像檔</comment>
+ <comment xml:lang="zh-CN">Wii 光盘映像</comment>
+ <comment xml:lang="zh-TW">Wii 光碟映像檔</comment>
<alias type="application/x-wii-iso-image"/>
<alias type="application/x-wbfs"/>
<alias type="application/x-wia"/>
<generic-icon name="application-x-executable"/>
<glob pattern="*.iso"/>
<magic priority="50">
- <match value="0x5d1c9ea3" type="big32" offset="24"/>
- <match value="WBFS" type="string" offset="0"/>
- <match value="WII\001DISC" type="string" offset="0"/>
+ <match offset="24" type="big32" value="0x5d1c9ea3"/>
+ <match offset="0" type="string" value="WBFS"/>
+ <match offset="0" type="string" value="WII\001DISC"/>
</magic>
</mime-type>
<mime-type type="application/x-wii-wad">
<comment>WiiWare bundle</comment>
+ <comment xml:lang="af">WiiWare-bundel</comment>
+ <comment xml:lang="bg">Програмен пакет — WiiWare</comment>
<comment xml:lang="ca">paquet de WiiWare</comment>
<comment xml:lang="cs">balíček pro WiiWare</comment>
<comment xml:lang="da">WiiWare-samling</comment>
<comment xml:lang="de">WiiWare-Paket</comment>
- <comment xml:lang="en_GB">WiiWare bundle</comment>
+ <comment xml:lang="en-GB">WiiWare bundle</comment>
<comment xml:lang="es">conjunto de WiiWare</comment>
<comment xml:lang="eu">WiiWare bilduma</comment>
+ <comment xml:lang="fi">WiiWare-lisäpaketti</comment>
<comment xml:lang="fr">lot WiiWare</comment>
+ <comment xml:lang="fur">côl WiiWare</comment>
<comment xml:lang="ga">burla WiiWare</comment>
<comment xml:lang="he">מאגד WiiWare</comment>
<comment xml:lang="hr">WiiWare paket</comment>
@@ -9706,39 +10096,42 @@
<comment xml:lang="id">Bundel WiiWare</comment>
<comment xml:lang="it">Bundle WiiWare</comment>
<comment xml:lang="kk">WiiWare дестесі</comment>
- <comment xml:lang="ko">위-웨어 번들</comment>
+ <comment xml:lang="ko">WiiWare 번들</comment>
<comment xml:lang="oc">lòt WiiWare</comment>
<comment xml:lang="pl">Pakiet WiiWare</comment>
<comment xml:lang="pt">pacote WiiWare</comment>
- <comment xml:lang="pt_BR">Pacote WiiWare</comment>
+ <comment xml:lang="pt-BR">Pacote WiiWare</comment>
<comment xml:lang="ru">Пакет WiiWare</comment>
<comment xml:lang="sk">Balík WiiWare</comment>
<comment xml:lang="sr">ВииВер комплет</comment>
<comment xml:lang="sv">WiiWare-paket</comment>
<comment xml:lang="tr">WiiWare paketi</comment>
<comment xml:lang="uk">пакет WiiWare</comment>
- <comment xml:lang="zh_CN">WiiWare 捆绑包</comment>
- <comment xml:lang="zh_TW">WiiWare 綁包</comment>
+ <comment xml:lang="zh-CN">WiiWare 捆绑包</comment>
+ <comment xml:lang="zh-TW">WiiWare 綁包</comment>
<generic-icon name="application-x-executable"/>
<magic priority="50">
- <match value="Is\0\0" type="string" offset="4"/>
- <match value="ib\0\0" type="string" offset="4"/>
- <match value="Bk\0\0" type="string" offset="4"/>
+ <match type="string" value="Is\0\0" offset="4"/>
+ <match type="string" value="ib\0\0" offset="4"/>
+ <match type="string" value="Bk\0\0" offset="4"/>
</magic>
<glob pattern="*.wad"/>
</mime-type>
<mime-type type="application/x-gamecube-rom">
<comment>GameCube disc image</comment>
+ <comment xml:lang="af">GameCube-skyfbeeldlêer</comment>
+ <comment xml:lang="bg">Диск — GameCube</comment>
<comment xml:lang="ca">imatge de disc de GameCube</comment>
<comment xml:lang="cs">obraz disku pro GameCube</comment>
<comment xml:lang="da">GameCube-diskaftryk</comment>
<comment xml:lang="de">GameCube-Datenträgerabbild</comment>
<comment xml:lang="el">Εικόνα δίσκου GameCube</comment>
- <comment xml:lang="en_GB">GameCube disc image</comment>
+ <comment xml:lang="en-GB">GameCube disc image</comment>
<comment xml:lang="es">imagen de disco de GameCube</comment>
<comment xml:lang="eu">GameCube disko irudia</comment>
<comment xml:lang="fi">GameCube-levykuva</comment>
<comment xml:lang="fr">image disque GameCube</comment>
+ <comment xml:lang="fur">imagjin disc GameCube</comment>
<comment xml:lang="ga">íomhá diosca GameCube</comment>
<comment xml:lang="gl">Imae de disco de GameCube</comment>
<comment xml:lang="he">דמות כונן GameCube</comment>
@@ -9752,7 +10145,7 @@
<comment xml:lang="oc">imatge disc GameCube</comment>
<comment xml:lang="pl">Obraz płyty konsoli GameCube</comment>
<comment xml:lang="pt">imagem de disco GameCube</comment>
- <comment xml:lang="pt_BR">Imagem de disco GameCube</comment>
+ <comment xml:lang="pt-BR">Imagem de disco GameCube</comment>
<comment xml:lang="ru">Образ диска GameCube</comment>
<comment xml:lang="sk">Obraz disku GameCube</comment>
<comment xml:lang="sl">Odtis diska GameCube</comment>
@@ -9760,144 +10153,169 @@
<comment xml:lang="sv">GameCube-skivavbild</comment>
<comment xml:lang="tr">GameCube disk görüntüsü</comment>
<comment xml:lang="uk">образ диска GameCube</comment>
- <comment xml:lang="zh_CN">GameCube 光盘映像</comment>
- <comment xml:lang="zh_TW">GameCube 光碟映像檔</comment>
+ <comment xml:lang="zh-CN">GameCube 光盘映像</comment>
+ <comment xml:lang="zh-TW">GameCube 光碟映像檔</comment>
<generic-icon name="application-x-executable"/>
<alias type="application/x-gamecube-iso-image"/>
<glob pattern="*.iso"/>
<magic priority="50">
- <match value="0xc2339f3d" type="big32" offset="28"/>
+ <match offset="28" type="big32" value="0xc2339f3d"/>
</magic>
</mime-type>
<mime-type type="application/x-thomson-cartridge-memo7">
<comment>Thomson Mémo7 cartridge</comment>
+ <comment xml:lang="bg">Касета — Thomson Mémo7</comment>
<comment xml:lang="ca">cartutx Thomson Mémo7</comment>
<comment xml:lang="cs">Kazeta Thomson Mémo7</comment>
+ <comment xml:lang="da">Thomson Mémo7-kassette</comment>
<comment xml:lang="de">Thomson-Mémo7-Steckmodul</comment>
- <comment xml:lang="en_GB">Thomson Mémo7 cartridge</comment>
+ <comment xml:lang="en-GB">Thomson Mémo7 cartridge</comment>
<comment xml:lang="es">cartucho Mémo7 de Thomson</comment>
+ <comment xml:lang="eu">Thomson Mémo7 kartutxoa</comment>
+ <comment xml:lang="fi">Thomson Mémo7 -patruuna</comment>
<comment xml:lang="fr">cartouche Thomson Mémo7</comment>
+ <comment xml:lang="fur">cartucje Mémo7 Thomson</comment>
<comment xml:lang="ga">cartús Thomson Mémo7</comment>
<comment xml:lang="hr">Thomson Mémo7 uložak</comment>
<comment xml:lang="hu">Thomson Mémo7 kazetta</comment>
- <comment xml:lang="id">cartridge Thomson Mémo7</comment>
+ <comment xml:lang="id">Cartridge Thomson Mémo7</comment>
<comment xml:lang="it">Cartuccia Thomson Mémo7</comment>
<comment xml:lang="kk">Thomson Mémo7 картриджі</comment>
- <comment xml:lang="ko">톰슨 메모7 카트릿지</comment>
+ <comment xml:lang="ko">톰슨 Mémo7 카트리지</comment>
<comment xml:lang="pl">Kartridż Thomson Mémo7</comment>
- <comment xml:lang="pt_BR">Cartucho Thomson Mémo7</comment>
+ <comment xml:lang="pt">cartucho Thomson Mémo7</comment>
+ <comment xml:lang="pt-BR">Cartucho Thomson Mémo7</comment>
<comment xml:lang="ru">Картридж Thomson Mémo7</comment>
<comment xml:lang="sk">Kazeta Thomson Mémo7</comment>
<comment xml:lang="sr">Томсон Мемо7 кертриџ</comment>
<comment xml:lang="sv">Thomson Mémo7-spelkassett</comment>
<comment xml:lang="tr">Thomson Mémo7 kartuşu</comment>
<comment xml:lang="uk">картридж Thomson Mémo7</comment>
- <comment xml:lang="zh_CN">Thomson Mémo7 卡带</comment>
- <comment xml:lang="zh_TW">Thomson Mémo7 卡匣</comment>
+ <comment xml:lang="zh-CN">Thomson Mémo7 卡带</comment>
+ <comment xml:lang="zh-TW">Thomson Mémo7 卡匣</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.m7"/>
</mime-type>
<mime-type type="application/x-thomson-cassette">
<comment>Thomson cassette</comment>
+ <comment xml:lang="bg">Касета — Thomson</comment>
<comment xml:lang="ca">cinta de casset Thomson</comment>
<comment xml:lang="cs">Kazeta Thomson</comment>
+ <comment xml:lang="da">Thomson-kassette</comment>
<comment xml:lang="de">Thomson-Kassette</comment>
- <comment xml:lang="en_GB">Thomson cassette</comment>
+ <comment xml:lang="en-GB">Thomson cassette</comment>
<comment xml:lang="es">casete de Thomson</comment>
+ <comment xml:lang="eu">Thomson kasetea</comment>
+ <comment xml:lang="fi">Thomson-kasetti</comment>
<comment xml:lang="fr">cassette Thomson</comment>
+ <comment xml:lang="fur">cassete Thomson</comment>
<comment xml:lang="ga">caiséad Thomson</comment>
<comment xml:lang="hr">Thomson kaseta</comment>
<comment xml:lang="hu">Thomson kazetta</comment>
- <comment xml:lang="id">kaset Thomson</comment>
+ <comment xml:lang="id">Kaset Thomson</comment>
<comment xml:lang="it">Cassetta Thomson</comment>
<comment xml:lang="kk">Thomson кассетасы</comment>
- <comment xml:lang="ko">톰슨 카셋트</comment>
+ <comment xml:lang="ko">톰슨 카세트</comment>
<comment xml:lang="pl">Kaseta Thomson</comment>
- <comment xml:lang="pt_BR">Cassete Thomson</comment>
+ <comment xml:lang="pt">cassete Thomson</comment>
+ <comment xml:lang="pt-BR">Cassete Thomson</comment>
<comment xml:lang="ru">Кассета Thomson</comment>
<comment xml:lang="sk">Kazeta Thomson</comment>
<comment xml:lang="sr">Томсон касете</comment>
<comment xml:lang="sv">Thomson-kassett</comment>
<comment xml:lang="tr">Thomson kaset</comment>
<comment xml:lang="uk">касета Thomson</comment>
- <comment xml:lang="zh_CN">Thomson 磁带</comment>
- <comment xml:lang="zh_TW">Thomson 卡匣</comment>
+ <comment xml:lang="zh-CN">Thomson 磁带</comment>
+ <comment xml:lang="zh-TW">Thomson 卡匣</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.k7"/>
</mime-type>
<mime-type type="application/x-hfe-floppy-image">
<comment>HFE floppy disk image</comment>
+ <comment xml:lang="bg">Диск — флопи, HFE</comment>
<comment xml:lang="ca">imatge de disquet HFE</comment>
<comment xml:lang="cs">Obraz diskety HFE</comment>
+ <comment xml:lang="da">HFE-floppydiskaftryk</comment>
<comment xml:lang="de">HFE-Diskettenabbild</comment>
- <comment xml:lang="en_GB">HFE floppy disk image</comment>
+ <comment xml:lang="en-GB">HFE floppy disk image</comment>
<comment xml:lang="es">imagen de disquete HFE</comment>
+ <comment xml:lang="eu">HFE diskete disko irudia</comment>
+ <comment xml:lang="fi">HFE disketti-levykuva</comment>
<comment xml:lang="fr">image disquette HFE</comment>
+ <comment xml:lang="fur">imagjin disc floppy HFE</comment>
<comment xml:lang="ga">íomhá diosca fhlapaigh HFE</comment>
<comment xml:lang="hr">HFE slika diskete</comment>
<comment xml:lang="hu">HFE flopi lemezkép</comment>
- <comment xml:lang="id">image disk floppy HFE</comment>
+ <comment xml:lang="id">Image disk floppy HFE</comment>
<comment xml:lang="it">Immagine disco floppy HFE</comment>
<comment xml:lang="kk">HFE иілгіш диск бейнесі</comment>
<comment xml:lang="ko">HFE 플로피 디스크 이미지</comment>
<comment xml:lang="pl">Obraz dyskietki HFE</comment>
- <comment xml:lang="pt_BR">Imagem de disco flexível HFE</comment>
+ <comment xml:lang="pt">imagem de disquete HFE</comment>
+ <comment xml:lang="pt-BR">Imagem de disco flexível HFE</comment>
<comment xml:lang="ru">Образ гибкого диска HFE</comment>
<comment xml:lang="sk">Obraz pružného disku HFE</comment>
<comment xml:lang="sr">ХФЕ слика флопи диска</comment>
<comment xml:lang="sv">HFE-diskavbild</comment>
- <comment xml:lang="tr">HFE disket kalıbı</comment>
+ <comment xml:lang="tr">HFE disket görüntüsü</comment>
<comment xml:lang="uk">образ дискети HFE</comment>
- <comment xml:lang="zh_CN">HFE 软盘映像</comment>
- <comment xml:lang="zh_TW">HFE 軟碟映像檔</comment>
+ <comment xml:lang="zh-CN">HFE 软盘映像</comment>
+ <comment xml:lang="zh-TW">HFE 軟碟映像檔</comment>
<acronym>HFE</acronym>
<expanded-acronym>HxC Floppy Emulator</expanded-acronym>
<generic-icon name="application-x-executable"/>
<glob pattern="*.hfe"/>
<magic>
- <match value="HXCPICFE" type="string" offset="0"/>
+ <match offset="0" type="string" value="HXCPICFE"/>
</magic>
<alias type="application/x-hfe-file"/>
</mime-type>
<mime-type type="application/x-thomson-sap-image">
<comment>SAP Thomson floppy disk image</comment>
+ <comment xml:lang="bg">Диск — флопи, SAP Thomson</comment>
<comment xml:lang="ca">imatge de disquet SAP Thomson</comment>
<comment xml:lang="cs">Obraz diskety SAP Thomson</comment>
+ <comment xml:lang="da">SAP Thomson-floppydiskaftryk</comment>
<comment xml:lang="de">SAP-Thomson-Diskettenabbild</comment>
- <comment xml:lang="en_GB">SAP Thomson floppy disk image</comment>
+ <comment xml:lang="en-GB">SAP Thomson floppy disk image</comment>
<comment xml:lang="es">imagen de disquete SAP de Thomson</comment>
+ <comment xml:lang="eu">SAP Thomson diskete disko irudia</comment>
+ <comment xml:lang="fi">SAP Thomson disketti-levykuva</comment>
<comment xml:lang="fr">image disquette SAP Thomson</comment>
+ <comment xml:lang="fur">imagjin disc floppy SAP Thomson</comment>
<comment xml:lang="ga">íomhá diosca fhlapaigh SAP Thomson</comment>
<comment xml:lang="hr">SAP Thomson slika diskete</comment>
<comment xml:lang="hu">SAP Thomson flopi lemezkép</comment>
- <comment xml:lang="id">image disk floppy SAP Thomson</comment>
+ <comment xml:lang="id">Image disk floppy SAP Thomson</comment>
<comment xml:lang="it">Immagine disco floppy Thomson SAP</comment>
<comment xml:lang="kk">SAP Thomson иілгіш диск бейнесі</comment>
<comment xml:lang="ko">SAP 톰슨 플로피 디스크 이미지</comment>
<comment xml:lang="pl">Obraz dyskietki SAP Thomson</comment>
- <comment xml:lang="pt_BR">Imagem de disco flexível SAP Thomson</comment>
+ <comment xml:lang="pt">imagem de disquete SAP Thomson</comment>
+ <comment xml:lang="pt-BR">Imagem de disco flexível SAP Thomson</comment>
<comment xml:lang="ru">Образ гибкого диска SAP Thomson</comment>
<comment xml:lang="sk">Obraz pružného disku SAP Thomson</comment>
<comment xml:lang="sr">САП Томсон слика флопи диска</comment>
<comment xml:lang="sv">SAP Thomson-diskavbild</comment>
- <comment xml:lang="tr">SAP Thomson disket kalıbı</comment>
+ <comment xml:lang="tr">SAP Thomson disket görüntüsü</comment>
<comment xml:lang="uk">образ дискети Thomson SAP</comment>
- <comment xml:lang="zh_CN">SAP Thomson 软盘映像</comment>
- <comment xml:lang="zh_TW">SAP Thomson 軟碟映像檔</comment>
+ <comment xml:lang="zh-CN">SAP Thomson 软盘映像</comment>
+ <comment xml:lang="zh-TW">SAP Thomson 軟碟映像檔</comment>
<acronym>SAP</acronym>
<expanded-acronym>Système d'Archivage Pukall</expanded-acronym>
<generic-icon name="application-x-executable"/>
<glob pattern="*.sap"/>
<magic>
- <match value="SYSTEME D'ARCHIVAGE PUKALL S.A.P. (c) Alexandre PUKALL Avril 1998" type="string" offset="1"/>
+ <match offset="1" type="string" value="SYSTEME D'ARCHIVAGE PUKALL S.A.P. (c) Alexandre PUKALL Avril 1998"/>
</magic>
<alias type="application/x-sap-file"/>
</mime-type>
<mime-type type="application/vnd.debian.binary-package">
<comment>Debian package</comment>
+ <comment xml:lang="af">Debian-pakket</comment>
<comment xml:lang="ar">حزمة ديبيان</comment>
<comment xml:lang="az">Debian paketi</comment>
- <comment xml:lang="be@latin">Pakunak Debian</comment>
+ <comment xml:lang="be-Latn">Pakunak Debian</comment>
<comment xml:lang="bg">Пакет — Debian</comment>
<comment xml:lang="ca">paquet Debian</comment>
<comment xml:lang="cs">balíček Debianu</comment>
@@ -9905,13 +10323,14 @@
<comment xml:lang="da">Debianpakke</comment>
<comment xml:lang="de">Debian-Paket</comment>
<comment xml:lang="el">Πακέτο Debian</comment>
- <comment xml:lang="en_GB">Debian package</comment>
+ <comment xml:lang="en-GB">Debian package</comment>
<comment xml:lang="eo">Debian-pakaĵo</comment>
<comment xml:lang="es">paquete de Debian</comment>
<comment xml:lang="eu">Debian paketea</comment>
<comment xml:lang="fi">Debian-paketti</comment>
<comment xml:lang="fo">Debian pakki</comment>
<comment xml:lang="fr">paquet Debian</comment>
+ <comment xml:lang="fur">pachet Debian</comment>
<comment xml:lang="ga">pacáiste Debian</comment>
<comment xml:lang="gl">paquete de Debian</comment>
<comment xml:lang="he">חבילת דביאן</comment>
@@ -9933,7 +10352,7 @@
<comment xml:lang="oc">paquet Debian</comment>
<comment xml:lang="pl">Pakiet Debiana</comment>
<comment xml:lang="pt">pacote Debian</comment>
- <comment xml:lang="pt_BR">Pacote Debian</comment>
+ <comment xml:lang="pt-BR">Pacote Debian</comment>
<comment xml:lang="ro">Pachet Debian</comment>
<comment xml:lang="ru">Пакет Debian</comment>
<comment xml:lang="sk">Balíček Debianu</comment>
@@ -9944,90 +10363,78 @@
<comment xml:lang="tr">Debian paketi</comment>
<comment xml:lang="uk">пакунок Debian</comment>
<comment xml:lang="vi">Gói Debian</comment>
- <comment xml:lang="zh_CN">Debian 软件包</comment>
- <comment xml:lang="zh_TW">Debian 軟體包</comment>
+ <comment xml:lang="zh-CN">Debian 软件包</comment>
+ <comment xml:lang="zh-TW">Debian 軟體包</comment>
<alias type="application/x-deb"/>
<alias type="application/x-debian-package"/>
<generic-icon name="package-x-generic"/>
<magic priority="50">
- <match value="!&lt;arch&gt;" type="string" offset="0">
- <match value="debian" type="string" offset="8"/>
+ <match type="string" value="!&lt;arch&gt;" offset="0">
+ <match type="string" value="debian" offset="8"/>
</match>
</magic>
<glob pattern="*.deb"/>
<glob pattern="*.udeb"/>
</mime-type>
<mime-type type="application/x-designer">
- <comment>Qt Designer file</comment>
- <comment xml:lang="ar">ملف Qt Designer</comment>
- <comment xml:lang="be@latin">Fajł Qt Designer</comment>
- <comment xml:lang="bg">Файл — Qt Designer</comment>
- <comment xml:lang="ca">fitxer de Qt Designer</comment>
- <comment xml:lang="cs">soubor Qt Designer</comment>
- <comment xml:lang="da">Qt Designer-fil</comment>
- <comment xml:lang="de">Qt-Designer-Datei</comment>
- <comment xml:lang="el">Αρχείο Qt Designer</comment>
- <comment xml:lang="en_GB">Qt Designer file</comment>
- <comment xml:lang="eo">dosiero de Qt Designer</comment>
- <comment xml:lang="es">archivo de Qt Designer</comment>
- <comment xml:lang="eu">Qt Designer Fitxategia</comment>
- <comment xml:lang="fi">Qt Designer -tiedosto</comment>
- <comment xml:lang="fo">Qt Designer fíla</comment>
- <comment xml:lang="fr">fichier Qt Designer</comment>
- <comment xml:lang="ga">comhad Qt Designer</comment>
- <comment xml:lang="gl">ficheiro de Qt Designer</comment>
- <comment xml:lang="he">קובץ של Qt Designer</comment>
- <comment xml:lang="hr">Qt Designer datoteka</comment>
- <comment xml:lang="hu">Qt Designer-fájl</comment>
- <comment xml:lang="ia">File Qt Designer</comment>
- <comment xml:lang="id">Berkas Qt Designer</comment>
- <comment xml:lang="it">File Qt Designer</comment>
- <comment xml:lang="ja">Qt Designer ファイル</comment>
- <comment xml:lang="kk">Qt Designer файлы</comment>
- <comment xml:lang="ko">Qt 디자이너 파일</comment>
- <comment xml:lang="lt">Qt Designer failas</comment>
- <comment xml:lang="lv">Qt Designer datne</comment>
- <comment xml:lang="ms">Fail Qt Designer</comment>
- <comment xml:lang="nb">Qt Designer-fil</comment>
- <comment xml:lang="nl">Qt Designer-bestand</comment>
- <comment xml:lang="nn">Qt Designer-fil</comment>
- <comment xml:lang="oc">fichièr Qt Designer</comment>
- <comment xml:lang="pl">Plik Qt Designer</comment>
- <comment xml:lang="pt">ficheiro do Qt Designer</comment>
- <comment xml:lang="pt_BR">Arquivo do Qt Designer</comment>
- <comment xml:lang="ro">Fișier Qt Designer</comment>
- <comment xml:lang="ru">Файл Qt Designer</comment>
- <comment xml:lang="sk">Súbor Qt Designer</comment>
- <comment xml:lang="sl">Datoteka Qt Designer</comment>
- <comment xml:lang="sq">File Qt Designer</comment>
- <comment xml:lang="sr">датотека Кут дизајнера</comment>
- <comment xml:lang="sv">Qt Designer-fil</comment>
- <comment xml:lang="tr">Qt Tasarımcı dosyası</comment>
- <comment xml:lang="uk">файл програми Qt-дизайнер</comment>
- <comment xml:lang="vi">Tập tin thiết kế Qt Designer</comment>
- <comment xml:lang="zh_CN">Qt Designer 文件</comment>
- <comment xml:lang="zh_TW">Qt Designer 檔案</comment>
+ <comment>Qt Designer interface document</comment>
+ <comment xml:lang="bg">Документ — интерфейс, Qt Designer</comment>
+ <comment xml:lang="ca">document d'interfície Qt Designer</comment>
+ <comment xml:lang="da">Qt Designer-brugerflade-dokument</comment>
+ <comment xml:lang="de">Qt-Designer-Oberflächendokument</comment>
+ <comment xml:lang="en-GB">Qt Designer interface document</comment>
+ <comment xml:lang="es">documento de interfaz de Qt Designer</comment>
+ <comment xml:lang="eu">Qt Designer interfaze dokumentua</comment>
+ <comment xml:lang="fi">Qt Designer -käyttöliittymän asiakirja</comment>
+ <comment xml:lang="fr">document d'interface Qt Designer</comment>
+ <comment xml:lang="hr">Qt Designer dokument sučelja</comment>
+ <comment xml:lang="hu">Qt Designer felületleíró dokumentum</comment>
+ <comment xml:lang="id">Dokumen antarmuka Qt Designer</comment>
+ <comment xml:lang="it">Documento interfaccia Qt Designer</comment>
+ <comment xml:lang="kk">Qt Designer интерфейс құжаты</comment>
+ <comment xml:lang="ko">Qt 디자이너 인터페이스 문서</comment>
+ <comment xml:lang="pl">Dokument interfejsu Qt Designer</comment>
+ <comment xml:lang="pt">documento de interface Qt Designer</comment>
+ <comment xml:lang="pt-BR">Documento de interface do Qt Designer</comment>
+ <comment xml:lang="ru">Документ интерфейса Qt Designer</comment>
+ <comment xml:lang="sv">Qt Designer-gränssnittsdokument</comment>
+ <comment xml:lang="tr">Qt Designer arayüz belgesi</comment>
+ <comment xml:lang="uk">документ інтерфейсу Qt Designer</comment>
+ <comment xml:lang="zh-CN">Qt Designer 界面文档</comment>
+ <comment xml:lang="zh-TW">Qt Designer 介面文件</comment>
<generic-icon name="x-office-document"/>
<sub-class-of type="application/xml"/>
<magic>
- <match value="&lt;ui " type="string" offset="0:256"/>
- <match value="&lt;UI " type="string" offset="0:256"/>
+ <match type="string" value="&lt;ui " offset="0:256"/>
+ <match type="string" value="&lt;UI " offset="0:256"/>
</magic>
<glob pattern="*.ui"/>
</mime-type>
+ <mime-type type="text/x-kaitai-struct">
+ <comment>Kaitai Struct definition file</comment>
+ <comment xml:lang="ca">fitxer de definicions Kaitai Struct</comment>
+ <comment xml:lang="fi">Kaitai Struct määritystiedosto</comment>
+ <comment xml:lang="it">File definizione Kaitai Struct</comment>
+ <comment xml:lang="pl">Plik definicji Kaitai Struct</comment>
+ <comment xml:lang="uk">файл визначень Kaitai Struct</comment>
+ <sub-class-of type="application/x-yaml"/>
+ <glob pattern="*.ksy"/>
+ </mime-type>
<mime-type type="text/x-qml">
<comment>Qt Markup Language file</comment>
- <comment xml:lang="bg">Файл — Qt Markup</comment>
+ <comment xml:lang="af">Qt Markup Language-lêer</comment>
+ <comment xml:lang="bg">Интерфейс — Qt Markup</comment>
<comment xml:lang="ca">fitxer de llenguatge de marcadors Qt</comment>
<comment xml:lang="cs">soubor Qt Markup Language</comment>
<comment xml:lang="da">Qt Markup Language-fil</comment>
<comment xml:lang="de">Qt-Auszeichnungssprachendatei</comment>
<comment xml:lang="el">Αρχείο Qt Markup Language</comment>
- <comment xml:lang="en_GB">Qt Markup Language file</comment>
+ <comment xml:lang="en-GB">Qt Markup Language file</comment>
<comment xml:lang="es">archivo de lenguaje de marcado Qt</comment>
<comment xml:lang="eu">Qt Markup lengoai fitxategia</comment>
<comment xml:lang="fi">QML-tiedosto</comment>
<comment xml:lang="fr">fichier Qt Markup Language</comment>
+ <comment xml:lang="fur">file Qt Markup Language</comment>
<comment xml:lang="ga">comhad teanga mharcála Qt</comment>
<comment xml:lang="gl">ficheiro de linguaxe de marcado Qt</comment>
<comment xml:lang="he">קובץ שפת סימון של Qt</comment>
@@ -10044,7 +10451,7 @@
<comment xml:lang="oc">fichièr Qt Markup Language</comment>
<comment xml:lang="pl">Plik języka znaczników Qt</comment>
<comment xml:lang="pt">ficheiro de linguagem Qt Markup</comment>
- <comment xml:lang="pt_BR">Arquivo de Qt Markup Language</comment>
+ <comment xml:lang="pt-BR">Arquivo de Qt Markup Language</comment>
<comment xml:lang="ru">Файл Qt Markup Language</comment>
<comment xml:lang="sk">Súbor značkovacieho jazyka Qt</comment>
<comment xml:lang="sl">Datoteka označevalnega jezika Qt</comment>
@@ -10052,15 +10459,15 @@
<comment xml:lang="sv">Qt-märkspråksfil</comment>
<comment xml:lang="tr">Qt İşaretleme Dili dosyası</comment>
<comment xml:lang="uk">файл мови розмітки Qt</comment>
- <comment xml:lang="zh_CN">Qt Markup Language 文件</comment>
- <comment xml:lang="zh_TW">Qt 標記語言檔</comment>
+ <comment xml:lang="zh-CN">Qt Markup Language 文件</comment>
+ <comment xml:lang="zh-TW">Qt 標記語言檔</comment>
<magic priority="80">
- <match value="/bin/env qml" type="string" offset="2:16"/>
- <match value="import Qt" type="string" offset="0:3000">
- <match value="{" type="string" offset="9:3009"/>
+ <match type="string" value="/bin/env qml" offset="2:16"/>
+ <match type="string" value="import Qt" offset="0:3000">
+ <match type="string" value="{" offset="9:3009"/>
</match>
- <match value="import Qml" type="string" offset="0:3000">
- <match value="{" type="string" offset="9:3009"/>
+ <match type="string" value="import Qml" offset="0:3000">
+ <match type="string" value="{" offset="9:3009"/>
</match>
</magic>
<glob pattern="*.qml"/>
@@ -10070,24 +10477,25 @@
<mime-type type="application/x-desktop">
<comment>desktop configuration file</comment>
<comment xml:lang="ar">ملف تضبيط سطح المكتب</comment>
- <comment xml:lang="be@latin">kanfihuracyjny fajł asiarodździa</comment>
- <comment xml:lang="bg">Файл с информация за работния плот</comment>
+ <comment xml:lang="be-Latn">kanfihuracyjny fajł asiarodździa</comment>
+ <comment xml:lang="bg">Информация за работния плот</comment>
<comment xml:lang="ca">fitxer de configuració d'escriptori</comment>
<comment xml:lang="cs">soubor nastavení pracovní plochy</comment>
<comment xml:lang="da">skrivebordskonfigurationsfil</comment>
<comment xml:lang="de">Desktop-Konfigurationsdatei</comment>
<comment xml:lang="el">Αρχείο ρυθμίσεων επιφάνειας εργασίας</comment>
- <comment xml:lang="en_GB">desktop configuration file</comment>
+ <comment xml:lang="en-GB">desktop configuration file</comment>
<comment xml:lang="eo">dosiero de agordoj de labortablo</comment>
<comment xml:lang="es">archivo de configuración del escritorio</comment>
<comment xml:lang="eu">Mahaigainaren konfigurazio-fitxategia</comment>
<comment xml:lang="fi">työpöydän asetustiedosto</comment>
<comment xml:lang="fo">skriviborðssamansetingarfíla</comment>
<comment xml:lang="fr">fichier de configuration desktop</comment>
+ <comment xml:lang="fur">file di configurazion scritori</comment>
<comment xml:lang="ga">comhad cumraíochta deisce</comment>
<comment xml:lang="gl">ficheiro de configuración de escritorio</comment>
<comment xml:lang="he">קובץ הגדרות שולחן עבודה</comment>
- <comment xml:lang="hr">Datoteka prečaca radne površine</comment>
+ <comment xml:lang="hr">datoteka podešavanja radne površine</comment>
<comment xml:lang="hu">asztalbeállító fájl</comment>
<comment xml:lang="ia">File de configuration de scriptorio</comment>
<comment xml:lang="id">berkas konfigurasi destop</comment>
@@ -10104,7 +10512,7 @@
<comment xml:lang="oc">fichièr de configuracion desktop</comment>
<comment xml:lang="pl">Plik konfiguracji środowiska</comment>
<comment xml:lang="pt">ficheiro de configuração de área de trabalho</comment>
- <comment xml:lang="pt_BR">Arquivo de configuração desktop</comment>
+ <comment xml:lang="pt-BR">Arquivo de configuração desktop</comment>
<comment xml:lang="ro">fișier de configurare al desktopului</comment>
<comment xml:lang="ru">Файл настроек рабочего стола</comment>
<comment xml:lang="sk">Súbor nastavení pracovnej plochy</comment>
@@ -10112,19 +10520,19 @@
<comment xml:lang="sq">File konfigurimi desktop</comment>
<comment xml:lang="sr">датотека подешавања радне површи</comment>
<comment xml:lang="sv">skrivbordskonfigurationsfil</comment>
- <comment xml:lang="tr">masa üstü yapılandırma dosyası</comment>
+ <comment xml:lang="tr">masaüstü yapılandırma dosyası</comment>
<comment xml:lang="uk">файл конфігурації стільниці</comment>
<comment xml:lang="vi">tập tin cấu hình môi trường</comment>
- <comment xml:lang="zh_CN">桌面配置文件</comment>
- <comment xml:lang="zh_TW">桌面組態檔</comment>
+ <comment xml:lang="zh-CN">桌面配置文件</comment>
+ <comment xml:lang="zh-TW">桌面組態檔</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<magic priority="50">
- <match value="[Desktop Entry]" type="string" offset="0:32"/>
- <match value="[Desktop Action" type="string" offset="0"/>
- <match value="[KDE Desktop Entry]" type="string" offset="0"/>
- <match value="# Config File" type="string" offset="0"/>
- <match value="# KDE Config File" type="string" offset="0"/>
+ <match type="string" value="[Desktop Entry]" offset="0:32"/>
+ <match type="string" value="[Desktop Action" offset="0"/>
+ <match type="string" value="[KDE Desktop Entry]" offset="0"/>
+ <match type="string" value="# Config File" offset="0"/>
+ <match type="string" value="# KDE Config File" offset="0"/>
</magic>
<glob pattern="*.desktop"/>
<glob pattern="*.kdelnk"/>
@@ -10132,6 +10540,7 @@
</mime-type>
<mime-type type="application/x-fictionbook+xml">
<comment>FictionBook document</comment>
+ <comment xml:lang="af">FictionBook-dokument</comment>
<comment xml:lang="ar">مستند FictionBook</comment>
<comment xml:lang="ast">Documentu de FictionBook</comment>
<comment xml:lang="bg">Документ — FictionBook</comment>
@@ -10140,13 +10549,14 @@
<comment xml:lang="da">FictionBook-dokument</comment>
<comment xml:lang="de">FictionBook-Dokument</comment>
<comment xml:lang="el">Έγγραφο FictionBook</comment>
- <comment xml:lang="en_GB">FictionBook document</comment>
+ <comment xml:lang="en-GB">FictionBook document</comment>
<comment xml:lang="eo">FictionBook-dokumento</comment>
<comment xml:lang="es">documento FictionBook</comment>
<comment xml:lang="eu">FictionBook dokumentua</comment>
<comment xml:lang="fi">FictionBook-asiakirja</comment>
<comment xml:lang="fo">FictionBook skjal</comment>
<comment xml:lang="fr">document FictionBook</comment>
+ <comment xml:lang="fur">document FictionBook</comment>
<comment xml:lang="ga">cáipéis FictionBook</comment>
<comment xml:lang="gl">documento de FictionBook</comment>
<comment xml:lang="he">מסמך FictionBook</comment>
@@ -10165,7 +10575,7 @@
<comment xml:lang="oc">document FictionBook</comment>
<comment xml:lang="pl">Dokument FictionBook</comment>
<comment xml:lang="pt">documento FictionBook</comment>
- <comment xml:lang="pt_BR">Documento FictionBook</comment>
+ <comment xml:lang="pt-BR">Documento FictionBook</comment>
<comment xml:lang="ro">Document FictionBook</comment>
<comment xml:lang="ru">Документ FictionBook</comment>
<comment xml:lang="sk">Dokument FictionBook</comment>
@@ -10175,29 +10585,32 @@
<comment xml:lang="tr">FictionBook belgesi</comment>
<comment xml:lang="uk">документ FictionBook</comment>
<comment xml:lang="vi">Tài liệu FictionBook</comment>
- <comment xml:lang="zh_CN">FictionBook 文档</comment>
- <comment xml:lang="zh_TW">FictionBook 文件</comment>
+ <comment xml:lang="zh-CN">FictionBook 文档</comment>
+ <comment xml:lang="zh-TW">FictionBook 文件</comment>
<sub-class-of type="application/xml"/>
<glob pattern="*.fb2"/>
<magic priority="80">
- <match value="&lt;FictionBook" type="string" offset="0:256"/>
+ <match type="string" value="&lt;FictionBook" offset="0:256"/>
</magic>
<alias type="application/x-fictionbook"/>
<root-XML namespaceURI="http://www.gribuser.ru/xml/fictionbook/2.0" localName="FictionBook"/>
</mime-type>
<mime-type type="application/x-zip-compressed-fb2">
<comment>Compressed FictionBook document</comment>
+ <comment xml:lang="af">Saamgepersde FictionBook-dokument</comment>
<comment xml:lang="ast">Documentu comprimíu de FictionBook</comment>
+ <comment xml:lang="bg">Документ — FictionBook, компресиран</comment>
<comment xml:lang="ca">document FictionBook amb compressió</comment>
<comment xml:lang="cs">komprimovaný dokument FictionBook</comment>
<comment xml:lang="da">Komprimeret FictionBook-dokument</comment>
<comment xml:lang="de">Komprimiertes FictionBook-Dokument</comment>
<comment xml:lang="el">Συμπιεσμένο έγγραφο FictionBook</comment>
- <comment xml:lang="en_GB">Compressed FictionBook document</comment>
+ <comment xml:lang="en-GB">Compressed FictionBook document</comment>
<comment xml:lang="es">documento comprimido de FictionBook</comment>
<comment xml:lang="eu">Konprimitutako FictionBook dokumentua</comment>
<comment xml:lang="fi">Pakattu FictionBook-asiakirja</comment>
<comment xml:lang="fr">document FictionBook compressé</comment>
+ <comment xml:lang="fur">document FictionBook comprimût</comment>
<comment xml:lang="ga">cáipéis chomhbhrúite FictionBook</comment>
<comment xml:lang="gl">Documento de FictionBook comprimida</comment>
<comment xml:lang="he">מסמך FictionBook מכווץ</comment>
@@ -10211,30 +10624,31 @@
<comment xml:lang="oc">document FictionBook compressat</comment>
<comment xml:lang="pl">Skompresowany dokument FictionBook</comment>
<comment xml:lang="pt">documento comprimido FictionBook</comment>
- <comment xml:lang="pt_BR">Documento FictionBook comprimido</comment>
+ <comment xml:lang="pt-BR">Documento FictionBook comprimido</comment>
<comment xml:lang="ru">Сжатый документ FictionBook</comment>
<comment xml:lang="sk">Komprimovaný dokument FictionBook</comment>
<comment xml:lang="sl">Stisnjeni dokument FictionBook</comment>
<comment xml:lang="sr">запаковани документ Фикшон Књиге</comment>
<comment xml:lang="sv">Komprimerat FictionBook-dokument</comment>
- <comment xml:lang="tr">Sıkıştırılmış KurguKitap belgesi</comment>
+ <comment xml:lang="tr">Sıkıştırılmış FictionBook belgesi</comment>
<comment xml:lang="uk">стиснений документ FictionBook</comment>
- <comment xml:lang="zh_CN">压缩的 FictionBook 文档</comment>
- <comment xml:lang="zh_TW">壓縮版 FictionBook 文件</comment>
+ <comment xml:lang="zh-CN">压缩的 FictionBook 文档</comment>
+ <comment xml:lang="zh-TW">壓縮版 FictionBook 文件</comment>
<sub-class-of type="application/zip"/>
<glob pattern="*.fb2.zip"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
-
- <match value=".fb2" type="string" offset="30:256"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <!-- Okay, this is not ideal, but it should be good enough for normal cases -->
+ <match type="string" value=".fb2" offset="30:256"/>
</match>
</magic>
</mime-type>
<mime-type type="application/x-dia-diagram">
<comment>Dia diagram</comment>
+ <comment xml:lang="af">Dia-diagram</comment>
<comment xml:lang="ar">خطاطة Dia</comment>
<comment xml:lang="az">Dia diaqramı</comment>
- <comment xml:lang="be@latin">Dyjahrama Dia</comment>
+ <comment xml:lang="be-Latn">Dyjahrama Dia</comment>
<comment xml:lang="bg">Диаграма — Dia</comment>
<comment xml:lang="ca">diagrama de Dia</comment>
<comment xml:lang="cs">diagram Dia</comment>
@@ -10242,13 +10656,14 @@
<comment xml:lang="da">Dia-diagram</comment>
<comment xml:lang="de">Dia-Diagramm</comment>
<comment xml:lang="el">Διάγραμμα Dia</comment>
- <comment xml:lang="en_GB">Dia diagram</comment>
+ <comment xml:lang="en-GB">Dia diagram</comment>
<comment xml:lang="eo">Dia-diagramo</comment>
<comment xml:lang="es">diagrama de Dia</comment>
<comment xml:lang="eu">Dia diagrama</comment>
<comment xml:lang="fi">Dia-kaavio</comment>
<comment xml:lang="fo">Dia ritmynd</comment>
<comment xml:lang="fr">diagramme Dia</comment>
+ <comment xml:lang="fur">diagram Dia</comment>
<comment xml:lang="ga">léaráid Dia</comment>
<comment xml:lang="gl">diagrama de Dia</comment>
<comment xml:lang="he">גרף של Dia</comment>
@@ -10270,7 +10685,7 @@
<comment xml:lang="oc">diagrama Dia</comment>
<comment xml:lang="pl">Diagram Dia</comment>
<comment xml:lang="pt">diagrama Dia</comment>
- <comment xml:lang="pt_BR">Diagrama do Dia</comment>
+ <comment xml:lang="pt-BR">Diagrama do Dia</comment>
<comment xml:lang="ro">Diagramă Dia</comment>
<comment xml:lang="ru">Диаграмма Dia</comment>
<comment xml:lang="sk">Diagram Dia</comment>
@@ -10281,18 +10696,19 @@
<comment xml:lang="tr">Dia çizimi</comment>
<comment xml:lang="uk">діаграма Dia</comment>
<comment xml:lang="vi">Biểu đồ Dia</comment>
- <comment xml:lang="zh_CN">Dia 图表</comment>
- <comment xml:lang="zh_TW">Dia 圖表</comment>
+ <comment xml:lang="zh-CN">Dia 图表</comment>
+ <comment xml:lang="zh-TW">Dia 圖表</comment>
<generic-icon name="image-x-generic"/>
<sub-class-of type="application/xml"/>
<glob pattern="*.dia"/>
<magic priority="50">
- <match value="&lt;dia:" type="string" offset="5:100"/>
+ <match offset="5:100" type="string" value="&lt;dia:"/>
</magic>
<root-XML namespaceURI="http://www.lysator.liu.se/~alla/dia/" localName="diagram"/>
</mime-type>
<mime-type type="application/x-dia-shape">
<comment>Dia shape</comment>
+ <comment xml:lang="af">Dia-vorm</comment>
<comment xml:lang="ar">شكل Dia</comment>
<comment xml:lang="bg">Фигура — Dia</comment>
<comment xml:lang="ca">forma de Dia</comment>
@@ -10300,12 +10716,13 @@
<comment xml:lang="da">Dia-figur</comment>
<comment xml:lang="de">Dia-Form</comment>
<comment xml:lang="el">Σχήμα Dia</comment>
- <comment xml:lang="en_GB">Dia shape</comment>
+ <comment xml:lang="en-GB">Dia shape</comment>
<comment xml:lang="es">forma de Dia</comment>
<comment xml:lang="eu">Dia-ren forma</comment>
<comment xml:lang="fi">Dia-muoto</comment>
<comment xml:lang="fo">Dia skapur</comment>
<comment xml:lang="fr">forme Dia</comment>
+ <comment xml:lang="fur">sagome Dia</comment>
<comment xml:lang="ga">cruth Dia</comment>
<comment xml:lang="gl">forma de Dia</comment>
<comment xml:lang="he">צורה של Dia</comment>
@@ -10323,7 +10740,7 @@
<comment xml:lang="oc">forma Dia</comment>
<comment xml:lang="pl">Kształt Dia</comment>
<comment xml:lang="pt">forma Dia</comment>
- <comment xml:lang="pt_BR">Formato Dia</comment>
+ <comment xml:lang="pt-BR">Formato Dia</comment>
<comment xml:lang="ro">Figură Dia</comment>
<comment xml:lang="ru">Фигура Dia</comment>
<comment xml:lang="sk">Tvar Dia</comment>
@@ -10332,34 +10749,36 @@
<comment xml:lang="sv">Dia-figur</comment>
<comment xml:lang="tr">Dia şekli</comment>
<comment xml:lang="uk">форма Dia</comment>
- <comment xml:lang="zh_CN">Dia 形状</comment>
- <comment xml:lang="zh_TW">Dia 形狀</comment>
+ <comment xml:lang="zh-CN">Dia 形状</comment>
+ <comment xml:lang="zh-TW">Dia 形狀</comment>
<generic-icon name="image-x-generic"/>
<sub-class-of type="application/xml"/>
<glob pattern="*.shape"/>
<magic priority="50">
- <match value="&lt;shape" type="string" offset="5:100"/>
+ <match offset="5:100" type="string" value="&lt;shape"/>
</magic>
<root-XML namespaceURI="http://www.daa.com.au/~james/dia-shape-ns" localName="shape"/>
</mime-type>
<mime-type type="application/x-dvi">
<comment>TeX DVI document</comment>
+ <comment xml:lang="af">TeX DVI-dokument</comment>
<comment xml:lang="ar">مستند TeX DVI</comment>
<comment xml:lang="ast">Documentu Tex DVI</comment>
- <comment xml:lang="be@latin">Dakument TeX DVI</comment>
+ <comment xml:lang="be-Latn">Dakument TeX DVI</comment>
<comment xml:lang="bg">Документ — TeX DVI</comment>
<comment xml:lang="ca">document DVI de TeX</comment>
<comment xml:lang="cs">dokument TeX DVI</comment>
<comment xml:lang="da">TeX DVI-dokument</comment>
<comment xml:lang="de">TeX-DVI-Dokument</comment>
<comment xml:lang="el">Έγγραφο TeX DVI</comment>
- <comment xml:lang="en_GB">TeX DVI document</comment>
+ <comment xml:lang="en-GB">TeX DVI document</comment>
<comment xml:lang="eo">DVI-dokumento de TeX</comment>
<comment xml:lang="es">documento TeX DVI</comment>
<comment xml:lang="eu">TeX DVI dokumentua</comment>
<comment xml:lang="fi">TeX DVI -asiakirja</comment>
<comment xml:lang="fo">TeX DVI skjal</comment>
<comment xml:lang="fr">document TeX DVI</comment>
+ <comment xml:lang="fur">document DVI TeX</comment>
<comment xml:lang="ga">cáipéis DVI TeX</comment>
<comment xml:lang="gl">documento TeX DVI</comment>
<comment xml:lang="he">מסמך מסוג TeX DVI</comment>
@@ -10380,7 +10799,7 @@
<comment xml:lang="oc">document TeX DVI</comment>
<comment xml:lang="pl">Dokument TeX DVI</comment>
<comment xml:lang="pt">documento TeX DVI</comment>
- <comment xml:lang="pt_BR">Documento DVI TeX</comment>
+ <comment xml:lang="pt-BR">Documento DVI TeX</comment>
<comment xml:lang="ro">Document Tex DVI</comment>
<comment xml:lang="ru">Документ TeX DVI</comment>
<comment xml:lang="sk">Dokument TeX DVI</comment>
@@ -10391,21 +10810,22 @@
<comment xml:lang="tr">TeX DVI belgesi</comment>
<comment xml:lang="uk">документ TeX DVI</comment>
<comment xml:lang="vi">Tài liệu DVI Tex</comment>
- <comment xml:lang="zh_CN">TeX DVI 文档</comment>
- <comment xml:lang="zh_TW">TeX DVI 文件</comment>
+ <comment xml:lang="zh-CN">TeX DVI 文档</comment>
+ <comment xml:lang="zh-TW">TeX DVI 文件</comment>
<acronym>DVI</acronym>
<expanded-acronym>Device independent file format</expanded-acronym>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="0x02f7" type="little16" offset="0"/>
+ <match type="little16" value="0x02f7" offset="0"/>
</magic>
<glob pattern="*.dvi"/>
</mime-type>
<mime-type type="application/x-e-theme">
<comment>Enlightenment theme</comment>
+ <comment xml:lang="af">Enlightenment-tema</comment>
<comment xml:lang="ar">سمة Enlightenment</comment>
<comment xml:lang="az">Enlightenment örtüyü</comment>
- <comment xml:lang="be@latin">Matyŭ Enlightenment</comment>
+ <comment xml:lang="be-Latn">Matyŭ Enlightenment</comment>
<comment xml:lang="bg">Тема — Enlightenment</comment>
<comment xml:lang="ca">tema d'Enlightenment</comment>
<comment xml:lang="cs">motiv Enlightenment</comment>
@@ -10413,13 +10833,14 @@
<comment xml:lang="da">Enlightenmenttema</comment>
<comment xml:lang="de">Enlightenment-Thema</comment>
<comment xml:lang="el">Θέμα Enlightenment</comment>
- <comment xml:lang="en_GB">Enlightenment theme</comment>
+ <comment xml:lang="en-GB">Enlightenment theme</comment>
<comment xml:lang="eo">etoso de Enlightenment</comment>
<comment xml:lang="es">tema de Enlightenment</comment>
<comment xml:lang="eu">Enlightenment gaia</comment>
<comment xml:lang="fi">Enlightenment-teema</comment>
<comment xml:lang="fo">Enlightenment tema</comment>
<comment xml:lang="fr">thème Enlightenment</comment>
+ <comment xml:lang="fur">teme di Enlightenment</comment>
<comment xml:lang="ga">téama Enlightenment</comment>
<comment xml:lang="gl">tema de Enlightenment</comment>
<comment xml:lang="he">ערכת נושא של Enlightenment</comment>
@@ -10441,7 +10862,7 @@
<comment xml:lang="oc">tèma Enlightenment</comment>
<comment xml:lang="pl">Motyw Enlightenment</comment>
<comment xml:lang="pt">tema Enlightenment</comment>
- <comment xml:lang="pt_BR">Tema do Enlightenment</comment>
+ <comment xml:lang="pt-BR">Tema do Enlightenment</comment>
<comment xml:lang="ro">Temă Enlightenment</comment>
<comment xml:lang="ru">Тема Enlightenment</comment>
<comment xml:lang="sk">Motív Enlightenment</comment>
@@ -10452,27 +10873,28 @@
<comment xml:lang="tr">Enlightenment teması</comment>
<comment xml:lang="uk">тема Enlightenment</comment>
<comment xml:lang="vi">Sắc thái Enlightenment</comment>
- <comment xml:lang="zh_CN">Enlightenment 主题</comment>
- <comment xml:lang="zh_TW">Enlightenment 佈景主題</comment>
+ <comment xml:lang="zh-CN">Enlightenment 主题</comment>
+ <comment xml:lang="zh-TW">Enlightenment 佈景主題</comment>
<glob pattern="*.etheme"/>
</mime-type>
<mime-type type="application/x-egon">
<comment>Egon Animator animation</comment>
<comment xml:lang="ar">تحريكة محرك Egon</comment>
- <comment xml:lang="be@latin">Animacyja Egon Animator</comment>
+ <comment xml:lang="be-Latn">Animacyja Egon Animator</comment>
<comment xml:lang="bg">Анимация — Egon Animator</comment>
<comment xml:lang="ca">animació d'Egon Animator</comment>
<comment xml:lang="cs">animace Egon Animator</comment>
<comment xml:lang="da">Egon Animator-animation</comment>
<comment xml:lang="de">Egon-Animator-Animation</comment>
<comment xml:lang="el">Κινούμενο σχέδιο Egon Animator</comment>
- <comment xml:lang="en_GB">Egon Animator animation</comment>
+ <comment xml:lang="en-GB">Egon Animator animation</comment>
<comment xml:lang="eo">animacio de Egon Animator</comment>
<comment xml:lang="es">animación de Egon Animator</comment>
<comment xml:lang="eu">Egon Animator-eko animazioa</comment>
<comment xml:lang="fi">Egon Animator -animaatio</comment>
<comment xml:lang="fo">Egon Animator teknimyndagerð</comment>
<comment xml:lang="fr">animation Egon Animator</comment>
+ <comment xml:lang="fur">animazion Egon Animator</comment>
<comment xml:lang="ga">beochan Egon Animator</comment>
<comment xml:lang="gl">animación de Egon Animator</comment>
<comment xml:lang="he">אנימצייה של Egon Animator</comment>
@@ -10494,7 +10916,7 @@
<comment xml:lang="oc">animacion Egon Animator</comment>
<comment xml:lang="pl">Animacja Egon Animator</comment>
<comment xml:lang="pt">animação Egon Animator</comment>
- <comment xml:lang="pt_BR">Animação do Egon Animator</comment>
+ <comment xml:lang="pt-BR">Animação do Egon Animator</comment>
<comment xml:lang="ro">Animație Egon Animator</comment>
<comment xml:lang="ru">Анимация Egon Animator</comment>
<comment xml:lang="sk">Animácia Egon Animator</comment>
@@ -10505,28 +10927,30 @@
<comment xml:lang="tr">Egon Animator canlandırması</comment>
<comment xml:lang="uk">анімація Egon Animator</comment>
<comment xml:lang="vi">Hoạt ảnh Egon Animator</comment>
- <comment xml:lang="zh_CN">Egon Animator 动画</comment>
- <comment xml:lang="zh_TW">Egon Animator 動畫</comment>
+ <comment xml:lang="zh-CN">Egon Animator 动画</comment>
+ <comment xml:lang="zh-TW">Egon Animator 動畫</comment>
<generic-icon name="image-x-generic"/>
<glob pattern="*.egon"/>
</mime-type>
<mime-type type="application/x-executable">
<comment>executable</comment>
+ <comment xml:lang="af">uitvoerbaar</comment>
<comment xml:lang="ar">تنفيذي</comment>
- <comment xml:lang="be@latin">vykonvalny fajł</comment>
+ <comment xml:lang="be-Latn">vykonvalny fajł</comment>
<comment xml:lang="bg">Изпълним файл</comment>
<comment xml:lang="ca">executable</comment>
<comment xml:lang="cs">spustitelný soubor</comment>
<comment xml:lang="da">kørbar</comment>
<comment xml:lang="de">Programm</comment>
<comment xml:lang="el">Εκτελέσιμο</comment>
- <comment xml:lang="en_GB">executable</comment>
+ <comment xml:lang="en-GB">executable</comment>
<comment xml:lang="eo">plenumebla</comment>
<comment xml:lang="es">ejecutable</comment>
<comment xml:lang="eu">exekutagarria</comment>
<comment xml:lang="fi">suoritettava ohjelma</comment>
<comment xml:lang="fo">inningarfør</comment>
<comment xml:lang="fr">exécutable</comment>
+ <comment xml:lang="fur">eseguibil</comment>
<comment xml:lang="ga">comhad inrite</comment>
<comment xml:lang="gl">executábel</comment>
<comment xml:lang="he">קובץ הרצה</comment>
@@ -10547,7 +10971,7 @@
<comment xml:lang="oc">executable</comment>
<comment xml:lang="pl">Program</comment>
<comment xml:lang="pt">executável</comment>
- <comment xml:lang="pt_BR">Executável</comment>
+ <comment xml:lang="pt-BR">Executável</comment>
<comment xml:lang="ro">executabil</comment>
<comment xml:lang="ru">Исполняемый</comment>
<comment xml:lang="sk">Spustiteľný súbor</comment>
@@ -10558,43 +10982,41 @@
<comment xml:lang="tr">çalıştırılabilir</comment>
<comment xml:lang="uk">виконуваний файл</comment>
<comment xml:lang="vi">thực hiện được</comment>
- <comment xml:lang="zh_CN">可执行文件</comment>
- <comment xml:lang="zh_TW">可執行檔</comment>
+ <comment xml:lang="zh-CN">可执行文件</comment>
+ <comment xml:lang="zh-TW">可執行檔</comment>
<generic-icon name="application-x-executable"/>
<magic priority="40">
- <match value="\177ELF" type="string" offset="0">
- <match value="1" type="byte" offset="5">
- <match value="2" type="little16" offset="16"/>
- </match>
+ <match type="string" value="\177ELF" offset="0">
+ <match type="byte" value="1" offset="5"/>
</match>
- <match value="\177ELF" type="string" offset="0">
- <match value="2" type="byte" offset="5">
- <match value="2" type="big16" offset="16"/>
- </match>
+ <match type="string" value="\177ELF" offset="0">
+ <match type="byte" value="2" offset="5"/>
</match>
- <match value="MZ" type="string" offset="0"/>
- <match value="0x521c" type="little16" offset="0"/>
- <match value="0420" type="host16" offset="0"/>
- <match value="0421" type="host16" offset="0"/>
- <match value="0603" type="little16" offset="0"/>
+ <match type="string" value="MZ" offset="0"/>
+ <match type="little16" value="0x521c" offset="0"/>
+ <match type="host16" value="0420" offset="0"/>
+ <match type="host16" value="0421" offset="0"/>
+ <match type="little16" value="0603" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-fluid">
<comment>FLTK Fluid file</comment>
+ <comment xml:lang="af">FLTK Fluit-lêer</comment>
<comment xml:lang="ar">ملف FLTK Fluid</comment>
- <comment xml:lang="be@latin">Fajł FLTK Fluid</comment>
+ <comment xml:lang="be-Latn">Fajł FLTK Fluid</comment>
<comment xml:lang="bg">Интерфейс — FLTK Fluid</comment>
<comment xml:lang="ca">fitxer FLTK Fluid</comment>
<comment xml:lang="cs">soubor FLTK Fluid</comment>
<comment xml:lang="da">FLTK Fluid-fil</comment>
<comment xml:lang="de">FLTK-Fluid-Datei</comment>
<comment xml:lang="el">Αρχείο FLTK Fluid</comment>
- <comment xml:lang="en_GB">FLTK Fluid file</comment>
+ <comment xml:lang="en-GB">FLTK Fluid file</comment>
<comment xml:lang="es">archivo FLTK Fluid</comment>
<comment xml:lang="eu">FLTK Fluid fitxategia</comment>
<comment xml:lang="fi">FLTK Fluid -tiedosto</comment>
<comment xml:lang="fo">FLTK Fluid fíla</comment>
<comment xml:lang="fr">fichier Fluid FLTK</comment>
+ <comment xml:lang="fur">file FLTK Fluid</comment>
<comment xml:lang="ga">comhad FLTK Fluid</comment>
<comment xml:lang="gl">ficheiro FLTK Fluid</comment>
<comment xml:lang="he">קובץ FLTK Fluid</comment>
@@ -10615,7 +11037,7 @@
<comment xml:lang="oc">fichièr Fluid FLTK</comment>
<comment xml:lang="pl">Plik Fluid FLTK</comment>
<comment xml:lang="pt">ficheiro FLTK Fluid</comment>
- <comment xml:lang="pt_BR">Arquivo Fluid do FLTK</comment>
+ <comment xml:lang="pt-BR">Arquivo Fluid do FLTK</comment>
<comment xml:lang="ro">Fișier FLTK Fluid</comment>
<comment xml:lang="ru">Файл FLTK Fluid</comment>
<comment xml:lang="sk">Súbor FLTK Fluid</comment>
@@ -10626,34 +11048,37 @@
<comment xml:lang="tr">FLTK Fluid dosyası</comment>
<comment xml:lang="uk">файл FLTK Fluid</comment>
<comment xml:lang="vi">Tập tin Fluid FLTK</comment>
- <comment xml:lang="zh_CN">FLTK 流体文档</comment>
- <comment xml:lang="zh_TW">FLTK Fluid 檔</comment>
+ <comment xml:lang="zh-CN">FLTK 流体文档</comment>
+ <comment xml:lang="zh-TW">FLTK Fluid 檔</comment>
<acronym>FLTK</acronym>
<expanded-acronym>Fast Light Toolkit</expanded-acronym>
<sub-class-of type="text/plain"/>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="# data file for the Fltk" type="string" offset="0"/>
+ <match type="string" value="# data file for the Fltk" offset="0"/>
</magic>
<glob pattern="*.fl"/>
</mime-type>
<mime-type type="font/woff">
<comment>WOFF font</comment>
+ <comment xml:lang="af">WOFF-skriftipe</comment>
<comment xml:lang="ast">Fonte WOFF</comment>
+ <comment xml:lang="bg">Шрифт — WOFF</comment>
<comment xml:lang="ca">lletra WOFF</comment>
<comment xml:lang="cs">font WOFF</comment>
<comment xml:lang="da">WOFF-skrifttype</comment>
<comment xml:lang="de">WOFF-Schrift</comment>
<comment xml:lang="el">Γραμματοσειρά WOFF</comment>
- <comment xml:lang="en_GB">WOFF font</comment>
+ <comment xml:lang="en-GB">WOFF font</comment>
<comment xml:lang="es">tipo de letra WOFF</comment>
<comment xml:lang="eu">WOFF letra-tipoa</comment>
<comment xml:lang="fi">WOFF-fontti</comment>
<comment xml:lang="fr">police WOFF</comment>
+ <comment xml:lang="fur">caratar WOFF</comment>
<comment xml:lang="ga">cló WOFF</comment>
<comment xml:lang="gl">Tipo de letra WOFF</comment>
<comment xml:lang="he">גופן WOFF</comment>
- <comment xml:lang="hr">WOFF slovo</comment>
+ <comment xml:lang="hr">WOFF font</comment>
<comment xml:lang="hu">WOFF-betűkészlet</comment>
<comment xml:lang="ia">Typo de litteras WOFF</comment>
<comment xml:lang="id">Fonta WOFF</comment>
@@ -10661,11 +11086,12 @@
<comment xml:lang="ja">WOFF フォント</comment>
<comment xml:lang="kk">WOFF қарібі</comment>
<comment xml:lang="ko">WOFF 글꼴</comment>
+ <comment xml:lang="lt">WOFF šriftas</comment>
<comment xml:lang="lv">WOFF fonts</comment>
<comment xml:lang="oc">poliça WOFF</comment>
<comment xml:lang="pl">Czcionka WOFF</comment>
<comment xml:lang="pt">letra WOFF</comment>
- <comment xml:lang="pt_BR">Fonte WOFF</comment>
+ <comment xml:lang="pt-BR">Fonte WOFF</comment>
<comment xml:lang="ru">Шрифт WOFF</comment>
<comment xml:lang="sk">Písmo WOFF</comment>
<comment xml:lang="sl">Pisava WOFF</comment>
@@ -10673,83 +11099,100 @@
<comment xml:lang="sv">WOFF-typsnitt</comment>
<comment xml:lang="tr">WOFF yazı tipi</comment>
<comment xml:lang="uk">шрифт WOFF</comment>
- <comment xml:lang="zh_CN">WOFF 字体</comment>
- <comment xml:lang="zh_TW">WOFF 字型</comment>
+ <comment xml:lang="zh-CN">WOFF 字体</comment>
+ <comment xml:lang="zh-TW">WOFF 字型</comment>
<acronym>WOFF</acronym>
<expanded-acronym>Web Open Font Format</expanded-acronym>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="0x774f4646" type="big32" offset="0"/>
+ <match type="big32" value="0x774f4646" offset="0"/>
</magic>
<glob pattern="*.woff"/>
<alias type="application/font-woff"/>
</mime-type>
- <mime-type type="font/woff">
+ <mime-type type="font/woff2">
<comment>WOFF2 font</comment>
+ <comment xml:lang="af">WOFF2-skriftipe</comment>
<comment xml:lang="ast">Fonte WOFF2</comment>
+ <comment xml:lang="bg">Шрифт — WOFF2</comment>
<comment xml:lang="ca">lletra WOFF2</comment>
<comment xml:lang="cs">font WOFF2</comment>
+ <comment xml:lang="da">WOFF2-skrifttype</comment>
<comment xml:lang="de">WOFF2-Schrift</comment>
- <comment xml:lang="en_GB">WOFF2 font</comment>
+ <comment xml:lang="en-GB">WOFF2 font</comment>
<comment xml:lang="es">tipo de letra WOFF2</comment>
+ <comment xml:lang="eu">WOFF2 letra-tipoa</comment>
<comment xml:lang="fi">WOFF2-fontti</comment>
- <comment xml:lang="hr">WOFF2 slovo</comment>
+ <comment xml:lang="fr">police WOFF2</comment>
+ <comment xml:lang="fur">caratar WOFF2</comment>
+ <comment xml:lang="ga">cló WOFF2</comment>
+ <comment xml:lang="hr">WOFF2 font</comment>
<comment xml:lang="hu">WOFF2 betűkészlet</comment>
<comment xml:lang="id">Fonta WOFF2</comment>
<comment xml:lang="it">Carattere WOFF2</comment>
<comment xml:lang="kk">WOFF2 қарібі</comment>
<comment xml:lang="ko">WOFF2 글꼴</comment>
+ <comment xml:lang="lt">WOFF2 šriftas</comment>
<comment xml:lang="pl">Czcionka WOFF2</comment>
- <comment xml:lang="pt_BR">Fonte WOFF2</comment>
+ <comment xml:lang="pt">letra WOFF2</comment>
+ <comment xml:lang="pt-BR">Fonte WOFF2</comment>
<comment xml:lang="ru">Шрифт WOFF2</comment>
<comment xml:lang="sk">Písmo WOFF2</comment>
+ <comment xml:lang="sl">Pisava WOFF2</comment>
<comment xml:lang="sv">WOFF2-typsnitt</comment>
+ <comment xml:lang="tr">WOFF2 yazı tipi</comment>
<comment xml:lang="uk">шрифт WOFF2</comment>
- <comment xml:lang="zh_CN">WOFF2 字体</comment>
- <comment xml:lang="zh_TW">WOFF2 字型</comment>
+ <comment xml:lang="zh-CN">WOFF2 字体</comment>
+ <comment xml:lang="zh-TW">WOFF2 字型</comment>
<acronym>WOFF2</acronym>
<expanded-acronym>Web Open Font Format 2.0</expanded-acronym>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="0x774f4632" type="big32" offset="0"/>
+ <match type="big32" value="0x774f4632" offset="0"/>
</magic>
<glob pattern="*.woff2"/>
</mime-type>
<mime-type type="application/x-font-type1">
<comment>PostScript type-1 font</comment>
+ <comment xml:lang="af">PostScript tipe 1-skriftipe</comment>
+ <comment xml:lang="bg">Шрифт — PostScript type-1</comment>
<comment xml:lang="ca">lletra type-1 de PostScript</comment>
<comment xml:lang="cs">font PostScript type-1</comment>
+ <comment xml:lang="da">PostScript type-1-skrifttype</comment>
<comment xml:lang="de">PostScript-Typ-1-Schrift</comment>
- <comment xml:lang="en_GB">PostScript type-1 font</comment>
+ <comment xml:lang="en-GB">PostScript type-1 font</comment>
<comment xml:lang="es">tipo de letra PostScript Type-1</comment>
<comment xml:lang="eu">PostScript type-1 letra-tipoa</comment>
+ <comment xml:lang="fi">PostScript type-1 -fontti</comment>
<comment xml:lang="fr">police PostScript Type 1</comment>
+ <comment xml:lang="fur">caratar PostScript type-1</comment>
<comment xml:lang="ga">cló PostScript type-1</comment>
- <comment xml:lang="hr">PostScript type-1 slovo</comment>
+ <comment xml:lang="hr">PostScript type-1 font</comment>
<comment xml:lang="hu">PostScript type-1 betűkészlet</comment>
- <comment xml:lang="id">fonta PostScript type-1</comment>
+ <comment xml:lang="id">Fonta PostScript type-1</comment>
<comment xml:lang="it">Carattere PostScript type-1</comment>
<comment xml:lang="kk">PostScript type-1 қарібі</comment>
<comment xml:lang="ko">PostScript Type-1 글꼴</comment>
<comment xml:lang="pl">Czcionka PostScript Type-1</comment>
- <comment xml:lang="pt_BR">Fonte PostScript tipo-1</comment>
+ <comment xml:lang="pt">letra PostScript Tipo 1</comment>
+ <comment xml:lang="pt-BR">Fonte PostScript tipo-1</comment>
<comment xml:lang="ru">Шрифт PostScript Type-1</comment>
<comment xml:lang="sk">Písmo PostScript typu 1</comment>
<comment xml:lang="sr">слова Постскрипта врсте-1</comment>
<comment xml:lang="sv">PostScript type-1-typsnitt</comment>
<comment xml:lang="tr">PostScript tip-1 yazı tipi</comment>
<comment xml:lang="uk">шрифт type-1 PostScript</comment>
- <comment xml:lang="zh_CN">PostScript type-1 字体</comment>
- <comment xml:lang="zh_TW">PostScript type-1 字型</comment>
+ <comment xml:lang="zh-CN">PostScript type-1 字体</comment>
+ <comment xml:lang="zh-TW">PostScript type-1 字型</comment>
<sub-class-of type="application/postscript"/>
<generic-icon name="font-x-generic"/>
<magic priority="60">
- <match value="LWFN" type="string" offset="0"/>
- <match value="LWFN" type="string" offset="65"/>
- <match value="%!PS-AdobeFont-1." type="string" offset="0"/>
- <match value="%!PS-AdobeFont-1." type="string" offset="6"/>
- <match value="%!FontType1-1." type="string" offset="0"/>
- <match value="%!FontType1-1." type="string" offset="6"/>
+ <match type="string" value="LWFN" offset="0"/>
+ <match type="string" value="LWFN" offset="65"/>
+ <match type="string" value="%!PS-AdobeFont-1." offset="0"/>
+ <match type="string" value="%!PS-AdobeFont-1." offset="6"/>
+ <match type="string" value="%!FontType1-1." offset="0"/>
+ <match type="string" value="%!FontType1-1." offset="6"/>
</magic>
<glob pattern="*.pfa"/>
<glob pattern="*.pfb"/>
@@ -10757,9 +11200,10 @@
</mime-type>
<mime-type type="application/x-font-afm">
<comment>Adobe font metrics</comment>
+ <comment xml:lang="af">Adobe skriftipe-afmetings</comment>
<comment xml:lang="ar">مقاييس خط أدوبي</comment>
<comment xml:lang="az">Adobe yazı növü metrikləri</comment>
- <comment xml:lang="be@latin">Metryka šryftu Adobe</comment>
+ <comment xml:lang="be-Latn">Metryka šryftu Adobe</comment>
<comment xml:lang="bg">Шрифтова метрика — Adobe</comment>
<comment xml:lang="ca">mètrica de lletra d'Adobe</comment>
<comment xml:lang="cs">metrika fontu Adobe</comment>
@@ -10767,16 +11211,17 @@
<comment xml:lang="da">Adobe skrifttypefil</comment>
<comment xml:lang="de">Adobe-Schriftmetriken</comment>
<comment xml:lang="el">Μετρικά γραμματοσειράς Adobe</comment>
- <comment xml:lang="en_GB">Adobe font metrics</comment>
+ <comment xml:lang="en-GB">Adobe font metrics</comment>
<comment xml:lang="eo">metrikoj de Adobe-tiparo</comment>
<comment xml:lang="es">métricas tipográficas de Adobe</comment>
<comment xml:lang="eu">Adobe letra-tipoen neurriak</comment>
<comment xml:lang="fi">Adobe-fonttimitat</comment>
<comment xml:lang="fr">métriques de police Adobe</comment>
+ <comment xml:lang="fur">metrichis caratar Adobe</comment>
<comment xml:lang="ga">meadarachtaí cló Adobe</comment>
<comment xml:lang="gl">métricas de fonte de Adobe</comment>
<comment xml:lang="he">מדדי גופן של Adobe</comment>
- <comment xml:lang="hr">Adobe mjere slova</comment>
+ <comment xml:lang="hr">Metrika Adobe fonta</comment>
<comment xml:lang="hu">Adobe-betűmetrika</comment>
<comment xml:lang="ia">Metricas de typo de litteras Adobe</comment>
<comment xml:lang="id">Metrik fonta Adobe</comment>
@@ -10793,7 +11238,7 @@
<comment xml:lang="oc">metricas de poliça Adobe</comment>
<comment xml:lang="pl">Metryka czcionki Adobe</comment>
<comment xml:lang="pt">métrica de letras Adobe</comment>
- <comment xml:lang="pt_BR">Métricas de fonte Adobe</comment>
+ <comment xml:lang="pt-BR">Métricas de fonte Adobe</comment>
<comment xml:lang="ro">Dimensiuni font Adobe</comment>
<comment xml:lang="ru">Метрика шрифта Adobe</comment>
<comment xml:lang="sk">Metrika písma Adobe</comment>
@@ -10801,19 +11246,20 @@
<comment xml:lang="sq">Metrik lloj gërmash Adobe</comment>
<comment xml:lang="sr">метрика Адобе слова</comment>
<comment xml:lang="sv">Adobe-typsnittsmetrik</comment>
- <comment xml:lang="tr">Adobe yazıtipi ölçüleri</comment>
+ <comment xml:lang="tr">Adobe yazı tipi ölçüleri</comment>
<comment xml:lang="uk">метрики шрифту Adobe</comment>
<comment xml:lang="vi">Cách đo phông chữ Adobe</comment>
- <comment xml:lang="zh_CN">Adobe 字体规格</comment>
- <comment xml:lang="zh_TW">Adobe 字型描述檔</comment>
+ <comment xml:lang="zh-CN">Adobe 字体规格</comment>
+ <comment xml:lang="zh-TW">Adobe 字型描述檔</comment>
<generic-icon name="font-x-generic"/>
<glob pattern="*.afm"/>
</mime-type>
<mime-type type="application/x-font-bdf">
<comment>BDF font</comment>
+ <comment xml:lang="af">BDF-skriftipe</comment>
<comment xml:lang="ar">خط BDF</comment>
<comment xml:lang="az">BDF yazı növü</comment>
- <comment xml:lang="be@latin">Šryft BDF</comment>
+ <comment xml:lang="be-Latn">Šryft BDF</comment>
<comment xml:lang="bg">Шрифт — BDF</comment>
<comment xml:lang="ca">lletra BDF</comment>
<comment xml:lang="cs">font BDF</comment>
@@ -10821,17 +11267,18 @@
<comment xml:lang="da">BDF-skrifttype</comment>
<comment xml:lang="de">BDF-Schrift</comment>
<comment xml:lang="el">Γραμματοσειρά BDF</comment>
- <comment xml:lang="en_GB">BDF font</comment>
+ <comment xml:lang="en-GB">BDF font</comment>
<comment xml:lang="eo">BDF-tiparo</comment>
<comment xml:lang="es">tipo de letra BDF</comment>
<comment xml:lang="eu">BDF letra-tipoa</comment>
<comment xml:lang="fi">BDF-fontti</comment>
<comment xml:lang="fo">BDF stavasnið</comment>
<comment xml:lang="fr">police BDF</comment>
+ <comment xml:lang="fur">caratar BDF</comment>
<comment xml:lang="ga">cló BDF</comment>
<comment xml:lang="gl">tipo de fonte BDF</comment>
<comment xml:lang="he">גופן BDF</comment>
- <comment xml:lang="hr">BDF slovo</comment>
+ <comment xml:lang="hr">BDF font</comment>
<comment xml:lang="hu">BDF-betűkészlet</comment>
<comment xml:lang="ia">Typo de litteras BDF</comment>
<comment xml:lang="id">Fonta BDF</comment>
@@ -10848,7 +11295,7 @@
<comment xml:lang="oc">poliça BDF</comment>
<comment xml:lang="pl">Czcionka BDF</comment>
<comment xml:lang="pt">letra BDF</comment>
- <comment xml:lang="pt_BR">Fonte BDF</comment>
+ <comment xml:lang="pt-BR">Fonte BDF</comment>
<comment xml:lang="ro">Font BDF</comment>
<comment xml:lang="ru">Шрифт BDF</comment>
<comment xml:lang="sk">Písmo BDF</comment>
@@ -10856,22 +11303,23 @@
<comment xml:lang="sq">Lloj gërme BDF</comment>
<comment xml:lang="sr">БДФ слова</comment>
<comment xml:lang="sv">BDF-typsnitt</comment>
- <comment xml:lang="tr">BDF fontu</comment>
+ <comment xml:lang="tr">BDF yazı tipi</comment>
<comment xml:lang="uk">шрифт BDF</comment>
<comment xml:lang="vi">Phông chữ BDF</comment>
- <comment xml:lang="zh_CN">BDF 字体</comment>
- <comment xml:lang="zh_TW">BDF 字型</comment>
+ <comment xml:lang="zh-CN">BDF 字体</comment>
+ <comment xml:lang="zh-TW">BDF 字型</comment>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="STARTFONT\040" type="string" offset="0"/>
+ <match type="string" value="STARTFONT\040" offset="0"/>
</magic>
<glob pattern="*.bdf"/>
</mime-type>
<mime-type type="application/x-font-dos">
<comment>DOS font</comment>
+ <comment xml:lang="af">DOS-skriftipe</comment>
<comment xml:lang="ar">خط DOS</comment>
<comment xml:lang="az">DOS yazı növü</comment>
- <comment xml:lang="be@latin">Šryft DOS</comment>
+ <comment xml:lang="be-Latn">Šryft DOS</comment>
<comment xml:lang="bg">Шрифт — DOS</comment>
<comment xml:lang="ca">lletra DOS</comment>
<comment xml:lang="cs">font pro DOS</comment>
@@ -10879,17 +11327,18 @@
<comment xml:lang="da">DOS-skrifttype</comment>
<comment xml:lang="de">DOS-Schrift</comment>
<comment xml:lang="el">Γραμματοσειρά DOS</comment>
- <comment xml:lang="en_GB">DOS font</comment>
+ <comment xml:lang="en-GB">DOS font</comment>
<comment xml:lang="eo">DOS-tiparo</comment>
<comment xml:lang="es">tipo de letra de DOS</comment>
<comment xml:lang="eu">DOS letra-tipoa</comment>
<comment xml:lang="fi">DOS-fontti</comment>
<comment xml:lang="fo">DOS stavasnið</comment>
<comment xml:lang="fr">police DOS</comment>
+ <comment xml:lang="fur">caratar DOS</comment>
<comment xml:lang="ga">cló DOS</comment>
<comment xml:lang="gl">tipo de fonte de DOS</comment>
<comment xml:lang="he">גופן DOS</comment>
- <comment xml:lang="hr">DOS slovo</comment>
+ <comment xml:lang="hr">DOS font</comment>
<comment xml:lang="hu">DOS-betűkészlet</comment>
<comment xml:lang="ia">Typo de litteras DOS</comment>
<comment xml:lang="id">Fonta DOS</comment>
@@ -10906,7 +11355,7 @@
<comment xml:lang="oc">poliça DOS</comment>
<comment xml:lang="pl">Czcionka DOS</comment>
<comment xml:lang="pt">letra DOS</comment>
- <comment xml:lang="pt_BR">Fonte do DOS</comment>
+ <comment xml:lang="pt-BR">Fonte do DOS</comment>
<comment xml:lang="ro">Font DOS</comment>
<comment xml:lang="ru">Шрифт DOS</comment>
<comment xml:lang="sk">Písmo pre DOS</comment>
@@ -10914,23 +11363,24 @@
<comment xml:lang="sq">Gërmë DOS</comment>
<comment xml:lang="sr">ДОС слова</comment>
<comment xml:lang="sv">DOS-typsnitt</comment>
- <comment xml:lang="tr">DOS fontu</comment>
+ <comment xml:lang="tr">DOS yazı tipi</comment>
<comment xml:lang="uk">шрифт DOS</comment>
<comment xml:lang="vi">Phông chữ DOS</comment>
- <comment xml:lang="zh_CN">DOS 字体</comment>
- <comment xml:lang="zh_TW">DOS 字型</comment>
+ <comment xml:lang="zh-CN">DOS 字体</comment>
+ <comment xml:lang="zh-TW">DOS 字型</comment>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="\xff\x46\x4f\x4e" type="string" offset="0"/>
- <match value="\x00\x45\x47\x41" type="string" offset="7"/>
- <match value="\x00\x56\x49\x44" type="string" offset="7"/>
+ <match type="string" value="\xff\x46\x4f\x4e" offset="0"/>
+ <match type="string" value="\x00\x45\x47\x41" offset="7"/>
+ <match type="string" value="\x00\x56\x49\x44" offset="7"/>
</magic>
</mime-type>
<mime-type type="application/x-font-framemaker">
<comment>Adobe FrameMaker font</comment>
+ <comment xml:lang="af">Adobe FrameMaker-skriftipe</comment>
<comment xml:lang="ar">خط أدوبي الصانع للإطارات</comment>
<comment xml:lang="az">Adobe FrameMaker yazı növü</comment>
- <comment xml:lang="be@latin">Šryft Adobe FrameMaker</comment>
+ <comment xml:lang="be-Latn">Šryft Adobe FrameMaker</comment>
<comment xml:lang="bg">Шрифт — Adobe FrameMaker</comment>
<comment xml:lang="ca">lletra d'Adobe FrameMaker</comment>
<comment xml:lang="cs">font Adobe FrameMaker</comment>
@@ -10938,17 +11388,18 @@
<comment xml:lang="da">Adobe FrameMaker-skrifttype</comment>
<comment xml:lang="de">Adobe-FrameMaker-Schrift</comment>
<comment xml:lang="el">Γραμματοσειρά Adobe FrameMaker</comment>
- <comment xml:lang="en_GB">Adobe FrameMaker font</comment>
+ <comment xml:lang="en-GB">Adobe FrameMaker font</comment>
<comment xml:lang="eo">Tiparo de Adobe FrameMaker</comment>
<comment xml:lang="es">tipo de letra de Adobe FrameMaker</comment>
<comment xml:lang="eu">Adobe FrameMaker-en letra-tipoa</comment>
<comment xml:lang="fi">Adobe FrameMaker -fontti</comment>
<comment xml:lang="fo">Adobe FrameMaker stavasnið</comment>
<comment xml:lang="fr">police Adobe FrameMaker</comment>
+ <comment xml:lang="fur">caratar Adobe FrameMaker</comment>
<comment xml:lang="ga">cló Adobe FrameMaker</comment>
<comment xml:lang="gl">tipo de fonte de Adobe FrameMaker</comment>
<comment xml:lang="he">גופן של Adobe FrameMaker</comment>
- <comment xml:lang="hr">Adobe FrameMaker slovo</comment>
+ <comment xml:lang="hr">Adobe FrameMaker font</comment>
<comment xml:lang="hu">Adobe FrameMaker-betűkészlet</comment>
<comment xml:lang="ia">Typo de litteras pro Adobe FrameMaker</comment>
<comment xml:lang="id">Fonta Adobe FrameMaker</comment>
@@ -10965,7 +11416,7 @@
<comment xml:lang="oc">poliça Adobe FrameMaker</comment>
<comment xml:lang="pl">Czcionka Adobe FrameMaker</comment>
<comment xml:lang="pt">letra Adobe FrameMaker</comment>
- <comment xml:lang="pt_BR">Fonte do Adobe FrameMaker</comment>
+ <comment xml:lang="pt-BR">Fonte do Adobe FrameMaker</comment>
<comment xml:lang="ro">Font Adobe FrameMaker</comment>
<comment xml:lang="ru">Шрифт Adobe FrameMaker</comment>
<comment xml:lang="sk">Písmo Adobe FrameMaker</comment>
@@ -10976,18 +11427,19 @@
<comment xml:lang="tr">Adobe FrameMaker yazı tipi</comment>
<comment xml:lang="uk">шрифт Adobe FrameMaker</comment>
<comment xml:lang="vi">Phông chữ Adobe FrameMaker</comment>
- <comment xml:lang="zh_CN">Adobe FrameMaker 字体</comment>
- <comment xml:lang="zh_TW">Adobe FrameMaker 字型</comment>
+ <comment xml:lang="zh-CN">Adobe FrameMaker 字体</comment>
+ <comment xml:lang="zh-TW">Adobe FrameMaker 字型</comment>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="&lt;MakerScreenFont" type="string" offset="0"/>
+ <match type="string" value="&lt;MakerScreenFont" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-font-libgrx">
<comment>LIBGRX font</comment>
+ <comment xml:lang="af">LIBGRX-skriftipe</comment>
<comment xml:lang="ar">خط LIBGRX</comment>
<comment xml:lang="az">LIBGRX yazı növü</comment>
- <comment xml:lang="be@latin">Šryft LIBGRX</comment>
+ <comment xml:lang="be-Latn">Šryft LIBGRX</comment>
<comment xml:lang="bg">Шрифт — LIBGRX</comment>
<comment xml:lang="ca">lletra LIBGRX</comment>
<comment xml:lang="cs">font LIBGRX</comment>
@@ -10995,17 +11447,18 @@
<comment xml:lang="da">LIBGRX-skrifttype</comment>
<comment xml:lang="de">LIBGRX-Schrift</comment>
<comment xml:lang="el">Γραμματοσειρά LIBGRX</comment>
- <comment xml:lang="en_GB">LIBGRX font</comment>
+ <comment xml:lang="en-GB">LIBGRX font</comment>
<comment xml:lang="eo">LIBGRX-tiparo</comment>
<comment xml:lang="es">tipo de letra LIBGRX</comment>
<comment xml:lang="eu">LIBGRX letra-tipoa</comment>
<comment xml:lang="fi">LIBGRX-fontti</comment>
<comment xml:lang="fo">LIBGRX stavasnið</comment>
<comment xml:lang="fr">police LIBGRX</comment>
+ <comment xml:lang="fur">caratar LIBGRX</comment>
<comment xml:lang="ga">cló LIBGRX</comment>
<comment xml:lang="gl">tipo de fonte en LIBGRX</comment>
<comment xml:lang="he">גופן LIBGRX</comment>
- <comment xml:lang="hr">LIBGRX slovo</comment>
+ <comment xml:lang="hr">LIBGRX font</comment>
<comment xml:lang="hu">LIBGRX-betűkészlet</comment>
<comment xml:lang="ia">Typo de litteras LIBGRX</comment>
<comment xml:lang="id">Fonta LIBGRX</comment>
@@ -11022,7 +11475,7 @@
<comment xml:lang="oc">poliça LIBGRX</comment>
<comment xml:lang="pl">Czcionka LIBGRX</comment>
<comment xml:lang="pt">letra LIBGRX</comment>
- <comment xml:lang="pt_BR">Fonte LIBGRX</comment>
+ <comment xml:lang="pt-BR">Fonte LIBGRX</comment>
<comment xml:lang="ro">Font LIBGRX</comment>
<comment xml:lang="ru">Шрифт LIBGRX</comment>
<comment xml:lang="sk">Písmo LIBGRX</comment>
@@ -11030,21 +11483,22 @@
<comment xml:lang="sq">Lloj gërme LIBGRX</comment>
<comment xml:lang="sr">ЛИБГРИкс слова</comment>
<comment xml:lang="sv">LIBGRX-typsnitt</comment>
- <comment xml:lang="tr">LIBGRX fontu</comment>
+ <comment xml:lang="tr">LIBGRX yazı tipi</comment>
<comment xml:lang="uk">шрифт LIBGRX</comment>
<comment xml:lang="vi">Phông chữ LIBGRX</comment>
- <comment xml:lang="zh_CN">LIBGRX 字体</comment>
- <comment xml:lang="zh_TW">LIBGRX 字型</comment>
+ <comment xml:lang="zh-CN">LIBGRX 字体</comment>
+ <comment xml:lang="zh-TW">LIBGRX 字型</comment>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="\x14\x02\x59\x19" type="string" offset="0"/>
+ <match type="string" value="\x14\x02\x59\x19" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-font-linux-psf">
<comment>Linux PSF console font</comment>
+ <comment xml:lang="af">Linux PSF-konsoleskriftipe</comment>
<comment xml:lang="ar">خط كونسول PSF لينكس</comment>
<comment xml:lang="az">Linux PSF konsol yazı növü</comment>
- <comment xml:lang="be@latin">Kansolny šryft PSF dla Linuksa</comment>
+ <comment xml:lang="be-Latn">Kansolny šryft PSF dla Linuksa</comment>
<comment xml:lang="bg">Шрифт — PSF, за конзолата на Линукс</comment>
<comment xml:lang="ca">lletra de consola PSF de Linux</comment>
<comment xml:lang="cs">font PSF pro konzolu Linuxu</comment>
@@ -11052,17 +11506,18 @@
<comment xml:lang="da">Linux PSF-konsolskrifttype</comment>
<comment xml:lang="de">Linux-PSF-Konsolenschrift</comment>
<comment xml:lang="el">Γραμματοσειρά κονσόλας PSF Linux</comment>
- <comment xml:lang="en_GB">Linux PSF console font</comment>
+ <comment xml:lang="en-GB">Linux PSF console font</comment>
<comment xml:lang="eo">PSF-tiparo de Linux-konzolo</comment>
<comment xml:lang="es">tipo de letra de consola Linux PSF</comment>
<comment xml:lang="eu">Linux PSF kontsolako letra-tipoa</comment>
<comment xml:lang="fi">Linux PSF -konsolifontti</comment>
<comment xml:lang="fo">Linux PSF stýristøðs stavasnið</comment>
<comment xml:lang="fr">police console Linux PSF</comment>
+ <comment xml:lang="fur">caratar console Linux PSF</comment>
<comment xml:lang="ga">cló consóil Linux PSF</comment>
<comment xml:lang="gl">tipo de fonte de consola Linux PSF</comment>
<comment xml:lang="he">גופן לקונסול מסוג Linux PSF</comment>
- <comment xml:lang="hr">Linux PSF konzolno slovo</comment>
+ <comment xml:lang="hr">Linux PSF font konzole</comment>
<comment xml:lang="hu">Linux PSF konzolos betűkészlet</comment>
<comment xml:lang="ia">Typo de litteras console Linux PSF</comment>
<comment xml:lang="id">Fonta konsol Linux PSF</comment>
@@ -11079,7 +11534,7 @@
<comment xml:lang="oc">poliça consòla Linux PSF</comment>
<comment xml:lang="pl">Czcionka konsoli PSF Linux</comment>
<comment xml:lang="pt">letra de consola Linux PSF</comment>
- <comment xml:lang="pt_BR">Fonte de console Linux PSF</comment>
+ <comment xml:lang="pt-BR">Fonte de console Linux PSF</comment>
<comment xml:lang="ro">Font consolă Linux PSF</comment>
<comment xml:lang="ru">Консольный шрифт Linux PSF</comment>
<comment xml:lang="sk">Písmo PSF pre konzolu Linuxu</comment>
@@ -11087,38 +11542,40 @@
<comment xml:lang="sq">Lloj gërme për konsolë Linux PSF</comment>
<comment xml:lang="sr">слова Линуксове ПСФ конзоле</comment>
<comment xml:lang="sv">Linux PSF-konsoltypsnitt</comment>
- <comment xml:lang="tr">Linux PSF konsol fontu</comment>
+ <comment xml:lang="tr">Linux PSF konsol yazı tipi</comment>
<comment xml:lang="uk">консольний шрифт Linux PSF</comment>
<comment xml:lang="vi">Phông chữ bàn giao tiếp PSF Linux</comment>
- <comment xml:lang="zh_CN">Linux PSF 控制台字体</comment>
- <comment xml:lang="zh_TW">Linux PSF console 字型</comment>
+ <comment xml:lang="zh-CN">Linux PSF 控制台字体</comment>
+ <comment xml:lang="zh-TW">Linux PSF console 字型</comment>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="\x36\x04" type="string" offset="0"/>
+ <match type="string" value="\x36\x04" offset="0"/>
</magic>
<glob pattern="*.psf"/>
</mime-type>
<mime-type type="application/x-gz-font-linux-psf">
<comment>Linux PSF console font (gzip-compressed)</comment>
+ <comment xml:lang="af">Linux PSF-konsoleskriftipe (gzip-saamgepers)</comment>
<comment xml:lang="ar">خط كونسول PSF لينكس (مضغوط-gzip)</comment>
- <comment xml:lang="be@latin">Kansolny šryft PSF dla Linuksa (gzip-skampresavany)</comment>
+ <comment xml:lang="be-Latn">Kansolny šryft PSF dla Linuksa (gzip-skampresavany)</comment>
<comment xml:lang="bg">Шрифт — Linux PSF, компресиран с gzip</comment>
<comment xml:lang="ca">lletra de consola PSF de Linux (amb compressió gzip)</comment>
<comment xml:lang="cs">font PSF pro konzolu Linuxu (komprimace gzip)</comment>
<comment xml:lang="da">Linux PSF-konsolskrifttype (gzip-komprimeret)</comment>
<comment xml:lang="de">Linux-PSF-Konsolenschrift (gzip-komprimiert)</comment>
<comment xml:lang="el">Γραμματοσειρά κονσόλας PSF Linux (συμπιεσμένη με gzip)</comment>
- <comment xml:lang="en_GB">Linux PSF console font (gzip-compressed)</comment>
+ <comment xml:lang="en-GB">Linux PSF console font (gzip-compressed)</comment>
<comment xml:lang="es">tipo de letra de consola Linux PSF (comprimido con gzip)</comment>
<comment xml:lang="eu">Linux PSF kontsolako letra-tipoa (gzip-ekin konprimitua)</comment>
<comment xml:lang="fi">Linux PSF -konsolifontti (gzip-pakattu)</comment>
<comment xml:lang="fo">Linux PSF stýristøðs stavasnið (gzip-stappað)</comment>
<comment xml:lang="fr">police console Linux PSF (compressée gzip)</comment>
+ <comment xml:lang="fur">caratar console Linux PSF (comprimût cun gzip)</comment>
<comment xml:lang="ga">cló consóil Linux PSF (comhbhrúite le gzip)</comment>
<comment xml:lang="gl">tipo de fonte de consola Linux PSF (comprimida con gzip)</comment>
<comment xml:lang="he">גופן למסוף מסוג Linux PSF (מכווץ ע״י gzip)</comment>
- <comment xml:lang="hr">Linux PSF konzolno slovo (gzip sažeto)</comment>
- <comment xml:lang="hu">Linux PSF konzolos betűkészlet (gzip-tömörítésű)</comment>
+ <comment xml:lang="hr">Linux PSF font konzolne (gzip komprimirano)</comment>
+ <comment xml:lang="hu">Linux PSF konzolos betűkészlet (gzip tömörítésű)</comment>
<comment xml:lang="ia">Typo de litteras console Linux PSF (comprimite con gzip)</comment>
<comment xml:lang="id">Fonta konsol Linux PSF (terkompresi gzip)</comment>
<comment xml:lang="it">Carattere console Linux PSF (compresso con gzip)</comment>
@@ -11133,7 +11590,7 @@
<comment xml:lang="oc">poliça consòla Linux PSF (compressat gzip)</comment>
<comment xml:lang="pl">Czcionka konsoli PSF Linux (kompresja gzip)</comment>
<comment xml:lang="pt">letra de consola Linux PSF (compressão gzip)</comment>
- <comment xml:lang="pt_BR">Fonte de console Linux PSF (compactada com gzip)</comment>
+ <comment xml:lang="pt-BR">Fonte de console Linux PSF (compactada com gzip)</comment>
<comment xml:lang="ro">Font consolă Linux PSF (compresie gzip)</comment>
<comment xml:lang="ru">Консольный шрифт Linux PSF (сжатый gzip)</comment>
<comment xml:lang="sk">Písmo PSF pre konzolu Linuxu (komprimované pomocou gzip)</comment>
@@ -11141,20 +11598,21 @@
<comment xml:lang="sq">Lloj gërme për konsolë Linux PSF (komresuar me gzip)</comment>
<comment xml:lang="sr">слова Линуксове ПСФ конзоле (запакована гзип-ом)</comment>
<comment xml:lang="sv">Linux PSF-konsoltypsnitt (gzip-komprimerat)</comment>
- <comment xml:lang="tr">Linux PSF konsol fontu (gzip ile sıkıştırılmış)</comment>
+ <comment xml:lang="tr">Linux PSF konsol yazı tipi (gzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">консольний шрифт Linux PSF (стиснений gzip)</comment>
<comment xml:lang="vi">Phông chữ bàn giao tiếp PSF Linux (đã nén gzip)</comment>
- <comment xml:lang="zh_CN">Linux PSF 控制台字体（gzip 压缩）</comment>
- <comment xml:lang="zh_TW">Linux PSF console 字型 (gzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">Linux PSF 控制台字体（gzip 压缩）</comment>
+ <comment xml:lang="zh-TW">Linux PSF console 字型 (gzip 壓縮)</comment>
<sub-class-of type="application/gzip"/>
<generic-icon name="font-x-generic"/>
<glob pattern="*.psf.gz"/>
</mime-type>
<mime-type type="application/x-font-pcf">
<comment>PCF font</comment>
+ <comment xml:lang="af">PCF-skriftipe</comment>
<comment xml:lang="ar">خط PCF</comment>
<comment xml:lang="az">PCF yazı növü</comment>
- <comment xml:lang="be@latin">Šryft PCF</comment>
+ <comment xml:lang="be-Latn">Šryft PCF</comment>
<comment xml:lang="bg">Шрифт — PCF</comment>
<comment xml:lang="ca">lletra PCF</comment>
<comment xml:lang="cs">font PCF</comment>
@@ -11162,17 +11620,18 @@
<comment xml:lang="da">PCF-skrifttype</comment>
<comment xml:lang="de">PCF-Schrift</comment>
<comment xml:lang="el">Γραμματοσειρά PCF</comment>
- <comment xml:lang="en_GB">PCF font</comment>
+ <comment xml:lang="en-GB">PCF font</comment>
<comment xml:lang="eo">PCF-tiparo</comment>
<comment xml:lang="es">tipo de letra PCF</comment>
<comment xml:lang="eu">PCF letra-tipoa</comment>
<comment xml:lang="fi">PCF-fontti</comment>
<comment xml:lang="fo">PCF stavasnið</comment>
<comment xml:lang="fr">police PCF</comment>
+ <comment xml:lang="fur">caratar PCF</comment>
<comment xml:lang="ga">cló PCF</comment>
<comment xml:lang="gl">tipo de letra PCF</comment>
<comment xml:lang="he">גופן PCF</comment>
- <comment xml:lang="hr">PCF slovo</comment>
+ <comment xml:lang="hr">PCF font</comment>
<comment xml:lang="hu">PCF-betűkészlet</comment>
<comment xml:lang="ia">Typo de litteras PCF</comment>
<comment xml:lang="id">Fonta PCF</comment>
@@ -11189,7 +11648,7 @@
<comment xml:lang="oc">poliça PCF</comment>
<comment xml:lang="pl">Czcionka PCF</comment>
<comment xml:lang="pt">letra PCF</comment>
- <comment xml:lang="pt_BR">Fonte PCF</comment>
+ <comment xml:lang="pt-BR">Fonte PCF</comment>
<comment xml:lang="ro">Font PCF</comment>
<comment xml:lang="ru">Шрифт PCF</comment>
<comment xml:lang="sk">Písmo PCF</comment>
@@ -11197,14 +11656,14 @@
<comment xml:lang="sq">Gërma PCF</comment>
<comment xml:lang="sr">ПЦФ слова</comment>
<comment xml:lang="sv">PCF-typsnitt</comment>
- <comment xml:lang="tr">PCF fontu</comment>
+ <comment xml:lang="tr">PCF yazı tipi</comment>
<comment xml:lang="uk">шрифт PCF</comment>
<comment xml:lang="vi">Phông chữ PCF</comment>
- <comment xml:lang="zh_CN">PCF 字体</comment>
- <comment xml:lang="zh_TW">PCF 字型</comment>
+ <comment xml:lang="zh-CN">PCF 字体</comment>
+ <comment xml:lang="zh-TW">PCF 字型</comment>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="\001fcp" type="string" offset="0"/>
+ <match type="string" value="\001fcp" offset="0"/>
</magic>
<glob pattern="*.pcf"/>
<glob pattern="*.pcf.Z"/>
@@ -11212,9 +11671,10 @@
</mime-type>
<mime-type type="font/otf">
<comment>OpenType font</comment>
+ <comment xml:lang="af">OpenType-skriftipe</comment>
<comment xml:lang="ar">خط OpenType</comment>
<comment xml:lang="az">OpenType yazı növü</comment>
- <comment xml:lang="be@latin">Šryft OpenType</comment>
+ <comment xml:lang="be-Latn">Šryft OpenType</comment>
<comment xml:lang="bg">Шрифт — OpenType</comment>
<comment xml:lang="ca">lletra OpenType</comment>
<comment xml:lang="cs">font OpenType</comment>
@@ -11222,17 +11682,18 @@
<comment xml:lang="da">OpenType-skrifttype</comment>
<comment xml:lang="de">OpenType-Schrift</comment>
<comment xml:lang="el">Γραμματοσειρά OpenType </comment>
- <comment xml:lang="en_GB">OpenType font</comment>
+ <comment xml:lang="en-GB">OpenType font</comment>
<comment xml:lang="eo">OpenType-tiparo</comment>
<comment xml:lang="es">tipo de letra OpenType</comment>
<comment xml:lang="eu">OpenType letra-tipoa</comment>
<comment xml:lang="fi">OpenType-fontti</comment>
<comment xml:lang="fo">OpenType stavasnið</comment>
<comment xml:lang="fr">police OpenType</comment>
+ <comment xml:lang="fur">caratar OpenType</comment>
<comment xml:lang="ga">cló OpenType</comment>
<comment xml:lang="gl">tipo de fonte OpenType</comment>
<comment xml:lang="he">גופן של OpenType</comment>
- <comment xml:lang="hr">OpenType slovo</comment>
+ <comment xml:lang="hr">OpenType font</comment>
<comment xml:lang="hu">OpenType-betűkészlet</comment>
<comment xml:lang="ia">Typo de litteras OpenType</comment>
<comment xml:lang="id">Fonta OpenType</comment>
@@ -11249,7 +11710,7 @@
<comment xml:lang="oc">poliça OpenType</comment>
<comment xml:lang="pl">Czcionka OpenType</comment>
<comment xml:lang="pt">letra OpenType</comment>
- <comment xml:lang="pt_BR">Fonte OpenType</comment>
+ <comment xml:lang="pt-BR">Fonte OpenType</comment>
<comment xml:lang="ro">Font OpenType</comment>
<comment xml:lang="ru">Шрифт OpenType</comment>
<comment xml:lang="sk">Písmo OpenType</comment>
@@ -11257,24 +11718,25 @@
<comment xml:lang="sq">Gërma OpenType</comment>
<comment xml:lang="sr">слова Отворене Врсте</comment>
<comment xml:lang="sv">OpenType-typsnitt</comment>
- <comment xml:lang="tr">OpenType fontu</comment>
+ <comment xml:lang="tr">OpenType yazı tipi</comment>
<comment xml:lang="uk">шрифт OpenType</comment>
<comment xml:lang="vi">Phông chữ OpenType</comment>
- <comment xml:lang="zh_CN">OpenType 字体</comment>
- <comment xml:lang="zh_TW">OpenType 字型</comment>
+ <comment xml:lang="zh-CN">OpenType 字体</comment>
+ <comment xml:lang="zh-TW">OpenType 字型</comment>
<sub-class-of type="font/ttf"/>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="OTTO" type="string" offset="0"/>
+ <match type="string" value="OTTO" offset="0"/>
</magic>
<glob pattern="*.otf"/>
<alias type="application/x-font-otf"/>
</mime-type>
<mime-type type="application/x-font-speedo">
<comment>Speedo font</comment>
+ <comment xml:lang="af">Speedo-skriftipe</comment>
<comment xml:lang="ar">خط Speedo</comment>
<comment xml:lang="az">Speedo yazı növü</comment>
- <comment xml:lang="be@latin">Šryft Speedo</comment>
+ <comment xml:lang="be-Latn">Šryft Speedo</comment>
<comment xml:lang="bg">Шрифт — Speedo</comment>
<comment xml:lang="ca">lletra Speedo</comment>
<comment xml:lang="cs">font Speedo</comment>
@@ -11282,17 +11744,18 @@
<comment xml:lang="da">Speedoskrifttype</comment>
<comment xml:lang="de">Speedo-Schrift</comment>
<comment xml:lang="el">Γραμματοσειρά Speedo</comment>
- <comment xml:lang="en_GB">Speedo font</comment>
+ <comment xml:lang="en-GB">Speedo font</comment>
<comment xml:lang="eo">Speedo-tiparo</comment>
<comment xml:lang="es">tipo de letra de Speedo</comment>
<comment xml:lang="eu">Speedo letra-tipoa</comment>
<comment xml:lang="fi">Speedo-fontti</comment>
<comment xml:lang="fo">Speedo stavasnið</comment>
<comment xml:lang="fr">police Speedo</comment>
+ <comment xml:lang="fur">caratar Speedo</comment>
<comment xml:lang="ga">cló Speedo</comment>
<comment xml:lang="gl">tipo de letra Speedo</comment>
<comment xml:lang="he">גופן של Speedo</comment>
- <comment xml:lang="hr">Speedo slovo</comment>
+ <comment xml:lang="hr">Speedo font</comment>
<comment xml:lang="hu">Speedo-betűkészlet</comment>
<comment xml:lang="ia">Typo de litteras Speedo</comment>
<comment xml:lang="id">Fonta Speedo</comment>
@@ -11309,7 +11772,7 @@
<comment xml:lang="oc">poliça Speedo</comment>
<comment xml:lang="pl">Czcionka Speedo</comment>
<comment xml:lang="pt">letra Speedo</comment>
- <comment xml:lang="pt_BR">Fonte Speedo</comment>
+ <comment xml:lang="pt-BR">Fonte Speedo</comment>
<comment xml:lang="ro">Font Speedo</comment>
<comment xml:lang="ru">Шрифт Speedo</comment>
<comment xml:lang="sk">Písmo Speedo</comment>
@@ -11317,22 +11780,23 @@
<comment xml:lang="sq">Gërma Speedo</comment>
<comment xml:lang="sr">Спидо слова</comment>
<comment xml:lang="sv">Speedo-typsnitt</comment>
- <comment xml:lang="tr">Speedo fontu</comment>
+ <comment xml:lang="tr">Speedo yazı tipi</comment>
<comment xml:lang="uk">шрифт Speedo</comment>
<comment xml:lang="vi">Phông chữ Speedo</comment>
- <comment xml:lang="zh_CN">Speedo 字体</comment>
- <comment xml:lang="zh_TW">Speedo 字型</comment>
+ <comment xml:lang="zh-CN">Speedo 字体</comment>
+ <comment xml:lang="zh-TW">Speedo 字型</comment>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="D1.0\015" type="string" offset="0"/>
+ <match type="string" value="D1.0\015" offset="0"/>
</magic>
<glob pattern="*.spd"/>
</mime-type>
<mime-type type="application/x-font-sunos-news">
<comment>SunOS News font</comment>
+ <comment xml:lang="af">SunOS News-skriftipe</comment>
<comment xml:lang="ar">خط SunOS News</comment>
<comment xml:lang="az">SunOS News yazı növü</comment>
- <comment xml:lang="be@latin">Šryft SunOS News</comment>
+ <comment xml:lang="be-Latn">Šryft SunOS News</comment>
<comment xml:lang="bg">Шрифт — SunOS News</comment>
<comment xml:lang="ca">lletra News de SunOS</comment>
<comment xml:lang="cs">font SunOS News</comment>
@@ -11340,17 +11804,18 @@
<comment xml:lang="da">SunOS News-skrifttype</comment>
<comment xml:lang="de">SunOS-News-Schrift</comment>
<comment xml:lang="el">Γραμματοσειρά SunOS News</comment>
- <comment xml:lang="en_GB">SunOS News font</comment>
+ <comment xml:lang="en-GB">SunOS News font</comment>
<comment xml:lang="eo">tiparo de SunOS News</comment>
<comment xml:lang="es">tipo de letra para NeWS de SunOS</comment>
<comment xml:lang="eu">SunOs News letra-tipoa</comment>
<comment xml:lang="fi">SunOS News -fontti</comment>
<comment xml:lang="fo">SunOS News stavasnið</comment>
<comment xml:lang="fr">police SunOS News</comment>
+ <comment xml:lang="fur">caratar SunOS News</comment>
<comment xml:lang="ga">cló SunOS News</comment>
<comment xml:lang="gl">tipo de letra SunOS News</comment>
<comment xml:lang="he">גופן של SunOS News</comment>
- <comment xml:lang="hr">SunOS News slovo</comment>
+ <comment xml:lang="hr">SunOS News font</comment>
<comment xml:lang="hu">SunOS News-betűkészlet</comment>
<comment xml:lang="ia">Typo de litteras SunOS News</comment>
<comment xml:lang="id">Fonta SunOS News</comment>
@@ -11367,7 +11832,7 @@
<comment xml:lang="oc">poliça SunOS News</comment>
<comment xml:lang="pl">Czcionka SunOS News</comment>
<comment xml:lang="pt">letra SunOS News</comment>
- <comment xml:lang="pt_BR">Fonte SunOS News</comment>
+ <comment xml:lang="pt-BR">Fonte SunOS News</comment>
<comment xml:lang="ro">Font SunOS News</comment>
<comment xml:lang="ru">Шрифт SunOS News</comment>
<comment xml:lang="sk">Písmo SunOS News</comment>
@@ -11378,20 +11843,21 @@
<comment xml:lang="tr">SunOS News yazı tipi</comment>
<comment xml:lang="uk">шрифт SunOS News</comment>
<comment xml:lang="vi">Phông chữ SunOS News</comment>
- <comment xml:lang="zh_CN">SunOS News 字体</comment>
- <comment xml:lang="zh_TW">SunOS News 字型</comment>
+ <comment xml:lang="zh-CN">SunOS News 字体</comment>
+ <comment xml:lang="zh-TW">SunOS News 字型</comment>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="StartFont" type="string" offset="0"/>
- <match value="\x13\x7A\x29" type="string" offset="0"/>
- <match value="\x13\x7A\x2B" type="string" offset="8"/>
+ <match type="string" value="StartFont" offset="0"/>
+ <match type="string" value="\x13\x7A\x29" offset="0"/>
+ <match type="string" value="\x13\x7A\x2B" offset="8"/>
</magic>
</mime-type>
<mime-type type="application/x-font-tex">
<comment>TeX font</comment>
+ <comment xml:lang="af">TeX-skriftipe</comment>
<comment xml:lang="ar">خط TeX</comment>
<comment xml:lang="az">TeX yazı növü</comment>
- <comment xml:lang="be@latin">Šryft TeX</comment>
+ <comment xml:lang="be-Latn">Šryft TeX</comment>
<comment xml:lang="bg">Шрифт — TeX</comment>
<comment xml:lang="ca">lletra TeX</comment>
<comment xml:lang="cs">font TeX</comment>
@@ -11399,17 +11865,18 @@
<comment xml:lang="da">TeX-skrifttype</comment>
<comment xml:lang="de">TeX-Schrift</comment>
<comment xml:lang="el">Γραμματοσειρά TeX</comment>
- <comment xml:lang="en_GB">TeX font</comment>
+ <comment xml:lang="en-GB">TeX font</comment>
<comment xml:lang="eo">TeX-tiparo</comment>
<comment xml:lang="es">tipo de letra de TeX</comment>
<comment xml:lang="eu">TeX letra-tipoa</comment>
<comment xml:lang="fi">TeX-fontti</comment>
<comment xml:lang="fo">TeX stavasnið</comment>
<comment xml:lang="fr">police TeX</comment>
+ <comment xml:lang="fur">caratar TeX</comment>
<comment xml:lang="ga">cló TeX</comment>
<comment xml:lang="gl">tipo de letra de TeX</comment>
<comment xml:lang="he">גופן TeX</comment>
- <comment xml:lang="hr">TeX slovo</comment>
+ <comment xml:lang="hr">TeX font</comment>
<comment xml:lang="hu">TeX-betűkészlet</comment>
<comment xml:lang="ia">Typo de litteras TeX</comment>
<comment xml:lang="id">Fonta TeX</comment>
@@ -11426,7 +11893,7 @@
<comment xml:lang="oc">poliça TeX</comment>
<comment xml:lang="pl">Czcionka TeX</comment>
<comment xml:lang="pt">letra TeX</comment>
- <comment xml:lang="pt_BR">Fonte TeX</comment>
+ <comment xml:lang="pt-BR">Fonte TeX</comment>
<comment xml:lang="ro">Font TeX</comment>
<comment xml:lang="ru">Шрифт TeX</comment>
<comment xml:lang="sk">Písmo TeX</comment>
@@ -11434,23 +11901,24 @@
<comment xml:lang="sq">Gërma TeX</comment>
<comment xml:lang="sr">ТеКс слова</comment>
<comment xml:lang="sv">TeX-typsnitt</comment>
- <comment xml:lang="tr">TeX fontu</comment>
+ <comment xml:lang="tr">TeX yazı tipi</comment>
<comment xml:lang="uk">шрифт TeX</comment>
<comment xml:lang="vi">Phông chữ TeX</comment>
- <comment xml:lang="zh_CN">TeX 字体</comment>
- <comment xml:lang="zh_TW">TeX 字型</comment>
+ <comment xml:lang="zh-CN">TeX 字体</comment>
+ <comment xml:lang="zh-TW">TeX 字型</comment>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="\367\203" type="string" offset="0"/>
- <match value="\367\131" type="string" offset="0"/>
- <match value="\367\312" type="string" offset="0"/>
+ <match type="string" value="\367\203" offset="0"/>
+ <match type="string" value="\367\131" offset="0"/>
+ <match type="string" value="\367\312" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-font-tex-tfm">
<comment>TeX font metrics</comment>
+ <comment xml:lang="af">TeX-skriftipeafmetings</comment>
<comment xml:lang="ar">مقاييس خط TeX</comment>
<comment xml:lang="az">TeX yazı növü metrikləri</comment>
- <comment xml:lang="be@latin">Metryka šryftu TeX</comment>
+ <comment xml:lang="be-Latn">Metryka šryftu TeX</comment>
<comment xml:lang="bg">Шрифтова метрика — TeX</comment>
<comment xml:lang="ca">mètrica de lletra de TeX</comment>
<comment xml:lang="cs">metrika fontu TeX</comment>
@@ -11458,16 +11926,17 @@
<comment xml:lang="da">TeX-skrifttypeinformation</comment>
<comment xml:lang="de">TeX-Schriftmetriken</comment>
<comment xml:lang="el">Μετρικά γραμματοσειράς TeX</comment>
- <comment xml:lang="en_GB">TeX font metrics</comment>
+ <comment xml:lang="en-GB">TeX font metrics</comment>
<comment xml:lang="eo">metrikoj de TeX-tiparo</comment>
<comment xml:lang="es">métricas tipográficas de TeX</comment>
<comment xml:lang="eu">TeX letra-tipoen neurriak</comment>
<comment xml:lang="fi">TeX-fonttimitat</comment>
<comment xml:lang="fr">métriques de police TeX</comment>
+ <comment xml:lang="fur">metrichis caratar TeX</comment>
<comment xml:lang="ga">meadarachtaí cló TeX</comment>
<comment xml:lang="gl">Métricas de tipo de letra de TeX</comment>
<comment xml:lang="he">ממדי גופן של TeX</comment>
- <comment xml:lang="hr">TeX mjere slova</comment>
+ <comment xml:lang="hr">Metrika TeX fonta</comment>
<comment xml:lang="hu">TeX-betűmetrika</comment>
<comment xml:lang="ia">Metricas de typo de litteras TeX</comment>
<comment xml:lang="id">Fonta metrik TeX</comment>
@@ -11484,7 +11953,7 @@
<comment xml:lang="oc">metricas de poliça TeX</comment>
<comment xml:lang="pl">Metryki czcionki TeX</comment>
<comment xml:lang="pt">métricas de letra TeX</comment>
- <comment xml:lang="pt_BR">Métrica de fonte TeX</comment>
+ <comment xml:lang="pt-BR">Métrica de fonte TeX</comment>
<comment xml:lang="ro">Dimensiuni font TeX</comment>
<comment xml:lang="ru">Метрика шрифта TeX</comment>
<comment xml:lang="sk">Metrika písma TeX</comment>
@@ -11495,35 +11964,37 @@
<comment xml:lang="tr">TeX yazı tipi ölçüleri</comment>
<comment xml:lang="uk">метрики шрифту TeX</comment>
<comment xml:lang="vi">Cách đo phông chữ TeX</comment>
- <comment xml:lang="zh_CN">TeX 字体规格</comment>
- <comment xml:lang="zh_TW">TeX 字型描述檔</comment>
+ <comment xml:lang="zh-CN">TeX 字体规格</comment>
+ <comment xml:lang="zh-TW">TeX 字型描述檔</comment>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="\000\021" type="string" offset="2"/>
- <match value="\000\022" type="string" offset="2"/>
+ <match type="string" value="\000\021" offset="2"/>
+ <match type="string" value="\000\022" offset="2"/>
</magic>
</mime-type>
<mime-type type="font/ttf">
<comment>TrueType font</comment>
+ <comment xml:lang="af">TrueType-skriftipe</comment>
<comment xml:lang="ar">خط TrueType</comment>
- <comment xml:lang="be@latin">Šryft TrueType</comment>
+ <comment xml:lang="be-Latn">Šryft TrueType</comment>
<comment xml:lang="bg">Шрифт — TrueType</comment>
<comment xml:lang="ca">lletra TrueType</comment>
<comment xml:lang="cs">font TrueType</comment>
<comment xml:lang="da">TrueType-skrifttype</comment>
<comment xml:lang="de">TrueType-Schrift</comment>
<comment xml:lang="el">Γραμματοσειρά TrueType</comment>
- <comment xml:lang="en_GB">TrueType font</comment>
+ <comment xml:lang="en-GB">TrueType font</comment>
<comment xml:lang="eo">TrueType-tiparo</comment>
<comment xml:lang="es">tipo de letra TrueType</comment>
<comment xml:lang="eu">TrueType letra-tipoa</comment>
<comment xml:lang="fi">TrueType-fontti</comment>
<comment xml:lang="fo">TrueType stavasnið</comment>
<comment xml:lang="fr">police Truetype</comment>
+ <comment xml:lang="fur">caratar TrueType</comment>
<comment xml:lang="ga">cló TrueType</comment>
<comment xml:lang="gl">tipo de letra TrueType</comment>
<comment xml:lang="he">גופן מסוג TrueType</comment>
- <comment xml:lang="hr">TrueType slovo</comment>
+ <comment xml:lang="hr">TrueType font</comment>
<comment xml:lang="hu">TrueType-betűkészlet</comment>
<comment xml:lang="ia">Typo de litteras TrueType</comment>
<comment xml:lang="id">Fonta TrueType</comment>
@@ -11540,7 +12011,7 @@
<comment xml:lang="oc">poliça Truetype</comment>
<comment xml:lang="pl">Czcionka TrueType</comment>
<comment xml:lang="pt">letra TrueType</comment>
- <comment xml:lang="pt_BR">Fonte TrueType</comment>
+ <comment xml:lang="pt-BR">Fonte TrueType</comment>
<comment xml:lang="ro">Font TrueType</comment>
<comment xml:lang="ru">Шрифт TrueType</comment>
<comment xml:lang="sk">Písmo TrueType</comment>
@@ -11548,65 +12019,77 @@
<comment xml:lang="sq">Lloj gërme TrueType</comment>
<comment xml:lang="sr">Трутајп слова</comment>
<comment xml:lang="sv">Truetype-typsnitt</comment>
- <comment xml:lang="tr">TrueType fontu</comment>
+ <comment xml:lang="tr">TrueType yazı tipi</comment>
<comment xml:lang="uk">шрифт TrueType</comment>
<comment xml:lang="vi">Phông chữ TrueType</comment>
- <comment xml:lang="zh_CN">TrueType 字体</comment>
- <comment xml:lang="zh_TW">TrueType 字型</comment>
+ <comment xml:lang="zh-CN">TrueType 字体</comment>
+ <comment xml:lang="zh-TW">TrueType 字型</comment>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="FFIL" type="string" offset="0"/>
- <match value="FFIL" type="string" offset="65"/>
- <match value="\000\001\000\000\000" type="string" offset="0"/>
+ <match type="string" value="FFIL" offset="0"/>
+ <match type="string" value="FFIL" offset="65"/>
+ <match type="string" value="\000\001\000\000\000" offset="0"/>
</magic>
<glob pattern="*.ttf"/>
<alias type="application/x-font-ttf"/>
</mime-type>
<mime-type type="font/collection">
<comment>Font collection</comment>
+ <comment xml:lang="af">Skriftipeversameling</comment>
+ <comment xml:lang="bg">Шрифтова колекция</comment>
<comment xml:lang="ca">ccol·lecció de lletres</comment>
<comment xml:lang="cs">kolekce fontů</comment>
+ <comment xml:lang="da">Skrifttypesamling</comment>
<comment xml:lang="de">Schriftsammlung</comment>
- <comment xml:lang="en_GB">Font collection</comment>
+ <comment xml:lang="en-GB">Font collection</comment>
<comment xml:lang="es">colección tipográfica</comment>
+ <comment xml:lang="eu">Letra-tipo bilduma</comment>
<comment xml:lang="fi">Fonttikokoelma</comment>
- <comment xml:lang="hr">Kolekcija slova</comment>
+ <comment xml:lang="fr">Collection de polices</comment>
+ <comment xml:lang="fur">colezion di caratars</comment>
+ <comment xml:lang="ga">bailiúchán clónna</comment>
+ <comment xml:lang="hr">Zbirka fontova</comment>
<comment xml:lang="hu">Betűkészlet-gyűjtemény</comment>
<comment xml:lang="id">Koleksi fonta</comment>
<comment xml:lang="it">Raccolta di caratteri</comment>
<comment xml:lang="kk">Қаріптер жинағы</comment>
<comment xml:lang="ko">글꼴 모음</comment>
<comment xml:lang="pl">Kolekcja czcionek</comment>
- <comment xml:lang="pt_BR">coleção de fontes</comment>
+ <comment xml:lang="pt">coleção de letras</comment>
+ <comment xml:lang="pt-BR">coleção de fontes</comment>
<comment xml:lang="ru">Коллекция шрифтов</comment>
<comment xml:lang="sk">Zbierka písiem</comment>
+ <comment xml:lang="sl">Zbirka pisav</comment>
<comment xml:lang="sv">Typsnittssamling</comment>
+ <comment xml:lang="tr">Yazı tipi derlemi</comment>
<comment xml:lang="uk">збірка шрифтів</comment>
- <comment xml:lang="zh_CN">字体集</comment>
- <comment xml:lang="zh_TW">字型集</comment>
+ <comment xml:lang="zh-CN">字体集</comment>
+ <comment xml:lang="zh-TW">字型集</comment>
<generic-icon name="font-x-generic"/>
<glob pattern="*.ttc"/>
</mime-type>
<mime-type type="application/x-font-ttx">
<comment>TrueType XML font</comment>
+ <comment xml:lang="af">TrueType XML-skriftipe</comment>
<comment xml:lang="ar">خط TrueType XML</comment>
- <comment xml:lang="be@latin">Šryft TrueType XML</comment>
+ <comment xml:lang="be-Latn">Šryft TrueType XML</comment>
<comment xml:lang="bg">Шрифт — TrueType XML</comment>
<comment xml:lang="ca">lletra XML de TrueType</comment>
<comment xml:lang="cs">font TrueType XML</comment>
<comment xml:lang="da">TrueType XML-skrifttype</comment>
<comment xml:lang="de">TrueType-XML-Schrift</comment>
<comment xml:lang="el">Γραμματοσειρά XML TrueType</comment>
- <comment xml:lang="en_GB">TrueType XML font</comment>
+ <comment xml:lang="en-GB">TrueType XML font</comment>
<comment xml:lang="es">tipo de letra TrueType XML</comment>
<comment xml:lang="eu">TrueType XML letra-tipoa</comment>
<comment xml:lang="fi">TrueType-XML-fontti</comment>
<comment xml:lang="fo">TrueType XML stavasnið</comment>
<comment xml:lang="fr">police Truetype XML</comment>
+ <comment xml:lang="fur">caratar TrueType XML</comment>
<comment xml:lang="ga">cló XML TrueType</comment>
<comment xml:lang="gl">tipo de letra TrueType XML</comment>
<comment xml:lang="he">גופן XML מסוג TrueType</comment>
- <comment xml:lang="hr">TrueType XML slovo</comment>
+ <comment xml:lang="hr">TrueType XML font</comment>
<comment xml:lang="hu">TrueType XML betűkészlet</comment>
<comment xml:lang="ia">Typo de litteras TrueType XML</comment>
<comment xml:lang="id">Fonta TrueType XML</comment>
@@ -11622,7 +12105,7 @@
<comment xml:lang="oc">poliça Truetype XML</comment>
<comment xml:lang="pl">Czcionka TrueType XML</comment>
<comment xml:lang="pt">letra TrueType XML</comment>
- <comment xml:lang="pt_BR">Fonte TrueType XML</comment>
+ <comment xml:lang="pt-BR">Fonte TrueType XML</comment>
<comment xml:lang="ro">Font XML TrueType</comment>
<comment xml:lang="ru">Шрифт TrueType XML</comment>
<comment xml:lang="sk">Písmo TrueType XML</comment>
@@ -11630,23 +12113,24 @@
<comment xml:lang="sq">Lloj gërme TrueType XML</comment>
<comment xml:lang="sr">Трутајп ИксМЛ слова</comment>
<comment xml:lang="sv">Truetype XML-typsnitt</comment>
- <comment xml:lang="tr">TrueType XML fontu</comment>
+ <comment xml:lang="tr">TrueType XML yazı tipi</comment>
<comment xml:lang="uk">шрифт TrueType XML</comment>
<comment xml:lang="vi">Phông chữ XML TrueType</comment>
- <comment xml:lang="zh_CN">TrueType XML 字体</comment>
- <comment xml:lang="zh_TW">TrueType XML 字型</comment>
+ <comment xml:lang="zh-CN">TrueType XML 字体</comment>
+ <comment xml:lang="zh-TW">TrueType XML 字型</comment>
<sub-class-of type="application/xml"/>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="&lt;ttFont sfntVersion=&quot;\\x00\\x01\\x00\\x00&quot; ttLibVersion=&quot;" type="string" offset="0:256"/>
+ <match type="string" value="&lt;ttFont sfntVersion=&quot;\\x00\\x01\\x00\\x00&quot; ttLibVersion=&quot;" offset="0:256"/>
</magic>
<glob pattern="*.ttx"/>
</mime-type>
<mime-type type="application/x-font-vfont">
<comment>V font</comment>
+ <comment xml:lang="af">V-skriftipe</comment>
<comment xml:lang="ar">خط V</comment>
<comment xml:lang="az">V yazı növü</comment>
- <comment xml:lang="be@latin">Šryft V</comment>
+ <comment xml:lang="be-Latn">Šryft V</comment>
<comment xml:lang="bg">Шрифт — V</comment>
<comment xml:lang="ca">lletra V</comment>
<comment xml:lang="cs">font V</comment>
@@ -11654,17 +12138,18 @@
<comment xml:lang="da">V-skrifttype</comment>
<comment xml:lang="de">V-Schrift</comment>
<comment xml:lang="el">Γραμματοσειρά V</comment>
- <comment xml:lang="en_GB">V font</comment>
+ <comment xml:lang="en-GB">V font</comment>
<comment xml:lang="eo">V-tiparo</comment>
<comment xml:lang="es">tipo de letra V</comment>
<comment xml:lang="eu">V letra-tipoa</comment>
<comment xml:lang="fi">V-fontti</comment>
<comment xml:lang="fo">V stavasnið</comment>
<comment xml:lang="fr">police V</comment>
+ <comment xml:lang="fur">caratar V</comment>
<comment xml:lang="ga">cló V</comment>
<comment xml:lang="gl">tipo de letra V</comment>
<comment xml:lang="he">גופן של V</comment>
- <comment xml:lang="hr">V slovo</comment>
+ <comment xml:lang="hr">V font</comment>
<comment xml:lang="hu">V-betűkészlet</comment>
<comment xml:lang="ia">Typo de litteras V</comment>
<comment xml:lang="id">Fonta V</comment>
@@ -11681,7 +12166,7 @@
<comment xml:lang="oc">poliça V</comment>
<comment xml:lang="pl">Czcionka V</comment>
<comment xml:lang="pt">letra V</comment>
- <comment xml:lang="pt_BR">Fonte V</comment>
+ <comment xml:lang="pt-BR">Fonte V</comment>
<comment xml:lang="ro">Font V</comment>
<comment xml:lang="ru">Шрифт V font</comment>
<comment xml:lang="sk">Písmo V</comment>
@@ -11689,34 +12174,36 @@
<comment xml:lang="sq">Gërmë V</comment>
<comment xml:lang="sr">В слова</comment>
<comment xml:lang="sv">V-typsnitt</comment>
- <comment xml:lang="tr">V fontu</comment>
+ <comment xml:lang="tr">V yazı tipi</comment>
<comment xml:lang="uk">V-шрифт</comment>
<comment xml:lang="vi">Phông chữ V</comment>
- <comment xml:lang="zh_CN">V 字体</comment>
- <comment xml:lang="zh_TW">V 字型</comment>
+ <comment xml:lang="zh-CN">V 字体</comment>
+ <comment xml:lang="zh-TW">V 字型</comment>
<generic-icon name="font-x-generic"/>
<magic priority="50">
- <match value="FONT" type="string" offset="0"/>
+ <match type="string" value="FONT" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/vnd.framemaker">
<comment>Adobe FrameMaker document</comment>
+ <comment xml:lang="af">Adobe FrameMaker-dokument</comment>
<comment xml:lang="ar">مستند أدوبي الصانع للإطارات</comment>
<comment xml:lang="ast">Documentu d'Adobe FrameMaker</comment>
- <comment xml:lang="be@latin">Dakument Adobe FrameMaker</comment>
+ <comment xml:lang="be-Latn">Dakument Adobe FrameMaker</comment>
<comment xml:lang="bg">Документ — Adobe FrameMaker</comment>
<comment xml:lang="ca">document d'Adobe FrameMaker</comment>
<comment xml:lang="cs">dokument Adobe FrameMaker</comment>
<comment xml:lang="da">Adobe FrameMaker-dokument</comment>
<comment xml:lang="de">Adobe-FrameMaker-Dokument</comment>
<comment xml:lang="el">Έγγραφο Adobe FrameMaker</comment>
- <comment xml:lang="en_GB">Adobe FrameMaker document</comment>
+ <comment xml:lang="en-GB">Adobe FrameMaker document</comment>
<comment xml:lang="eo">Dokumento de Adobe FrameMaker</comment>
<comment xml:lang="es">documento de Adobe FrameMaker</comment>
<comment xml:lang="eu">Adobe FrameMaker-en dokumentua</comment>
<comment xml:lang="fi">Adobe FrameMaker -asiakirja</comment>
<comment xml:lang="fo">Adobe FrameMaker skjal</comment>
<comment xml:lang="fr">document Adobe FrameMaker</comment>
+ <comment xml:lang="fur">document Adobe FrameMaker</comment>
<comment xml:lang="ga">cáipéis Adobe FrameMaker</comment>
<comment xml:lang="gl">documento de Adobe FrameMaker</comment>
<comment xml:lang="he">מסמך Adobe FrameMaker</comment>
@@ -11737,7 +12224,7 @@
<comment xml:lang="oc">document Adobe FrameMaker</comment>
<comment xml:lang="pl">Dokument Adobe FrameMaker</comment>
<comment xml:lang="pt">documento Adobe FrameMaker</comment>
- <comment xml:lang="pt_BR">Documento do Adobe FrameMaker</comment>
+ <comment xml:lang="pt-BR">Documento do Adobe FrameMaker</comment>
<comment xml:lang="ro">Document Adobe FrameMaker</comment>
<comment xml:lang="ru">Документ Adobe FrameMaker</comment>
<comment xml:lang="sk">Dokument Adobe FrameMaker</comment>
@@ -11748,17 +12235,17 @@
<comment xml:lang="tr">Adobe FrameMaker belgesi</comment>
<comment xml:lang="uk">документ Adobe FrameMaker</comment>
<comment xml:lang="vi">Tài liệu Adobe FrameMaker</comment>
- <comment xml:lang="zh_CN">Adobe FrameMaker 文档</comment>
- <comment xml:lang="zh_TW">Adobe FrameMaker 文件</comment>
+ <comment xml:lang="zh-CN">Adobe FrameMaker 文档</comment>
+ <comment xml:lang="zh-TW">Adobe FrameMaker 文件</comment>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="&lt;MakerFile" type="string" offset="0"/>
- <match value="&lt;MIFFile" type="string" offset="0"/>
- <match value="&lt;MakerDictionary" type="string" offset="0"/>
- <match value="&lt;MakerScreenFon" type="string" offset="0"/>
- <match value="&lt;MML" type="string" offset="0"/>
- <match value="&lt;Book" type="string" offset="0"/>
- <match value="&lt;Maker" type="string" offset="0"/>
+ <match type="string" value="&lt;MakerFile" offset="0"/>
+ <match type="string" value="&lt;MIFFile" offset="0"/>
+ <match type="string" value="&lt;MakerDictionary" offset="0"/>
+ <match type="string" value="&lt;MakerScreenFon" offset="0"/>
+ <match type="string" value="&lt;MML" offset="0"/>
+ <match type="string" value="&lt;Book" offset="0"/>
+ <match type="string" value="&lt;Maker" offset="0"/>
</magic>
<glob pattern="*.fm"/>
<alias type="application/x-frame"/>
@@ -11766,20 +12253,21 @@
<mime-type type="application/x-gameboy-rom">
<comment>Game Boy ROM</comment>
<comment xml:lang="ar">Game Boy ROM</comment>
- <comment xml:lang="be@latin">Game Boy ROM</comment>
+ <comment xml:lang="be-Latn">Game Boy ROM</comment>
<comment xml:lang="bg">ROM — Game Boy</comment>
<comment xml:lang="ca">ROM de Game Boy</comment>
<comment xml:lang="cs">ROM pro Game Boy</comment>
- <comment xml:lang="da">Game Boy-rom</comment>
+ <comment xml:lang="da">Game Boy-ROM</comment>
<comment xml:lang="de">Game Boy ROM</comment>
<comment xml:lang="el">Game Boy ROM</comment>
- <comment xml:lang="en_GB">Game Boy ROM</comment>
+ <comment xml:lang="en-GB">Game Boy ROM</comment>
<comment xml:lang="eo">NLM de Game Boy</comment>
<comment xml:lang="es">ROM de Game Boy</comment>
<comment xml:lang="eu">Game Boy-eko ROMa</comment>
<comment xml:lang="fi">Game Boy -ROM</comment>
<comment xml:lang="fo">Game Boy ROM</comment>
<comment xml:lang="fr">ROM Game Boy</comment>
+ <comment xml:lang="fur">ROM Game Boy</comment>
<comment xml:lang="ga">ROM Game Boy</comment>
<comment xml:lang="gl">ROM de Game Boy</comment>
<comment xml:lang="he">ROM של Game Boy</comment>
@@ -11801,7 +12289,7 @@
<comment xml:lang="oc">ROM Game Boy</comment>
<comment xml:lang="pl">Plik ROM konsoli Game Boy</comment>
<comment xml:lang="pt">ROM Game Boy</comment>
- <comment xml:lang="pt_BR">ROM de Game Boy</comment>
+ <comment xml:lang="pt-BR">ROM de Game Boy</comment>
<comment xml:lang="ro">ROM Game Boy</comment>
<comment xml:lang="ru">Game Boy ROM</comment>
<comment xml:lang="sk">ROM pre Game Boy</comment>
@@ -11812,12 +12300,12 @@
<comment xml:lang="tr">Game Boy ROM</comment>
<comment xml:lang="uk">ППП Game Boy</comment>
<comment xml:lang="vi">ROM Game Boy</comment>
- <comment xml:lang="zh_CN">Game Boy ROM</comment>
- <comment xml:lang="zh_TW">Game Boy ROM</comment>
+ <comment xml:lang="zh-CN">Game Boy ROM</comment>
+ <comment xml:lang="zh-TW">Game Boy ROM</comment>
<generic-icon name="application-x-executable"/>
<magic priority="50">
- <match value="\xce\xed\x66\x66\xcc\x0d\x00\x0b\x03\x73\x00\x83\x00\x0c\x00\x0d\x00\x08\x11\x1f\x88\x89\x00\x0e" type="string" offset="260">
- <match value="0x0" type="byte" offset="323" mask="0x80"/>
+ <match type="string" value="\xce\xed\x66\x66\xcc\x0d\x00\x0b\x03\x73\x00\x83\x00\x0c\x00\x0d\x00\x08\x11\x1f\x88\x89\x00\x0e" offset="260">
+ <match type="byte" value="0x0" mask="0x80" offset="323"/>
</match>
</magic>
<glob pattern="*.gb"/>
@@ -11825,15 +12313,17 @@
</mime-type>
<mime-type type="application/x-gameboy-color-rom">
<comment>Game Boy Color ROM</comment>
+ <comment xml:lang="bg">ROM — Game Boy Color</comment>
<comment xml:lang="ca">ROM de Game Boy Color</comment>
<comment xml:lang="cs">ROM pro Game Boy Color</comment>
- <comment xml:lang="da">Game Boy Color ROM</comment>
+ <comment xml:lang="da">Game Boy Color-ROM</comment>
<comment xml:lang="de">Game Boy Color ROM</comment>
- <comment xml:lang="en_GB">Game Boy Colour ROM</comment>
+ <comment xml:lang="en-GB">Game Boy Colour ROM</comment>
<comment xml:lang="es">ROM de Game Boy Color</comment>
<comment xml:lang="eu">Game Boy Color ROM</comment>
<comment xml:lang="fi">Game Boy Color -ROM</comment>
<comment xml:lang="fr">ROM Game Boy Color</comment>
+ <comment xml:lang="fur">ROM Game Boy Color</comment>
<comment xml:lang="ga">ROM Game Boy Color</comment>
<comment xml:lang="he">ROM של Game Boy Color</comment>
<comment xml:lang="hr">Game Boy Color ROM</comment>
@@ -11843,19 +12333,19 @@
<comment xml:lang="kk">Game Boy Color ROM</comment>
<comment xml:lang="ko">게임보이 컬러 롬</comment>
<comment xml:lang="pl">Plik ROM konsoli Game Boy Color</comment>
- <comment xml:lang="pt_BR">ROM de Game Boy Color</comment>
+ <comment xml:lang="pt-BR">ROM de Game Boy Color</comment>
<comment xml:lang="ru">Game Boy Color ROM</comment>
<comment xml:lang="sk">ROM pre Game Boy Color</comment>
<comment xml:lang="sr">Гејм Бој РОМ боје</comment>
<comment xml:lang="sv">Game Boy Color-rom</comment>
<comment xml:lang="tr">Game Boy Color ROM</comment>
<comment xml:lang="uk">ППП Game Boy Color</comment>
- <comment xml:lang="zh_CN">Game Boy Color ROM</comment>
- <comment xml:lang="zh_TW">Game Boy Color ROM</comment>
+ <comment xml:lang="zh-CN">Game Boy Color ROM</comment>
+ <comment xml:lang="zh-TW">Game Boy Color ROM</comment>
<generic-icon name="application-x-executable"/>
<magic priority="50">
- <match value="\xce\xed\x66\x66\xcc\x0d\x00\x0b\x03\x73\x00\x83\x00\x0c\x00\x0d\x00\x08" type="string" offset="260">
- <match value="0x80" type="byte" offset="323" mask="0x80"/>
+ <match type="string" value="\xce\xed\x66\x66\xcc\x0d\x00\x0b\x03\x73\x00\x83\x00\x0c\x00\x0d\x00\x08" offset="260">
+ <match type="byte" value="0x80" mask="0x80" offset="323"/>
</match>
</magic>
<glob pattern="*.gbc"/>
@@ -11864,19 +12354,20 @@
<mime-type type="application/x-gba-rom">
<comment>Game Boy Advance ROM</comment>
<comment xml:lang="ar">Game Boy Advance ROM</comment>
- <comment xml:lang="be@latin">Game Boy Advance ROM</comment>
+ <comment xml:lang="be-Latn">Game Boy Advance ROM</comment>
<comment xml:lang="bg">ROM — Game Boy Advance</comment>
<comment xml:lang="ca">ROM de Game Boy Advance</comment>
<comment xml:lang="cs">ROM pro Game Boy Advance</comment>
- <comment xml:lang="da">Game Boy Advance-rom</comment>
+ <comment xml:lang="da">Game Boy Advance-ROM</comment>
<comment xml:lang="de">Game Boy Advance ROM</comment>
<comment xml:lang="el">Game Boy Advance ROM</comment>
- <comment xml:lang="en_GB">Game Boy Advance ROM</comment>
+ <comment xml:lang="en-GB">Game Boy Advance ROM</comment>
<comment xml:lang="es">ROM de Game Boy Advance</comment>
<comment xml:lang="eu">Game Boy Advance-ko ROMa</comment>
<comment xml:lang="fi">Game Boy Advance -ROM</comment>
<comment xml:lang="fo">Game Boy Advance ROM</comment>
<comment xml:lang="fr">ROM Game Boy Advance</comment>
+ <comment xml:lang="fur">ROM Game Boy Advance</comment>
<comment xml:lang="ga">ROM Game Boy Advance</comment>
<comment xml:lang="gl">ROM de Game Boy Advance</comment>
<comment xml:lang="he">ROM של Game Boy Advance</comment>
@@ -11897,7 +12388,7 @@
<comment xml:lang="oc">ROM Game Boy Advance</comment>
<comment xml:lang="pl">Plik ROM konsoli Game Boy Advance</comment>
<comment xml:lang="pt">ROM Game Boy Advance</comment>
- <comment xml:lang="pt_BR">ROM de Game Boy Advance</comment>
+ <comment xml:lang="pt-BR">ROM de Game Boy Advance</comment>
<comment xml:lang="ro">ROM Game Boy Advance</comment>
<comment xml:lang="ru">Game Boy Advance ROM</comment>
<comment xml:lang="sk">ROM pre Game Boy Advance</comment>
@@ -11908,19 +12399,26 @@
<comment xml:lang="tr">Game Boy Gelişmiş ROM</comment>
<comment xml:lang="uk">розширений ППП Game Boy</comment>
<comment xml:lang="vi">ROM Game Boy Advance</comment>
- <comment xml:lang="zh_CN">Game Boy Advance ROM</comment>
- <comment xml:lang="zh_TW">Game Boy Advance ROM</comment>
+ <comment xml:lang="zh-CN">Game Boy Advance ROM</comment>
+ <comment xml:lang="zh-TW">Game Boy Advance ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.gba"/>
<glob pattern="*.agb"/>
</mime-type>
<mime-type type="application/x-virtual-boy-rom">
<comment>Virtual Boy ROM</comment>
+ <comment xml:lang="bg">ROM — Virtual Boy</comment>
<comment xml:lang="ca">ROM de Virtual Boy</comment>
<comment xml:lang="cs">ROM pro Virtual Boy</comment>
+ <comment xml:lang="da">Virtual Boy-ROM</comment>
<comment xml:lang="de">Virtual Boy ROM</comment>
- <comment xml:lang="en_GB">Virtual Boy ROM</comment>
+ <comment xml:lang="en-GB">Virtual Boy ROM</comment>
<comment xml:lang="es">ROM de Virtual Boy</comment>
+ <comment xml:lang="eu">Virtual Boy ROM</comment>
+ <comment xml:lang="fi">Virtual Boy ROM</comment>
+ <comment xml:lang="fr">ROM Virtual Boy</comment>
+ <comment xml:lang="fur">ROM Virtual Boy</comment>
+ <comment xml:lang="ga">ROM Virtual Boy</comment>
<comment xml:lang="hr">Virtual Boy ROM</comment>
<comment xml:lang="hu">Virtual Boy ROM</comment>
<comment xml:lang="id">ROM Virtual Boy</comment>
@@ -11928,33 +12426,36 @@
<comment xml:lang="kk">Virtual Boy ROM</comment>
<comment xml:lang="ko">버추얼보이 롬</comment>
<comment xml:lang="pl">Plik ROM konsoli Virtual Boy</comment>
- <comment xml:lang="pt_BR">ROM de Virtual Boy</comment>
+ <comment xml:lang="pt-BR">ROM de Virtual Boy</comment>
<comment xml:lang="ru">Virtual Boy ROM</comment>
<comment xml:lang="sk">ROM pre Virtual Boy</comment>
<comment xml:lang="sv">Virtual Boy-rom</comment>
+ <comment xml:lang="tr">Virtual Boy ROM</comment>
<comment xml:lang="uk">ROM Virtual Boy</comment>
- <comment xml:lang="zh_CN">Virtual Boy ROM</comment>
- <comment xml:lang="zh_TW">Virtual Boy ROM</comment>
+ <comment xml:lang="zh-CN">Virtual Boy ROM</comment>
+ <comment xml:lang="zh-TW">Virtual Boy ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.vb"/>
</mime-type>
<mime-type type="application/x-gdbm">
<comment>GDBM database</comment>
+ <comment xml:lang="af">GDBM-databasis</comment>
<comment xml:lang="ar">قاعدة بيانات GDBM</comment>
- <comment xml:lang="be@latin">Baza źviestak GDBM</comment>
+ <comment xml:lang="be-Latn">Baza źviestak GDBM</comment>
<comment xml:lang="bg">База от данни — GDBM</comment>
<comment xml:lang="ca">base de dades GDBM</comment>
<comment xml:lang="cs">databáze GDBM</comment>
<comment xml:lang="da">GDBM-database</comment>
<comment xml:lang="de">GDBM-Datenbank</comment>
<comment xml:lang="el">Βάση δεδομένων GDBM</comment>
- <comment xml:lang="en_GB">GDBM database</comment>
+ <comment xml:lang="en-GB">GDBM database</comment>
<comment xml:lang="eo">GDBM-datumbazo</comment>
<comment xml:lang="es">base de datos GDBM</comment>
<comment xml:lang="eu">GDBM datu-basea</comment>
<comment xml:lang="fi">GDBM-tietokanta</comment>
<comment xml:lang="fo">GDBM dátustovnur</comment>
<comment xml:lang="fr">base de données GDBM</comment>
+ <comment xml:lang="fur">base di dâts GDBM</comment>
<comment xml:lang="ga">bunachar sonraí GDBM</comment>
<comment xml:lang="gl">base de datos GDBM</comment>
<comment xml:lang="he">מסד נתונים GDBM</comment>
@@ -11975,7 +12476,7 @@
<comment xml:lang="oc">banca de donadas GDBM</comment>
<comment xml:lang="pl">Baza danych GDBM</comment>
<comment xml:lang="pt">base de dados GDMB</comment>
- <comment xml:lang="pt_BR">Banco de dados GDBM</comment>
+ <comment xml:lang="pt-BR">Banco de dados GDBM</comment>
<comment xml:lang="ro">Bază de date GDBM</comment>
<comment xml:lang="ru">База данных GDBM</comment>
<comment xml:lang="sk">Databáza GDBM</comment>
@@ -11983,37 +12484,39 @@
<comment xml:lang="sq">Bazë me të dhëna GDBM</comment>
<comment xml:lang="sr">ГДБМ база података</comment>
<comment xml:lang="sv">GDBM-databas</comment>
- <comment xml:lang="tr">GDBM veritabanı</comment>
+ <comment xml:lang="tr">GDBM veri tabanı</comment>
<comment xml:lang="uk">база даних GDBM</comment>
<comment xml:lang="vi">Cơ sở dữ liệu GDBM</comment>
- <comment xml:lang="zh_CN">GDBM 数据库</comment>
- <comment xml:lang="zh_TW">GDBM 資料庫</comment>
+ <comment xml:lang="zh-CN">GDBM 数据库</comment>
+ <comment xml:lang="zh-TW">GDBM 資料庫</comment>
<acronym>GDBM</acronym>
<expanded-acronym>GNU Database Manager</expanded-acronym>
<magic priority="50">
- <match value="0x13579ace" type="big32" offset="0"/>
- <match value="0x13579ace" type="little32" offset="0"/>
- <match value="GDBM" type="string" offset="0"/>
+ <match type="big32" value="0x13579ace" offset="0"/>
+ <match type="little32" value="0x13579ace" offset="0"/>
+ <match type="string" value="GDBM" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-genesis-rom">
-
+ <!-- Translate this to Mega Drive if the console was known as such in your locale
+ Should be Mega Drive in all but en_US, Mexico and Canada: https://en.wikipedia.org/wiki/Sega_Genesis#History -->
<comment>Genesis ROM</comment>
<comment xml:lang="ar">Genesis ROM</comment>
- <comment xml:lang="be@latin">Genesis ROM</comment>
+ <comment xml:lang="be-Latn">Genesis ROM</comment>
<comment xml:lang="bg">ROM — Genesis</comment>
<comment xml:lang="ca">ROM de Genesis</comment>
<comment xml:lang="cs">ROM pro Genesis</comment>
- <comment xml:lang="da">Genesis-rom</comment>
+ <comment xml:lang="da">Genesis-ROM</comment>
<comment xml:lang="de">Genesis ROM</comment>
<comment xml:lang="el">Genesis ROM</comment>
- <comment xml:lang="en_GB">Genesis ROM</comment>
+ <comment xml:lang="en-GB">Genesis ROM</comment>
<comment xml:lang="eo">Genesis-NLM</comment>
<comment xml:lang="es">ROM de Genesis (Mega Drive)</comment>
<comment xml:lang="eu">Genesis-eko ROMa</comment>
<comment xml:lang="fi">Genesis-ROM</comment>
<comment xml:lang="fo">Genesis ROM</comment>
<comment xml:lang="fr">ROM Mega Drive/Genesis</comment>
+ <comment xml:lang="fur">ROM Sega Mega Drive</comment>
<comment xml:lang="ga">ROM Genesis</comment>
<comment xml:lang="gl">ROM xenérica</comment>
<comment xml:lang="he">ROM מסוג Genesis</comment>
@@ -12034,7 +12537,7 @@
<comment xml:lang="oc">ROM Mega Drive/Genesis</comment>
<comment xml:lang="pl">Plik ROM konsoli Mega Drive</comment>
<comment xml:lang="pt">ROM Mega Drive</comment>
- <comment xml:lang="pt_BR">ROM de Genesis (Mega Drive)</comment>
+ <comment xml:lang="pt-BR">ROM de Genesis (Mega Drive)</comment>
<comment xml:lang="ro">ROM Genesis</comment>
<comment xml:lang="ru">Genesis ROM</comment>
<comment xml:lang="sk">ROM pre Megadrive</comment>
@@ -12045,30 +12548,35 @@
<comment xml:lang="tr">Genesis ROM</comment>
<comment xml:lang="uk">ППП Genesis</comment>
<comment xml:lang="vi">ROM Genesis</comment>
- <comment xml:lang="zh_CN">Genesis ROM</comment>
- <comment xml:lang="zh_TW">Genesis ROM</comment>
+ <comment xml:lang="zh-CN">Genesis ROM</comment>
+ <comment xml:lang="zh-TW">Genesis ROM</comment>
<generic-icon name="application-x-executable"/>
<magic priority="50">
- <match value="SEGA GENESIS" type="string" offset="256"/>
- <match value="SEGA MEGA DRIVE" type="string" offset="256"/>
- <match value="EAGN" type="string" offset="640"/>
- <match value="EAMG" type="string" offset="640"/>
+ <match type="string" value="SEGA GENESIS" offset="256"/>
+ <match type="string" value="SEGA MEGA DRIVE" offset="256"/>
+ <match type="string" value="SEGA_MEGA_DRIVE" offset="256"/>
+ <match type="string" value="EAGN" offset="640"/>
+ <match type="string" value="EAMG" offset="640"/>
</magic>
<glob pattern="*.gen"/>
<glob pattern="*.smd"/>
+ <glob pattern="*.sgd"/>
</mime-type>
<mime-type type="application/x-genesis-32x-rom">
-
+ <!-- Translate this to Super 32X, Mega Drive 32X or Mega 32X if the system was known as such in your locale
+ Should be Super 32X in Japan, Mega Drive 32X in PAL region and Mega 32X in Brazil: https://en.wikipedia.org/wiki/32X -->
<comment>Genesis 32X ROM</comment>
+ <comment xml:lang="bg">ROM — Genesis 32X</comment>
<comment xml:lang="ca">ROM de Genesis 32X</comment>
<comment xml:lang="cs">ROM pro Genesis 32X</comment>
- <comment xml:lang="da">Genesis 32X ROM</comment>
+ <comment xml:lang="da">Genesis 32X-ROM</comment>
<comment xml:lang="de">Genesis 32X ROM</comment>
- <comment xml:lang="en_GB">Genesis 32X ROM</comment>
+ <comment xml:lang="en-GB">Genesis 32X ROM</comment>
<comment xml:lang="es">ROM de Genesis 32X</comment>
<comment xml:lang="eu">Genesis 32X ROM</comment>
<comment xml:lang="fi">Genesis 32X -ROM</comment>
<comment xml:lang="fr">ROM Genesis 32X</comment>
+ <comment xml:lang="fur">ROM Sega Mega Drive 32X</comment>
<comment xml:lang="ga">ROM Genesis 32X</comment>
<comment xml:lang="he">ROM מסוג Genesis 32X</comment>
<comment xml:lang="hr">Genesis 32X ROM</comment>
@@ -12078,39 +12586,41 @@
<comment xml:lang="kk">Genesis 32X ROM</comment>
<comment xml:lang="ko">제네시스 32X 롬</comment>
<comment xml:lang="pl">Plik ROM konsoli Mega Drive 32X</comment>
- <comment xml:lang="pt_BR">ROM de Genesis 32X</comment>
+ <comment xml:lang="pt-BR">ROM de Genesis 32X</comment>
<comment xml:lang="ru">Genesis 32X ROM</comment>
<comment xml:lang="sk">ROM pre Genesis 32X</comment>
<comment xml:lang="sr">Џенезис 32X РОМ</comment>
<comment xml:lang="sv">Mega Drive 32X-rom</comment>
<comment xml:lang="tr">Genesis 32X ROM</comment>
<comment xml:lang="uk">ППП Genesis 32X</comment>
- <comment xml:lang="zh_CN">Genesis 32X ROM</comment>
- <comment xml:lang="zh_TW">Genesis 32X ROM</comment>
+ <comment xml:lang="zh-CN">Genesis 32X ROM</comment>
+ <comment xml:lang="zh-TW">Genesis 32X ROM</comment>
<generic-icon name="application-x-executable"/>
<magic priority="50">
- <match value="SEGA 32X" type="string" offset="256"/>
+ <match type="string" value="SEGA 32X" offset="256"/>
</magic>
<glob pattern="*.32x"/>
<glob pattern="*.mdx"/>
</mime-type>
<mime-type type="application/x-gettext-translation">
<comment>translated messages (machine-readable)</comment>
+ <comment xml:lang="af">vertaalde boodskappe (masjienleesbaar)</comment>
<comment xml:lang="ar">رسائل مترجمة (مقروءة آليا)</comment>
- <comment xml:lang="be@latin">pierakładzienyja paviedamleńni (dla čytańnia kamputaram)</comment>
+ <comment xml:lang="be-Latn">pierakładzienyja paviedamleńni (dla čytańnia kamputaram)</comment>
<comment xml:lang="bg">Преведени съобщения — машинен формат</comment>
<comment xml:lang="ca">missatges traduïts (llegible per màquina)</comment>
<comment xml:lang="cs">přeložené zprávy (strojově čitelné)</comment>
<comment xml:lang="da">oversatte meddelelser (maskinlæsbare)</comment>
<comment xml:lang="de">Übersetzte Meldungen (maschinenlesbar)</comment>
<comment xml:lang="el">Μεταφρασμένα μηνύματα (για μηχανική ανάγνωση)</comment>
- <comment xml:lang="en_GB">translated messages (machine-readable)</comment>
+ <comment xml:lang="en-GB">translated messages (machine-readable)</comment>
<comment xml:lang="eo">tradukitaj mesaĝoj (maŝinlegebla)</comment>
<comment xml:lang="es">mensajes traducidos (legibles por máquinas)</comment>
<comment xml:lang="eu">itzulitako mezuak (ordenagailuek irakurtzeko)</comment>
<comment xml:lang="fi">käännetyt viestit (koneluettava)</comment>
<comment xml:lang="fo">týdd boð (maskin-lesifør)</comment>
<comment xml:lang="fr">messages traduits (lisibles par machine)</comment>
+ <comment xml:lang="fur">messaçs tradots (leibii de machine)</comment>
<comment xml:lang="ga">teachtaireachtaí aistrithe (inléite ag meaisín)</comment>
<comment xml:lang="gl">mensaxes traducidos (lexíbeis por máquinas)</comment>
<comment xml:lang="he">הודעות מתורגמות (מובן ע״י מכונה)</comment>
@@ -12132,7 +12642,7 @@
<comment xml:lang="oc">messatges tradusits (legibles per maquina)</comment>
<comment xml:lang="pl">Przetłumaczone komunikaty (czytelne dla komputera)</comment>
<comment xml:lang="pt">mensagens traduzidas (leitura pelo computador)</comment>
- <comment xml:lang="pt_BR">Mensagens traduzidas (legível pelo computador)</comment>
+ <comment xml:lang="pt-BR">Mensagens traduzidas (legível pelo computador)</comment>
<comment xml:lang="ro">mesaje traduse (citite de calculator)</comment>
<comment xml:lang="ru">Переводы сообщений (откомпилированые)</comment>
<comment xml:lang="sk">Preložené správy (strojovo čitateľné)</comment>
@@ -12143,64 +12653,53 @@
<comment xml:lang="tr">çevrilmiş iletiler (makine tarafından okunabilir)</comment>
<comment xml:lang="uk">перекладені повідомлення (у машинній формі)</comment>
<comment xml:lang="vi">thông điệp đã dịch (máy đọc được)</comment>
- <comment xml:lang="zh_CN">已翻译消息（机读）</comment>
- <comment xml:lang="zh_TW">翻譯訊息 (程式讀取格式)</comment>
+ <comment xml:lang="zh-CN">已翻译消息（机读）</comment>
+ <comment xml:lang="zh-TW">翻譯訊息 (程式讀取格式)</comment>
<magic priority="50">
- <match value="\336\22\4\225" type="string" offset="0"/>
- <match value="\225\4\22\336" type="string" offset="0"/>
+ <match type="string" value="\336\22\4\225" offset="0"/>
+ <match type="string" value="\225\4\22\336" offset="0"/>
</magic>
<glob pattern="*.gmo"/>
<glob pattern="*.mo"/>
</mime-type>
<mime-type type="application/x-gtk-builder">
- <comment>GTK+ Builder</comment>
- <comment xml:lang="ca">constructor de GTK+</comment>
- <comment xml:lang="cs">GTK+ Builder</comment>
- <comment xml:lang="da">GTK+ Builder</comment>
- <comment xml:lang="de">GTK+ Builder</comment>
- <comment xml:lang="el">Δομητής GTK+</comment>
- <comment xml:lang="en_GB">GTK+ Builder</comment>
- <comment xml:lang="es">GTK+ Builder</comment>
- <comment xml:lang="eu">GTK+ Builder</comment>
- <comment xml:lang="fi">GTK+ Builder</comment>
- <comment xml:lang="fr">GTK+ Builder</comment>
- <comment xml:lang="ga">Tógálaí GTK+</comment>
- <comment xml:lang="gl">Construtor de GTK+</comment>
- <comment xml:lang="he">בנייה של GTK+‎</comment>
- <comment xml:lang="hr">GTK+ Builder</comment>
- <comment xml:lang="hu">GTK+ Builder</comment>
- <comment xml:lang="ia">GTK+ Builder</comment>
- <comment xml:lang="id">GTK+ Builder</comment>
- <comment xml:lang="it">GTK+ Builder</comment>
- <comment xml:lang="ja">GTK+ Builder</comment>
- <comment xml:lang="kk">GTK+ Builder</comment>
- <comment xml:lang="ko">GTK+ 빌더</comment>
- <comment xml:lang="lv">GTK+ būvētājs</comment>
- <comment xml:lang="oc">GTK+ Builder</comment>
- <comment xml:lang="pl">GTK+ Builder</comment>
- <comment xml:lang="pt">Construtor GTK+</comment>
- <comment xml:lang="pt_BR">GTK+ Builder</comment>
- <comment xml:lang="ru">GTK+ Builder</comment>
- <comment xml:lang="sk">GTK+ Builder</comment>
- <comment xml:lang="sl">GTK+ Builder</comment>
- <comment xml:lang="sr">ГТК+ Градитељ</comment>
- <comment xml:lang="sv">GTK+ Builder</comment>
- <comment xml:lang="tr">GTK+ İnşa Edici</comment>
- <comment xml:lang="uk">GTK+ Builder</comment>
- <comment xml:lang="zh_CN">GTK+ Builder</comment>
- <comment xml:lang="zh_TW">GTK+ Builder</comment>
+ <comment>GTK+ Builder interface document</comment>
+ <comment xml:lang="bg">Интерфейс — GTK+ Builder</comment>
+ <comment xml:lang="ca">document d'interfície GTK+ Builder</comment>
+ <comment xml:lang="da">GTK+ Builder-brugerflade-dokument</comment>
+ <comment xml:lang="de">GTK+-Builder-Oberflächendokument</comment>
+ <comment xml:lang="en-GB">GTK+ Builder interface document</comment>
+ <comment xml:lang="es">documento de interfaz de GTK Builder</comment>
+ <comment xml:lang="eu">GTK+ Builder interfaze dokumentua</comment>
+ <comment xml:lang="fi">GTK+ Builder -käyttöliittymän asiakirja</comment>
+ <comment xml:lang="fr">document d'interface GTK+ Builder</comment>
+ <comment xml:lang="hr">GTK+ Graditelj dokument sučelja</comment>
+ <comment xml:lang="hu">GTK+ Builder felületleíró dokumentum</comment>
+ <comment xml:lang="id">Dokumen antarmuka GTK+ Builder</comment>
+ <comment xml:lang="it">Documento interfaccia GTK+ Builder</comment>
+ <comment xml:lang="kk">GTK+ Builder интерфейс құжаты</comment>
+ <comment xml:lang="ko">GTK+ 빌더 인터페이스 문서</comment>
+ <comment xml:lang="pl">Dokument interfejsu GTK Builder</comment>
+ <comment xml:lang="pt-BR">Documento de interface do GTK+ Builder</comment>
+ <comment xml:lang="ru">Документ интерфейса GTK+ Builder</comment>
+ <comment xml:lang="sv">GTK+-Builder-gränssnittsdokument</comment>
+ <comment xml:lang="tr">GTK+ Builder arayüz belgesi</comment>
+ <comment xml:lang="uk">документ інтерфейсу GTK+ Builder</comment>
+ <comment xml:lang="zh-CN">GTK+ Builder 界面文档</comment>
+ <comment xml:lang="zh-TW">GTK+ Builder 介面文件</comment>
<sub-class-of type="application/xml"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.ui"/>
<magic priority="50">
- <match value="&lt;interface" type="string" offset="0:256"/>
+ <match type="string" value="&lt;interface" offset="0:256"/>
</magic>
</mime-type>
<mime-type type="application/x-glade">
<comment>Glade project</comment>
+ <comment xml:lang="af">Glade-projek</comment>
<comment xml:lang="ar">مشروع Glade</comment>
<comment xml:lang="az">Glade layihəsi</comment>
- <comment xml:lang="be@latin">Prajekt Glade</comment>
+ <comment xml:lang="be-Latn">Prajekt Glade</comment>
<comment xml:lang="bg">Проект — Glade</comment>
<comment xml:lang="ca">projecte de Glade</comment>
<comment xml:lang="cs">projekt Glade</comment>
@@ -12208,13 +12707,14 @@
<comment xml:lang="da">Gladeprojekt</comment>
<comment xml:lang="de">Glade-Projekt</comment>
<comment xml:lang="el">Έργο Glade</comment>
- <comment xml:lang="en_GB">Glade project</comment>
+ <comment xml:lang="en-GB">Glade project</comment>
<comment xml:lang="eo">Glade-projekto</comment>
<comment xml:lang="es">proyecto de Glade</comment>
<comment xml:lang="eu">Glade proiektua</comment>
<comment xml:lang="fi">Glade-projekti</comment>
<comment xml:lang="fo">Glade verkætlan</comment>
<comment xml:lang="fr">projet Glade</comment>
+ <comment xml:lang="fur">progjet Glade</comment>
<comment xml:lang="ga">tionscadal Glade</comment>
<comment xml:lang="gl">proxecto de Glade</comment>
<comment xml:lang="he">מיזם Glade</comment>
@@ -12235,7 +12735,7 @@
<comment xml:lang="oc">projècte Glade</comment>
<comment xml:lang="pl">Projekt Glade</comment>
<comment xml:lang="pt">projecto Glade</comment>
- <comment xml:lang="pt_BR">Projeto do Glade</comment>
+ <comment xml:lang="pt-BR">Projeto do Glade</comment>
<comment xml:lang="ro">Proiect Glade</comment>
<comment xml:lang="ru">Проект Glade</comment>
<comment xml:lang="sk">Projekt Glade</comment>
@@ -12244,19 +12744,20 @@
<comment xml:lang="sr">Глејдов пројекат</comment>
<comment xml:lang="sv">Glade-projekt</comment>
<comment xml:lang="tr">Glade projesi</comment>
- <comment xml:lang="uk">проект Glade</comment>
+ <comment xml:lang="uk">проєкт Glade</comment>
<comment xml:lang="vi">Dự án Glade</comment>
- <comment xml:lang="zh_CN">Glade 工程</comment>
- <comment xml:lang="zh_TW">Glade 專案</comment>
+ <comment xml:lang="zh-CN">Glade 工程</comment>
+ <comment xml:lang="zh-TW">Glade 專案</comment>
<sub-class-of type="application/xml"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.glade"/>
<magic priority="50">
- <match value="&lt;glade-interface" type="string" offset="0:256"/>
+ <match type="string" value="&lt;glade-interface" offset="0:256"/>
</magic>
</mime-type>
<mime-type type="application/x-gnucash">
<comment>GnuCash financial data</comment>
+ <comment xml:lang="af">GnuCash finansiële data</comment>
<comment xml:lang="ar">معلومات GnuCash المالية</comment>
<comment xml:lang="bg">Финансови данни — GnuCash</comment>
<comment xml:lang="ca">dades financeres de GnuCash</comment>
@@ -12264,12 +12765,13 @@
<comment xml:lang="da">Finansielle data til GnuCash</comment>
<comment xml:lang="de">GnuCash-Finanzdaten</comment>
<comment xml:lang="el">Οικονομικά στοιχεία GnuCash</comment>
- <comment xml:lang="en_GB">GnuCash financial data</comment>
+ <comment xml:lang="en-GB">GnuCash financial data</comment>
<comment xml:lang="es">datos financieros de GnuCash</comment>
<comment xml:lang="eu">GnuCash finantzako datuak</comment>
<comment xml:lang="fi">GnuCash-taloustiedot</comment>
<comment xml:lang="fo">GnuCash fíggjarligar dátur</comment>
<comment xml:lang="fr">données financières GnuCash</comment>
+ <comment xml:lang="fur">dâts finanziaris GnuCash</comment>
<comment xml:lang="ga">sonraí airgeadúla GnuCash</comment>
<comment xml:lang="gl">datos financeiros de GNUCash</comment>
<comment xml:lang="he">מידע כלכלי של GnuCash</comment>
@@ -12287,7 +12789,7 @@
<comment xml:lang="oc">donadas financières GnuCash</comment>
<comment xml:lang="pl">Dane finansowe GnuCash</comment>
<comment xml:lang="pt">dados financeiros GnuCash</comment>
- <comment xml:lang="pt_BR">Dados financeiros do GnuCash</comment>
+ <comment xml:lang="pt-BR">Dados financeiros do GnuCash</comment>
<comment xml:lang="ro">Date financiare GnuCash</comment>
<comment xml:lang="ru">Финансовые данные GnuCash</comment>
<comment xml:lang="sk">Finančné údaje GnuCash</comment>
@@ -12297,8 +12799,8 @@
<comment xml:lang="tr">GnuCash mali verisi</comment>
<comment xml:lang="uk">фінансові дані GnuCash</comment>
<comment xml:lang="vi">Dữ liệu tài chính GnuCash</comment>
- <comment xml:lang="zh_CN">GnuCash 财务数据</comment>
- <comment xml:lang="zh_TW">GnuCash 財務資料</comment>
+ <comment xml:lang="zh-CN">GnuCash 财务数据</comment>
+ <comment xml:lang="zh-TW">GnuCash 財務資料</comment>
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.gnucash"/>
<glob pattern="*.gnc"/>
@@ -12306,21 +12808,23 @@
</mime-type>
<mime-type type="application/x-gnumeric">
<comment>Gnumeric spreadsheet</comment>
+ <comment xml:lang="af">Gnumeric-sigblad</comment>
<comment xml:lang="ar">جدول Gnumeric</comment>
- <comment xml:lang="be@latin">Raźlikovy arkuš Gnumeric</comment>
+ <comment xml:lang="be-Latn">Raźlikovy arkuš Gnumeric</comment>
<comment xml:lang="bg">Таблица — Gnumeric</comment>
<comment xml:lang="ca">full de càlcul de Gnumeric</comment>
<comment xml:lang="cs">sešit Gnumeric</comment>
<comment xml:lang="da">Gnumeric-regneark</comment>
<comment xml:lang="de">Gnumeric-Tabelle</comment>
<comment xml:lang="el">Λογιστικό φύλλο Gnumeric</comment>
- <comment xml:lang="en_GB">Gnumeric spreadsheet</comment>
+ <comment xml:lang="en-GB">Gnumeric spreadsheet</comment>
<comment xml:lang="eo">Gnumeric-kalkultabelo</comment>
<comment xml:lang="es">hoja de cálculo de Gnumeric</comment>
<comment xml:lang="eu">Gnumeric kalkulu-orria</comment>
<comment xml:lang="fi">Gnumeric-taulukko</comment>
<comment xml:lang="fo">Gnumeric rokniark</comment>
<comment xml:lang="fr">feuille de calcul Gnumeric</comment>
+ <comment xml:lang="fur">sfuei di calcul Gnumeric</comment>
<comment xml:lang="ga">scarbhileog Gnumeric</comment>
<comment xml:lang="gl">folla de cálculo de Gnumeric</comment>
<comment xml:lang="he">גליון עבודה Gnumeric</comment>
@@ -12341,7 +12845,7 @@
<comment xml:lang="oc">fuèlh de calcul Gnumeric</comment>
<comment xml:lang="pl">Arkusz Gnumeric</comment>
<comment xml:lang="pt">folha de cálculo Gnumeric</comment>
- <comment xml:lang="pt_BR">Planilha do Gnumeric</comment>
+ <comment xml:lang="pt-BR">Planilha do Gnumeric</comment>
<comment xml:lang="ro">Foaie de calcul Gnumeric</comment>
<comment xml:lang="ru">Электронная таблица Gnumeric</comment>
<comment xml:lang="sk">Zošit Gnumeric</comment>
@@ -12349,36 +12853,38 @@
<comment xml:lang="sq">Fletë llogaritjesh Gnumeric</comment>
<comment xml:lang="sr">табела Гномовог бројевника</comment>
<comment xml:lang="sv">Gnumeric-kalkylblad</comment>
- <comment xml:lang="tr">Gnumeric çalışma sayfası</comment>
+ <comment xml:lang="tr">Gnumeric hesap çizelgesi</comment>
<comment xml:lang="uk">ел. таблиця Gnumeric</comment>
<comment xml:lang="vi">Bảng tính Gnumeric.</comment>
- <comment xml:lang="zh_CN">Gnumeric 电子表格</comment>
- <comment xml:lang="zh_TW">Gnumeric 試算表</comment>
+ <comment xml:lang="zh-CN">Gnumeric 电子表格</comment>
+ <comment xml:lang="zh-TW">Gnumeric 試算表</comment>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
- <match value="gmr:Workbook" type="string" offset="0:64"/>
- <match value="gnm:Workbook" type="string" offset="0:64"/>
+ <match type="string" value="gmr:Workbook" offset="0:64"/>
+ <match type="string" value="gnm:Workbook" offset="0:64"/>
</magic>
<glob pattern="*.gnumeric"/>
</mime-type>
<mime-type type="application/x-gnuplot">
<comment>Gnuplot document</comment>
+ <comment xml:lang="af">Gnuplot-dokument</comment>
<comment xml:lang="ar">مستند Gnuplot</comment>
<comment xml:lang="ast">Documentu de Gnuplot</comment>
- <comment xml:lang="be@latin">Dakument Gnuplot</comment>
+ <comment xml:lang="be-Latn">Dakument Gnuplot</comment>
<comment xml:lang="bg">Документ — Gnuplot</comment>
<comment xml:lang="ca">document gnuplot</comment>
<comment xml:lang="cs">dokument Gnuplot</comment>
- <comment xml:lang="da">Gnuplotdokument</comment>
+ <comment xml:lang="da">Gnuplot-dokument</comment>
<comment xml:lang="de">Gnuplot-Dokument</comment>
<comment xml:lang="el">Έγγραφο Gnuplot</comment>
- <comment xml:lang="en_GB">Gnuplot document</comment>
+ <comment xml:lang="en-GB">Gnuplot document</comment>
<comment xml:lang="eo">Gnuplot-dokumento</comment>
<comment xml:lang="es">documento de Gnuplot</comment>
<comment xml:lang="eu">Gnuplot dokumentua</comment>
<comment xml:lang="fi">Gnuplot-asiakirja</comment>
<comment xml:lang="fo">Gnuplot skjal</comment>
<comment xml:lang="fr">document Gnuplot</comment>
+ <comment xml:lang="fur">document Gnuplot</comment>
<comment xml:lang="ga">cáipéis Gnuplot</comment>
<comment xml:lang="gl">documento de Gnuplot</comment>
<comment xml:lang="he">מסמך Gnuplot</comment>
@@ -12398,7 +12904,7 @@
<comment xml:lang="oc">document Gnuplot</comment>
<comment xml:lang="pl">Dokument Gnuplot</comment>
<comment xml:lang="pt">documento Gnuplot</comment>
- <comment xml:lang="pt_BR">Documento do Gnuplot</comment>
+ <comment xml:lang="pt-BR">Documento do Gnuplot</comment>
<comment xml:lang="ro">Document Gnuplot</comment>
<comment xml:lang="ru">Документ Gnuplot</comment>
<comment xml:lang="sk">Dokument Gnuplot</comment>
@@ -12409,8 +12915,8 @@
<comment xml:lang="tr">Gnuplot belgesi</comment>
<comment xml:lang="uk">документ Gnuplot</comment>
<comment xml:lang="vi">Tài liệu Gnuplot</comment>
- <comment xml:lang="zh_CN">Gnuplot 文档</comment>
- <comment xml:lang="zh_TW">Gnuplot 文件</comment>
+ <comment xml:lang="zh-CN">Gnuplot 文档</comment>
+ <comment xml:lang="zh-TW">Gnuplot 文件</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.gp"/>
@@ -12420,20 +12926,21 @@
<mime-type type="application/x-graphite">
<comment>Graphite scientific graph</comment>
<comment xml:lang="ar">مبيان الجرافيت العلمي</comment>
- <comment xml:lang="be@latin">Navukovy hrafik Graphite</comment>
+ <comment xml:lang="be-Latn">Navukovy hrafik Graphite</comment>
<comment xml:lang="bg">Графика — Graphite</comment>
<comment xml:lang="ca">gràfic científic Graphite</comment>
<comment xml:lang="cs">vědecký graf Graphite</comment>
<comment xml:lang="da">Graphite videnskabelig graf</comment>
<comment xml:lang="de">Wissenschaftlicher Graphite-Graph</comment>
<comment xml:lang="el">Επιστημονικό γράφημα Graphite</comment>
- <comment xml:lang="en_GB">Graphite scientific graph</comment>
+ <comment xml:lang="en-GB">Graphite scientific graph</comment>
<comment xml:lang="eo">scienca grafikaĵo de Graphite</comment>
<comment xml:lang="es">gráfico científico de Graphite</comment>
<comment xml:lang="eu">Graphite - grafiko zientifikoak</comment>
<comment xml:lang="fi">Graphite- tieteellinen graafi</comment>
<comment xml:lang="fo">Grapite vísindarlig ritmynd</comment>
<comment xml:lang="fr">graphe Graphite scientific</comment>
+ <comment xml:lang="fur">grafic sientific Graphite</comment>
<comment xml:lang="ga">graf eolaíochta Graphite</comment>
<comment xml:lang="gl">gráfica científica de Graphite</comment>
<comment xml:lang="he">תרשים מדעי של Graphite</comment>
@@ -12454,7 +12961,7 @@
<comment xml:lang="oc">graphe Graphite scientific</comment>
<comment xml:lang="pl">Wykres naukowy Graphite</comment>
<comment xml:lang="pt">gráfico científico Graphite</comment>
- <comment xml:lang="pt_BR">Gráfico científico do Graphite</comment>
+ <comment xml:lang="pt-BR">Gráfico científico do Graphite</comment>
<comment xml:lang="ro">Grafic științific Graphite</comment>
<comment xml:lang="ru">Научная диаграмма Graphite</comment>
<comment xml:lang="sk">Vedecký graf Graphite</comment>
@@ -12465,28 +12972,29 @@
<comment xml:lang="tr">Graphite bilimsel grafiği</comment>
<comment xml:lang="uk">наукова графіка Graphite</comment>
<comment xml:lang="vi">Biểu đồ khoa học Graphite</comment>
- <comment xml:lang="zh_CN">Graphite 科学图形</comment>
- <comment xml:lang="zh_TW">Graphite 科學圖表</comment>
+ <comment xml:lang="zh-CN">Graphite 科学图形</comment>
+ <comment xml:lang="zh-TW">Graphite 科學圖表</comment>
<generic-icon name="x-office-document"/>
<glob pattern="*.gra"/>
</mime-type>
<mime-type type="application/x-gtktalog">
<comment>GTKtalog catalog</comment>
<comment xml:lang="ar">كتالوج GTKtalog</comment>
- <comment xml:lang="be@latin">Kataloh GTKtalog</comment>
+ <comment xml:lang="be-Latn">Kataloh GTKtalog</comment>
<comment xml:lang="bg">Каталог — Gtktalog</comment>
<comment xml:lang="ca">catàleg de GTKtalog</comment>
<comment xml:lang="cs">katalog GTKtalog</comment>
<comment xml:lang="da">GTKtalog-katalog</comment>
<comment xml:lang="de">GTKtalog-Katalog</comment>
<comment xml:lang="el">Κατάλογος GTKtalog</comment>
- <comment xml:lang="en_GB">GTKtalog catalogue</comment>
+ <comment xml:lang="en-GB">GTKtalog catalogue</comment>
<comment xml:lang="eo">katalogo de GTKtalog</comment>
<comment xml:lang="es">catálogo de GTKtalog</comment>
<comment xml:lang="eu">Gtktalog katalogoa</comment>
<comment xml:lang="fi">GTKtalog-luettelo</comment>
<comment xml:lang="fo">GTKtalog skrá</comment>
<comment xml:lang="fr">catalogue Gtktalog</comment>
+ <comment xml:lang="fur">catalic GTKtalog</comment>
<comment xml:lang="ga">catalóg GTKtalog</comment>
<comment xml:lang="gl">catálogo de GTKtalog</comment>
<comment xml:lang="he">קטלוג GTKtalog</comment>
@@ -12508,7 +13016,7 @@
<comment xml:lang="oc">catalòg Gtktalog</comment>
<comment xml:lang="pl">Katalog programu GTKtalog</comment>
<comment xml:lang="pt">catálogo GTKtalog</comment>
- <comment xml:lang="pt_BR">Catálogo GTKtalog</comment>
+ <comment xml:lang="pt-BR">Catálogo GTKtalog</comment>
<comment xml:lang="ro">Catalog GTKalog</comment>
<comment xml:lang="ru">Каталог GTKtalog</comment>
<comment xml:lang="sk">Katalóg GTKtalog</comment>
@@ -12516,38 +13024,40 @@
<comment xml:lang="sq">Katallog GTKtalog</comment>
<comment xml:lang="sr">каталог ГТКталога</comment>
<comment xml:lang="sv">GTKtalog-katalog</comment>
- <comment xml:lang="tr">Gtktalog kataloğu</comment>
+ <comment xml:lang="tr">GTKtalog kataloğu</comment>
<comment xml:lang="uk">каталог GTKtalog</comment>
<comment xml:lang="vi">Phân loại GTKtalog</comment>
- <comment xml:lang="zh_CN">GTKtalog 目录</comment>
- <comment xml:lang="zh_TW">GTKtalog 光碟目錄</comment>
+ <comment xml:lang="zh-CN">GTKtalog 目录</comment>
+ <comment xml:lang="zh-TW">GTKtalog 光碟目錄</comment>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="gtktalog " type="string" offset="4"/>
+ <match type="string" value="gtktalog " offset="4"/>
</magic>
</mime-type>
<mime-type type="application/x-gzdvi">
<comment>TeX DVI document (gzip-compressed)</comment>
+ <comment xml:lang="af">TeX DVI-dokument (gzip-saamgepers)</comment>
<comment xml:lang="ar">مستند TeX DVI (مضغوط-gzip)</comment>
<comment xml:lang="ast">Documentu Tex DVI (comprimíu en gzip)</comment>
- <comment xml:lang="be@latin">Dakument TeX DVI (gzip-skampresavany)</comment>
+ <comment xml:lang="be-Latn">Dakument TeX DVI (gzip-skampresavany)</comment>
<comment xml:lang="bg">Документ — TeX DVI, компресиран с gzip</comment>
<comment xml:lang="ca">document DVI de TeX (amb compressió gzip)</comment>
<comment xml:lang="cs">dokument TeX DVI (komprimovaný pomocí gzip)</comment>
<comment xml:lang="da">TeX DVI-dokument (gzip-komprimeret)</comment>
<comment xml:lang="de">TeX-DVI-Dokument (gzip-komprimiert)</comment>
<comment xml:lang="el">Έγγραφο TeX DVI (συμπιεσμένο με gzip)</comment>
- <comment xml:lang="en_GB">TeX DVI document (gzip-compressed)</comment>
+ <comment xml:lang="en-GB">TeX DVI document (gzip-compressed)</comment>
<comment xml:lang="es">documento DVI de TeX (comprimido con gzip)</comment>
<comment xml:lang="eu">TeX DVI dokumentua (gzip-ekin konprimitua)</comment>
<comment xml:lang="fi">TeX DVI -asiakirja (gzip-pakattu)</comment>
<comment xml:lang="fo">TeX DVI skjal (gzip-stappað)</comment>
<comment xml:lang="fr">document DVI TeX (compressé gzip)</comment>
+ <comment xml:lang="fur">document DVI TeX (comprimût cun gzip)</comment>
<comment xml:lang="ga">cáipéis DVI TeX (comhbhrúite le gzip)</comment>
<comment xml:lang="gl">documento DVI de TeX (comprimido con gzip)</comment>
<comment xml:lang="he">מסמך מסוג TeX DVI (מכווץ ע״י gzip)</comment>
<comment xml:lang="hr">TeX DVI dokument (gzip sažet)</comment>
- <comment xml:lang="hu">TeX DVI dokumentum (gzip-pel tömörítve)</comment>
+ <comment xml:lang="hu">TeX DVI dokumentum (gzip tömörítésű)</comment>
<comment xml:lang="ia">Documento TeX DVI (comprimite con gzip)</comment>
<comment xml:lang="id">Dokumen TeX DVI (terkompresi gzip)</comment>
<comment xml:lang="it">Documento Tex DVI (compresso con gzip)</comment>
@@ -12562,7 +13072,7 @@
<comment xml:lang="oc">document DVI TeX (compressat gzip)</comment>
<comment xml:lang="pl">Dokument TeX DVI (kompresja gzip)</comment>
<comment xml:lang="pt">documento TeX DVI (compressão gzip)</comment>
- <comment xml:lang="pt_BR">Documento DVI TeX (compactado com gzip)</comment>
+ <comment xml:lang="pt-BR">Documento DVI TeX (compactado com gzip)</comment>
<comment xml:lang="ro">Document TeX DVI (comprimat gzip)</comment>
<comment xml:lang="ru">Документ TeX DVI (сжатый gzip)</comment>
<comment xml:lang="sk">Dokument TeX DVI (komprimovaný pomocou gzip)</comment>
@@ -12573,29 +13083,31 @@
<comment xml:lang="tr">TeX DVI belgesi (gzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">документ TeX DVI (стиснений gzip)</comment>
<comment xml:lang="vi">Tài liệu DVI TeX (đã nén gzip)</comment>
- <comment xml:lang="zh_CN">TeX DVI 文档（gzip 压缩）</comment>
- <comment xml:lang="zh_TW">TeX DVI 文件 (gzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">TeX DVI 文档（gzip 压缩）</comment>
+ <comment xml:lang="zh-TW">TeX DVI 文件 (gzip 壓縮)</comment>
<sub-class-of type="application/gzip"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.dvi.gz"/>
</mime-type>
<mime-type type="application/gzip">
<comment>Gzip archive</comment>
+ <comment xml:lang="af">Gzip-argief</comment>
<comment xml:lang="ar">أرشيف Gzip</comment>
- <comment xml:lang="be@latin">Archiŭ gzip</comment>
+ <comment xml:lang="be-Latn">Archiŭ gzip</comment>
<comment xml:lang="bg">Архив — gzip</comment>
<comment xml:lang="ca">arxiu gzip</comment>
<comment xml:lang="cs">archiv gzip</comment>
<comment xml:lang="da">Gzip-arkiv</comment>
<comment xml:lang="de">Gzip-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Gzip</comment>
- <comment xml:lang="en_GB">Gzip archive</comment>
+ <comment xml:lang="en-GB">Gzip archive</comment>
<comment xml:lang="eo">Gzip-arkivo</comment>
<comment xml:lang="es">archivador Gzip</comment>
<comment xml:lang="eu">Gzip artxiboa</comment>
<comment xml:lang="fi">Gzip-arkisto</comment>
<comment xml:lang="fo">Gzip skjalasavn</comment>
<comment xml:lang="fr">archive gzip</comment>
+ <comment xml:lang="fur">archivi Gzip</comment>
<comment xml:lang="ga">cartlann Gzip</comment>
<comment xml:lang="gl">arquivo Gzip</comment>
<comment xml:lang="he">ארכיון Gzip</comment>
@@ -12615,10 +13127,10 @@
<comment xml:lang="oc">archiu gzip</comment>
<comment xml:lang="pl">Archiwum gzip</comment>
<comment xml:lang="pt">arquivo Gzip</comment>
- <comment xml:lang="pt_BR">Pacote Gzip</comment>
+ <comment xml:lang="pt-BR">Pacote Gzip</comment>
<comment xml:lang="ro">Arhivă Gzip</comment>
<comment xml:lang="ru">Архив GZIP</comment>
- <comment xml:lang="sk">Archív gzip</comment>
+ <comment xml:lang="sk">Archív Gzip</comment>
<comment xml:lang="sl">Datoteka arhiva Gzip</comment>
<comment xml:lang="sq">Arkiv gzip</comment>
<comment xml:lang="sr">Гзип архива</comment>
@@ -12626,37 +13138,39 @@
<comment xml:lang="tr">Gzip arşivi</comment>
<comment xml:lang="uk">архів gzip</comment>
<comment xml:lang="vi">Kho nén gzip</comment>
- <comment xml:lang="zh_CN">Gzip 归档文件</comment>
- <comment xml:lang="zh_TW">Gzip 封存檔</comment>
+ <comment xml:lang="zh-CN">Gzip 归档文件</comment>
+ <comment xml:lang="zh-TW">Gzip 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="50">
- <match value="\037\213" type="string" offset="0"/>
+ <match type="string" value="\037\213" offset="0"/>
</magic>
<glob pattern="*.gz"/>
<alias type="application/x-gzip"/>
</mime-type>
<mime-type type="application/x-gzpdf">
<comment>PDF document (gzip-compressed)</comment>
+ <comment xml:lang="af">PDF-dokument (gzip-saamgepers)</comment>
<comment xml:lang="ar">مستند PDF (مضغوط-gzip)</comment>
<comment xml:lang="ast">Documentu PDF (comprimíu en gzip)</comment>
- <comment xml:lang="be@latin">Dakument PDF (gzip-skampresavany)</comment>
+ <comment xml:lang="be-Latn">Dakument PDF (gzip-skampresavany)</comment>
<comment xml:lang="bg">Документ — PDF, компресиран с gzip</comment>
<comment xml:lang="ca">document PDF (amb compressió gzip)</comment>
<comment xml:lang="cs">dokument PDF (komprimovaný pomocí gzip)</comment>
<comment xml:lang="da">PDF-dokument (gzip-komprimeret)</comment>
<comment xml:lang="de">PDF-Dokument (gzip-komprimiert)</comment>
<comment xml:lang="el">Έγγραφο PDF (συμπιεσμένο με gzip)</comment>
- <comment xml:lang="en_GB">PDF document (gzip-compressed)</comment>
+ <comment xml:lang="en-GB">PDF document (gzip-compressed)</comment>
<comment xml:lang="es">documento PDF (comprimido con gzip)</comment>
<comment xml:lang="eu">PDF dokumentua (gzip-ekin konprimitua)</comment>
<comment xml:lang="fi">PDF-asiakirja (gzip-pakattu)</comment>
<comment xml:lang="fo">PDF skjal (gzip-stappað)</comment>
<comment xml:lang="fr">document PDF (compressé gzip)</comment>
+ <comment xml:lang="fur">document PDF (comprimût cun gzip)</comment>
<comment xml:lang="ga">cáipéis PDF (comhbhrúite le gzip)</comment>
<comment xml:lang="gl">documento PDF (comprimido en gzip)</comment>
<comment xml:lang="he">מסמך PDF (מכווץ ע״י gzip)</comment>
<comment xml:lang="hr">PDF dokument (gzip sažet)</comment>
- <comment xml:lang="hu">PDF dokumentum (gzip-tömörítésű)</comment>
+ <comment xml:lang="hu">PDF dokumentum (gzip tömörítésű)</comment>
<comment xml:lang="ia">Documento PDF (comprimite con gzip)</comment>
<comment xml:lang="id">Dokumen PDF (terkompresi gzip)</comment>
<comment xml:lang="it">Documento PDF (compresso con gzip)</comment>
@@ -12671,7 +13185,7 @@
<comment xml:lang="oc">document PDF (compressat gzip)</comment>
<comment xml:lang="pl">Dokument PDF (kompresja gzip)</comment>
<comment xml:lang="pt">documento PDF (compressão gzip)</comment>
- <comment xml:lang="pt_BR">Documento PDF (compactado com gzip)</comment>
+ <comment xml:lang="pt-BR">Documento PDF (compactado com gzip)</comment>
<comment xml:lang="ro">Document PDF (comprimat gzip)</comment>
<comment xml:lang="ru">Документ PDF (сжатый gzip)</comment>
<comment xml:lang="sk">Dokument PDF (komprimovaný pomocou gzip)</comment>
@@ -12682,35 +13196,37 @@
<comment xml:lang="tr">PDF belgesi (gzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">документ PDF (стиснений gzip)</comment>
<comment xml:lang="vi">Tài liệu PDF (đã nén gzip)</comment>
- <comment xml:lang="zh_CN">PDF 文档（gzip 压缩）</comment>
- <comment xml:lang="zh_TW">PDF 文件 (gzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">PDF 文档（gzip 压缩）</comment>
+ <comment xml:lang="zh-TW">PDF 文件 (gzip 壓縮)</comment>
<sub-class-of type="application/gzip"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.pdf.gz"/>
</mime-type>
<mime-type type="application/x-gzpostscript">
<comment>PostScript document (gzip-compressed)</comment>
+ <comment xml:lang="af">PostScript-dokument (gzip-saamgepers)</comment>
<comment xml:lang="ar">مستند PostScript (مضغوط-gzip)</comment>
<comment xml:lang="ast">Documentu PostScript (comprimíu en gzip)</comment>
- <comment xml:lang="be@latin">Dakument PostScript (gzip-skampresavany)</comment>
+ <comment xml:lang="be-Latn">Dakument PostScript (gzip-skampresavany)</comment>
<comment xml:lang="bg">Документ — PostScript, компресиран с gzip</comment>
<comment xml:lang="ca">document PostScript (amb compressió gzip)</comment>
<comment xml:lang="cs">dokument PostScript (komprimovaný pomocí gzip)</comment>
<comment xml:lang="da">PostScript-dokument (gzip-komprimeret)</comment>
<comment xml:lang="de">PostScript-Dokument (gzip-komprimiert)</comment>
<comment xml:lang="el">Έγγραφο PostScript (συμπιεσμένο με gzip)</comment>
- <comment xml:lang="en_GB">PostScript document (gzip-compressed)</comment>
+ <comment xml:lang="en-GB">PostScript document (gzip-compressed)</comment>
<comment xml:lang="eo">PostScript-dokumento (kunpremita per gzip)</comment>
<comment xml:lang="es">documento PostScript (comprimido con gzip)</comment>
<comment xml:lang="eu">PostScript dokumentua (gzip-konprimitua)</comment>
<comment xml:lang="fi">PostScript-asiakirja (gzip-pakattu)</comment>
<comment xml:lang="fo">PostScript skjal (gzip-stappað)</comment>
<comment xml:lang="fr">document PostScript (compressé gzip)</comment>
+ <comment xml:lang="fur">document PostScript (comprimût cun gzip)</comment>
<comment xml:lang="ga">cáipéis PostScript (comhbhrúite le gzip)</comment>
<comment xml:lang="gl">documento PostScript (comprimido con gzip)</comment>
<comment xml:lang="he">מסמך PostScript (מכוות ע״י gzip)</comment>
<comment xml:lang="hr">PostScript dokument (gzip sažet)</comment>
- <comment xml:lang="hu">PostScript-dokumentum (gzip-pel tömörítve)</comment>
+ <comment xml:lang="hu">PostScript-dokumentum (gzip tömörítésű)</comment>
<comment xml:lang="ia">Documento PostScript (comprimite con gzip)</comment>
<comment xml:lang="id">Dokumen PostScript (terkompresi gzip)</comment>
<comment xml:lang="it">Documento PostScript (compresso con gzip)</comment>
@@ -12724,9 +13240,9 @@
<comment xml:lang="nl">PostScript-document (ingepakt met gzip)</comment>
<comment xml:lang="nn">PostScript-dokument (pakka med gzip)</comment>
<comment xml:lang="oc">document PostEscript (compressat gzip)</comment>
- <comment xml:lang="pl">Dokument Postscript (kompresja gzip)</comment>
+ <comment xml:lang="pl">Dokument PostScript (kompresja gzip)</comment>
<comment xml:lang="pt">documento PostScript (compressão gzip)</comment>
- <comment xml:lang="pt_BR">Documento PostScript (compactado com gzip)</comment>
+ <comment xml:lang="pt-BR">Documento PostScript (compactado com gzip)</comment>
<comment xml:lang="ro">Document PostScript (comprimat gzip)</comment>
<comment xml:lang="ru">Документ PostScript (сжатый gzip)</comment>
<comment xml:lang="sk">Dokument PostScript (komprimovaný pomocou gzip)</comment>
@@ -12737,18 +13253,19 @@
<comment xml:lang="tr">PostScript belgesi (gzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">документ PostScript (стиснене gzip)</comment>
<comment xml:lang="vi">Tài liệu PostScript (đã nén gzip)</comment>
- <comment xml:lang="zh_CN">PostScript 文档（gzip 压缩）</comment>
- <comment xml:lang="zh_TW">PostScript 文件 (gzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">PostScript 文档（gzip 压缩）</comment>
+ <comment xml:lang="zh-TW">PostScript 文件 (gzip 壓縮)</comment>
<sub-class-of type="application/gzip"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.ps.gz"/>
</mime-type>
<mime-type type="application/x-hdf">
<comment>HDF document</comment>
+ <comment xml:lang="af">HDF-dokument</comment>
<comment xml:lang="ar">مستند HDF</comment>
<comment xml:lang="ast">Documentu HDF</comment>
<comment xml:lang="az">HDF sənədi</comment>
- <comment xml:lang="be@latin">Dakument HDF</comment>
+ <comment xml:lang="be-Latn">Dakument HDF</comment>
<comment xml:lang="bg">Документ — HDF</comment>
<comment xml:lang="ca">document HDF</comment>
<comment xml:lang="cs">dokument HDF</comment>
@@ -12756,13 +13273,14 @@
<comment xml:lang="da">HDF-dokument</comment>
<comment xml:lang="de">HDF-Dokument</comment>
<comment xml:lang="el">Έγγραφο HDF</comment>
- <comment xml:lang="en_GB">HDF document</comment>
+ <comment xml:lang="en-GB">HDF document</comment>
<comment xml:lang="eo">HDF-dokumento</comment>
<comment xml:lang="es">documento HDF</comment>
<comment xml:lang="eu">HDF dokumentua</comment>
<comment xml:lang="fi">HDF-asiakirja</comment>
<comment xml:lang="fo">HDF skjal</comment>
<comment xml:lang="fr">document HDF</comment>
+ <comment xml:lang="fur">document HDF</comment>
<comment xml:lang="ga">cáipéis HDF</comment>
<comment xml:lang="gl">documento HDF</comment>
<comment xml:lang="he">מסמך HDF</comment>
@@ -12783,7 +13301,7 @@
<comment xml:lang="oc">document HDF</comment>
<comment xml:lang="pl">Dokument HDF</comment>
<comment xml:lang="pt">documento HDF</comment>
- <comment xml:lang="pt_BR">Documento HDF</comment>
+ <comment xml:lang="pt-BR">Documento HDF</comment>
<comment xml:lang="ro">Document HDF</comment>
<comment xml:lang="ru">Документ HDF</comment>
<comment xml:lang="sk">Dokument HDF</comment>
@@ -12794,14 +13312,14 @@
<comment xml:lang="tr">HDF belgesi</comment>
<comment xml:lang="uk">документ HDF</comment>
<comment xml:lang="vi">Tài liệu HDF</comment>
- <comment xml:lang="zh_CN">HDF 文档</comment>
- <comment xml:lang="zh_TW">HDF 文件</comment>
+ <comment xml:lang="zh-CN">HDF 文档</comment>
+ <comment xml:lang="zh-TW">HDF 文件</comment>
<acronym>HDF</acronym>
<expanded-acronym>Hierarchical Data Format</expanded-acronym>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="\211HDF\r\n\032\n" type="string" offset="0"/>
- <match value="\016\003\023\001" type="string" offset="0"/>
+ <match type="string" offset="0" value="\211HDF\r\n\032\n"/>
+ <match type="string" offset="0" value="\016\003\023\001"/>
</magic>
<glob pattern="*.hdf"/>
<glob pattern="*.hdf4"/>
@@ -12811,16 +13329,19 @@
</mime-type>
<mime-type type="application/x-iff">
<comment>IFF file</comment>
+ <comment xml:lang="af">IFF-lêer</comment>
+ <comment xml:lang="bg">Пакет — IFF</comment>
<comment xml:lang="ca">fitxer IFF</comment>
<comment xml:lang="cs">soubor IFF</comment>
<comment xml:lang="da">IFF-fil</comment>
<comment xml:lang="de">IFF-Datei</comment>
<comment xml:lang="el">Αρχείο IFF</comment>
- <comment xml:lang="en_GB">IFF file</comment>
+ <comment xml:lang="en-GB">IFF file</comment>
<comment xml:lang="es">archivo IFF</comment>
<comment xml:lang="eu">IFF fitxtegia</comment>
<comment xml:lang="fi">IFF-tiedosto</comment>
<comment xml:lang="fr">fichier IFF</comment>
+ <comment xml:lang="fur">file IFF</comment>
<comment xml:lang="ga">comhad IFF</comment>
<comment xml:lang="gl">Ficheiro IFF</comment>
<comment xml:lang="he">קובץ IFF</comment>
@@ -12836,7 +13357,7 @@
<comment xml:lang="oc">fichièr IFF</comment>
<comment xml:lang="pl">Plik IFF</comment>
<comment xml:lang="pt">ficheiro IFF</comment>
- <comment xml:lang="pt_BR">Arquivo IFF</comment>
+ <comment xml:lang="pt-BR">Arquivo IFF</comment>
<comment xml:lang="ru">Файл IFF</comment>
<comment xml:lang="sk">Súbor IFF</comment>
<comment xml:lang="sl">Datoteka IFF</comment>
@@ -12844,31 +13365,32 @@
<comment xml:lang="sv">IFF-fil</comment>
<comment xml:lang="tr">IFF dosyası</comment>
<comment xml:lang="uk">файл IFF</comment>
- <comment xml:lang="zh_CN">IFF 文件</comment>
- <comment xml:lang="zh_TW">IFF 檔案</comment>
+ <comment xml:lang="zh-CN">IFF 文件</comment>
+ <comment xml:lang="zh-TW">IFF 檔案</comment>
<acronym>IFF</acronym>
<expanded-acronym>Interchange File Format</expanded-acronym>
<magic priority="40">
- <match value="FORM" type="string" offset="0"/>
+ <match type="string" value="FORM" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-ipod-firmware">
<comment>iPod firmware</comment>
<comment xml:lang="ar">برنامج عتاد الـiPod</comment>
- <comment xml:lang="be@latin">Firmware iPod</comment>
- <comment xml:lang="bg">Фърмуер за iPod</comment>
+ <comment xml:lang="be-Latn">Firmware iPod</comment>
+ <comment xml:lang="bg">Фърмуер — iPod</comment>
<comment xml:lang="ca">microprogramari d'iPod</comment>
<comment xml:lang="cs">firmware iPod</comment>
<comment xml:lang="da">iPod-styreprogram</comment>
<comment xml:lang="de">iPod-Firmware</comment>
<comment xml:lang="el">Υλικολογισμικό iPod</comment>
- <comment xml:lang="en_GB">iPod firmware</comment>
+ <comment xml:lang="en-GB">iPod firmware</comment>
<comment xml:lang="eo">iPod-mikroprogramaro</comment>
<comment xml:lang="es">firmware de iPod</comment>
<comment xml:lang="eu">iPod firmwarea</comment>
<comment xml:lang="fi">iPod-laiteohjelmisto</comment>
<comment xml:lang="fo">iPod fastbúnaður</comment>
<comment xml:lang="fr">firmware iPod</comment>
+ <comment xml:lang="fur">firmware iPod</comment>
<comment xml:lang="ga">dochtearraí iPod</comment>
<comment xml:lang="gl">firmware de iPod</comment>
<comment xml:lang="he">קושחת ipod</comment>
@@ -12889,7 +13411,7 @@
<comment xml:lang="oc">firmware iPod</comment>
<comment xml:lang="pl">Oprogramowanie wewnętrzne iPod</comment>
<comment xml:lang="pt">firmware iPod</comment>
- <comment xml:lang="pt_BR">Firmware do iPod</comment>
+ <comment xml:lang="pt-BR">Firmware do iPod</comment>
<comment xml:lang="ro">Firmware iPod</comment>
<comment xml:lang="ru">Микропрограмма iPod</comment>
<comment xml:lang="sk">Firmware iPod</comment>
@@ -12897,32 +13419,34 @@
<comment xml:lang="sq">Firmware iPod</comment>
<comment xml:lang="sr">ајПод-ов уграђени</comment>
<comment xml:lang="sv">fast iPod-program</comment>
- <comment xml:lang="tr">iPod üretici yazılımı</comment>
+ <comment xml:lang="tr">iPod donanım yazılımı</comment>
<comment xml:lang="uk">мікропрограма iPod</comment>
<comment xml:lang="vi">phần vững iPod</comment>
- <comment xml:lang="zh_CN">iPod 固件</comment>
- <comment xml:lang="zh_TW">iPod 韌體</comment>
+ <comment xml:lang="zh-CN">iPod 固件</comment>
+ <comment xml:lang="zh-TW">iPod 韌體</comment>
<magic priority="50">
- <match value="S T O P" type="string" offset="0"/>
+ <match type="string" value="S T O P" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-java-archive">
<comment>Java archive</comment>
+ <comment xml:lang="af">Java-argief</comment>
<comment xml:lang="ar">أرشيف Java</comment>
- <comment xml:lang="be@latin">Archiŭ Java</comment>
+ <comment xml:lang="be-Latn">Archiŭ Java</comment>
<comment xml:lang="bg">Архив — Java</comment>
<comment xml:lang="ca">arxiu de Java</comment>
<comment xml:lang="cs">archiv Java</comment>
- <comment xml:lang="da">Javaarkiv</comment>
+ <comment xml:lang="da">Java-arkiv</comment>
<comment xml:lang="de">Java-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Java</comment>
- <comment xml:lang="en_GB">Java archive</comment>
+ <comment xml:lang="en-GB">Java archive</comment>
<comment xml:lang="eo">Java-arkivo</comment>
<comment xml:lang="es">archivador Java</comment>
<comment xml:lang="eu">Java artxiboa</comment>
<comment xml:lang="fi">Java-arkisto</comment>
<comment xml:lang="fo">Java skjalasavn</comment>
<comment xml:lang="fr">archive Java</comment>
+ <comment xml:lang="fur">archivi Java</comment>
<comment xml:lang="ga">cartlann Java</comment>
<comment xml:lang="gl">arquivo Java</comment>
<comment xml:lang="he">ארכיון Java</comment>
@@ -12943,7 +13467,7 @@
<comment xml:lang="oc">archiu Java</comment>
<comment xml:lang="pl">Archiwum Java</comment>
<comment xml:lang="pt">arquivo Java</comment>
- <comment xml:lang="pt_BR">Pacote Java</comment>
+ <comment xml:lang="pt-BR">Pacote Java</comment>
<comment xml:lang="ro">Arhivă Java</comment>
<comment xml:lang="ru">Архив Java</comment>
<comment xml:lang="sk">Archív Java</comment>
@@ -12954,8 +13478,8 @@
<comment xml:lang="tr">Java arşivi</comment>
<comment xml:lang="uk">архів Java</comment>
<comment xml:lang="vi">Kho nén Java</comment>
- <comment xml:lang="zh_CN">Java 归档文件</comment>
- <comment xml:lang="zh_TW">Java 封存檔</comment>
+ <comment xml:lang="zh-CN">Java 归档文件</comment>
+ <comment xml:lang="zh-TW">Java 封存檔</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="package-x-generic"/>
<alias type="application/x-jar"/>
@@ -12964,21 +13488,23 @@
</mime-type>
<mime-type type="application/x-java">
<comment>Java class</comment>
+ <comment xml:lang="af">Java-klas</comment>
<comment xml:lang="ar">صنف java</comment>
- <comment xml:lang="be@latin">Klasa Java</comment>
- <comment xml:lang="bg">Клас на Java</comment>
+ <comment xml:lang="be-Latn">Klasa Java</comment>
+ <comment xml:lang="bg">Клас — Java</comment>
<comment xml:lang="ca">classe de Java</comment>
<comment xml:lang="cs">třída Java</comment>
- <comment xml:lang="da">Javaklasse</comment>
+ <comment xml:lang="da">Java-klasse</comment>
<comment xml:lang="de">Java-Klasse</comment>
<comment xml:lang="el">Κλάση Java</comment>
- <comment xml:lang="en_GB">Java class</comment>
+ <comment xml:lang="en-GB">Java class</comment>
<comment xml:lang="eo">Java-klaso</comment>
<comment xml:lang="es">clase de Java</comment>
<comment xml:lang="eu">Java-ko klasea</comment>
<comment xml:lang="fi">Java-luokka</comment>
<comment xml:lang="fo">Java flokkur</comment>
<comment xml:lang="fr">classe Java</comment>
+ <comment xml:lang="fur">classe Java</comment>
<comment xml:lang="ga">aicme Java</comment>
<comment xml:lang="gl">clase de Java</comment>
<comment xml:lang="he">מחלקת Java</comment>
@@ -12999,7 +13525,7 @@
<comment xml:lang="oc">classa Java</comment>
<comment xml:lang="pl">Klasa Java</comment>
<comment xml:lang="pt">classe Java</comment>
- <comment xml:lang="pt_BR">Classe Java</comment>
+ <comment xml:lang="pt-BR">Classe Java</comment>
<comment xml:lang="ro">Clasă Java</comment>
<comment xml:lang="ru">Класс Java</comment>
<comment xml:lang="sk">Trieda Java</comment>
@@ -13010,10 +13536,10 @@
<comment xml:lang="tr">Java sınıfı</comment>
<comment xml:lang="uk">клас Java</comment>
<comment xml:lang="vi">Hạng Java</comment>
- <comment xml:lang="zh_CN">Java 类</comment>
- <comment xml:lang="zh_TW">Java class</comment>
+ <comment xml:lang="zh-CN">Java 类</comment>
+ <comment xml:lang="zh-TW">Java class</comment>
<magic priority="50">
- <match value="0xcafebabe" type="big32" offset="0"/>
+ <match type="big32" value="0xcafebabe" offset="0"/>
</magic>
<alias type="application/java"/>
<alias type="application/java-byte-code"/>
@@ -13022,23 +13548,90 @@
<alias type="application/x-java-vm"/>
<glob pattern="*.class"/>
</mime-type>
+ <mime-type type="text/x-groovy">
+ <comment>Groovy source code</comment>
+ <comment xml:lang="bg">Изходен код — Groovy</comment>
+ <comment xml:lang="ca">codi font en Groovy</comment>
+ <comment xml:lang="da">Groovy-kildekode</comment>
+ <comment xml:lang="de">Groovy-Quelltext</comment>
+ <comment xml:lang="en-GB">Groovy source code</comment>
+ <comment xml:lang="es">código fuente en Groovy</comment>
+ <comment xml:lang="eu">Groovy iturburu-kodea</comment>
+ <comment xml:lang="fi">Groovy-lähdekoodi</comment>
+ <comment xml:lang="fr">code source Groovy</comment>
+ <comment xml:lang="hr">Groovy izvorni kôd</comment>
+ <comment xml:lang="hu">Groovy forráskód</comment>
+ <comment xml:lang="id">Kode sumber Groovy</comment>
+ <comment xml:lang="it">Codice sorgente Groovy</comment>
+ <comment xml:lang="kk">Groovy бастапқы коды</comment>
+ <comment xml:lang="ko">그루비 소스 코드</comment>
+ <comment xml:lang="pl">Kod źródłowy Groovy</comment>
+ <comment xml:lang="pt-BR">Código-fonte Groovy</comment>
+ <comment xml:lang="ru">Исходный код Groovy</comment>
+ <comment xml:lang="sv">Groovy-källkod</comment>
+ <comment xml:lang="tr">Groovy kaynak kodu</comment>
+ <comment xml:lang="uk">вихідний код мовою Groovy</comment>
+ <comment xml:lang="zh-CN">Groovy 源代码</comment>
+ <comment xml:lang="zh-TW">Groovy 原始碼</comment>
+ <sub-class-of type="text/x-csrc"/>
+ <generic-icon name="text-x-script"/>
+ <glob pattern="*.groovy"/>
+ <glob pattern="*.gvy"/>
+ <glob pattern="*.gy"/>
+ <glob pattern="*.gsh"/>
+ </mime-type>
+ <mime-type type="text/x-gradle">
+ <comment>Gradle scripts</comment>
+ <comment xml:lang="af">Gradle-skrippe</comment>
+ <comment xml:lang="bg">Скрипт — Gradle</comment>
+ <comment xml:lang="ca">scripts Gradle</comment>
+ <comment xml:lang="cs">skript Gradle</comment>
+ <comment xml:lang="da">Gradle-programmer</comment>
+ <comment xml:lang="de">Gradle-Skripte</comment>
+ <comment xml:lang="en-GB">Gradle scripts</comment>
+ <comment xml:lang="es">secuencias de órdenes de Gradle</comment>
+ <comment xml:lang="eu">Gradle script-ak</comment>
+ <comment xml:lang="fi">Gradle scriptit</comment>
+ <comment xml:lang="fr">scripts Gradle</comment>
+ <comment xml:lang="fur">script Gradle</comment>
+ <comment xml:lang="ga">scripteanna Gradle</comment>
+ <comment xml:lang="hr">Gradle skripta</comment>
+ <comment xml:lang="hu">Gradle-parancsfájl</comment>
+ <comment xml:lang="id">Skrip Gradle</comment>
+ <comment xml:lang="it">Script Gradle</comment>
+ <comment xml:lang="kk">Gradle сценарийлері</comment>
+ <comment xml:lang="ko">Gradle 스크립트</comment>
+ <comment xml:lang="pl">Skrypty Gradle</comment>
+ <comment xml:lang="pt-BR">Scripts Gradle</comment>
+ <comment xml:lang="ru">Скрипты Gradle</comment>
+ <comment xml:lang="sk">Skripty Gradle</comment>
+ <comment xml:lang="sv">Gradle-skript</comment>
+ <comment xml:lang="tr">Gradle betikleri</comment>
+ <comment xml:lang="uk">скрипти Gradle</comment>
+ <comment xml:lang="zh-CN">Gradle 脚本</comment>
+ <comment xml:lang="zh-TW">Gradle 指令稿</comment>
+ <sub-class-of type="text/x-groovy"/>
+ <glob pattern="*.gradle"/>
+ </mime-type>
<mime-type type="application/x-java-jnlp-file">
<comment>JNLP file</comment>
+ <comment xml:lang="af">JNLP-lêer</comment>
<comment xml:lang="ar">ملف JNLP</comment>
- <comment xml:lang="be@latin">Fajł JNLP</comment>
- <comment xml:lang="bg">Файл — JNLP</comment>
+ <comment xml:lang="be-Latn">Fajł JNLP</comment>
+ <comment xml:lang="bg">Стартер — JNLP</comment>
<comment xml:lang="ca">fitxer JNLP</comment>
<comment xml:lang="cs">soubor JNLP</comment>
<comment xml:lang="da">JNPL-fil</comment>
<comment xml:lang="de">JNLP-Datei</comment>
<comment xml:lang="el">Αρχείο JNLP</comment>
- <comment xml:lang="en_GB">JNLP file</comment>
+ <comment xml:lang="en-GB">JNLP file</comment>
<comment xml:lang="eo">JNLP-dosiero</comment>
<comment xml:lang="es">archivo JNPL</comment>
<comment xml:lang="eu">JNLP fitxategia</comment>
<comment xml:lang="fi">JNLP-tiedosto</comment>
<comment xml:lang="fo">JNLP fíla</comment>
<comment xml:lang="fr">fichier JNLP</comment>
+ <comment xml:lang="fur">file JNLP</comment>
<comment xml:lang="ga">comhad JNLP</comment>
<comment xml:lang="gl">ficheiro JNLP</comment>
<comment xml:lang="he">קובץ JNLP</comment>
@@ -13058,7 +13651,7 @@
<comment xml:lang="oc">fichièr JNLP</comment>
<comment xml:lang="pl">Plik JNLP</comment>
<comment xml:lang="pt">ficheiro JNLP</comment>
- <comment xml:lang="pt_BR">Arquivo JNLP</comment>
+ <comment xml:lang="pt-BR">Arquivo JNLP</comment>
<comment xml:lang="ro">Fișier JNLP</comment>
<comment xml:lang="ru">Файл JNLP</comment>
<comment xml:lang="sk">Súbor JNLP</comment>
@@ -13069,15 +13662,15 @@
<comment xml:lang="tr">JNLP dosyası</comment>
<comment xml:lang="uk">файл JNLP</comment>
<comment xml:lang="vi">Tập tin JNLP</comment>
- <comment xml:lang="zh_CN">JNLP 文件</comment>
- <comment xml:lang="zh_TW">JNLP 檔案</comment>
+ <comment xml:lang="zh-CN">JNLP 文件</comment>
+ <comment xml:lang="zh-TW">JNLP 檔案</comment>
<acronym>JNLP</acronym>
<expanded-acronym>Java Network Launching Protocol</expanded-acronym>
<sub-class-of type="application/xml"/>
<generic-icon name="text-x-script"/>
<glob pattern="*.jnlp"/>
<magic priority="50">
- <match value="&lt;jnlp" type="string" offset="0:256"/>
+ <match type="string" value="&lt;jnlp" offset="0:256"/>
</magic>
</mime-type>
<mime-type type="application/x-java-keystore">
@@ -13086,15 +13679,16 @@
<comment xml:lang="bg">Ключодържател — Java</comment>
<comment xml:lang="ca">magatzem de claus de Java</comment>
<comment xml:lang="cs">úložiště klíčů Java</comment>
- <comment xml:lang="da">Javanøglelager</comment>
+ <comment xml:lang="da">Java-nøglelager</comment>
<comment xml:lang="de">Java-Schlüsselbund</comment>
<comment xml:lang="el">Χώρος αποθήκευσης κλειδιών Java</comment>
- <comment xml:lang="en_GB">Java keystore</comment>
+ <comment xml:lang="en-GB">Java keystore</comment>
<comment xml:lang="es">almacén de claves de Java</comment>
<comment xml:lang="eu">Java-ren gako-biltegia</comment>
<comment xml:lang="fi">Java-avainvarasto</comment>
<comment xml:lang="fo">Java lyklagoymsla</comment>
<comment xml:lang="fr">stockage de clés Java</comment>
+ <comment xml:lang="fur">archivi di clâfs Java</comment>
<comment xml:lang="ga">eochairstór Java</comment>
<comment xml:lang="gl">almacén de chaves de Java</comment>
<comment xml:lang="he">אחסון מפתחות של Java</comment>
@@ -13112,19 +13706,19 @@
<comment xml:lang="oc">emmagazinatge de claus Java</comment>
<comment xml:lang="pl">Baza kluczy Java</comment>
<comment xml:lang="pt">armazém de chaves Java</comment>
- <comment xml:lang="pt_BR">Keystore de Java</comment>
+ <comment xml:lang="pt-BR">Keystore de Java</comment>
<comment xml:lang="ro">Stocare chei Java</comment>
<comment xml:lang="ru">Хранилище ключей Java</comment>
<comment xml:lang="sk">Úložisko kľúčov Java</comment>
<comment xml:lang="sl">Datoteka tipkovne razporeditve Java</comment>
<comment xml:lang="sr">смештај кључа Јаве</comment>
<comment xml:lang="sv">Java-nyckellager</comment>
- <comment xml:lang="tr">Java deposu</comment>
+ <comment xml:lang="tr">Java anahtar deposu</comment>
<comment xml:lang="uk">сховище ключів Java</comment>
- <comment xml:lang="zh_CN">Java 密钥库</comment>
- <comment xml:lang="zh_TW">Java 金鑰儲存</comment>
+ <comment xml:lang="zh-CN">Java 密钥库</comment>
+ <comment xml:lang="zh-TW">Java 金鑰儲存</comment>
<magic priority="50">
- <match value="0xfeedfeed" type="big32" offset="0"/>
+ <match type="big32" value="0xfeedfeed" offset="0"/>
</magic>
<glob pattern="*.jks"/>
<glob pattern="*.ks"/>
@@ -13139,12 +13733,13 @@
<comment xml:lang="da">Java JCE-nøglelager</comment>
<comment xml:lang="de">Java JCE-Schlüsselbund</comment>
<comment xml:lang="el">Αποθήκη κλειδιών Java JCE</comment>
- <comment xml:lang="en_GB">Java JCE keystore</comment>
+ <comment xml:lang="en-GB">Java JCE keystore</comment>
<comment xml:lang="es">almacén de claves JCE de Java</comment>
<comment xml:lang="eu">Java JCE-ren gako-biltegia</comment>
<comment xml:lang="fi">Java JCE -avainvarasto</comment>
<comment xml:lang="fo">Java JCE lyklagoymsla</comment>
<comment xml:lang="fr">stockage de clés Java JCE</comment>
+ <comment xml:lang="fur">archivi di clâfs JCE Java</comment>
<comment xml:lang="ga">eochairstór Java JCE</comment>
<comment xml:lang="gl">almacén de chves JCE de Java</comment>
<comment xml:lang="he">אחסון מפתחות של Java JCE</comment>
@@ -13162,40 +13757,41 @@
<comment xml:lang="oc">emmagazinatge de claus Java JCE</comment>
<comment xml:lang="pl">Baza kluczy Java JCE</comment>
<comment xml:lang="pt">armazém de chaves JavaJCE</comment>
- <comment xml:lang="pt_BR">Keystore JCE do Java</comment>
+ <comment xml:lang="pt-BR">Keystore JCE do Java</comment>
<comment xml:lang="ro">Stocare chei Java JCE</comment>
<comment xml:lang="ru">Хранилище ключей Java JCE</comment>
<comment xml:lang="sk">Úložisko kľúčov Java JCE</comment>
<comment xml:lang="sl">Datoteka tipkovne razporeditve Java JCE</comment>
<comment xml:lang="sr">смештај ЈЦЕ кључа Јаве</comment>
<comment xml:lang="sv">Java JCE-nyckellager</comment>
- <comment xml:lang="tr">Java JCE deposu</comment>
+ <comment xml:lang="tr">Java JCE anahtar deposu</comment>
<comment xml:lang="uk">сховище ключів JCE Java</comment>
- <comment xml:lang="zh_CN">Java JCE 密钥库</comment>
- <comment xml:lang="zh_TW">Java JCE 金鑰儲存</comment>
+ <comment xml:lang="zh-CN">Java JCE 密钥库</comment>
+ <comment xml:lang="zh-TW">Java JCE 金鑰儲存</comment>
<acronym>JCE</acronym>
<expanded-acronym>Java Cryptography Extension</expanded-acronym>
<magic priority="50">
- <match value="0xcececece" type="host32" offset="0"/>
+ <match type="host32" value="0xcececece" offset="0"/>
</magic>
<glob pattern="*.jceks"/>
</mime-type>
<mime-type type="application/x-java-pack200">
<comment>Pack200 Java archive</comment>
<comment xml:lang="ar">أرشيف Pack200 Java</comment>
- <comment xml:lang="be@latin">Archiŭ Pack200 Java</comment>
+ <comment xml:lang="be-Latn">Archiŭ Pack200 Java</comment>
<comment xml:lang="bg">Архив — Java Pack200</comment>
<comment xml:lang="ca">arxiu de Java en Pack200</comment>
<comment xml:lang="cs">archiv Java Pack200</comment>
<comment xml:lang="da">Pack200 Java-arkiv</comment>
<comment xml:lang="de">Pack200-Java-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Java Pack200</comment>
- <comment xml:lang="en_GB">Pack200 Java archive</comment>
+ <comment xml:lang="en-GB">Pack200 Java archive</comment>
<comment xml:lang="es">archivador Pack200 Java</comment>
<comment xml:lang="eu">Pack2000 Java artxiboa</comment>
<comment xml:lang="fi">Pack200-Java-arkisto</comment>
<comment xml:lang="fo">Pack200 Java skjalasavn</comment>
<comment xml:lang="fr">archive Java Pack200</comment>
+ <comment xml:lang="fur">archivi Java Pack200</comment>
<comment xml:lang="ga">cartlann Java Pack200</comment>
<comment xml:lang="gl">arquivo Pack200 Java</comment>
<comment xml:lang="he">ארכיון מסוג Pack200 Java</comment>
@@ -13215,7 +13811,7 @@
<comment xml:lang="oc">archiu Java Pack200</comment>
<comment xml:lang="pl">Archiwum Java Pack200</comment>
<comment xml:lang="pt">arquivo Java Pack200</comment>
- <comment xml:lang="pt_BR">Pacote Java Pack200</comment>
+ <comment xml:lang="pt-BR">Pacote Java Pack200</comment>
<comment xml:lang="ro">Arhivă Java Pack2000</comment>
<comment xml:lang="ru">Архив Java Pack200</comment>
<comment xml:lang="sk">Archív Java Pack200</comment>
@@ -13226,31 +13822,33 @@
<comment xml:lang="tr">Pack200 Java arşivi</comment>
<comment xml:lang="uk">архів Java Pack200</comment>
<comment xml:lang="vi">Kho nén Java Pack200</comment>
- <comment xml:lang="zh_CN">Pack200 Java 归档文件</comment>
- <comment xml:lang="zh_TW">Pack200 Java 封存檔</comment>
+ <comment xml:lang="zh-CN">Pack200 Java 归档文件</comment>
+ <comment xml:lang="zh-TW">Pack200 Java 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="0xcafed00d" type="big32" offset="0"/>
+ <match type="big32" value="0xcafed00d" offset="0"/>
</magic>
<glob pattern="*.pack"/>
</mime-type>
<mime-type type="application/javascript">
<comment>JavaScript program</comment>
+ <comment xml:lang="af">JavaScript-program</comment>
<comment xml:lang="ar">برنامج جافاسكربت</comment>
- <comment xml:lang="be@latin">Prahrama JavaScript</comment>
+ <comment xml:lang="be-Latn">Prahrama JavaScript</comment>
<comment xml:lang="bg">Програма на JavaScript</comment>
<comment xml:lang="ca">programa JavaScript</comment>
<comment xml:lang="cs">program v JavaScriptu</comment>
<comment xml:lang="da">JavaScript-program</comment>
<comment xml:lang="de">JavaScript-Programm</comment>
<comment xml:lang="el">Πρόγραμμα JavaScript</comment>
- <comment xml:lang="en_GB">JavaScript program</comment>
+ <comment xml:lang="en-GB">JavaScript program</comment>
<comment xml:lang="eo">JavaScript-programo</comment>
<comment xml:lang="es">programa en JavaScript</comment>
<comment xml:lang="eu">JavaScript programa</comment>
<comment xml:lang="fi">JavaScript-ohjelma</comment>
<comment xml:lang="fo">JavaScript forrit</comment>
<comment xml:lang="fr">programme JavaScript</comment>
+ <comment xml:lang="fur">program JavaScript</comment>
<comment xml:lang="ga">ríomhchlár JavaScript</comment>
<comment xml:lang="gl">programa JavaScript</comment>
<comment xml:lang="he">תכנית JavaScript</comment>
@@ -13271,7 +13869,7 @@
<comment xml:lang="oc">programa JavaEscript</comment>
<comment xml:lang="pl">Pogram JavaScript</comment>
<comment xml:lang="pt">programa JavaScript</comment>
- <comment xml:lang="pt_BR">Programa JavaScript</comment>
+ <comment xml:lang="pt-BR">Programa JavaScript</comment>
<comment xml:lang="ro">Program JavaScript</comment>
<comment xml:lang="ru">Программа JavaScript</comment>
<comment xml:lang="sk">Program jazyka JavaScript</comment>
@@ -13282,23 +13880,23 @@
<comment xml:lang="tr">JavaScript programı</comment>
<comment xml:lang="uk">програма мовою JavaScript</comment>
<comment xml:lang="vi">Chương trình JavaScript</comment>
- <comment xml:lang="zh_CN">JavaScript 程序</comment>
- <comment xml:lang="zh_TW">JavaScript 程式</comment>
+ <comment xml:lang="zh-CN">JavaScript 程序</comment>
+ <comment xml:lang="zh-TW">JavaScript 程式</comment>
<alias type="application/x-javascript"/>
<alias type="text/javascript"/>
<sub-class-of type="application/ecmascript"/>
<generic-icon name="text-x-script"/>
<magic priority="50">
- <match value="#!/bin/gjs" type="string" offset="0"/>
- <match value="#! /bin/gjs" type="string" offset="0"/>
- <match value='eval \"exec /bin/gjs' type="string" offset="0"/>
- <match value="#!/usr/bin/gjs" type="string" offset="0"/>
- <match value="#! /usr/bin/gjs" type="string" offset="0"/>
- <match value='eval \"exec /usr/bin/gjs' type="string" offset="0"/>
- <match value="#!/usr/local/bin/gjs" type="string" offset="0"/>
- <match value="#! /usr/local/bin/gjs" type="string" offset="0"/>
- <match value='eval \"exec /usr/local/bin/gjs' type="string" offset="0"/>
- <match value='/bin/env gjs' type="string" offset="2:16"/>
+ <match type="string" value="#!/bin/gjs" offset="0"/>
+ <match type="string" value="#! /bin/gjs" offset="0"/>
+ <match type="string" value="eval \&quot;exec /bin/gjs" offset="0"/>
+ <match type="string" value="#!/usr/bin/gjs" offset="0"/>
+ <match type="string" value="#! /usr/bin/gjs" offset="0"/>
+ <match type="string" value="eval \&quot;exec /usr/bin/gjs" offset="0"/>
+ <match type="string" value="#!/usr/local/bin/gjs" offset="0"/>
+ <match type="string" value="#! /usr/local/bin/gjs" offset="0"/>
+ <match type="string" value="eval \&quot;exec /usr/local/bin/gjs" offset="0"/>
+ <match type="string" value="/bin/env gjs" offset="2:16"/>
</magic>
<glob pattern="*.js"/>
<glob pattern="*.jsm"/>
@@ -13306,17 +13904,20 @@
</mime-type>
<mime-type type="application/json">
<comment>JSON document</comment>
+ <comment xml:lang="af">JSON-dokument</comment>
<comment xml:lang="ast">Documentu JSON</comment>
+ <comment xml:lang="bg">Документ — JSON</comment>
<comment xml:lang="ca">document JSON</comment>
<comment xml:lang="cs">dokument JSON</comment>
<comment xml:lang="da">JSON-dokument</comment>
<comment xml:lang="de">JSON-Dokument</comment>
<comment xml:lang="el">Έγγραφο JSON</comment>
- <comment xml:lang="en_GB">JSON document</comment>
+ <comment xml:lang="en-GB">JSON document</comment>
<comment xml:lang="es">documento JSON</comment>
<comment xml:lang="eu">JSON dokumentua</comment>
<comment xml:lang="fi">JSON-asiakirja</comment>
<comment xml:lang="fr">document JSON</comment>
+ <comment xml:lang="fur">document JSON</comment>
<comment xml:lang="ga">cáipéis JSON</comment>
<comment xml:lang="gl">Documento JSON</comment>
<comment xml:lang="he">מסמך JSON</comment>
@@ -13330,7 +13931,7 @@
<comment xml:lang="oc">document JSON</comment>
<comment xml:lang="pl">Dokument JSON</comment>
<comment xml:lang="pt">documento JSON</comment>
- <comment xml:lang="pt_BR">Documento JSON</comment>
+ <comment xml:lang="pt-BR">Documento JSON</comment>
<comment xml:lang="ru">Документ JSON</comment>
<comment xml:lang="sk">Dokument JSON</comment>
<comment xml:lang="sl">Dokument JSON</comment>
@@ -13338,8 +13939,8 @@
<comment xml:lang="sv">JSON-dokument</comment>
<comment xml:lang="tr">JSON belgesi</comment>
<comment xml:lang="uk">документ JSON</comment>
- <comment xml:lang="zh_CN">JSON 文档</comment>
- <comment xml:lang="zh_TW">JSON 文件</comment>
+ <comment xml:lang="zh-CN">JSON 文档</comment>
+ <comment xml:lang="zh-TW">JSON 文件</comment>
<acronym>JSON</acronym>
<expanded-acronym>JavaScript Object Notation</expanded-acronym>
<sub-class-of type="application/javascript"/>
@@ -13348,17 +13949,20 @@
</mime-type>
<mime-type type="application/jrd+json">
<comment>JRD document</comment>
+ <comment xml:lang="af">JRD-dokument</comment>
<comment xml:lang="ast">Documentu JRD</comment>
+ <comment xml:lang="bg">Документ — JRD</comment>
<comment xml:lang="ca">document JRD</comment>
<comment xml:lang="cs">dokument JRD</comment>
<comment xml:lang="da">JRD-dokument</comment>
<comment xml:lang="de">JRD-Dokument</comment>
<comment xml:lang="el">Έγγραφο JRD</comment>
- <comment xml:lang="en_GB">JRD document</comment>
+ <comment xml:lang="en-GB">JRD document</comment>
<comment xml:lang="es">documento JRD</comment>
<comment xml:lang="eu">JRD dokumentua</comment>
<comment xml:lang="fi">JRD-asiakirja</comment>
<comment xml:lang="fr">document JRD</comment>
+ <comment xml:lang="fur">document JRD</comment>
<comment xml:lang="ga">cáipéis JRD</comment>
<comment xml:lang="he">מסמך JRD</comment>
<comment xml:lang="hr">JRD dokument</comment>
@@ -13371,15 +13975,16 @@
<comment xml:lang="oc">document JRD</comment>
<comment xml:lang="pl">Dokument JRD</comment>
<comment xml:lang="pt">doxumento JRD</comment>
- <comment xml:lang="pt_BR">Documento JRD</comment>
+ <comment xml:lang="pt-BR">Documento JRD</comment>
<comment xml:lang="ru">Документ JRD</comment>
<comment xml:lang="sk">Dokument JRD</comment>
+ <comment xml:lang="sl">Dokument JRD</comment>
<comment xml:lang="sr">ЈРД документ</comment>
<comment xml:lang="sv">JRD-dokument</comment>
<comment xml:lang="tr">JRD belgesi</comment>
<comment xml:lang="uk">документ JRD</comment>
- <comment xml:lang="zh_CN">JRD 文档</comment>
- <comment xml:lang="zh_TW">JRD 文件</comment>
+ <comment xml:lang="zh-CN">JRD 文档</comment>
+ <comment xml:lang="zh-TW">JRD 文件</comment>
<acronym>JRD</acronym>
<expanded-acronym>JSON Resource Descriptor</expanded-acronym>
<sub-class-of type="application/json"/>
@@ -13388,14 +13993,17 @@
</mime-type>
<mime-type type="application/json-patch+json">
<comment>JSON patch</comment>
+ <comment xml:lang="bg">Кръпка — JSON</comment>
<comment xml:lang="ca">pedaç de JSON</comment>
<comment xml:lang="cs">cesta JSON</comment>
<comment xml:lang="da">JSON-rettelse</comment>
<comment xml:lang="de">JSON-Patch</comment>
- <comment xml:lang="en_GB">JSON patch</comment>
+ <comment xml:lang="en-GB">JSON patch</comment>
<comment xml:lang="es">parche en JSON</comment>
<comment xml:lang="eu">JSON adabakia</comment>
+ <comment xml:lang="fi">JSON-paikkatiedosto</comment>
<comment xml:lang="fr">correctif JSON</comment>
+ <comment xml:lang="fur">blec JSON</comment>
<comment xml:lang="ga">paiste JSON</comment>
<comment xml:lang="he">טלאי JSON</comment>
<comment xml:lang="hr">JSON zakrpa</comment>
@@ -13408,15 +14016,15 @@
<comment xml:lang="oc">correctiu JSON</comment>
<comment xml:lang="pl">Łata JSON</comment>
<comment xml:lang="pt">patch JSON</comment>
- <comment xml:lang="pt_BR">Patch JSON</comment>
+ <comment xml:lang="pt-BR">Patch JSON</comment>
<comment xml:lang="ru">Патч JSON</comment>
<comment xml:lang="sk">Záplata JSON</comment>
<comment xml:lang="sr">ЈСОН закрпа</comment>
<comment xml:lang="sv">JSON patch</comment>
<comment xml:lang="tr">JSON yaması</comment>
<comment xml:lang="uk">латка JSON</comment>
- <comment xml:lang="zh_CN">JSON 补丁</comment>
- <comment xml:lang="zh_TW">JSON 修補檔</comment>
+ <comment xml:lang="zh-CN">JSON 补丁</comment>
+ <comment xml:lang="zh-TW">JSON 修補檔</comment>
<acronym>JSON</acronym>
<expanded-acronym>JavaScript Object Notation</expanded-acronym>
<sub-class-of type="application/json"/>
@@ -13426,16 +14034,18 @@
<mime-type type="application/ld+json">
<comment>JSON-LD document</comment>
<comment xml:lang="ast">Documentu JSON-LD</comment>
+ <comment xml:lang="bg">Документ — JSON-LD</comment>
<comment xml:lang="ca">document JSON-LD</comment>
<comment xml:lang="cs">dokument JSON-LD</comment>
<comment xml:lang="da">JSON-LD-dokument</comment>
<comment xml:lang="de">JSON-LD-Dokument</comment>
<comment xml:lang="el">Έγγραφο JSON-LD</comment>
- <comment xml:lang="en_GB">JSON-LD document</comment>
+ <comment xml:lang="en-GB">JSON-LD document</comment>
<comment xml:lang="es">documento JSON-LD</comment>
<comment xml:lang="eu">JSON-LD dokumentua</comment>
<comment xml:lang="fi">JSON-LD-asiakirja</comment>
<comment xml:lang="fr">document JSON-LD</comment>
+ <comment xml:lang="fur">document JSON-LD</comment>
<comment xml:lang="ga">cáipéis JSON-LD</comment>
<comment xml:lang="he">מסמך JSON-LD</comment>
<comment xml:lang="hr">JSON-LD dokument</comment>
@@ -13448,15 +14058,16 @@
<comment xml:lang="oc">Document JSON-LD</comment>
<comment xml:lang="pl">Dokument JSON-LD</comment>
<comment xml:lang="pt">documento JSON-LD</comment>
- <comment xml:lang="pt_BR">Documento JSON-LD</comment>
+ <comment xml:lang="pt-BR">Documento JSON-LD</comment>
<comment xml:lang="ru">Документ JSON-LD</comment>
<comment xml:lang="sk">Dokument JSON-LD</comment>
+ <comment xml:lang="sl">Dokument JSON-LD</comment>
<comment xml:lang="sr">ЈСОН-ЛД документ</comment>
<comment xml:lang="sv">JSON-LD-dokument</comment>
<comment xml:lang="tr">JSON-LD belgesi</comment>
<comment xml:lang="uk">документ JSON-LD</comment>
- <comment xml:lang="zh_CN">JSON-LD 文档</comment>
- <comment xml:lang="zh_TW">JSON-LD 文件</comment>
+ <comment xml:lang="zh-CN">JSON-LD 文档</comment>
+ <comment xml:lang="zh-TW">JSON-LD 文件</comment>
<acronym>JSON-LD</acronym>
<expanded-acronym>JavaScript Object Notation for Linked Data</expanded-acronym>
<sub-class-of type="application/json"/>
@@ -13464,55 +14075,55 @@
<glob pattern="*.jsonld"/>
</mime-type>
<mime-type type="application/x-ipynb+json">
- <comment>Jupyter Notebook</comment>
- <comment xml:lang="ca">llibreta de notes de Jupyter</comment>
- <comment xml:lang="cs">sešit Jupyter</comment>
- <comment xml:lang="da">Jupyter Notebook</comment>
- <comment xml:lang="de">Jupyter-Dokument</comment>
- <comment xml:lang="en_GB">Jupyter Notebook</comment>
- <comment xml:lang="es">libreta de Jupyter</comment>
- <comment xml:lang="eu">Jupyter Notebook</comment>
+ <comment>Jupyter notebook document</comment>
+ <comment xml:lang="bg">Скицник — Jupyter</comment>
+ <comment xml:lang="ca">document de llibreta de notes de Jupyter</comment>
+ <comment xml:lang="da">Jupyter notebook-dokument</comment>
+ <comment xml:lang="de">Jupyter-Notebook-Dokument</comment>
+ <comment xml:lang="en-GB">Jupyter notebook document</comment>
+ <comment xml:lang="es">documento de cuaderno de Jupyter</comment>
+ <comment xml:lang="eu">Jupyter notebook dokumentua</comment>
+ <comment xml:lang="fi">Jupyter notebook -asiakirja</comment>
<comment xml:lang="fr">carnet de notes Jupyter</comment>
- <comment xml:lang="ga">Leabhar nótaí Jupyter</comment>
- <comment xml:lang="he">מחברת Jupyter</comment>
- <comment xml:lang="hr">Jupyter bilježnica</comment>
- <comment xml:lang="hu">Jupyter notesz</comment>
- <comment xml:lang="id">Notebook Jupyter</comment>
- <comment xml:lang="it">Notebook Jupyter</comment>
- <comment xml:lang="kk">Jupyter Notebook</comment>
- <comment xml:lang="ko">Jupyter 노트북</comment>
- <comment xml:lang="pl">Notatnik Jupyter</comment>
- <comment xml:lang="pt_BR">Bloco de Notas Jupyter</comment>
- <comment xml:lang="ru">Jupyter Notebook</comment>
- <comment xml:lang="sk">Zošit programu Jupyter</comment>
- <comment xml:lang="sr">Џупитер бележница</comment>
- <comment xml:lang="sv">Jupyter Notebook-dokument</comment>
- <comment xml:lang="tr">Jupyter Notebook</comment>
- <comment xml:lang="uk">записник Jupyter</comment>
- <comment xml:lang="zh_CN">Jupyter 笔记本</comment>
- <comment xml:lang="zh_TW">Jupyter 記事本</comment>
+ <comment xml:lang="hr">Jupyter notebook dokument</comment>
+ <comment xml:lang="hu">Jupyter munkafüzet dokumentum</comment>
+ <comment xml:lang="id">Dokumen Jupyter notebook</comment>
+ <comment xml:lang="it">Documento notebook Jupyter</comment>
+ <comment xml:lang="kk">Jupyter блокнот құжаты</comment>
+ <comment xml:lang="ko">주피터 노트북 문서</comment>
+ <comment xml:lang="pl">Dokument notatnika Jupyter</comment>
+ <comment xml:lang="pt-BR">Documento Jupyter Notebook</comment>
+ <comment xml:lang="ru">Документ Jupyter notebook</comment>
+ <comment xml:lang="sv">Jupyter-anteckningsboksdokument</comment>
+ <comment xml:lang="tr">Jupyter notebook belgesi</comment>
+ <comment xml:lang="uk">документ нотатника Jupyter</comment>
+ <comment xml:lang="zh-CN">Jupyter 笔记本文档</comment>
+ <comment xml:lang="zh-TW">Jupyter 記事本文件</comment>
<sub-class-of type="application/json"/>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="{" type="string" offset="0">
- <match value='"cells":' type="string" offset="1:256"/>
+ <match type="string" value="{" offset="0">
+ <match type="string" value="&quot;cells&quot;:" offset="1:256"/>
</match>
</magic>
<glob pattern="*.ipynb"/>
</mime-type>
<mime-type type="application/vnd.coffeescript">
<comment>CoffeeScript document</comment>
+ <comment xml:lang="af">CoffeeScript-dokument</comment>
<comment xml:lang="ast">Documentu de CoffeScript</comment>
+ <comment xml:lang="bg">Документ — CoffeeScript</comment>
<comment xml:lang="ca">document CoffeeScript</comment>
<comment xml:lang="cs">dokument CoffeeScript</comment>
<comment xml:lang="da">CoffeeScript-dokument</comment>
<comment xml:lang="de">CoffeeScript-Dokument</comment>
<comment xml:lang="el">Έγγραφο CoffeeScript</comment>
- <comment xml:lang="en_GB">CoffeeScript document</comment>
+ <comment xml:lang="en-GB">CoffeeScript document</comment>
<comment xml:lang="es">documento en CoffeeScript</comment>
<comment xml:lang="eu">CoffeeScript dokumentua</comment>
<comment xml:lang="fi">CoffeeScript-asiakirja</comment>
<comment xml:lang="fr">document CoffeeScript</comment>
+ <comment xml:lang="fur">document CoffeeScript</comment>
<comment xml:lang="ga">cáipéis CoffeeScript</comment>
<comment xml:lang="he">מסמך CoffeeScript</comment>
<comment xml:lang="hr">CoffeeScript dokument</comment>
@@ -13525,36 +14136,39 @@
<comment xml:lang="oc">Document CoffeScript</comment>
<comment xml:lang="pl">Dokument CoffeeScript</comment>
<comment xml:lang="pt">documento CoffeeScript</comment>
- <comment xml:lang="pt_BR">Documento CoffeeScript</comment>
+ <comment xml:lang="pt-BR">Documento CoffeeScript</comment>
<comment xml:lang="ru">Документ CoffeeScript</comment>
<comment xml:lang="sk">Dokument CoffeeScript</comment>
+ <comment xml:lang="sl">Dokument CoffeeScript</comment>
<comment xml:lang="sr">Кофи скрипт документ</comment>
<comment xml:lang="sv">CoffeeScript-dokument</comment>
<comment xml:lang="tr">CoffeeScript belgesi</comment>
<comment xml:lang="uk">документ CoffeeScript</comment>
- <comment xml:lang="zh_CN">CoffeeScript 文档</comment>
- <comment xml:lang="zh_TW">CoffeeScript 文件</comment>
+ <comment xml:lang="zh-CN">CoffeeScript 文档</comment>
+ <comment xml:lang="zh-TW">CoffeeScript 文件</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-script"/>
<glob pattern="*.coffee"/>
</mime-type>
<mime-type type="application/x-jbuilder-project">
<comment>JBuilder project</comment>
+ <comment xml:lang="af">JBuilder-projek</comment>
<comment xml:lang="ar">مشروع JBuilder</comment>
- <comment xml:lang="be@latin">Prajekt JBuilder</comment>
+ <comment xml:lang="be-Latn">Prajekt JBuilder</comment>
<comment xml:lang="bg">Проект — JBuilder</comment>
<comment xml:lang="ca">projecte de JBuilder</comment>
<comment xml:lang="cs">projekt JBuilder</comment>
<comment xml:lang="da">JBuilder-projekt</comment>
<comment xml:lang="de">JBuilder-Projekt</comment>
<comment xml:lang="el">Εργο JBuilder</comment>
- <comment xml:lang="en_GB">JBuilder project</comment>
+ <comment xml:lang="en-GB">JBuilder project</comment>
<comment xml:lang="eo">JBuilder-projekto</comment>
<comment xml:lang="es">proyecto de JBuilder</comment>
<comment xml:lang="eu">JBuilder proiektua</comment>
<comment xml:lang="fi">JBuilder-projekti</comment>
<comment xml:lang="fo">JBuilder verkætlan</comment>
<comment xml:lang="fr">projet JBuilder</comment>
+ <comment xml:lang="fur">progjet JBuilder</comment>
<comment xml:lang="ga">tionscadal JBuilder</comment>
<comment xml:lang="gl">proxecto de JBuilder</comment>
<comment xml:lang="he">מיזם JBuilder</comment>
@@ -13575,7 +14189,7 @@
<comment xml:lang="oc">projècte JBuilder</comment>
<comment xml:lang="pl">Projekt JBuilder</comment>
<comment xml:lang="pt">projecto JBuilder</comment>
- <comment xml:lang="pt_BR">Projeto do JBuilder</comment>
+ <comment xml:lang="pt-BR">Projeto do JBuilder</comment>
<comment xml:lang="ro">Proiect JBuilder</comment>
<comment xml:lang="ru">Проект JBuilder</comment>
<comment xml:lang="sk">Projekt JBuilder</comment>
@@ -13584,31 +14198,33 @@
<comment xml:lang="sr">пројекат ЈГрадитеља</comment>
<comment xml:lang="sv">JBuilder-projekt</comment>
<comment xml:lang="tr">JBuilder projesi</comment>
- <comment xml:lang="uk">проект JBuilder</comment>
+ <comment xml:lang="uk">проєкт JBuilder</comment>
<comment xml:lang="vi">Dự án JBuilder</comment>
- <comment xml:lang="zh_CN">JBuilder 工程</comment>
- <comment xml:lang="zh_TW">JBuilder 專案</comment>
+ <comment xml:lang="zh-CN">JBuilder 工程</comment>
+ <comment xml:lang="zh-TW">JBuilder 專案</comment>
<generic-icon name="x-office-document"/>
<glob pattern="*.jpr"/>
<glob pattern="*.jpx"/>
</mime-type>
<mime-type type="application/x-karbon">
<comment>Karbon14 drawing</comment>
+ <comment xml:lang="af">Karbon14-tekening</comment>
<comment xml:lang="ar">تصميم Karbon14</comment>
- <comment xml:lang="be@latin">Rysunak Karbon14</comment>
+ <comment xml:lang="be-Latn">Rysunak Karbon14</comment>
<comment xml:lang="bg">Чертеж — Karbon14</comment>
<comment xml:lang="ca">dibuix de Karbon14</comment>
<comment xml:lang="cs">kresba Karbon14</comment>
<comment xml:lang="da">Karbon14-tegning</comment>
<comment xml:lang="de">Karbon14-Zeichnung</comment>
<comment xml:lang="el">Σχέδιο Karbon14</comment>
- <comment xml:lang="en_GB">Karbon14 drawing</comment>
+ <comment xml:lang="en-GB">Karbon14 drawing</comment>
<comment xml:lang="eo">Karbon14-grafikaĵo</comment>
<comment xml:lang="es">dibujo de Karbon14</comment>
<comment xml:lang="eu">Karbon14 marrazkia</comment>
<comment xml:lang="fi">Karbon14-piirros</comment>
<comment xml:lang="fo">Karbon14 tekning</comment>
<comment xml:lang="fr">dessin Karbon14</comment>
+ <comment xml:lang="fur">dissen Karbon14</comment>
<comment xml:lang="ga">líníocht Karbon14</comment>
<comment xml:lang="gl">debuxo de Karbon14</comment>
<comment xml:lang="he">ציור Karbon14</comment>
@@ -13629,7 +14245,7 @@
<comment xml:lang="oc">dessenh Karbon14</comment>
<comment xml:lang="pl">Rysunek Karbon14</comment>
<comment xml:lang="pt">desenho Karbon14</comment>
- <comment xml:lang="pt_BR">Desenho do Karbon14</comment>
+ <comment xml:lang="pt-BR">Desenho do Karbon14</comment>
<comment xml:lang="ro">Desen Karbon14</comment>
<comment xml:lang="ru">Рисунок Karbon14</comment>
<comment xml:lang="sk">Kresba Karbon14</comment>
@@ -13640,18 +14256,18 @@
<comment xml:lang="tr">Karbon14 çizimi</comment>
<comment xml:lang="uk">малюнок Karbon14</comment>
<comment xml:lang="vi">Bản vẽ Karbon14</comment>
- <comment xml:lang="zh_CN">Karbon14 绘图</comment>
- <comment xml:lang="zh_TW">Karbon14 繪圖</comment>
+ <comment xml:lang="zh-CN">Karbon14 绘图</comment>
+ <comment xml:lang="zh-TW">Karbon14 繪圖</comment>
<generic-icon name="image-x-generic"/>
<magic priority="60">
- <match value="\037\213" type="string" offset="0">
- <match value="KOffice" type="string" offset="10">
- <match value="application/x-karbon\004\006" type="string" offset="18"/>
+ <match type="string" value="\037\213" offset="0">
+ <match type="string" value="KOffice" offset="10">
+ <match type="string" value="application/x-karbon\004\006" offset="18"/>
</match>
</match>
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/x-karbon" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/x-karbon" offset="38"/>
</match>
</match>
</magic>
@@ -13659,21 +14275,23 @@
</mime-type>
<mime-type type="application/x-kchart">
<comment>KChart chart</comment>
+ <comment xml:lang="af">KChart-grafiek</comment>
<comment xml:lang="ar">رسم بياني KChart</comment>
- <comment xml:lang="be@latin">Hrafik KChart</comment>
+ <comment xml:lang="be-Latn">Hrafik KChart</comment>
<comment xml:lang="bg">Диаграма — KChart</comment>
<comment xml:lang="ca">diagrama de KChart</comment>
<comment xml:lang="cs">graf Chart</comment>
<comment xml:lang="da">KChart-diagram</comment>
<comment xml:lang="de">KChart-Diagramm</comment>
<comment xml:lang="el">Γράφημα KChart</comment>
- <comment xml:lang="en_GB">KChart chart</comment>
+ <comment xml:lang="en-GB">KChart chart</comment>
<comment xml:lang="eo">KChart-diagramo</comment>
<comment xml:lang="es">gráfico de KChart</comment>
<comment xml:lang="eu">KChart diagrama</comment>
<comment xml:lang="fi">KChart-kaavio</comment>
<comment xml:lang="fo">KChart strikumynd</comment>
<comment xml:lang="fr">graphique KChart</comment>
+ <comment xml:lang="fur">grafic KChart</comment>
<comment xml:lang="ga">cairt KChart</comment>
<comment xml:lang="gl">gráfica de KChart</comment>
<comment xml:lang="he">תרשים KChart</comment>
@@ -13694,7 +14312,7 @@
<comment xml:lang="oc">grafic KChart</comment>
<comment xml:lang="pl">Wykres KChart</comment>
<comment xml:lang="pt">gráfico KChart</comment>
- <comment xml:lang="pt_BR">Gráfico do KChart</comment>
+ <comment xml:lang="pt-BR">Gráfico do KChart</comment>
<comment xml:lang="ro">Diagramă KChart</comment>
<comment xml:lang="ru">Диаграмма KChart</comment>
<comment xml:lang="sk">Graf KChart</comment>
@@ -13705,224 +14323,159 @@
<comment xml:lang="tr">KChart çizgesi</comment>
<comment xml:lang="uk">діаграма KChart</comment>
<comment xml:lang="vi">Sơ đồ KChart</comment>
- <comment xml:lang="zh_CN">KChart 图表</comment>
- <comment xml:lang="zh_TW">KChart 圖表</comment>
+ <comment xml:lang="zh-CN">KChart 图表</comment>
+ <comment xml:lang="zh-TW">KChart 圖表</comment>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="60">
- <match value="\037\213" type="string" offset="0">
- <match value="KOffice" type="string" offset="10">
- <match value="application/x-kchart\004\006" type="string" offset="18"/>
+ <match type="string" value="\037\213" offset="0">
+ <match type="string" value="KOffice" offset="10">
+ <match type="string" value="application/x-kchart\004\006" offset="18"/>
</match>
</match>
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/x-kchart" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/x-kchart" offset="38"/>
</match>
</match>
</magic>
<glob pattern="*.chrt"/>
</mime-type>
<mime-type type="application/x-kexi-connectiondata">
- <comment>Kexi settings for database server connection</comment>
- <comment xml:lang="ar">إعدادات Kexi للإتصال بخادم قاعدة البيانات</comment>
- <comment xml:lang="bg">Връзка към база от данни — Kexi</comment>
- <comment xml:lang="ca">ajusts de Kexi per a la connexió al servidor de bases de dades</comment>
- <comment xml:lang="cs">nastavení Kexi ke spojení s databázovým serverem</comment>
- <comment xml:lang="da">Kexiopsætning til forbindelsen for databaseserveren</comment>
- <comment xml:lang="de">Kexi-Einstellungen für Verbindung zum Datenbankserver</comment>
- <comment xml:lang="el">Ρυθμίσεις Kexi για σύνδεση με εξυπηρετητή βάσεων δεδομένων</comment>
- <comment xml:lang="en_GB">Kexi settings for database server connection</comment>
- <comment xml:lang="es">configuración de Kexi para conectar con un servidor de bases de datos</comment>
- <comment xml:lang="eu">Kexi-ren ezarpenak datu-basearen zerbitzariarekin konektatzeko</comment>
- <comment xml:lang="fi">Kexi-tietokantayhteysasetukset</comment>
- <comment xml:lang="fo">Kexi stillingar fyri dátustovnsambætara sambinding</comment>
- <comment xml:lang="fr">paramètres Kexi pour connexion au serveur de base de données</comment>
- <comment xml:lang="ga">socruithe Kexi do cheangal le freastalaí bunachair sonraí</comment>
- <comment xml:lang="gl">configuración de Kexi para conexión con servidor de base de datos </comment>
- <comment xml:lang="he">הגדרות של Kexi עבור חיבור שרת למסד נתונים</comment>
- <comment xml:lang="hr">Kexi postavke za povezeivanje baza podataka poslužitelja</comment>
- <comment xml:lang="hu">Kexi beállítások adatbáziskiszolgáló-kapcsolathoz</comment>
- <comment xml:lang="ia">Configuration Kexi pro connexion al servitor de base de datos</comment>
- <comment xml:lang="id">Tatanan Kexi bagi koneksi server basis data</comment>
- <comment xml:lang="it">Impostazioni Kexi per connessione a server di database</comment>
- <comment xml:lang="ja">データベースサーバ接続用の Kexi 設定</comment>
- <comment xml:lang="kk">Дерекқор серверге байланыс Kexi баптаулары</comment>
- <comment xml:lang="ko">Kexi 데이터베이스 서버 연결 설정</comment>
- <comment xml:lang="lt">Kexi duomenų bazės ryšio su serveriu parametrai</comment>
- <comment xml:lang="lv">Kexi iestatījumi datubāzes servera savienojumam</comment>
- <comment xml:lang="nl">Kexi instellingen voor database server connectie</comment>
- <comment xml:lang="oc">paramètres Kexi per connexion al servidor de banca de donadas</comment>
- <comment xml:lang="pl">Ustawienia Kexi dla połączenia serwera bazy danych</comment>
- <comment xml:lang="pt">definições Kexi para ligação de servidor de base de dados</comment>
- <comment xml:lang="pt_BR">Configurações do Kexi para conexão a servidor de banco de dados</comment>
- <comment xml:lang="ro">Configurări Kexi pentru conexiunea la serverul de baze de date</comment>
- <comment xml:lang="ru">Параметры Kexi для подключения к серверу БД</comment>
- <comment xml:lang="sk">Nastavenia Kexi pre pripojenie k databázovému serveru</comment>
- <comment xml:lang="sl">Strežniška povezava do nastavitvene datoteke Kexi.</comment>
- <comment xml:lang="sr">подешавања Кексија за везу са сервером базе података</comment>
- <comment xml:lang="sv">Kexi-inställningar för anslutning till databasserver</comment>
- <comment xml:lang="tr">Veritabanı sunucu bağlantısı için Kexi ayarları</comment>
- <comment xml:lang="uk">параметри Kexi для встановлення з’єднання з сервером бази даних</comment>
- <comment xml:lang="zh_CN">Kexi 数据库服务器连接设置</comment>
- <comment xml:lang="zh_TW">Kexi 設定值 (資料庫伺服器連線用)</comment>
+ <comment>Kexi settings</comment>
+ <comment xml:lang="bg">Настройки — Kexi</comment>
+ <comment xml:lang="ca">ajusts de Kexi</comment>
+ <comment xml:lang="da">Kexi-indstillinger</comment>
+ <comment xml:lang="de">Kexi-Einstellungen</comment>
+ <comment xml:lang="en-GB">Kexi settings</comment>
+ <comment xml:lang="es">configuración de Kexi</comment>
+ <comment xml:lang="eu">Kexi ezarpenak</comment>
+ <comment xml:lang="fi">Kexi-asetukset</comment>
+ <comment xml:lang="fr">réglages Kexi</comment>
+ <comment xml:lang="hr">Kexi postavke</comment>
+ <comment xml:lang="hu">Kexi beállítások</comment>
+ <comment xml:lang="id">Pengaturan Kexi</comment>
+ <comment xml:lang="it">Impostazioni Kexi</comment>
+ <comment xml:lang="kk">Kexi баптаулары</comment>
+ <comment xml:lang="ko">Kexi 설정</comment>
+ <comment xml:lang="pl">Ustawienia Kexi</comment>
+ <comment xml:lang="pt-BR">Configurações do Kexi</comment>
+ <comment xml:lang="ru">Файл настроек Kexi</comment>
+ <comment xml:lang="sk">Nastavenia Kexi</comment>
+ <comment xml:lang="sl">Nastavitve Kexi</comment>
+ <comment xml:lang="sv">Kexi-inställningar</comment>
+ <comment xml:lang="tr">Kexi ayarları</comment>
+ <comment xml:lang="uk">параметри Kexi</comment>
+ <comment xml:lang="zh-CN">Kexi 设置</comment>
+ <comment xml:lang="zh-TW">Kexi 設定</comment>
<glob pattern="*.kexic"/>
</mime-type>
<mime-type type="application/x-kexiproject-shortcut">
- <comment>shortcut to Kexi project on database server</comment>
- <comment xml:lang="ar">اختصار لمشروع Kexi على خادم قاعدة بيانات</comment>
- <comment xml:lang="bg">Връзка към проект — Kexi</comment>
- <comment xml:lang="ca">drecera al projecte de Kexi en un servidor de base de dades</comment>
- <comment xml:lang="cs">zástupce projektu Kexi na databázovém serveru</comment>
- <comment xml:lang="da">genvej til Kexiprojekt på databaseserver</comment>
- <comment xml:lang="de">Schnellzugriff zum Kexi-Projekt auf dem Datenbankserver</comment>
- <comment xml:lang="el">Συντόμευση σε έργο Kexi στον εξυπηρετητή βάσης δεδομένων</comment>
- <comment xml:lang="en_GB">shortcut to Kexi project on database server</comment>
- <comment xml:lang="es">acceso directo a proyecto Kexi en el servidor de bases de datos</comment>
- <comment xml:lang="eu">lasterbidea datu-basearen zerbitzariko Kexi proiekturako</comment>
- <comment xml:lang="fi">pikakuvake tietokantapalvelimella olevaan Kexi-projektiin</comment>
- <comment xml:lang="fo">snarvegur til Kexi verkætlan á dátustovnsambætara</comment>
- <comment xml:lang="fr">raccourci vers projet Kexi sur serveur de base de données</comment>
- <comment xml:lang="ga">aicearra go tionscadal Kexi ar fhreastalaí bunachair sonraí</comment>
- <comment xml:lang="gl">acceso directo a proxecto Kexi no servidor de bases de datos</comment>
- <comment xml:lang="he">קיצור דרך לפרוירט Kexi בשרת נתונים</comment>
- <comment xml:lang="hr">Prečac do Kexi projekta na poslužitelju baze podataka</comment>
- <comment xml:lang="hu">indítóikon adatbázis-kiszolgálón lévő Kexi projektre</comment>
- <comment xml:lang="ia">Ligamine a projecto Kexi in servitor de base de datos</comment>
- <comment xml:lang="id">pintasan ke projek Kexi pada server basis data</comment>
- <comment xml:lang="it">Scorciatoia a progetto Kexi su server di database</comment>
- <comment xml:lang="ja">データベースサーバの Kexi プロジェクトへのショートカット</comment>
- <comment xml:lang="kk">дерекқор серверіндегі Kexi жобасына сілтеме</comment>
- <comment xml:lang="ko">데이터베이스 서버의 Kexi 프로젝트 바로 가기</comment>
- <comment xml:lang="lt">nuoroda į Kexi projektą duomenų bazės serveryje</comment>
- <comment xml:lang="lv">īsceļš uz Kexi projektu datubāzes serverī</comment>
- <comment xml:lang="nl">shortcut naar Kexi project op database server</comment>
- <comment xml:lang="oc">acorchi cap a projècte Kexi sus servidor de banca de donadas</comment>
- <comment xml:lang="pl">Skrót do projektu Kexi na serwerze bazy danych</comment>
- <comment xml:lang="pt">atalho para projeto Kexi em servidor de base de dados</comment>
- <comment xml:lang="pt_BR">Atalho para projeto Kexi no servidor de banco de dados</comment>
- <comment xml:lang="ro">scurtătură către un proiect Kexi pe un server de baze de date</comment>
- <comment xml:lang="ru">Ссылка на проект Kexi на сервере БД</comment>
- <comment xml:lang="sk">Zástupca projektu Kexi na databázovom serveri</comment>
- <comment xml:lang="sl">bližnjica do Kexi projekta na podatkovnem strežniku</comment>
- <comment xml:lang="sr">пречица до пројекта Кексија на серверу базе података</comment>
- <comment xml:lang="sv">genväg till Kexi-projekt på databasserver</comment>
- <comment xml:lang="tr">veritabanı üzerindeki Kexi projesine kısayol</comment>
- <comment xml:lang="uk">скорочення для проекту Kexi на сервері бази даних</comment>
- <comment xml:lang="zh_CN">数据库服务器上 Kexi 项目的快捷方式</comment>
- <comment xml:lang="zh_TW">資料庫伺服器上 Kexi 專案的捷徑</comment>
+ <comment>Kexi shortcut</comment>
+ <comment xml:lang="bg">Ускорител — Kexi</comment>
+ <comment xml:lang="ca">drecera de Kexi</comment>
+ <comment xml:lang="da">Kexi-genvej</comment>
+ <comment xml:lang="de">Kexi-Verweis</comment>
+ <comment xml:lang="en-GB">Kexi shortcut</comment>
+ <comment xml:lang="es">atajo de Kexi</comment>
+ <comment xml:lang="eu">Kexi lasterbidea</comment>
+ <comment xml:lang="fi">KEXI-pikakuvake</comment>
+ <comment xml:lang="fr">raccourci Kexi</comment>
+ <comment xml:lang="hr">Kexi prečac</comment>
+ <comment xml:lang="hu">Kexi parancsiko</comment>
+ <comment xml:lang="id">Pintasan Kexi</comment>
+ <comment xml:lang="it">Scorciatoia Kexi</comment>
+ <comment xml:lang="kk">Kexi жарлығы</comment>
+ <comment xml:lang="ko">Kexi 바로 가기</comment>
+ <comment xml:lang="pl">Skrót Kexi</comment>
+ <comment xml:lang="pt-BR">Atalho do Kexi</comment>
+ <comment xml:lang="ru">Ссылка Kexi</comment>
+ <comment xml:lang="sk">Odkaz Kexi</comment>
+ <comment xml:lang="sv">Kexi-genväg</comment>
+ <comment xml:lang="tr">Kexi kısayolu</comment>
+ <comment xml:lang="uk">скорочення Kexi</comment>
+ <comment xml:lang="zh-CN">Kexi 快捷方式</comment>
+ <comment xml:lang="zh-TW">Kexi 捷徑</comment>
<glob pattern="*.kexis"/>
</mime-type>
<mime-type type="application/x-kexiproject-sqlite2">
- <comment>Kexi database file-based project</comment>
- <comment xml:lang="ar">مشروع قاعدة بيانات Kexi يعتمد على ملفات</comment>
- <comment xml:lang="bg">Проект с база от данни — Kexi</comment>
- <comment xml:lang="ca">projecte basat en fitxer de base de dades de Kexi</comment>
- <comment xml:lang="cs">projekt založený na souboru databáze Kexi</comment>
- <comment xml:lang="da">Filbaseret projekt for Kexidatabase</comment>
- <comment xml:lang="de">Dateibasiertes Kexi-Datenbankprojekt</comment>
- <comment xml:lang="el">Έργο βάσης δεδομένων Kexi βασισμένο σε αρχεία </comment>
- <comment xml:lang="en_GB">Kexi database file-based project</comment>
- <comment xml:lang="es">proyecto de base de datos basada en archivos de Kexi</comment>
- <comment xml:lang="eu">Kexi datu-baseko fitxategian oinarritutako proiektua</comment>
- <comment xml:lang="fi">Kexin tiedostoperustainen tietokantaprojekti</comment>
- <comment xml:lang="fo">Kexi dátustovns fílugrundað verkætlan</comment>
- <comment xml:lang="fr">projet de base de données Kexi en mode fichier</comment>
- <comment xml:lang="ga">tionscadal bunachair sonraí Kexi bunaithe ar chomhaid</comment>
- <comment xml:lang="gl">proxecto baseado no ficheiro-base de datos Kexi</comment>
- <comment xml:lang="he">מיזם מסד נתונים מבוסס-קובץ של Kexi</comment>
- <comment xml:lang="hr">Kexi baza podataka datotekom temeljen projekt</comment>
- <comment xml:lang="hu">Kexi adatbázisfájl-alapú projekt</comment>
- <comment xml:lang="ia">Projecto de base de datos Kexi in modo file</comment>
- <comment xml:lang="id">Projek berbasis berkas basis data Kexi</comment>
- <comment xml:lang="it">Progetto su file di database Kexi</comment>
- <comment xml:lang="ja">Kexi データベース ファイルベースプロジェクト</comment>
- <comment xml:lang="kk">Файл негізінде жоба үшін Kexi дерекқоры</comment>
- <comment xml:lang="ko">Kexi 데이터베이스 파일 기반 프로젝트</comment>
- <comment xml:lang="lt">Kexi duomenų bazės failo tipo projektas</comment>
- <comment xml:lang="lv">Kexi datubāzes datnes balstīts projekts</comment>
- <comment xml:lang="nl">Kexi database bestandgebaseerd project</comment>
- <comment xml:lang="oc">projècte de banca de donadas Kexi en mòde fichièr</comment>
- <comment xml:lang="pl">Projekt bazy danych Kexi na podstawie plików</comment>
- <comment xml:lang="pt">projeto Kexi em base de dados baseada em ficheiros</comment>
- <comment xml:lang="pt_BR">Projeto de banco de dados baseado em arquivo do Kexi</comment>
- <comment xml:lang="ro">Proiect bazat pe fișiere al bazei de date Kexi</comment>
- <comment xml:lang="ru">Файловый проект базы данных Kexi</comment>
- <comment xml:lang="sk">Projekt databázy Kexi s úložiskom typu súbor</comment>
- <comment xml:lang="sl">Datoteka projekta podatkovne zbirke Kexi</comment>
- <comment xml:lang="sr">пројекат Кексијеве базе података на основу датотеке</comment>
- <comment xml:lang="sv">Kexi-databas för filbaserat projekt</comment>
- <comment xml:lang="tr">Dosya temelli Kexi veritabanı projesi</comment>
- <comment xml:lang="uk">проект файлової бази даних Kexi</comment>
- <comment xml:lang="zh_CN">Kexi 基于文件的数据库项目</comment>
- <comment xml:lang="zh_TW">Kexi 資料庫檔案基礎專案</comment>
+ <comment>Kexi database file</comment>
+ <comment xml:lang="bg">База от данни — Kexi</comment>
+ <comment xml:lang="ca">fitxer de base de dades de Kexi</comment>
+ <comment xml:lang="da">Kexi database-fil</comment>
+ <comment xml:lang="de">Kexi-Datenbankdatei</comment>
+ <comment xml:lang="en-GB">Kexi database file</comment>
+ <comment xml:lang="es">archivo de base de datos de Kexi</comment>
+ <comment xml:lang="eu">Kexi datu-base fitxategia</comment>
+ <comment xml:lang="fi">KEXI-tietokanta</comment>
+ <comment xml:lang="fr">fichier de base de données Kexi</comment>
+ <comment xml:lang="hr">Kexi datoteka baze podataka</comment>
+ <comment xml:lang="hu">Kexi adatbázisfájl</comment>
+ <comment xml:lang="id">Berkas basis data Kexi</comment>
+ <comment xml:lang="it">File database Kexi</comment>
+ <comment xml:lang="kk">Kexi дерекқор файлы</comment>
+ <comment xml:lang="ko">Kexi 데이터베이스 파일</comment>
+ <comment xml:lang="pl">Plik bazy danych Kexi</comment>
+ <comment xml:lang="pt-BR">Arquivo de banco de dados do Kexi</comment>
+ <comment xml:lang="ru">Файл базы данных Kexi</comment>
+ <comment xml:lang="sk">Súbor databázy Kexi</comment>
+ <comment xml:lang="sv">Kexi-databasfil</comment>
+ <comment xml:lang="tr">Kexi veri tabanı dosyası</comment>
+ <comment xml:lang="uk">файл бази даних Kexi</comment>
+ <comment xml:lang="zh-CN">Kexi 数据库文件</comment>
+ <comment xml:lang="zh-TW">Kexi 資料庫檔案</comment>
<sub-class-of type="application/x-sqlite2"/>
<glob pattern="*.kexi"/>
</mime-type>
<mime-type type="application/x-kexiproject-sqlite3">
- <comment>Kexi database file-based project</comment>
- <comment xml:lang="ar">مشروع قاعدة بيانات Kexi يعتمد على ملفات</comment>
- <comment xml:lang="bg">Проект с база от данни — Kexi</comment>
- <comment xml:lang="ca">projecte basat en fitxer de base de dades de Kexi</comment>
- <comment xml:lang="cs">projekt založený na souboru databáze Kexi</comment>
- <comment xml:lang="da">Filbaseret projekt for Kexidatabase</comment>
- <comment xml:lang="de">Dateibasiertes Kexi-Datenbankprojekt</comment>
- <comment xml:lang="el">Έργο βάσης δεδομένων Kexi βασισμένο σε αρχεία </comment>
- <comment xml:lang="en_GB">Kexi database file-based project</comment>
- <comment xml:lang="es">proyecto de base de datos basada en archivos de Kexi</comment>
- <comment xml:lang="eu">Kexi datu-baseko fitxategian oinarritutako proiektua</comment>
- <comment xml:lang="fi">Kexin tiedostoperustainen tietokantaprojekti</comment>
- <comment xml:lang="fo">Kexi dátustovns fílugrundað verkætlan</comment>
- <comment xml:lang="fr">projet de base de données Kexi en mode fichier</comment>
- <comment xml:lang="ga">tionscadal bunachair sonraí Kexi bunaithe ar chomhaid</comment>
- <comment xml:lang="gl">proxecto baseado no ficheiro-base de datos Kexi</comment>
- <comment xml:lang="he">מיזם מסד נתונים מבוסס-קובץ של Kexi</comment>
- <comment xml:lang="hr">Kexi baza podataka datotekom temeljen projekt</comment>
- <comment xml:lang="hu">Kexi adatbázisfájl-alapú projekt</comment>
- <comment xml:lang="ia">Projecto de base de datos Kexi in modo file</comment>
- <comment xml:lang="id">Projek berbasis berkas basis data Kexi</comment>
- <comment xml:lang="it">Progetto su file di database Kexi</comment>
- <comment xml:lang="ja">Kexi データベース ファイルベースプロジェクト</comment>
- <comment xml:lang="kk">Файл негізінде жоба үшін Kexi дерекқоры</comment>
- <comment xml:lang="ko">Kexi 데이터베이스 파일 기반 프로젝트</comment>
- <comment xml:lang="lt">Kexi duomenų bazės failo tipo projektas</comment>
- <comment xml:lang="lv">Kexi datubāzes datnes balstīts projekts</comment>
- <comment xml:lang="nl">Kexi database bestandgebaseerd project</comment>
- <comment xml:lang="oc">projècte de banca de donadas Kexi en mòde fichièr</comment>
- <comment xml:lang="pl">Projekt bazy danych Kexi na podstawie plików</comment>
- <comment xml:lang="pt">projeto Kexi em base de dados baseada em ficheiros</comment>
- <comment xml:lang="pt_BR">Projeto de banco de dados baseado em arquivo do Kexi</comment>
- <comment xml:lang="ro">Proiect bazat pe fișiere al bazei de date Kexi</comment>
- <comment xml:lang="ru">Файловый проект базы данных Kexi</comment>
- <comment xml:lang="sk">Projekt databázy Kexi s úložiskom typu súbor</comment>
- <comment xml:lang="sl">Datoteka projekta podatkovne zbirke Kexi</comment>
- <comment xml:lang="sr">пројекат Кексијеве базе података на основу датотеке</comment>
- <comment xml:lang="sv">Kexi-databas för filbaserat projekt</comment>
- <comment xml:lang="tr">Dosya temelli Kexi veritabanı projesi</comment>
- <comment xml:lang="uk">проект файлової бази даних Kexi</comment>
- <comment xml:lang="zh_CN">Kexi 基于文件的数据库项目</comment>
- <comment xml:lang="zh_TW">Kexi 資料庫檔案基礎專案</comment>
- <sub-class-of type="application/x-sqlite3"/>
+ <comment>Kexi database file</comment>
+ <comment xml:lang="bg">База от данни — Kexi</comment>
+ <comment xml:lang="ca">fitxer de base de dades de Kexi</comment>
+ <comment xml:lang="da">Kexi database-fil</comment>
+ <comment xml:lang="de">Kexi-Datenbankdatei</comment>
+ <comment xml:lang="en-GB">Kexi database file</comment>
+ <comment xml:lang="es">archivo de base de datos de Kexi</comment>
+ <comment xml:lang="eu">Kexi datu-base fitxategia</comment>
+ <comment xml:lang="fi">KEXI-tietokanta</comment>
+ <comment xml:lang="fr">fichier de base de données Kexi</comment>
+ <comment xml:lang="hr">Kexi datoteka baze podataka</comment>
+ <comment xml:lang="hu">Kexi adatbázisfájl</comment>
+ <comment xml:lang="id">Berkas basis data Kexi</comment>
+ <comment xml:lang="it">File database Kexi</comment>
+ <comment xml:lang="kk">Kexi дерекқор файлы</comment>
+ <comment xml:lang="ko">Kexi 데이터베이스 파일</comment>
+ <comment xml:lang="pl">Plik bazy danych Kexi</comment>
+ <comment xml:lang="pt-BR">Arquivo de banco de dados do Kexi</comment>
+ <comment xml:lang="ru">Файл базы данных Kexi</comment>
+ <comment xml:lang="sk">Súbor databázy Kexi</comment>
+ <comment xml:lang="sv">Kexi-databasfil</comment>
+ <comment xml:lang="tr">Kexi veri tabanı dosyası</comment>
+ <comment xml:lang="uk">файл бази даних Kexi</comment>
+ <comment xml:lang="zh-CN">Kexi 数据库文件</comment>
+ <comment xml:lang="zh-TW">Kexi 資料庫檔案</comment>
+ <sub-class-of type="application/vnd.sqlite3"/>
<glob pattern="*.kexi"/>
<alias type="application/x-vnd.kde.kexi"/>
<alias type="application/x-kexiproject-sqlite"/>
</mime-type>
<mime-type type="application/x-kformula">
<comment>KFormula formula</comment>
+ <comment xml:lang="af">KFormula-formule</comment>
<comment xml:lang="ar">صيغة KFormula</comment>
- <comment xml:lang="be@latin">Formuła KFormula</comment>
+ <comment xml:lang="be-Latn">Formuła KFormula</comment>
<comment xml:lang="bg">Формула — KFormula</comment>
<comment xml:lang="ca">fórmula de KFormula</comment>
<comment xml:lang="cs">vzorec KFormula</comment>
<comment xml:lang="da">KFormula-formel</comment>
<comment xml:lang="de">KFormula-Formel</comment>
<comment xml:lang="el">Μαθηματικός τύπος KFormula</comment>
- <comment xml:lang="en_GB">KFormula formula</comment>
+ <comment xml:lang="en-GB">KFormula formula</comment>
<comment xml:lang="eo">KFormula-formulo</comment>
<comment xml:lang="es">fórmula de KFormula</comment>
<comment xml:lang="eu">KFormula formula</comment>
<comment xml:lang="fi">KFormula-kaava</comment>
<comment xml:lang="fo">KFormula frymil</comment>
<comment xml:lang="fr">formule KFormula</comment>
+ <comment xml:lang="fur">formule KFormula</comment>
<comment xml:lang="ga">foirmle KFormula</comment>
<comment xml:lang="gl">fórmula de KFormula</comment>
<comment xml:lang="he">נוסחת KFormula</comment>
@@ -13943,7 +14496,7 @@
<comment xml:lang="oc">formula KFormula</comment>
<comment xml:lang="pl">Formuła KFormula</comment>
<comment xml:lang="pt">fórmula KFormula</comment>
- <comment xml:lang="pt_BR">Fórmula do KFormula</comment>
+ <comment xml:lang="pt-BR">Fórmula do KFormula</comment>
<comment xml:lang="ro">Formulă KFormula</comment>
<comment xml:lang="ru">Формула KFormula</comment>
<comment xml:lang="sk">Vzorec KFormula</comment>
@@ -13954,18 +14507,18 @@
<comment xml:lang="tr">KFormula formülü</comment>
<comment xml:lang="uk">формула KFormula</comment>
<comment xml:lang="vi">Công thức KFormula</comment>
- <comment xml:lang="zh_CN">KFormula 公式</comment>
- <comment xml:lang="zh_TW">KFormula 公式</comment>
+ <comment xml:lang="zh-CN">KFormula 公式</comment>
+ <comment xml:lang="zh-TW">KFormula 公式</comment>
<generic-icon name="x-office-document"/>
<magic priority="60">
- <match value="\037\213" type="string" offset="0">
- <match value="KOffice" type="string" offset="10">
- <match value="application/x-kformula\004\006" type="string" offset="18"/>
+ <match type="string" value="\037\213" offset="0">
+ <match type="string" value="KOffice" offset="10">
+ <match type="string" value="application/x-kformula\004\006" offset="18"/>
</match>
</match>
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/x-kformula" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/x-kformula" offset="38"/>
</match>
</match>
</magic>
@@ -13973,21 +14526,23 @@
</mime-type>
<mime-type type="application/x-killustrator">
<comment>KIllustrator drawing</comment>
+ <comment xml:lang="af">KIllustrator-tekening</comment>
<comment xml:lang="ar">تصميم KIllustrator</comment>
- <comment xml:lang="be@latin">Rysunak KIllustrator</comment>
+ <comment xml:lang="be-Latn">Rysunak KIllustrator</comment>
<comment xml:lang="bg">Чертеж — KIllustrator</comment>
<comment xml:lang="ca">dibuix de KIllustrator</comment>
<comment xml:lang="cs">kresba KIllustrator</comment>
<comment xml:lang="da">KIllustrator-tegning</comment>
<comment xml:lang="de">KIllustrator-Zeichnung</comment>
<comment xml:lang="el">Σχέδιο KIllustrator</comment>
- <comment xml:lang="en_GB">KIllustrator drawing</comment>
+ <comment xml:lang="en-GB">KIllustrator drawing</comment>
<comment xml:lang="eo">KIllustrator-grafikaĵo</comment>
<comment xml:lang="es">dibujo de KIllustrator</comment>
<comment xml:lang="eu">KIllustrator marrazkia</comment>
<comment xml:lang="fi">KIllustrator-piirros</comment>
<comment xml:lang="fo">KIllustrator tekning</comment>
<comment xml:lang="fr">dessin KIllustrator</comment>
+ <comment xml:lang="fur">dissen KIllustrator</comment>
<comment xml:lang="ga">líníocht KIllustrator</comment>
<comment xml:lang="gl">debuxo de KIllustrator</comment>
<comment xml:lang="he">ציור KIllustrator</comment>
@@ -14008,7 +14563,7 @@
<comment xml:lang="oc">dessenh KIllustrator</comment>
<comment xml:lang="pl">Rysunek KIllustrator</comment>
<comment xml:lang="pt">desenho KIllustrator</comment>
- <comment xml:lang="pt_BR">Desenho do KIllustrator</comment>
+ <comment xml:lang="pt-BR">Desenho do KIllustrator</comment>
<comment xml:lang="ro">Desen KIllustrator</comment>
<comment xml:lang="ru">Рисунок KIllustrator</comment>
<comment xml:lang="sk">Kresba KIllustrator</comment>
@@ -14019,13 +14574,13 @@
<comment xml:lang="tr">KIllustrator çizimi</comment>
<comment xml:lang="uk">малюнок KIllustrator</comment>
<comment xml:lang="vi">Bản vẽ KIllustrator</comment>
- <comment xml:lang="zh_CN">KIllustrator 绘图</comment>
- <comment xml:lang="zh_TW">KIllustrator 繪圖</comment>
+ <comment xml:lang="zh-CN">KIllustrator 绘图</comment>
+ <comment xml:lang="zh-TW">KIllustrator 繪圖</comment>
<generic-icon name="image-x-generic"/>
<magic priority="60">
- <match value="\037\213" type="string" offset="0">
- <match value="KOffice" type="string" offset="10">
- <match value="application/x-killustrator\004\006" type="string" offset="18"/>
+ <match type="string" value="\037\213" offset="0">
+ <match type="string" value="KOffice" offset="10">
+ <match type="string" value="application/x-killustrator\004\006" offset="18"/>
</match>
</match>
</magic>
@@ -14033,21 +14588,23 @@
</mime-type>
<mime-type type="application/x-kivio">
<comment>Kivio flowchart</comment>
+ <comment xml:lang="af">Kivio-vloeidiagram</comment>
<comment xml:lang="ar">قائمة تدفق Kivio</comment>
- <comment xml:lang="be@latin">Blok-schiema Kivio</comment>
+ <comment xml:lang="be-Latn">Blok-schiema Kivio</comment>
<comment xml:lang="bg">Диаграма — Kivio</comment>
<comment xml:lang="ca">diagrama de flux de Kivio</comment>
<comment xml:lang="cs">vývojový diagram Kivio</comment>
<comment xml:lang="da">Kiviorutediagram</comment>
<comment xml:lang="de">Kivio-Flussdiagramm</comment>
<comment xml:lang="el">Διάγραμμα ροής Kivio</comment>
- <comment xml:lang="en_GB">Kivio flowchart</comment>
+ <comment xml:lang="en-GB">Kivio flowchart</comment>
<comment xml:lang="eo">Kivo-fluskemo</comment>
<comment xml:lang="es">diagrama de flujo de Kivio</comment>
<comment xml:lang="eu">Kivio diagrama</comment>
<comment xml:lang="fi">Kivio-vuokaavio</comment>
<comment xml:lang="fo">Kivio leiðarit</comment>
<comment xml:lang="fr">diagramme de flux Kivio</comment>
+ <comment xml:lang="fur">diagram di flus Kivio</comment>
<comment xml:lang="ga">sreabhchairt Kivio</comment>
<comment xml:lang="gl">gráfica de fluxo de Kivio</comment>
<comment xml:lang="he">תרשים זרימה של Kivio</comment>
@@ -14068,7 +14625,7 @@
<comment xml:lang="oc">diagrama de flux Kivio</comment>
<comment xml:lang="pl">Diagram przepływów Kivio</comment>
<comment xml:lang="pt">gráfico de fluxo Kivio</comment>
- <comment xml:lang="pt_BR">Fluxograma do Kivio</comment>
+ <comment xml:lang="pt-BR">Fluxograma do Kivio</comment>
<comment xml:lang="ro">Diagramă Kivio</comment>
<comment xml:lang="ru">Диаграмма Kivio</comment>
<comment xml:lang="sk">Vývojový diagram Kivio</comment>
@@ -14076,21 +14633,21 @@
<comment xml:lang="sq">Diagramë fluksi Kivio</comment>
<comment xml:lang="sr">Кивиов дијаграм тока</comment>
<comment xml:lang="sv">Kivio-flödesschema</comment>
- <comment xml:lang="tr">Kivio akış şeması</comment>
+ <comment xml:lang="tr">Kivio akış çizgesi</comment>
<comment xml:lang="uk">блок-схема Kivio</comment>
<comment xml:lang="vi">Lược đồ Kivio</comment>
- <comment xml:lang="zh_CN">Kivio 流程图</comment>
- <comment xml:lang="zh_TW">Kivio 圖表</comment>
+ <comment xml:lang="zh-CN">Kivio 流程图</comment>
+ <comment xml:lang="zh-TW">Kivio 流程圖</comment>
<generic-icon name="x-office-document"/>
<magic priority="60">
- <match value="\037\213" type="string" offset="0">
- <match value="KOffice" type="string" offset="10">
- <match value="application/x-kivio\004\006" type="string" offset="18"/>
+ <match type="string" value="\037\213" offset="0">
+ <match type="string" value="KOffice" offset="10">
+ <match type="string" value="application/x-kivio\004\006" offset="18"/>
</match>
</match>
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/x-kivio" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/x-kivio" offset="38"/>
</match>
</match>
</magic>
@@ -14098,21 +14655,23 @@
</mime-type>
<mime-type type="application/x-kontour">
<comment>Kontour drawing</comment>
+ <comment xml:lang="af">Kontour-tekening</comment>
<comment xml:lang="ar">تصميم Kontour</comment>
- <comment xml:lang="be@latin">Rysunak Kontour</comment>
+ <comment xml:lang="be-Latn">Rysunak Kontour</comment>
<comment xml:lang="bg">Чертеж — Kontour</comment>
<comment xml:lang="ca">dibuix de Kontour</comment>
<comment xml:lang="cs">kresba Kontour</comment>
<comment xml:lang="da">Kontourtegning</comment>
<comment xml:lang="de">Kontour-Zeichnung</comment>
<comment xml:lang="el">Σχέδιο Kontour</comment>
- <comment xml:lang="en_GB">Kontour drawing</comment>
+ <comment xml:lang="en-GB">Kontour drawing</comment>
<comment xml:lang="eo">Kontour-grafikaĵo</comment>
<comment xml:lang="es">dibujo de Kontour</comment>
<comment xml:lang="eu">Kontour marrazkia</comment>
<comment xml:lang="fi">Kontour-piirros</comment>
<comment xml:lang="fo">Kontour tekning</comment>
<comment xml:lang="fr">dessin Kontour</comment>
+ <comment xml:lang="fur">dissen Kontour</comment>
<comment xml:lang="ga">líníocht Kontour</comment>
<comment xml:lang="gl">debuxo de Kontour</comment>
<comment xml:lang="he">ציור Kontour</comment>
@@ -14133,7 +14692,7 @@
<comment xml:lang="oc">dessenh Kontour</comment>
<comment xml:lang="pl">Rysunek Kontour</comment>
<comment xml:lang="pt">desenho Kontour</comment>
- <comment xml:lang="pt_BR">Desenho do Kontour</comment>
+ <comment xml:lang="pt-BR">Desenho do Kontour</comment>
<comment xml:lang="ro">Desen Kontour</comment>
<comment xml:lang="ru">Рисунок Kontour</comment>
<comment xml:lang="sk">Kresba Kontour</comment>
@@ -14144,18 +14703,18 @@
<comment xml:lang="tr">Kontour çizimi</comment>
<comment xml:lang="uk">малюнок Kontour</comment>
<comment xml:lang="vi">Bản vẽ Kontour</comment>
- <comment xml:lang="zh_CN">Kontour 绘图</comment>
- <comment xml:lang="zh_TW">Kontour 繪圖</comment>
+ <comment xml:lang="zh-CN">Kontour 绘图</comment>
+ <comment xml:lang="zh-TW">Kontour 繪圖</comment>
<generic-icon name="image-x-generic"/>
<magic priority="60">
- <match value="\037\213" type="string" offset="0">
- <match value="KOffice" type="string" offset="10">
- <match value="application/x-kontour\004\006" type="string" offset="18"/>
+ <match type="string" value="\037\213" offset="0">
+ <match type="string" value="KOffice" offset="10">
+ <match type="string" value="application/x-kontour\004\006" offset="18"/>
</match>
</match>
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/x-kontour" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/x-kontour" offset="38"/>
</match>
</match>
</magic>
@@ -14163,21 +14722,23 @@
</mime-type>
<mime-type type="application/x-kpovmodeler">
<comment>KPovModeler scene</comment>
+ <comment xml:lang="af">KPovModeler-toneel</comment>
<comment xml:lang="ar">مشهد KPovModeler</comment>
- <comment xml:lang="be@latin">Scena KPovModeler</comment>
+ <comment xml:lang="be-Latn">Scena KPovModeler</comment>
<comment xml:lang="bg">Сцена — KPovModeler</comment>
<comment xml:lang="ca">escena de KPovModeler</comment>
<comment xml:lang="cs">scéna KPovModeler</comment>
<comment xml:lang="da">KPovModeler-scene</comment>
<comment xml:lang="de">KPovModeler-Szene</comment>
<comment xml:lang="el">Σκηνή KPovModeler</comment>
- <comment xml:lang="en_GB">KPovModeler scene</comment>
+ <comment xml:lang="en-GB">KPovModeler scene</comment>
<comment xml:lang="eo">KPovModeler-sceno</comment>
<comment xml:lang="es">escena de KPovModeler</comment>
<comment xml:lang="eu">KPovModeler eszena</comment>
<comment xml:lang="fi">KPovModeler-näkymä</comment>
<comment xml:lang="fo">KPovModeler leikmynd</comment>
<comment xml:lang="fr">scène KPovModeler</comment>
+ <comment xml:lang="fur">sene KPovModeler</comment>
<comment xml:lang="ga">radharc KPovModeler</comment>
<comment xml:lang="gl">escena de KPovModeler</comment>
<comment xml:lang="he">סצנת KPovModeler</comment>
@@ -14198,7 +14759,7 @@
<comment xml:lang="oc">scène KPovModeler</comment>
<comment xml:lang="pl">Scena KPovModeler</comment>
<comment xml:lang="pt">cenário KPovModeler</comment>
- <comment xml:lang="pt_BR">Cena do KPovModeler</comment>
+ <comment xml:lang="pt-BR">Cena do KPovModeler</comment>
<comment xml:lang="ro">Scenă KPovModeler</comment>
<comment xml:lang="ru">Сцена KPovModeler</comment>
<comment xml:lang="sk">Scéna KPovModeler</comment>
@@ -14209,28 +14770,30 @@
<comment xml:lang="tr">KPovModeler sahnesi</comment>
<comment xml:lang="uk">сцена KPovModeler</comment>
<comment xml:lang="vi">Cảnh KPovModeler</comment>
- <comment xml:lang="zh_CN">KPovModeler 场景</comment>
- <comment xml:lang="zh_TW">KPovModeler 場景</comment>
+ <comment xml:lang="zh-CN">KPovModeler 场景</comment>
+ <comment xml:lang="zh-TW">KPovModeler 場景</comment>
<generic-icon name="image-x-generic"/>
<glob pattern="*.kpm"/>
</mime-type>
<mime-type type="application/x-kpresenter">
<comment>KPresenter presentation</comment>
+ <comment xml:lang="af">KPresenter-voorlegging</comment>
<comment xml:lang="ar">عرض تقديمي KPresenter</comment>
- <comment xml:lang="be@latin">Prezentacyja KPresenter</comment>
+ <comment xml:lang="be-Latn">Prezentacyja KPresenter</comment>
<comment xml:lang="bg">Презентация — KPresenter</comment>
<comment xml:lang="ca">presentació de KPresenter</comment>
<comment xml:lang="cs">prezentace KPresenter</comment>
<comment xml:lang="da">KPresenter-præsentation</comment>
<comment xml:lang="de">KPresenter-Präsentation</comment>
<comment xml:lang="el">Παρουσίαση KPresenter</comment>
- <comment xml:lang="en_GB">KPresenter presentation</comment>
+ <comment xml:lang="en-GB">KPresenter presentation</comment>
<comment xml:lang="eo">KPresenter-prezentaĵo</comment>
<comment xml:lang="es">presentación de KPresenter</comment>
<comment xml:lang="eu">Kpresenter aurkezpena</comment>
<comment xml:lang="fi">KPresenter-esitys</comment>
<comment xml:lang="fo">KPresenter framløga</comment>
<comment xml:lang="fr">présentation KPresenter</comment>
+ <comment xml:lang="fur">presentazion KPresenter</comment>
<comment xml:lang="ga">láithreoireacht KPresenter</comment>
<comment xml:lang="gl">presentación de KPresenter</comment>
<comment xml:lang="he">מצגת KPresenter</comment>
@@ -14251,7 +14814,7 @@
<comment xml:lang="oc">presentacion KPresenter</comment>
<comment xml:lang="pl">Prezentacja KPresenter</comment>
<comment xml:lang="pt">apresentação KPresenter</comment>
- <comment xml:lang="pt_BR">Apresentação do KPresenter</comment>
+ <comment xml:lang="pt-BR">Apresentação do KPresenter</comment>
<comment xml:lang="ro">Prezentare KPresenter</comment>
<comment xml:lang="ru">Презентация KPresenter</comment>
<comment xml:lang="sk">Prezentácia KPresenter</comment>
@@ -14262,18 +14825,18 @@
<comment xml:lang="tr">KPresenter sunum dosyası</comment>
<comment xml:lang="uk">презентація KPresenter</comment>
<comment xml:lang="vi">Trình diễn KPresenter</comment>
- <comment xml:lang="zh_CN">KPresenter 演示文稿</comment>
- <comment xml:lang="zh_TW">KPresenter 簡報檔</comment>
+ <comment xml:lang="zh-CN">KPresenter 演示文稿</comment>
+ <comment xml:lang="zh-TW">KPresenter 簡報</comment>
<generic-icon name="x-office-presentation"/>
<magic priority="60">
- <match value="\037\213" type="string" offset="0">
- <match value="KOffice" type="string" offset="10">
- <match value="application/x-kpresenter\004\006" type="string" offset="18"/>
+ <match type="string" value="\037\213" offset="0">
+ <match type="string" value="KOffice" offset="10">
+ <match type="string" value="application/x-kpresenter\004\006" offset="18"/>
</match>
</match>
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/x-kpresenter" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/x-kpresenter" offset="38"/>
</match>
</match>
</magic>
@@ -14282,22 +14845,24 @@
</mime-type>
<mime-type type="application/x-krita">
<comment>Krita document</comment>
+ <comment xml:lang="af">Krita-dokument</comment>
<comment xml:lang="ar">مستند Krita</comment>
<comment xml:lang="ast">Documentu de Krita</comment>
- <comment xml:lang="be@latin">Dakument Krita</comment>
+ <comment xml:lang="be-Latn">Dakument Krita</comment>
<comment xml:lang="bg">Документ — Krita</comment>
- <comment xml:lang="ca">document Krita</comment>
+ <comment xml:lang="ca">document de Krita</comment>
<comment xml:lang="cs">dokument Krita</comment>
<comment xml:lang="da">Kritadokument</comment>
<comment xml:lang="de">Krita-Dokument</comment>
<comment xml:lang="el">Έγγραφο Krita</comment>
- <comment xml:lang="en_GB">Krita document</comment>
+ <comment xml:lang="en-GB">Krita document</comment>
<comment xml:lang="eo">Krita-dokumento</comment>
<comment xml:lang="es">documento de Krita</comment>
<comment xml:lang="eu">Krita dokumentua</comment>
<comment xml:lang="fi">Krita-asiakirja</comment>
<comment xml:lang="fo">Krita skjal</comment>
<comment xml:lang="fr">document Krita</comment>
+ <comment xml:lang="fur">document Krita</comment>
<comment xml:lang="ga">cáipéis Krita</comment>
<comment xml:lang="gl">documento de Krita</comment>
<comment xml:lang="he">מסמך Krita</comment>
@@ -14318,7 +14883,7 @@
<comment xml:lang="oc">document Krita</comment>
<comment xml:lang="pl">Dokument Krita</comment>
<comment xml:lang="pt">documento Krita</comment>
- <comment xml:lang="pt_BR">Documento do Krita</comment>
+ <comment xml:lang="pt-BR">Documento do Krita</comment>
<comment xml:lang="ro">Document Krita</comment>
<comment xml:lang="ru">Документ Krita</comment>
<comment xml:lang="sk">Dokument Krita</comment>
@@ -14329,18 +14894,18 @@
<comment xml:lang="tr">Krita belgesi</comment>
<comment xml:lang="uk">документ Krita</comment>
<comment xml:lang="vi">Tài liệu Krita</comment>
- <comment xml:lang="zh_CN">Krita 文档</comment>
- <comment xml:lang="zh_TW">Krita 文件</comment>
+ <comment xml:lang="zh-CN">Krita 文档</comment>
+ <comment xml:lang="zh-TW">Krita 文件</comment>
<generic-icon name="x-office-document"/>
<magic priority="60">
- <match value="\037\213" type="string" offset="0">
- <match value="KOffice" type="string" offset="10">
- <match value="application/x-krita\004\006" type="string" offset="18"/>
+ <match type="string" value="\037\213" offset="0">
+ <match type="string" value="KOffice" offset="10">
+ <match type="string" value="application/x-krita\004\006" offset="18"/>
</match>
</match>
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/x-krita" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/x-krita" offset="38"/>
</match>
</match>
</magic>
@@ -14348,21 +14913,23 @@
</mime-type>
<mime-type type="application/x-kspread">
<comment>KSpread spreadsheet</comment>
+ <comment xml:lang="af">KSpread-sigblad</comment>
<comment xml:lang="ar">جدول KSpread</comment>
- <comment xml:lang="be@latin">Raźlikovy arkuš KSpread</comment>
+ <comment xml:lang="be-Latn">Raźlikovy arkuš KSpread</comment>
<comment xml:lang="bg">Таблица — KSpread</comment>
<comment xml:lang="ca">full de càlcul de KSpread</comment>
<comment xml:lang="cs">sešit KSpread</comment>
<comment xml:lang="da">KSpread-regneark</comment>
<comment xml:lang="de">KSpread-Tabelle</comment>
<comment xml:lang="el">Λογιστικό φύλλο KSpread</comment>
- <comment xml:lang="en_GB">KSpread spreadsheet</comment>
+ <comment xml:lang="en-GB">KSpread spreadsheet</comment>
<comment xml:lang="eo">KSpread-kalkultabelo</comment>
<comment xml:lang="es">hoja de cálculo de KSpread</comment>
<comment xml:lang="eu">KSpread kalkulu-orria</comment>
<comment xml:lang="fi">KSpread-taulukko</comment>
<comment xml:lang="fo">KSpread rokniark</comment>
<comment xml:lang="fr">feuille de calcul KSpread</comment>
+ <comment xml:lang="fur">sfuei di calcul KSpread</comment>
<comment xml:lang="ga">scarbhileog KSpread</comment>
<comment xml:lang="gl">folla de cálculo de KSpread</comment>
<comment xml:lang="he">גליון נתונים של Kspread</comment>
@@ -14383,7 +14950,7 @@
<comment xml:lang="oc">fuèlh de calcul KSpread</comment>
<comment xml:lang="pl">Arkusz KSpread</comment>
<comment xml:lang="pt">folha de cálculo KSpread</comment>
- <comment xml:lang="pt_BR">Planilha do KSpread</comment>
+ <comment xml:lang="pt-BR">Planilha do KSpread</comment>
<comment xml:lang="ro">Foaie de calcul KSpread</comment>
<comment xml:lang="ru">Электронная таблица KSpread</comment>
<comment xml:lang="sk">Zošit KSpread</comment>
@@ -14391,21 +14958,21 @@
<comment xml:lang="sq">Fletë llogaritjesh KSpread</comment>
<comment xml:lang="sr">табела К-табеле</comment>
<comment xml:lang="sv">KSpread-kalkylblad</comment>
- <comment xml:lang="tr">KSpread çalışma sayfası</comment>
+ <comment xml:lang="tr">KSpread hesap çizelgesi</comment>
<comment xml:lang="uk">ел. таблиця KSpread</comment>
<comment xml:lang="vi">Bảng tính KSpread</comment>
- <comment xml:lang="zh_CN">KSpread 电子表格</comment>
- <comment xml:lang="zh_TW">KSpread 試算表</comment>
+ <comment xml:lang="zh-CN">KSpread 电子表格</comment>
+ <comment xml:lang="zh-TW">KSpread 試算表</comment>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="60">
- <match value="\037\213" type="string" offset="0">
- <match value="KOffice" type="string" offset="10">
- <match value="application/x-kspread\004\006" type="string" offset="18"/>
+ <match type="string" value="\037\213" offset="0">
+ <match type="string" value="KOffice" offset="10">
+ <match type="string" value="application/x-kspread\004\006" offset="18"/>
</match>
</match>
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/x-kspread" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/x-kspread" offset="38"/>
</match>
</match>
</magic>
@@ -14413,21 +14980,23 @@
</mime-type>
<mime-type type="application/x-kspread-crypt">
<comment>KSpread spreadsheet (encrypted)</comment>
+ <comment xml:lang="af">KSpread-sigblad (geënkripteer)</comment>
<comment xml:lang="ar">جدول KSpread (مشفر)</comment>
- <comment xml:lang="be@latin">Raźlikovy arkuš KSpread (zašyfravany)</comment>
+ <comment xml:lang="be-Latn">Raźlikovy arkuš KSpread (zašyfravany)</comment>
<comment xml:lang="bg">Таблица — KSpread, шифрирана</comment>
<comment xml:lang="ca">full de càlcul de KSpread (xifrat)</comment>
<comment xml:lang="cs">sešit KSpread (šifrovaný)</comment>
<comment xml:lang="da">KSpread-regneark (krypteret)</comment>
<comment xml:lang="de">KSpread-Tabelle (verschlüsselt)</comment>
<comment xml:lang="el">Λογιστικό φύλλο KSpread (κρυπτογραφημένο)</comment>
- <comment xml:lang="en_GB">KSpread spreadsheet (encrypted)</comment>
+ <comment xml:lang="en-GB">KSpread spreadsheet (encrypted)</comment>
<comment xml:lang="eo">KSpread-kalkultabelo (ĉifrita)</comment>
<comment xml:lang="es">hoja de cálculo de KSpread (cifrada)</comment>
- <comment xml:lang="eu">KSpread kalkulu-orria (enkriptatua)</comment>
+ <comment xml:lang="eu">KSpread kalkulu-orria (zifratuta)</comment>
<comment xml:lang="fi">KSpread-taulukko (salattu)</comment>
<comment xml:lang="fo">KSpread rokniark (bronglað)</comment>
<comment xml:lang="fr">feuille de calcul KSpread (chiffrée)</comment>
+ <comment xml:lang="fur">sfuei di calcul KSpread (cifrât)</comment>
<comment xml:lang="ga">scarbhileog KSpread (criptithe)</comment>
<comment xml:lang="gl">folla de cálculo de KSpread (cifrada)</comment>
<comment xml:lang="he">גליון נתונים של KSpread (מוצפן)</comment>
@@ -14448,7 +15017,7 @@
<comment xml:lang="oc">fuèlh de calcul KSpread (chifrada)</comment>
<comment xml:lang="pl">Arkusz KSpread (zaszyfrowany)</comment>
<comment xml:lang="pt">folha de cálculo KSpread (encriptada)</comment>
- <comment xml:lang="pt_BR">Planilha do KSpread (criptografada)</comment>
+ <comment xml:lang="pt-BR">Planilha do KSpread (criptografada)</comment>
<comment xml:lang="ro">Foaie de calcul KSpread (criptat)</comment>
<comment xml:lang="ru">Электронная таблица KSpread (зашифрованная)</comment>
<comment xml:lang="sk">Zošit KSpread (šifrovaný)</comment>
@@ -14456,32 +15025,33 @@
<comment xml:lang="sq">Fletë llogaritjesh KSpread (e kriptuar)</comment>
<comment xml:lang="sr">табела К-табеле (шифрована)</comment>
<comment xml:lang="sv">KSpread-kalkylblad (krypterat)</comment>
- <comment xml:lang="tr">KSpread çalışma sayfası (şifreli)</comment>
+ <comment xml:lang="tr">KSpread hesap çizelgesi (şifreli)</comment>
<comment xml:lang="uk">ел. таблиця KSpread (зашифрована)</comment>
<comment xml:lang="vi">Bảng tính KSpread (đã mật mã)</comment>
- <comment xml:lang="zh_CN">KSpread 电子表格（加密）</comment>
- <comment xml:lang="zh_TW">KSpread 試算表 (已加密)</comment>
+ <comment xml:lang="zh-CN">KSpread 电子表格（加密）</comment>
+ <comment xml:lang="zh-TW">KSpread 試算表 (加密)</comment>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
- <match value="0x0d1a2702" type="big32" offset="0"/>
+ <match type="big32" value="0x0d1a2702" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-ksysv-package">
<comment>KSysV init package</comment>
<comment xml:lang="ar">حزمة KSysV init</comment>
- <comment xml:lang="be@latin">Inicyjalny pakunak KSysV</comment>
+ <comment xml:lang="be-Latn">Inicyjalny pakunak KSysV</comment>
<comment xml:lang="bg">Пакет — KSysV init</comment>
- <comment xml:lang="ca">paquet d'inici KSysV</comment>
+ <comment xml:lang="ca">paquet de KSysV init</comment>
<comment xml:lang="cs">balíček init KSysV</comment>
<comment xml:lang="da">KSsV init-pakke</comment>
<comment xml:lang="de">KSysV-Init-Paket</comment>
<comment xml:lang="el">Αρχικό πακέτο KSysV</comment>
- <comment xml:lang="en_GB">KSysV init package</comment>
+ <comment xml:lang="en-GB">KSysV init package</comment>
<comment xml:lang="es">paquete de configuración de init para KSysV</comment>
<comment xml:lang="eu">KSysV hasieratzeko paketea</comment>
<comment xml:lang="fi">KSysV init -paketti</comment>
<comment xml:lang="fo">KSysV init pakki</comment>
<comment xml:lang="fr">paquet d'initialisation KSysV</comment>
+ <comment xml:lang="fur">pachet init KSysV</comment>
<comment xml:lang="ga">pacáiste túsaithe KSysV</comment>
<comment xml:lang="gl">paquete de KsysV init</comment>
<comment xml:lang="he">חבילת KSysV init</comment>
@@ -14501,7 +15071,7 @@
<comment xml:lang="oc">paquet d'initializacion KSysV</comment>
<comment xml:lang="pl">Pakiet KSysV init</comment>
<comment xml:lang="pt">pacote inicial KSysV</comment>
- <comment xml:lang="pt_BR">Pacote init do KSysV</comment>
+ <comment xml:lang="pt-BR">Pacote init do KSysV</comment>
<comment xml:lang="ro">Pachet KSysV init</comment>
<comment xml:lang="ru">Пакет инициализации KSysV</comment>
<comment xml:lang="sk">Balíček KSysV init</comment>
@@ -14512,33 +15082,35 @@
<comment xml:lang="tr">KSysV init paketi</comment>
<comment xml:lang="uk">пакунок KSysV init</comment>
<comment xml:lang="vi">Gói sở khởi KSysV</comment>
- <comment xml:lang="zh_CN">KSysV init 软件包</comment>
- <comment xml:lang="zh_TW">KSysV init 軟體包</comment>
+ <comment xml:lang="zh-CN">KSysV init 软件包</comment>
+ <comment xml:lang="zh-TW">KSysV init 軟體包</comment>
<generic-icon name="package-x-generic"/>
<magic priority="50">
- <match value="KSysV" type="string" offset="4">
- <match value="1" type="byte" offset="15"/>
+ <match type="string" value="KSysV" offset="4">
+ <match type="byte" value="1" offset="15"/>
</match>
</magic>
</mime-type>
<mime-type type="application/x-kugar">
<comment>Kugar document</comment>
+ <comment xml:lang="af">Kugar-dokument</comment>
<comment xml:lang="ar">مستند Kugar</comment>
<comment xml:lang="ast">Documentu de Kugar</comment>
- <comment xml:lang="be@latin">Dakument Kugar</comment>
+ <comment xml:lang="be-Latn">Dakument Kugar</comment>
<comment xml:lang="bg">Документ — Kugar</comment>
<comment xml:lang="ca">document Kugar</comment>
<comment xml:lang="cs">dokument Kugar</comment>
<comment xml:lang="da">Kugardokument</comment>
<comment xml:lang="de">Kugar-Dokument</comment>
<comment xml:lang="el">Έγγραφο Kugar</comment>
- <comment xml:lang="en_GB">Kugar document</comment>
+ <comment xml:lang="en-GB">Kugar document</comment>
<comment xml:lang="eo">Kugar-dokumento</comment>
<comment xml:lang="es">documento de Kugar</comment>
<comment xml:lang="eu">Kugar dokumentua</comment>
<comment xml:lang="fi">Kugar-asiakirja</comment>
<comment xml:lang="fo">Kugar skjal</comment>
<comment xml:lang="fr">document Kugar</comment>
+ <comment xml:lang="fur">document Kugar</comment>
<comment xml:lang="ga">cáipéis Kugar</comment>
<comment xml:lang="gl">documento de Kugar</comment>
<comment xml:lang="he">מסמך Kugar</comment>
@@ -14559,7 +15131,7 @@
<comment xml:lang="oc">document Kugar</comment>
<comment xml:lang="pl">Dokument Kuguar</comment>
<comment xml:lang="pt">documento Kugar</comment>
- <comment xml:lang="pt_BR">Documento do Kugar</comment>
+ <comment xml:lang="pt-BR">Documento do Kugar</comment>
<comment xml:lang="ro">Document Kugar</comment>
<comment xml:lang="ru">Документ Kugar</comment>
<comment xml:lang="sk">Dokument Kugar</comment>
@@ -14570,16 +15142,17 @@
<comment xml:lang="tr">Kugar belgesi</comment>
<comment xml:lang="uk">документ Kugar</comment>
<comment xml:lang="vi">Tài liệu Kugar</comment>
- <comment xml:lang="zh_CN">Kugar 文档</comment>
- <comment xml:lang="zh_TW">Kugar 文件</comment>
+ <comment xml:lang="zh-CN">Kugar 文档</comment>
+ <comment xml:lang="zh-TW">Kugar 文件</comment>
<generic-icon name="x-office-document"/>
<glob pattern="*.kud"/>
</mime-type>
<mime-type type="application/x-kword">
<comment>KWord document</comment>
+ <comment xml:lang="af">KWord-dokument</comment>
<comment xml:lang="ar">مستند KWord</comment>
<comment xml:lang="ast">Documentu de Kword</comment>
- <comment xml:lang="be@latin">Dakument KWord</comment>
+ <comment xml:lang="be-Latn">Dakument KWord</comment>
<comment xml:lang="bg">Документ — KWord</comment>
<comment xml:lang="ca">document KWord</comment>
<comment xml:lang="cs">dokument KWord</comment>
@@ -14587,13 +15160,14 @@
<comment xml:lang="da">KWord-dokument</comment>
<comment xml:lang="de">KWord-Dokument</comment>
<comment xml:lang="el">Έγγραφο KWord</comment>
- <comment xml:lang="en_GB">KWord document</comment>
+ <comment xml:lang="en-GB">KWord document</comment>
<comment xml:lang="eo">KWord-dokumento</comment>
<comment xml:lang="es">documento de KWord</comment>
<comment xml:lang="eu">KWord dokumentua</comment>
<comment xml:lang="fi">KWord-asiakirja</comment>
<comment xml:lang="fo">KWord skjal</comment>
<comment xml:lang="fr">document KWord</comment>
+ <comment xml:lang="fur">document KWord</comment>
<comment xml:lang="ga">cáipéis KWord</comment>
<comment xml:lang="gl">documento de KWord</comment>
<comment xml:lang="he">מסמך KWord</comment>
@@ -14614,7 +15188,7 @@
<comment xml:lang="oc">document KWord</comment>
<comment xml:lang="pl">Dokument KWord</comment>
<comment xml:lang="pt">documento KWord</comment>
- <comment xml:lang="pt_BR">Documento do KWord</comment>
+ <comment xml:lang="pt-BR">Documento do KWord</comment>
<comment xml:lang="ro">Document KWord</comment>
<comment xml:lang="ru">Документ KWord</comment>
<comment xml:lang="sk">Dokument KWord</comment>
@@ -14625,18 +15199,18 @@
<comment xml:lang="tr">KWord belgesi</comment>
<comment xml:lang="uk">документ KWord</comment>
<comment xml:lang="vi">Tài liệu KWord</comment>
- <comment xml:lang="zh_CN">KWord 文档</comment>
- <comment xml:lang="zh_TW">KWord 文件</comment>
+ <comment xml:lang="zh-CN">KWord 文档</comment>
+ <comment xml:lang="zh-TW">KWord 文件</comment>
<generic-icon name="x-office-document"/>
<magic priority="60">
- <match value="\037\213" type="string" offset="0">
- <match value="KOffice" type="string" offset="10">
- <match value="application/x-kword\004\006" type="string" offset="18"/>
+ <match type="string" value="\037\213" offset="0">
+ <match type="string" value="KOffice" offset="10">
+ <match type="string" value="application/x-kword\004\006" offset="18"/>
</match>
</match>
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="application/x-kword" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="application/x-kword" offset="38"/>
</match>
</match>
</magic>
@@ -14645,22 +15219,24 @@
</mime-type>
<mime-type type="application/x-kword-crypt">
<comment>KWord document (encrypted)</comment>
+ <comment xml:lang="af">KWord-dokument (geënkripteer)</comment>
<comment xml:lang="ar">مستند KWord (مشفر)</comment>
<comment xml:lang="ast">Documentu de Kword (cifráu)</comment>
- <comment xml:lang="be@latin">Dakument KWord (zašyfravany)</comment>
+ <comment xml:lang="be-Latn">Dakument KWord (zašyfravany)</comment>
<comment xml:lang="bg">Документ — KWord, шифриран</comment>
<comment xml:lang="ca">document KWord (xifrat)</comment>
<comment xml:lang="cs">dokument KWord (šifrovaný)</comment>
<comment xml:lang="da">KWord-dokument (krypteret)</comment>
<comment xml:lang="de">KWord-Dokument (verschlüsselt)</comment>
<comment xml:lang="el">Έγγραφο KWord (κρυπτογραφημένο)</comment>
- <comment xml:lang="en_GB">KWord document (encrypted)</comment>
+ <comment xml:lang="en-GB">KWord document (encrypted)</comment>
<comment xml:lang="eo">KWord-dokumento (ĉifrita)</comment>
<comment xml:lang="es">documento de KWord (cifrado)</comment>
- <comment xml:lang="eu">KWord dokumentua (enkriptatua)</comment>
+ <comment xml:lang="eu">KWord dokumentua (zifratuta)</comment>
<comment xml:lang="fi">KWord-asiakirja (salattu)</comment>
<comment xml:lang="fo">KWord skjal (bronglað)</comment>
<comment xml:lang="fr">document KWord (chiffré)</comment>
+ <comment xml:lang="fur">document KWord (cifrât)</comment>
<comment xml:lang="ga">cáipéis KWord (criptithe)</comment>
<comment xml:lang="gl">documento de KWord (cifrado)</comment>
<comment xml:lang="he">מסמך KWord (מוצפן)</comment>
@@ -14681,7 +15257,7 @@
<comment xml:lang="oc">document KWord (chifrat)</comment>
<comment xml:lang="pl">Dokument KWord (zaszyfrowany)</comment>
<comment xml:lang="pt">documento KWord (encriptado)</comment>
- <comment xml:lang="pt_BR">Documento do KWord (criptografado)</comment>
+ <comment xml:lang="pt-BR">Documento do KWord (criptografado)</comment>
<comment xml:lang="ro">Document KWord (criptat)</comment>
<comment xml:lang="ru">Документ KWord (зашифрованный)</comment>
<comment xml:lang="sk">Dokument KWord (šifrovaný)</comment>
@@ -14692,18 +15268,19 @@
<comment xml:lang="tr">KWord belgesi (şifreli)</comment>
<comment xml:lang="uk">документ KWord (зашифрований)</comment>
<comment xml:lang="vi">Tài liệu KWord (đã mật mã)</comment>
- <comment xml:lang="zh_CN">KWord 文档（加密）</comment>
- <comment xml:lang="zh_TW">KWord 文件 (已加密)</comment>
+ <comment xml:lang="zh-CN">KWord 文档（加密）</comment>
+ <comment xml:lang="zh-TW">KWord 文件 (加密)</comment>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="0x0d1a2701" type="big32" offset="0"/>
+ <match type="big32" value="0x0d1a2701" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-lha">
<comment>LHA archive</comment>
+ <comment xml:lang="af">LHA-argief</comment>
<comment xml:lang="ar">أرشيف LHA</comment>
<comment xml:lang="az">LHA arxivi</comment>
- <comment xml:lang="be@latin">Archiŭ LHA</comment>
+ <comment xml:lang="be-Latn">Archiŭ LHA</comment>
<comment xml:lang="bg">Архив — LHA</comment>
<comment xml:lang="ca">arxiu LHA</comment>
<comment xml:lang="cs">archiv LHA</comment>
@@ -14711,13 +15288,14 @@
<comment xml:lang="da">LHA-arkiv</comment>
<comment xml:lang="de">LHA-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο LHA</comment>
- <comment xml:lang="en_GB">LHA archive</comment>
+ <comment xml:lang="en-GB">LHA archive</comment>
<comment xml:lang="eo">LHA-arkivo</comment>
<comment xml:lang="es">archivador LHA</comment>
<comment xml:lang="eu">LHA artxiboa</comment>
<comment xml:lang="fi">LHA-arkisto</comment>
<comment xml:lang="fo">LHA skjalasavn</comment>
<comment xml:lang="fr">archive LHA</comment>
+ <comment xml:lang="fur">archivi LHA</comment>
<comment xml:lang="ga">cartlann LHA</comment>
<comment xml:lang="gl">arquivo LHA</comment>
<comment xml:lang="he">ארכיון LHA</comment>
@@ -14738,7 +15316,7 @@
<comment xml:lang="oc">archiu LHA</comment>
<comment xml:lang="pl">Archiwum LHA</comment>
<comment xml:lang="pt">arquivo LHA</comment>
- <comment xml:lang="pt_BR">Pacote LHA</comment>
+ <comment xml:lang="pt-BR">Pacote LHA</comment>
<comment xml:lang="ro">Arhivă LHA</comment>
<comment xml:lang="ru">Архив LHA</comment>
<comment xml:lang="sk">Archív LHA</comment>
@@ -14749,22 +15327,22 @@
<comment xml:lang="tr">LHA arşivi</comment>
<comment xml:lang="uk">архів LHA</comment>
<comment xml:lang="vi">Kho nén LHA</comment>
- <comment xml:lang="zh_CN">LHA 归档文件</comment>
- <comment xml:lang="zh_TW">LHA 封存檔</comment>
+ <comment xml:lang="zh-CN">LHA 归档文件</comment>
+ <comment xml:lang="zh-TW">LHA 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="-lh -" type="string" offset="2"/>
- <match value="-lh0-" type="string" offset="2"/>
- <match value="-lh1-" type="string" offset="2"/>
- <match value="-lh2-" type="string" offset="2"/>
- <match value="-lh3-" type="string" offset="2"/>
- <match value="-lh4-" type="string" offset="2"/>
- <match value="-lh5-" type="string" offset="2"/>
- <match value="-lh40-" type="string" offset="2"/>
- <match value="-lhd-" type="string" offset="2"/>
- <match value="-lz4-" type="string" offset="2"/>
- <match value="-lz5-" type="string" offset="2"/>
- <match value="-lzs-" type="string" offset="2"/>
+ <match type="string" value="-lh -" offset="2"/>
+ <match type="string" value="-lh0-" offset="2"/>
+ <match type="string" value="-lh1-" offset="2"/>
+ <match type="string" value="-lh2-" offset="2"/>
+ <match type="string" value="-lh3-" offset="2"/>
+ <match type="string" value="-lh4-" offset="2"/>
+ <match type="string" value="-lh5-" offset="2"/>
+ <match type="string" value="-lh40-" offset="2"/>
+ <match type="string" value="-lhd-" offset="2"/>
+ <match type="string" value="-lz4-" offset="2"/>
+ <match type="string" value="-lz5-" offset="2"/>
+ <match type="string" value="-lzs-" offset="2"/>
</magic>
<glob pattern="*.lha"/>
<glob pattern="*.lzh"/>
@@ -14772,21 +15350,23 @@
</mime-type>
<mime-type type="application/x-lhz">
<comment>LHZ archive</comment>
+ <comment xml:lang="af">LHZ-argief</comment>
<comment xml:lang="ar">أرشيف LHZ</comment>
- <comment xml:lang="be@latin">Archiŭ LHZ</comment>
+ <comment xml:lang="be-Latn">Archiŭ LHZ</comment>
<comment xml:lang="bg">Архив — LHZ</comment>
<comment xml:lang="ca">arxiu LHZ</comment>
<comment xml:lang="cs">archiv LHZ</comment>
<comment xml:lang="da">LHZ-arkiv</comment>
<comment xml:lang="de">LHZ-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο LHZ</comment>
- <comment xml:lang="en_GB">LHZ archive</comment>
+ <comment xml:lang="en-GB">LHZ archive</comment>
<comment xml:lang="eo">LHZ-arkivo</comment>
<comment xml:lang="es">archivador LHZ</comment>
<comment xml:lang="eu">LHZ artxiboa</comment>
<comment xml:lang="fi">LHZ-arkisto</comment>
<comment xml:lang="fo">LHZ skjalasavn</comment>
<comment xml:lang="fr">archive LHZ</comment>
+ <comment xml:lang="fur">archivi LHZ</comment>
<comment xml:lang="ga">cartlann LHZ</comment>
<comment xml:lang="gl">arquivo LHZ</comment>
<comment xml:lang="he">ארכיון LHZ</comment>
@@ -14807,7 +15387,7 @@
<comment xml:lang="oc">archiu LHZ</comment>
<comment xml:lang="pl">Archiwum LHZ</comment>
<comment xml:lang="pt">arquivo LHZ</comment>
- <comment xml:lang="pt_BR">Pacote LHZ</comment>
+ <comment xml:lang="pt-BR">Pacote LHZ</comment>
<comment xml:lang="ro">Arhivă LHZ</comment>
<comment xml:lang="ru">Архив LHZ</comment>
<comment xml:lang="sk">Archív LHZ</comment>
@@ -14818,28 +15398,30 @@
<comment xml:lang="tr">LHZ arşivi</comment>
<comment xml:lang="uk">архів LHZ</comment>
<comment xml:lang="vi">Kho nén LHZ (LHA đã nén)</comment>
- <comment xml:lang="zh_CN">LHZ 归档文件</comment>
- <comment xml:lang="zh_TW">LHZ 封存檔</comment>
+ <comment xml:lang="zh-CN">LHZ 归档文件</comment>
+ <comment xml:lang="zh-TW">LHZ 封存檔</comment>
<generic-icon name="package-x-generic"/>
<glob pattern="*.lhz"/>
</mime-type>
- <mime-type type="text/vnd.qt.linguist">
+ <mime-type type="text/vnd.trolltech.linguist">
<comment>message catalog</comment>
+ <comment xml:lang="af">boodskaplêer</comment>
<comment xml:lang="ar">كتالوج الرسالة</comment>
- <comment xml:lang="be@latin">kataloh paviedamleńniaŭ</comment>
+ <comment xml:lang="be-Latn">kataloh paviedamleńniaŭ</comment>
<comment xml:lang="bg">Каталог със съобщения</comment>
<comment xml:lang="ca">catàleg de missatges</comment>
<comment xml:lang="cs">katalog zpráv</comment>
<comment xml:lang="da">meddelelseskatalog</comment>
<comment xml:lang="de">Nachrichtenkatalog</comment>
<comment xml:lang="el">Κατάλογος μηνυμάτων</comment>
- <comment xml:lang="en_GB">message catalogue</comment>
+ <comment xml:lang="en-GB">message catalogue</comment>
<comment xml:lang="eo">katalogo de mesaĝoj</comment>
<comment xml:lang="es">catálogo de mensajes</comment>
<comment xml:lang="eu">mezuen katalogoa</comment>
<comment xml:lang="fi">viestiluettelo</comment>
<comment xml:lang="fo">boðskrá</comment>
<comment xml:lang="fr">catalogue de messages</comment>
+ <comment xml:lang="fur">catalic di messaçs</comment>
<comment xml:lang="ga">catalóg theachtaireachtaí</comment>
<comment xml:lang="gl">catálogo de mensaxes</comment>
<comment xml:lang="he">קטלוג הודעות</comment>
@@ -14860,7 +15442,7 @@
<comment xml:lang="oc">catalòg de messatges</comment>
<comment xml:lang="pl">Katalog wiadomości</comment>
<comment xml:lang="pt">catálogo de mensagens</comment>
- <comment xml:lang="pt_BR">Catálogo de mensagens</comment>
+ <comment xml:lang="pt-BR">Catálogo de mensagens</comment>
<comment xml:lang="ro">catalog de mesaje</comment>
<comment xml:lang="ru">Каталог сообщений</comment>
<comment xml:lang="sk">Katalóg správ</comment>
@@ -14871,34 +15453,37 @@
<comment xml:lang="tr">ileti kataloğu</comment>
<comment xml:lang="uk">каталог повідомлень</comment>
<comment xml:lang="vi">phân loại thông điệp</comment>
- <comment xml:lang="zh_CN">消息库</comment>
- <comment xml:lang="zh_TW">訊息目錄</comment>
+ <comment xml:lang="zh-CN">消息库</comment>
+ <comment xml:lang="zh-TW">訊息目錄</comment>
<sub-class-of type="application/xml"/>
<magic>
- <match value="&lt;TS" type="string" offset="0:256"/>
+ <match type="string" value="&lt;TS " offset="0:256"/>
+ <match type="string" value="&lt;TS&gt;" offset="0:256"/>
</magic>
<glob pattern="*.ts"/>
<alias type="application/x-linguist"/>
- <alias type="text/vnd.trolltech.linguist"/>
+ <alias type="text/vnd.qt.linguist"/>
</mime-type>
<mime-type type="application/x-lyx">
<comment>LyX document</comment>
+ <comment xml:lang="af">LyX-dokument</comment>
<comment xml:lang="ar">مستند LyX</comment>
<comment xml:lang="ast">Documentu de Lyx</comment>
- <comment xml:lang="be@latin">Dakument LyX</comment>
+ <comment xml:lang="be-Latn">Dakument LyX</comment>
<comment xml:lang="bg">Документ — LyX</comment>
<comment xml:lang="ca">document LyX</comment>
<comment xml:lang="cs">dokument LyX</comment>
<comment xml:lang="da">LyX-dokument</comment>
<comment xml:lang="de">LyX-Dokument</comment>
<comment xml:lang="el">Έγγραφο LyX</comment>
- <comment xml:lang="en_GB">LyX document</comment>
+ <comment xml:lang="en-GB">LyX document</comment>
<comment xml:lang="eo">LyX-dokumento</comment>
<comment xml:lang="es">documento de LyX</comment>
<comment xml:lang="eu">LyX dokumentua</comment>
<comment xml:lang="fi">LyX-asiakirja</comment>
<comment xml:lang="fo">LyX skjal</comment>
<comment xml:lang="fr">document LyX</comment>
+ <comment xml:lang="fur">document LyX</comment>
<comment xml:lang="ga">cáipéis LyX</comment>
<comment xml:lang="gl">documento LyX</comment>
<comment xml:lang="he">מסמך Lyx</comment>
@@ -14919,7 +15504,7 @@
<comment xml:lang="oc">document LyX</comment>
<comment xml:lang="pl">Dokument LyX</comment>
<comment xml:lang="pt">documento LyX</comment>
- <comment xml:lang="pt_BR">Documento LyX</comment>
+ <comment xml:lang="pt-BR">Documento LyX</comment>
<comment xml:lang="ro">Document LyX</comment>
<comment xml:lang="ru">Документ LyX</comment>
<comment xml:lang="sk">Dokument LyX</comment>
@@ -14930,28 +15515,31 @@
<comment xml:lang="tr">LyX belgesi</comment>
<comment xml:lang="uk">документ LyX</comment>
<comment xml:lang="vi">Tài liệu LyX</comment>
- <comment xml:lang="zh_CN">LyX 文档</comment>
- <comment xml:lang="zh_TW">LyX 文件</comment>
+ <comment xml:lang="zh-CN">LyX 文档</comment>
+ <comment xml:lang="zh-TW">LyX 文件</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="#LyX" type="string" offset="0"/>
+ <match type="string" value="#LyX" offset="0"/>
</magic>
<glob pattern="*.lyx"/>
<alias type="text/x-lyx"/>
</mime-type>
<mime-type type="application/x-lz4">
<comment>LZ4 archive</comment>
+ <comment xml:lang="af">LZ4-argief</comment>
+ <comment xml:lang="bg">Архив — LZ4</comment>
<comment xml:lang="ca">arxiu LZ4</comment>
<comment xml:lang="cs">archiv LZ4</comment>
<comment xml:lang="da">LZ4-arkiv</comment>
<comment xml:lang="de">LZ4-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο LZ4</comment>
- <comment xml:lang="en_GB">LZ4 archive</comment>
+ <comment xml:lang="en-GB">LZ4 archive</comment>
<comment xml:lang="es">archivador LZ4</comment>
<comment xml:lang="eu">LZ4 artxiboa</comment>
<comment xml:lang="fi">LZ4-arkisto</comment>
<comment xml:lang="fr">archive LZ4</comment>
+ <comment xml:lang="fur">archivi LZ4</comment>
<comment xml:lang="ga">Cartlann LZ4</comment>
<comment xml:lang="gl">Arquivo LZ4</comment>
<comment xml:lang="he">ארכיון LZ4</comment>
@@ -14965,7 +15553,7 @@
<comment xml:lang="oc">archiu LZ4</comment>
<comment xml:lang="pl">Archiwum LZ4</comment>
<comment xml:lang="pt">arquivo LZ4</comment>
- <comment xml:lang="pt_BR">Pacote LZ4</comment>
+ <comment xml:lang="pt-BR">Pacote LZ4</comment>
<comment xml:lang="ru">Архив LZ4</comment>
<comment xml:lang="sk">Archív LZ4</comment>
<comment xml:lang="sl">Datoteka arhiva LZ4</comment>
@@ -14973,64 +15561,69 @@
<comment xml:lang="sv">LZ4-arkiv</comment>
<comment xml:lang="tr">LZ4 arşivi</comment>
<comment xml:lang="uk">архів LZ4</comment>
- <comment xml:lang="zh_CN">LZ4 归档文件</comment>
- <comment xml:lang="zh_TW">LZ4 封存檔</comment>
+ <comment xml:lang="zh-CN">LZ4 归档文件</comment>
+ <comment xml:lang="zh-TW">LZ4 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="0x184d2204" type="little32" offset="0"/>
- <match value="0x184c2102" type="little32" offset="0"/>
+ <match type="little32" value="0x184d2204" offset="0"/>
+ <match type="little32" value="0x184c2102" offset="0"/>
</magic>
<glob pattern="*.lz4"/>
</mime-type>
<mime-type type="application/x-lz4-compressed-tar">
<comment>Tar archive (LZ4-compressed)</comment>
+ <comment xml:lang="af">Tar-argief (LZ4-saamgepers)</comment>
+ <comment xml:lang="bg">Архив — tar, компресиран с LZ4</comment>
<comment xml:lang="ca">arxiu tar (amb compressió LZ4)</comment>
<comment xml:lang="cs">archiv Tar (komprimace LZ4)</comment>
<comment xml:lang="da">Tar-arkiv (LZ4-komprimeret)</comment>
<comment xml:lang="de">Tar-Archiv (LZ4-komprimiert)</comment>
- <comment xml:lang="en_GB">Tar archive (LZ4-compressed)</comment>
+ <comment xml:lang="en-GB">Tar archive (LZ4-compressed)</comment>
<comment xml:lang="es">archivador Tar (comprimido con LZ4)</comment>
<comment xml:lang="eu">Tar artxiboa (LZ4-rekin konprimatua)</comment>
<comment xml:lang="fi">Tar-arkisto (LZ4-pakattu)</comment>
<comment xml:lang="fr">archive tar (compression LZ4)</comment>
+ <comment xml:lang="fur">archivi Tar (comprimût cun LZ4)</comment>
<comment xml:lang="ga">cartlann Tar (comhbhrúite le LZ4)</comment>
<comment xml:lang="he">ארכיון Tar (מכווץ ע״י LZ4)</comment>
<comment xml:lang="hr">Tar arhiva (LZ4 sažeto)</comment>
- <comment xml:lang="hu">Tar archívum (LZ4-el tömörítve)</comment>
- <comment xml:lang="id">arsip tar (terkompresi LZ4)</comment>
+ <comment xml:lang="hu">Tar archívum (LZ4 tömörítésű)</comment>
+ <comment xml:lang="id">Arsip tar (terkompresi LZ4)</comment>
<comment xml:lang="it">Archivio tar (compresso con LZ4)</comment>
<comment xml:lang="kk">Tar архиві (LZ4-пен сығылған)</comment>
<comment xml:lang="ko">Tar 묶음 파일(LZ4 압축)</comment>
<comment xml:lang="pl">Archiwum tar (kompresja LZ4)</comment>
- <comment xml:lang="pt_BR">Arquvio Tar (compactado com LZ4)</comment>
+ <comment xml:lang="pt-BR">Arquivo Tar (compactado com LZ4)</comment>
<comment xml:lang="ru">Архив TAR (сжатый lz4)</comment>
- <comment xml:lang="sk">Archív tar (komprimovaný pomocou LZ4)</comment>
+ <comment xml:lang="sk">Archív Tar (komprimovaný pomocou LZ4)</comment>
<comment xml:lang="sr">Тар архива (запакована ЛЗ4-ом)</comment>
<comment xml:lang="sv">Tar-arkiv (LZ4-komprimerat)</comment>
<comment xml:lang="tr">Tar arşivi (LZ4 ile sıkıştırılmış)</comment>
<comment xml:lang="uk">архів tar (стиснений LZ4)</comment>
- <comment xml:lang="zh_CN">Tar 归档文件（LZ4 压缩）</comment>
- <comment xml:lang="zh_TW">Tar 封存檔 (LZ4 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">Tar 归档文件（LZ4 压缩）</comment>
+ <comment xml:lang="zh-TW">Tar 封存檔 (LZ4 壓縮)</comment>
<generic-icon name="package-x-generic"/>
<sub-class-of type="application/x-lz4"/>
<glob pattern="*.tar.lz4"/>
</mime-type>
<mime-type type="application/x-lzip">
<comment>Lzip archive</comment>
+ <comment xml:lang="af">Lzip-argief</comment>
<comment xml:lang="ar">أرشيف Lzip</comment>
- <comment xml:lang="bg">Архив — lzip</comment>
+ <comment xml:lang="bg">Архив — Lzip</comment>
<comment xml:lang="ca">arxiu lzip</comment>
<comment xml:lang="cs">archiv Lzip</comment>
<comment xml:lang="da">Lzip-arkiv</comment>
<comment xml:lang="de">Lzip-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Lzip</comment>
- <comment xml:lang="en_GB">Lzip archive</comment>
+ <comment xml:lang="en-GB">Lzip archive</comment>
<comment xml:lang="eo">Lzip-arkivo</comment>
<comment xml:lang="es">archivador Lzip</comment>
<comment xml:lang="eu">Lzip artxiboa</comment>
<comment xml:lang="fi">Lzip-arkisto</comment>
<comment xml:lang="fo">Lzip skjalasavn</comment>
<comment xml:lang="fr">archive lzip</comment>
+ <comment xml:lang="fur">archivi Lzip</comment>
<comment xml:lang="ga">cartlann Lzip</comment>
<comment xml:lang="gl">arquivo Lzip</comment>
<comment xml:lang="he">ארכיון Lzip</comment>
@@ -15048,7 +15641,7 @@
<comment xml:lang="oc">archiu lzip</comment>
<comment xml:lang="pl">Archiwum lzip</comment>
<comment xml:lang="pt">arquivo LZip</comment>
- <comment xml:lang="pt_BR">Pacote Lzip</comment>
+ <comment xml:lang="pt-BR">Pacote Lzip</comment>
<comment xml:lang="ro">Arhivă Lzip</comment>
<comment xml:lang="ru">Архив LZIP</comment>
<comment xml:lang="sk">Archív Lzip</comment>
@@ -15057,96 +15650,105 @@
<comment xml:lang="sv">Lzip-arkiv</comment>
<comment xml:lang="tr">Lzip arşivi</comment>
<comment xml:lang="uk">архів lzip</comment>
- <comment xml:lang="zh_CN">Lzip 归档文件</comment>
- <comment xml:lang="zh_TW">Lzip 封存檔</comment>
+ <comment xml:lang="zh-CN">Lzip 归档文件</comment>
+ <comment xml:lang="zh-TW">Lzip 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="LZIP" type="string" offset="0"/>
+ <match type="string" value="LZIP" offset="0"/>
</magic>
<glob pattern="*.lz"/>
</mime-type>
<mime-type type="application/x-lzip-compressed-tar">
<comment>Tar archive (lzip-compressed)</comment>
+ <comment xml:lang="af">Tar-argief (lzip-saamgepers)</comment>
+ <comment xml:lang="bg">Архив — tar, компресиран с Lzip</comment>
<comment xml:lang="ca">arxiu tar (amb compressió lzip)</comment>
<comment xml:lang="cs">archiv Tar (komprimace lzip)</comment>
<comment xml:lang="da">Tar-arkiv (lzip-komprimeret)</comment>
<comment xml:lang="de">Tar-Archiv (lzip-komprimiert)</comment>
- <comment xml:lang="en_GB">Tar archive (lzip-compressed)</comment>
+ <comment xml:lang="en-GB">Tar archive (lzip-compressed)</comment>
<comment xml:lang="es">archivador Tar (comprimido con lzip)</comment>
<comment xml:lang="eu">Tar artxiboa (lzip-rekin konprimatua)</comment>
<comment xml:lang="fi">Tar-arkisto (lzip-pakattu)</comment>
<comment xml:lang="fr">archive tar (compressée lzip)</comment>
+ <comment xml:lang="fur">archivi Tar (comprimût cun lzip)</comment>
<comment xml:lang="ga">cartlann Tar (comhbhrúite le lzip)</comment>
<comment xml:lang="he">ארכיון Tar (מכווץ ע״י lzip)</comment>
<comment xml:lang="hr">Tar arhiva (lzip sažeto)</comment>
- <comment xml:lang="hu">Tar archívum (lzippel tömörítve)</comment>
- <comment xml:lang="id">arsip tar (terkompresi lzip)</comment>
+ <comment xml:lang="hu">Tar archívum (lzip tömörítésű)</comment>
+ <comment xml:lang="id">Arsip tar (terkompresi lzip)</comment>
<comment xml:lang="it">Archivio tar (compresso con lzip)</comment>
<comment xml:lang="kk">Tar архиві (lzip-пен сығылған)</comment>
<comment xml:lang="ko">TAR 묶음 파일(LZIP 압축)</comment>
<comment xml:lang="pl">Archiwum tar (kompresja lzip)</comment>
- <comment xml:lang="pt_BR">Arquivo Tar (compactado com lzip)</comment>
+ <comment xml:lang="pt-BR">Arquivo Tar (compactado com lzip)</comment>
<comment xml:lang="ru">Архив TAR (сжатый lzip)</comment>
- <comment xml:lang="sk">Archív tar (komprimovaný pomocou lzip)</comment>
+ <comment xml:lang="sk">Archív Tar (komprimovaný pomocou lzip)</comment>
<comment xml:lang="sr">Тар архива (запакована лзипом)</comment>
<comment xml:lang="sv">Tar-arkiv (lzip-komprimerat)</comment>
<comment xml:lang="tr">Tar arşivi (lzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">архів tar (стиснений lzip)</comment>
- <comment xml:lang="zh_CN">Tar 归档文件（lzip 压缩）</comment>
- <comment xml:lang="zh_TW">Tar 封存檔 (lzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">Tar 归档文件（lzip 压缩）</comment>
+ <comment xml:lang="zh-TW">Tar 封存檔 (lzip 壓縮)</comment>
<generic-icon name="package-x-generic"/>
<sub-class-of type="application/x-lzip"/>
<glob pattern="*.tar.lz"/>
</mime-type>
<mime-type type="application/x-lzpdf">
<comment>PDF document (lzip-compressed)</comment>
+ <comment xml:lang="af">PDF-dokument (lzip-saamgepers)</comment>
<comment xml:lang="ast">Documentu PDF (comprimíu en lzip)</comment>
+ <comment xml:lang="bg">Документ — PDF, компресиран с Lzip</comment>
<comment xml:lang="ca">document PDF (amb compressió lzip)</comment>
<comment xml:lang="cs">dokument PDF (komprimace lzip)</comment>
+ <comment xml:lang="da">PDF-dokument (lzip-komprimeret)</comment>
<comment xml:lang="de">PDF-Dokument (lzip-komprimiert)</comment>
- <comment xml:lang="en_GB">PDF document (lzip-compressed)</comment>
+ <comment xml:lang="en-GB">PDF document (lzip-compressed)</comment>
<comment xml:lang="es">documento PDF (comprimido con lzip)</comment>
<comment xml:lang="eu">PDF dokumentua (lzip-rekin konprimitua)</comment>
<comment xml:lang="fi">PDF-asiakirja (lzip-pakattu)</comment>
<comment xml:lang="fr">document PDF (compressé lzip)</comment>
+ <comment xml:lang="fur">document PDF (comprimût cun lzip)</comment>
<comment xml:lang="ga">cáipéis PDF (comhbhrúite le lzip)</comment>
<comment xml:lang="hr">PDF dokument (lzip sažeto)</comment>
- <comment xml:lang="hu">PDF dokumentum (lzip-tömörítésű)</comment>
- <comment xml:lang="id">dokumen PDF (termkompresi lzip)</comment>
+ <comment xml:lang="hu">PDF dokumentum (lzip tömörítésű)</comment>
+ <comment xml:lang="id">Dokumen PDF (termkompresi lzip)</comment>
<comment xml:lang="it">Documento PDF (compresso con lzip)</comment>
<comment xml:lang="kk">PDF құжаты (lzip-пен сығылған)</comment>
<comment xml:lang="ko">PDF 문서(LZIP 압축)</comment>
<comment xml:lang="pl">Dokument PDF (kompresja lzip)</comment>
- <comment xml:lang="pt_BR">Documento PDF (compactado com lzip)</comment>
+ <comment xml:lang="pt-BR">Documento PDF (compactado com lzip)</comment>
<comment xml:lang="ru">Документ PDF (сжатый lzip)</comment>
<comment xml:lang="sk">Dokument PDF (komprimovaný pomocou lzip)</comment>
<comment xml:lang="sr">ПДФ документ (запакован лзип-ом)</comment>
<comment xml:lang="sv">PDF-dokument (lzip-komprimerat)</comment>
<comment xml:lang="tr">PDF belgesi (lzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">документ PDF (стиснений lzip)</comment>
- <comment xml:lang="zh_CN">PDF 文档（lzip 压缩）</comment>
- <comment xml:lang="zh_TW">PDF 文件 (lzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">PDF 文档（lzip 压缩）</comment>
+ <comment xml:lang="zh-TW">PDF 文件 (lzip 壓縮)</comment>
<sub-class-of type="application/x-lzip"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.pdf.lz"/>
</mime-type>
<mime-type type="application/x-lzma">
<comment>LZMA archive</comment>
+ <comment xml:lang="af">LZMA-argief</comment>
<comment xml:lang="ar">أرشيف LZMA</comment>
- <comment xml:lang="be@latin">Archiŭ LZMA</comment>
+ <comment xml:lang="be-Latn">Archiŭ LZMA</comment>
<comment xml:lang="bg">Архив — LZMA</comment>
<comment xml:lang="ca">arxiu LZMA</comment>
<comment xml:lang="cs">archiv LZMA</comment>
<comment xml:lang="da">LZHA-arkiv</comment>
<comment xml:lang="de">LZMA-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο LZMA</comment>
- <comment xml:lang="en_GB">LZMA archive</comment>
+ <comment xml:lang="en-GB">LZMA archive</comment>
<comment xml:lang="eo">LZMA-arkivo</comment>
<comment xml:lang="es">archivador LZMA</comment>
<comment xml:lang="eu">LZMA artxiboa</comment>
<comment xml:lang="fi">LZMA-arkisto</comment>
<comment xml:lang="fo">LZMA skjalasavn</comment>
<comment xml:lang="fr">archive LZMA</comment>
+ <comment xml:lang="fur">archivi LZMA</comment>
<comment xml:lang="ga">cartlann LZMA</comment>
<comment xml:lang="gl">arquivo LZMA</comment>
<comment xml:lang="he">ארכיון LZMA</comment>
@@ -15166,7 +15768,7 @@
<comment xml:lang="oc">archiu LZMA</comment>
<comment xml:lang="pl">Archiwum LZMA</comment>
<comment xml:lang="pt">arquivo LZMA</comment>
- <comment xml:lang="pt_BR">Pacote LZMA</comment>
+ <comment xml:lang="pt-BR">Pacote LZMA</comment>
<comment xml:lang="ro">Arhivă LZMA</comment>
<comment xml:lang="ru">Архив LZMA</comment>
<comment xml:lang="sk">Archív LZMA</comment>
@@ -15177,8 +15779,8 @@
<comment xml:lang="tr">LZMA arşivi</comment>
<comment xml:lang="uk">архів LZMA</comment>
<comment xml:lang="vi">Kho nén LZMA</comment>
- <comment xml:lang="zh_CN">LZMA 归档文件</comment>
- <comment xml:lang="zh_TW">LZMA 封存檔</comment>
+ <comment xml:lang="zh-CN">LZMA 归档文件</comment>
+ <comment xml:lang="zh-TW">LZMA 封存檔</comment>
<acronym>LZMA</acronym>
<expanded-acronym>Lempel-Ziv-Markov chain-Algorithm</expanded-acronym>
<generic-icon name="package-x-generic"/>
@@ -15186,25 +15788,27 @@
</mime-type>
<mime-type type="application/x-lzma-compressed-tar">
<comment>Tar archive (LZMA-compressed)</comment>
+ <comment xml:lang="af">Tar-argief (LZMA-saamgepers)</comment>
<comment xml:lang="ar">أرشيف Tar (مضغوط-LZMA)</comment>
- <comment xml:lang="be@latin">Archiŭ tar (LZMA-skampresavany)</comment>
+ <comment xml:lang="be-Latn">Archiŭ tar (LZMA-skampresavany)</comment>
<comment xml:lang="bg">Архив — tar, компресиран с LZMA</comment>
<comment xml:lang="ca">arxiu tar (amb compressió LZMA)</comment>
<comment xml:lang="cs">archiv Tar (komprimace LZMA)</comment>
<comment xml:lang="da">Tar-arkiv (LZMA-komprimeret)</comment>
<comment xml:lang="de">Tar-Archiv (LZMA-komprimiert)</comment>
<comment xml:lang="el">Αρχείο Tar (συμπιεσμένο με LZMA)</comment>
- <comment xml:lang="en_GB">Tar archive (LZMA-compressed)</comment>
+ <comment xml:lang="en-GB">Tar archive (LZMA-compressed)</comment>
<comment xml:lang="es">archivador Tar (comprimido con LZMA)</comment>
<comment xml:lang="eu">Tar artxiboa (LZMA-rekin konprimitua)</comment>
<comment xml:lang="fi">Tar-arkisto (LZMA-pakattu)</comment>
<comment xml:lang="fo">Tar skjalasavn (LZMA-stappað)</comment>
<comment xml:lang="fr">archive tar (compression LZMA)</comment>
+ <comment xml:lang="fur">archivi Tar (comprimût cun LZMA)</comment>
<comment xml:lang="ga">cartlann Tar (comhbhrúite le LZMA)</comment>
<comment xml:lang="gl">arquivo Tar (comprimido con LZMA)</comment>
<comment xml:lang="he">ארכיון Tar (מכווץ ע״י LZMA)</comment>
<comment xml:lang="hr">Tar arhiva (LZMA sažeta)</comment>
- <comment xml:lang="hu">Tar archívum (LZMA-val tömörítve)</comment>
+ <comment xml:lang="hu">Tar archívum (LZMA tömörítésű)</comment>
<comment xml:lang="ia">Archivo Tar (comprimite con LZMA)</comment>
<comment xml:lang="id">Arsip Tar (terkompresi LZMA)</comment>
<comment xml:lang="it">Archivio tar (compresso con LZMA)</comment>
@@ -15219,10 +15823,10 @@
<comment xml:lang="oc">archiu tar (compression LZMA)</comment>
<comment xml:lang="pl">Archiwum tar (kompresja LZMA)</comment>
<comment xml:lang="pt">arquivo Tar (compressão LZMA)</comment>
- <comment xml:lang="pt_BR">Pacote Tar (compactado com LZMA)</comment>
+ <comment xml:lang="pt-BR">Pacote Tar (compactado com LZMA)</comment>
<comment xml:lang="ro">Arhivă Tar (comprimată LZMA)</comment>
<comment xml:lang="ru">Архив TAR (сжатый lzma)</comment>
- <comment xml:lang="sk">Archív tar (komprimovaný pomocou LZMA)</comment>
+ <comment xml:lang="sk">Archív Tar (komprimovaný pomocou LZMA)</comment>
<comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z LZMA)</comment>
<comment xml:lang="sq">Arkiv tar (i kompresuar me LZMA)</comment>
<comment xml:lang="sr">Тар архива (запакована ЛЗМА-ом)</comment>
@@ -15230,8 +15834,8 @@
<comment xml:lang="tr">Tar arşivi (LZMA ile sıkıştırılmış)</comment>
<comment xml:lang="uk">архів tar (стиснений LZMA)</comment>
<comment xml:lang="vi">Kho nén tar (đã nén LZMA)</comment>
- <comment xml:lang="zh_CN">Tar 归档文件（LZMA 压缩）</comment>
- <comment xml:lang="zh_TW">Tar 封存檔 (LZMA 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">Tar 归档文件（LZMA 压缩）</comment>
+ <comment xml:lang="zh-TW">Tar 封存檔 (LZMA 壓縮)</comment>
<sub-class-of type="application/x-lzma"/>
<generic-icon name="package-x-generic"/>
<glob pattern="*.tar.lzma"/>
@@ -15239,21 +15843,23 @@
</mime-type>
<mime-type type="application/x-lzop">
<comment>LZO archive</comment>
+ <comment xml:lang="af">LZO-argief</comment>
<comment xml:lang="ar">أرشيف LZO</comment>
- <comment xml:lang="be@latin">Archiŭ LZO</comment>
+ <comment xml:lang="be-Latn">Archiŭ LZO</comment>
<comment xml:lang="bg">Архив — LZO</comment>
<comment xml:lang="ca">arxiu LZO</comment>
<comment xml:lang="cs">archiv LZO</comment>
<comment xml:lang="da">LZO-arkiv</comment>
<comment xml:lang="de">LZO-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο LZO</comment>
- <comment xml:lang="en_GB">LZO archive</comment>
+ <comment xml:lang="en-GB">LZO archive</comment>
<comment xml:lang="eo">LZO-arkivo</comment>
<comment xml:lang="es">archivador LZO</comment>
<comment xml:lang="eu">LZO artxiboa</comment>
<comment xml:lang="fi">LZO-arkisto</comment>
<comment xml:lang="fo">LZO skjalasavn</comment>
<comment xml:lang="fr">archive LZO</comment>
+ <comment xml:lang="fur">archivi LZO</comment>
<comment xml:lang="ga">cartlann LZO</comment>
<comment xml:lang="gl">arquivo LZO</comment>
<comment xml:lang="he">ארכיון LZO</comment>
@@ -15274,7 +15880,7 @@
<comment xml:lang="oc">archiu LZO</comment>
<comment xml:lang="pl">Archiwum LZO</comment>
<comment xml:lang="pt">arquivo LZO</comment>
- <comment xml:lang="pt_BR">Pacote LZO</comment>
+ <comment xml:lang="pt-BR">Pacote LZO</comment>
<comment xml:lang="ro">Arhivă LZO</comment>
<comment xml:lang="ru">Архив LZO</comment>
<comment xml:lang="sk">Archív LZO</comment>
@@ -15285,27 +15891,31 @@
<comment xml:lang="tr">LZO arşivi</comment>
<comment xml:lang="uk">архів LZO</comment>
<comment xml:lang="vi">Kho nén LZO</comment>
- <comment xml:lang="zh_CN">LZO 归档文件</comment>
- <comment xml:lang="zh_TW">LZO 封存檔</comment>
+ <comment xml:lang="zh-CN">LZO 归档文件</comment>
+ <comment xml:lang="zh-TW">LZO 封存檔</comment>
<acronym>LZO</acronym>
<expanded-acronym>Lempel-Ziv-Oberhumer</expanded-acronym>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a" type="string" offset="0"/>
+ <match type="string" value="\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a" offset="0"/>
</magic>
<glob pattern="*.lzo"/>
</mime-type>
<mime-type type="application/x-qpress">
<comment>Qpress archive</comment>
+ <comment xml:lang="af">Qpress-argief</comment>
+ <comment xml:lang="bg">Архив — Qpress</comment>
<comment xml:lang="ca">arxiu Qpress</comment>
<comment xml:lang="cs">archiv Qpress</comment>
<comment xml:lang="da">Qpress-arkiv</comment>
<comment xml:lang="de">Qpress-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Qpress</comment>
- <comment xml:lang="en_GB">Qpress archive</comment>
+ <comment xml:lang="en-GB">Qpress archive</comment>
<comment xml:lang="es">archivador de Qpress</comment>
+ <comment xml:lang="eu">Qpress artxiboa</comment>
<comment xml:lang="fi">Qpress-arkisto</comment>
<comment xml:lang="fr">Archive Qpress</comment>
+ <comment xml:lang="fur">archivi Qpress</comment>
<comment xml:lang="ga">cartlann Qpress</comment>
<comment xml:lang="gl">Arquivo Qpress</comment>
<comment xml:lang="he">ארכיון Qpress</comment>
@@ -15319,7 +15929,7 @@
<comment xml:lang="oc">Archiu Qpress</comment>
<comment xml:lang="pl">Archiwum Qpress</comment>
<comment xml:lang="pt">arquivo Qpress</comment>
- <comment xml:lang="pt_BR">Pacote Qpress</comment>
+ <comment xml:lang="pt-BR">Pacote Qpress</comment>
<comment xml:lang="ru">Архив Qpress</comment>
<comment xml:lang="sk">Archív Qpress</comment>
<comment xml:lang="sl">Datoteka arhiva Qpress</comment>
@@ -15327,25 +15937,28 @@
<comment xml:lang="sv">Qpress-arkiv</comment>
<comment xml:lang="tr">Qpress arşivi</comment>
<comment xml:lang="uk">архів Qpress</comment>
- <comment xml:lang="zh_CN">Qpress 归档文件</comment>
- <comment xml:lang="zh_TW">Qpress 封存檔</comment>
+ <comment xml:lang="zh-CN">Qpress 归档文件</comment>
+ <comment xml:lang="zh-TW">Qpress 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="qpress10" type="string" offset="0"/>
+ <match type="string" value="qpress10" offset="0"/>
</magic>
<glob pattern="*.qp"/>
</mime-type>
<mime-type type="application/x-xar">
<comment>XAR archive</comment>
+ <comment xml:lang="af">XAR-argief</comment>
+ <comment xml:lang="bg">Архив — XAR</comment>
<comment xml:lang="ca">arxiu XAR</comment>
<comment xml:lang="cs">archiv XAR</comment>
<comment xml:lang="da">XAR-arkiv</comment>
<comment xml:lang="de">XAR-Archiv</comment>
- <comment xml:lang="en_GB">XAR archive</comment>
+ <comment xml:lang="en-GB">XAR archive</comment>
<comment xml:lang="es">archivador XAR</comment>
<comment xml:lang="eu">XAR artxiboa</comment>
<comment xml:lang="fi">XAR-arkisto</comment>
<comment xml:lang="fr">archive XAR</comment>
+ <comment xml:lang="fur">archivi XAR</comment>
<comment xml:lang="ga">cartlann XAR</comment>
<comment xml:lang="he">ארכיון XAR</comment>
<comment xml:lang="hr">XAR arhiva</comment>
@@ -15356,36 +15969,40 @@
<comment xml:lang="ko">XAR 아카이브</comment>
<comment xml:lang="oc">Archiu XAR</comment>
<comment xml:lang="pl">Archiwum XAR</comment>
- <comment xml:lang="pt_BR">Arquivo XAR</comment>
+ <comment xml:lang="pt-BR">Arquivo XAR</comment>
<comment xml:lang="ru">Архив XAR</comment>
<comment xml:lang="sk">Archív XAR</comment>
<comment xml:lang="sr">ИксАР архива</comment>
<comment xml:lang="sv">XAR-arkiv</comment>
<comment xml:lang="tr">XAR arşivi</comment>
<comment xml:lang="uk">архів XAR</comment>
- <comment xml:lang="zh_CN">XAR 归档文件</comment>
- <comment xml:lang="zh_TW">XAR 封存檔</comment>
+ <comment xml:lang="zh-CN">XAR 归档文件</comment>
+ <comment xml:lang="zh-TW">XAR 封存檔</comment>
<acronym>XAR</acronym>
<expanded-acronym>eXtensible ARchive</expanded-acronym>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="0x78617221" type="big32" offset="0"/>
+ <match type="big32" value="0x78617221" offset="0"/>
</magic>
<glob pattern="*.xar"/>
-
+ <!-- OS X 10.5+ installer package -->
<glob pattern="*.pkg"/>
</mime-type>
<mime-type type="application/zlib">
<comment>Zlib archive</comment>
+ <comment xml:lang="af">Zlib-argief</comment>
+ <comment xml:lang="bg">Архив — Zlib</comment>
<comment xml:lang="ca">arxiu Zlib</comment>
<comment xml:lang="cs">archiv Zlib</comment>
<comment xml:lang="da">Zlib-arkiv</comment>
<comment xml:lang="de">Zlib-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Zlib</comment>
- <comment xml:lang="en_GB">Zlib archive</comment>
+ <comment xml:lang="en-GB">Zlib archive</comment>
<comment xml:lang="es">archivador Zlib</comment>
+ <comment xml:lang="eu">Zlib artxiboa</comment>
<comment xml:lang="fi">Zlib-arkisto</comment>
<comment xml:lang="fr">Archive Zlib</comment>
+ <comment xml:lang="fur">archivi Zlib</comment>
<comment xml:lang="ga">cartlann Zlib</comment>
<comment xml:lang="gl">Arquivo Zlib</comment>
<comment xml:lang="he">ארכיון Zlib</comment>
@@ -15399,7 +16016,7 @@
<comment xml:lang="oc">Archiu Zlib</comment>
<comment xml:lang="pl">Archiwum Zlib</comment>
<comment xml:lang="pt">arquivo Zlib</comment>
- <comment xml:lang="pt_BR">Pacote Zlib</comment>
+ <comment xml:lang="pt-BR">Pacote Zlib</comment>
<comment xml:lang="ru">Архив Zlib</comment>
<comment xml:lang="sk">Archív Zlib</comment>
<comment xml:lang="sl">Datoteka arhiva Zlib</comment>
@@ -15407,15 +16024,16 @@
<comment xml:lang="sv">Zlib-arkiv</comment>
<comment xml:lang="tr">Zlib arşivi</comment>
<comment xml:lang="uk">архів zlib</comment>
- <comment xml:lang="zh_CN">Alzip 归档文件</comment>
- <comment xml:lang="zh_TW">Zlib 封存檔</comment>
+ <comment xml:lang="zh-CN">Alzip 归档文件</comment>
+ <comment xml:lang="zh-TW">Zlib 封存檔</comment>
<generic-icon name="package-x-generic"/>
<glob pattern="*.zz"/>
</mime-type>
<mime-type type="application/x-magicpoint">
<comment>MagicPoint presentation</comment>
+ <comment xml:lang="af">MagicPoint-voorlegging</comment>
<comment xml:lang="ar">عرض تقديمي MagicPoint</comment>
- <comment xml:lang="be@latin">Prezentacyja MagicPoint</comment>
+ <comment xml:lang="be-Latn">Prezentacyja MagicPoint</comment>
<comment xml:lang="bg">Презентация — MagicPoint</comment>
<comment xml:lang="ca">presentació de MagicPoint</comment>
<comment xml:lang="cs">prezentace MagicPoint</comment>
@@ -15423,13 +16041,14 @@
<comment xml:lang="da">MagicPoint-præsentation</comment>
<comment xml:lang="de">MagicPoint-Präsentation</comment>
<comment xml:lang="el">Παρουσίαση MagicPoint</comment>
- <comment xml:lang="en_GB">MagicPoint presentation</comment>
+ <comment xml:lang="en-GB">MagicPoint presentation</comment>
<comment xml:lang="eo">MagicPoint-prezentaĵo</comment>
<comment xml:lang="es">presentación de MagicPoint</comment>
<comment xml:lang="eu">MagicPoint aurkezpena</comment>
<comment xml:lang="fi">MagicPoint-esitys</comment>
<comment xml:lang="fo">MagicPoint framløga</comment>
<comment xml:lang="fr">présentation MagicPoint</comment>
+ <comment xml:lang="fur">presentazion MagicPoint</comment>
<comment xml:lang="ga">láithreoireacht MagicPoint</comment>
<comment xml:lang="gl">presentación de MagicPoint</comment>
<comment xml:lang="he">מצגת MagicPoint</comment>
@@ -15451,7 +16070,7 @@
<comment xml:lang="oc">presentacion MagicPoint</comment>
<comment xml:lang="pl">Prezentacja programu MagicPoint</comment>
<comment xml:lang="pt">apresentação MagicPoint</comment>
- <comment xml:lang="pt_BR">Apresentação do MagicPoint</comment>
+ <comment xml:lang="pt-BR">Apresentação do MagicPoint</comment>
<comment xml:lang="ro">Prezentare MagicPoint</comment>
<comment xml:lang="ru">Презентация MagicPoint</comment>
<comment xml:lang="sk">Prezentácia MagicPoint</comment>
@@ -15462,29 +16081,31 @@
<comment xml:lang="tr">MagicPoint sunumu</comment>
<comment xml:lang="uk">презентація MagicPoint</comment>
<comment xml:lang="vi">Trình diễn MagicPoint</comment>
- <comment xml:lang="zh_CN">MagicPoint 演示文稿</comment>
- <comment xml:lang="zh_TW">MagicPoint 簡報檔</comment>
+ <comment xml:lang="zh-CN">MagicPoint 演示文稿</comment>
+ <comment xml:lang="zh-TW">MagicPoint 簡報</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="x-office-presentation"/>
<glob pattern="*.mgp"/>
</mime-type>
<mime-type type="application/x-macbinary">
<comment>Macintosh MacBinary file</comment>
+ <comment xml:lang="af">Macintosh MacBinary-lêer</comment>
<comment xml:lang="ar">ملف Macintosh MacBinary</comment>
- <comment xml:lang="be@latin">Fajł Macintosh MacBinary</comment>
+ <comment xml:lang="be-Latn">Fajł Macintosh MacBinary</comment>
<comment xml:lang="bg">Файл — MacBinary</comment>
<comment xml:lang="ca">fitxer MacBinary de Macintosh</comment>
<comment xml:lang="cs">soubor MacBinary pro Macintosh </comment>
<comment xml:lang="da">Macintosh MacBinary-fil</comment>
<comment xml:lang="de">Macintosh-MacBinary-Datei</comment>
<comment xml:lang="el">Εκτελέσιμο Macintosh MacBinary</comment>
- <comment xml:lang="en_GB">Macintosh MacBinary file</comment>
+ <comment xml:lang="en-GB">Macintosh MacBinary file</comment>
<comment xml:lang="eo">MacBinary-dosiero de Macintosh</comment>
<comment xml:lang="es">archivo de Macintosh MacBinary</comment>
<comment xml:lang="eu">Macintosh MacBinary fitxategia</comment>
<comment xml:lang="fi">Macintosh MacBinary -tiedosto</comment>
<comment xml:lang="fo">Macintosh MacBinary fíla</comment>
<comment xml:lang="fr">fichier Macintosh MacBinary</comment>
+ <comment xml:lang="fur">file MacBinary di Macintosh</comment>
<comment xml:lang="ga">comhad Macintosh MacBinary</comment>
<comment xml:lang="gl">ficheiro MacBinary de Macintosh</comment>
<comment xml:lang="he">קובץ בינרי של מקינטוש</comment>
@@ -15505,7 +16126,7 @@
<comment xml:lang="oc">fichièr Macintosh MacBinary</comment>
<comment xml:lang="pl">Plik MacBinary Macintosh</comment>
<comment xml:lang="pt">ficheiro MacBinary de Macintosh</comment>
- <comment xml:lang="pt_BR">Arquivo do Macintosh MacBinary</comment>
+ <comment xml:lang="pt-BR">Arquivo do Macintosh MacBinary</comment>
<comment xml:lang="ro">Fișier Macintosh MacBinary</comment>
<comment xml:lang="ru">Файл Macintosh MacBinary</comment>
<comment xml:lang="sk">Súbor pre Macintosh MacBinary</comment>
@@ -15516,29 +16137,31 @@
<comment xml:lang="tr">Macintosh MacBinary dosyası</comment>
<comment xml:lang="uk">файл Macintosh MacBinary</comment>
<comment xml:lang="vi">Tập tin nhị phân MacBinary của Macintosh</comment>
- <comment xml:lang="zh_CN">Macintosh MacBinary 文件</comment>
- <comment xml:lang="zh_TW">Macintosh MacBinary 檔</comment>
+ <comment xml:lang="zh-CN">Macintosh MacBinary 文件</comment>
+ <comment xml:lang="zh-TW">Macintosh MacBinary 檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="50">
- <match value="mBIN" type="string" offset="102"/>
+ <match type="string" value="mBIN" offset="102"/>
</magic>
</mime-type>
<mime-type type="application/x-matroska">
<comment>Matroska stream</comment>
+ <comment xml:lang="af">Matroska-stroom</comment>
<comment xml:lang="ar">دفق Matroska</comment>
- <comment xml:lang="be@latin">Płyń Matroska</comment>
+ <comment xml:lang="be-Latn">Płyń Matroska</comment>
<comment xml:lang="bg">Поток — Matroska</comment>
<comment xml:lang="ca">flux Matroska</comment>
<comment xml:lang="cs">proud Matroska</comment>
- <comment xml:lang="da">Matroskastrøm</comment>
+ <comment xml:lang="da">Matroska-strøm</comment>
<comment xml:lang="de">Matroska-Datenstrom</comment>
<comment xml:lang="el">Ροή Matroska</comment>
- <comment xml:lang="en_GB">Matroska stream</comment>
+ <comment xml:lang="en-GB">Matroska stream</comment>
<comment xml:lang="es">flujo Matroska</comment>
<comment xml:lang="eu">Matroska korrontea</comment>
<comment xml:lang="fi">Matroska-virta</comment>
<comment xml:lang="fo">Matroska streymur</comment>
<comment xml:lang="fr">flux Matroska</comment>
+ <comment xml:lang="fur">flus Matroska</comment>
<comment xml:lang="ga">sruth Matroska</comment>
<comment xml:lang="gl">fluxo de Matroska</comment>
<comment xml:lang="he">זרימת Matroska</comment>
@@ -15558,7 +16181,7 @@
<comment xml:lang="oc">flux Matroska</comment>
<comment xml:lang="pl">Strumień Matroska</comment>
<comment xml:lang="pt">fluxo Matroska</comment>
- <comment xml:lang="pt_BR">Transmissão do Matroska</comment>
+ <comment xml:lang="pt-BR">Transmissão do Matroska</comment>
<comment xml:lang="ro">Flux Matroska</comment>
<comment xml:lang="ru">Поток Matroska</comment>
<comment xml:lang="sk">Stream Matroska</comment>
@@ -15569,38 +16192,40 @@
<comment xml:lang="tr">Matroska akışı</comment>
<comment xml:lang="uk">потік даних Matroska</comment>
<comment xml:lang="vi">Luồng Matroska</comment>
- <comment xml:lang="zh_CN">Matroska 流</comment>
- <comment xml:lang="zh_TW">Matroska 串流</comment>
+ <comment xml:lang="zh-CN">Matroska 流</comment>
+ <comment xml:lang="zh-TW">Matroska 串流</comment>
<generic-icon name="video-x-generic"/>
<magic priority="50">
-
- <match value="0x1a45dfa3" type="big32" offset="0">
-
- <match value="0x4282" type="big16" offset="5:65">
-
- <match value="matroska" type="string" offset="8:75"/>
+ <!-- EBML ID -->
+ <match type="big32" value="0x1a45dfa3" offset="0">
+ <!-- DocumentType ID -->
+ <match type="big16" value="0x4282" offset="5:65">
+ <!-- DocumentType -->
+ <match type="string" value="matroska" offset="8:75"/>
</match>
</match>
</magic>
</mime-type>
<mime-type type="video/x-matroska">
<comment>Matroska video</comment>
+ <comment xml:lang="af">Matroska-video</comment>
<comment xml:lang="ar">Matroska مرئي</comment>
<comment xml:lang="ast">Videu en Matroska</comment>
- <comment xml:lang="be@latin">Videa Matroska</comment>
+ <comment xml:lang="be-Latn">Videa Matroska</comment>
<comment xml:lang="bg">Видео — Matroska</comment>
<comment xml:lang="ca">vídeo Matroska</comment>
<comment xml:lang="cs">video Matroska</comment>
- <comment xml:lang="da">Matroskavideo</comment>
+ <comment xml:lang="da">Matroska-video</comment>
<comment xml:lang="de">Matroska-Video</comment>
<comment xml:lang="el">Βίντεο Matroska</comment>
- <comment xml:lang="en_GB">Matroska video</comment>
+ <comment xml:lang="en-GB">Matroska video</comment>
<comment xml:lang="eo">Matroska-video</comment>
<comment xml:lang="es">vídeo Matroska</comment>
<comment xml:lang="eu">Matroska bideoa</comment>
<comment xml:lang="fi">Matroska-video</comment>
<comment xml:lang="fo">Matroska video</comment>
<comment xml:lang="fr">vidéo Matroska</comment>
+ <comment xml:lang="fur">video Matroska</comment>
<comment xml:lang="ga">físeán Matroska</comment>
<comment xml:lang="gl">vídeo de Matroska</comment>
<comment xml:lang="he">וידאו Matroska</comment>
@@ -15622,7 +16247,7 @@
<comment xml:lang="oc">vidèo Matroska</comment>
<comment xml:lang="pl">Plik wideo Matroska</comment>
<comment xml:lang="pt">vídeo Matroska</comment>
- <comment xml:lang="pt_BR">Vídeo Matroska</comment>
+ <comment xml:lang="pt-BR">Vídeo Matroska</comment>
<comment xml:lang="ro">Video Matroska</comment>
<comment xml:lang="ru">Видео Matroska</comment>
<comment xml:lang="sk">Video Matroska</comment>
@@ -15633,24 +16258,27 @@
<comment xml:lang="tr">Matroska video</comment>
<comment xml:lang="uk">відеокліп Matroska</comment>
<comment xml:lang="vi">Ảnh động Matroska</comment>
- <comment xml:lang="zh_CN">Matroska 视频</comment>
- <comment xml:lang="zh_TW">Matroska 視訊</comment>
+ <comment xml:lang="zh-CN">Matroska 视频</comment>
+ <comment xml:lang="zh-TW">Matroska 視訊</comment>
<glob pattern="*.mkv"/>
<sub-class-of type="application/x-matroska"/>
</mime-type>
<mime-type type="video/x-matroska-3d">
<comment>Matroska 3D video</comment>
+ <comment xml:lang="af">Matroska 3D video</comment>
<comment xml:lang="ast">Videu en Matroska 3D</comment>
+ <comment xml:lang="bg">Видео — Matroska 3D</comment>
<comment xml:lang="ca">vídeo Matroska 3D</comment>
<comment xml:lang="cs">3D video Matroska</comment>
<comment xml:lang="da">Matroska 3D-video</comment>
<comment xml:lang="de">Matroska 3D-Video</comment>
<comment xml:lang="el">Βίντεο 3Δ Matroska</comment>
- <comment xml:lang="en_GB">Matroska 3D video</comment>
+ <comment xml:lang="en-GB">Matroska 3D video</comment>
<comment xml:lang="es">vídeo Matroska en 3D</comment>
<comment xml:lang="eu">Matroska 3D bideoa</comment>
<comment xml:lang="fi">Matroska 3D-video</comment>
<comment xml:lang="fr">vidéo Matroska 3D</comment>
+ <comment xml:lang="fur">video 3D Matroska</comment>
<comment xml:lang="ga">físeán Matroska 3D</comment>
<comment xml:lang="gl">Video Matroska 3D</comment>
<comment xml:lang="he">סרטון תלת ממדי מסוג Matroska</comment>
@@ -15664,7 +16292,7 @@
<comment xml:lang="oc">vidèo Matroska 3D</comment>
<comment xml:lang="pl">Plik wideo Matroska 3D</comment>
<comment xml:lang="pt">vídeo 3D Matroska</comment>
- <comment xml:lang="pt_BR">Vídeo 3D Matroska</comment>
+ <comment xml:lang="pt-BR">Vídeo 3D Matroska</comment>
<comment xml:lang="ru">Видео Matroska 3D</comment>
<comment xml:lang="sk">3D video Matroska</comment>
<comment xml:lang="sl">Video datoteka Matroska 3D</comment>
@@ -15672,28 +16300,30 @@
<comment xml:lang="sv">Matroska 3D-video</comment>
<comment xml:lang="tr">Matroska 3B video</comment>
<comment xml:lang="uk">відеокліп Matroska 3D</comment>
- <comment xml:lang="zh_CN">Matroska 3D 视频</comment>
- <comment xml:lang="zh_TW">Matroska 3D 視訊</comment>
+ <comment xml:lang="zh-CN">Matroska 3D 视频</comment>
+ <comment xml:lang="zh-TW">Matroska 3D 視訊</comment>
<glob pattern="*.mk3d"/>
<sub-class-of type="application/x-matroska"/>
</mime-type>
<mime-type type="audio/x-matroska">
<comment>Matroska audio</comment>
+ <comment xml:lang="af">Matroska-oudio</comment>
<comment xml:lang="ar">سمعي Matroska</comment>
- <comment xml:lang="be@latin">Aŭdyjo Matroska</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Matroska</comment>
<comment xml:lang="bg">Аудио — Matroska</comment>
- <comment xml:lang="ca">àudio de Matroska</comment>
+ <comment xml:lang="ca">àudio Matroska</comment>
<comment xml:lang="cs">zvuk Matroska</comment>
- <comment xml:lang="da">Matroskalyd</comment>
+ <comment xml:lang="da">Matroska-lyd</comment>
<comment xml:lang="de">Matroska-Audio</comment>
<comment xml:lang="el">Ήχος Matroska</comment>
- <comment xml:lang="en_GB">Matroska audio</comment>
+ <comment xml:lang="en-GB">Matroska audio</comment>
<comment xml:lang="eo">Matroska-sondosiero</comment>
- <comment xml:lang="es">sonido Matroska</comment>
+ <comment xml:lang="es">audio Matroska</comment>
<comment xml:lang="eu">Matroska audioa</comment>
<comment xml:lang="fi">Matroska-ääni</comment>
<comment xml:lang="fo">Matroska ljóður</comment>
<comment xml:lang="fr">audio Matroska</comment>
+ <comment xml:lang="fur">audio Matroska</comment>
<comment xml:lang="ga">fuaim Matroska</comment>
<comment xml:lang="gl">son de Matroska</comment>
<comment xml:lang="he">שמע Matroska</comment>
@@ -15714,7 +16344,7 @@
<comment xml:lang="oc">àudio Matroska</comment>
<comment xml:lang="pl">Plik dźwiękowy Matroska</comment>
<comment xml:lang="pt">áudio Matroska</comment>
- <comment xml:lang="pt_BR">Áudio Matroska</comment>
+ <comment xml:lang="pt-BR">Áudio Matroska</comment>
<comment xml:lang="ro">Audio Matroska</comment>
<comment xml:lang="ru">Аудио Matroska</comment>
<comment xml:lang="sk">Zvuk Matroska</comment>
@@ -15725,13 +16355,14 @@
<comment xml:lang="tr">Matroska ses</comment>
<comment xml:lang="uk">звук Matroska</comment>
<comment xml:lang="vi">Âm thanh Matroska</comment>
- <comment xml:lang="zh_CN">Matroska 音频</comment>
- <comment xml:lang="zh_TW">Matroska 音訊</comment>
+ <comment xml:lang="zh-CN">Matroska 音频</comment>
+ <comment xml:lang="zh-TW">Matroska 音訊</comment>
<glob pattern="*.mka"/>
<sub-class-of type="application/x-matroska"/>
</mime-type>
<mime-type type="video/webm">
<comment>WebM video</comment>
+ <comment xml:lang="af">WebM-video</comment>
<comment xml:lang="ar">WebM مرئي</comment>
<comment xml:lang="ast">Videu en WebM</comment>
<comment xml:lang="bg">Видео — WebM</comment>
@@ -15740,13 +16371,14 @@
<comment xml:lang="da">WebM-video</comment>
<comment xml:lang="de">WebM-Video</comment>
<comment xml:lang="el">Βίντεο WebM</comment>
- <comment xml:lang="en_GB">WebM video</comment>
+ <comment xml:lang="en-GB">WebM video</comment>
<comment xml:lang="eo">WebM-video</comment>
<comment xml:lang="es">vídeo WebM</comment>
<comment xml:lang="eu">WebM bideoa</comment>
<comment xml:lang="fi">WebM-video</comment>
<comment xml:lang="fo">WebM video</comment>
<comment xml:lang="fr">vidéo WebM</comment>
+ <comment xml:lang="fur">video WebM</comment>
<comment xml:lang="ga">físeán WebM</comment>
<comment xml:lang="gl">vídeo WebM</comment>
<comment xml:lang="he">וידאו WebM</comment>
@@ -15764,7 +16396,7 @@
<comment xml:lang="oc">vidèo WebM</comment>
<comment xml:lang="pl">Plik wideo WebM</comment>
<comment xml:lang="pt">vídeo WebM</comment>
- <comment xml:lang="pt_BR">Vídeo WebM</comment>
+ <comment xml:lang="pt-BR">Vídeo WebM</comment>
<comment xml:lang="ro">Video WebM</comment>
<comment xml:lang="ru">Видео WebM</comment>
<comment xml:lang="sk">Video WebM</comment>
@@ -15773,36 +16405,38 @@
<comment xml:lang="sv">WebM-video</comment>
<comment xml:lang="tr">WebM video</comment>
<comment xml:lang="uk">відео WebM</comment>
- <comment xml:lang="zh_CN">WebM 视频</comment>
- <comment xml:lang="zh_TW">WebM 視訊</comment>
+ <comment xml:lang="zh-CN">WebM 视频</comment>
+ <comment xml:lang="zh-TW">WebM 視訊</comment>
<glob pattern="*.webm"/>
<magic priority="50">
-
- <match value="0x1a45dfa3" type="big32" offset="0">
-
- <match value="0x4282" type="big16" offset="5:65">
-
- <match value="webm" type="string" offset="8:75"/>
+ <!-- EBML ID -->
+ <match type="big32" value="0x1a45dfa3" offset="0">
+ <!-- DocumentType ID -->
+ <match type="big16" value="0x4282" offset="5:65">
+ <!-- DocumentType -->
+ <match type="string" value="webm" offset="8:75"/>
</match>
</match>
</magic>
</mime-type>
<mime-type type="audio/webm">
<comment>WebM audio</comment>
+ <comment xml:lang="af">WebM-oudio</comment>
<comment xml:lang="ar">WebM سمعي</comment>
<comment xml:lang="bg">Аудио — WebM</comment>
- <comment xml:lang="ca">àudio de WebM</comment>
+ <comment xml:lang="ca">àudio WebM</comment>
<comment xml:lang="cs">zvuk WebM</comment>
<comment xml:lang="da">WebM-lyd</comment>
<comment xml:lang="de">WebM-Audio</comment>
<comment xml:lang="el">Ήχος WebM</comment>
- <comment xml:lang="en_GB">WebM audio</comment>
+ <comment xml:lang="en-GB">WebM audio</comment>
<comment xml:lang="eo">WebM-sondosiero</comment>
- <comment xml:lang="es">sonido WebM</comment>
+ <comment xml:lang="es">audio WebM</comment>
<comment xml:lang="eu">WebM audioa</comment>
<comment xml:lang="fi">WebM-ääni</comment>
<comment xml:lang="fo">WebM ljóður</comment>
<comment xml:lang="fr">audio WebM</comment>
+ <comment xml:lang="fur">audio WebM</comment>
<comment xml:lang="ga">fuaim WebM</comment>
<comment xml:lang="gl">son WebM</comment>
<comment xml:lang="he">שמע WebM</comment>
@@ -15820,7 +16454,7 @@
<comment xml:lang="oc">àudio WebM</comment>
<comment xml:lang="pl">Plik dźwiękowy WebM</comment>
<comment xml:lang="pt">áudio WebM</comment>
- <comment xml:lang="pt_BR">Áudio WebM</comment>
+ <comment xml:lang="pt-BR">Áudio WebM</comment>
<comment xml:lang="ro">Audio WebM</comment>
<comment xml:lang="ru">Аудио WebM</comment>
<comment xml:lang="sk">Zvuk WebM</comment>
@@ -15829,22 +16463,25 @@
<comment xml:lang="sv">WebM-ljud</comment>
<comment xml:lang="tr">WebM sesi</comment>
<comment xml:lang="uk">звук WebM</comment>
- <comment xml:lang="zh_CN">WebM 音频</comment>
- <comment xml:lang="zh_TW">WebM 音訊</comment>
+ <comment xml:lang="zh-CN">WebM 音频</comment>
+ <comment xml:lang="zh-TW">WebM 音訊</comment>
<sub-class-of type="video/webm"/>
</mime-type>
<mime-type type="application/x-mimearchive">
<comment>MHTML web archive</comment>
+ <comment xml:lang="af">MHTML-webargief</comment>
+ <comment xml:lang="bg">Архив — MHTML</comment>
<comment xml:lang="ca">arxiu web MHTML</comment>
<comment xml:lang="cs">webový archiv MHTML</comment>
- <comment xml:lang="da">MHTML-netarkiv</comment>
+ <comment xml:lang="da">MHTML-webarkiv</comment>
<comment xml:lang="de">MHTML-Webarchiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο ιστού MHTML</comment>
- <comment xml:lang="en_GB">MHTML web archive</comment>
+ <comment xml:lang="en-GB">MHTML web archive</comment>
<comment xml:lang="es">archivador web MHTML</comment>
<comment xml:lang="eu">MHTML web artxiboa</comment>
<comment xml:lang="fi">MHTML-kooste</comment>
<comment xml:lang="fr">archive web MHTML</comment>
+ <comment xml:lang="fur">archivi web MHTML</comment>
<comment xml:lang="ga">cartlann ghréasáin MHTML</comment>
<comment xml:lang="gl">Arquivo web MHTML</comment>
<comment xml:lang="he">ארכיון רשת MHTML</comment>
@@ -15860,7 +16497,7 @@
<comment xml:lang="oc">archiu web MHTML</comment>
<comment xml:lang="pl">Archiwum witryny MHTML</comment>
<comment xml:lang="pt">arquivo web MHTML</comment>
- <comment xml:lang="pt_BR">Pacote web MHTML</comment>
+ <comment xml:lang="pt-BR">Pacote web MHTML</comment>
<comment xml:lang="ru">Веб-архив MHTML</comment>
<comment xml:lang="sk">Webový archív MHTML</comment>
<comment xml:lang="sl">Spletni arhiv MHTML</comment>
@@ -15868,8 +16505,8 @@
<comment xml:lang="sv">MHTML-webbarkiv</comment>
<comment xml:lang="tr">MHTML web arşivi</comment>
<comment xml:lang="uk">вебархів MHTML</comment>
- <comment xml:lang="zh_CN">MHTML 网络归档</comment>
- <comment xml:lang="zh_TW">MHTML 網頁封存檔</comment>
+ <comment xml:lang="zh-CN">MHTML 网络归档</comment>
+ <comment xml:lang="zh-TW">MHTML 網頁封存檔</comment>
<acronym>MHTML</acronym>
<expanded-acronym>MIME HTML</expanded-acronym>
<glob pattern="*.mhtml"/>
@@ -15878,6 +16515,7 @@
</mime-type>
<mime-type type="application/mxf">
<comment>MXF video</comment>
+ <comment xml:lang="af">MXF-video</comment>
<comment xml:lang="ar">MXF مرئي</comment>
<comment xml:lang="ast">Videu en MXF</comment>
<comment xml:lang="bg">Видео — MXF</comment>
@@ -15886,13 +16524,14 @@
<comment xml:lang="da">MXF-video</comment>
<comment xml:lang="de">MXF-Video</comment>
<comment xml:lang="el">Βίντεο MXF</comment>
- <comment xml:lang="en_GB">MXF video</comment>
+ <comment xml:lang="en-GB">MXF video</comment>
<comment xml:lang="eo">MXF-video</comment>
<comment xml:lang="es">vídeo MXF</comment>
<comment xml:lang="eu">MXF bideoa</comment>
<comment xml:lang="fi">MXF-video</comment>
<comment xml:lang="fo">MXF video</comment>
<comment xml:lang="fr">vidéo MXF</comment>
+ <comment xml:lang="fur">video MXF</comment>
<comment xml:lang="ga">físeán MXF</comment>
<comment xml:lang="gl">vídeo MXF</comment>
<comment xml:lang="he">וידאו MXF</comment>
@@ -15911,7 +16550,7 @@
<comment xml:lang="oc">vidèo MXF</comment>
<comment xml:lang="pl">Plik wideo MXF</comment>
<comment xml:lang="pt">vídeo MXF</comment>
- <comment xml:lang="pt_BR">Vídeo MXF</comment>
+ <comment xml:lang="pt-BR">Vídeo MXF</comment>
<comment xml:lang="ro">Video MXF</comment>
<comment xml:lang="ru">Видео MXF</comment>
<comment xml:lang="sk">Video MXF</comment>
@@ -15920,33 +16559,35 @@
<comment xml:lang="sv">MXF-video</comment>
<comment xml:lang="tr">MXF video</comment>
<comment xml:lang="uk">відеокліп MXF</comment>
- <comment xml:lang="zh_CN">MXF 视频</comment>
- <comment xml:lang="zh_TW">MXF 視訊</comment>
+ <comment xml:lang="zh-CN">MXF 视频</comment>
+ <comment xml:lang="zh-TW">MXF 視訊</comment>
<acronym>MXF</acronym>
<expanded-acronym>Material Exchange Format</expanded-acronym>
<generic-icon name="video-x-generic"/>
<magic priority="50">
- <match value="\x06\x0e\x2b\x34\x02\x05\x01\x01\x0d\x01\x02\x01\x01\x02" type="string" offset="0:256"/>
+ <match type="string" value="\x06\x0e\x2b\x34\x02\x05\x01\x01\x0d\x01\x02\x01\x01\x02" offset="0:256"/>
</magic>
<glob pattern="*.mxf"/>
</mime-type>
<mime-type type="text/x-ocl">
<comment>OCL file</comment>
+ <comment xml:lang="af">OCL-lêer</comment>
<comment xml:lang="ar">ملف OCL</comment>
- <comment xml:lang="be@latin">Fajł OCL</comment>
+ <comment xml:lang="be-Latn">Fajł OCL</comment>
<comment xml:lang="bg">Файл — OCL</comment>
<comment xml:lang="ca">fitxer OCL</comment>
<comment xml:lang="cs">soubor OCL</comment>
<comment xml:lang="da">OCL-fil</comment>
<comment xml:lang="de">OCL-Datei</comment>
<comment xml:lang="el">Αρχείο OCL</comment>
- <comment xml:lang="en_GB">OCL file</comment>
+ <comment xml:lang="en-GB">OCL file</comment>
<comment xml:lang="eo">OCL-dosiero</comment>
<comment xml:lang="es">archivo OCL</comment>
<comment xml:lang="eu">OCL fitxategia</comment>
<comment xml:lang="fi">OCL-tiedosto</comment>
<comment xml:lang="fo">OCL fíla</comment>
<comment xml:lang="fr">fichier OCL</comment>
+ <comment xml:lang="fur">file OCL</comment>
<comment xml:lang="ga">comhad OCL</comment>
<comment xml:lang="gl">ficheiro OCL</comment>
<comment xml:lang="he">קובץ OCL</comment>
@@ -15966,7 +16607,7 @@
<comment xml:lang="oc">fichièr OCL</comment>
<comment xml:lang="pl">Plik OCL</comment>
<comment xml:lang="pt">ficheiro OCL</comment>
- <comment xml:lang="pt_BR">Arquivo OCL</comment>
+ <comment xml:lang="pt-BR">Arquivo OCL</comment>
<comment xml:lang="ro">Fișier OCL</comment>
<comment xml:lang="ru">Файл OCL</comment>
<comment xml:lang="sk">Súbor OCL</comment>
@@ -15977,54 +16618,39 @@
<comment xml:lang="tr">OCL dosyası</comment>
<comment xml:lang="uk">файл OCL</comment>
<comment xml:lang="vi">Tập tin OCL</comment>
- <comment xml:lang="zh_CN">OCL 文件</comment>
- <comment xml:lang="zh_TW">OCL 檔</comment>
+ <comment xml:lang="zh-CN">OCL 文件</comment>
+ <comment xml:lang="zh-TW">OCL 檔</comment>
<acronym>OCL</acronym>
<expanded-acronym>Object Constraint Language</expanded-acronym>
<sub-class-of type="text/plain"/>
<glob pattern="*.ocl"/>
</mime-type>
<mime-type type="text/x-cobol">
- <comment>COBOL source file</comment>
+ <comment>COBOL source code</comment>
<comment xml:lang="bg">Изходен код — COBOL</comment>
<comment xml:lang="ca">codi font en COBOL</comment>
- <comment xml:lang="cs">zdrojový soubor COBOL</comment>
- <comment xml:lang="da">COBOL-kildefil</comment>
- <comment xml:lang="de">COBOL-Quelldatei</comment>
- <comment xml:lang="el">Πηγαίο αρχείο COBOL</comment>
- <comment xml:lang="en_GB">COBOL source file</comment>
- <comment xml:lang="eo">COBOL-fontdosiero</comment>
- <comment xml:lang="es">archivo fuente de COBOL</comment>
+ <comment xml:lang="da">COBOL-kildekode</comment>
+ <comment xml:lang="de">COBOL-Quelltext</comment>
+ <comment xml:lang="en-GB">COBOL source code</comment>
+ <comment xml:lang="es">código fuente en COBOL</comment>
<comment xml:lang="eu">COBOL iturburu-kodea</comment>
<comment xml:lang="fi">COBOL-lähdekoodi</comment>
- <comment xml:lang="fr">fichier source COBOL</comment>
- <comment xml:lang="ga">cód foinseach COBOL</comment>
- <comment xml:lang="gl">ficheiro fonte de COBOL</comment>
- <comment xml:lang="he">קובץ מקור של COBOL</comment>
- <comment xml:lang="hr">COBOL izvorna datoteka</comment>
- <comment xml:lang="hu">COBOL forrásfájl</comment>
- <comment xml:lang="ia">File de codice fonte COBOL</comment>
- <comment xml:lang="id">Berkas sumber COBOL</comment>
- <comment xml:lang="it">File sorgente COBOL</comment>
- <comment xml:lang="ja">COBOL ソースファイル</comment>
- <comment xml:lang="ka">COBOL-ის საწყისი ფაილი</comment>
+ <comment xml:lang="fr">code source COBOL</comment>
+ <comment xml:lang="hr">COBOL izvorni kôd</comment>
+ <comment xml:lang="hu">COBOL forráskód</comment>
+ <comment xml:lang="id">Kode sumber COBOL</comment>
+ <comment xml:lang="it">Codice sorgente COBOL</comment>
<comment xml:lang="kk">COBOL бастапқы коды</comment>
- <comment xml:lang="ko">COBOL 소스 파일</comment>
- <comment xml:lang="lv">COBOL pirmkods</comment>
- <comment xml:lang="nl">COBOL bronbestand</comment>
- <comment xml:lang="oc">fichièr font COBOL</comment>
- <comment xml:lang="pl">Plik źródłowy COBOL</comment>
- <comment xml:lang="pt">ficheiro origem COBOL</comment>
- <comment xml:lang="pt_BR">Arquivo de código-fonte em COBOL</comment>
- <comment xml:lang="ru">Файл исходного кода на COBOL</comment>
- <comment xml:lang="sk">Zdrojový súbor COBOLu</comment>
- <comment xml:lang="sl">Izvorna koda COBOL</comment>
- <comment xml:lang="sr">изворна датотека КОБОЛ-а</comment>
- <comment xml:lang="sv">COBOL-källkodsfil</comment>
- <comment xml:lang="tr">COBOL kaynak dosyası</comment>
+ <comment xml:lang="ko">코볼 소스 코드</comment>
+ <comment xml:lang="pl">Kod źródłowy COBOL</comment>
+ <comment xml:lang="pt-BR">Código-fonte COBOL</comment>
+ <comment xml:lang="ru">Исходный код COBOL</comment>
+ <comment xml:lang="sk">Zdrojový kód COBOL</comment>
+ <comment xml:lang="sv">COBOL-källkod</comment>
+ <comment xml:lang="tr">COBOL kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою COBOL</comment>
- <comment xml:lang="zh_CN">COBOL 源文件</comment>
- <comment xml:lang="zh_TW">COBOL 源檔</comment>
+ <comment xml:lang="zh-CN">COBOL 源代码</comment>
+ <comment xml:lang="zh-TW">COBOL 原始碼</comment>
<acronym>COBOL</acronym>
<expanded-acronym>COmmon Business Oriented Language</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -16033,24 +16659,26 @@
</mime-type>
<mime-type type="application/x-mobipocket-ebook">
<comment>Mobipocket e-book</comment>
+ <comment xml:lang="af">Mobipocket e-boek</comment>
<comment xml:lang="bg">Е-книга — Mobipocket</comment>
<comment xml:lang="ca">llibre electrònic Mobipocket </comment>
<comment xml:lang="cs">elektronická kniha Mobipocket</comment>
<comment xml:lang="da">Mobipocket e-bog</comment>
<comment xml:lang="de">Mobipocket E-Book</comment>
<comment xml:lang="el">Ηλεκτρονικό βιβλίο Mobipocket</comment>
- <comment xml:lang="en_GB">Mobipocket e-book</comment>
+ <comment xml:lang="en-GB">Mobipocket e-book</comment>
<comment xml:lang="es">libro electrónico de Mobipocket</comment>
<comment xml:lang="eu">Mobipocket liburua</comment>
<comment xml:lang="fi">Mobipocket e-kirja</comment>
<comment xml:lang="fr">livre numérique Mobipocket</comment>
+ <comment xml:lang="fur">e-book Mobipocket</comment>
<comment xml:lang="ga">r-leabhar Mobipocket</comment>
<comment xml:lang="gl">E-book Mobipocket</comment>
<comment xml:lang="he">ספר אלקטרוני של Mobipocket</comment>
<comment xml:lang="hr">Mobipocket e-knjiga</comment>
<comment xml:lang="hu">Mobipocket e-könyv</comment>
<comment xml:lang="ia">E-libro Mobipocket</comment>
- <comment xml:lang="id">e-book Mobipocket</comment>
+ <comment xml:lang="id">E-book Mobipocket</comment>
<comment xml:lang="it">E-book Mobipocket</comment>
<comment xml:lang="ja">Mobipocket 電子書籍</comment>
<comment xml:lang="ka">Mobipocket-ის ელწიგნი</comment>
@@ -16061,7 +16689,7 @@
<comment xml:lang="oc">libre numeric Mobipocket</comment>
<comment xml:lang="pl">E-book Mobipocket</comment>
<comment xml:lang="pt">ebook Mobipocket</comment>
- <comment xml:lang="pt_BR">E-book Mobipocket</comment>
+ <comment xml:lang="pt-BR">E-book Mobipocket</comment>
<comment xml:lang="ru">Электронная книга Mobipocket</comment>
<comment xml:lang="sk">E-kniha Mobipocket</comment>
<comment xml:lang="sl">e-knjiga Mobipocket</comment>
@@ -16069,38 +16697,40 @@
<comment xml:lang="sv">Mobipocket-e-bok</comment>
<comment xml:lang="tr">Mobipocket e-kitap</comment>
<comment xml:lang="uk">електронна книга Mobipocket</comment>
- <comment xml:lang="zh_CN">Mobipocket 电子书</comment>
- <comment xml:lang="zh_TW">Mobipocket e-book</comment>
+ <comment xml:lang="zh-CN">Mobipocket 电子书</comment>
+ <comment xml:lang="zh-TW">Mobipocket e-book</comment>
<sub-class-of type="application/vnd.palm"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.mobi"/>
<glob pattern="*.prc"/>
<magic priority="30">
-
- <match value="TEXtREAd" type="string" offset="60"/>
+ <!-- This also matches AportisDoc, so lower the priority and prefer extension -->
+ <match type="string" offset="60" value="TEXtREAd"/>
</magic>
<magic priority="80">
- <match value="BOOKMOBI" type="string" offset="60"/>
+ <match type="string" offset="60" value="BOOKMOBI"/>
</magic>
</mime-type>
<mime-type type="application/x-mif">
<comment>Adobe FrameMaker MIF document</comment>
+ <comment xml:lang="af">Adobe FrameMaker MIF-dokument</comment>
<comment xml:lang="ar">مستند أدوبي الصانع للإطارات MIF</comment>
<comment xml:lang="ast">Documentu MIF d'Adobe FrameMaker</comment>
- <comment xml:lang="be@latin">Dakument Adobe FrameMaker MIF</comment>
+ <comment xml:lang="be-Latn">Dakument Adobe FrameMaker MIF</comment>
<comment xml:lang="bg">Документ — Adobe FrameMaker MIF</comment>
<comment xml:lang="ca">document MIF d'Adobe FrameMaker</comment>
<comment xml:lang="cs">dokument Adobe FrameMaker MIF</comment>
<comment xml:lang="da">Adobe FrameMaker MIF-dokument</comment>
<comment xml:lang="de">Adobe-FrameMaker-MIF-Dokument</comment>
<comment xml:lang="el">Έγγραφο MIF του Adobe FrameMaker </comment>
- <comment xml:lang="en_GB">Adobe FrameMaker MIF document</comment>
+ <comment xml:lang="en-GB">Adobe FrameMaker MIF document</comment>
<comment xml:lang="eo">MIF-dokumento de Adobe FrameMaker</comment>
<comment xml:lang="es">documento MIF de Adobe FrameMaker</comment>
<comment xml:lang="eu">Adobe FrameMaker-en MIF dokumentua</comment>
<comment xml:lang="fi">Adobe FrameMaker MIF -asiakirja</comment>
<comment xml:lang="fo">Adobe FrameMaker MIF skjal</comment>
<comment xml:lang="fr">document MIF Adobe FrameMaker</comment>
+ <comment xml:lang="fur">document MIF di Adobe FrameMaker</comment>
<comment xml:lang="ga">cáipéis MIF Adobe FrameMaker</comment>
<comment xml:lang="gl">documento MIF de Adobe FrameMaker</comment>
<comment xml:lang="he">מסמך MIF של Adobe FrameMaker</comment>
@@ -16121,7 +16751,7 @@
<comment xml:lang="oc">document MIF Adobe FrameMaker</comment>
<comment xml:lang="pl">Dokument MIF Adobe FrameMaker</comment>
<comment xml:lang="pt">documento Adobe FrameMaker MIF</comment>
- <comment xml:lang="pt_BR">Documento MIF do Adobe FrameMaker</comment>
+ <comment xml:lang="pt-BR">Documento MIF do Adobe FrameMaker</comment>
<comment xml:lang="ro">Document Adobe FrameMaker MIF</comment>
<comment xml:lang="ru">Документ Adobe FrameMaker MIF</comment>
<comment xml:lang="sk">Dokument Adobe FrameMaker MIF</comment>
@@ -16132,27 +16762,29 @@
<comment xml:lang="tr">Adobe FrameMaker MIF belgesi</comment>
<comment xml:lang="uk">документ Adobe FrameMaker MIF</comment>
<comment xml:lang="vi">Tài liệu Adobe FrameMaker MIF</comment>
- <comment xml:lang="zh_CN">Adobe FrameMaker MIF 文档</comment>
- <comment xml:lang="zh_TW">Adobe FrameMaker MIF 文件</comment>
+ <comment xml:lang="zh-CN">Adobe FrameMaker MIF 文档</comment>
+ <comment xml:lang="zh-TW">Adobe FrameMaker MIF 文件</comment>
<glob pattern="*.mif"/>
</mime-type>
<mime-type type="application/x-mozilla-bookmarks">
<comment>Mozilla bookmarks</comment>
+ <comment xml:lang="af">Mozilla-boekmerke</comment>
<comment xml:lang="ar">علامات موزيلا</comment>
- <comment xml:lang="be@latin">Zakładki Mozilla</comment>
+ <comment xml:lang="be-Latn">Zakładki Mozilla</comment>
<comment xml:lang="bg">Отметки — Mozilla</comment>
<comment xml:lang="ca">llista d'adreces d'interès de Mozilla</comment>
<comment xml:lang="cs">záložky Mozilla</comment>
<comment xml:lang="da">Mozillabogmærker</comment>
<comment xml:lang="de">Mozilla-Lesezeichen</comment>
<comment xml:lang="el">Σελιδοδείκτες Mozilla</comment>
- <comment xml:lang="en_GB">Mozilla bookmarks</comment>
+ <comment xml:lang="en-GB">Mozilla bookmarks</comment>
<comment xml:lang="eo">Mozilla-legosignoj</comment>
<comment xml:lang="es">marcadores de Mozilla</comment>
<comment xml:lang="eu">Mozillako laster-markak</comment>
<comment xml:lang="fi">Mozilla-kirjanmerkit</comment>
<comment xml:lang="fo">Mozilla bókamerki</comment>
<comment xml:lang="fr">marque-pages Mozilla</comment>
+ <comment xml:lang="fur">segnelibris Mozilla</comment>
<comment xml:lang="ga">leabharmharcanna Mozilla</comment>
<comment xml:lang="gl">Marcadores de Mozilla</comment>
<comment xml:lang="he">סימניה של Mozilla</comment>
@@ -16173,7 +16805,7 @@
<comment xml:lang="oc">marcapaginas Mozilla</comment>
<comment xml:lang="pl">Zakładki Mozilla</comment>
<comment xml:lang="pt">marcadores do Mozilla</comment>
- <comment xml:lang="pt_BR">Favoritos do Mozilla</comment>
+ <comment xml:lang="pt-BR">Favoritos do Mozilla</comment>
<comment xml:lang="ro">Semne de carte Mozilla</comment>
<comment xml:lang="ru">Закладки Mozilla</comment>
<comment xml:lang="sk">Záložky Mozilla</comment>
@@ -16184,32 +16816,34 @@
<comment xml:lang="tr">Mozilla yer imleri</comment>
<comment xml:lang="uk">закладки Mozilla</comment>
<comment xml:lang="vi">Liên kết đã lưu Mozilla</comment>
- <comment xml:lang="zh_CN">Mozilla 书签</comment>
- <comment xml:lang="zh_TW">Mozilla 書籤</comment>
+ <comment xml:lang="zh-CN">Mozilla 书签</comment>
+ <comment xml:lang="zh-TW">Mozilla 書籤</comment>
<sub-class-of type="text/html"/>
<generic-icon name="text-html"/>
<magic priority="80">
- <match value="&lt;!DOCTYPE NETSCAPE-Bookmark-file-1&gt;" type="string" offset="0:64"/>
+ <match type="string" value="&lt;!DOCTYPE NETSCAPE-Bookmark-file-1&gt;" offset="0:64"/>
</magic>
<alias type="application/x-netscape-bookmarks"/>
</mime-type>
<mime-type type="application/x-ms-dos-executable">
<comment>DOS/Windows executable</comment>
+ <comment xml:lang="af">DOS/Windows-uitvoerbaar</comment>
<comment xml:lang="ar">تنفيذي DOS/Windows</comment>
- <comment xml:lang="be@latin">Vykonvalny fajł DOS/Windows</comment>
+ <comment xml:lang="be-Latn">Vykonvalny fajł DOS/Windows</comment>
<comment xml:lang="bg">Изпълним файл — DOS/Windows</comment>
<comment xml:lang="ca">executable de DOS o de Windows</comment>
<comment xml:lang="cs">spustitelný soubor pro DOS/Windows</comment>
<comment xml:lang="da">DOS-/Windowskørbar</comment>
<comment xml:lang="de">DOS/Windows-Programmdatei</comment>
<comment xml:lang="el">Εκτελέσιμο DOS/Windows</comment>
- <comment xml:lang="en_GB">DOS/Windows executable</comment>
+ <comment xml:lang="en-GB">DOS/Windows executable</comment>
<comment xml:lang="eo">DOS/Windows-plenumebla</comment>
<comment xml:lang="es">ejecutable de DOS/Windows</comment>
<comment xml:lang="eu">DOS/Windows-eko exekutagarria</comment>
<comment xml:lang="fi">DOS/Windows-ohjelma</comment>
<comment xml:lang="fo">DOS/Windows inningarfør</comment>
<comment xml:lang="fr">exécutable DOS/Windows</comment>
+ <comment xml:lang="fur">eseguibil DOS/Windows</comment>
<comment xml:lang="ga">comhad inrite DOS/Windows</comment>
<comment xml:lang="gl">executábel de DOS/Windows</comment>
<comment xml:lang="he">קובץ בר־הרצה של DOS/חלונות</comment>
@@ -16231,7 +16865,7 @@
<comment xml:lang="oc">executable DOS/Windows</comment>
<comment xml:lang="pl">Program DOS/Windows</comment>
<comment xml:lang="pt">executável DOS/Windows</comment>
- <comment xml:lang="pt_BR">Executável do DOS/Windows</comment>
+ <comment xml:lang="pt-BR">Executável do DOS/Windows</comment>
<comment xml:lang="ro">Executabil DOS/Windows</comment>
<comment xml:lang="ru">Исполняемый файл DOS/Windows</comment>
<comment xml:lang="sk">Spustiteľný súbor pre DOS/Windows</comment>
@@ -16239,33 +16873,35 @@
<comment xml:lang="sq">I ekzekutueshëm DOS/Windows</comment>
<comment xml:lang="sr">ДОС/Виндоуз извршна</comment>
<comment xml:lang="sv">Körbar DOS/Windows-fil</comment>
- <comment xml:lang="tr">DOS/Windows çalıştırılabilir</comment>
+ <comment xml:lang="tr">DOS/Windows çalıştırılabiliri</comment>
<comment xml:lang="uk">виконуваний файл DOS/Windows</comment>
<comment xml:lang="vi">Tập tin có thực hiện được DOS/Windows</comment>
- <comment xml:lang="zh_CN">DOS/Windows 可执行文件</comment>
- <comment xml:lang="zh_TW">DOS/Windows 可執行檔</comment>
+ <comment xml:lang="zh-CN">DOS/Windows 可执行文件</comment>
+ <comment xml:lang="zh-TW">DOS/Windows 可執行檔</comment>
<generic-icon name="application-x-executable"/>
<magic priority="50">
- <match value="MZ" type="string" offset="0"/>
+ <match type="string" value="MZ" offset="0"/>
</magic>
<glob pattern="*.exe"/>
</mime-type>
<mime-type type="application/x-mswinurl">
<comment>Internet shortcut</comment>
+ <comment xml:lang="af">Internet-kortpad</comment>
<comment xml:lang="ar">اختصار الإنترنت</comment>
- <comment xml:lang="be@latin">Sieciŭnaja spasyłka</comment>
+ <comment xml:lang="be-Latn">Sieciŭnaja spasyłka</comment>
<comment xml:lang="bg">Адрес в Интернет</comment>
<comment xml:lang="ca">drecera d'Internet</comment>
<comment xml:lang="cs">odkaz do Internetu</comment>
<comment xml:lang="da">Internetgenvej</comment>
<comment xml:lang="de">Internet-Verweis</comment>
<comment xml:lang="el">Συντόμευση διαδικτύου</comment>
- <comment xml:lang="en_GB">Internet shortcut</comment>
+ <comment xml:lang="en-GB">Internet shortcut</comment>
<comment xml:lang="es">acceso directo a Internet</comment>
<comment xml:lang="eu">Interneteko lasterbidea</comment>
<comment xml:lang="fi">Internet-pikakuvake</comment>
<comment xml:lang="fo">Alnetssnarvegur</comment>
<comment xml:lang="fr">raccourci Internet</comment>
+ <comment xml:lang="fur">scurte di internet</comment>
<comment xml:lang="ga">aicearra Idirlín</comment>
<comment xml:lang="gl">atallo de Internet</comment>
<comment xml:lang="he">קיצור דרך של האינטרנט</comment>
@@ -16285,7 +16921,7 @@
<comment xml:lang="oc">acorchi Internet</comment>
<comment xml:lang="pl">Skrót internetowy</comment>
<comment xml:lang="pt">atalho da Internet</comment>
- <comment xml:lang="pt_BR">Atalho da Internet</comment>
+ <comment xml:lang="pt-BR">Atalho da Internet</comment>
<comment xml:lang="ro">Scurtătură Internet</comment>
<comment xml:lang="ru">Интернет-ссылка</comment>
<comment xml:lang="sk">Internetový odkaz</comment>
@@ -16296,34 +16932,36 @@
<comment xml:lang="tr">İnternet kısayolu</comment>
<comment xml:lang="uk">інтернет-посилання</comment>
<comment xml:lang="vi">Lối tắt Internet</comment>
- <comment xml:lang="zh_CN">Internet 快捷方式</comment>
- <comment xml:lang="zh_TW">網際網路捷徑</comment>
+ <comment xml:lang="zh-CN">Internet 快捷方式</comment>
+ <comment xml:lang="zh-TW">網際網路捷徑</comment>
<magic priority="50">
- <match value="InternetShortcut" type="string" offset="1"/>
- <match value="DEFAULT" type="string" offset="1">
- <match value="BASEURL=" type="string" offset="11"/>
+ <match type="string" value="InternetShortcut" offset="1"/>
+ <match type="string" value="DEFAULT" offset="1">
+ <match type="string" value="BASEURL=" offset="11"/>
</match>
</magic>
<glob pattern="*.url"/>
</mime-type>
<mime-type type="application/x-mswrite">
<comment>WRI document</comment>
+ <comment xml:lang="af">WRI-dokument</comment>
<comment xml:lang="ar">مستند WRI</comment>
<comment xml:lang="ast">Documentu WRI</comment>
- <comment xml:lang="be@latin">Dakument WRI</comment>
+ <comment xml:lang="be-Latn">Dakument WRI</comment>
<comment xml:lang="bg">Документ — WRI</comment>
<comment xml:lang="ca">document WRI</comment>
<comment xml:lang="cs">dokument WRI</comment>
<comment xml:lang="da">WRI-dokument</comment>
<comment xml:lang="de">WRI-Dokument</comment>
<comment xml:lang="el">Έγγραφο WRI</comment>
- <comment xml:lang="en_GB">WRI document</comment>
+ <comment xml:lang="en-GB">WRI document</comment>
<comment xml:lang="eo">WRI-dokumento</comment>
<comment xml:lang="es">documento WRI</comment>
<comment xml:lang="eu">WRI dokumentua</comment>
<comment xml:lang="fi">WRI-asiakirja</comment>
<comment xml:lang="fo">WRI skjal</comment>
<comment xml:lang="fr">document WRI</comment>
+ <comment xml:lang="fur">document WRI</comment>
<comment xml:lang="ga">cáipéis WRI</comment>
<comment xml:lang="gl">documento WRI</comment>
<comment xml:lang="he">מסמך WRI</comment>
@@ -16343,7 +16981,7 @@
<comment xml:lang="oc">document WRI</comment>
<comment xml:lang="pl">Dokument WRI</comment>
<comment xml:lang="pt">documento WRI</comment>
- <comment xml:lang="pt_BR">Documento WRI</comment>
+ <comment xml:lang="pt-BR">Documento WRI</comment>
<comment xml:lang="ro">Document WRI</comment>
<comment xml:lang="ru">Документ WRI</comment>
<comment xml:lang="sk">Dokument WRI</comment>
@@ -16354,29 +16992,30 @@
<comment xml:lang="tr">WRI belgesi</comment>
<comment xml:lang="uk">документ WRI</comment>
<comment xml:lang="vi">Tài liệu WRI</comment>
- <comment xml:lang="zh_CN">WRI 文档</comment>
- <comment xml:lang="zh_TW">WRI 文件</comment>
+ <comment xml:lang="zh-CN">WRI 文档</comment>
+ <comment xml:lang="zh-TW">WRI 文件</comment>
<generic-icon name="x-office-document"/>
<glob pattern="*.wri"/>
</mime-type>
<mime-type type="application/x-msx-rom">
<comment>MSX ROM</comment>
<comment xml:lang="ar">MSX ROM</comment>
- <comment xml:lang="be@latin">MSX ROM</comment>
+ <comment xml:lang="be-Latn">MSX ROM</comment>
<comment xml:lang="bg">ROM — MSX</comment>
<comment xml:lang="ca">ROM de MSX</comment>
<comment xml:lang="cs">ROM pro MSX</comment>
<comment xml:lang="cy">ROM MSX</comment>
- <comment xml:lang="da">MSX-rom</comment>
+ <comment xml:lang="da">MSX-ROM</comment>
<comment xml:lang="de">MSX ROM</comment>
<comment xml:lang="el">MSX ROM</comment>
- <comment xml:lang="en_GB">MSX ROM</comment>
+ <comment xml:lang="en-GB">MSX ROM</comment>
<comment xml:lang="eo">MSX-NLM</comment>
<comment xml:lang="es">ROM de MSX</comment>
<comment xml:lang="eu">MSX-ko ROMa</comment>
<comment xml:lang="fi">MSX-ROM</comment>
<comment xml:lang="fo">MSX ROM</comment>
<comment xml:lang="fr">ROM MSX</comment>
+ <comment xml:lang="fur">ROM MSX</comment>
<comment xml:lang="ga">ROM MSX</comment>
<comment xml:lang="gl">ROM de MSX</comment>
<comment xml:lang="he">MSX ROM</comment>
@@ -16398,7 +17037,7 @@
<comment xml:lang="oc">ROM MSX</comment>
<comment xml:lang="pl">Plik ROM konsoli MSX</comment>
<comment xml:lang="pt">ROM MSX</comment>
- <comment xml:lang="pt_BR">ROM de MSX</comment>
+ <comment xml:lang="pt-BR">ROM de MSX</comment>
<comment xml:lang="ro">ROM MSX</comment>
<comment xml:lang="ru">MSX ROM</comment>
<comment xml:lang="sk">ROM pre MSX</comment>
@@ -16409,27 +17048,29 @@
<comment xml:lang="tr">MSX ROM</comment>
<comment xml:lang="uk">ППП MSX</comment>
<comment xml:lang="vi">ROM MSX</comment>
- <comment xml:lang="zh_CN">MSX ROM</comment>
- <comment xml:lang="zh_TW">MSX ROM</comment>
+ <comment xml:lang="zh-CN">MSX ROM</comment>
+ <comment xml:lang="zh-TW">MSX ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.msx"/>
</mime-type>
<mime-type type="application/x-m4">
<comment>M4 macro</comment>
+ <comment xml:lang="af">M4-makro</comment>
<comment xml:lang="ar">M4 macro</comment>
- <comment xml:lang="be@latin">Makras M4</comment>
+ <comment xml:lang="be-Latn">Makras M4</comment>
<comment xml:lang="bg">Макроси — M4</comment>
<comment xml:lang="ca">macro M4</comment>
<comment xml:lang="cs">makro M4</comment>
<comment xml:lang="da">M4-makro</comment>
<comment xml:lang="de">M4-Makro</comment>
<comment xml:lang="el">Μακροεντολή m4</comment>
- <comment xml:lang="en_GB">M4 macro</comment>
+ <comment xml:lang="en-GB">M4 macro</comment>
<comment xml:lang="es">macro M4</comment>
<comment xml:lang="eu">M4 makroa</comment>
<comment xml:lang="fi">M4-makro</comment>
<comment xml:lang="fo">M4 fjølvi</comment>
<comment xml:lang="fr">macro M4</comment>
+ <comment xml:lang="fur">macro M4</comment>
<comment xml:lang="ga">macra M4</comment>
<comment xml:lang="gl">macro M4</comment>
<comment xml:lang="he">מאקרו M4</comment>
@@ -16449,7 +17090,7 @@
<comment xml:lang="oc">macro M4</comment>
<comment xml:lang="pl">Makro M4</comment>
<comment xml:lang="pt">macro M4</comment>
- <comment xml:lang="pt_BR">Macro M4</comment>
+ <comment xml:lang="pt-BR">Macro M4</comment>
<comment xml:lang="ro">Macro M4</comment>
<comment xml:lang="ru">Макрос M4</comment>
<comment xml:lang="sk">Makro M4</comment>
@@ -16460,8 +17101,8 @@
<comment xml:lang="tr">M4 makrosu</comment>
<comment xml:lang="uk">макрос M4</comment>
<comment xml:lang="vi">Vĩ lệnh M4</comment>
- <comment xml:lang="zh_CN">M4 宏</comment>
- <comment xml:lang="zh_TW">M4 巨集</comment>
+ <comment xml:lang="zh-CN">M4 宏</comment>
+ <comment xml:lang="zh-TW">M4 巨集</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-script"/>
<glob pattern="*.m4"/>
@@ -16469,20 +17110,21 @@
<mime-type type="application/x-n64-rom">
<comment>Nintendo64 ROM</comment>
<comment xml:lang="ar">Nintendo64 ROM</comment>
- <comment xml:lang="be@latin">Nintendo64 ROM</comment>
+ <comment xml:lang="be-Latn">Nintendo64 ROM</comment>
<comment xml:lang="bg">ROM — Nintendo64</comment>
<comment xml:lang="ca">ROM de Nintendo64</comment>
<comment xml:lang="cs">ROM pro Nintendo64</comment>
- <comment xml:lang="da">Nintendo64-rom</comment>
+ <comment xml:lang="da">Nintendo64-ROM</comment>
<comment xml:lang="de">Nintendo64 ROM</comment>
<comment xml:lang="el">Nintendo64 ROM</comment>
- <comment xml:lang="en_GB">Nintendo64 ROM</comment>
+ <comment xml:lang="en-GB">Nintendo64 ROM</comment>
<comment xml:lang="eo">Nintendo64-NLM</comment>
<comment xml:lang="es">ROM de Nintendo64</comment>
<comment xml:lang="eu">Nintendo64-ko ROMa</comment>
<comment xml:lang="fi">Nintendo64-ROM</comment>
<comment xml:lang="fo">Nintendo64 ROM</comment>
<comment xml:lang="fr">ROM Nintendo64</comment>
+ <comment xml:lang="fur">ROM Nintendo64</comment>
<comment xml:lang="ga">ROM Nintendo64</comment>
<comment xml:lang="gl">ROM de Nintendo64</comment>
<comment xml:lang="he">ROM של Nintendo64</comment>
@@ -16503,7 +17145,7 @@
<comment xml:lang="oc">ROM Nintendo64</comment>
<comment xml:lang="pl">Plik ROM konsoli Nintendo64</comment>
<comment xml:lang="pt">ROM Nintendo64</comment>
- <comment xml:lang="pt_BR">ROM de Nintendo64</comment>
+ <comment xml:lang="pt-BR">ROM de Nintendo64</comment>
<comment xml:lang="ro">ROM Nintendo64</comment>
<comment xml:lang="ru">Nintendo64 ROM</comment>
<comment xml:lang="sk">ROM pre Nintendo64</comment>
@@ -16514,26 +17156,27 @@
<comment xml:lang="tr">Nintendo64 ROM</comment>
<comment xml:lang="uk">ППП Nintendo64</comment>
<comment xml:lang="vi">ROM Nintendo64</comment>
- <comment xml:lang="zh_CN">任天堂 64 ROM</comment>
- <comment xml:lang="zh_TW">Nintendo64 ROM</comment>
+ <comment xml:lang="zh-CN">任天堂 64 ROM</comment>
+ <comment xml:lang="zh-TW">Nintendo64 ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.n64"/>
<glob pattern="*.z64"/>
<glob pattern="*.v64"/>
<magic>
-
- <match value="0x80371240" type="big32" offset="0"/>
-
- <match value="0x37804012" type="big32" offset="0"/>
-
- <match value="0x40123780" type="big32" offset="0"/>
+ <!-- native *.z64 -->
+ <match type="big32" offset="0" value="0x80371240"/>
+ <!-- byteswapped [BADC] *.v64 -->
+ <match type="big32" offset="0" value="0x37804012"/>
+ <!-- wordswapped [DCBA] *.n64 -->
+ <match type="big32" offset="0" value="0x40123780"/>
</magic>
</mime-type>
<mime-type type="application/x-nautilus-link">
<comment>Nautilus link</comment>
+ <comment xml:lang="af">Nautilus-skakel</comment>
<comment xml:lang="ar">وصلة Nautilus</comment>
<comment xml:lang="az">Nautilus körpüsü</comment>
- <comment xml:lang="be@latin">Spasyłka Nautilus</comment>
+ <comment xml:lang="be-Latn">Spasyłka Nautilus</comment>
<comment xml:lang="bg">Връзка — Nautilus</comment>
<comment xml:lang="ca">enllaç de Nautilus</comment>
<comment xml:lang="cs">odkaz Nautilus</comment>
@@ -16541,13 +17184,14 @@
<comment xml:lang="da">Nautilus-henvisning</comment>
<comment xml:lang="de">Nautilus-Verknüpfung</comment>
<comment xml:lang="el">Σύνδεσμος Nautilus</comment>
- <comment xml:lang="en_GB">Nautilus link</comment>
+ <comment xml:lang="en-GB">Nautilus link</comment>
<comment xml:lang="eo">Nautilus-ligilo</comment>
<comment xml:lang="es">enlace de Nautilus</comment>
<comment xml:lang="eu">Nautilus esteka</comment>
<comment xml:lang="fi">Nautilus-linkki</comment>
<comment xml:lang="fo">Nautilus leinkja</comment>
<comment xml:lang="fr">lien Nautilus</comment>
+ <comment xml:lang="fur">colegament Nautilus</comment>
<comment xml:lang="ga">nasc Nautilus</comment>
<comment xml:lang="gl">ligazón de nautilus</comment>
<comment xml:lang="he">קישור של Nautilus</comment>
@@ -16568,7 +17212,7 @@
<comment xml:lang="oc">ligam Nautilus</comment>
<comment xml:lang="pl">Odnośnik Nautilus</comment>
<comment xml:lang="pt">atalho Nautilus</comment>
- <comment xml:lang="pt_BR">Link do Nautilus</comment>
+ <comment xml:lang="pt-BR">Link do Nautilus</comment>
<comment xml:lang="ro">Legătură Nautilus</comment>
<comment xml:lang="ru">Ссылка Nautilus</comment>
<comment xml:lang="sk">Odkaz Nautilus</comment>
@@ -16579,25 +17223,27 @@
<comment xml:lang="tr">Nautilus bağlantısı</comment>
<comment xml:lang="uk">посилання Nautilus</comment>
<comment xml:lang="vi">Liên kết Nautilus</comment>
- <comment xml:lang="zh_CN">Nautilus 链接</comment>
- <comment xml:lang="zh_TW">Nautilus 鏈結</comment>
+ <comment xml:lang="zh-CN">Nautilus 链接</comment>
+ <comment xml:lang="zh-TW">Nautilus 連結</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<magic priority="50">
- <match value="&lt;nautilus_object nautilus_link" type="string" offset="0:32"/>
+ <match type="string" value="&lt;nautilus_object nautilus_link" offset="0:32"/>
</magic>
</mime-type>
<mime-type type="application/x-neo-geo-pocket-rom">
<comment>Neo-Geo Pocket ROM</comment>
+ <comment xml:lang="bg">ROM — Neo-Geo Pocket</comment>
<comment xml:lang="ca">ROM de Neo-Geo Pocket</comment>
<comment xml:lang="cs">ROM pro Neo-Geo Pocket</comment>
- <comment xml:lang="da">Neo-Geo Pocket ROM</comment>
+ <comment xml:lang="da">Neo-Geo Pocket-ROM</comment>
<comment xml:lang="de">Neo-Geo Pocket ROM</comment>
- <comment xml:lang="en_GB">Neo-Geo Pocket ROM</comment>
+ <comment xml:lang="en-GB">Neo-Geo Pocket ROM</comment>
<comment xml:lang="es">ROM de Neo-Geo Pocket</comment>
<comment xml:lang="eu">Neo-Geo Pocket ROM</comment>
<comment xml:lang="fi">Neo-Geo Pocket -ROM</comment>
<comment xml:lang="fr">ROM Neo-Geo Pocket</comment>
+ <comment xml:lang="fur">ROM Neo-Geo Pocket</comment>
<comment xml:lang="ga">ROM Neo-Geo Pocket</comment>
<comment xml:lang="hr">Neo-Geo Pocket ROM</comment>
<comment xml:lang="hu">Neo-Geo Pocket ROM</comment>
@@ -16606,54 +17252,82 @@
<comment xml:lang="kk">Neo-Geo Pocket ROM</comment>
<comment xml:lang="ko">네오지오 포켓 롬</comment>
<comment xml:lang="pl">Plik ROM konsoli Neo-Geo Pocket</comment>
- <comment xml:lang="pt_BR">ROM de Neo-Geo Pocket</comment>
+ <comment xml:lang="pt-BR">ROM de Neo-Geo Pocket</comment>
<comment xml:lang="ru">Neo-Geo Pocket ROM</comment>
<comment xml:lang="sk">ROM pre Neo-Geo Pocket</comment>
<comment xml:lang="sr">Нео-Гео Покет РОМ</comment>
<comment xml:lang="sv">Neo-Geo Pocket-rom</comment>
<comment xml:lang="tr">Neo-Geo Pocket ROM</comment>
<comment xml:lang="uk">ППП Neo-Geo Pocket</comment>
- <comment xml:lang="zh_CN">Neo-Geo Pocket ROM</comment>
- <comment xml:lang="zh_TW">Neo-Geo Pocket ROM</comment>
+ <comment xml:lang="zh-CN">Neo-Geo Pocket ROM</comment>
+ <comment xml:lang="zh-TW">Neo-Geo Pocket ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.ngp"/>
<magic>
- <match value="0x0" type="byte" offset="35">
- <match value="COPYRIGHT BY SNK CORPORATION" type="string" offset="0"/>
- <match value=" LICENSED BY SNK CORPORATION" type="string" offset="0"/>
+ <match offset="35" type="byte" value="0x0">
+ <match offset="0" type="string" value="COPYRIGHT BY SNK CORPORATION"/>
+ <match offset="0" type="string" value=" LICENSED BY SNK CORPORATION"/>
</match>
</magic>
</mime-type>
<mime-type type="application/x-neo-geo-pocket-color-rom">
<comment>Neo-Geo Pocket Color ROM</comment>
+ <comment xml:lang="bg">ROM — Neo-Geo Pocket Color</comment>
+ <comment xml:lang="ca">ROM de Neo-Geo Pocket Color</comment>
+ <comment xml:lang="cs">ROM pro Neo-Geo Pocket Color</comment>
+ <comment xml:lang="da">Neo-Geo Pocket Color-ROM</comment>
+ <comment xml:lang="de">Neo-Geo Pocket Color ROM</comment>
+ <comment xml:lang="en-GB">Neo-Geo Pocket Colour ROM</comment>
+ <comment xml:lang="es">ROM de Neo-Geo Pocket Color</comment>
+ <comment xml:lang="eu">Neo-Geo Pocket Color ROM</comment>
+ <comment xml:lang="fi">Neo-Geo Pocket Color ROM</comment>
+ <comment xml:lang="fr">ROM Neo-Geo Pocket Color</comment>
+ <comment xml:lang="fur">ROM Neo-Geo Pocket Color</comment>
+ <comment xml:lang="ga">ROM datha Neo-Geo Pocket</comment>
+ <comment xml:lang="hr">Neo-Geo Pocket Color ROM</comment>
+ <comment xml:lang="hu">Neo-Geo Pocket Color ROM</comment>
+ <comment xml:lang="id">ROM Neo-Geo Pocket Color</comment>
+ <comment xml:lang="it">ROM Neo-Geo Pocket Color</comment>
+ <comment xml:lang="kk">Neo-Geo Pocket Color ROM</comment>
+ <comment xml:lang="ko">네오지오 포켓 컬러 롬</comment>
+ <comment xml:lang="pl">Plik ROM konsoli Neo-Geo Pocket Color</comment>
+ <comment xml:lang="pt-BR">ROM de Neo-Geo Pocket Color</comment>
+ <comment xml:lang="ru">Neo-Geo Pocket Color ROM</comment>
+ <comment xml:lang="sk">ROM pre Neo-Geo Pocket Color</comment>
+ <comment xml:lang="sv">Neo-Geo Pocket Color ROM</comment>
+ <comment xml:lang="tr">Neo-Geo Pocket Color ROM</comment>
+ <comment xml:lang="uk">ППП Neo-Geo Pocket Color</comment>
+ <comment xml:lang="zh-CN">Neo-Geo Pocket Color ROM</comment>
+ <comment xml:lang="zh-TW">Neo-Geo Pocket Color ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.ngc"/>
<magic>
- <match value="0x10" type="byte" offset="35">
- <match value="COPYRIGHT BY SNK CORPORATION" type="string" offset="0"/>
- <match value=" LICENSED BY SNK CORPORATION" type="string" offset="0"/>
+ <match offset="35" type="byte" value="0x10">
+ <match offset="0" type="string" value="COPYRIGHT BY SNK CORPORATION"/>
+ <match offset="0" type="string" value=" LICENSED BY SNK CORPORATION"/>
</match>
</magic>
</mime-type>
<mime-type type="application/x-nes-rom">
-
+ <!-- Translate this to Famicom if the console was known as such in your locale -->
<comment>NES ROM</comment>
<comment xml:lang="ar">NES ROM</comment>
- <comment xml:lang="be@latin">NES ROM</comment>
+ <comment xml:lang="be-Latn">NES ROM</comment>
<comment xml:lang="bg">ROM — NES</comment>
<comment xml:lang="ca">ROM de NES</comment>
<comment xml:lang="cs">ROM pro NES</comment>
<comment xml:lang="cy">ROM NES</comment>
- <comment xml:lang="da">NES-rom</comment>
+ <comment xml:lang="da">NES-ROM</comment>
<comment xml:lang="de">NES ROM</comment>
<comment xml:lang="el">NES ROM</comment>
- <comment xml:lang="en_GB">NES ROM</comment>
+ <comment xml:lang="en-GB">NES ROM</comment>
<comment xml:lang="eo">NES-NLM</comment>
<comment xml:lang="es">ROM de NES</comment>
<comment xml:lang="eu">NES-eko ROMa</comment>
<comment xml:lang="fi">NES-ROM</comment>
<comment xml:lang="fo">NES ROM</comment>
<comment xml:lang="fr">ROM NES</comment>
+ <comment xml:lang="fur">ROM NES</comment>
<comment xml:lang="ga">ROM NES</comment>
<comment xml:lang="gl">ROM de NES</comment>
<comment xml:lang="he">ROM של NES</comment>
@@ -16674,7 +17348,7 @@
<comment xml:lang="oc">ROM NES</comment>
<comment xml:lang="pl">Plik ROM konsoli NES</comment>
<comment xml:lang="pt">ROM NES</comment>
- <comment xml:lang="pt_BR">ROM de NES</comment>
+ <comment xml:lang="pt-BR">ROM de NES</comment>
<comment xml:lang="ro">ROM NES</comment>
<comment xml:lang="ru">NES ROM</comment>
<comment xml:lang="sk">ROM pre NES</comment>
@@ -16685,8 +17359,8 @@
<comment xml:lang="tr">NES ROM</comment>
<comment xml:lang="uk">ППП NES</comment>
<comment xml:lang="vi">ROM NES</comment>
- <comment xml:lang="zh_CN">NES ROM</comment>
- <comment xml:lang="zh_TW">任天堂 ROM</comment>
+ <comment xml:lang="zh-CN">NES ROM</comment>
+ <comment xml:lang="zh-TW">任天堂紅白機 ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.nes"/>
<glob pattern="*.nez"/>
@@ -16697,20 +17371,21 @@
<comment>Unidata NetCDF document</comment>
<comment xml:lang="ar">مستند Unidata NetCDF</comment>
<comment xml:lang="ast">Documentu NetCDF d'Unidata</comment>
- <comment xml:lang="be@latin">Dakument Unidata NetCDF</comment>
+ <comment xml:lang="be-Latn">Dakument Unidata NetCDF</comment>
<comment xml:lang="bg">Документ — Unidata NetCDF</comment>
<comment xml:lang="ca">document d'Unidata NetCDF</comment>
<comment xml:lang="cs">dokument Unidata NetCDF</comment>
<comment xml:lang="da">Unidata NetCDF-dokument</comment>
<comment xml:lang="de">Unidata-NetCDF-Dokument</comment>
<comment xml:lang="el">Έγγραφο Unidata NetCDF</comment>
- <comment xml:lang="en_GB">Unidata NetCDF document</comment>
+ <comment xml:lang="en-GB">Unidata NetCDF document</comment>
<comment xml:lang="eo">dokumento en NetCDF-formato de Unidata</comment>
<comment xml:lang="es">documento de Unidata NetCDF</comment>
<comment xml:lang="eu">Unidata NetCDF dokumentua</comment>
<comment xml:lang="fi">Unidata NetCDF -asiakirja</comment>
<comment xml:lang="fo">Unidata NetCDF skjal</comment>
<comment xml:lang="fr">document Unidata NetCDF</comment>
+ <comment xml:lang="fur">document Unidata NetCDF</comment>
<comment xml:lang="ga">cáipéis Unidata NetCDF</comment>
<comment xml:lang="gl">Documentno de Unixdata NetCDF</comment>
<comment xml:lang="he">מסמך של Unidata NetCDF</comment>
@@ -16731,7 +17406,7 @@
<comment xml:lang="oc">document Unidata NetCDF</comment>
<comment xml:lang="pl">Dokument Unidata NetCDF</comment>
<comment xml:lang="pt">documento Unidata NetCDF</comment>
- <comment xml:lang="pt_BR">Documento do Unidata NetCDF</comment>
+ <comment xml:lang="pt-BR">Documento do Unidata NetCDF</comment>
<comment xml:lang="ro">Document Unidata NetCDF</comment>
<comment xml:lang="ru">Документ Unidata NetCDF</comment>
<comment xml:lang="sk">Dokument Unidata NetCDF</comment>
@@ -16742,8 +17417,8 @@
<comment xml:lang="tr">Unidata NetCDF belgesi</comment>
<comment xml:lang="uk">документ Unidata NetCDF</comment>
<comment xml:lang="vi">Tài liệu NetCDF Unidata</comment>
- <comment xml:lang="zh_CN">Unidata NetCDF 文档</comment>
- <comment xml:lang="zh_TW">Unidata NetCDF 文件</comment>
+ <comment xml:lang="zh-CN">Unidata NetCDF 文档</comment>
+ <comment xml:lang="zh-TW">Unidata NetCDF 文件</comment>
<acronym>NetCDF</acronym>
<expanded-acronym>Network Common Data Form</expanded-acronym>
<generic-icon name="x-office-document"/>
@@ -16755,13 +17430,15 @@
<comment xml:lang="bg">Индекс — Usenet, NewzBin</comment>
<comment xml:lang="ca">índex d'Usenet NewzBin</comment>
<comment xml:lang="cs">index NewzBin diskuzních skupin Usenet</comment>
- <comment xml:lang="da">NewzBin-brugernetindex</comment>
+ <comment xml:lang="da">NewzBin usenet-indeks</comment>
<comment xml:lang="de">NewzBin-Usenet-Index</comment>
<comment xml:lang="el">Ευρετήριο usenet NewzBin</comment>
- <comment xml:lang="en_GB">NewzBin usenet index</comment>
+ <comment xml:lang="en-GB">NewzBin usenet index</comment>
<comment xml:lang="es">índice NewzBin de usenet</comment>
<comment xml:lang="eu">NewzBin usenet indizea</comment>
+ <comment xml:lang="fi">NewzBin usenet indeksi</comment>
<comment xml:lang="fr">index usenet </comment>
+ <comment xml:lang="fur">tabele usenet NewzBin</comment>
<comment xml:lang="ga">innéacs usenet NewzBin</comment>
<comment xml:lang="gl">Índice de usenet NEwzBin</comment>
<comment xml:lang="he">אינדקס שרתי חדשות NewzBin</comment>
@@ -16778,7 +17455,7 @@
<comment xml:lang="oc">indèx usenet NewzBin</comment>
<comment xml:lang="pl">Indeks grup dyskusyjnych NewzBin</comment>
<comment xml:lang="pt">índice usenet NewzBin</comment>
- <comment xml:lang="pt_BR">Índice de usenet NewzBin</comment>
+ <comment xml:lang="pt-BR">Índice de usenet NewzBin</comment>
<comment xml:lang="ru">Индекс usenet NewzBin</comment>
<comment xml:lang="sk">Index Usenetu NewzBin</comment>
<comment xml:lang="sl">Kazalo usenet NewzBin</comment>
@@ -16786,30 +17463,32 @@
<comment xml:lang="sv">NewzBin-usenetindex</comment>
<comment xml:lang="tr">NewzBin usenet dizini</comment>
<comment xml:lang="uk">покажчик usenet NewzBin</comment>
- <comment xml:lang="zh_CN">NewzBin Usenet 索引</comment>
- <comment xml:lang="zh_TW">NewzBin usenet 索引</comment>
+ <comment xml:lang="zh-CN">NewzBin Usenet 索引</comment>
+ <comment xml:lang="zh-TW">NewzBin usenet 索引</comment>
<sub-class-of type="application/xml"/>
<magic priority="80">
- <match value="&lt;nzb" type="string" offset="0:256"/>
+ <match type="string" value="&lt;nzb" offset="0:256"/>
</magic>
<glob pattern="*.nzb"/>
</mime-type>
<mime-type type="application/x-object">
<comment>object code</comment>
+ <comment xml:lang="af">objekkode</comment>
<comment xml:lang="ar">رمز الكائن</comment>
- <comment xml:lang="be@latin">abjektny kod</comment>
+ <comment xml:lang="be-Latn">abjektny kod</comment>
<comment xml:lang="bg">Обектен код</comment>
<comment xml:lang="ca">codi objecte</comment>
<comment xml:lang="cs">objektový kód</comment>
<comment xml:lang="da">objektkode</comment>
<comment xml:lang="de">Objektcode</comment>
<comment xml:lang="el">Μεταφρασμένος κώδικας</comment>
- <comment xml:lang="en_GB">object code</comment>
+ <comment xml:lang="en-GB">object code</comment>
<comment xml:lang="eo">celkodo</comment>
<comment xml:lang="es">código objeto</comment>
<comment xml:lang="eu">objektu kodea</comment>
<comment xml:lang="fi">objektikoodi</comment>
<comment xml:lang="fr">code objet</comment>
+ <comment xml:lang="fur">codiç ogjet</comment>
<comment xml:lang="ga">cód réada</comment>
<comment xml:lang="gl">código obxecto</comment>
<comment xml:lang="he">קוד אובייקט</comment>
@@ -16830,7 +17509,7 @@
<comment xml:lang="oc">còde objet</comment>
<comment xml:lang="pl">Kod obiektowy</comment>
<comment xml:lang="pt">código de objeto</comment>
- <comment xml:lang="pt_BR">Código-objeto</comment>
+ <comment xml:lang="pt-BR">Código-objeto</comment>
<comment xml:lang="ro">cod sursă obiect</comment>
<comment xml:lang="ru">Объектный код</comment>
<comment xml:lang="sk">Objektový kód</comment>
@@ -16841,18 +17520,18 @@
<comment xml:lang="tr">nesne kodu</comment>
<comment xml:lang="uk">об'єктний код</comment>
<comment xml:lang="vi">mã đối tượng</comment>
- <comment xml:lang="zh_CN">目标代码</comment>
- <comment xml:lang="zh_TW">目的碼</comment>
+ <comment xml:lang="zh-CN">目标代码</comment>
+ <comment xml:lang="zh-TW">目的碼</comment>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="\177ELF" type="string" offset="0">
- <match value="1" type="byte" offset="5">
- <match value="1" type="little16" offset="16"/>
+ <match type="string" value="\177ELF" offset="0">
+ <match type="byte" value="1" offset="5">
+ <match type="little16" value="1" offset="16"/>
</match>
</match>
- <match value="\177ELF" type="string" offset="0">
- <match value="2" type="byte" offset="5">
- <match value="1" type="big16" offset="16"/>
+ <match type="string" value="\177ELF" offset="0">
+ <match type="byte" value="2" offset="5">
+ <match type="big16" value="1" offset="16"/>
</match>
</match>
</magic>
@@ -16867,12 +17546,13 @@
<comment xml:lang="da">Udvekslingsformat for Annodex</comment>
<comment xml:lang="de">Annodex-Wechselformat</comment>
<comment xml:lang="el">Μορφή ανταλλαγής Annodex</comment>
- <comment xml:lang="en_GB">Annodex exchange format</comment>
+ <comment xml:lang="en-GB">Annodex exchange format</comment>
<comment xml:lang="es">formato de intercambio de Annodex</comment>
<comment xml:lang="eu">Annodex trukatze-formatua</comment>
<comment xml:lang="fi">Annodex-siirtomuoto</comment>
<comment xml:lang="fo">Annodex umbýtingarsnið</comment>
<comment xml:lang="fr">format d'échange Annodex</comment>
+ <comment xml:lang="fur">formât di scambi Annodex</comment>
<comment xml:lang="ga">formáid mhalairte Annodex</comment>
<comment xml:lang="gl">formato intercambiábel de Annodex</comment>
<comment xml:lang="he">תבנית החלפת Annodex</comment>
@@ -16891,7 +17571,7 @@
<comment xml:lang="oc">format d'escambi Annodex</comment>
<comment xml:lang="pl">Format wymiany Annodex</comment>
<comment xml:lang="pt">formato de troca Annodex</comment>
- <comment xml:lang="pt_BR">Formato de troca Annodex</comment>
+ <comment xml:lang="pt-BR">Formato de troca Annodex</comment>
<comment xml:lang="ro">Format schimb Annodex</comment>
<comment xml:lang="ru">Формат обмена Annodex</comment>
<comment xml:lang="sk">Formát pre výmenu Annodex</comment>
@@ -16901,13 +17581,13 @@
<comment xml:lang="tr">Annodex değişim biçimi</comment>
<comment xml:lang="uk">формат обміну даними Annodex</comment>
<comment xml:lang="vi">Định dạng trao đổi Annodex</comment>
- <comment xml:lang="zh_CN">Annodex 交换格式</comment>
- <comment xml:lang="zh_TW">Annodex 交換格式</comment>
+ <comment xml:lang="zh-CN">Annodex 交换格式</comment>
+ <comment xml:lang="zh-TW">Annodex 交換格式</comment>
<generic-icon name="video-x-generic"/>
<magic priority="50">
- <match value="OggS" type="string" offset="0">
- <match value="fishead\0" type="string" offset="28">
- <match value="CMML\0\0\0\0" type="string" offset="56:512"/>
+ <match type="string" value="OggS" offset="0">
+ <match type="string" value="fishead\0" offset="28">
+ <match type="string" value="CMML\0\0\0\0" offset="56:512"/>
</match>
</match>
</magic>
@@ -16915,57 +17595,35 @@
<alias type="application/x-annodex"/>
</mime-type>
<mime-type type="video/annodex">
- <comment>Annodex Video</comment>
- <comment xml:lang="ar">Annodex مرئي</comment>
- <comment xml:lang="ast">Videu n'Annodex</comment>
+ <comment>Annodex video</comment>
<comment xml:lang="bg">Видео — Annodex</comment>
- <comment xml:lang="ca">Annodex Video</comment>
- <comment xml:lang="cs">video Annodex</comment>
- <comment xml:lang="da">Annodexvideo</comment>
+ <comment xml:lang="ca">vídeo Annodex</comment>
+ <comment xml:lang="da">Annodex-video</comment>
<comment xml:lang="de">Annodex-Video</comment>
- <comment xml:lang="el">Βίντεο Annodex</comment>
- <comment xml:lang="en_GB">Annodex Video</comment>
- <comment xml:lang="eo">Annodex-video</comment>
+ <comment xml:lang="en-GB">Annodex video</comment>
<comment xml:lang="es">vídeo Annodex</comment>
<comment xml:lang="eu">Annodex bideoa</comment>
- <comment xml:lang="fi">Annodex-video</comment>
- <comment xml:lang="fo">Annodex video</comment>
+ <comment xml:lang="fi">Annodex video</comment>
<comment xml:lang="fr">vidéo Annodex</comment>
- <comment xml:lang="ga">Físeán Annodex</comment>
- <comment xml:lang="gl">vídeo de Annodex</comment>
- <comment xml:lang="he">וידאו Annodex</comment>
<comment xml:lang="hr">Annodex video snimka</comment>
<comment xml:lang="hu">Annodex videó</comment>
- <comment xml:lang="ia">Video Annodex</comment>
<comment xml:lang="id">Video Annodex</comment>
<comment xml:lang="it">Video Annodex</comment>
- <comment xml:lang="ja">Annodex 動画</comment>
- <comment xml:lang="ka">Annodex-ის ვიდეო</comment>
<comment xml:lang="kk">Annodex видеосы</comment>
<comment xml:lang="ko">Annodex 동영상</comment>
- <comment xml:lang="lt">Annodex vaizdo įrašas</comment>
- <comment xml:lang="lv">Annodex video</comment>
- <comment xml:lang="nl">Annodex Video</comment>
- <comment xml:lang="oc">vidèo Annodex</comment>
<comment xml:lang="pl">Plik wideo Annodex</comment>
- <comment xml:lang="pt">vídeo Annodex</comment>
- <comment xml:lang="pt_BR">Vídeo Annodex</comment>
- <comment xml:lang="ro">Video Annodex</comment>
+ <comment xml:lang="pt-BR">Vídeo Annodex</comment>
<comment xml:lang="ru">Видео Annodex</comment>
- <comment xml:lang="sk">Video Annodex</comment>
- <comment xml:lang="sl">Video datoteka Annodex</comment>
- <comment xml:lang="sr">Анодекс видео</comment>
<comment xml:lang="sv">Annodex-video</comment>
- <comment xml:lang="tr">Annodex Video</comment>
- <comment xml:lang="uk">відеокліп Annodex</comment>
- <comment xml:lang="vi">Ảnh động Annodex</comment>
- <comment xml:lang="zh_CN">Annodex 视频</comment>
- <comment xml:lang="zh_TW">Annodex 視訊</comment>
+ <comment xml:lang="tr">Annodex video</comment>
+ <comment xml:lang="uk">відео Annodex</comment>
+ <comment xml:lang="zh-CN">Annodex 视频</comment>
+ <comment xml:lang="zh-TW">Annodex 視訊</comment>
<sub-class-of type="application/annodex"/>
<magic priority="50">
- <match value="OggS" type="string" offset="0">
- <match value="fishead\0" type="string" offset="28">
- <match value="CMML\0\0\0\0" type="string" offset="56:512"/>
+ <match type="string" value="OggS" offset="0">
+ <match type="string" value="fishead\0" offset="28">
+ <match type="string" value="CMML\0\0\0\0" offset="56:512"/>
</match>
</match>
</magic>
@@ -16973,56 +17631,35 @@
<alias type="video/x-annodex"/>
</mime-type>
<mime-type type="audio/annodex">
- <comment>Annodex Audio</comment>
- <comment xml:lang="ar">Annodex سمعي</comment>
+ <comment>Annodex audio</comment>
<comment xml:lang="bg">Аудио — Annodex</comment>
- <comment xml:lang="ca">Annodex Audio</comment>
- <comment xml:lang="cs">zvuk Annodex</comment>
- <comment xml:lang="da">Annodexlyd</comment>
+ <comment xml:lang="ca">àudio Annodex</comment>
+ <comment xml:lang="da">Annodex-lyd</comment>
<comment xml:lang="de">Annodex-Audio</comment>
- <comment xml:lang="el">Ήχος Annodex</comment>
- <comment xml:lang="en_GB">Annodex Audio</comment>
- <comment xml:lang="eo">Annodex-sondosiero</comment>
- <comment xml:lang="es">sonido Annodex</comment>
+ <comment xml:lang="en-GB">Annodex audio</comment>
+ <comment xml:lang="es">audio Annodex</comment>
<comment xml:lang="eu">Annodex audioa</comment>
- <comment xml:lang="fi">Annodex-ääni</comment>
- <comment xml:lang="fo">Annodex ljóður</comment>
+ <comment xml:lang="fi">Annodex ääni</comment>
<comment xml:lang="fr">audio Annodex</comment>
- <comment xml:lang="ga">Fuaim Annodex</comment>
- <comment xml:lang="gl">son de Annodex</comment>
- <comment xml:lang="he">שמע Annodex</comment>
<comment xml:lang="hr">Annodex zvučni zapis</comment>
<comment xml:lang="hu">Annodex hang</comment>
- <comment xml:lang="ia">Audio Annodex</comment>
<comment xml:lang="id">Audio Annodex</comment>
<comment xml:lang="it">Audio Annodex</comment>
- <comment xml:lang="ja">Annodex オーディオ</comment>
- <comment xml:lang="ka">Annodex-ის აუდიო</comment>
<comment xml:lang="kk">Annodex аудиосы</comment>
<comment xml:lang="ko">Annodex 오디오</comment>
- <comment xml:lang="lt">Annodex garso įrašas</comment>
- <comment xml:lang="lv">Annodex audio</comment>
- <comment xml:lang="nl">Annodex Audio</comment>
- <comment xml:lang="oc">àudio Annodex</comment>
<comment xml:lang="pl">Plik dźwiękowy Annodex</comment>
- <comment xml:lang="pt">áudio Annodex</comment>
- <comment xml:lang="pt_BR">Áudio Annodex</comment>
- <comment xml:lang="ro">Audio Annodex</comment>
+ <comment xml:lang="pt-BR">Áudio Annodex</comment>
<comment xml:lang="ru">Аудио Annodex</comment>
- <comment xml:lang="sk">Zvuk Annodex</comment>
- <comment xml:lang="sl">Zvočna datoteka Annodex</comment>
- <comment xml:lang="sr">Анодекс аудио</comment>
<comment xml:lang="sv">Annodex-ljud</comment>
- <comment xml:lang="tr">Annodex Sesi</comment>
+ <comment xml:lang="tr">Annodex sesi</comment>
<comment xml:lang="uk">звук Annodex</comment>
- <comment xml:lang="vi">Âm thanh Annodex</comment>
- <comment xml:lang="zh_CN">Annodex 音频</comment>
- <comment xml:lang="zh_TW">Annodex 音訊</comment>
+ <comment xml:lang="zh-CN">Annodex 音频</comment>
+ <comment xml:lang="zh-TW">Annodex 音訊</comment>
<sub-class-of type="application/annodex"/>
<magic priority="50">
- <match value="OggS" type="string" offset="0">
- <match value="fishead\0" type="string" offset="28">
- <match value="CMML\0\0\0\0" type="string" offset="56:512"/>
+ <match type="string" value="OggS" offset="0">
+ <match type="string" value="fishead\0" offset="28">
+ <match type="string" value="CMML\0\0\0\0" offset="56:512"/>
</match>
</match>
</magic>
@@ -17031,20 +17668,22 @@
</mime-type>
<mime-type type="application/ogg">
<comment>Ogg multimedia file</comment>
+ <comment xml:lang="af">Ogg-multimedialêer</comment>
<comment xml:lang="ar">ملف وسائط متعددة Ogg</comment>
- <comment xml:lang="be@latin">Multymedyjny fajł Ogg</comment>
+ <comment xml:lang="be-Latn">Multymedyjny fajł Ogg</comment>
<comment xml:lang="bg">Мултимедия — Ogg</comment>
<comment xml:lang="ca">fitxer multimèdia Ogg</comment>
<comment xml:lang="cs">multimediální soubor Ogg</comment>
<comment xml:lang="da">Ogg multimedie-fil</comment>
<comment xml:lang="de">Ogg-Multimediadatei</comment>
<comment xml:lang="el">Αρχείο πολυμέσων Ogg</comment>
- <comment xml:lang="en_GB">Ogg multimedia file</comment>
+ <comment xml:lang="en-GB">Ogg multimedia file</comment>
<comment xml:lang="es">archivo multimedia Ogg</comment>
<comment xml:lang="eu">Ogg multimediako fitxategia</comment>
<comment xml:lang="fi">Ogg-multimediatiedosto</comment>
<comment xml:lang="fo">Ogg margmiðlafíla</comment>
<comment xml:lang="fr">fichier multimédia Ogg</comment>
+ <comment xml:lang="fur">file multimediâl Ogg</comment>
<comment xml:lang="ga">comhad ilmheán Ogg</comment>
<comment xml:lang="gl">ficheiro multimedia Ogg</comment>
<comment xml:lang="he">קובץ מולטימדיה Ogg</comment>
@@ -17065,7 +17704,7 @@
<comment xml:lang="oc">fichièr multimèdia Ogg</comment>
<comment xml:lang="pl">Plik multimedialny Ogg</comment>
<comment xml:lang="pt">ficheiro multimédia Ogg</comment>
- <comment xml:lang="pt_BR">Arquivo multimídia Ogg</comment>
+ <comment xml:lang="pt-BR">Arquivo multimídia Ogg</comment>
<comment xml:lang="ro">Fișier multimedia Ogg</comment>
<comment xml:lang="ru">Мультимедийный файл Ogg</comment>
<comment xml:lang="sk">Súbor multimédií Ogg</comment>
@@ -17073,70 +17712,47 @@
<comment xml:lang="sq">File multimedial Ogg</comment>
<comment xml:lang="sr">Огг мултимедијална датотека</comment>
<comment xml:lang="sv">Ogg-multimediafil</comment>
- <comment xml:lang="tr">Ogg çokluortam dosyası</comment>
+ <comment xml:lang="tr">Ogg çoklu ortam dosyası</comment>
<comment xml:lang="uk">мультимедійний файл Ogg</comment>
<comment xml:lang="vi">Tập tin đa phương tiện Ogg</comment>
- <comment xml:lang="zh_CN">Ogg 多媒体文件</comment>
- <comment xml:lang="zh_TW">Ogg 多媒體檔案</comment>
+ <comment xml:lang="zh-CN">Ogg 多媒体文件</comment>
+ <comment xml:lang="zh-TW">Ogg 多媒體檔案</comment>
<generic-icon name="video-x-generic"/>
<alias type="application/x-ogg"/>
<magic priority="50">
- <match value="OggS" type="string" offset="0"/>
+ <match type="string" value="OggS" offset="0"/>
</magic>
<glob pattern="*.ogx"/>
</mime-type>
<mime-type type="audio/ogg">
- <comment>Ogg Audio</comment>
- <comment xml:lang="ar">Ogg سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo Ogg</comment>
+ <comment>Ogg audio</comment>
<comment xml:lang="bg">Аудио — Ogg</comment>
- <comment xml:lang="ca">àudio d'Ogg</comment>
- <comment xml:lang="cs">zvuk Ogg</comment>
+ <comment xml:lang="ca">àudio Ogg</comment>
<comment xml:lang="da">Ogg-lyd</comment>
<comment xml:lang="de">Ogg-Audio</comment>
- <comment xml:lang="el">Ήχος Ogg</comment>
- <comment xml:lang="en_GB">Ogg Audio</comment>
- <comment xml:lang="es">sonido Ogg</comment>
+ <comment xml:lang="en-GB">Ogg audio</comment>
+ <comment xml:lang="es">audio Ogg</comment>
<comment xml:lang="eu">Ogg audioa</comment>
<comment xml:lang="fi">Ogg-ääni</comment>
- <comment xml:lang="fo">Ogg ljóður</comment>
<comment xml:lang="fr">audio Ogg</comment>
- <comment xml:lang="ga">Fuaim Ogg</comment>
- <comment xml:lang="gl">son Ogg</comment>
- <comment xml:lang="he">שמע Ogg</comment>
<comment xml:lang="hr">Ogg zvučni zapis</comment>
<comment xml:lang="hu">Ogg hang</comment>
- <comment xml:lang="ia">Audio Ogg</comment>
<comment xml:lang="id">Audio Ogg</comment>
<comment xml:lang="it">Audio Ogg</comment>
- <comment xml:lang="ja">Ogg オーディオ</comment>
- <comment xml:lang="ka">Ogg-ის აუდიო</comment>
- <comment xml:lang="kk">Ogg аудиосы</comment>
+ <comment xml:lang="kk">Ogg аулиосы</comment>
<comment xml:lang="ko">Ogg 오디오</comment>
- <comment xml:lang="lt">Ogg garso įrašas</comment>
- <comment xml:lang="lv">Ogg audio</comment>
- <comment xml:lang="nb">Ogg lyd</comment>
- <comment xml:lang="nl">Ogg-audio</comment>
- <comment xml:lang="nn">Ogg-lyd</comment>
- <comment xml:lang="oc">àudio Ogg</comment>
<comment xml:lang="pl">Plik dźwiękowy Ogg</comment>
- <comment xml:lang="pt">áudio Ogg</comment>
- <comment xml:lang="pt_BR">Áudio Ogg</comment>
- <comment xml:lang="ro">Audio Ogg</comment>
+ <comment xml:lang="pt-BR">Áudio Ogg</comment>
<comment xml:lang="ru">Аудио Ogg</comment>
<comment xml:lang="sk">Zvuk Ogg</comment>
- <comment xml:lang="sl">Zvočna datoteka Ogg</comment>
- <comment xml:lang="sq">Audio Ogg</comment>
- <comment xml:lang="sr">Огг звук</comment>
<comment xml:lang="sv">Ogg-ljud</comment>
- <comment xml:lang="tr">Ogg Sesi</comment>
+ <comment xml:lang="tr">Ogg sesi</comment>
<comment xml:lang="uk">звук ogg</comment>
- <comment xml:lang="vi">Âm thanh Ogg</comment>
- <comment xml:lang="zh_CN">Ogg 音频</comment>
- <comment xml:lang="zh_TW">Ogg 音訊</comment>
+ <comment xml:lang="zh-CN">Ogg 音频</comment>
+ <comment xml:lang="zh-TW">Ogg 音訊</comment>
<sub-class-of type="application/ogg"/>
<magic priority="50">
- <match value="OggS" type="string" offset="0"/>
+ <match type="string" value="OggS" offset="0"/>
</magic>
<glob pattern="*.oga"/>
<glob pattern="*.ogg"/>
@@ -17144,58 +17760,34 @@
<alias type="audio/x-ogg"/>
</mime-type>
<mime-type type="video/ogg">
- <comment>Ogg Video</comment>
- <comment xml:lang="ar">Ogg مرئي</comment>
- <comment xml:lang="ast">Videu n'Ogg</comment>
- <comment xml:lang="be@latin">Videa Ogg</comment>
+ <comment>Ogg video</comment>
<comment xml:lang="bg">Видео — Ogg</comment>
<comment xml:lang="ca">vídeo Ogg</comment>
- <comment xml:lang="cs">video Ogg</comment>
<comment xml:lang="da">Ogg-video</comment>
<comment xml:lang="de">Ogg-Video</comment>
- <comment xml:lang="el">Βίντεο Ogg</comment>
- <comment xml:lang="en_GB">Ogg Video</comment>
+ <comment xml:lang="en-GB">Ogg video</comment>
<comment xml:lang="es">vídeo Ogg</comment>
<comment xml:lang="eu">Ogg bideoa</comment>
<comment xml:lang="fi">Ogg-video</comment>
- <comment xml:lang="fo">Ogg Video</comment>
<comment xml:lang="fr">vidéo Ogg</comment>
- <comment xml:lang="ga">Físeán Ogg</comment>
- <comment xml:lang="gl">vídeo Ogg</comment>
- <comment xml:lang="he">וידאו Ogg</comment>
<comment xml:lang="hr">Ogg video snimka</comment>
<comment xml:lang="hu">Ogg videó</comment>
- <comment xml:lang="ia">Video Ogg</comment>
<comment xml:lang="id">Video Ogg</comment>
<comment xml:lang="it">Video Ogg</comment>
- <comment xml:lang="ja">Ogg 動画</comment>
- <comment xml:lang="ka">Ogg ვიდეო</comment>
<comment xml:lang="kk">Ogg видеосы</comment>
<comment xml:lang="ko">Ogg 동영상</comment>
- <comment xml:lang="lt">Ogg vaizdo įrašas</comment>
- <comment xml:lang="lv">Ogg video</comment>
- <comment xml:lang="nb">Ogg video</comment>
- <comment xml:lang="nl">Ogg-video</comment>
- <comment xml:lang="nn">Ogg-video</comment>
- <comment xml:lang="oc">vidèo Ogg</comment>
<comment xml:lang="pl">Plik wideo Ogg</comment>
- <comment xml:lang="pt">vídeo Ogg</comment>
- <comment xml:lang="pt_BR">Vídeo Ogg</comment>
- <comment xml:lang="ro">Video Ogg</comment>
+ <comment xml:lang="pt-BR">Vídeo Ogg</comment>
<comment xml:lang="ru">Видео Ogg</comment>
<comment xml:lang="sk">Video Ogg</comment>
- <comment xml:lang="sl">Video datoteka Ogg</comment>
- <comment xml:lang="sq">Video Ogg</comment>
- <comment xml:lang="sr">Огг снимак</comment>
<comment xml:lang="sv">Ogg-video</comment>
- <comment xml:lang="tr">Ogg Video</comment>
- <comment xml:lang="uk">відеокліп ogg</comment>
- <comment xml:lang="vi">Ảnh động Ogg</comment>
- <comment xml:lang="zh_CN">Ogg 视频</comment>
- <comment xml:lang="zh_TW">Ogg 視訊</comment>
+ <comment xml:lang="tr">Ogg video</comment>
+ <comment xml:lang="uk">відео ogg</comment>
+ <comment xml:lang="zh-CN">Ogg 视频</comment>
+ <comment xml:lang="zh-TW">Ogg 視訊</comment>
<sub-class-of type="application/ogg"/>
<magic priority="50">
- <match value="OggS" type="string" offset="0"/>
+ <match type="string" value="OggS" offset="0"/>
</magic>
<glob pattern="*.ogv"/>
<glob pattern="*.ogg"/>
@@ -17203,23 +17795,25 @@
</mime-type>
<mime-type type="audio/x-vorbis+ogg">
<comment>Ogg Vorbis audio</comment>
+ <comment xml:lang="af">Ogg Vorbis-oudio</comment>
<comment xml:lang="ar">Ogg Vorbis سمعي</comment>
<comment xml:lang="az">Ogg Vorbis audio faylı</comment>
- <comment xml:lang="be@latin">Aŭdyjo Ogg Vorbis</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Ogg Vorbis</comment>
<comment xml:lang="bg">Аудио — Ogg Vorbis</comment>
- <comment xml:lang="ca">àudio d'Ogg Vorbis</comment>
+ <comment xml:lang="ca">àudio Ogg Vorbis</comment>
<comment xml:lang="cs">zvuk Ogg Vorbis</comment>
<comment xml:lang="cy">Sain Ogg Vorbis</comment>
<comment xml:lang="da">Ogg Vorbis-lyd</comment>
<comment xml:lang="de">Ogg-Vorbis-Audio</comment>
<comment xml:lang="el">Ήχος Ogg Vobris</comment>
- <comment xml:lang="en_GB">Ogg Vorbis audio</comment>
+ <comment xml:lang="en-GB">Ogg Vorbis audio</comment>
<comment xml:lang="eo">Ogg-Vorbis-sondosiero</comment>
- <comment xml:lang="es">sonido Ogg Vorbis</comment>
+ <comment xml:lang="es">audio Ogg Vorbis</comment>
<comment xml:lang="eu">Ogg Vorbis audioa</comment>
<comment xml:lang="fi">Ogg Vorbis -ääni</comment>
<comment xml:lang="fo">Ogg Vorbis ljóður</comment>
<comment xml:lang="fr">audio Ogg Vorbis</comment>
+ <comment xml:lang="fur">audio Ogg Vorbis</comment>
<comment xml:lang="ga">fuaim Ogg Vorbis</comment>
<comment xml:lang="gl">son Ogg Vorbis</comment>
<comment xml:lang="he">שמע Ogg Vorbis</comment>
@@ -17241,7 +17835,7 @@
<comment xml:lang="oc">àudio Ogg Vorbis</comment>
<comment xml:lang="pl">Plik dźwiękowy Ogg Vorbis</comment>
<comment xml:lang="pt">áudio Ogg Vorbis</comment>
- <comment xml:lang="pt_BR">Áudio Ogg Vorbis</comment>
+ <comment xml:lang="pt-BR">Áudio Ogg Vorbis</comment>
<comment xml:lang="ro">Audio Ogg Vorbis</comment>
<comment xml:lang="ru">Аудио Ogg Vorbis</comment>
<comment xml:lang="sk">Zvuk Ogg Vorbis</comment>
@@ -17252,14 +17846,14 @@
<comment xml:lang="tr">Ogg Vorbis sesi</comment>
<comment xml:lang="uk">звук ogg Vorbis</comment>
<comment xml:lang="vi">Âm thanh Vorbis Ogg</comment>
- <comment xml:lang="zh_CN">Ogg Vorbis 音频</comment>
- <comment xml:lang="zh_TW">Ogg Vorbis 音訊</comment>
+ <comment xml:lang="zh-CN">Ogg Vorbis 音频</comment>
+ <comment xml:lang="zh-TW">Ogg Vorbis 音訊</comment>
<sub-class-of type="audio/ogg"/>
<alias type="audio/vorbis"/>
<alias type="audio/x-vorbis"/>
<magic priority="80">
- <match value="OggS" type="string" offset="0">
- <match value="\x01vorbis" type="string" offset="28"/>
+ <match type="string" value="OggS" offset="0">
+ <match type="string" value="\x01vorbis" offset="28"/>
</match>
</magic>
<glob pattern="*.oga"/>
@@ -17267,20 +17861,22 @@
</mime-type>
<mime-type type="audio/x-flac+ogg">
<comment>Ogg FLAC audio</comment>
+ <comment xml:lang="af">Ogg FLAC-oudio</comment>
<comment xml:lang="ar">Ogg FLAC سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo Ogg FLAC</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Ogg FLAC</comment>
<comment xml:lang="bg">Аудио — Ogg FLAC</comment>
- <comment xml:lang="ca">àudio FLAC d'Ogg</comment>
+ <comment xml:lang="ca">àudio Ogg FLAC</comment>
<comment xml:lang="cs">zvuk Ogg FLAC</comment>
<comment xml:lang="da">Ogg FLAC-lyd</comment>
<comment xml:lang="de">Ogg-FLAC-Audio</comment>
<comment xml:lang="el">Ήχος Ogg FLAC</comment>
- <comment xml:lang="en_GB">Ogg FLAC audio</comment>
- <comment xml:lang="es">sonido Ogg FLAC</comment>
+ <comment xml:lang="en-GB">Ogg FLAC audio</comment>
+ <comment xml:lang="es">audio Ogg FLAC</comment>
<comment xml:lang="eu">Ogg FLAC audioa</comment>
<comment xml:lang="fi">Ogg FLAC -ääni</comment>
<comment xml:lang="fo">Ogg FLAC ljóður</comment>
<comment xml:lang="fr">audio Ogg FLAC</comment>
+ <comment xml:lang="fur">audio Ogg FLAC</comment>
<comment xml:lang="ga">fuaim Ogg FLAC</comment>
<comment xml:lang="gl">son Ogg FLAC</comment>
<comment xml:lang="he">שמע Ogg FLAC</comment>
@@ -17301,7 +17897,7 @@
<comment xml:lang="oc">àudio Ogg FLAC</comment>
<comment xml:lang="pl">Plik dźwiękowy Ogg FLAC</comment>
<comment xml:lang="pt">áudio Ogg FLAC</comment>
- <comment xml:lang="pt_BR">Áudio Ogg FLAC</comment>
+ <comment xml:lang="pt-BR">Áudio Ogg FLAC</comment>
<comment xml:lang="ro">Audio Ogg FLAC</comment>
<comment xml:lang="ru">Аудио Ogg FLAC</comment>
<comment xml:lang="sk">Zvuk Ogg FLAC</comment>
@@ -17312,13 +17908,13 @@
<comment xml:lang="tr">Ogg FLAC sesi</comment>
<comment xml:lang="uk">звук ogg FLAC</comment>
<comment xml:lang="vi">Âm thanh FLAC Ogg</comment>
- <comment xml:lang="zh_CN">Ogg FLAC 音频</comment>
- <comment xml:lang="zh_TW">Ogg FLAC 音訊</comment>
+ <comment xml:lang="zh-CN">Ogg FLAC 音频</comment>
+ <comment xml:lang="zh-TW">Ogg FLAC 音訊</comment>
<sub-class-of type="audio/ogg"/>
<alias type="audio/x-oggflac"/>
<magic priority="80">
- <match value="OggS" type="string" offset="0">
- <match value="fLaC" type="string" offset="28"/>
+ <match type="string" value="OggS" offset="0">
+ <match type="string" value="fLaC" offset="28"/>
</match>
<match value="OggS" type="string" offset="0">
<match value="\177FLAC" type="string" offset="28"/>
@@ -17329,16 +17925,19 @@
</mime-type>
<mime-type type="audio/x-opus+ogg">
<comment>Opus audio</comment>
- <comment xml:lang="ca">àudio d'Opus</comment>
+ <comment xml:lang="af">Opus-oudio</comment>
+ <comment xml:lang="bg">Аудио — Opus</comment>
+ <comment xml:lang="ca">àudio Opus</comment>
<comment xml:lang="cs">zvuk Opus</comment>
<comment xml:lang="da">Opus-lyd</comment>
<comment xml:lang="de">Opus-Audio</comment>
<comment xml:lang="el">Ήχος Opus </comment>
- <comment xml:lang="en_GB">Opus audio</comment>
- <comment xml:lang="es">sonido Opus</comment>
+ <comment xml:lang="en-GB">Opus audio</comment>
+ <comment xml:lang="es">audio Opus</comment>
<comment xml:lang="eu">Opus audioa</comment>
<comment xml:lang="fi">Opus-ääni</comment>
<comment xml:lang="fr">audio Opus</comment>
+ <comment xml:lang="fur">audio Opus</comment>
<comment xml:lang="ga">fuaim Opus</comment>
<comment xml:lang="gl">Son Opus</comment>
<comment xml:lang="he">שמע Opus</comment>
@@ -17352,7 +17951,7 @@
<comment xml:lang="oc">àudio Opus</comment>
<comment xml:lang="pl">Plik dźwiękowy Opus</comment>
<comment xml:lang="pt">áudio Opus</comment>
- <comment xml:lang="pt_BR">Áudio Opus</comment>
+ <comment xml:lang="pt-BR">Áudio Opus</comment>
<comment xml:lang="ru">Аудио Opus</comment>
<comment xml:lang="sk">Zvuk Opu</comment>
<comment xml:lang="sl">Zvočna datoteka Opus</comment>
@@ -17360,32 +17959,34 @@
<comment xml:lang="sv">Opus-ljud</comment>
<comment xml:lang="tr">Opus sesi</comment>
<comment xml:lang="uk">звук Opus</comment>
- <comment xml:lang="zh_CN">Opus 音频</comment>
- <comment xml:lang="zh_TW">Opus 音訊</comment>
+ <comment xml:lang="zh-CN">Opus 音频</comment>
+ <comment xml:lang="zh-TW">Opus 音訊</comment>
<sub-class-of type="audio/ogg"/>
<magic priority="80">
- <match value="OggS" type="string" offset="0">
- <match value="OpusHead" type="string" offset="28"/>
+ <match type="string" value="OggS" offset="0">
+ <match type="string" value="OpusHead" offset="28"/>
</match>
</magic>
<glob pattern="*.opus"/>
</mime-type>
<mime-type type="audio/x-speex+ogg">
<comment>Ogg Speex audio</comment>
+ <comment xml:lang="af">Ogg Speex-oudio</comment>
<comment xml:lang="ar">Ogg Speex سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo Ogg Speex</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Ogg Speex</comment>
<comment xml:lang="bg">Аудио — Ogg Speex</comment>
- <comment xml:lang="ca">àudio Speex d'Ogg</comment>
+ <comment xml:lang="ca">àudio Ogg Speex</comment>
<comment xml:lang="cs">zvuk Ogg Speex</comment>
<comment xml:lang="da">Ogg Speex-lyd</comment>
<comment xml:lang="de">Ogg-Speex-Audio</comment>
<comment xml:lang="el">Ήχος Ogg Speex</comment>
- <comment xml:lang="en_GB">Ogg Speex audio</comment>
- <comment xml:lang="es">sonido Ogg Speex</comment>
+ <comment xml:lang="en-GB">Ogg Speex audio</comment>
+ <comment xml:lang="es">audio Ogg Speex</comment>
<comment xml:lang="eu">Ogg Speex audioa</comment>
<comment xml:lang="fi">Ogg Speex -ääni</comment>
<comment xml:lang="fo">Ogg Speex ljóður</comment>
<comment xml:lang="fr">audio Ogg Speex</comment>
+ <comment xml:lang="fur">audio Ogg Speex</comment>
<comment xml:lang="ga">fuaim Ogg Speex</comment>
<comment xml:lang="gl">son Ogg Speex</comment>
<comment xml:lang="he">שמע Ogg Speex</comment>
@@ -17406,7 +18007,7 @@
<comment xml:lang="oc">àudio Ogg Speex</comment>
<comment xml:lang="pl">Plik dźwiękowy Ogg Speex</comment>
<comment xml:lang="pt">áudio Ogg Speex</comment>
- <comment xml:lang="pt_BR">Áudio Ogg Speex</comment>
+ <comment xml:lang="pt-BR">Áudio Ogg Speex</comment>
<comment xml:lang="ro">Audio Ogg Speex</comment>
<comment xml:lang="ru">Аудио Ogg Speex</comment>
<comment xml:lang="sk">Zvuk Ogg Speex</comment>
@@ -17417,33 +18018,36 @@
<comment xml:lang="tr">Ogg Speex sesi</comment>
<comment xml:lang="uk">звук ogg Speex</comment>
<comment xml:lang="vi">Âm thanh Speex Ogg</comment>
- <comment xml:lang="zh_CN">Ogg Speex 音频</comment>
- <comment xml:lang="zh_TW">Ogg Speex 音訊</comment>
+ <comment xml:lang="zh-CN">Ogg Speex 音频</comment>
+ <comment xml:lang="zh-TW">Ogg Speex 音訊</comment>
<sub-class-of type="audio/ogg"/>
<magic priority="80">
- <match value="OggS" type="string" offset="0">
- <match value="Speex " type="string" offset="28"/>
+ <match type="string" value="OggS" offset="0">
+ <match type="string" value="Speex " offset="28"/>
</match>
</magic>
<glob pattern="*.oga"/>
<glob pattern="*.ogg"/>
+ <glob pattern="*.spx"/>
</mime-type>
<mime-type type="audio/x-speex">
<comment>Speex audio</comment>
+ <comment xml:lang="af">Speex-oudio</comment>
<comment xml:lang="ar">Speex سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo Speex</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Speex</comment>
<comment xml:lang="bg">Аудио — Speex</comment>
- <comment xml:lang="ca">àudio de Speex</comment>
+ <comment xml:lang="ca">àudio Speex</comment>
<comment xml:lang="cs">zvuk Speex</comment>
- <comment xml:lang="da">Speexlyd</comment>
+ <comment xml:lang="da">Speex-lyd</comment>
<comment xml:lang="de">Speex-Audio</comment>
<comment xml:lang="el">Ήχος Speex</comment>
- <comment xml:lang="en_GB">Speex audio</comment>
- <comment xml:lang="es">sonido Speex</comment>
+ <comment xml:lang="en-GB">Speex audio</comment>
+ <comment xml:lang="es">audio Speex</comment>
<comment xml:lang="eu">Speex audioa</comment>
<comment xml:lang="fi">Speex-ääni</comment>
<comment xml:lang="fo">Speex ljóður</comment>
<comment xml:lang="fr">audio Speex</comment>
+ <comment xml:lang="fur">audio Speex</comment>
<comment xml:lang="ga">fuaim Speex</comment>
<comment xml:lang="gl">son Speex</comment>
<comment xml:lang="he">שמע של Speex</comment>
@@ -17463,7 +18067,7 @@
<comment xml:lang="oc">àudio Speex</comment>
<comment xml:lang="pl">Plik dźwiękowy Speex</comment>
<comment xml:lang="pt">áudio Speex</comment>
- <comment xml:lang="pt_BR">Áudio Speex</comment>
+ <comment xml:lang="pt-BR">Áudio Speex</comment>
<comment xml:lang="ro">Audio Speex</comment>
<comment xml:lang="ru">Аудио Speex</comment>
<comment xml:lang="sk">Zvuk Speex</comment>
@@ -17474,30 +18078,32 @@
<comment xml:lang="tr">Speex sesi</comment>
<comment xml:lang="uk">звук Speex</comment>
<comment xml:lang="vi">Âm thanh Speex</comment>
- <comment xml:lang="zh_CN">Speex 音频</comment>
- <comment xml:lang="zh_TW">Speex 音訊</comment>
+ <comment xml:lang="zh-CN">Speex 音频</comment>
+ <comment xml:lang="zh-TW">Speex 音訊</comment>
<magic priority="50">
- <match value="Speex" type="string" offset="0"/>
+ <match type="string" value="Speex" offset="0"/>
</magic>
<glob pattern="*.spx"/>
</mime-type>
<mime-type type="video/x-theora+ogg">
<comment>Ogg Theora video</comment>
+ <comment xml:lang="af">Ogg Theora-video</comment>
<comment xml:lang="ar">Ogg Theora مرئي</comment>
<comment xml:lang="ast">Videu n'Ogg Theora</comment>
- <comment xml:lang="be@latin">Videa Ogg Theora</comment>
+ <comment xml:lang="be-Latn">Videa Ogg Theora</comment>
<comment xml:lang="bg">Видео — Ogg Theora</comment>
<comment xml:lang="ca">vídeo Ogg Theora</comment>
<comment xml:lang="cs">video Ogg Theora</comment>
<comment xml:lang="da">Ogg Theora-video</comment>
<comment xml:lang="de">Ogg-Theora-Video</comment>
<comment xml:lang="el">Βίντεο Ogg Theora</comment>
- <comment xml:lang="en_GB">Ogg Theora video</comment>
+ <comment xml:lang="en-GB">Ogg Theora video</comment>
<comment xml:lang="es">vídeo Ogg Theora</comment>
<comment xml:lang="eu">Ogg Theora bideoa</comment>
<comment xml:lang="fi">Ogg Theora -video</comment>
<comment xml:lang="fo">Ogg Theora video</comment>
<comment xml:lang="fr">vidéo Ogg Theora</comment>
+ <comment xml:lang="fur">video Ogg Theora</comment>
<comment xml:lang="ga">físeán Ogg Theora</comment>
<comment xml:lang="gl">vídeo Ogg Theora</comment>
<comment xml:lang="he">שמע Ogg Theora</comment>
@@ -17518,7 +18124,7 @@
<comment xml:lang="oc">vidèo Ogg Theora</comment>
<comment xml:lang="pl">Plik wideo Ogg Theora</comment>
<comment xml:lang="pt">vídeo Ogg Theora</comment>
- <comment xml:lang="pt_BR">Vídeo Ogg Theora</comment>
+ <comment xml:lang="pt-BR">Vídeo Ogg Theora</comment>
<comment xml:lang="ro">Video Ogg Theora</comment>
<comment xml:lang="ru">Видео Ogg Theora</comment>
<comment xml:lang="sk">Video Ogg Theora</comment>
@@ -17529,35 +18135,37 @@
<comment xml:lang="tr">Ogg Theora video</comment>
<comment xml:lang="uk">відеокліп ogg Theora</comment>
<comment xml:lang="vi">Ảnh động Theora Ogg</comment>
- <comment xml:lang="zh_CN">Ogg Theora 视频</comment>
- <comment xml:lang="zh_TW">Ogg Theora 視訊</comment>
+ <comment xml:lang="zh-CN">Ogg Theora 视频</comment>
+ <comment xml:lang="zh-TW">Ogg Theora 視訊</comment>
<sub-class-of type="video/ogg"/>
<alias type="video/x-theora"/>
<magic priority="80">
- <match value="OggS" type="string" offset="0">
- <match value="\x80theora" type="string" offset="28"/>
+ <match type="string" value="OggS" offset="0">
+ <match type="string" value="\x80theora" offset="28"/>
</match>
</magic>
<glob pattern="*.ogg"/>
</mime-type>
<mime-type type="video/x-ogm+ogg">
<comment>OGM video</comment>
+ <comment xml:lang="af">OGM-video</comment>
<comment xml:lang="ar">OGM مرئي</comment>
<comment xml:lang="ast">Videu n'OGM</comment>
- <comment xml:lang="be@latin">Videa OGM</comment>
+ <comment xml:lang="be-Latn">Videa OGM</comment>
<comment xml:lang="bg">Видео — OGM</comment>
<comment xml:lang="ca">vídeo OGM</comment>
<comment xml:lang="cs">video OGM</comment>
<comment xml:lang="da">OGM-video</comment>
<comment xml:lang="de">OGM-Video</comment>
<comment xml:lang="el">Βίντεο OGM</comment>
- <comment xml:lang="en_GB">OGM video</comment>
+ <comment xml:lang="en-GB">OGM video</comment>
<comment xml:lang="eo">OGM-video</comment>
<comment xml:lang="es">vídeo OGM</comment>
<comment xml:lang="eu">OGM bideoa</comment>
<comment xml:lang="fi">OGM-video</comment>
<comment xml:lang="fo">OGM video</comment>
<comment xml:lang="fr">vidéo OGM</comment>
+ <comment xml:lang="fur">video OGM</comment>
<comment xml:lang="ga">físeán OGM</comment>
<comment xml:lang="gl">vídeo OGM</comment>
<comment xml:lang="he">וידאו OGM</comment>
@@ -17578,7 +18186,7 @@
<comment xml:lang="oc">vidèo OGM</comment>
<comment xml:lang="pl">Plik wideo OGM</comment>
<comment xml:lang="pt">vídeo OGM</comment>
- <comment xml:lang="pt_BR">Vídeo OGM</comment>
+ <comment xml:lang="pt-BR">Vídeo OGM</comment>
<comment xml:lang="ro">Video OGM</comment>
<comment xml:lang="ru">Видео OGM</comment>
<comment xml:lang="sk">Video OGM</comment>
@@ -17589,43 +18197,45 @@
<comment xml:lang="tr">OGM video</comment>
<comment xml:lang="uk">відеокліп OGM</comment>
<comment xml:lang="vi">Ảnh động OGM</comment>
- <comment xml:lang="zh_CN">OGM 视频</comment>
- <comment xml:lang="zh_TW">OGM 視訊</comment>
+ <comment xml:lang="zh-CN">OGM 视频</comment>
+ <comment xml:lang="zh-TW">OGM 視訊</comment>
<sub-class-of type="video/ogg"/>
<alias type="video/x-ogm"/>
<magic priority="80">
- <match value="OggS" type="string" offset="0">
- <match value="video" type="string" offset="29"/>
+ <match type="string" value="OggS" offset="0">
+ <match type="string" value="video" offset="29"/>
</match>
</magic>
<glob pattern="*.ogm"/>
</mime-type>
-
+ <!-- These are typically compount document of various types, so prefer
+ extensions for these -->
<mime-type type="application/x-ole-storage">
<comment>OLE2 compound document storage</comment>
<comment xml:lang="ar">تخزين مجمع مستند OLE2</comment>
<comment xml:lang="ast">Almacenamientu de documentos compuestu por OLE2</comment>
- <comment xml:lang="be@latin">Schovišča dla kampanentaŭ dakumentu OLE2</comment>
+ <comment xml:lang="be-Latn">Schovišča dla kampanentaŭ dakumentu OLE2</comment>
<comment xml:lang="bg">Съставен документ-хранилище — OLE2</comment>
<comment xml:lang="ca">emmagatzematge de documents compostos OLE2</comment>
<comment xml:lang="cs">úložiště složeného dokumentu OLE2</comment>
<comment xml:lang="da">OLE2-sammensat dokumentlager</comment>
<comment xml:lang="de">OLE2-Verbunddokumentenspeicher</comment>
<comment xml:lang="el">Αρχείο συμπαγούς αποθήκευσης εγγράφων OLE2</comment>
- <comment xml:lang="en_GB">OLE2 compound document storage</comment>
+ <comment xml:lang="en-GB">OLE2 compound document storage</comment>
<comment xml:lang="eo">OLE2-deponejo de parentezaj dokumentoj</comment>
<comment xml:lang="es">almacenamiento de documentos compuestos OLE2</comment>
<comment xml:lang="eu">OLE2 konposatutako dokumentu-bilduma</comment>
<comment xml:lang="fi">OLE2-yhdisteasiakirjatallenne</comment>
<comment xml:lang="fo">OLE2 samansett skjalagoymsla</comment>
<comment xml:lang="fr">document de stockage composé OLE2</comment>
+ <comment xml:lang="fur">memorizazion document compost OLE2</comment>
<comment xml:lang="ga">stóras cáipéisí comhshuite OLE2</comment>
<comment xml:lang="gl">almacenamento de documento composto OLE2</comment>
<comment xml:lang="he">אחסון מסמך משותף OLE2</comment>
<comment xml:lang="hr">OLE2 pohrana složenog dokumenta</comment>
<comment xml:lang="hu">OLE2 összetett dokumentumtároló</comment>
<comment xml:lang="ia">Magazin de documentos composite OLE2</comment>
- <comment xml:lang="id">penyimpan dokumen kompon OLE2</comment>
+ <comment xml:lang="id">Penyimpan dokumen kompon OLE2</comment>
<comment xml:lang="it">Memorizzazione documento composto OLE2</comment>
<comment xml:lang="ja">OLE2 複合ドキュメントストレージ</comment>
<comment xml:lang="kk">OLE2 құрама құжаттар қоймасы</comment>
@@ -17639,7 +18249,7 @@
<comment xml:lang="oc">document d'emmagazinatge compausat OLE2</comment>
<comment xml:lang="pl">Magazyn dokumentu złożonego OLE2</comment>
<comment xml:lang="pt">armazenamento de documento composto OLE2</comment>
- <comment xml:lang="pt_BR">Armazenamento de documento composto OLE2</comment>
+ <comment xml:lang="pt-BR">Armazenamento de documento composto OLE2</comment>
<comment xml:lang="ro">Document de stocare compus OLE2</comment>
<comment xml:lang="ru">Хранилище составных документов OLE2</comment>
<comment xml:lang="sk">Úložisko zloženého dokumentu OLE2</comment>
@@ -17650,27 +18260,30 @@
<comment xml:lang="tr">OLE2 bileşik belge depolama</comment>
<comment xml:lang="uk">сховище складних документів OLE2</comment>
<comment xml:lang="vi">Kho lưu tài liệu ghép OLE2</comment>
- <comment xml:lang="zh_CN">OLE2 组合文档存储</comment>
- <comment xml:lang="zh_TW">OLE2 複合文件儲存</comment>
+ <comment xml:lang="zh-CN">OLE2 组合文档存储</comment>
+ <comment xml:lang="zh-TW">OLE2 複合文件儲存</comment>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="\320\317\021\340\241\261\032\341" type="string" offset="0"/>
- <match value="0xe011cfd0" type="little32" offset="0"/>
+ <match type="string" value="\320\317\021\340\241\261\032\341" offset="0"/>
+ <match type="little32" value="0xe011cfd0" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/vnd.ms-publisher">
<comment>Microsoft Publisher document</comment>
+ <comment xml:lang="af">Microsoft Publisher-dokument</comment>
<comment xml:lang="ast">Documentu de Microsoft Publisher</comment>
+ <comment xml:lang="bg">Документ — Microsoft Publisher</comment>
<comment xml:lang="ca">document de Microsoft Publisher</comment>
<comment xml:lang="cs">dokument Microsoft Publisher</comment>
<comment xml:lang="da">Microsoft Publisher-dokument</comment>
<comment xml:lang="de">Microsoft-Publisher-Dokument</comment>
<comment xml:lang="el">Έγγραφο Microsoft Publisher</comment>
- <comment xml:lang="en_GB">Microsoft Publisher document</comment>
+ <comment xml:lang="en-GB">Microsoft Publisher document</comment>
<comment xml:lang="es">documento de Microsoft Publisher</comment>
<comment xml:lang="eu">Microsoft Publisher dokumentua</comment>
<comment xml:lang="fi">Microsoft Publisher -asiakirja</comment>
<comment xml:lang="fr">document Microsoft Publisher</comment>
+ <comment xml:lang="fur">document Microsoft Publisher</comment>
<comment xml:lang="ga">cáipéis Microsoft Publisher</comment>
<comment xml:lang="gl">Documento de Microsoft Publisher</comment>
<comment xml:lang="he">מסמך Microsoft Publisher</comment>
@@ -17684,7 +18297,7 @@
<comment xml:lang="oc">document Microsoft Publisher</comment>
<comment xml:lang="pl">Dokument Microsoft Publisher</comment>
<comment xml:lang="pt">documento Microsoft Publisher</comment>
- <comment xml:lang="pt_BR">Documento do Microsoft Publisher</comment>
+ <comment xml:lang="pt-BR">Documento do Microsoft Publisher</comment>
<comment xml:lang="ru">Документ Microsoft Publisher</comment>
<comment xml:lang="sk">Dokument Microsoft Publisher</comment>
<comment xml:lang="sl">Dokument Microsoft Publisher</comment>
@@ -17692,27 +18305,29 @@
<comment xml:lang="sv">Microsoft Publisher-dokument</comment>
<comment xml:lang="tr">Microsoft Publisher belgesi</comment>
<comment xml:lang="uk">документ Microsoft Publisher</comment>
- <comment xml:lang="zh_CN">Microsoft Publisher 文档</comment>
- <comment xml:lang="zh_TW">Microsoft Publisher 文件</comment>
+ <comment xml:lang="zh-CN">Microsoft Publisher 文档</comment>
+ <comment xml:lang="zh-TW">微軟 Publisher 文件</comment>
<sub-class-of type="application/x-ole-storage"/>
<glob pattern="*.pub"/>
</mime-type>
<mime-type type="application/x-msi">
<comment>Windows Installer package</comment>
+ <comment xml:lang="af">Windows-installeerpakket</comment>
<comment xml:lang="ar">حزمة مثبّت ويندوز</comment>
- <comment xml:lang="be@latin">Pakunak Windows Installer</comment>
+ <comment xml:lang="be-Latn">Pakunak Windows Installer</comment>
<comment xml:lang="bg">Пакет — инсталация за Windows</comment>
<comment xml:lang="ca">paquet de Windows Installer</comment>
<comment xml:lang="cs">balíček Windows Installer</comment>
- <comment xml:lang="da">Windows Installer-pakke</comment>
+ <comment xml:lang="da">Windows installationsprogram-pakke</comment>
<comment xml:lang="de">Windows-Installationspaket</comment>
<comment xml:lang="el">Πακέτο Windows Installer</comment>
- <comment xml:lang="en_GB">Windows Installer package</comment>
+ <comment xml:lang="en-GB">Windows Installer package</comment>
<comment xml:lang="es">paquete de instalación de Windows</comment>
<comment xml:lang="eu">Windows-eko pakete instalatzailea</comment>
<comment xml:lang="fi">Windows-asennuspaketti</comment>
<comment xml:lang="fo">Windows innleggingarpakki</comment>
<comment xml:lang="fr">paquet d'installation Windows</comment>
+ <comment xml:lang="fur">pachet Windows Installer</comment>
<comment xml:lang="ga">pacáiste Windows Installer</comment>
<comment xml:lang="gl">paquete de instalación de Windows</comment>
<comment xml:lang="he">חבילה של Windows Installer</comment>
@@ -17731,7 +18346,7 @@
<comment xml:lang="oc">paquet d'installacion Windows</comment>
<comment xml:lang="pl">Pakiet instalatora Windows</comment>
<comment xml:lang="pt">pacote de instalação Windows</comment>
- <comment xml:lang="pt_BR">Pacote do Windows Installer</comment>
+ <comment xml:lang="pt-BR">Pacote do Windows Installer</comment>
<comment xml:lang="ro">Pachet instalator Windows</comment>
<comment xml:lang="ru">Пакет Windows Installer</comment>
<comment xml:lang="sk">Balík Windows Installer</comment>
@@ -17742,28 +18357,30 @@
<comment xml:lang="tr">Windows Installer paketi</comment>
<comment xml:lang="uk">пакунок Windows Installer</comment>
<comment xml:lang="vi">Gói cài đặt Windows</comment>
- <comment xml:lang="zh_CN">Windows 程序安装包</comment>
- <comment xml:lang="zh_TW">Windows Installer 軟體包</comment>
+ <comment xml:lang="zh-CN">Windows 程序安装包</comment>
+ <comment xml:lang="zh-TW">Windows Installer 軟體包</comment>
<sub-class-of type="application/x-ole-storage"/>
<glob pattern="*.msi"/>
</mime-type>
<mime-type type="application/x-oleo">
<comment>GNU Oleo spreadsheet</comment>
+ <comment xml:lang="af">GNU Oleo-sigblad</comment>
<comment xml:lang="ar">جدول جنو Oleo</comment>
- <comment xml:lang="be@latin">Raźlikovy arkuš GNU Oleo</comment>
+ <comment xml:lang="be-Latn">Raźlikovy arkuš GNU Oleo</comment>
<comment xml:lang="bg">Таблица — GNU Oleo</comment>
<comment xml:lang="ca">full de càlcul de GNU Oleo</comment>
<comment xml:lang="cs">sešit GNU Oleo</comment>
<comment xml:lang="da">GNU Oleo-regneark</comment>
<comment xml:lang="de">GNU-Oleo-Tabelle</comment>
<comment xml:lang="el">Λογιστικό φύλλο GNU Oleo</comment>
- <comment xml:lang="en_GB">GNU Oleo spreadsheet</comment>
+ <comment xml:lang="en-GB">GNU Oleo spreadsheet</comment>
<comment xml:lang="eo">Kalkultabelo de GNU Oleo</comment>
<comment xml:lang="es">hoja de cálculo de GNU Oleo</comment>
<comment xml:lang="eu">GNU Oleo kalkulu-orria</comment>
<comment xml:lang="fi">GNU Oleo -taulukko</comment>
<comment xml:lang="fo">GNU Oleo rokniark</comment>
<comment xml:lang="fr">feuille de calcul GNU Oleo</comment>
+ <comment xml:lang="fur">sfuei di calcul GNU Oleo</comment>
<comment xml:lang="ga">scarbhileog GNU Oleo</comment>
<comment xml:lang="gl">folla de cálculo de Oleo GNU</comment>
<comment xml:lang="he">גליון נתונים של GNU Oleo</comment>
@@ -17785,7 +18402,7 @@
<comment xml:lang="oc">fuèlh de calcul GNU Oleo</comment>
<comment xml:lang="pl">Arkusz GNU Oleo</comment>
<comment xml:lang="pt">folha de cálculo GNU Oleo</comment>
- <comment xml:lang="pt_BR">Planilha do GNU Oleo</comment>
+ <comment xml:lang="pt-BR">Planilha do GNU Oleo</comment>
<comment xml:lang="ro">Foaie de calcul GNU Oleo</comment>
<comment xml:lang="ru">Электронная таблица GNU Oleo</comment>
<comment xml:lang="sk">Zošit GNU Oleo</comment>
@@ -17793,34 +18410,36 @@
<comment xml:lang="sq">Fletë llogaritje GNU Oleo</comment>
<comment xml:lang="sr">ГНУ Олео табела</comment>
<comment xml:lang="sv">GNU Oleo-kalkylblad</comment>
- <comment xml:lang="tr">GNU Oleo çalışma sayfası</comment>
+ <comment xml:lang="tr">GNU Oleo hesap çizelgesi</comment>
<comment xml:lang="uk">ел. таблиця GNU Oleo</comment>
<comment xml:lang="vi">Bảng tính Oleo của GNU</comment>
- <comment xml:lang="zh_CN">GNU Oleo 电子表格</comment>
- <comment xml:lang="zh_TW">GNU Oleo 試算表</comment>
+ <comment xml:lang="zh-CN">GNU Oleo 电子表格</comment>
+ <comment xml:lang="zh-TW">GNU Oleo 試算表</comment>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
- <match value="Oleo" type="string" offset="31"/>
+ <match type="string" value="Oleo" offset="31"/>
</magic>
<glob pattern="*.oleo"/>
</mime-type>
<mime-type type="application/x-pak">
<comment>PAK archive</comment>
+ <comment xml:lang="af">PAK-argief</comment>
<comment xml:lang="ar">أرشيف PAK</comment>
- <comment xml:lang="be@latin">Archiŭ PAK</comment>
+ <comment xml:lang="be-Latn">Archiŭ PAK</comment>
<comment xml:lang="bg">Архив — PAK</comment>
<comment xml:lang="ca">arxiu PAK</comment>
<comment xml:lang="cs">archiv PAK</comment>
<comment xml:lang="da">PAK-arkiv</comment>
<comment xml:lang="de">PAK-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο PAK</comment>
- <comment xml:lang="en_GB">PAK archive</comment>
+ <comment xml:lang="en-GB">PAK archive</comment>
<comment xml:lang="eo">PAK-arkivo</comment>
<comment xml:lang="es">archivador PAK</comment>
<comment xml:lang="eu">PAK artxiboa</comment>
<comment xml:lang="fi">PAK-arkisto</comment>
<comment xml:lang="fo">PAK skjalasavn</comment>
<comment xml:lang="fr">archive PAK</comment>
+ <comment xml:lang="fur">archivi PAK</comment>
<comment xml:lang="ga">cartlann PAK</comment>
<comment xml:lang="gl">arquivo PAK</comment>
<comment xml:lang="he">ארכיון PAK</comment>
@@ -17841,7 +18460,7 @@
<comment xml:lang="oc">archiu PAK</comment>
<comment xml:lang="pl">Archiwum PAK</comment>
<comment xml:lang="pt">arquivo PAK</comment>
- <comment xml:lang="pt_BR">Pacote PAK</comment>
+ <comment xml:lang="pt-BR">Pacote PAK</comment>
<comment xml:lang="ro">Arhivă PAK</comment>
<comment xml:lang="ru">Архив PAK</comment>
<comment xml:lang="sk">Archív PAK</comment>
@@ -17852,19 +18471,20 @@
<comment xml:lang="tr">PAK arşivi</comment>
<comment xml:lang="uk">архів PAK</comment>
<comment xml:lang="vi">Kho nén PAK</comment>
- <comment xml:lang="zh_CN">PAK 归档文件</comment>
- <comment xml:lang="zh_TW">PAK 封存檔</comment>
+ <comment xml:lang="zh-CN">PAK 归档文件</comment>
+ <comment xml:lang="zh-TW">PAK 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="80">
- <match value="PACK" type="string" offset="0"/>
+ <match offset="0" type="string" value="PACK"/>
</magic>
<glob pattern="*.pak"/>
</mime-type>
<mime-type type="application/vnd.palm">
<comment>Palm OS database</comment>
+ <comment xml:lang="af">Palm OS-databasis</comment>
<comment xml:lang="ar">قاعدة بيانات Palm OS</comment>
<comment xml:lang="az">Palm OS mə'lumat bazası</comment>
- <comment xml:lang="be@latin">Baza źviestak Palm OS</comment>
+ <comment xml:lang="be-Latn">Baza źviestak Palm OS</comment>
<comment xml:lang="bg">База от данни — Palm OS</comment>
<comment xml:lang="ca">base de dades Palm OS</comment>
<comment xml:lang="cs">databáze Palm OS</comment>
@@ -17872,13 +18492,14 @@
<comment xml:lang="da">Palm OS-database</comment>
<comment xml:lang="de">Palm-OS-Datenbank</comment>
<comment xml:lang="el">Βάση δεδομένων Palm OS</comment>
- <comment xml:lang="en_GB">Palm OS database</comment>
+ <comment xml:lang="en-GB">Palm OS database</comment>
<comment xml:lang="eo">datumbazo de Palm OS</comment>
<comment xml:lang="es">base de datos de Palm OS</comment>
<comment xml:lang="eu">Palm OS datu-basea</comment>
<comment xml:lang="fi">Palm OS -tietokanta</comment>
<comment xml:lang="fo">Palm OS dátustovnur</comment>
<comment xml:lang="fr">base de données Palm OS</comment>
+ <comment xml:lang="fur">base di dâts Palm OS</comment>
<comment xml:lang="ga">bunachar sonraí Palm OS</comment>
<comment xml:lang="gl">base de datos de Palm OS</comment>
<comment xml:lang="he">מסד נתונים של Palm OS</comment>
@@ -17899,7 +18520,7 @@
<comment xml:lang="oc">banca de donadas Palm OS</comment>
<comment xml:lang="pl">Baza danych Palm OS</comment>
<comment xml:lang="pt">base de dados Palm OS</comment>
- <comment xml:lang="pt_BR">Banco de dados do Palm OS</comment>
+ <comment xml:lang="pt-BR">Banco de dados do Palm OS</comment>
<comment xml:lang="ro">Bază de date Palm OS</comment>
<comment xml:lang="ru">База данных Palm OS</comment>
<comment xml:lang="sk">Databáza Palm OS</comment>
@@ -17907,11 +18528,11 @@
<comment xml:lang="sq">Bankë me të dhëna Palm OS</comment>
<comment xml:lang="sr">база података Палм ОС-а</comment>
<comment xml:lang="sv">Palm OS-databas</comment>
- <comment xml:lang="tr">Palm OS veritabanı</comment>
+ <comment xml:lang="tr">Palm OS veri tabanı</comment>
<comment xml:lang="uk">база даних Palm OS</comment>
<comment xml:lang="vi">Cơ sở dữ liệu PalmOS</comment>
- <comment xml:lang="zh_CN">Palm OS 数据库</comment>
- <comment xml:lang="zh_TW">Palm OS 資料庫</comment>
+ <comment xml:lang="zh-CN">Palm OS 数据库</comment>
+ <comment xml:lang="zh-TW">Palm OS 資料庫</comment>
<glob pattern="*.prc"/>
<glob pattern="*.pdb"/>
<glob pattern="*.pqa"/>
@@ -17920,20 +18541,22 @@
</mime-type>
<mime-type type="application/x-par2">
<comment>Parchive archive</comment>
+ <comment xml:lang="af">Parchive-argief</comment>
<comment xml:lang="ar">أرشيف Parchive</comment>
- <comment xml:lang="be@latin">Archiŭ Parchive</comment>
+ <comment xml:lang="be-Latn">Archiŭ Parchive</comment>
<comment xml:lang="bg">Архив — parchive</comment>
<comment xml:lang="ca">arxiu Parchive</comment>
<comment xml:lang="cs">archiv Parchive</comment>
<comment xml:lang="da">Parchive-arkiv</comment>
<comment xml:lang="de">Parchive-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Parchive</comment>
- <comment xml:lang="en_GB">Parchive archive</comment>
+ <comment xml:lang="en-GB">Parchive archive</comment>
<comment xml:lang="es">archivador Parchive</comment>
<comment xml:lang="eu">Parchive artxiboa</comment>
<comment xml:lang="fi">Parchive-arkisto</comment>
<comment xml:lang="fo">Parchive skjalasavn</comment>
<comment xml:lang="fr">archive Parchive</comment>
+ <comment xml:lang="fur">archivi Parchive</comment>
<comment xml:lang="ga">cartlann Parchive</comment>
<comment xml:lang="gl">arquivo Parchive</comment>
<comment xml:lang="he">ארכיון של Parchive</comment>
@@ -17953,7 +18576,7 @@
<comment xml:lang="oc">archiu Parchive</comment>
<comment xml:lang="pl">Archiwum parchive</comment>
<comment xml:lang="pt">arquivo Parchive</comment>
- <comment xml:lang="pt_BR">Pacote Parchive</comment>
+ <comment xml:lang="pt-BR">Pacote Parchive</comment>
<comment xml:lang="ro">Arhivă Parchive</comment>
<comment xml:lang="ru">Архив Parchive</comment>
<comment xml:lang="sk">Archív Parchive</comment>
@@ -17964,34 +18587,36 @@
<comment xml:lang="tr">Parchive arşivi</comment>
<comment xml:lang="uk">архів Parchive</comment>
<comment xml:lang="vi">Kho nén Parchive</comment>
- <comment xml:lang="zh_CN">Parchive 归档文件</comment>
- <comment xml:lang="zh_TW">Parchive 封存檔</comment>
+ <comment xml:lang="zh-CN">Parchive 归档文件</comment>
+ <comment xml:lang="zh-TW">Parchive 封存檔</comment>
<acronym>Parchive</acronym>
<expanded-acronym>Parity Volume Set Archive</expanded-acronym>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="PAR2" type="string" offset="0"/>
+ <match offset="0" type="string" value="PAR2"/>
</magic>
<glob pattern="*.PAR2"/>
<glob pattern="*.par2"/>
</mime-type>
<mime-type type="application/x-pef-executable">
<comment>PEF executable</comment>
+ <comment xml:lang="af">PEF-uitvoerbaar</comment>
<comment xml:lang="ar">PEF تنفيذي</comment>
- <comment xml:lang="be@latin">Vykonvalny fajł PEF</comment>
+ <comment xml:lang="be-Latn">Vykonvalny fajł PEF</comment>
<comment xml:lang="bg">Изпълним файл — PEF</comment>
<comment xml:lang="ca">executable PEF</comment>
<comment xml:lang="cs">spustitelný soubor PEF</comment>
<comment xml:lang="da">PEF-kørbar</comment>
<comment xml:lang="de">PEF-Programm</comment>
<comment xml:lang="el">Εκτελέσιμο PEF</comment>
- <comment xml:lang="en_GB">PEF executable</comment>
+ <comment xml:lang="en-GB">PEF executable</comment>
<comment xml:lang="eo">PEF-plenumebla</comment>
<comment xml:lang="es">ejecutable PEF</comment>
<comment xml:lang="eu">PEF exekutagarria</comment>
<comment xml:lang="fi">PEF-ohjelma</comment>
<comment xml:lang="fo">PEF inningarfør</comment>
<comment xml:lang="fr">exécutable PEF</comment>
+ <comment xml:lang="fur">eseguibil PEF</comment>
<comment xml:lang="ga">comhad inrite PEF</comment>
<comment xml:lang="gl">Executábel PEF</comment>
<comment xml:lang="he">קובץ הרצה PEF</comment>
@@ -18012,7 +18637,7 @@
<comment xml:lang="oc">executable PEF</comment>
<comment xml:lang="pl">Program PEF</comment>
<comment xml:lang="pt">executável PEF</comment>
- <comment xml:lang="pt_BR">Executável PEF</comment>
+ <comment xml:lang="pt-BR">Executável PEF</comment>
<comment xml:lang="ro">Executabil PEF</comment>
<comment xml:lang="ru">Исполняемый файл PEF</comment>
<comment xml:lang="sk">Spustiteľný súbor PEF</comment>
@@ -18023,31 +18648,33 @@
<comment xml:lang="tr">PEF çalıştırılabilir</comment>
<comment xml:lang="uk">виконуваний файл PEF</comment>
<comment xml:lang="vi">Tập tin thực hiện được PEF</comment>
- <comment xml:lang="zh_CN">PEF 可执行文件</comment>
- <comment xml:lang="zh_TW">PEF 可執行檔</comment>
+ <comment xml:lang="zh-CN">PEF 可执行文件</comment>
+ <comment xml:lang="zh-TW">PEF 可執行檔</comment>
<generic-icon name="application-x-executable"/>
<magic priority="50">
- <match value="Joy!" type="string" offset="0"/>
+ <match type="string" value="Joy!" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-perl">
<comment>Perl script</comment>
+ <comment xml:lang="af">Perl-skrip</comment>
<comment xml:lang="ar">سكربت بيرل</comment>
- <comment xml:lang="be@latin">Skrypt Perl</comment>
+ <comment xml:lang="be-Latn">Skrypt Perl</comment>
<comment xml:lang="bg">Скрипт — Perl</comment>
<comment xml:lang="ca">script Perl</comment>
<comment xml:lang="cs">skript v Perlu</comment>
<comment xml:lang="cy">Sgript Perl</comment>
- <comment xml:lang="da">Perlprogram</comment>
+ <comment xml:lang="da">Perl-program</comment>
<comment xml:lang="de">Perl-Skript</comment>
<comment xml:lang="el">Δέσμη ενεργειών Perl</comment>
- <comment xml:lang="en_GB">Perl script</comment>
+ <comment xml:lang="en-GB">Perl script</comment>
<comment xml:lang="eo">Perl-skripto</comment>
<comment xml:lang="es">secuencia de órdenes en Perl</comment>
<comment xml:lang="eu">Perl script-a</comment>
<comment xml:lang="fi">Perl-komentotiedosto</comment>
<comment xml:lang="fo">Perl boðrøð</comment>
<comment xml:lang="fr">script Perl</comment>
+ <comment xml:lang="fur">script Perl</comment>
<comment xml:lang="ga">script Perl</comment>
<comment xml:lang="gl">Script de Perl</comment>
<comment xml:lang="he">תסריט מעטפת של Perl</comment>
@@ -18068,7 +18695,7 @@
<comment xml:lang="oc">escript Perl</comment>
<comment xml:lang="pl">Skrypt Perl</comment>
<comment xml:lang="pt">script Perl</comment>
- <comment xml:lang="pt_BR">Script Perl</comment>
+ <comment xml:lang="pt-BR">Script Perl</comment>
<comment xml:lang="ro">Script Perl</comment>
<comment xml:lang="ru">Сценарий Perl</comment>
<comment xml:lang="sk">Skript jazyka Perl</comment>
@@ -18079,40 +18706,41 @@
<comment xml:lang="tr">Perl betiği</comment>
<comment xml:lang="uk">скрипт на Perl</comment>
<comment xml:lang="vi">Văn lệnh Perl</comment>
- <comment xml:lang="zh_CN">Perl 脚本</comment>
- <comment xml:lang="zh_TW">Perl 指令稿</comment>
+ <comment xml:lang="zh-CN">Perl 脚本</comment>
+ <comment xml:lang="zh-TW">Perl 指令稿</comment>
<sub-class-of type="application/x-executable"/>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-script"/>
<alias type="text/x-perl"/>
<magic priority="50">
- <match value='eval \"exec /usr/local/bin/perl' type="string" offset="0"/>
- <match value="/bin/perl" type="string" offset="2:16"/>
- <match value="/bin/env perl" type="string" offset="2:16"/>
- <match value="use strict" type="string" offset="0:256"/>
- <match value="use warnings" type="string" offset="0:256"/>
- <match value="use diagnostics" type="string" offset="0:256"/>
- <match value="use Test::" type="string" offset="0:256"/>
- <match value="BEGIN {" type="string" offset="0:256"/>
+ <match type="string" value="eval \&quot;exec /usr/local/bin/perl" offset="0"/>
+ <match type="string" value="/bin/perl" offset="2:16"/>
+ <match type="string" value="/bin/env perl" offset="2:16"/>
+ <match type="string" value="use Test::" offset="0:256"/>
+ <match type="string" value="BEGIN {" offset="0:256"/>
</magic>
<magic priority="40">
- <match value="\n=pod" type="string" offset="0:256"/>
- <match value="\n=head1 NAME" type="string" offset="0:256"/>
- <match value="\n=head1 DESCRIPTION" type="string" offset="0:256"/>
+ <match type="string" value="use strict" offset="0:256"/>
+ <match type="string" value="use warnings" offset="0:256"/>
+ <match type="string" value="use diagnostics" offset="0:256"/>
+ <match type="string" value="\n=pod" offset="0:256"/>
+ <match type="string" value="\n=head1 NAME" offset="0:256"/>
+ <match type="string" value="\n=head1 DESCRIPTION" offset="0:256"/>
</magic>
<glob pattern="*.pl"/>
- <glob pattern="*.PL"/>
- <glob pattern="*.pm"/>
- <glob pattern="*.al"/>
+ <glob pattern="*.PL"/><!-- CPAN-style Perl build script -->
+ <glob pattern="*.pm"/><!-- module -->
+ <glob pattern="*.al"/><!-- autoloader -->
<glob pattern="*.perl"/>
- <glob pattern="*.pod"/>
- <glob weight="10" pattern="*.t"/>
+ <glob pattern="*.pod"/><!-- documentation -->
+ <glob pattern="*.t" weight="10"/><!-- CPAN-style Perl test script -->
</mime-type>
<mime-type type="application/x-php">
<comment>PHP script</comment>
+ <comment xml:lang="af">PHP-skrip</comment>
<comment xml:lang="ar">سكربت PHP</comment>
<comment xml:lang="az">PHP skripti</comment>
- <comment xml:lang="be@latin">Skrypt PHP</comment>
+ <comment xml:lang="be-Latn">Skrypt PHP</comment>
<comment xml:lang="bg">Скрипт — PHP</comment>
<comment xml:lang="ca">script PHP</comment>
<comment xml:lang="cs">skript PHP</comment>
@@ -18120,13 +18748,14 @@
<comment xml:lang="da">PHP-program</comment>
<comment xml:lang="de">PHP-Skript</comment>
<comment xml:lang="el">Δέσμη ενεργειών PHP</comment>
- <comment xml:lang="en_GB">PHP script</comment>
+ <comment xml:lang="en-GB">PHP script</comment>
<comment xml:lang="eo">PHP-skripto</comment>
<comment xml:lang="es">secuencia de órdenes en PHP</comment>
<comment xml:lang="eu">PHP script-a</comment>
<comment xml:lang="fi">PHP-komentotiedosto</comment>
<comment xml:lang="fo">PHP boðrøð</comment>
<comment xml:lang="fr">script PHP</comment>
+ <comment xml:lang="fur">script PHP</comment>
<comment xml:lang="ga">script PHP</comment>
<comment xml:lang="gl">Script de PHP</comment>
<comment xml:lang="he">תסריט מעטפת של PHP</comment>
@@ -18147,7 +18776,7 @@
<comment xml:lang="oc">escript PHP</comment>
<comment xml:lang="pl">Skrypt PHP</comment>
<comment xml:lang="pt">script PHP</comment>
- <comment xml:lang="pt_BR">Script PHP</comment>
+ <comment xml:lang="pt-BR">Script PHP</comment>
<comment xml:lang="ro">Script PHP</comment>
<comment xml:lang="ru">Сценарий PHP</comment>
<comment xml:lang="sk">Skript PHP</comment>
@@ -18158,12 +18787,12 @@
<comment xml:lang="tr">PHP betiği</comment>
<comment xml:lang="uk">скрипт PHP</comment>
<comment xml:lang="vi">Văn lệnh PHP</comment>
- <comment xml:lang="zh_CN">PHP 脚本</comment>
- <comment xml:lang="zh_TW">PHP 指令稿</comment>
+ <comment xml:lang="zh-CN">PHP 脚本</comment>
+ <comment xml:lang="zh-TW">PHP 指令稿</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-script"/>
<magic priority="80">
- <match value="&lt;?php" type="string" offset="0:64"/>
+ <match type="string" value="&lt;?php" offset="0:64"/>
</magic>
<glob pattern="*.php"/>
<glob pattern="*.php3"/>
@@ -18173,19 +18802,21 @@
</mime-type>
<mime-type type="application/x-pkcs7-certificates">
<comment>PKCS#7 certificate bundle</comment>
+ <comment xml:lang="af">PKCS#7-sertifikaatbundel</comment>
<comment xml:lang="ar">رزمة الشهادة PKCS#7</comment>
- <comment xml:lang="bg">Сбор със сертификати — PKCS#7</comment>
+ <comment xml:lang="bg">Пакет със сертификати — PKCS#7</comment>
<comment xml:lang="ca">conjunt de certificats PKCS#7</comment>
<comment xml:lang="cs">svazek certifikátů PKCS#7</comment>
<comment xml:lang="da">PKCS#7-certifikatbundt</comment>
<comment xml:lang="de">PKCS#7-Zertifikatspaket</comment>
<comment xml:lang="el">Πακέτο ψηφιακών πιστοποιητικών PKCS#7</comment>
- <comment xml:lang="en_GB">PKCS#7 certificate bundle</comment>
+ <comment xml:lang="en-GB">PKCS#7 certificate bundle</comment>
<comment xml:lang="es">lote de certificados PCKS#7</comment>
<comment xml:lang="eu">PKCS#7 zertifikazio sorta</comment>
<comment xml:lang="fi">PKCS#7-varmennenippu</comment>
<comment xml:lang="fo">PKCS#7 váttanar bundi</comment>
<comment xml:lang="fr">lot de certificats PKCS#7</comment>
+ <comment xml:lang="fur">côl di certificâts PKCS#7</comment>
<comment xml:lang="ga">burla teastas PKCS#7</comment>
<comment xml:lang="gl">paquete de certificado PKCS#7</comment>
<comment xml:lang="he">בקשה מוסמכת PKCS#7</comment>
@@ -18203,7 +18834,7 @@
<comment xml:lang="oc">lòt de certificats PKCS#7</comment>
<comment xml:lang="pl">Pakiet certyfikatu PKCS#7</comment>
<comment xml:lang="pt">pacote de certificação PKCS#7</comment>
- <comment xml:lang="pt_BR">Pacote de certificados PKCS#7</comment>
+ <comment xml:lang="pt-BR">Pacote de certificados PKCS#7</comment>
<comment xml:lang="ro">Pachet certificat PKCS#7</comment>
<comment xml:lang="ru">Пакет сертификата PKCS#7</comment>
<comment xml:lang="sk">Zväzok certifikátov PKCS#7</comment>
@@ -18213,8 +18844,8 @@
<comment xml:lang="tr">PKCS#7 sertifika paketi</comment>
<comment xml:lang="uk">комплект сертифікатів PKCS#7</comment>
<comment xml:lang="vi">Bó chứng nhận PKCS#7</comment>
- <comment xml:lang="zh_CN">PKCS#7 证书束</comment>
- <comment xml:lang="zh_TW">PKCS#7 憑證綁包</comment>
+ <comment xml:lang="zh-CN">PKCS#7 证书束</comment>
+ <comment xml:lang="zh-TW">PKCS#7 憑證綁包</comment>
<acronym>PKCS</acronym>
<expanded-acronym>Public-Key Cryptography Standards</expanded-acronym>
<glob pattern="*.p7b"/>
@@ -18222,21 +18853,23 @@
</mime-type>
<mime-type type="application/pkcs12">
<comment>PKCS#12 certificate bundle</comment>
+ <comment xml:lang="af">PKCS#12-sertifikaatbundel</comment>
<comment xml:lang="ar">رزمة الشهادة PKCS#12</comment>
- <comment xml:lang="be@latin">Viazka sertyfikataŭ PKCS#12</comment>
- <comment xml:lang="bg">Сбор със сертификати — PKCS#12</comment>
+ <comment xml:lang="be-Latn">Viazka sertyfikataŭ PKCS#12</comment>
+ <comment xml:lang="bg">Пакет със сертификати — PKCS#12</comment>
<comment xml:lang="ca">conjunt de certificats PKCS#12</comment>
<comment xml:lang="cs">svazek certifikátů PKCS#12</comment>
<comment xml:lang="da">PKCS#12-certifikatbundt</comment>
<comment xml:lang="de">PKCS#12-Zertifikatspaket</comment>
<comment xml:lang="el">Πακέτο ψηφιακών πιστοποιητικών PKCS#12</comment>
- <comment xml:lang="en_GB">PKCS#12 certificate bundle</comment>
+ <comment xml:lang="en-GB">PKCS#12 certificate bundle</comment>
<comment xml:lang="eo">ligaĵo de PKCS#12-atestiloj</comment>
<comment xml:lang="es">lote de certificados PCKS#12</comment>
<comment xml:lang="eu">PKCS#12 zertifikazio sorta</comment>
<comment xml:lang="fi">PKCS#12-varmennenippu</comment>
<comment xml:lang="fo">PKCS#12 váttanar bundi</comment>
<comment xml:lang="fr">lot de certificats PKCS#12</comment>
+ <comment xml:lang="fur">côl di certificâts PKCS#12</comment>
<comment xml:lang="ga">burla teastas PKCS#12</comment>
<comment xml:lang="gl">paquete de certificado PKCS#12</comment>
<comment xml:lang="he">בקשה מוסמכת PKCS#12</comment>
@@ -18257,7 +18890,7 @@
<comment xml:lang="oc">lòt de certificats PKCS#12</comment>
<comment xml:lang="pl">Pakiet certyfikatu PKCS#12</comment>
<comment xml:lang="pt">pacote de certificação PKCS#12</comment>
- <comment xml:lang="pt_BR">Pacote de certificados PKCS#12</comment>
+ <comment xml:lang="pt-BR">Pacote de certificados PKCS#12</comment>
<comment xml:lang="ro">Certificat împachetat PKCS#12</comment>
<comment xml:lang="ru">Пакет сертификата PKCS#12</comment>
<comment xml:lang="sk">Zväzok certifikátov PKCS#12</comment>
@@ -18268,8 +18901,8 @@
<comment xml:lang="tr">PKCS#12 sertifika paketi</comment>
<comment xml:lang="uk">комплект сертифікатів PKCS#12</comment>
<comment xml:lang="vi">Bó chứng nhận PKCS#12</comment>
- <comment xml:lang="zh_CN">PKCS#12 证书束</comment>
- <comment xml:lang="zh_TW">PKCS#12 憑證檔綁包</comment>
+ <comment xml:lang="zh-CN">PKCS#12 证书束</comment>
+ <comment xml:lang="zh-TW">PKCS#12 憑證綁包</comment>
<acronym>PKCS</acronym>
<expanded-acronym>Public-Key Cryptography Standards</expanded-acronym>
<glob pattern="*.p12"/>
@@ -18278,20 +18911,22 @@
</mime-type>
<mime-type type="application/x-planperfect">
<comment>PlanPerfect spreadsheet</comment>
+ <comment xml:lang="af">PlanPerfect-sigblad</comment>
<comment xml:lang="ar">جدول PlanPerfect</comment>
- <comment xml:lang="be@latin">Raźlikovy arkuš PlanPerfect</comment>
+ <comment xml:lang="be-Latn">Raźlikovy arkuš PlanPerfect</comment>
<comment xml:lang="bg">Таблица — PlanPerfect</comment>
<comment xml:lang="ca">full de càlcul de PlanPerfect</comment>
<comment xml:lang="cs">sešit PlanPerfect</comment>
<comment xml:lang="da">PlanPerfect-regneark</comment>
<comment xml:lang="de">PlanPerfect-Tabelle</comment>
<comment xml:lang="el">Φύλλο εργασίας PlanPerfect</comment>
- <comment xml:lang="en_GB">PlanPerfect spreadsheet</comment>
+ <comment xml:lang="en-GB">PlanPerfect spreadsheet</comment>
<comment xml:lang="es">hoja de cálculo de PlanPerfect</comment>
<comment xml:lang="eu">PlanPerfect kalkulu-orria</comment>
<comment xml:lang="fi">PlanPerfect-taulukko</comment>
<comment xml:lang="fo">PlanPerfect rokniark</comment>
<comment xml:lang="fr">feuille de calcul PlanPerfect</comment>
+ <comment xml:lang="fur">sfuei di calcul PlanPerfect</comment>
<comment xml:lang="ga">scarbhileog PlanPerfect</comment>
<comment xml:lang="gl">folla de cálculo de PlanPerfect</comment>
<comment xml:lang="he">גליון נתונים של PlanPerfect</comment>
@@ -18311,7 +18946,7 @@
<comment xml:lang="oc">fuèlh de calcul PlanPerfect</comment>
<comment xml:lang="pl">Arkusz PlanPerfect</comment>
<comment xml:lang="pt">folha de cálculo PlanPerfect</comment>
- <comment xml:lang="pt_BR">Planilha do PlanPerfect</comment>
+ <comment xml:lang="pt-BR">Planilha do PlanPerfect</comment>
<comment xml:lang="ro">Foaie de calcul PlanPerfect</comment>
<comment xml:lang="ru">Электронная таблица PlanPerfect</comment>
<comment xml:lang="sk">Zošit PlanPerfect</comment>
@@ -18319,16 +18954,17 @@
<comment xml:lang="sq">Fletë llogaritjesh PlanPerfect</comment>
<comment xml:lang="sr">табела План Перфекта</comment>
<comment xml:lang="sv">PlanPerfect-kalkylblad</comment>
- <comment xml:lang="tr">PlanPerfect çalışma sayfası</comment>
+ <comment xml:lang="tr">PlanPerfect hesap çizelgesi</comment>
<comment xml:lang="uk">ел. таблиця PlanPerfect</comment>
<comment xml:lang="vi">Bảng tính PlanPerfect</comment>
- <comment xml:lang="zh_CN">PlanPerfect 电子表格</comment>
- <comment xml:lang="zh_TW">PlanPerfect 試算表</comment>
+ <comment xml:lang="zh-CN">PlanPerfect 电子表格</comment>
+ <comment xml:lang="zh-TW">PlanPerfect 試算表</comment>
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.pln"/>
</mime-type>
<mime-type type="application/x-pocket-word">
<comment>Pocket Word document</comment>
+ <comment xml:lang="af">Pocket Word-dokument</comment>
<comment xml:lang="ar">مستند Pocket Word</comment>
<comment xml:lang="ast">Documentu de PocketWord</comment>
<comment xml:lang="bg">Документ — Pocket Word</comment>
@@ -18337,12 +18973,13 @@
<comment xml:lang="da">Pocket Word-dokument</comment>
<comment xml:lang="de">Pocket-Word-Dokument</comment>
<comment xml:lang="el">Έγγραφο Pocket Word</comment>
- <comment xml:lang="en_GB">Pocket Word document</comment>
+ <comment xml:lang="en-GB">Pocket Word document</comment>
<comment xml:lang="es">documento de Pocket Word</comment>
<comment xml:lang="eu">Pocket Word dokumentua</comment>
<comment xml:lang="fi">Pocket Word -asiakirja</comment>
<comment xml:lang="fo">Pocket Word skjal</comment>
<comment xml:lang="fr">document Pocket Word</comment>
+ <comment xml:lang="fur">document Pocket Word</comment>
<comment xml:lang="ga">cáipéis Pocket Word</comment>
<comment xml:lang="gl">documento de Pocket Word</comment>
<comment xml:lang="he">מסמך של Pocket Word</comment>
@@ -18360,7 +18997,7 @@
<comment xml:lang="oc">document Pocket Word</comment>
<comment xml:lang="pl">Dokument Pocket Word</comment>
<comment xml:lang="pt">documento Pocket Word</comment>
- <comment xml:lang="pt_BR">Documento do Pocket Word</comment>
+ <comment xml:lang="pt-BR">Documento do Pocket Word</comment>
<comment xml:lang="ro">Document Pocket Word</comment>
<comment xml:lang="ru">Документ Pocket Word</comment>
<comment xml:lang="sk">Dokument Pocket Word</comment>
@@ -18370,32 +19007,34 @@
<comment xml:lang="tr">Pocket Word belgesi</comment>
<comment xml:lang="uk">документ Pocket Word</comment>
<comment xml:lang="vi">Tài liệu Pocket Word</comment>
- <comment xml:lang="zh_CN">Pocket Word 文档</comment>
- <comment xml:lang="zh_TW">Pocket Word 文件</comment>
+ <comment xml:lang="zh-CN">Pocket Word 文档</comment>
+ <comment xml:lang="zh-TW">Pocket Word 文件</comment>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="{\\pwi" type="string" offset="0"/>
+ <match type="string" value="{\\pwi" offset="0"/>
</magic>
<glob pattern="*.psw"/>
</mime-type>
<mime-type type="application/x-profile">
<comment>profiler results</comment>
+ <comment xml:lang="af">profieldata</comment>
<comment xml:lang="ar">نتائج المحلل</comment>
<comment xml:lang="az">profiler nəticələri</comment>
- <comment xml:lang="be@latin">vyniki profilera</comment>
+ <comment xml:lang="be-Latn">vyniki profilera</comment>
<comment xml:lang="bg">Резултати от анализатора</comment>
- <comment xml:lang="ca">resultats de profiler</comment>
+ <comment xml:lang="ca">resultats del perfilador</comment>
<comment xml:lang="cs">výsledky profileru</comment>
<comment xml:lang="cy">canlyniadau proffeilio</comment>
<comment xml:lang="da">profileringsresultater</comment>
<comment xml:lang="de">Profiler-Ergebnisse</comment>
<comment xml:lang="el">Αποτελέσματα μετρήσεων για την εκτέλεση προγράμματος</comment>
- <comment xml:lang="en_GB">profiler results</comment>
+ <comment xml:lang="en-GB">profiler results</comment>
<comment xml:lang="eo">resultoj de profililo</comment>
<comment xml:lang="es">resultados del perfilador</comment>
<comment xml:lang="eu">profiler-aren emaitzak</comment>
<comment xml:lang="fi">profilointitulokset</comment>
<comment xml:lang="fr">résultats de profileur</comment>
+ <comment xml:lang="fur">risultâts profiladôr</comment>
<comment xml:lang="ga">torthaí próifíleora</comment>
<comment xml:lang="gl">resultados do perfilador</comment>
<comment xml:lang="he">תוצאות מאבחן</comment>
@@ -18416,7 +19055,7 @@
<comment xml:lang="oc">resultats de perfilador</comment>
<comment xml:lang="pl">Wyniki profilowania</comment>
<comment xml:lang="pt">resultados de análise de perfil</comment>
- <comment xml:lang="pt_BR">Resultados do profiler</comment>
+ <comment xml:lang="pt-BR">Resultados do profiler</comment>
<comment xml:lang="ro">rezultate profiler</comment>
<comment xml:lang="ru">Результаты профилирования</comment>
<comment xml:lang="sk">Výsledky profilera</comment>
@@ -18424,33 +19063,35 @@
<comment xml:lang="sq">Rezultate të profiluesit</comment>
<comment xml:lang="sr">резултати профилатора</comment>
<comment xml:lang="sv">profilerarresultat</comment>
- <comment xml:lang="tr">profil sonuçları</comment>
+ <comment xml:lang="tr">profiler sonuçları</comment>
<comment xml:lang="uk">результати профілювання</comment>
<comment xml:lang="vi">kết quả nét hiện trạng</comment>
- <comment xml:lang="zh_CN">探查器结果</comment>
- <comment xml:lang="zh_TW">硬體資訊產生器成果</comment>
+ <comment xml:lang="zh-CN">探查器结果</comment>
+ <comment xml:lang="zh-TW">硬體資訊產生器成果</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<glob pattern="gmon.out"/>
</mime-type>
<mime-type type="application/x-pw">
<comment>Pathetic Writer document</comment>
+ <comment xml:lang="af">Pathetic Writer-dokument</comment>
<comment xml:lang="ar">مستند Pathetic Writer</comment>
<comment xml:lang="ast">Documentu de Pathetic Writer</comment>
- <comment xml:lang="be@latin">Dakument Pathetic Writer</comment>
+ <comment xml:lang="be-Latn">Dakument Pathetic Writer</comment>
<comment xml:lang="bg">Документ — Pathetic Writer</comment>
<comment xml:lang="ca">document de Pathetic Writer</comment>
<comment xml:lang="cs">dokument Pathetic Writer</comment>
<comment xml:lang="da">Pathetic Writer-dokument</comment>
<comment xml:lang="de">Pathetic-Writer-Dokument</comment>
<comment xml:lang="el">Έγγραφο Pathetic Writer</comment>
- <comment xml:lang="en_GB">Pathetic Writer document</comment>
+ <comment xml:lang="en-GB">Pathetic Writer document</comment>
<comment xml:lang="eo">dokumento de Pathetic Writer</comment>
<comment xml:lang="es">documento de Pathetic Writer</comment>
<comment xml:lang="eu">Pathetic Writer dokumentua</comment>
<comment xml:lang="fi">Pathetic Writer -asiakirja</comment>
<comment xml:lang="fo">Pathetic Writer skjal</comment>
<comment xml:lang="fr">document Pathetic Writer</comment>
+ <comment xml:lang="fur">document Pathetic Writer</comment>
<comment xml:lang="ga">cáipéis Pathetic Writer</comment>
<comment xml:lang="gl">documento de Pathetic Writer</comment>
<comment xml:lang="he">מסמך של Pathetic Writer</comment>
@@ -18471,7 +19112,7 @@
<comment xml:lang="oc">document Pathetic Writer</comment>
<comment xml:lang="pl">Dokument Pathetic Writer</comment>
<comment xml:lang="pt">documento do Pathetic Writer</comment>
- <comment xml:lang="pt_BR">Documento do Pathetic Writer</comment>
+ <comment xml:lang="pt-BR">Documento do Pathetic Writer</comment>
<comment xml:lang="ro">Document Pathetic Writer</comment>
<comment xml:lang="ru">Документ Pathetic Writer</comment>
<comment xml:lang="sk">Dokument Pathetic Writer</comment>
@@ -18482,30 +19123,32 @@
<comment xml:lang="tr">Pathetic Writer belgesi</comment>
<comment xml:lang="uk">документ Pathetic Writer</comment>
<comment xml:lang="vi">Tài liệu Pathetic Writer</comment>
- <comment xml:lang="zh_CN">Pathetic Writer 文档</comment>
- <comment xml:lang="zh_TW">Pathetic Writer 文件</comment>
+ <comment xml:lang="zh-CN">Pathetic Writer 文档</comment>
+ <comment xml:lang="zh-TW">Pathetic Writer 文件</comment>
<generic-icon name="x-office-document"/>
<glob pattern="*.pw"/>
</mime-type>
<mime-type type="application/x-python-bytecode">
<comment>Python bytecode</comment>
+ <comment xml:lang="af">Python binêre kode</comment>
<comment xml:lang="ar">Python bytecode</comment>
<comment xml:lang="az">Python bayt kodu</comment>
- <comment xml:lang="be@latin">Bajtavy kod Python</comment>
+ <comment xml:lang="be-Latn">Bajtavy kod Python</comment>
<comment xml:lang="bg">Байт код — Python</comment>
<comment xml:lang="ca">bytecode de Python</comment>
<comment xml:lang="cs">bajtový kód Python</comment>
<comment xml:lang="cy">Côd beit Python</comment>
- <comment xml:lang="da">Pythonbytekode</comment>
+ <comment xml:lang="da">Python-bytekode</comment>
<comment xml:lang="de">Python-Bytecode</comment>
<comment xml:lang="el">Συμβολοκώδικας Python</comment>
- <comment xml:lang="en_GB">Python bytecode</comment>
+ <comment xml:lang="en-GB">Python bytecode</comment>
<comment xml:lang="eo">Python-bajtkodo</comment>
<comment xml:lang="es">bytecode de Python</comment>
<comment xml:lang="eu">Python byte-kodea</comment>
<comment xml:lang="fi">Python-tavukoodi</comment>
<comment xml:lang="fo">Python býtkota</comment>
<comment xml:lang="fr">bytecode Python</comment>
+ <comment xml:lang="fur">bytecode di Python</comment>
<comment xml:lang="ga">beartchód Python</comment>
<comment xml:lang="gl">bytecode de Python</comment>
<comment xml:lang="he">Bytecode של Python</comment>
@@ -18526,7 +19169,7 @@
<comment xml:lang="oc">bytecode Python</comment>
<comment xml:lang="pl">Kod bajtowy Python</comment>
<comment xml:lang="pt">código binário Python</comment>
- <comment xml:lang="pt_BR">Código compilado Python</comment>
+ <comment xml:lang="pt-BR">Código compilado Python</comment>
<comment xml:lang="ro">Bytecode Python</comment>
<comment xml:lang="ru">Байт-код Python</comment>
<comment xml:lang="sk">Bajtový kód Python</comment>
@@ -18537,27 +19180,30 @@
<comment xml:lang="tr">Python bayt kodu</comment>
<comment xml:lang="uk">байт-код Python</comment>
<comment xml:lang="vi">Mã byte Python</comment>
- <comment xml:lang="zh_CN">Python 字节码</comment>
- <comment xml:lang="zh_TW">Python 位元組碼</comment>
+ <comment xml:lang="zh-CN">Python 字节码</comment>
+ <comment xml:lang="zh-TW">Python 位元組碼</comment>
<magic priority="50">
- <match value="0x994e0d0a" type="big32" offset="0"/>
+ <match type="big32" value="0x994e0d0a" offset="0"/>
</magic>
<glob pattern="*.pyc"/>
<glob pattern="*.pyo"/>
</mime-type>
<mime-type type="application/x-qtiplot">
<comment>QtiPlot document</comment>
+ <comment xml:lang="af">QtiPlot-dokument</comment>
<comment xml:lang="ast">Documentu de QtiPlot</comment>
+ <comment xml:lang="bg">Документ — QtiPlot</comment>
<comment xml:lang="ca">document QtiPlot</comment>
<comment xml:lang="cs">dokument GtiPlot</comment>
<comment xml:lang="da">QtiPlot-dokument</comment>
<comment xml:lang="de">QtiPlot-Dokument</comment>
<comment xml:lang="el">Έγγραφο QtiPlot</comment>
- <comment xml:lang="en_GB">QtiPlot document</comment>
+ <comment xml:lang="en-GB">QtiPlot document</comment>
<comment xml:lang="es">documento de QtiPlot</comment>
<comment xml:lang="eu">QtiPlot dokumentua</comment>
<comment xml:lang="fi">QtiPlot-asiakirja</comment>
<comment xml:lang="fr">document QtiPlot</comment>
+ <comment xml:lang="fur">document QtiPlot</comment>
<comment xml:lang="ga">cáipéis QtiPlot</comment>
<comment xml:lang="gl">Documento de QtiPilot</comment>
<comment xml:lang="he">מסמך QtiPlot</comment>
@@ -18573,7 +19219,7 @@
<comment xml:lang="oc">document QtiPlot</comment>
<comment xml:lang="pl">Dokument QtiPlot</comment>
<comment xml:lang="pt">documento QtiPlot</comment>
- <comment xml:lang="pt_BR">Documento do QtiPlot</comment>
+ <comment xml:lang="pt-BR">Documento do QtiPlot</comment>
<comment xml:lang="ru">Документ QtiPlot</comment>
<comment xml:lang="sk">Dokument QtiPlot</comment>
<comment xml:lang="sl">Dokument QtiPlot</comment>
@@ -18581,8 +19227,8 @@
<comment xml:lang="sv">QtiPlot-dokument</comment>
<comment xml:lang="tr">QtiPlot belgesi</comment>
<comment xml:lang="uk">документ QtiPlot</comment>
- <comment xml:lang="zh_CN">QtiPlot 文档</comment>
- <comment xml:lang="zh_TW">QtiPlot 文件</comment>
+ <comment xml:lang="zh-CN">QtiPlot 文档</comment>
+ <comment xml:lang="zh-TW">QtiPlot 文件</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="x-office-document"/>
<magic priority="50">
@@ -18593,21 +19239,23 @@
</mime-type>
<mime-type type="application/x-quattropro">
<comment>Quattro Pro spreadsheet</comment>
+ <comment xml:lang="af">Quattro Pro-sigblad</comment>
<comment xml:lang="ar">جدول Quattro Pro</comment>
- <comment xml:lang="be@latin">Raźlikovy arkuš Quattro Pro</comment>
+ <comment xml:lang="be-Latn">Raźlikovy arkuš Quattro Pro</comment>
<comment xml:lang="bg">Таблица — Quattro Pro</comment>
<comment xml:lang="ca">full de càlcul de Quattro Pro</comment>
<comment xml:lang="cs">sešit Quattro Pro</comment>
<comment xml:lang="da">Quattro Pro-regneark</comment>
<comment xml:lang="de">Quattro-Pro-Tabelle</comment>
<comment xml:lang="el">Λογιστικό φύλλο Quattro Pro</comment>
- <comment xml:lang="en_GB">Quattro Pro spreadsheet</comment>
+ <comment xml:lang="en-GB">Quattro Pro spreadsheet</comment>
<comment xml:lang="eo">sterntabelo de Quattro Pro</comment>
<comment xml:lang="es">hoja de cálculo de Quattro Pro</comment>
<comment xml:lang="eu">Quattro Pro kalkulu-orria</comment>
<comment xml:lang="fi">Quattro Pro -taulukko</comment>
<comment xml:lang="fo">Quattro Pro rokniark</comment>
<comment xml:lang="fr">feuille de calcul Quattro Pro</comment>
+ <comment xml:lang="fur">sfuei di calcul Quattro Pro</comment>
<comment xml:lang="ga">scarbhileog Quattro Pro</comment>
<comment xml:lang="gl">folla de cálculo Quattro Pro</comment>
<comment xml:lang="he">גליון נתונים של Quattro Pro</comment>
@@ -18628,7 +19276,7 @@
<comment xml:lang="oc">fuèlh de calcul Quattro Pro</comment>
<comment xml:lang="pl">Arkusz Quattro Pro</comment>
<comment xml:lang="pt">folha de cálculo Quattro Pro</comment>
- <comment xml:lang="pt_BR">Planilha do Quattro Pro</comment>
+ <comment xml:lang="pt-BR">Planilha do Quattro Pro</comment>
<comment xml:lang="ro">Foaie de calcul Quattro Pro</comment>
<comment xml:lang="ru">Электронная таблица Quattro Pro</comment>
<comment xml:lang="sk">Zošit Quattro Pro</comment>
@@ -18636,70 +19284,48 @@
<comment xml:lang="sq">Fletë llogaritjesh Quattro Pro</comment>
<comment xml:lang="sr">Кватро Про табела</comment>
<comment xml:lang="sv">Quattro Pro-kalkylblad</comment>
- <comment xml:lang="tr">Quattro Pro çalışma sayfası</comment>
+ <comment xml:lang="tr">Quattro Pro hesap çizelgesi</comment>
<comment xml:lang="uk">ел. таблиця Quattro Pro</comment>
<comment xml:lang="vi">Bảng tính Quattro Pro</comment>
- <comment xml:lang="zh_CN">Quattro Pro 电子表格</comment>
- <comment xml:lang="zh_TW">Quattro Pro 試算表</comment>
+ <comment xml:lang="zh-CN">Quattro Pro 电子表格</comment>
+ <comment xml:lang="zh-TW">Quattro Pro 試算表</comment>
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.wb1"/>
<glob pattern="*.wb2"/>
<glob pattern="*.wb3"/>
</mime-type>
<mime-type type="application/x-quicktime-media-link">
- <comment>QuickTime metalink playlist</comment>
- <comment xml:lang="ar">قائمة تشغيل QuickTime metalink</comment>
- <comment xml:lang="be@latin">śpis metaspasyłak na pieśni QuickTime</comment>
+ <comment>QuickTime playlist</comment>
<comment xml:lang="bg">Списък за изпълнение — QuickTime</comment>
- <comment xml:lang="ca">llista de reproducció de metaenllaços QuickTime</comment>
- <comment xml:lang="cs">seznam k přehrání metalink QuickTime</comment>
- <comment xml:lang="da">QuickTime metalink-afspilningsliste</comment>
- <comment xml:lang="de">QuickTime-Metalink-Wiedergabeliste</comment>
- <comment xml:lang="el">Λίστα αναπαραγωγής metalinks QuickTime</comment>
- <comment xml:lang="en_GB">QuickTime metalink playlist</comment>
- <comment xml:lang="es">lista de reproducción de metaenlaces QuickTime</comment>
- <comment xml:lang="eu">QuickTime meta-esteken erreprodukzio-zerrenda</comment>
- <comment xml:lang="fi">QuickTime metalink -soittolista</comment>
- <comment xml:lang="fo">QuickTime metaleinkju avspælingarlisti</comment>
- <comment xml:lang="fr">liste de lecture metalink QuickTime</comment>
- <comment xml:lang="ga">seinmliosta meiteanasc QuickTime</comment>
- <comment xml:lang="gl">lista de reprodución de metaligazóns QuickTime</comment>
- <comment xml:lang="he">רשימת השמעה מקושרת של QuickTime</comment>
- <comment xml:lang="hr">QuickTime meta poveznica popisa izvođenja</comment>
- <comment xml:lang="hu">QuickTime metalink lejátszólista</comment>
- <comment xml:lang="ia">Lista de selection Metalink QuickTime</comment>
- <comment xml:lang="id">Senarai berkas taut meta QuickTime</comment>
- <comment xml:lang="it">Playlist metalink QuickTime</comment>
- <comment xml:lang="ja">QuickTime メタリンク再生リスト</comment>
- <comment xml:lang="kk">QuickTime метасілтемелер ойнау тізімі</comment>
- <comment xml:lang="ko">퀵타임 메타링크 재생 목록</comment>
- <comment xml:lang="lt">QuickTime metanuorodos grojaraštis</comment>
- <comment xml:lang="lv">QuickTime metasaites repertuārs</comment>
- <comment xml:lang="nb">QuickTime metalink-spilleliste</comment>
- <comment xml:lang="nl">QuickTime metalink-afspeellijst</comment>
- <comment xml:lang="nn">QuickTime metalink-speleliste</comment>
- <comment xml:lang="oc">lista de lectura metalink QuickTime</comment>
- <comment xml:lang="pl">Lista odtwarzania metaodnośników QuickTime</comment>
- <comment xml:lang="pt">lista de reprodução QuickTime metalink</comment>
- <comment xml:lang="pt_BR">Lista de reprodução metalink do QuickTime</comment>
- <comment xml:lang="ro">Listă cu metalegături QuickTime</comment>
- <comment xml:lang="ru">Список воспроизведения мета-ссылок QuickTime</comment>
- <comment xml:lang="sk">Zoznam skladieb metalink QuickTime</comment>
- <comment xml:lang="sl">Seznam predvajanja QuickTime</comment>
- <comment xml:lang="sq">Listë titujsh metalink QuickTime</comment>
- <comment xml:lang="sr">списак нумера мета везе Квик Тајма</comment>
- <comment xml:lang="sv">QuickTime-metalänkspellista</comment>
- <comment xml:lang="tr">QuickTime metalink çalma listesi</comment>
- <comment xml:lang="uk">список відтворення QuickTime metalink</comment>
- <comment xml:lang="vi">Danh mục nhạc siêu liên kết Quicktime</comment>
- <comment xml:lang="zh_CN">QuickTime Metalink 播放列表</comment>
- <comment xml:lang="zh_TW">QuickTime metalink 播放清單</comment>
+ <comment xml:lang="ca">llista de reproducció QuickTime</comment>
+ <comment xml:lang="da">QuickTime-afspilningsliste</comment>
+ <comment xml:lang="de">QuickTime-Wiedergabeliste</comment>
+ <comment xml:lang="en-GB">QuickTime playlist</comment>
+ <comment xml:lang="es">lista de reproducción de QuickTime</comment>
+ <comment xml:lang="eu">QuickTime erreprodukzio-zerrenda</comment>
+ <comment xml:lang="fi">QuickTime-soittolista</comment>
+ <comment xml:lang="fr">liste de lecture QuickTime</comment>
+ <comment xml:lang="hr">QuickTime popis izvođenja</comment>
+ <comment xml:lang="hu">QuickTime lejátszólista</comment>
+ <comment xml:lang="id">Daftar putar QuickTime</comment>
+ <comment xml:lang="it">Playlist QuickTime</comment>
+ <comment xml:lang="kk">QuickTime ойнау тізімі</comment>
+ <comment xml:lang="ko">퀵타임 재생 목록</comment>
+ <comment xml:lang="pl">Lista odtwarzania QuickTime</comment>
+ <comment xml:lang="pt-BR">Lista de reprodução do QuickTime</comment>
+ <comment xml:lang="ru">Список воспроизведения QuickTime</comment>
+ <comment xml:lang="sk">Zoznam skladieb QuickTime</comment>
+ <comment xml:lang="sv">QuickTime-spellista</comment>
+ <comment xml:lang="tr">QuickTime çalma listesi</comment>
+ <comment xml:lang="uk">список відтворення QuickTime</comment>
+ <comment xml:lang="zh-CN">QuickTime 播放列表</comment>
+ <comment xml:lang="zh-TW">QuickTime 播放清單</comment>
<generic-icon name="video-x-generic"/>
<sub-class-of type="video/quicktime"/>
<alias type="application/x-quicktimeplayer"/>
<magic priority="60">
<match value="&lt;?xml" type="string" offset="0">
- <match value="&lt;?quicktime" type="string" offset="0:64"/>
+ <match type="string" value="&lt;?quicktime" offset="0:64"/>
</match>
<match value="RTSPtext" type="string" offset="0"/>
<match value="rtsptext" type="string" offset="0"/>
@@ -18709,10 +19335,11 @@
</mime-type>
<mime-type type="application/x-qw">
<comment>Quicken document</comment>
+ <comment xml:lang="af">Quicken-dokument</comment>
<comment xml:lang="ar">مستند Quicken</comment>
<comment xml:lang="ast">Documentu de Quicken</comment>
<comment xml:lang="az">Quicken sənədi</comment>
- <comment xml:lang="be@latin">Dakument Quicken</comment>
+ <comment xml:lang="be-Latn">Dakument Quicken</comment>
<comment xml:lang="bg">Документ — Quicken</comment>
<comment xml:lang="ca">document Quicken</comment>
<comment xml:lang="cs">dokument Quicken</comment>
@@ -18720,13 +19347,14 @@
<comment xml:lang="da">Quickendokument</comment>
<comment xml:lang="de">Quicken-Dokument</comment>
<comment xml:lang="el">Έγγραφο Quicken</comment>
- <comment xml:lang="en_GB">Quicken document</comment>
+ <comment xml:lang="en-GB">Quicken document</comment>
<comment xml:lang="eo">Quicken-dokumento</comment>
<comment xml:lang="es">documento de Quicken</comment>
<comment xml:lang="eu">Quicken dokumentua</comment>
<comment xml:lang="fi">Quicken-asiakirja</comment>
<comment xml:lang="fo">Quicken skjal</comment>
<comment xml:lang="fr">document Quicken</comment>
+ <comment xml:lang="fur">document Quicken</comment>
<comment xml:lang="ga">cáipéis Quicken</comment>
<comment xml:lang="gl">documento de Quicken</comment>
<comment xml:lang="he">מסמך של Quicken</comment>
@@ -18747,7 +19375,7 @@
<comment xml:lang="oc">document Quicken</comment>
<comment xml:lang="pl">Dokument Quicken</comment>
<comment xml:lang="pt">documento Quicken</comment>
- <comment xml:lang="pt_BR">Documento do Quicken</comment>
+ <comment xml:lang="pt-BR">Documento do Quicken</comment>
<comment xml:lang="ro">Document Quicken</comment>
<comment xml:lang="ru">Документ Quicken</comment>
<comment xml:lang="sk">Dokument Quicken</comment>
@@ -18758,15 +19386,16 @@
<comment xml:lang="tr">Quicken belgesi</comment>
<comment xml:lang="uk">документ Quicken</comment>
<comment xml:lang="vi">Tài liệu Quicken</comment>
- <comment xml:lang="zh_CN">Quicken 文档</comment>
- <comment xml:lang="zh_TW">Quicken 文件</comment>
+ <comment xml:lang="zh-CN">Quicken 文档</comment>
+ <comment xml:lang="zh-TW">Quicken 文件</comment>
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.qif"/>
</mime-type>
<mime-type type="application/vnd.rar">
<comment>RAR archive</comment>
+ <comment xml:lang="af">RAR-argief</comment>
<comment xml:lang="ar">أرشيف RAR</comment>
- <comment xml:lang="be@latin">Archiŭ RAR</comment>
+ <comment xml:lang="be-Latn">Archiŭ RAR</comment>
<comment xml:lang="bg">Архив — RAR</comment>
<comment xml:lang="ca">arxiu RAR</comment>
<comment xml:lang="cs">archiv RAR</comment>
@@ -18774,13 +19403,14 @@
<comment xml:lang="da">RAR-arkiv</comment>
<comment xml:lang="de">RAR-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο RAR</comment>
- <comment xml:lang="en_GB">RAR archive</comment>
+ <comment xml:lang="en-GB">RAR archive</comment>
<comment xml:lang="eo">RAR-arkivo</comment>
<comment xml:lang="es">archivador RAR</comment>
<comment xml:lang="eu">RAR artxiboa</comment>
<comment xml:lang="fi">RAR-arkisto</comment>
<comment xml:lang="fo">RAR skjalasavn</comment>
<comment xml:lang="fr">archive RAR</comment>
+ <comment xml:lang="fur">archivi RAR</comment>
<comment xml:lang="ga">cartlann RAR</comment>
<comment xml:lang="gl">ficheiro RAR</comment>
<comment xml:lang="he">ארכיון RAR</comment>
@@ -18801,7 +19431,7 @@
<comment xml:lang="oc">archiu RAR</comment>
<comment xml:lang="pl">Archiwum RAR</comment>
<comment xml:lang="pt">arquivo RAR</comment>
- <comment xml:lang="pt_BR">Pacote RAR</comment>
+ <comment xml:lang="pt-BR">Pacote RAR</comment>
<comment xml:lang="ro">Arhivă RAR</comment>
<comment xml:lang="ru">Архив RAR</comment>
<comment xml:lang="sk">Archív RAR</comment>
@@ -18812,35 +19442,37 @@
<comment xml:lang="tr">RAR arşivi</comment>
<comment xml:lang="uk">архів RAR</comment>
<comment xml:lang="vi">Kho nén RAR</comment>
- <comment xml:lang="zh_CN">RAR 归档文件</comment>
- <comment xml:lang="zh_TW">RAR 封存檔</comment>
+ <comment xml:lang="zh-CN">RAR 归档文件</comment>
+ <comment xml:lang="zh-TW">RAR 封存檔</comment>
<acronym>RAR</acronym>
<expanded-acronym>Roshal ARchive</expanded-acronym>
<alias type="application/x-rar"/>
<alias type="application/x-rar-compressed"/>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="Rar!" type="string" offset="0"/>
+ <match type="string" value="Rar!" offset="0"/>
</magic>
<glob pattern="*.rar"/>
</mime-type>
<mime-type type="application/x-dar">
<comment>DAR archive</comment>
+ <comment xml:lang="af">DAR-argief</comment>
<comment xml:lang="ar">أرشيف DAR</comment>
- <comment xml:lang="be@latin">Archiŭ DAR</comment>
+ <comment xml:lang="be-Latn">Archiŭ DAR</comment>
<comment xml:lang="bg">Архив — DAR</comment>
<comment xml:lang="ca">arxiu DAR</comment>
<comment xml:lang="cs">archiv DAR</comment>
<comment xml:lang="da">DAR-arkiv</comment>
<comment xml:lang="de">DAR-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο DAR</comment>
- <comment xml:lang="en_GB">DAR archive</comment>
+ <comment xml:lang="en-GB">DAR archive</comment>
<comment xml:lang="eo">DAR-arkivo</comment>
<comment xml:lang="es">archivador DAR</comment>
<comment xml:lang="eu">DAR artxiboa</comment>
<comment xml:lang="fi">DAR-arkisto</comment>
<comment xml:lang="fo">DAR skjalasavn</comment>
<comment xml:lang="fr">archive DAR</comment>
+ <comment xml:lang="fur">archivi DAR</comment>
<comment xml:lang="ga">cartlann DAR</comment>
<comment xml:lang="gl">arquivo DAR</comment>
<comment xml:lang="he">ארכיון DAR</comment>
@@ -18861,7 +19493,7 @@
<comment xml:lang="oc">archiu DAR</comment>
<comment xml:lang="pl">Archiwum DAR</comment>
<comment xml:lang="pt">arquivo DAR</comment>
- <comment xml:lang="pt_BR">Pacote DAR</comment>
+ <comment xml:lang="pt-BR">Pacote DAR</comment>
<comment xml:lang="ro">Arhivă DAR</comment>
<comment xml:lang="ru">Архив DAR</comment>
<comment xml:lang="sk">Archív DAR</comment>
@@ -18872,31 +19504,33 @@
<comment xml:lang="tr">DAR arşivi</comment>
<comment xml:lang="uk">архів DAR</comment>
<comment xml:lang="vi">Kho nén DAR</comment>
- <comment xml:lang="zh_CN">DAR 归档文件</comment>
- <comment xml:lang="zh_TW">DAR 封存檔</comment>
+ <comment xml:lang="zh-CN">DAR 归档文件</comment>
+ <comment xml:lang="zh-TW">DAR 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic>
- <match value="123" type="big32" offset="0"/>
+ <match type="big32" value="123" offset="0"/>
</magic>
<glob pattern="*.dar"/>
</mime-type>
<mime-type type="application/x-alz">
<comment>Alzip archive</comment>
+ <comment xml:lang="af">Alzip-argief</comment>
<comment xml:lang="ar">أرشيف Alzip</comment>
- <comment xml:lang="be@latin">Archiŭ Alzip</comment>
+ <comment xml:lang="be-Latn">Archiŭ Alzip</comment>
<comment xml:lang="bg">Архив — alzip</comment>
<comment xml:lang="ca">arxiu Alzip</comment>
<comment xml:lang="cs">archiv Alzip</comment>
- <comment xml:lang="da">Alziparkiv</comment>
+ <comment xml:lang="da">Alzip-arkiv</comment>
<comment xml:lang="de">Alzip-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Alzip</comment>
- <comment xml:lang="en_GB">Alzip archive</comment>
+ <comment xml:lang="en-GB">Alzip archive</comment>
<comment xml:lang="eo">Alzip-arkivo</comment>
<comment xml:lang="es">archivador Alzip</comment>
<comment xml:lang="eu">Alzip artxiboa</comment>
<comment xml:lang="fi">Alzip-arkisto</comment>
<comment xml:lang="fo">Alsip skjalasavn</comment>
<comment xml:lang="fr">archive alzip</comment>
+ <comment xml:lang="fur">archivi Alzip</comment>
<comment xml:lang="ga">cartlann Alzip</comment>
<comment xml:lang="gl">arquivo Alzip</comment>
<comment xml:lang="he">ארכיון Alzip</comment>
@@ -18917,7 +19551,7 @@
<comment xml:lang="oc">archiu alzip</comment>
<comment xml:lang="pl">Archiwum alzip</comment>
<comment xml:lang="pt">arquivo Alzip</comment>
- <comment xml:lang="pt_BR">Pacote Alzip</comment>
+ <comment xml:lang="pt-BR">Pacote Alzip</comment>
<comment xml:lang="ro">Arhivă Alzip</comment>
<comment xml:lang="ru">Архив ALZIP</comment>
<comment xml:lang="sk">Archív Alzip</comment>
@@ -18928,31 +19562,32 @@
<comment xml:lang="tr">Alzip arşivi</comment>
<comment xml:lang="uk">архів Alzip</comment>
<comment xml:lang="vi">Kho nén Alzip</comment>
- <comment xml:lang="zh_CN">Alzip 归档文件</comment>
- <comment xml:lang="zh_TW">Alzip 封存檔</comment>
+ <comment xml:lang="zh-CN">Alzip 归档文件</comment>
+ <comment xml:lang="zh-TW">Alzip 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="50">
- <match value="ALZ" type="string" offset="0"/>
+ <match type="string" value="ALZ" offset="0"/>
</magic>
<glob pattern="*.alz"/>
</mime-type>
<mime-type type="text/x-reject">
<comment>rejected patch</comment>
<comment xml:lang="ar">رقعة مرفوضة</comment>
- <comment xml:lang="be@latin">niepryniaty patch</comment>
+ <comment xml:lang="be-Latn">niepryniaty patch</comment>
<comment xml:lang="bg">Отхвърлен файл с кръпка</comment>
<comment xml:lang="ca">pedaç rebutjat</comment>
<comment xml:lang="cs">odmítnutá záplata</comment>
- <comment xml:lang="da">afvist tekstlap</comment>
+ <comment xml:lang="da">afvist rettelse</comment>
<comment xml:lang="de">Abgelehnter Patch</comment>
<comment xml:lang="el">Διόρθωση που απορρίφθηκε</comment>
- <comment xml:lang="en_GB">rejected patch</comment>
+ <comment xml:lang="en-GB">rejected patch</comment>
<comment xml:lang="eo">reĵeta flikaĵo</comment>
<comment xml:lang="es">parche rechazado</comment>
<comment xml:lang="eu">baztertutako adabakia</comment>
<comment xml:lang="fi">hylättyjen muutosten tiedosto</comment>
<comment xml:lang="fo">vrakað rætting</comment>
<comment xml:lang="fr">correctif rejeté</comment>
+ <comment xml:lang="fur">blec refudât</comment>
<comment xml:lang="ga">paiste diúltaithe</comment>
<comment xml:lang="gl">parche rexeitado</comment>
<comment xml:lang="he">טלאי שנדחה</comment>
@@ -18973,7 +19608,7 @@
<comment xml:lang="oc">correctiu regetat</comment>
<comment xml:lang="pl">Odrzucona łata</comment>
<comment xml:lang="pt">patch rejeitado</comment>
- <comment xml:lang="pt_BR">Arquivo de patch rejeitado</comment>
+ <comment xml:lang="pt-BR">Arquivo de patch rejeitado</comment>
<comment xml:lang="ro">petec respsins</comment>
<comment xml:lang="ru">Отклонённый патч</comment>
<comment xml:lang="sk">Odmietnutá záplata</comment>
@@ -18984,8 +19619,8 @@
<comment xml:lang="tr">reddedilmiş yama</comment>
<comment xml:lang="uk">відхилена латка</comment>
<comment xml:lang="vi">đắp vá bị từ chối</comment>
- <comment xml:lang="zh_CN">拒绝的补丁</comment>
- <comment xml:lang="zh_TW">回絕的修補</comment>
+ <comment xml:lang="zh-CN">拒绝的补丁</comment>
+ <comment xml:lang="zh-TW">回絕的修補</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<alias type="application/x-reject"/>
@@ -18993,21 +19628,23 @@
</mime-type>
<mime-type type="application/x-rpm">
<comment>RPM package</comment>
+ <comment xml:lang="af">RPM-pakket</comment>
<comment xml:lang="ar">حزمة RPM</comment>
- <comment xml:lang="be@latin">Pakunak RPM</comment>
+ <comment xml:lang="be-Latn">Pakunak RPM</comment>
<comment xml:lang="bg">Пакет — RPM</comment>
<comment xml:lang="ca">paquet RPM</comment>
<comment xml:lang="cs">balíček RPM</comment>
<comment xml:lang="da">RPM-pakke</comment>
<comment xml:lang="de">RPM-Paket</comment>
<comment xml:lang="el">Πακέτο RPM</comment>
- <comment xml:lang="en_GB">RPM package</comment>
+ <comment xml:lang="en-GB">RPM package</comment>
<comment xml:lang="eo">RPM-pakaĵo</comment>
<comment xml:lang="es">paquete RPM</comment>
<comment xml:lang="eu">RPM paketea</comment>
<comment xml:lang="fi">RPM-paketti</comment>
<comment xml:lang="fo">RPM pakki</comment>
<comment xml:lang="fr">paquet RPM</comment>
+ <comment xml:lang="fur">pachet RPM</comment>
<comment xml:lang="ga">pacáiste RPM</comment>
<comment xml:lang="gl">paquete RFM</comment>
<comment xml:lang="he">חבילת RPM</comment>
@@ -19028,7 +19665,7 @@
<comment xml:lang="oc">paquet RPM</comment>
<comment xml:lang="pl">Pakiet RPM</comment>
<comment xml:lang="pt">pacote RPM</comment>
- <comment xml:lang="pt_BR">Pacote RPM</comment>
+ <comment xml:lang="pt-BR">Pacote RPM</comment>
<comment xml:lang="ro">Pachet RPM</comment>
<comment xml:lang="ru">Пакет RPM</comment>
<comment xml:lang="sk">Balík RPM</comment>
@@ -19039,27 +19676,30 @@
<comment xml:lang="tr">RPM paketi</comment>
<comment xml:lang="uk">пакунок RPM</comment>
<comment xml:lang="vi">Gói RPM</comment>
- <comment xml:lang="zh_CN">RPM 软件包</comment>
- <comment xml:lang="zh_TW">RPM 軟體包</comment>
+ <comment xml:lang="zh-CN">RPM 软件包</comment>
+ <comment xml:lang="zh-TW">RPM 軟體包</comment>
<generic-icon name="package-x-generic"/>
<alias type="application/x-redhat-package-manager"/>
<magic priority="50">
- <match value="\xed\xab\xee\xdb" type="string" offset="0"/>
+ <match type="string" value="\xed\xab\xee\xdb" offset="0"/>
</magic>
<glob pattern="*.rpm"/>
</mime-type>
<mime-type type="application/x-source-rpm">
<comment>Source RPM package</comment>
+ <comment xml:lang="af">Bron-RPM-pakket</comment>
+ <comment xml:lang="bg">Пакет — RPM с изходен код</comment>
<comment xml:lang="ca">paquet RPM de codi font</comment>
<comment xml:lang="cs">zdrojový balíček RPM</comment>
<comment xml:lang="da">Kilde RPM-pakke</comment>
<comment xml:lang="de">Quell-RPM-Paket</comment>
<comment xml:lang="el">Πακέτο πηγής RPM</comment>
- <comment xml:lang="en_GB">Source RPM package</comment>
+ <comment xml:lang="en-GB">Source RPM package</comment>
<comment xml:lang="es">paquete de fuente RPM</comment>
<comment xml:lang="eu">Iturburu RPM paketea</comment>
<comment xml:lang="fi">RPM-lähdepaketti</comment>
<comment xml:lang="fr">paquet source RPM</comment>
+ <comment xml:lang="fur">pachet sorzint RPM</comment>
<comment xml:lang="ga">pacáiste foinse RPM</comment>
<comment xml:lang="gl">Paquete RPM de fontes</comment>
<comment xml:lang="he">חבילת מקור RPM</comment>
@@ -19075,7 +19715,7 @@
<comment xml:lang="oc">paquet font RPM</comment>
<comment xml:lang="pl">Źródłowy pakiet RPM</comment>
<comment xml:lang="pt">pacote origem RPM</comment>
- <comment xml:lang="pt_BR">Pacote fonte RPM</comment>
+ <comment xml:lang="pt-BR">Pacote fonte RPM</comment>
<comment xml:lang="ru">Пакет RPM с исходным кодом</comment>
<comment xml:lang="sk">Zdrojový balík RPM</comment>
<comment xml:lang="sl">Paket izvorne kode RPM</comment>
@@ -19083,8 +19723,8 @@
<comment xml:lang="sv">Käll-RPM-paket</comment>
<comment xml:lang="tr">Kaynak RPM paketi</comment>
<comment xml:lang="uk">пакунок RPM з початковим кодом</comment>
- <comment xml:lang="zh_CN">源码 RPM 软件包</comment>
- <comment xml:lang="zh_TW">來源 RPM 軟體包</comment>
+ <comment xml:lang="zh-CN">源码 RPM 软件包</comment>
+ <comment xml:lang="zh-TW">來源 RPM 軟體包</comment>
<generic-icon name="package-x-generic"/>
<sub-class-of type="application/x-rpm"/>
<glob pattern="*.src.rpm"/>
@@ -19092,21 +19732,23 @@
</mime-type>
<mime-type type="application/x-ruby">
<comment>Ruby script</comment>
+ <comment xml:lang="af">Ruby-skrip</comment>
<comment xml:lang="ar">سكربت روبي</comment>
- <comment xml:lang="be@latin">Skrypt Ruby</comment>
+ <comment xml:lang="be-Latn">Skrypt Ruby</comment>
<comment xml:lang="bg">Скрипт — Ruby</comment>
<comment xml:lang="ca">script Ruby</comment>
<comment xml:lang="cs">skript Ruby</comment>
- <comment xml:lang="da">Rubyprogram</comment>
+ <comment xml:lang="da">Ruby-program</comment>
<comment xml:lang="de">Ruby-Skript</comment>
<comment xml:lang="el">Δέσμη ενεργειών Ruby</comment>
- <comment xml:lang="en_GB">Ruby script</comment>
+ <comment xml:lang="en-GB">Ruby script</comment>
<comment xml:lang="eo">Ruby-skripto</comment>
<comment xml:lang="es">secuencia de órdenes en Ruby</comment>
<comment xml:lang="eu">Ruby script-a</comment>
<comment xml:lang="fi">Ruby-komentotiedosto</comment>
<comment xml:lang="fo">Ruby boðrøð</comment>
<comment xml:lang="fr">script Ruby</comment>
+ <comment xml:lang="fur">script Ruby</comment>
<comment xml:lang="ga">script Ruby</comment>
<comment xml:lang="gl">Script de Ruby</comment>
<comment xml:lang="he">תסריט Ruby</comment>
@@ -19127,7 +19769,7 @@
<comment xml:lang="oc">escript Ruby</comment>
<comment xml:lang="pl">Skrypt Ruby</comment>
<comment xml:lang="pt">script Ruby</comment>
- <comment xml:lang="pt_BR">Script Ruby</comment>
+ <comment xml:lang="pt-BR">Script Ruby</comment>
<comment xml:lang="ro">Script Ruby</comment>
<comment xml:lang="ru">Сценарий Ruby</comment>
<comment xml:lang="sk">Skript Ruby</comment>
@@ -19138,34 +19780,36 @@
<comment xml:lang="tr">Ruby betiği</comment>
<comment xml:lang="uk">скрипт Ruby</comment>
<comment xml:lang="vi">Văn lệnh Ruby</comment>
- <comment xml:lang="zh_CN">Ruby 脚本</comment>
- <comment xml:lang="zh_TW">Ruby 指令稿</comment>
+ <comment xml:lang="zh-CN">Ruby 脚本</comment>
+ <comment xml:lang="zh-TW">Ruby 指令稿</comment>
<sub-class-of type="application/x-executable"/>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-script"/>
<magic>
- <match value="/bin/env ruby" type="string" offset="2:16"/>
- <match value="/bin/ruby" type="string" offset="2:16"/>
+ <match type="string" value="/bin/env ruby" offset="2:16"/>
+ <match type="string" value="/bin/ruby" offset="2:16"/>
</magic>
<glob pattern="*.rb"/>
</mime-type>
<mime-type type="application/x-markaby">
<comment>Markaby script</comment>
+ <comment xml:lang="af">Markaby-skrip</comment>
<comment xml:lang="ar">سكربت Markaby</comment>
- <comment xml:lang="be@latin">Skrypt Markaby</comment>
+ <comment xml:lang="be-Latn">Skrypt Markaby</comment>
<comment xml:lang="bg">Скрипт — Markaby</comment>
<comment xml:lang="ca">script Markaby</comment>
<comment xml:lang="cs">skript Markaby</comment>
- <comment xml:lang="da">Markabyprogram</comment>
+ <comment xml:lang="da">Markaby-program</comment>
<comment xml:lang="de">Markaby-Skript</comment>
<comment xml:lang="el">Δέσμη ενεργειών Markaby</comment>
- <comment xml:lang="en_GB">Markaby script</comment>
+ <comment xml:lang="en-GB">Markaby script</comment>
<comment xml:lang="eo">Markaby-skripto</comment>
<comment xml:lang="es">secuencia de órdenes en Markaby</comment>
<comment xml:lang="eu">Markaby script-a</comment>
<comment xml:lang="fi">Markaby-komentotiedosto</comment>
<comment xml:lang="fo">Markaby boðrøð</comment>
<comment xml:lang="fr">script Markaby</comment>
+ <comment xml:lang="fur">script Markaby</comment>
<comment xml:lang="ga">script Markaby</comment>
<comment xml:lang="gl">Script de Markaby</comment>
<comment xml:lang="he">תסריט Markby</comment>
@@ -19186,7 +19830,7 @@
<comment xml:lang="oc">escript Markaby</comment>
<comment xml:lang="pl">Skrypt Markaby</comment>
<comment xml:lang="pt">script Markaby</comment>
- <comment xml:lang="pt_BR">Script Markaby</comment>
+ <comment xml:lang="pt-BR">Script Markaby</comment>
<comment xml:lang="ro">Script Markaby</comment>
<comment xml:lang="ru">Сценарий Markaby</comment>
<comment xml:lang="sk">Skript Markaby</comment>
@@ -19197,24 +19841,27 @@
<comment xml:lang="tr">Markaby betiği</comment>
<comment xml:lang="uk">скрипт Markaby</comment>
<comment xml:lang="vi">Văn lệnh Markaby</comment>
- <comment xml:lang="zh_CN">RMarkaby 脚本</comment>
- <comment xml:lang="zh_TW">Markaby 指令稿</comment>
+ <comment xml:lang="zh-CN">RMarkaby 脚本</comment>
+ <comment xml:lang="zh-TW">Markaby 指令稿</comment>
<sub-class-of type="application/x-ruby"/>
<generic-icon name="text-x-script"/>
<glob pattern="*.mab"/>
</mime-type>
<mime-type type="text/rust">
<comment>Rust source code</comment>
+ <comment xml:lang="af">Rust-bronkode</comment>
+ <comment xml:lang="bg">Изходен код — Rust</comment>
<comment xml:lang="ca">codi font en Rust</comment>
<comment xml:lang="cs">zdrojový kód v jazyce Rust</comment>
<comment xml:lang="da">Rust-kildekode</comment>
<comment xml:lang="de">Rust-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Rust</comment>
- <comment xml:lang="en_GB">Rust source code</comment>
+ <comment xml:lang="en-GB">Rust source code</comment>
<comment xml:lang="es">código fuente en Rust</comment>
<comment xml:lang="eu">Rust iturburu-kodea</comment>
<comment xml:lang="fi">Rust-lähdekoodi</comment>
<comment xml:lang="fr">code source Rust</comment>
+ <comment xml:lang="fur">codiç sorzint Rust</comment>
<comment xml:lang="ga">cód foinseach Rust</comment>
<comment xml:lang="he">קוד מקור של Rust</comment>
<comment xml:lang="hr">Rust izvorni kôd</comment>
@@ -19227,35 +19874,38 @@
<comment xml:lang="oc">còde font Rust</comment>
<comment xml:lang="pl">Kod źródłowy Rust</comment>
<comment xml:lang="pt">código origem Rust</comment>
- <comment xml:lang="pt_BR">Código-fonte Rust</comment>
+ <comment xml:lang="pt-BR">Código-fonte Rust</comment>
<comment xml:lang="ru">Исходный код Rust</comment>
<comment xml:lang="sk">Zdrojový kód Rust</comment>
+ <comment xml:lang="sl">Izvorna koda Rust</comment>
<comment xml:lang="sr">Раст изворни ко̂д</comment>
<comment xml:lang="sv">Rust-källkod</comment>
<comment xml:lang="tr">Rust kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Rust</comment>
- <comment xml:lang="zh_CN">Rust 源代码</comment>
- <comment xml:lang="zh_TW">Rust 源碼</comment>
+ <comment xml:lang="zh-CN">Rust 源代码</comment>
+ <comment xml:lang="zh-TW">Rust 源碼</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.rs"/>
</mime-type>
<mime-type type="application/x-sc">
<comment>SC/Xspread spreadsheet</comment>
+ <comment xml:lang="af">SC/Xspread-sigblad</comment>
<comment xml:lang="ar">جدول SC/Xspread</comment>
- <comment xml:lang="be@latin">Raźlikovy arkuš SC/Xspread</comment>
+ <comment xml:lang="be-Latn">Raźlikovy arkuš SC/Xspread</comment>
<comment xml:lang="bg">Таблица — SC/Xspread</comment>
<comment xml:lang="ca">full de càlcul de SC/Xspread</comment>
<comment xml:lang="cs">sešit SC/Xspread</comment>
<comment xml:lang="da">SC/Xspread-regneark</comment>
<comment xml:lang="de">SX/Xspread-Tabelle</comment>
<comment xml:lang="el">Λογιστικό φύλλο SC/Xspread</comment>
- <comment xml:lang="en_GB">SC/Xspread spreadsheet</comment>
+ <comment xml:lang="en-GB">SC/Xspread spreadsheet</comment>
<comment xml:lang="eo">SC/Xspread-kalkultabelo</comment>
<comment xml:lang="es">hoja de cálculo SC/Xspread</comment>
<comment xml:lang="eu">SC/Xspread kalkulu-orria</comment>
<comment xml:lang="fi">SC/Xspread-taulukko</comment>
<comment xml:lang="fo">SC/Xspread rokniark</comment>
<comment xml:lang="fr">feuille de calcul SC/Xspread</comment>
+ <comment xml:lang="fur">sfuei di calcul SC/Xspread</comment>
<comment xml:lang="ga">scarbhileog SC/Xspread</comment>
<comment xml:lang="gl">folla de cálculo SC/Xspread</comment>
<comment xml:lang="he">גליון נתונים של SC/Xspread</comment>
@@ -19275,7 +19925,7 @@
<comment xml:lang="oc">fuèlh de calcul SC/Xspread</comment>
<comment xml:lang="pl">Arkusz SC/Xspread</comment>
<comment xml:lang="pt">folha de cálculo SC/Xspread</comment>
- <comment xml:lang="pt_BR">Planilha do SC/Xspread</comment>
+ <comment xml:lang="pt-BR">Planilha do SC/Xspread</comment>
<comment xml:lang="ro">Foaie de calcul SC/Xspread</comment>
<comment xml:lang="ru">Электронная таблица SC/Xspread</comment>
<comment xml:lang="sk">Zošit SC/Xspread</comment>
@@ -19283,35 +19933,37 @@
<comment xml:lang="sq">Fletë llogaritjesh SC/Xspread</comment>
<comment xml:lang="sr">табела СЦ/Икс-табеле</comment>
<comment xml:lang="sv">SC/Xspread-kalkylblad</comment>
- <comment xml:lang="tr">SC/Xspread çalışma sayfası</comment>
+ <comment xml:lang="tr">SC/Xspread hesap çizelgesi</comment>
<comment xml:lang="uk">ел. таблиця SC/Xspread</comment>
<comment xml:lang="vi">Bảng tính SC/Xspread</comment>
- <comment xml:lang="zh_CN">SC/Xspread 电子表格</comment>
- <comment xml:lang="zh_TW">SC/Xspread 試算表</comment>
+ <comment xml:lang="zh-CN">SC/Xspread 电子表格</comment>
+ <comment xml:lang="zh-TW">SC/Xspread 試算表</comment>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
- <match value="Spreadsheet" type="string" offset="38"/>
+ <match type="string" value="Spreadsheet" offset="38"/>
</magic>
</mime-type>
<mime-type type="application/x-shar">
<comment>shell archive</comment>
+ <comment xml:lang="af">shell-argief</comment>
<comment xml:lang="ar">أرشيف شِل</comment>
<comment xml:lang="az">qabıq arxivi</comment>
- <comment xml:lang="be@latin">archiŭ abałonki</comment>
+ <comment xml:lang="be-Latn">archiŭ abałonki</comment>
<comment xml:lang="bg">Архив на обвивката</comment>
<comment xml:lang="ca">arxiu de shell</comment>
<comment xml:lang="cs">archiv shellu</comment>
<comment xml:lang="cy">archif plisgyn</comment>
- <comment xml:lang="da">skalarkiv</comment>
+ <comment xml:lang="da">skal-arkiv</comment>
<comment xml:lang="de">Shell-Archiv</comment>
<comment xml:lang="el">Αρχείο κέλυφους</comment>
- <comment xml:lang="en_GB">shell archive</comment>
+ <comment xml:lang="en-GB">shell archive</comment>
<comment xml:lang="eo">ŝel-arkivo</comment>
<comment xml:lang="es">archivador shell</comment>
<comment xml:lang="eu">shell artxiboa</comment>
<comment xml:lang="fi">komentotulkkiarkisto</comment>
<comment xml:lang="fo">skel savn</comment>
<comment xml:lang="fr">archive shell</comment>
+ <comment xml:lang="fur">archivi shell</comment>
<comment xml:lang="ga">cartlann bhlaoisce</comment>
<comment xml:lang="gl">ficheiro shell</comment>
<comment xml:lang="he">ארכיון מעטפת</comment>
@@ -19332,7 +19984,7 @@
<comment xml:lang="oc">archiu shell</comment>
<comment xml:lang="pl">Archiwum powłoki</comment>
<comment xml:lang="pt">arquivo de terminal</comment>
- <comment xml:lang="pt_BR">Pacote shell</comment>
+ <comment xml:lang="pt-BR">Pacote shell</comment>
<comment xml:lang="ro">arhivă shell</comment>
<comment xml:lang="ru">Архив shell</comment>
<comment xml:lang="sk">Archív shellu</comment>
@@ -19343,27 +19995,29 @@
<comment xml:lang="tr">kabuk arşivi</comment>
<comment xml:lang="uk">архів оболонки</comment>
<comment xml:lang="vi">kho trình bao</comment>
- <comment xml:lang="zh_CN">shell 归档文件</comment>
- <comment xml:lang="zh_TW">shell 封存檔</comment>
+ <comment xml:lang="zh-CN">shell 归档文件</comment>
+ <comment xml:lang="zh-TW">shell 封存檔</comment>
<generic-icon name="package-x-generic"/>
<glob pattern="*.shar"/>
</mime-type>
<mime-type type="application/x-shared-library-la">
<comment>libtool shared library</comment>
+ <comment xml:lang="af">libtool- gedeelde biblioteek</comment>
<comment xml:lang="ar">مكتبة libtool المشتركة</comment>
- <comment xml:lang="be@latin">supolnaja biblijateka libtool</comment>
+ <comment xml:lang="be-Latn">supolnaja biblijateka libtool</comment>
<comment xml:lang="bg">Споделена библиотека — libtool</comment>
<comment xml:lang="ca">biblioteca compartida libtool</comment>
<comment xml:lang="cs">sdílená knihovna libtool</comment>
<comment xml:lang="da">libtool delt bibliotek</comment>
<comment xml:lang="de">Gemeinsame libtool-Bibliothek</comment>
<comment xml:lang="el">Κοινόχρηστη βιβλιοθήκη libtool</comment>
- <comment xml:lang="en_GB">libtool shared library</comment>
+ <comment xml:lang="en-GB">libtool shared library</comment>
<comment xml:lang="es">biblioteca compartida de libtool</comment>
<comment xml:lang="eu">libtool partekatutako liburutegia</comment>
<comment xml:lang="fi">jaettu libtool-kirjasto</comment>
<comment xml:lang="fo">libtool felagssavn</comment>
<comment xml:lang="fr">bibliothèque partagée libtool</comment>
+ <comment xml:lang="fur">librarie condividude libtool</comment>
<comment xml:lang="ga">comhleabharlann libtool</comment>
<comment xml:lang="gl">biblioteca compartida de libtool</comment>
<comment xml:lang="he">ספרייה משותפת של libtool</comment>
@@ -19383,7 +20037,7 @@
<comment xml:lang="oc">bibliotèca partejada libtool</comment>
<comment xml:lang="pl">Biblioteka współdzielona libtool</comment>
<comment xml:lang="pt">biblioteca partilhada libtool</comment>
- <comment xml:lang="pt_BR">Biblioteca compartilhada libtool</comment>
+ <comment xml:lang="pt-BR">Biblioteca compartilhada libtool</comment>
<comment xml:lang="ro">bibliotecă partajată libtool</comment>
<comment xml:lang="ru">Разделяемая библиотека libtool</comment>
<comment xml:lang="sk">Zdieľaná knižnica libtool</comment>
@@ -19394,17 +20048,18 @@
<comment xml:lang="tr">libtool paylaşımlı kitaplığı</comment>
<comment xml:lang="uk">спільна бібліотека libtool</comment>
<comment xml:lang="vi">thư viện dùng chung libtool</comment>
- <comment xml:lang="zh_CN">libtool 共享库</comment>
- <comment xml:lang="zh_TW">libtool 共享函式庫</comment>
+ <comment xml:lang="zh-CN">libtool 共享库</comment>
+ <comment xml:lang="zh-TW">libtool 共享函式庫</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-script"/>
<glob pattern="*.la"/>
</mime-type>
<mime-type type="application/x-sharedlib">
<comment>shared library</comment>
+ <comment xml:lang="af">gedeelde biblioteek</comment>
<comment xml:lang="ar">مكتبة مشتركة</comment>
<comment xml:lang="az">bölüşülmüş kitabxana</comment>
- <comment xml:lang="be@latin">supolnaja biblijateka</comment>
+ <comment xml:lang="be-Latn">supolnaja biblijateka</comment>
<comment xml:lang="bg">Споделена библиотека</comment>
<comment xml:lang="ca">biblioteca compartida</comment>
<comment xml:lang="cs">sdílená knihovna</comment>
@@ -19412,13 +20067,14 @@
<comment xml:lang="da">delt bibliotek</comment>
<comment xml:lang="de">Gemeinsame Bibliothek</comment>
<comment xml:lang="el">Αρχείο κοινόχρηστης βιβλιοθήκης</comment>
- <comment xml:lang="en_GB">shared library</comment>
+ <comment xml:lang="en-GB">shared library</comment>
<comment xml:lang="eo">dinamike bindebla biblioteko</comment>
<comment xml:lang="es">biblioteca compartida</comment>
<comment xml:lang="eu">partekatutako liburutegia</comment>
<comment xml:lang="fi">jaettu kirjasto</comment>
<comment xml:lang="fo">felagssavn</comment>
<comment xml:lang="fr">bibliothèque partagée</comment>
+ <comment xml:lang="fur">librarie condividude</comment>
<comment xml:lang="ga">comhleabharlann</comment>
<comment xml:lang="gl">biblioteca compartida</comment>
<comment xml:lang="he">ספרייה משותפת</comment>
@@ -19439,7 +20095,7 @@
<comment xml:lang="oc">bibliotèca partejada</comment>
<comment xml:lang="pl">Biblioteka współdzielona</comment>
<comment xml:lang="pt">biblioteca partilhada</comment>
- <comment xml:lang="pt_BR">Biblioteca compartilhada</comment>
+ <comment xml:lang="pt-BR">Biblioteca compartilhada</comment>
<comment xml:lang="ro">bibliotecă partajată</comment>
<comment xml:lang="ru">Разделяемая библиотека</comment>
<comment xml:lang="sk">Zdieľaná knižnica</comment>
@@ -19450,45 +20106,36 @@
<comment xml:lang="tr">paylaşımlı kitaplık</comment>
<comment xml:lang="uk">спільна бібліотека</comment>
<comment xml:lang="vi">thư viện dùng chung</comment>
- <comment xml:lang="zh_CN">共享库</comment>
- <comment xml:lang="zh_TW">共享函式庫</comment>
+ <comment xml:lang="zh-CN">共享库</comment>
+ <comment xml:lang="zh-TW">共享函式庫</comment>
<magic priority="50">
- <match value="\177ELF" type="string" offset="0">
- <match value="1" type="byte" offset="5">
- <match value="3" type="little16" offset="16"/>
- </match>
- </match>
- <match value="\177ELF" type="string" offset="0">
- <match value="2" type="byte" offset="5">
- <match value="3" type="big16" offset="16"/>
- </match>
- </match>
- <match value="0603" type="little16" offset="0">
- <match value="020000" type="little16" offset="22" mask="030000"/>
+ <match type="little16" value="0603" offset="0">
+ <match type="little16" mask="030000" value="020000" offset="22"/>
</match>
- <match value="\177ELF \003" type="string" offset="0" mask="0xffffffff000000000000000000000000ff"/>
</magic>
<glob pattern="*.so"/>
</mime-type>
<mime-type type="application/x-shellscript">
<comment>shell script</comment>
+ <comment xml:lang="af">shell-skrip</comment>
<comment xml:lang="ar">سكربت شِل</comment>
<comment xml:lang="az">qabıq skripti</comment>
- <comment xml:lang="be@latin">skrypt abałonki</comment>
+ <comment xml:lang="be-Latn">skrypt abałonki</comment>
<comment xml:lang="bg">Скрипт на обвивката</comment>
<comment xml:lang="ca">script shell</comment>
<comment xml:lang="cs">skript shellu</comment>
<comment xml:lang="cy">sgript plisgyn</comment>
- <comment xml:lang="da">skalprogram</comment>
+ <comment xml:lang="da">skal-program</comment>
<comment xml:lang="de">Shell-Skript</comment>
<comment xml:lang="el">Δέσμη ενεργειών κελύφους</comment>
- <comment xml:lang="en_GB">shell script</comment>
+ <comment xml:lang="en-GB">shell script</comment>
<comment xml:lang="eo">ŝelskripto</comment>
<comment xml:lang="es">secuencia de órdenes en shell</comment>
<comment xml:lang="eu">shell script-a</comment>
<comment xml:lang="fi">komentotulkin komentotiedosto</comment>
<comment xml:lang="fo">skel boðrøð</comment>
<comment xml:lang="fr">script shell</comment>
+ <comment xml:lang="fur">script shell</comment>
<comment xml:lang="ga">script bhlaoisce</comment>
<comment xml:lang="gl">script de shell</comment>
<comment xml:lang="he">תסריט מעטפת</comment>
@@ -19509,7 +20156,7 @@
<comment xml:lang="oc">escript shell</comment>
<comment xml:lang="pl">Skrypt powłoki</comment>
<comment xml:lang="pt">script de terminal</comment>
- <comment xml:lang="pt_BR">Script shell</comment>
+ <comment xml:lang="pt-BR">Script shell</comment>
<comment xml:lang="ro">script shell</comment>
<comment xml:lang="ru">Сценарий shell</comment>
<comment xml:lang="sk">Skript shellu</comment>
@@ -19520,44 +20167,46 @@
<comment xml:lang="tr">kabuk betiği</comment>
<comment xml:lang="uk">скрипт оболонки</comment>
<comment xml:lang="vi">văn lệnh trình bao</comment>
- <comment xml:lang="zh_CN">shell 脚本</comment>
- <comment xml:lang="zh_TW">shell 指令稿</comment>
+ <comment xml:lang="zh-CN">shell 脚本</comment>
+ <comment xml:lang="zh-TW">shell 指令稿</comment>
<sub-class-of type="application/x-executable"/>
<sub-class-of type="text/plain"/>
<alias type="text/x-sh"/>
<generic-icon name="text-x-script"/>
<magic priority="50">
- <match value="# This is a shell archive" type="string" offset="10"/>
- <match value="/bin/bash" type="string" offset="2:16"/>
- <match value="/bin/nawk" type="string" offset="2:16"/>
- <match value="/bin/zsh" type="string" offset="2:16"/>
- <match value="/bin/sh" type="string" offset="2:16"/>
- <match value="/bin/ksh" type="string" offset="2:16"/>
- <match value="/bin/dash" type="string" offset="2:16"/>
- <match value="/bin/env sh" type="string" offset="2:16"/>
- <match value="/bin/env bash" type="string" offset="2:16"/>
- <match value="/bin/env zsh" type="string" offset="2:16"/>
- <match value="/bin/env ksh" type="string" offset="2:16"/>
+ <match type="string" value="# This is a shell archive" offset="10"/>
+ <match type="string" value="/bin/bash" offset="2:16"/>
+ <match type="string" value="/bin/nawk" offset="2:16"/>
+ <match type="string" value="/bin/zsh" offset="2:16"/>
+ <match type="string" value="/bin/sh" offset="2:16"/>
+ <match type="string" value="/bin/ksh" offset="2:16"/>
+ <match type="string" value="/bin/dash" offset="2:16"/>
+ <match type="string" value="/bin/env sh" offset="2:16"/>
+ <match type="string" value="/bin/env bash" offset="2:16"/>
+ <match type="string" value="/bin/env zsh" offset="2:16"/>
+ <match type="string" value="/bin/env ksh" offset="2:16"/>
</magic>
<glob pattern="*.sh"/>
</mime-type>
<mime-type type="application/vnd.adobe.flash.movie">
<comment>Shockwave Flash file</comment>
+ <comment xml:lang="af">Shockwave Flash-lêer</comment>
<comment xml:lang="ar">ملف Shockwave Flash</comment>
- <comment xml:lang="be@latin">Fajł Shockwave Flash</comment>
+ <comment xml:lang="be-Latn">Fajł Shockwave Flash</comment>
<comment xml:lang="bg">Файл — Shockwave Flash</comment>
<comment xml:lang="ca">fitxer Shockwave Flash</comment>
<comment xml:lang="cs">soubor Shockwave Flash</comment>
<comment xml:lang="da">Shockwave Flash-fil</comment>
<comment xml:lang="de">Shockwave-Flash-Datei</comment>
<comment xml:lang="el">Αρχείο Shockwave Flash</comment>
- <comment xml:lang="en_GB">Shockwave Flash file</comment>
+ <comment xml:lang="en-GB">Shockwave Flash file</comment>
<comment xml:lang="eo">dosiero de Shockwave Flash</comment>
<comment xml:lang="es">archivo Shockwave Flash</comment>
<comment xml:lang="eu">Shockwave Flash fitxategia</comment>
<comment xml:lang="fi">Shockwave Flash -tiedosto</comment>
<comment xml:lang="fo">Shockwave Flash fíla</comment>
<comment xml:lang="fr">fichier Shockwave Flash</comment>
+ <comment xml:lang="fur">file Shockwave Flash</comment>
<comment xml:lang="ga">comhad Shockwave Flash</comment>
<comment xml:lang="gl">ficheiro sockwave Flash</comment>
<comment xml:lang="he">קובץ של Shockwave Flash</comment>
@@ -19578,7 +20227,7 @@
<comment xml:lang="oc">fichièr Shockwave Flash</comment>
<comment xml:lang="pl">Plik Shockwave Flash</comment>
<comment xml:lang="pt">ficheiro Shockwave Flash</comment>
- <comment xml:lang="pt_BR">Arquivo Shockwave Flash</comment>
+ <comment xml:lang="pt-BR">Arquivo Shockwave Flash</comment>
<comment xml:lang="ro">Fișier Shockwave Flash</comment>
<comment xml:lang="ru">Файл Shockwave Flash</comment>
<comment xml:lang="sk">Súbor Shockwave Flash</comment>
@@ -19589,36 +20238,38 @@
<comment xml:lang="tr">Shockwave Flash dosyası</comment>
<comment xml:lang="uk">файл Shockwave Flash</comment>
<comment xml:lang="vi">Tập tin Flash Shockwave</comment>
- <comment xml:lang="zh_CN">Shockwave Flash 文件</comment>
- <comment xml:lang="zh_TW">Shockwave Flash 檔案</comment>
+ <comment xml:lang="zh-CN">Shockwave Flash 文件</comment>
+ <comment xml:lang="zh-TW">Shockwave Flash 檔案</comment>
<alias type="application/x-shockwave-flash"/>
<alias type="application/futuresplash"/>
<generic-icon name="video-x-generic"/>
<magic priority="50">
- <match value="FWS" type="string" offset="0"/>
- <match value="CWS" type="string" offset="0"/>
+ <match type="string" value="FWS" offset="0"/>
+ <match type="string" value="CWS" offset="0"/>
</magic>
<glob pattern="*.swf"/>
<glob pattern="*.spl"/>
</mime-type>
<mime-type type="application/x-shorten">
-
+ <!-- translators: "Shorten" is the name of an audio codec -->
<comment>Shorten audio</comment>
+ <comment xml:lang="af">Shorten-oudio</comment>
<comment xml:lang="ar">Shorten سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo Shorten</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Shorten</comment>
<comment xml:lang="bg">Аудио — Shorten</comment>
<comment xml:lang="ca">àudio de Shorten</comment>
<comment xml:lang="cs">zvuk Shorten</comment>
- <comment xml:lang="da">Shortenlyd</comment>
+ <comment xml:lang="da">Shorten-lyd</comment>
<comment xml:lang="de">Shorten-Audio</comment>
<comment xml:lang="el">Ήχος Shorten</comment>
- <comment xml:lang="en_GB">Shorten audio</comment>
+ <comment xml:lang="en-GB">Shorten audio</comment>
<comment xml:lang="eo">Shorten-sondosiero</comment>
- <comment xml:lang="es">sonido Shorten</comment>
+ <comment xml:lang="es">audio Shorten</comment>
<comment xml:lang="eu">Shorten audioa</comment>
<comment xml:lang="fi">Shorten-ääni</comment>
<comment xml:lang="fo">Shorten ljóður</comment>
<comment xml:lang="fr">audio Shorten</comment>
+ <comment xml:lang="fur">audio Shorten</comment>
<comment xml:lang="ga">fuaim Shorten</comment>
<comment xml:lang="gl">son Shorten</comment>
<comment xml:lang="he">שמע של Shorten</comment>
@@ -19638,7 +20289,7 @@
<comment xml:lang="oc">àudio Shorten</comment>
<comment xml:lang="pl">Plik dźwiękowy Shorten</comment>
<comment xml:lang="pt">áudio Shorten</comment>
- <comment xml:lang="pt_BR">Áudio Shorten</comment>
+ <comment xml:lang="pt-BR">Áudio Shorten</comment>
<comment xml:lang="ro">Audio Shorten</comment>
<comment xml:lang="ru">Аудио Shorten</comment>
<comment xml:lang="sk">Zvuk Shorten</comment>
@@ -19646,35 +20297,37 @@
<comment xml:lang="sq">Audio Shorten</comment>
<comment xml:lang="sr">Шортен звук</comment>
<comment xml:lang="sv">Shorten-ljud</comment>
- <comment xml:lang="tr">Kısaltılmış ses</comment>
+ <comment xml:lang="tr">Shorten sesi</comment>
<comment xml:lang="uk">звук Shorten</comment>
<comment xml:lang="vi">Âm thanh Shorten</comment>
- <comment xml:lang="zh_CN">Shorten 音频</comment>
- <comment xml:lang="zh_TW">Shorten 音訊</comment>
+ <comment xml:lang="zh-CN">Shorten 音频</comment>
+ <comment xml:lang="zh-TW">Shorten 音訊</comment>
<generic-icon name="audio-x-generic"/>
<magic priority="50">
- <match value="ajkg" type="string" offset="0"/>
+ <match type="string" value="ajkg" offset="0"/>
</magic>
<glob pattern="*.shn"/>
<alias type="audio/x-shorten"/>
</mime-type>
<mime-type type="application/x-siag">
<comment>Siag spreadsheet</comment>
+ <comment xml:lang="af">Siag-sigblad</comment>
<comment xml:lang="ar">جدول Siag</comment>
- <comment xml:lang="be@latin">Raźlikovy arkuš Siag</comment>
+ <comment xml:lang="be-Latn">Raźlikovy arkuš Siag</comment>
<comment xml:lang="bg">Таблица — Siag</comment>
<comment xml:lang="ca">full de càlcul Siag</comment>
<comment xml:lang="cs">sešit Siag</comment>
<comment xml:lang="da">Siagregneark</comment>
<comment xml:lang="de">Siag-Tabelle</comment>
<comment xml:lang="el">Λογιστικό φύλλο Siag</comment>
- <comment xml:lang="en_GB">Siag spreadsheet</comment>
+ <comment xml:lang="en-GB">Siag spreadsheet</comment>
<comment xml:lang="eo">Siag-kalkultabelo</comment>
<comment xml:lang="es">hoja de cálculo de Siag</comment>
<comment xml:lang="eu">Siag kalkulu-orria</comment>
<comment xml:lang="fi">Siag-taulukko</comment>
<comment xml:lang="fo">Siag rokniark</comment>
<comment xml:lang="fr">feuille de calcul Siag</comment>
+ <comment xml:lang="fur">sfuei di calcul Siag</comment>
<comment xml:lang="ga">scarbhileog Siag</comment>
<comment xml:lang="gl">folla de cálculo de Siag</comment>
<comment xml:lang="he">גליון נתונים של Siag</comment>
@@ -19695,7 +20348,7 @@
<comment xml:lang="oc">fuèlh de calcul Siag</comment>
<comment xml:lang="pl">Arkusz Siag</comment>
<comment xml:lang="pt">folha de cálculo Siag</comment>
- <comment xml:lang="pt_BR">Planilha do Siag</comment>
+ <comment xml:lang="pt-BR">Planilha do Siag</comment>
<comment xml:lang="ro">Foaie de calcul Siag</comment>
<comment xml:lang="ru">Электронная таблица Siag</comment>
<comment xml:lang="sk">Zošit Siag</comment>
@@ -19703,32 +20356,34 @@
<comment xml:lang="sq">Fletë llogaritjesh Siag</comment>
<comment xml:lang="sr">Сјаг табела</comment>
<comment xml:lang="sv">Siag-kalkylblad</comment>
- <comment xml:lang="tr">Siag çalışma sayfası</comment>
+ <comment xml:lang="tr">Siag hesap çizelgesi</comment>
<comment xml:lang="uk">ел. таблиця Siag</comment>
<comment xml:lang="vi">Bảng tính Slag</comment>
- <comment xml:lang="zh_CN">Siag 电子表格</comment>
- <comment xml:lang="zh_TW">Siag 試算表</comment>
+ <comment xml:lang="zh-CN">Siag 电子表格</comment>
+ <comment xml:lang="zh-TW">Siag 試算表</comment>
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.siag"/>
</mime-type>
<mime-type type="image/x-skencil">
<comment>Skencil document</comment>
+ <comment xml:lang="af">Skencil-dokument</comment>
<comment xml:lang="ar">مستند Skencil</comment>
<comment xml:lang="ast">Documentu de Skencil</comment>
- <comment xml:lang="be@latin">Dakument Skencil</comment>
+ <comment xml:lang="be-Latn">Dakument Skencil</comment>
<comment xml:lang="bg">Документ — Skencil</comment>
<comment xml:lang="ca">document Skencil</comment>
<comment xml:lang="cs">dokument Skencil</comment>
<comment xml:lang="da">Skencildokument</comment>
<comment xml:lang="de">Skencil-Dokument</comment>
<comment xml:lang="el">Έγγραφο Skencil</comment>
- <comment xml:lang="en_GB">Skencil document</comment>
+ <comment xml:lang="en-GB">Skencil document</comment>
<comment xml:lang="eo">Skencil-dokumento</comment>
<comment xml:lang="es">documento de Skencil</comment>
<comment xml:lang="eu">Skencil dokumentua</comment>
<comment xml:lang="fi">Skencil-asiakirja</comment>
<comment xml:lang="fo">Skencil skjal</comment>
<comment xml:lang="fr">document Skencil</comment>
+ <comment xml:lang="fur">document Skencil</comment>
<comment xml:lang="ga">cáipéis Skencil</comment>
<comment xml:lang="gl">documento Skencil</comment>
<comment xml:lang="he">מסמך Skencil</comment>
@@ -19747,7 +20402,7 @@
<comment xml:lang="oc">document Skencil</comment>
<comment xml:lang="pl">Dokument Skencil</comment>
<comment xml:lang="pt">documento Skencil</comment>
- <comment xml:lang="pt_BR">Documento do Skencil</comment>
+ <comment xml:lang="pt-BR">Documento do Skencil</comment>
<comment xml:lang="ro">Document Skencil</comment>
<comment xml:lang="ru">Документ Skencil</comment>
<comment xml:lang="sk">Dokument Skencil</comment>
@@ -19758,19 +20413,20 @@
<comment xml:lang="tr">Skencil belgesi</comment>
<comment xml:lang="uk">документ Skencil</comment>
<comment xml:lang="vi">Tài liệu Skencil</comment>
- <comment xml:lang="zh_CN">Skencil 文档</comment>
- <comment xml:lang="zh_TW">Skencil 文件</comment>
+ <comment xml:lang="zh-CN">Skencil 文档</comment>
+ <comment xml:lang="zh-TW">Skencil 文件</comment>
<glob pattern="*.sk"/>
<glob pattern="*.sk1"/>
<magic priority="50">
- <match value="##Sketch" type="string" offset="0"/>
+ <match type="string" value="##Sketch" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-slp">
<comment>Stampede package</comment>
+ <comment xml:lang="af">Stampede-pakket</comment>
<comment xml:lang="ar">حزمة Stampede</comment>
<comment xml:lang="az">Stampede paketi</comment>
- <comment xml:lang="be@latin">Pakunak Stampede</comment>
+ <comment xml:lang="be-Latn">Pakunak Stampede</comment>
<comment xml:lang="bg">Пакет — Stampede</comment>
<comment xml:lang="ca">paquet Stampede</comment>
<comment xml:lang="cs">balíček Stampede</comment>
@@ -19778,13 +20434,14 @@
<comment xml:lang="da">Stampedepakke</comment>
<comment xml:lang="de">Stampede-Paket</comment>
<comment xml:lang="el">Πακέτο Stampede</comment>
- <comment xml:lang="en_GB">Stampede package</comment>
+ <comment xml:lang="en-GB">Stampede package</comment>
<comment xml:lang="eo">Stampede-pakaĵo</comment>
<comment xml:lang="es">paquete Stampede</comment>
<comment xml:lang="eu">Stampede paketea</comment>
<comment xml:lang="fi">Stampede-paketti</comment>
<comment xml:lang="fo">Stampede pakki</comment>
<comment xml:lang="fr">paquet Stampede</comment>
+ <comment xml:lang="fur">pachet Stampede</comment>
<comment xml:lang="ga">pacáiste Stampede</comment>
<comment xml:lang="gl">paquete Stampede</comment>
<comment xml:lang="he">חבילה של Stampede</comment>
@@ -19805,7 +20462,7 @@
<comment xml:lang="oc">paquet Stampede</comment>
<comment xml:lang="pl">Pakiet Stampede</comment>
<comment xml:lang="pt">pacote Stampede</comment>
- <comment xml:lang="pt_BR">Pacote Stampede</comment>
+ <comment xml:lang="pt-BR">Pacote Stampede</comment>
<comment xml:lang="ro">Pachet Stampede</comment>
<comment xml:lang="ru">Пакет Stampede</comment>
<comment xml:lang="sk">Balíček Stampede</comment>
@@ -19816,21 +20473,23 @@
<comment xml:lang="tr">Stampede paketi</comment>
<comment xml:lang="uk">пакунок Stampede</comment>
<comment xml:lang="vi">Gói Stampede</comment>
- <comment xml:lang="zh_CN">Stampede 软件包</comment>
- <comment xml:lang="zh_TW">Stampede 軟體包</comment>
+ <comment xml:lang="zh-CN">Stampede 软件包</comment>
+ <comment xml:lang="zh-TW">Stampede 軟體包</comment>
<generic-icon name="package-x-generic"/>
</mime-type>
<mime-type type="application/x-sg1000-rom">
<comment>SG-1000 ROM</comment>
+ <comment xml:lang="bg">ROM — SG-1000</comment>
<comment xml:lang="ca">ROM de SG-1000</comment>
<comment xml:lang="cs">ROM pro SG-1000</comment>
- <comment xml:lang="da">SG-1000 ROM</comment>
+ <comment xml:lang="da">SG-1000-ROM</comment>
<comment xml:lang="de">SG-1000 ROM</comment>
- <comment xml:lang="en_GB">SG-1000 ROM</comment>
+ <comment xml:lang="en-GB">SG-1000 ROM</comment>
<comment xml:lang="es">ROM de SG-1000</comment>
<comment xml:lang="eu">SG-1000 ROM</comment>
<comment xml:lang="fi">SG-1000 -ROM</comment>
<comment xml:lang="fr">ROM SG-1000</comment>
+ <comment xml:lang="fur">ROM SG-1000</comment>
<comment xml:lang="ga">ROM SG-1000</comment>
<comment xml:lang="hr">SG-1000 ROM</comment>
<comment xml:lang="hu">SG-1000 ROM</comment>
@@ -19839,30 +20498,33 @@
<comment xml:lang="kk">SG-1000 ROM</comment>
<comment xml:lang="ko">SG-1000 롬</comment>
<comment xml:lang="pl">Plik ROM konsoli SG-1000</comment>
- <comment xml:lang="pt_BR">ROM de SG-1000</comment>
+ <comment xml:lang="pt-BR">ROM de SG-1000</comment>
<comment xml:lang="ru">SG-1000 ROM</comment>
<comment xml:lang="sk">ROM pre SG-1000</comment>
+ <comment xml:lang="sl">SG-1000 ROM</comment>
<comment xml:lang="sr">СГ-1000 РОМ</comment>
<comment xml:lang="sv">SG-1000-rom</comment>
<comment xml:lang="tr">SG-1000 ROM</comment>
<comment xml:lang="uk">ППП SG-1000</comment>
- <comment xml:lang="zh_CN">SG-1000 ROM</comment>
- <comment xml:lang="zh_TW">SG-1000 ROM</comment>
+ <comment xml:lang="zh-CN">SG-1000 ROM</comment>
+ <comment xml:lang="zh-TW">SG-1000 ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.sg"/>
</mime-type>
<mime-type type="application/x-sms-rom">
-
+ <!-- Translate this to "Master System/Mark III" if the console was known as such in your locale (probably only in Japan) -->
<comment>Master System ROM</comment>
+ <comment xml:lang="bg">ROM — Master System</comment>
<comment xml:lang="ca">ROM de Master System</comment>
<comment xml:lang="cs">ROM pro Master System</comment>
- <comment xml:lang="da">Master System ROM</comment>
+ <comment xml:lang="da">Master System-ROM</comment>
<comment xml:lang="de">Master System ROM</comment>
- <comment xml:lang="en_GB">Master System ROM</comment>
+ <comment xml:lang="en-GB">Master System ROM</comment>
<comment xml:lang="es">ROM de Master System</comment>
<comment xml:lang="eu">Master System ROM</comment>
<comment xml:lang="fi">Master System -ROM</comment>
<comment xml:lang="fr">ROM Master System</comment>
+ <comment xml:lang="fur">ROM Master System</comment>
<comment xml:lang="ga">ROM Master System</comment>
<comment xml:lang="hr">Master System ROM</comment>
<comment xml:lang="hu">Master System ROM</comment>
@@ -19871,30 +20533,38 @@
<comment xml:lang="kk">Master System ROM</comment>
<comment xml:lang="ko">마스터 시스템 롬</comment>
<comment xml:lang="pl">Plik ROM konsoli SMS</comment>
- <comment xml:lang="pt_BR">ROM de Master System</comment>
+ <comment xml:lang="pt-BR">ROM de Master System</comment>
<comment xml:lang="ru">Master System ROM</comment>
<comment xml:lang="sk">ROM pre Master System</comment>
<comment xml:lang="sr">Мастер Систем РОМ</comment>
<comment xml:lang="sv">Master System-rom</comment>
<comment xml:lang="tr">Master System ROM</comment>
<comment xml:lang="uk">ППП Master System</comment>
- <comment xml:lang="zh_CN">Master System ROM</comment>
- <comment xml:lang="zh_TW">Master System ROM</comment>
+ <comment xml:lang="zh-CN">Master System ROM</comment>
+ <comment xml:lang="zh-TW">Master System ROM</comment>
<generic-icon name="application-x-executable"/>
-
+ <!-- Disabled, the magic would be too far into the file
+ <magic>
+ <match type="string" value="TMR SEGA" offset="32752">
+ <match type="byte" value="0x30" offset="32767" mask="0xf0"/>
+ <match type="byte" value="0x40" offset="32767" mask="0xf0"/>
+ </match>
+ </magic> -->
<glob pattern="*.sms"/>
</mime-type>
<mime-type type="application/x-gamegear-rom">
<comment>Game Gear ROM</comment>
+ <comment xml:lang="bg">ROM — Game Gear</comment>
<comment xml:lang="ca">ROM de Game Gear</comment>
<comment xml:lang="cs">ROM pro Game Gear</comment>
- <comment xml:lang="da">Game Gear ROM</comment>
+ <comment xml:lang="da">Game Gear-ROM</comment>
<comment xml:lang="de">Game Gear ROM</comment>
- <comment xml:lang="en_GB">Game Gear ROM</comment>
+ <comment xml:lang="en-GB">Game Gear ROM</comment>
<comment xml:lang="es">ROM de Game Gear</comment>
<comment xml:lang="eu">Game Gear ROM</comment>
<comment xml:lang="fi">Game Gear -ROM</comment>
<comment xml:lang="fr">ROM Game Gear</comment>
+ <comment xml:lang="fur">ROM Game Gear</comment>
<comment xml:lang="ga">ROM Game Gear</comment>
<comment xml:lang="hr">Game Gear ROM</comment>
<comment xml:lang="hu">Game Gear ROM</comment>
@@ -19903,36 +20573,44 @@
<comment xml:lang="kk">Game Gear ROM</comment>
<comment xml:lang="ko">게임 기어 롬</comment>
<comment xml:lang="pl">Plik ROM konsoli Game Gear</comment>
- <comment xml:lang="pt_BR">ROM de Game Gear</comment>
+ <comment xml:lang="pt-BR">ROM de Game Gear</comment>
<comment xml:lang="ru">Game Gear ROM</comment>
<comment xml:lang="sk">ROM pre Game Gear</comment>
<comment xml:lang="sr">Гејм Гир РОМ</comment>
<comment xml:lang="sv">Game Gear-rom</comment>
<comment xml:lang="tr">Game Gear ROM</comment>
<comment xml:lang="uk">ППП Game Gear</comment>
- <comment xml:lang="zh_CN">Game Gear ROM</comment>
- <comment xml:lang="zh_TW">Game Gear ROM</comment>
+ <comment xml:lang="zh-CN">Game Gear ROM</comment>
+ <comment xml:lang="zh-TW">Game Gear ROM</comment>
<generic-icon name="application-x-executable"/>
-
+ <!-- Disabled, the magic would be too far into the file
+ <magic>
+ <match type="string" value="TMR SEGA" offset="32752">
+ <match type="byte" value="0x50" offset="32767" mask="0xf0"/>
+ <match type="byte" value="0x60" offset="32767" mask="0xf0"/>
+ <match type="byte" value="0x70" offset="32767" mask="0xf0"/>
+ </match>
+ </magic> -->
<glob pattern="*.gg"/>
</mime-type>
<mime-type type="application/vnd.nintendo.snes.rom">
-
+ <!-- Translate this as Super Famicom (in Far East Asia) or Super Nintendo (in Europe) if the console was known as such in your locale -->
<comment>Super NES ROM</comment>
<comment xml:lang="ar">Super NES ROM</comment>
- <comment xml:lang="be@latin">Super Nintendo ROM</comment>
+ <comment xml:lang="be-Latn">Super Nintendo ROM</comment>
<comment xml:lang="bg">ROM — Super NES</comment>
<comment xml:lang="ca">ROM de Super NES</comment>
<comment xml:lang="cs">ROM pro Super Nintendo</comment>
- <comment xml:lang="da">Super NES-rom</comment>
+ <comment xml:lang="da">Super NES-ROM</comment>
<comment xml:lang="de">Super NES ROM</comment>
<comment xml:lang="el">Super NES ROM</comment>
- <comment xml:lang="en_GB">Super NES ROM</comment>
+ <comment xml:lang="en-GB">Super NES ROM</comment>
<comment xml:lang="es">ROM de Super NES</comment>
<comment xml:lang="eu">Super Nintendo-ko ROMa</comment>
<comment xml:lang="fi">Super Nintendo -ROM</comment>
<comment xml:lang="fo">Super NES ROM</comment>
<comment xml:lang="fr">ROM Super Nintendo</comment>
+ <comment xml:lang="fur">ROM Super Nintendo</comment>
<comment xml:lang="ga">ROM Super NES</comment>
<comment xml:lang="gl">ROM de Super NES</comment>
<comment xml:lang="he">ROM של Super NES</comment>
@@ -19952,7 +20630,7 @@
<comment xml:lang="oc">ROM Super Nintendo</comment>
<comment xml:lang="pl">Plik ROM konsoli SNES</comment>
<comment xml:lang="pt">ROM Super Nintendo</comment>
- <comment xml:lang="pt_BR">ROM de Super Nintendo</comment>
+ <comment xml:lang="pt-BR">ROM de Super Nintendo</comment>
<comment xml:lang="ro">ROM Super Nintendo</comment>
<comment xml:lang="ru">Super NES ROM</comment>
<comment xml:lang="sk">ROM pre Super Nintendo</comment>
@@ -19963,8 +20641,8 @@
<comment xml:lang="tr">Super NES ROM</comment>
<comment xml:lang="uk">ППП Super NES</comment>
<comment xml:lang="vi">ROM Super Nintendo</comment>
- <comment xml:lang="zh_CN">Super NES ROM</comment>
- <comment xml:lang="zh_TW">超級任天堂 ROM</comment>
+ <comment xml:lang="zh-CN">Super NES ROM</comment>
+ <comment xml:lang="zh-TW">超級任天堂 ROM</comment>
<generic-icon name="application-x-executable"/>
<alias type="application/x-snes-rom"/>
<glob pattern="*.sfc"/>
@@ -19972,21 +20650,23 @@
</mime-type>
<mime-type type="application/x-stuffit">
<comment>StuffIt archive</comment>
+ <comment xml:lang="af">StuffIt-argief</comment>
<comment xml:lang="ar">أرشيف StuffIt</comment>
- <comment xml:lang="be@latin">Archiŭ StuffIt</comment>
+ <comment xml:lang="be-Latn">Archiŭ StuffIt</comment>
<comment xml:lang="bg">Архив — StuffIt</comment>
<comment xml:lang="ca">arxiu StuffIt</comment>
<comment xml:lang="cs">archiv StuffIt</comment>
<comment xml:lang="da">StuffIt-arkiv</comment>
<comment xml:lang="de">StuffIt-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο StuffIt</comment>
- <comment xml:lang="en_GB">StuffIt archive</comment>
+ <comment xml:lang="en-GB">StuffIt archive</comment>
<comment xml:lang="eo">StuffIt-arkivo</comment>
<comment xml:lang="es">archivador de StuffIt</comment>
<comment xml:lang="eu">StuffIt artxiboa</comment>
<comment xml:lang="fi">StuffIt-arkisto</comment>
<comment xml:lang="fo">StuffIt skjalasavn</comment>
<comment xml:lang="fr">archive StuffIt</comment>
+ <comment xml:lang="fur">archivi StuffIt</comment>
<comment xml:lang="ga">cartlann StuffIt</comment>
<comment xml:lang="gl">arquivo StuffIt</comment>
<comment xml:lang="he">ארכיון של StuffIt</comment>
@@ -20006,7 +20686,7 @@
<comment xml:lang="oc">archiu StuffIt</comment>
<comment xml:lang="pl">Archiwum StuffIt</comment>
<comment xml:lang="pt">arquivo StuffIt</comment>
- <comment xml:lang="pt_BR">Pacote StuffIt</comment>
+ <comment xml:lang="pt-BR">Pacote StuffIt</comment>
<comment xml:lang="ro">Arhivă StuffIt</comment>
<comment xml:lang="ru">Архив StuffIt</comment>
<comment xml:lang="sk">Archív StuffIt</comment>
@@ -20017,34 +20697,36 @@
<comment xml:lang="tr">StuffIt arşivi</comment>
<comment xml:lang="uk">архів StuffIt</comment>
<comment xml:lang="vi">Kho nén Stuffit</comment>
- <comment xml:lang="zh_CN">Macintosh StuffIt 归档文件</comment>
- <comment xml:lang="zh_TW">StuffIt 封存檔</comment>
+ <comment xml:lang="zh-CN">Macintosh StuffIt 归档文件</comment>
+ <comment xml:lang="zh-TW">StuffIt 封存檔</comment>
<generic-icon name="package-x-generic"/>
<alias type="application/stuffit"/>
<alias type="application/x-sit"/>
<magic priority="60">
- <match value="StuffIt " type="string" offset="0"/>
- <match value="SIT!" type="string" offset="0"/>
+ <match type="string" value="StuffIt " offset="0"/>
+ <match type="string" value="SIT!" offset="0"/>
</magic>
<glob pattern="*.sit"/>
</mime-type>
<mime-type type="application/x-subrip">
<comment>SubRip subtitles</comment>
+ <comment xml:lang="af">SubRip-onderskrifte</comment>
<comment xml:lang="ar">ترجمات SubRip</comment>
- <comment xml:lang="be@latin">Subtytry SubRip</comment>
+ <comment xml:lang="be-Latn">Subtytry SubRip</comment>
<comment xml:lang="bg">Субтитри — SubRip</comment>
<comment xml:lang="ca">subtítols SubRip</comment>
<comment xml:lang="cs">titulky SubRip</comment>
<comment xml:lang="da">SubRip-undertekster</comment>
<comment xml:lang="de">SubRip-Untertitel</comment>
<comment xml:lang="el">Υπότιτλοι SubRip</comment>
- <comment xml:lang="en_GB">SubRip subtitles</comment>
+ <comment xml:lang="en-GB">SubRip subtitles</comment>
<comment xml:lang="eo">SubRip-subtekstoj</comment>
<comment xml:lang="es">subtítulos SubRip</comment>
<comment xml:lang="eu">SubRip azpitituluak</comment>
<comment xml:lang="fi">SubRip-tekstitykset</comment>
<comment xml:lang="fo">SubRip undirtekstir</comment>
<comment xml:lang="fr">sous-titres SubRip</comment>
+ <comment xml:lang="fur">sottitui SubRip</comment>
<comment xml:lang="ga">fotheidil SubRip</comment>
<comment xml:lang="gl">subtítulos SubRip</comment>
<comment xml:lang="he">כתוביות של SubRip</comment>
@@ -20064,7 +20746,7 @@
<comment xml:lang="oc">sostítols SubRip</comment>
<comment xml:lang="pl">Napisy SubRip</comment>
<comment xml:lang="pt">legendas SubRip</comment>
- <comment xml:lang="pt_BR">Legendas SubRip</comment>
+ <comment xml:lang="pt-BR">Legendas SubRip</comment>
<comment xml:lang="ro">Subtitrare SubRip</comment>
<comment xml:lang="ru">Субтитры SubRip</comment>
<comment xml:lang="sk">Titulky SubRip</comment>
@@ -20072,34 +20754,36 @@
<comment xml:lang="sq">Nëntituj SubRip</comment>
<comment xml:lang="sr">Суб Рип преводи</comment>
<comment xml:lang="sv">SubRip-undertexter</comment>
- <comment xml:lang="tr">SubRip altyazıları</comment>
+ <comment xml:lang="tr">SubRip alt yazıları</comment>
<comment xml:lang="uk">субтитри SubRip</comment>
<comment xml:lang="vi">Phụ đề SubRip</comment>
- <comment xml:lang="zh_CN">SubRip 字幕</comment>
- <comment xml:lang="zh_TW">SubRip 字幕</comment>
+ <comment xml:lang="zh-CN">SubRip 字幕</comment>
+ <comment xml:lang="zh-TW">SubRip 字幕</comment>
<alias type="application/x-srt"/>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<magic priority="50">
- <match value="1" type="string" offset="0">
- <match value=" --> " type="string" offset="0:256"/>
+ <match type="string" value="1" offset="0">
+ <match type="string" value=" --&gt; " offset="0:256"/>
</match>
</magic>
<glob pattern="*.srt"/>
</mime-type>
<mime-type type="text/vtt">
<comment>WebVTT subtitles</comment>
+ <comment xml:lang="af">WebVTT-onderskrifte</comment>
<comment xml:lang="bg">Субтитри — WebVTT</comment>
<comment xml:lang="ca">subtítols WebVTT</comment>
<comment xml:lang="cs">titulky WebVTT</comment>
<comment xml:lang="da">WebVTT-undertekster</comment>
<comment xml:lang="de">WebVTT-Untertitel</comment>
<comment xml:lang="el">Υπότιτλοι WebVTT</comment>
- <comment xml:lang="en_GB">WebVTT subtitles</comment>
+ <comment xml:lang="en-GB">WebVTT subtitles</comment>
<comment xml:lang="es">subtítulos WebVTT</comment>
<comment xml:lang="eu">WebVTT azpitituluak</comment>
<comment xml:lang="fi">WebVTT-tekstitykset</comment>
<comment xml:lang="fr">sous-titres WebVTT</comment>
+ <comment xml:lang="fur">sottitui WebVTT</comment>
<comment xml:lang="ga">fotheidil WebVTT</comment>
<comment xml:lang="gl">subtítulos WebVTT</comment>
<comment xml:lang="he">כתוביות WebVTT</comment>
@@ -20117,42 +20801,44 @@
<comment xml:lang="oc">sostítols WebVTT</comment>
<comment xml:lang="pl">Napisy WebVTT</comment>
<comment xml:lang="pt">legendas WebVTT</comment>
- <comment xml:lang="pt_BR">Legendas WebVTT</comment>
+ <comment xml:lang="pt-BR">Legendas WebVTT</comment>
<comment xml:lang="ru">Субтитры WebVTT</comment>
<comment xml:lang="sk">Titulky WebVTT</comment>
<comment xml:lang="sl">Podnapisi WebVTT</comment>
<comment xml:lang="sr">Веб ВТТ преводи</comment>
<comment xml:lang="sv">WebVTT-undertexter</comment>
- <comment xml:lang="tr">WebVTT altyazıları</comment>
+ <comment xml:lang="tr">WebVTT alt yazıları</comment>
<comment xml:lang="uk">субтитри WebVTT</comment>
- <comment xml:lang="zh_CN">WebVTT 字幕</comment>
- <comment xml:lang="zh_TW">WebVTT 字幕</comment>
+ <comment xml:lang="zh-CN">WebVTT 字幕</comment>
+ <comment xml:lang="zh-TW">WebVTT 字幕</comment>
<acronym>VTT</acronym>
<expanded-acronym>Video Text Tracks</expanded-acronym>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<magic priority="50">
- <match value="WEBVTT" type="string" offset="0"/>
+ <match type="string" value="WEBVTT" offset="0"/>
</magic>
<glob pattern="*.vtt"/>
</mime-type>
<mime-type type="application/x-sami">
<comment>SAMI subtitles</comment>
+ <comment xml:lang="af">SAMI-onderskrifte</comment>
<comment xml:lang="ar">ترجمات SAMI</comment>
- <comment xml:lang="be@latin">Subtytry SAMI</comment>
+ <comment xml:lang="be-Latn">Subtytry SAMI</comment>
<comment xml:lang="bg">Субтитри — SAMI</comment>
<comment xml:lang="ca">subtítols SAMI</comment>
<comment xml:lang="cs">titulky SAMI</comment>
<comment xml:lang="da">SAMI-undertekster</comment>
<comment xml:lang="de">SAMI-Untertitel</comment>
<comment xml:lang="el">Υπότιτλοι SAMI</comment>
- <comment xml:lang="en_GB">SAMI subtitles</comment>
+ <comment xml:lang="en-GB">SAMI subtitles</comment>
<comment xml:lang="eo">SAMI-subtekstoj</comment>
<comment xml:lang="es">subtítulos SAMI</comment>
<comment xml:lang="eu">SAMI azpitituluak</comment>
<comment xml:lang="fi">SAMI-tekstitykset</comment>
<comment xml:lang="fo">SAMI undirtekstir</comment>
<comment xml:lang="fr">sous-titres SAMI</comment>
+ <comment xml:lang="fur">sottitui SAMI</comment>
<comment xml:lang="ga">fotheidil SAMI</comment>
<comment xml:lang="gl">subtítulos SAMI</comment>
<comment xml:lang="he">כתוביות SAMI</comment>
@@ -20172,7 +20858,7 @@
<comment xml:lang="oc">sostítols SAMI</comment>
<comment xml:lang="pl">Napisy SAMI</comment>
<comment xml:lang="pt">legendas SAMI</comment>
- <comment xml:lang="pt_BR">Legendas SAMI</comment>
+ <comment xml:lang="pt-BR">Legendas SAMI</comment>
<comment xml:lang="ro">Subtitrări SAMI</comment>
<comment xml:lang="ru">Субтитры SAMI</comment>
<comment xml:lang="sk">Titulky SAMI</comment>
@@ -20180,38 +20866,40 @@
<comment xml:lang="sq">Nëntituj SAMI</comment>
<comment xml:lang="sr">САМИ преводи</comment>
<comment xml:lang="sv">SAMI-undertexter</comment>
- <comment xml:lang="tr">SAMI altyazıları</comment>
+ <comment xml:lang="tr">SAMI alt yazıları</comment>
<comment xml:lang="uk">субтитри SAMI</comment>
<comment xml:lang="vi">Phụ đề SAMI</comment>
- <comment xml:lang="zh_CN">SAMI 字幕</comment>
- <comment xml:lang="zh_TW">SAMI 字幕</comment>
+ <comment xml:lang="zh-CN">SAMI 字幕</comment>
+ <comment xml:lang="zh-TW">SAMI 字幕</comment>
<acronym>SAMI</acronym>
<expanded-acronym>Synchronized Accessible Media Interchange</expanded-acronym>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<magic priority="50">
- <match value="&lt;SAMI&gt;" type="string" offset="0:256"/>
+ <match type="string" value="&lt;SAMI&gt;" offset="0:256"/>
</magic>
<glob pattern="*.smi"/>
<glob pattern="*.sami"/>
</mime-type>
<mime-type type="text/x-microdvd">
<comment>MicroDVD subtitles</comment>
+ <comment xml:lang="af">MicroDVD-onderskrifte</comment>
<comment xml:lang="ar">ترجمات MicroDVD</comment>
- <comment xml:lang="be@latin">Subtytry MicroDVD</comment>
+ <comment xml:lang="be-Latn">Subtytry MicroDVD</comment>
<comment xml:lang="bg">Субтитри — MicroDVD</comment>
<comment xml:lang="ca">subtítols MicroDVD</comment>
<comment xml:lang="cs">titulky MicroDVD</comment>
<comment xml:lang="da">MicroDVD-undertekster</comment>
<comment xml:lang="de">MicroDVD-Untertitel</comment>
<comment xml:lang="el">Υπότιτλοι MicroDVD</comment>
- <comment xml:lang="en_GB">MicroDVD subtitles</comment>
+ <comment xml:lang="en-GB">MicroDVD subtitles</comment>
<comment xml:lang="eo">MicroDVD-subtekstoj</comment>
<comment xml:lang="es">subtítulos de MicroDVD</comment>
<comment xml:lang="eu">MicroDVD azpitituluak</comment>
<comment xml:lang="fi">MicroDVD-tekstitykset</comment>
<comment xml:lang="fo">MicroDVD undirtekstir</comment>
<comment xml:lang="fr">sous-titres MicroDVD</comment>
+ <comment xml:lang="fur">sottitui MicroDVD</comment>
<comment xml:lang="ga">fotheidil MicroDVD</comment>
<comment xml:lang="gl">subtítulos de MicroDVD</comment>
<comment xml:lang="he">כתוביות של MicroDVD</comment>
@@ -20232,7 +20920,7 @@
<comment xml:lang="oc">sostítols MicroDVD</comment>
<comment xml:lang="pl">Napisy MicroDVD</comment>
<comment xml:lang="pt">legendas MicroDVD</comment>
- <comment xml:lang="pt_BR">Legendas MicroDVD</comment>
+ <comment xml:lang="pt-BR">Legendas MicroDVD</comment>
<comment xml:lang="ro">Subtitrări MicroDVD</comment>
<comment xml:lang="ru">Субтитры MicroDVD</comment>
<comment xml:lang="sk">Titulky MicroDVD</comment>
@@ -20240,36 +20928,38 @@
<comment xml:lang="sq">Nëntituj MicroDVD</comment>
<comment xml:lang="sr">Микро ДВД преводи</comment>
<comment xml:lang="sv">MicroDVD-undertexter</comment>
- <comment xml:lang="tr">MicroDVD altyazısı</comment>
+ <comment xml:lang="tr">MicroDVD alt yazısı</comment>
<comment xml:lang="uk">субтитри MicroDVD</comment>
<comment xml:lang="vi">Phụ đề MicroDVD</comment>
- <comment xml:lang="zh_CN">MicroDVD 字幕</comment>
- <comment xml:lang="zh_TW">MicroDVD 字幕</comment>
+ <comment xml:lang="zh-CN">MicroDVD 字幕</comment>
+ <comment xml:lang="zh-TW">MicroDVD 字幕</comment>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="{1}" type="string" offset="0"/>
- <match value="{0}" type="string" offset="0"/>
- <match value="}{" type="string" offset="0:6"/>
+ <match type="string" value="{1}" offset="0"/>
+ <match type="string" value="{0}" offset="0"/>
+ <match type="string" value="}{" offset="0:6"/>
</magic>
<glob pattern="*.sub"/>
</mime-type>
<mime-type type="text/x-mpsub">
<comment>MPSub subtitles</comment>
+ <comment xml:lang="af">MPSub-onderskrifte</comment>
<comment xml:lang="ar">ترجمات MPSub</comment>
- <comment xml:lang="be@latin">Subtytry MPSub</comment>
+ <comment xml:lang="be-Latn">Subtytry MPSub</comment>
<comment xml:lang="bg">Субтитри — MPSub</comment>
<comment xml:lang="ca">subtítols MPSub</comment>
<comment xml:lang="cs">titulky MPSub</comment>
<comment xml:lang="da">MPSub-undertekster</comment>
<comment xml:lang="de">MPSub-Untertitel</comment>
<comment xml:lang="el">Υπότιτλοι MPSub</comment>
- <comment xml:lang="en_GB">MPSub subtitles</comment>
+ <comment xml:lang="en-GB">MPSub subtitles</comment>
<comment xml:lang="eo">MPSub-subtekstoj</comment>
<comment xml:lang="es">subtítulos MPSub</comment>
<comment xml:lang="eu">MPSub azpitituluak</comment>
<comment xml:lang="fi">MPSub-tekstitykset</comment>
<comment xml:lang="fo">MPSub undirtekstir</comment>
<comment xml:lang="fr">sous-titres MPSub</comment>
+ <comment xml:lang="fur">sottitui MPSub</comment>
<comment xml:lang="ga">fotheidil MPSub</comment>
<comment xml:lang="gl">subtítulos MPSub</comment>
<comment xml:lang="he">כתוביות MPSub</comment>
@@ -20290,7 +20980,7 @@
<comment xml:lang="oc">sostítols MPSub</comment>
<comment xml:lang="pl">Napisy MPSub</comment>
<comment xml:lang="pt">legendas MPSub</comment>
- <comment xml:lang="pt_BR">Legendas MPSub</comment>
+ <comment xml:lang="pt-BR">Legendas MPSub</comment>
<comment xml:lang="ro">Subtitrări MPSub</comment>
<comment xml:lang="ru">Субтитры MPSub</comment>
<comment xml:lang="sk">Titulky MPSub</comment>
@@ -20298,36 +20988,38 @@
<comment xml:lang="sq">Nëntituj MPSub</comment>
<comment xml:lang="sr">МПСуб преводи</comment>
<comment xml:lang="sv">MPSub-undertexter</comment>
- <comment xml:lang="tr">MPSub altyazıları</comment>
+ <comment xml:lang="tr">MPSub alt yazıları</comment>
<comment xml:lang="uk">субтитри MPSub</comment>
<comment xml:lang="vi">Phụ đề MPSub</comment>
- <comment xml:lang="zh_CN">MPSub 字幕</comment>
- <comment xml:lang="zh_TW">MPSub 字幕</comment>
+ <comment xml:lang="zh-CN">MPSub 字幕</comment>
+ <comment xml:lang="zh-TW">MPSub 字幕</comment>
<acronym>MPSub</acronym>
<expanded-acronym>MPlayer Subtitle</expanded-acronym>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="FORMAT=" type="string" offset="0:256"/>
+ <match type="string" value="FORMAT=" offset="0:256"/>
</magic>
<glob pattern="*.sub"/>
</mime-type>
<mime-type type="text/x-ssa">
<comment>SSA subtitles</comment>
+ <comment xml:lang="af">SSA-onderskrifte</comment>
<comment xml:lang="ar">ترجمات SSA</comment>
- <comment xml:lang="be@latin">Subtytry SSA</comment>
+ <comment xml:lang="be-Latn">Subtytry SSA</comment>
<comment xml:lang="bg">Субтитри — SSA</comment>
<comment xml:lang="ca">subtítols SSA</comment>
<comment xml:lang="cs">titulky SSA</comment>
<comment xml:lang="da">SSA-undertekster</comment>
<comment xml:lang="de">SSA-Untertitel</comment>
<comment xml:lang="el">Υπότιτλοι SSA</comment>
- <comment xml:lang="en_GB">SSA subtitles</comment>
+ <comment xml:lang="en-GB">SSA subtitles</comment>
<comment xml:lang="eo">SSA-subtekstoj</comment>
<comment xml:lang="es">subtítulos SSA</comment>
<comment xml:lang="eu">SSA azpitituluak</comment>
<comment xml:lang="fi">SSA-tekstitykset</comment>
<comment xml:lang="fo">SSA undirtekstir</comment>
<comment xml:lang="fr">sous-titres SSA</comment>
+ <comment xml:lang="fur">sottitui SSA</comment>
<comment xml:lang="ga">fotheidil SSA</comment>
<comment xml:lang="gl">Subtitulos SSA</comment>
<comment xml:lang="he">כתובית SSA</comment>
@@ -20347,7 +21039,7 @@
<comment xml:lang="oc">sostítols SSA</comment>
<comment xml:lang="pl">Napisy SSA</comment>
<comment xml:lang="pt">legendas SSA</comment>
- <comment xml:lang="pt_BR">Legendas SSA</comment>
+ <comment xml:lang="pt-BR">Legendas SSA</comment>
<comment xml:lang="ro">Subtitrări SSA</comment>
<comment xml:lang="ru">Субтитры SSA</comment>
<comment xml:lang="sk">Titulky SSA</comment>
@@ -20355,38 +21047,40 @@
<comment xml:lang="sq">Nëntituj SSA</comment>
<comment xml:lang="sr">ССА преводи</comment>
<comment xml:lang="sv">SSA-undertexter</comment>
- <comment xml:lang="tr">SSA altyazıları</comment>
+ <comment xml:lang="tr">SSA alt yazıları</comment>
<comment xml:lang="uk">субтитри SSA</comment>
<comment xml:lang="vi">Phụ đề SSA</comment>
- <comment xml:lang="zh_CN">SSA 字幕</comment>
- <comment xml:lang="zh_TW">SSA 字幕</comment>
+ <comment xml:lang="zh-CN">SSA 字幕</comment>
+ <comment xml:lang="zh-TW">SSA 字幕</comment>
<acronym>SSA</acronym>
<expanded-acronym>SubStation Alpha</expanded-acronym>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="[Script Info]" type="string" offset="0:256"/>
- <match value="Dialogue: " type="string" offset="0:256"/>
+ <match type="string" value="[Script Info]" offset="0:256"/>
+ <match type="string" value="Dialogue: " offset="0:256"/>
</magic>
<glob pattern="*.ssa"/>
<glob pattern="*.ass"/>
</mime-type>
<mime-type type="text/x-subviewer">
<comment>SubViewer subtitles</comment>
+ <comment xml:lang="af">SubViewer-onderskrifte</comment>
<comment xml:lang="ar">ترجمات SubViewer</comment>
- <comment xml:lang="be@latin">Subtytry SubViewer</comment>
+ <comment xml:lang="be-Latn">Subtytry SubViewer</comment>
<comment xml:lang="bg">Субтитри — SubViewer</comment>
<comment xml:lang="ca">subtítols SubViewer</comment>
<comment xml:lang="cs">titulky SubViewer</comment>
<comment xml:lang="da">SubViewer-undertekster</comment>
<comment xml:lang="de">SubViewer-Untertitel</comment>
<comment xml:lang="el">Υπότιτλοι SubViewer</comment>
- <comment xml:lang="en_GB">SubViewer subtitles</comment>
+ <comment xml:lang="en-GB">SubViewer subtitles</comment>
<comment xml:lang="eo">SubViewer-subtekstoj</comment>
<comment xml:lang="es">subtítulos SubViewer</comment>
<comment xml:lang="eu">SubViewer azpitituluak</comment>
<comment xml:lang="fi">SubViewer-tekstitykset</comment>
<comment xml:lang="fo">SubViewer undirtekstir</comment>
<comment xml:lang="fr">sous-titres SubViewer</comment>
+ <comment xml:lang="fur">sottitui SubViewer</comment>
<comment xml:lang="ga">fotheidil SubViewer</comment>
<comment xml:lang="gl">subtítulos SubViewer</comment>
<comment xml:lang="he">כתוביות של SubViewer</comment>
@@ -20406,7 +21100,7 @@
<comment xml:lang="oc">sostítols SubViewer</comment>
<comment xml:lang="pl">Napisy SubViewer</comment>
<comment xml:lang="pt">legendas SubViewer</comment>
- <comment xml:lang="pt_BR">Legendas SubViewer</comment>
+ <comment xml:lang="pt-BR">Legendas SubViewer</comment>
<comment xml:lang="ro">Subtitrare SubViewer</comment>
<comment xml:lang="ru">Субтитры SubViewer</comment>
<comment xml:lang="sk">Titulky SubViewer</comment>
@@ -20414,33 +21108,35 @@
<comment xml:lang="sq">Nëntituj SubViewer</comment>
<comment xml:lang="sr">Суб Вјивер преводи</comment>
<comment xml:lang="sv">SubViewer-undertexter</comment>
- <comment xml:lang="tr">SubViewer altyazıları</comment>
+ <comment xml:lang="tr">SubViewer alt yazıları</comment>
<comment xml:lang="uk">субтитри SubViewer</comment>
<comment xml:lang="vi">Phụ đề SubViewer</comment>
- <comment xml:lang="zh_CN">SubViewer 字幕</comment>
- <comment xml:lang="zh_TW">SubViewer 字幕</comment>
+ <comment xml:lang="zh-CN">SubViewer 字幕</comment>
+ <comment xml:lang="zh-TW">SubViewer 字幕</comment>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="[INFORMATION]" type="string" offset="0"/>
+ <match type="string" value="[INFORMATION]" offset="0"/>
</magic>
<glob pattern="*.sub"/>
</mime-type>
<mime-type type="text/x-iMelody">
<comment>iMelody ringtone</comment>
+ <comment xml:lang="af">iMelody-luitoon</comment>
<comment xml:lang="ar">نغمة iMelody</comment>
- <comment xml:lang="be@latin">Rington iMelody</comment>
+ <comment xml:lang="be-Latn">Rington iMelody</comment>
<comment xml:lang="bg">Аудио — iMelody</comment>
<comment xml:lang="ca">to de trucada iMelody</comment>
<comment xml:lang="cs">vyzváněcí melodie iMelody</comment>
<comment xml:lang="da">iMelody-ringetone</comment>
<comment xml:lang="de">iMelody-Klingelton</comment>
<comment xml:lang="el">ringtone iMelody</comment>
- <comment xml:lang="en_GB">iMelody ringtone</comment>
+ <comment xml:lang="en-GB">iMelody ringtone</comment>
<comment xml:lang="es">tono de llamada iMelody</comment>
<comment xml:lang="eu">iMelody doinua</comment>
<comment xml:lang="fi">iMelody-soittoääni</comment>
<comment xml:lang="fo">iMelody ringitóni</comment>
<comment xml:lang="fr">sonnerie iMelody</comment>
+ <comment xml:lang="fur">sunarie iMelody</comment>
<comment xml:lang="ga">ton buailte iMelody</comment>
<comment xml:lang="gl">Melodía de iMelody</comment>
<comment xml:lang="he">צלצול של iMelody</comment>
@@ -20460,7 +21156,7 @@
<comment xml:lang="oc">sonariá iMelody</comment>
<comment xml:lang="pl">Dzwonek iMelody</comment>
<comment xml:lang="pt">toque iMelody</comment>
- <comment xml:lang="pt_BR">Toque de celular do iMelody</comment>
+ <comment xml:lang="pt-BR">Toque de celular do iMelody</comment>
<comment xml:lang="ro">Sonerie iMelody</comment>
<comment xml:lang="ru">Мелодия iMelody</comment>
<comment xml:lang="sk">Vyzváňacie melódie iMelody</comment>
@@ -20471,33 +21167,35 @@
<comment xml:lang="tr">iMelody melodisi</comment>
<comment xml:lang="uk">рінгтон iMelody</comment>
<comment xml:lang="vi">tiếng réo iMelody</comment>
- <comment xml:lang="zh_CN">iMelody 铃声</comment>
- <comment xml:lang="zh_TW">iMelody 鈴聲</comment>
+ <comment xml:lang="zh-CN">iMelody 铃声</comment>
+ <comment xml:lang="zh-TW">iMelody 鈴聲</comment>
<magic priority="50">
- <match value="BEGIN:IMELODY" type="string" offset="0"/>
+ <match type="string" value="BEGIN:IMELODY" offset="0"/>
</magic>
<glob pattern="*.imy"/>
<glob pattern="*.ime"/>
<alias type="audio/x-iMelody"/>
<alias type="audio/iMelody"/>
</mime-type>
- <mime-type type="application/x-smaf">
+ <mime-type type="application/vnd.smaf">
<comment>SMAF audio</comment>
+ <comment xml:lang="af">SMAF-oudio</comment>
<comment xml:lang="ar">SMAF سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo SMAF</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo SMAF</comment>
<comment xml:lang="bg">Аудио — SMAF</comment>
<comment xml:lang="ca">àudio SMAF</comment>
<comment xml:lang="cs">zvuk SMAF</comment>
<comment xml:lang="da">SMAF-lyd</comment>
<comment xml:lang="de">SMAF-Audio</comment>
<comment xml:lang="el">Ήχος SMAF</comment>
- <comment xml:lang="en_GB">SMAF audio</comment>
+ <comment xml:lang="en-GB">SMAF audio</comment>
<comment xml:lang="eo">SMAF-sondosiero</comment>
- <comment xml:lang="es">sonido SMAF</comment>
+ <comment xml:lang="es">audio SMAF</comment>
<comment xml:lang="eu">SMAF audioa</comment>
<comment xml:lang="fi">SMAF-ääni</comment>
<comment xml:lang="fo">SMAF ljóður</comment>
<comment xml:lang="fr">audio SMAF</comment>
+ <comment xml:lang="fur">audio SMAF</comment>
<comment xml:lang="ga">fuaim SMAF</comment>
<comment xml:lang="gl">son SMAF</comment>
<comment xml:lang="he">שמע SMAF</comment>
@@ -20517,7 +21215,7 @@
<comment xml:lang="oc">àudio SMAF</comment>
<comment xml:lang="pl">Plik dźwiękowy SMAF</comment>
<comment xml:lang="pt">áudio SMAF</comment>
- <comment xml:lang="pt_BR">Áudio SMAF</comment>
+ <comment xml:lang="pt-BR">Áudio SMAF</comment>
<comment xml:lang="ro">Audio SMAF</comment>
<comment xml:lang="ru">Аудио SMAF</comment>
<comment xml:lang="sk">Zvuk SMAF</comment>
@@ -20528,35 +21226,37 @@
<comment xml:lang="tr">SMAF sesi</comment>
<comment xml:lang="uk">звук SMAF</comment>
<comment xml:lang="vi">Âm thanh SMAF</comment>
- <comment xml:lang="zh_CN">SMAF 音频</comment>
- <comment xml:lang="zh_TW">SMAF 音訊</comment>
+ <comment xml:lang="zh-CN">SMAF 音频</comment>
+ <comment xml:lang="zh-TW">SMAF 音訊</comment>
<acronym>SMAF</acronym>
<expanded-acronym>Synthetic music Mobile Application Format</expanded-acronym>
<generic-icon name="audio-x-generic"/>
<magic priority="50">
- <match value="MMMD" type="string" offset="0"/>
+ <match type="string" value="MMMD" offset="0"/>
</magic>
<glob pattern="*.mmf"/>
<glob pattern="*.smaf"/>
- <alias type="application/vnd.smaf"/>
+ <alias type="application/x-smaf"/>
</mime-type>
<mime-type type="text/x-mrml">
<comment>MRML playlist</comment>
+ <comment xml:lang="af">MRML-speellys</comment>
<comment xml:lang="ar">قائمة تشغيل MRML</comment>
- <comment xml:lang="be@latin">Śpis piesień MRML</comment>
+ <comment xml:lang="be-Latn">Śpis piesień MRML</comment>
<comment xml:lang="bg">Списък за изпълнение — MRML</comment>
<comment xml:lang="ca">llista de reproducció MRML</comment>
<comment xml:lang="cs">seznam k přehrání MRML</comment>
<comment xml:lang="da">MRML-afspilningsliste</comment>
<comment xml:lang="de">MRML-Wiedergabeliste</comment>
<comment xml:lang="el">Λίστα αναπαραγωγής MRML</comment>
- <comment xml:lang="en_GB">MRML playlist</comment>
+ <comment xml:lang="en-GB">MRML playlist</comment>
<comment xml:lang="eo">MRML-ludlisto</comment>
<comment xml:lang="es">lista de reproducción MRML</comment>
<comment xml:lang="eu">MRML erreprodukzio-zerrenda</comment>
<comment xml:lang="fi">MRML-soittolista</comment>
<comment xml:lang="fo">MRML avspælingarlisti</comment>
<comment xml:lang="fr">liste de lecture MRML</comment>
+ <comment xml:lang="fur">liste di riproduzion MRML</comment>
<comment xml:lang="ga">seinmliosta MRML</comment>
<comment xml:lang="gl">lista de reprodución MRML</comment>
<comment xml:lang="he">רשימת השמעה MRML</comment>
@@ -20577,7 +21277,7 @@
<comment xml:lang="oc">lista de lectura MRML</comment>
<comment xml:lang="pl">Lista odtwarzania MRML</comment>
<comment xml:lang="pt">lista de reprodução MRML</comment>
- <comment xml:lang="pt_BR">Lista de reprodução do MRML</comment>
+ <comment xml:lang="pt-BR">Lista de reprodução do MRML</comment>
<comment xml:lang="ro">Listă redare MRML</comment>
<comment xml:lang="ru">Список воспроизведения MRML</comment>
<comment xml:lang="sk">Zoznam skladieb MRML</comment>
@@ -20585,36 +21285,38 @@
<comment xml:lang="sq">Listë titujsh MRML</comment>
<comment xml:lang="sr">МРМЛ списак нумера</comment>
<comment xml:lang="sv">MRML-spellista</comment>
- <comment xml:lang="tr">MRML oynatma listesi</comment>
+ <comment xml:lang="tr">MRML çalma listesi</comment>
<comment xml:lang="uk">список відтворення MRML</comment>
<comment xml:lang="vi">Danh mục nhạc MRML</comment>
- <comment xml:lang="zh_CN">MRML 播放列表</comment>
- <comment xml:lang="zh_TW">MRML 播放清單</comment>
+ <comment xml:lang="zh-CN">MRML 播放列表</comment>
+ <comment xml:lang="zh-TW">MRML 播放清單</comment>
<acronym>MRML</acronym>
<expanded-acronym>Multimedia Retrieval Markup Language</expanded-acronym>
<magic priority="50">
- <match value="&lt;mrml " type="string" offset="0"/>
+ <match type="string" value="&lt;mrml " offset="0"/>
</magic>
<glob pattern="*.mrml"/>
<glob pattern="*.mrl"/>
</mime-type>
<mime-type type="audio/x-xmf">
<comment>XMF audio</comment>
+ <comment xml:lang="af">XMF-oudio</comment>
<comment xml:lang="ar">XMF سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo XMF</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo XMF</comment>
<comment xml:lang="bg">Аудио — XMF</comment>
<comment xml:lang="ca">àudio XMF</comment>
<comment xml:lang="cs">zvuk XMF</comment>
<comment xml:lang="da">XMF-lyd</comment>
<comment xml:lang="de">XMF-Audio</comment>
<comment xml:lang="el">Ήχος XMF</comment>
- <comment xml:lang="en_GB">XMF audio</comment>
+ <comment xml:lang="en-GB">XMF audio</comment>
<comment xml:lang="eo">XMF-sondosiero</comment>
- <comment xml:lang="es">sonido XMF</comment>
+ <comment xml:lang="es">audio XMF</comment>
<comment xml:lang="eu">XMF audioa</comment>
<comment xml:lang="fi">XMF-ääni</comment>
<comment xml:lang="fo">XMF ljóður</comment>
<comment xml:lang="fr">audio XMF</comment>
+ <comment xml:lang="fur">audio XMF</comment>
<comment xml:lang="ga">fuaim XMF</comment>
<comment xml:lang="gl">son XMF</comment>
<comment xml:lang="he">שמע XMF</comment>
@@ -20634,7 +21336,7 @@
<comment xml:lang="oc">àudio XMF</comment>
<comment xml:lang="pl">Plik dźwiękowy XMF</comment>
<comment xml:lang="pt">aúdio XMF</comment>
- <comment xml:lang="pt_BR">Áudio XMF</comment>
+ <comment xml:lang="pt-BR">Áudio XMF</comment>
<comment xml:lang="ro">Audio XMF</comment>
<comment xml:lang="ru">Аудио XMF</comment>
<comment xml:lang="sk">Zvuk XMF</comment>
@@ -20645,13 +21347,13 @@
<comment xml:lang="tr">XMF sesi</comment>
<comment xml:lang="uk">звук XMF</comment>
<comment xml:lang="vi">Âm thanh XMF</comment>
- <comment xml:lang="zh_CN">XMF 音频</comment>
- <comment xml:lang="zh_TW">XMF 音訊</comment>
+ <comment xml:lang="zh-CN">XMF 音频</comment>
+ <comment xml:lang="zh-TW">XMF 音訊</comment>
<acronym>XMF</acronym>
<expanded-acronym>eXtensible Music Format</expanded-acronym>
<magic priority="50">
- <match value="XMF_" type="string" offset="0"/>
- <match value="\130\115\106\137\062\056\060\060\000\000\000\002" type="string" offset="0"/>
+ <match type="string" value="XMF_" offset="0"/>
+ <match type="string" value="\130\115\106\137\062\056\060\060\000\000\000\002" offset="0"/>
</magic>
<glob pattern="*.xmf"/>
<alias type="audio/xmf"/>
@@ -20659,23 +21361,25 @@
</mime-type>
<mime-type type="application/x-sv4cpio">
<comment>SV4 CPIO archive</comment>
+ <comment xml:lang="af">SV4 CPIO-argief</comment>
<comment xml:lang="ar">أرشيف SV4 CPIO</comment>
<comment xml:lang="az">SV4 CPIO arxivi</comment>
- <comment xml:lang="be@latin">Archiŭ SV4 CPIO</comment>
+ <comment xml:lang="be-Latn">Archiŭ SV4 CPIO</comment>
<comment xml:lang="bg">Архив — SV4 CPIO</comment>
- <comment xml:lang="ca">arxiu CPIO SV4</comment>
+ <comment xml:lang="ca">arxiu SV4 CPIO</comment>
<comment xml:lang="cs">archiv SV4 CPIO</comment>
<comment xml:lang="cy">Archif CPIO SV4</comment>
<comment xml:lang="da">SV4 CPIO-arkiv</comment>
<comment xml:lang="de">SV4-CPIO-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο SV4 CPIO</comment>
- <comment xml:lang="en_GB">SV4 CPIO archive</comment>
+ <comment xml:lang="en-GB">SV4 CPIO archive</comment>
<comment xml:lang="eo">SV4-CPIO-arkivo</comment>
<comment xml:lang="es">archivador SV4 CPIO</comment>
<comment xml:lang="eu">SV4 CPIO artxiboa</comment>
<comment xml:lang="fi">SV4 CPIO -arkisto</comment>
<comment xml:lang="fo">SV4 CPIO skjalasavn</comment>
<comment xml:lang="fr">archive SV4 CPIO</comment>
+ <comment xml:lang="fur">archivi SV4 CPIO</comment>
<comment xml:lang="ga">cartlann SV4 CPIO</comment>
<comment xml:lang="gl">arquivo SV4 CPIO</comment>
<comment xml:lang="he">ארכיון של SV4 SPIO</comment>
@@ -20696,7 +21400,7 @@
<comment xml:lang="oc">archiu SV4 CPIO</comment>
<comment xml:lang="pl">Archiwum SV4 CPIO</comment>
<comment xml:lang="pt">arquivo SV4 CPIO</comment>
- <comment xml:lang="pt_BR">Pacote SV4 CPIO</comment>
+ <comment xml:lang="pt-BR">Pacote SV4 CPIO</comment>
<comment xml:lang="ro">Arhivă SV4 CPIO</comment>
<comment xml:lang="ru">Архив SV4 CPIO</comment>
<comment xml:lang="sk">Archív SV4 CPIO</comment>
@@ -20707,28 +21411,30 @@
<comment xml:lang="tr">SV4 CPIO arşivi</comment>
<comment xml:lang="uk">архів SV4 CPIO</comment>
<comment xml:lang="vi">Kho nén CPIO SV4</comment>
- <comment xml:lang="zh_CN">SV4 CPIO 归档文件</comment>
- <comment xml:lang="zh_TW">SV4 CPIO 封存檔</comment>
+ <comment xml:lang="zh-CN">SV4 CPIO 归档文件</comment>
+ <comment xml:lang="zh-TW">SV4 CPIO 封存檔</comment>
<generic-icon name="package-x-generic"/>
<glob pattern="*.sv4cpio"/>
</mime-type>
<mime-type type="application/x-sv4crc">
<comment>SV4 CPIO archive (with CRC)</comment>
+ <comment xml:lang="af">SV4 CPIO-argief (met CRC)</comment>
<comment xml:lang="ar">أرشيف SV4 CPIO (مع CRC)</comment>
- <comment xml:lang="be@latin">Archiŭ SV4 CPIO (z CRC)</comment>
+ <comment xml:lang="be-Latn">Archiŭ SV4 CPIO (z CRC)</comment>
<comment xml:lang="bg">Архив — SV4 CPIO, проверка за грешки CRC</comment>
- <comment xml:lang="ca">arxiu CPIO SV4 (amb CRC)</comment>
+ <comment xml:lang="ca">arxiu SV4 CPIO (amb CRC)</comment>
<comment xml:lang="cs">archiv SV4 CPIO (s CRC)</comment>
<comment xml:lang="da">SV4 CPIO-arkiv (med CRC)</comment>
<comment xml:lang="de">SV4-CPIO-Archiv (mit CRC)</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο SV4 CPIO (με CRC)</comment>
- <comment xml:lang="en_GB">SV4 CPIO archive (with CRC)</comment>
+ <comment xml:lang="en-GB">SV4 CPIO archive (with CRC)</comment>
<comment xml:lang="eo">SV4-CPIO-arkivo (kun CRC)</comment>
<comment xml:lang="es">archivador SV4 CPIO (con CRC)</comment>
<comment xml:lang="eu">SV4 CPIO artxiboa (CRC-rekin)</comment>
<comment xml:lang="fi">SV4 CPIO -arkisto (CRC:llä)</comment>
<comment xml:lang="fo">SV4 CPIO skjalasavn (við CRC)</comment>
<comment xml:lang="fr">archive SV4 CPIO (avec CRC)</comment>
+ <comment xml:lang="fur">archivi SV4 CPIO (cun CRC)</comment>
<comment xml:lang="ga">cartlann SV4 CPIO (le CRC)</comment>
<comment xml:lang="gl">Arquivador SV4 CPIO (con CRC)</comment>
<comment xml:lang="he">ארכיון של SV4 SPIO (עם CRC)</comment>
@@ -20747,9 +21453,9 @@
<comment xml:lang="nl">SV4 CPIO-archief (met CRC)</comment>
<comment xml:lang="nn">SV4 CPIO arkiv (med CRC)</comment>
<comment xml:lang="oc">archiu SV4 CPIO (avec CRC)</comment>
- <comment xml:lang="pl">Archiwum SV4 CPIO (z sumą kontrolną)</comment>
+ <comment xml:lang="pl">Archiwum SV4 CPIO (z sumą kontrolną)</comment>
<comment xml:lang="pt">arquivo SV4 CPIO (com CRC)</comment>
- <comment xml:lang="pt_BR">Pacote SV4 CPIO (com CRC)</comment>
+ <comment xml:lang="pt-BR">Pacote SV4 CPIO (com CRC)</comment>
<comment xml:lang="ro">Arhivă SV4 CPIO (cu CRC)</comment>
<comment xml:lang="ru">Архив SV4 CPIO (с CRC)</comment>
<comment xml:lang="sk">Archív SV4 CPIO (s CRC)</comment>
@@ -20760,16 +21466,17 @@
<comment xml:lang="tr">SV4 CPIO arşivi (CRC ile)</comment>
<comment xml:lang="uk">архів SV4 CPIO (з CRC)</comment>
<comment xml:lang="vi">Kho nén CPIO SV4 (với CRC)</comment>
- <comment xml:lang="zh_CN">SV4 CPIP 归档文件（带 CRC）</comment>
- <comment xml:lang="zh_TW">SV4 CPIO 封存檔 (具有 CRC)</comment>
+ <comment xml:lang="zh-CN">SV4 CPIP 归档文件（带 CRC）</comment>
+ <comment xml:lang="zh-TW">SV4 CPIO 封存檔 (具有 CRC)</comment>
<generic-icon name="package-x-generic"/>
<glob pattern="*.sv4crc"/>
</mime-type>
<mime-type type="application/x-tar">
<comment>Tar archive</comment>
+ <comment xml:lang="af">Tar-argief</comment>
<comment xml:lang="ar">أرشيف Tar</comment>
<comment xml:lang="az">Tar arxivi</comment>
- <comment xml:lang="be@latin">Archiŭ tar</comment>
+ <comment xml:lang="be-Latn">Archiŭ tar</comment>
<comment xml:lang="bg">Архив — tar</comment>
<comment xml:lang="ca">arxiu tar</comment>
<comment xml:lang="cs">archiv Tar</comment>
@@ -20777,12 +21484,13 @@
<comment xml:lang="da">Tar-arkiv</comment>
<comment xml:lang="de">Tar-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Tar</comment>
- <comment xml:lang="en_GB">Tar archive</comment>
+ <comment xml:lang="en-GB">Tar archive</comment>
<comment xml:lang="es">archivador Tar</comment>
<comment xml:lang="eu">Tar artxiboa</comment>
<comment xml:lang="fi">Tar-arkisto</comment>
<comment xml:lang="fo">Tar skjalasavn</comment>
<comment xml:lang="fr">archive tar</comment>
+ <comment xml:lang="fur">archivi Tar</comment>
<comment xml:lang="ga">cartlann Tar</comment>
<comment xml:lang="gl">arquivo Tar</comment>
<comment xml:lang="he">ארכיון Tar</comment>
@@ -20803,10 +21511,10 @@
<comment xml:lang="oc">archiu tar</comment>
<comment xml:lang="pl">Archiwum tar</comment>
<comment xml:lang="pt">arquivo Tar</comment>
- <comment xml:lang="pt_BR">Pacote Tar</comment>
+ <comment xml:lang="pt-BR">Pacote Tar</comment>
<comment xml:lang="ro">Arhivă Tar</comment>
<comment xml:lang="ru">Архив TAR</comment>
- <comment xml:lang="sk">Archív tar</comment>
+ <comment xml:lang="sk">Archív Tar</comment>
<comment xml:lang="sl">Datoteka arhiva Tar</comment>
<comment xml:lang="sq">Arkiv tar</comment>
<comment xml:lang="sr">Тар архива</comment>
@@ -20814,13 +21522,13 @@
<comment xml:lang="tr">Tar arşivi</comment>
<comment xml:lang="uk">архів tar</comment>
<comment xml:lang="vi">Kho nén tar</comment>
- <comment xml:lang="zh_CN">Tar 归档文件</comment>
- <comment xml:lang="zh_TW">Tar 封存檔</comment>
+ <comment xml:lang="zh-CN">Tar 归档文件</comment>
+ <comment xml:lang="zh-TW">Tar 封存檔</comment>
<generic-icon name="package-x-generic"/>
<alias type="application/x-gtar"/>
<magic priority="60">
- <match value="ustar\0" type="string" offset="257"/>
- <match value="ustar\040\040\0" type="string" offset="257"/>
+ <match type="string" value="ustar\0" offset="257"/>
+ <match type="string" value="ustar\040\040\0" offset="257"/>
</magic>
<glob pattern="*.tar"/>
<glob pattern="*.gtar"/>
@@ -20828,20 +21536,22 @@
</mime-type>
<mime-type type="application/x-tarz">
<comment>Tar archive (compressed)</comment>
+ <comment xml:lang="af">Tar-argief (saamgepers)</comment>
<comment xml:lang="ar">أرشيف Tar (مضغوط)</comment>
- <comment xml:lang="be@latin">Archiŭ tar (skampresavany)</comment>
+ <comment xml:lang="be-Latn">Archiŭ tar (skampresavany)</comment>
<comment xml:lang="bg">Архив — tar, компресиран</comment>
<comment xml:lang="ca">arxiu tar (amb compressió)</comment>
<comment xml:lang="cs">archiv Tar (komprimovaný)</comment>
<comment xml:lang="da">Tar-arkiv (komprimeret)</comment>
<comment xml:lang="de">Tar-Archiv (komprimiert)</comment>
<comment xml:lang="el">Αρχείο Tar (συμπιεσμένο)</comment>
- <comment xml:lang="en_GB">Tar archive (compressed)</comment>
+ <comment xml:lang="en-GB">Tar archive (compressed)</comment>
<comment xml:lang="es">archivador Tar (comprimido)</comment>
<comment xml:lang="eu">Tar artxiboa (konprimitua)</comment>
<comment xml:lang="fi">Tar-arkisto (pakattu)</comment>
<comment xml:lang="fo">Tar skjalasavn (stappað)</comment>
<comment xml:lang="fr">archive tar (compressée)</comment>
+ <comment xml:lang="fur">archivi Tar (comprimût)</comment>
<comment xml:lang="ga">cartlann Tar (comhbhrúite)</comment>
<comment xml:lang="gl">arquivo Tar (comprimido)</comment>
<comment xml:lang="he">ארכיון Tar (מכווץ)</comment>
@@ -20861,10 +21571,10 @@
<comment xml:lang="oc">archiu tar (compressat)</comment>
<comment xml:lang="pl">Archiwum tar (skompresowane)</comment>
<comment xml:lang="pt">arquivo Tar (comprimido)</comment>
- <comment xml:lang="pt_BR">Pacote Tar (compactado)</comment>
+ <comment xml:lang="pt-BR">Pacote Tar (compactado)</comment>
<comment xml:lang="ro">Arhivă Tar (comprimată)</comment>
<comment xml:lang="ru">Архив TAR (сжатый)</comment>
- <comment xml:lang="sk">Archív tar (komprimovaný)</comment>
+ <comment xml:lang="sk">Archív Tar (komprimovaný)</comment>
<comment xml:lang="sl">Datoteka arhiva Tar (stisnjen)</comment>
<comment xml:lang="sq">Arkiv tar (i kompresuar)</comment>
<comment xml:lang="sr">Тар архива (запакована)</comment>
@@ -20872,8 +21582,8 @@
<comment xml:lang="tr">Tar arşivi (sıkıştırılmış)</comment>
<comment xml:lang="uk">архів tar (стиснений)</comment>
<comment xml:lang="vi">Kho nén tar (đã nén)</comment>
- <comment xml:lang="zh_CN">Tar 归档文件（压缩）</comment>
- <comment xml:lang="zh_TW">Tar 封存檔 (UNIX 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">Tar 归档文件（压缩）</comment>
+ <comment xml:lang="zh-TW">Tar 封存檔 (壓縮)</comment>
<sub-class-of type="application/x-compress"/>
<generic-icon name="package-x-generic"/>
<glob pattern="*.tar.Z"/>
@@ -20881,25 +21591,27 @@
</mime-type>
<mime-type type="application/x-tex-gf">
<comment>generic font file</comment>
+ <comment xml:lang="af">generiese skriftipelêer</comment>
<comment xml:lang="ar">ملف الخط العام</comment>
- <comment xml:lang="be@latin">zvyčajny fajł šryftu</comment>
+ <comment xml:lang="be-Latn">zvyčajny fajł šryftu</comment>
<comment xml:lang="bg">Шрифт</comment>
<comment xml:lang="ca">fitxer de lletra genèrica</comment>
<comment xml:lang="cs">obecný soubor s fontem</comment>
<comment xml:lang="da">general skrifttypefil</comment>
<comment xml:lang="de">Allgemeine Schriftdatei</comment>
<comment xml:lang="el">Γενικό αρχείο γραμματοσειράς</comment>
- <comment xml:lang="en_GB">generic font file</comment>
+ <comment xml:lang="en-GB">generic font file</comment>
<comment xml:lang="eo">genera tipara dosiero</comment>
<comment xml:lang="es">tipo de letra genérico</comment>
<comment xml:lang="eu">letra-tipo orokorra</comment>
<comment xml:lang="fi">yleinen fonttitiedosto</comment>
<comment xml:lang="fo">felagsstavasniðsfíla</comment>
<comment xml:lang="fr">fichier de polices générique</comment>
+ <comment xml:lang="fur">file di caratar gjeneric</comment>
<comment xml:lang="ga">comhad cló ginearálta</comment>
<comment xml:lang="gl">ficheiro de tipo de fonte xenérica</comment>
<comment xml:lang="he">קובץ גופן גנרי</comment>
- <comment xml:lang="hr">Izvorna datoteka slova</comment>
+ <comment xml:lang="hr">generička datoteka fonta</comment>
<comment xml:lang="hu">általános betűkészletfájl</comment>
<comment xml:lang="ia">File de typo de litteras generic</comment>
<comment xml:lang="id">berkas fonta generik</comment>
@@ -20916,7 +21628,7 @@
<comment xml:lang="oc">fichièr de poliças generic</comment>
<comment xml:lang="pl">Zwykły plik czcionki</comment>
<comment xml:lang="pt">ficheiro genérico de letra</comment>
- <comment xml:lang="pt_BR">Arquivo de fonte genérico</comment>
+ <comment xml:lang="pt-BR">Arquivo de fonte genérico</comment>
<comment xml:lang="ro">fișier de font generic</comment>
<comment xml:lang="ru">Обычный файл шрифта</comment>
<comment xml:lang="sk">Obyčajný súbor písma</comment>
@@ -20927,32 +21639,34 @@
<comment xml:lang="tr">genel yazı tipi dosyası</comment>
<comment xml:lang="uk">загальний файл шрифту</comment>
<comment xml:lang="vi">tập tin phông giống loài</comment>
- <comment xml:lang="zh_CN">通用字体文件</comment>
- <comment xml:lang="zh_TW">通用字型檔</comment>
+ <comment xml:lang="zh-CN">通用字体文件</comment>
+ <comment xml:lang="zh-TW">通用字型檔</comment>
<generic-icon name="font-x-generic"/>
<glob pattern="*.gf"/>
</mime-type>
<mime-type type="application/x-tex-pk">
<comment>packed font file</comment>
+ <comment xml:lang="af">verpakte skriftipelêer</comment>
<comment xml:lang="ar">ملف الخط المرزم</comment>
- <comment xml:lang="be@latin">zapakavany fajł šryftu</comment>
+ <comment xml:lang="be-Latn">zapakavany fajł šryftu</comment>
<comment xml:lang="bg">Шрифт — компресиран</comment>
<comment xml:lang="ca">fitxer de lletra empaquetada</comment>
<comment xml:lang="cs">komprimovaný soubor s fontem</comment>
<comment xml:lang="da">pakket skrifttypefil</comment>
<comment xml:lang="de">Gepackte Schriftdatei</comment>
<comment xml:lang="el">Αρχείο συμπιεσμένης γραμματοσειράς</comment>
- <comment xml:lang="en_GB">packed font file</comment>
+ <comment xml:lang="en-GB">packed font file</comment>
<comment xml:lang="eo">pakigita tipara dosiero</comment>
<comment xml:lang="es">tipo de letra empaquetado</comment>
<comment xml:lang="eu">Letra-tipo fitxategi paketatua</comment>
<comment xml:lang="fi">pakattu fonttitiedosto</comment>
<comment xml:lang="fo">pakkað stavasniðsfíla</comment>
<comment xml:lang="fr">fichier de polices empaquetées</comment>
+ <comment xml:lang="fur">file di caratar impachetât</comment>
<comment xml:lang="ga">comhad cló pacáilte</comment>
<comment xml:lang="gl">ficheiro de fonte empaquetada</comment>
<comment xml:lang="he">קובץ גופן ארוז</comment>
- <comment xml:lang="hr">Zapakirana datoteka slova</comment>
+ <comment xml:lang="hr">zapakirana datoteka fonta</comment>
<comment xml:lang="hu">packed font-fájl</comment>
<comment xml:lang="ia">File de typos de litteras impacchettate</comment>
<comment xml:lang="id">berkas fonta terkemas</comment>
@@ -20969,7 +21683,7 @@
<comment xml:lang="oc">fichièr de poliças empaquetadas</comment>
<comment xml:lang="pl">Plik ze spakowaną czcionką</comment>
<comment xml:lang="pt">ficheiro de letras empacotadas</comment>
- <comment xml:lang="pt_BR">Arquivo de fonte empacotado</comment>
+ <comment xml:lang="pt-BR">Arquivo de fonte empacotado</comment>
<comment xml:lang="ro">fișier font împachetat</comment>
<comment xml:lang="ru">Сжатый файл шрифта</comment>
<comment xml:lang="sk">Komprimovaný súbor písma</comment>
@@ -20980,29 +21694,31 @@
<comment xml:lang="tr">paketlenmiş yazı tipi dosyası</comment>
<comment xml:lang="uk">запакований файл шрифту</comment>
<comment xml:lang="vi">tập tin phông chữ đã đóng gói</comment>
- <comment xml:lang="zh_CN">打包的字体文件</comment>
- <comment xml:lang="zh_TW">包裝字型檔</comment>
+ <comment xml:lang="zh-CN">打包的字体文件</comment>
+ <comment xml:lang="zh-TW">包裝字型檔</comment>
<generic-icon name="font-x-generic"/>
<glob pattern="*.pk"/>
</mime-type>
<mime-type type="application/x-tgif">
<comment>TGIF document</comment>
+ <comment xml:lang="af">TGIF-dokument</comment>
<comment xml:lang="ar">مستند TGIF</comment>
<comment xml:lang="ast">Documentu de TGIF</comment>
- <comment xml:lang="be@latin">Dakument TGIF</comment>
+ <comment xml:lang="be-Latn">Dakument TGIF</comment>
<comment xml:lang="bg">Документ — TGIF</comment>
<comment xml:lang="ca">document TGIF</comment>
<comment xml:lang="cs">dokument TGIF</comment>
<comment xml:lang="da">TGIF-dokument</comment>
<comment xml:lang="de">TGIF-Dokument</comment>
<comment xml:lang="el">Έγγραφο TGIF</comment>
- <comment xml:lang="en_GB">TGIF document</comment>
+ <comment xml:lang="en-GB">TGIF document</comment>
<comment xml:lang="eo">TGIF-dokumento</comment>
<comment xml:lang="es">documento TGIF</comment>
<comment xml:lang="eu">TGIF dokumentua</comment>
<comment xml:lang="fi">TGIF-asiakirja</comment>
<comment xml:lang="fo">TGIF skjal</comment>
<comment xml:lang="fr">document TGIF</comment>
+ <comment xml:lang="fur">document TGIF</comment>
<comment xml:lang="ga">cáipéis TGIF</comment>
<comment xml:lang="gl">documento TGIF</comment>
<comment xml:lang="he">מסמך TGIF</comment>
@@ -21023,7 +21739,7 @@
<comment xml:lang="oc">document TGIF</comment>
<comment xml:lang="pl">Dokument TGIF</comment>
<comment xml:lang="pt">documento TGIF</comment>
- <comment xml:lang="pt_BR">Documento TGIF</comment>
+ <comment xml:lang="pt-BR">Documento TGIF</comment>
<comment xml:lang="ro">Document TGIF</comment>
<comment xml:lang="ru">Документ TGIF</comment>
<comment xml:lang="sk">Dokument TGIF</comment>
@@ -21034,19 +21750,20 @@
<comment xml:lang="tr">TGIF belgesi</comment>
<comment xml:lang="uk">документ TGIF</comment>
<comment xml:lang="vi">Tài liệu TGIF</comment>
- <comment xml:lang="zh_CN">TGIF 文档</comment>
- <comment xml:lang="zh_TW">TGIF 文件</comment>
+ <comment xml:lang="zh-CN">TGIF 文档</comment>
+ <comment xml:lang="zh-TW">TGIF 文件</comment>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="%TGIF" type="string" offset="0"/>
+ <match type="string" value="%TGIF" offset="0"/>
</magic>
<glob pattern="*.obj"/>
</mime-type>
<mime-type type="application/x-theme">
<comment>theme</comment>
+ <comment xml:lang="af">tema</comment>
<comment xml:lang="ar">سمة</comment>
<comment xml:lang="az">örtük</comment>
- <comment xml:lang="be@latin">matyŭ</comment>
+ <comment xml:lang="be-Latn">matyŭ</comment>
<comment xml:lang="bg">Тема</comment>
<comment xml:lang="ca">tema</comment>
<comment xml:lang="cs">motiv</comment>
@@ -21054,13 +21771,14 @@
<comment xml:lang="da">tema</comment>
<comment xml:lang="de">Thema</comment>
<comment xml:lang="el">Θέμα</comment>
- <comment xml:lang="en_GB">theme</comment>
+ <comment xml:lang="en-GB">theme</comment>
<comment xml:lang="eo">etoso</comment>
<comment xml:lang="es">tema</comment>
<comment xml:lang="eu">gaia</comment>
<comment xml:lang="fi">teema</comment>
<comment xml:lang="fo">tema</comment>
<comment xml:lang="fr">thème</comment>
+ <comment xml:lang="fur">teme</comment>
<comment xml:lang="ga">téama</comment>
<comment xml:lang="gl">tema</comment>
<comment xml:lang="he">ערכת נושא</comment>
@@ -21082,7 +21800,7 @@
<comment xml:lang="oc">tèma</comment>
<comment xml:lang="pl">Motyw</comment>
<comment xml:lang="pt">tema</comment>
- <comment xml:lang="pt_BR">Tema</comment>
+ <comment xml:lang="pt-BR">Tema</comment>
<comment xml:lang="ro">temă</comment>
<comment xml:lang="ru">Тема</comment>
<comment xml:lang="sk">Motív</comment>
@@ -21093,18 +21811,19 @@
<comment xml:lang="tr">tema</comment>
<comment xml:lang="uk">тема</comment>
<comment xml:lang="vi">sắc thái</comment>
- <comment xml:lang="zh_CN">主题</comment>
- <comment xml:lang="zh_TW">佈景主題</comment>
+ <comment xml:lang="zh-CN">主题</comment>
+ <comment xml:lang="zh-TW">佈景主題</comment>
<sub-class-of type="application/x-desktop"/>
<generic-icon name="package-x-generic"/>
<glob pattern="*.theme"/>
</mime-type>
<mime-type type="application/x-toutdoux">
<comment>ToutDoux document</comment>
+ <comment xml:lang="af">ToutDoux-dokument</comment>
<comment xml:lang="ar">مستند ToutDoux</comment>
<comment xml:lang="ast">Documentu de ToutDoux</comment>
<comment xml:lang="az">ToutDoux sənədi</comment>
- <comment xml:lang="be@latin">Dakument ToutDoux</comment>
+ <comment xml:lang="be-Latn">Dakument ToutDoux</comment>
<comment xml:lang="bg">Документ — ToutDoux</comment>
<comment xml:lang="ca">document ToutDoux</comment>
<comment xml:lang="cs">dokument ToutDoux</comment>
@@ -21112,13 +21831,14 @@
<comment xml:lang="da">ToutDoux-dokument</comment>
<comment xml:lang="de">ToutDoux-Dokument</comment>
<comment xml:lang="el">Έγγραφο ToutDoux</comment>
- <comment xml:lang="en_GB">ToutDoux document</comment>
+ <comment xml:lang="en-GB">ToutDoux document</comment>
<comment xml:lang="eo">ToutDoux-dokumento</comment>
<comment xml:lang="es">documento de ToutDoux</comment>
<comment xml:lang="eu">ToutDoux dokumentua</comment>
<comment xml:lang="fi">ToutDoux-asiakirja</comment>
<comment xml:lang="fo">ToutDoux skjal</comment>
<comment xml:lang="fr">document ToutDoux</comment>
+ <comment xml:lang="fur">document ToutDoux</comment>
<comment xml:lang="ga">cáipéis ToutDoux</comment>
<comment xml:lang="gl">documento de ToutDoux</comment>
<comment xml:lang="he">מסמך של ToutDoux</comment>
@@ -21139,7 +21859,7 @@
<comment xml:lang="oc">document ToutDoux</comment>
<comment xml:lang="pl">Dokument ToutDoux</comment>
<comment xml:lang="pt">documento ToutDoux</comment>
- <comment xml:lang="pt_BR">Documento do ToutDoux</comment>
+ <comment xml:lang="pt-BR">Documento do ToutDoux</comment>
<comment xml:lang="ro">Document ToutDoux</comment>
<comment xml:lang="ru">Документ ToutDoux</comment>
<comment xml:lang="sk">Dokument ToutDoux</comment>
@@ -21150,27 +21870,29 @@
<comment xml:lang="tr">ToutDoux belgesi</comment>
<comment xml:lang="uk">документ ToutDoux</comment>
<comment xml:lang="vi">Tài liệu ToutDoux</comment>
- <comment xml:lang="zh_CN">ToutDoux 文档</comment>
- <comment xml:lang="zh_TW">ToutDoux 文件</comment>
+ <comment xml:lang="zh-CN">ToutDoux 文档</comment>
+ <comment xml:lang="zh-TW">ToutDoux 文件</comment>
<generic-icon name="x-office-document"/>
</mime-type>
<mime-type type="application/x-trash">
<comment>backup file</comment>
+ <comment xml:lang="af">rugsteunlêer</comment>
<comment xml:lang="ar">ملف النسخ الاحتياطي</comment>
- <comment xml:lang="be@latin">zapasny fajł</comment>
+ <comment xml:lang="be-Latn">zapasny fajł</comment>
<comment xml:lang="bg">Резервно копие</comment>
<comment xml:lang="ca">fitxer de còpia de seguretat</comment>
<comment xml:lang="cs">záložní soubor</comment>
<comment xml:lang="da">sikkerhedskopi</comment>
<comment xml:lang="de">Sicherungsdatei</comment>
<comment xml:lang="el">Αντίγραφο ασφαλείας</comment>
- <comment xml:lang="en_GB">backup file</comment>
+ <comment xml:lang="en-GB">backup file</comment>
<comment xml:lang="eo">restaŭrkopio</comment>
<comment xml:lang="es">archivo de respaldo</comment>
<comment xml:lang="eu">babes-kopiako fitxategia</comment>
<comment xml:lang="fi">varmuuskopio</comment>
<comment xml:lang="fo">trygdarritsfíla</comment>
<comment xml:lang="fr">fichier de sauvegarde</comment>
+ <comment xml:lang="fur">file di backup</comment>
<comment xml:lang="ga">comhad cúltaca</comment>
<comment xml:lang="gl">ficheiro de copia de seguridade</comment>
<comment xml:lang="he">קובץ גיבוי</comment>
@@ -21191,7 +21913,7 @@
<comment xml:lang="oc">fichièr de salvament</comment>
<comment xml:lang="pl">Plik zapasowy</comment>
<comment xml:lang="pt">cópia de segurança</comment>
- <comment xml:lang="pt_BR">Arquivo de backup</comment>
+ <comment xml:lang="pt-BR">Arquivo de backup</comment>
<comment xml:lang="ro">fișier de backup</comment>
<comment xml:lang="ru">Резервная копия</comment>
<comment xml:lang="sk">Záložný súbor</comment>
@@ -21202,8 +21924,8 @@
<comment xml:lang="tr">yedek dosyası</comment>
<comment xml:lang="uk">резервна копія</comment>
<comment xml:lang="vi">tập tin sao lưu</comment>
- <comment xml:lang="zh_CN">备份文件</comment>
- <comment xml:lang="zh_TW">備份檔</comment>
+ <comment xml:lang="zh-CN">备份文件</comment>
+ <comment xml:lang="zh-TW">備份檔</comment>
<glob pattern="*~"/>
<glob pattern="*%"/>
<glob pattern="*.bak"/>
@@ -21212,10 +21934,11 @@
</mime-type>
<mime-type type="text/troff">
<comment>Troff document</comment>
+ <comment xml:lang="af">Troff-dokument</comment>
<comment xml:lang="ar">مستند Troff</comment>
<comment xml:lang="ast">Documentu de Troff</comment>
<comment xml:lang="az">Troff sənədi</comment>
- <comment xml:lang="be@latin">Dakument Troff</comment>
+ <comment xml:lang="be-Latn">Dakument Troff</comment>
<comment xml:lang="bg">Документ — Troff</comment>
<comment xml:lang="ca">document Troff</comment>
<comment xml:lang="cs">dokument Troff</comment>
@@ -21223,13 +21946,14 @@
<comment xml:lang="da">Troffdokument</comment>
<comment xml:lang="de">Troff-Dokument</comment>
<comment xml:lang="el">Έγγραφο troff</comment>
- <comment xml:lang="en_GB">Troff document</comment>
+ <comment xml:lang="en-GB">Troff document</comment>
<comment xml:lang="eo">Troff-dokumento</comment>
<comment xml:lang="es">documento de Troff</comment>
<comment xml:lang="eu">Troff dokumentua</comment>
<comment xml:lang="fi">Troff-asiakirja</comment>
<comment xml:lang="fo">Troff skjal</comment>
<comment xml:lang="fr">document Troff</comment>
+ <comment xml:lang="fur">document Troff</comment>
<comment xml:lang="ga">cáipéis Troff</comment>
<comment xml:lang="gl">documento Troff</comment>
<comment xml:lang="he">מסמך Troff</comment>
@@ -21250,7 +21974,7 @@
<comment xml:lang="oc">document Troff</comment>
<comment xml:lang="pl">Dokument Troff</comment>
<comment xml:lang="pt">documento Troff</comment>
- <comment xml:lang="pt_BR">Documento Troff</comment>
+ <comment xml:lang="pt-BR">Documento Troff</comment>
<comment xml:lang="ro">Document Troff</comment>
<comment xml:lang="ru">Документ Troff</comment>
<comment xml:lang="sk">Dokument troff</comment>
@@ -21261,16 +21985,16 @@
<comment xml:lang="tr">Troff belgesi</comment>
<comment xml:lang="uk">документ Troff</comment>
<comment xml:lang="vi">Tài liệu Troff</comment>
- <comment xml:lang="zh_CN">Troff 文档</comment>
- <comment xml:lang="zh_TW">Troff 文件</comment>
+ <comment xml:lang="zh-CN">Troff 文档</comment>
+ <comment xml:lang="zh-TW">Troff 文件</comment>
<sub-class-of type="text/plain"/>
<alias type="application/x-troff"/>
<alias type="text/x-troff"/>
<magic priority="50">
- <match value='.\\\"' type="string" offset="0"/>
- <match value="'\\\&quot;" type="string" offset="0"/>
- <match value="'.\\\&quot;" type="string" offset="0"/>
- <match value='\\\"' type="string" offset="0"/>
+ <match type="string" value=".\\\&quot;" offset="0"/>
+ <match type="string" value="'\\\&quot;" offset="0"/>
+ <match type="string" value="'.\\\&quot;" offset="0"/>
+ <match type="string" value="\\\&quot;" offset="0"/>
</magic>
<glob pattern="*.tr"/>
<glob pattern="*.roff"/>
@@ -21278,15 +22002,19 @@
</mime-type>
<mime-type type="application/x-troff-man">
<comment>Manpage manual document</comment>
+ <comment xml:lang="af">Manpage-handleiding</comment>
+ <comment xml:lang="bg">Страница от ръководството</comment>
<comment xml:lang="ca">document de pàgina man</comment>
<comment xml:lang="cs">manuálová stránka</comment>
<comment xml:lang="da">Manpage-manualdokument</comment>
<comment xml:lang="de">Manpage-Handbuchdokument</comment>
<comment xml:lang="el">Έγγραφο βοήθειας manpage</comment>
- <comment xml:lang="en_GB">Manpage manual document</comment>
+ <comment xml:lang="en-GB">Manpage manual document</comment>
<comment xml:lang="es">documento de manual de Manpage</comment>
<comment xml:lang="eu">Manpage eskuliburu dokumentua</comment>
+ <comment xml:lang="fi">Manpage manuaali dokumentit</comment>
<comment xml:lang="fr">document manuel Manpage</comment>
+ <comment xml:lang="fur">document manuâl Manpage</comment>
<comment xml:lang="ga">cáipéis lámhleabhair Man</comment>
<comment xml:lang="he">מסמך תיעוד man</comment>
<comment xml:lang="hr">Manpage dokument priručnika</comment>
@@ -21295,42 +22023,44 @@
<comment xml:lang="id">Dokumen manual manpage</comment>
<comment xml:lang="it">Documento di manuale manpage</comment>
<comment xml:lang="kk">Manpage нұсқаулық құжаты</comment>
- <comment xml:lang="ko">맨 페이지 설명서 문서</comment>
+ <comment xml:lang="ko">man 페이지 설명서 문서</comment>
<comment xml:lang="oc">document de manual Manpage</comment>
<comment xml:lang="pl">Dokument podręcznika stron pomocy</comment>
<comment xml:lang="pt">documento de ajuda Manpage</comment>
- <comment xml:lang="pt_BR">Documento Manpage</comment>
+ <comment xml:lang="pt-BR">Documento Manpage</comment>
<comment xml:lang="ru">Документ справочной системы Manpage</comment>
<comment xml:lang="sk">Dokument manuálu Manpage</comment>
<comment xml:lang="sr">документ упутства странице упутства</comment>
<comment xml:lang="sv">Manpage-manualdokument</comment>
<comment xml:lang="tr">Man sayfası el kitabı belgesi</comment>
<comment xml:lang="uk">документ підручника man</comment>
- <comment xml:lang="zh_CN">Manpage 手册文档</comment>
- <comment xml:lang="zh_TW">Manpage 手冊說明文件</comment>
+ <comment xml:lang="zh-CN">Manpage 手册文档</comment>
+ <comment xml:lang="zh-TW">Manpage 手冊說明文件</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<glob pattern="*.man"/>
</mime-type>
<mime-type type="application/x-troff-man-compressed">
<comment>manual page (compressed)</comment>
+ <comment xml:lang="af">handleiding (saamgepers)</comment>
<comment xml:lang="ar">صفحة المساعدة (مضغوطة)</comment>
<comment xml:lang="az">man səhifəsi (sıxışdırılmış)</comment>
- <comment xml:lang="be@latin">staronka dapamohi (skampresavanaja)</comment>
- <comment xml:lang="bg">Страница от справочника, компресирана</comment>
+ <comment xml:lang="be-Latn">staronka dapamohi (skampresavanaja)</comment>
+ <comment xml:lang="bg">Страница от ръководството — компресирана</comment>
<comment xml:lang="ca">pàgina de manual (amb compressió)</comment>
<comment xml:lang="cs">manuálová stránka (komprimovaná)</comment>
<comment xml:lang="cy">tudalen llawlyfr (wedi ei gywasgu)</comment>
<comment xml:lang="da">manualside (komprimeret)</comment>
<comment xml:lang="de">Handbuchseite (komprimiert)</comment>
<comment xml:lang="el">Σελίδα οδηγιών (συμπιεσμένη)</comment>
- <comment xml:lang="en_GB">manual page (compressed)</comment>
+ <comment xml:lang="en-GB">manual page (compressed)</comment>
<comment xml:lang="eo">manpaĝo (kunpremita)</comment>
<comment xml:lang="es">página de manual (comprimida)</comment>
<comment xml:lang="eu">eskuliburu orria (konprimitua)</comment>
<comment xml:lang="fi">manuaalisivu (pakattu)</comment>
<comment xml:lang="fo">handbókasíða (stappað)</comment>
<comment xml:lang="fr">page de manuel (compressée)</comment>
+ <comment xml:lang="fur">pagjine di manuâl (comprimude)</comment>
<comment xml:lang="ga">leathanach lámhleabhair (comhbhrúite)</comment>
<comment xml:lang="gl">páxina de manual (comprimida)</comment>
<comment xml:lang="he">דף עזר (מכווץ)</comment>
@@ -21351,7 +22081,7 @@
<comment xml:lang="oc">pagina de manual (compressat)</comment>
<comment xml:lang="pl">Strona podręcznika (skompresowana)</comment>
<comment xml:lang="pt">página de manual (comprimida)</comment>
- <comment xml:lang="pt_BR">Página de manual (compactada)</comment>
+ <comment xml:lang="pt-BR">Página de manual (compactada)</comment>
<comment xml:lang="ro">pagină de manual (comprimată)</comment>
<comment xml:lang="ru">Страница руководства (сжатая)</comment>
<comment xml:lang="sk">Manuálová stránka (komprimovaná)</comment>
@@ -21362,31 +22092,33 @@
<comment xml:lang="tr">kılavuz dosyası (sıkıştırılmış)</comment>
<comment xml:lang="uk">сторінка посібника (стиснена)</comment>
<comment xml:lang="vi">trang hướng dẫn (đã nén)</comment>
- <comment xml:lang="zh_CN">手册页（压缩）</comment>
- <comment xml:lang="zh_TW">手冊頁面 (壓縮版)</comment>
+ <comment xml:lang="zh-CN">手册页（压缩）</comment>
+ <comment xml:lang="zh-TW">手冊頁面 (壓縮版)</comment>
<generic-icon name="text-x-generic"/>
</mime-type>
<mime-type type="application/x-tzo">
<comment>Tar archive (LZO-compressed)</comment>
+ <comment xml:lang="af">Tar-argief (LZO-saamgepers)</comment>
<comment xml:lang="ar">أرشيف Tar (مضغوط-LZO)</comment>
- <comment xml:lang="be@latin">Archiŭ tar (LZO-skampresavany)</comment>
+ <comment xml:lang="be-Latn">Archiŭ tar (LZO-skampresavany)</comment>
<comment xml:lang="bg">Архив — tar, компресиран с LZO</comment>
<comment xml:lang="ca">arxiu tar (amb compressió LZO)</comment>
<comment xml:lang="cs">archiv Tar (komprimovaný pomocí LZO)</comment>
<comment xml:lang="da">Tar-arkiv (LZO-komprimeret)</comment>
<comment xml:lang="de">Tar-Archiv (LZO-komprimiert)</comment>
<comment xml:lang="el">Αρχείο Tar (συμπιεσμένο με LZO)</comment>
- <comment xml:lang="en_GB">Tar archive (LZO-compressed)</comment>
+ <comment xml:lang="en-GB">Tar archive (LZO-compressed)</comment>
<comment xml:lang="es">archivador Tar (comprimido con LZO)</comment>
<comment xml:lang="eu">Tar artxiboa (LZO-rekin konprimitua)</comment>
<comment xml:lang="fi">Tar-arkisto (LZO-pakattu)</comment>
<comment xml:lang="fo">Tar skjalasavn (LZO-stappað)</comment>
<comment xml:lang="fr">archive tar (compression LZO)</comment>
+ <comment xml:lang="fur">archivi Tar (comprimût cun LZO)</comment>
<comment xml:lang="ga">cartlann Tar (comhbhrúite le LZO)</comment>
<comment xml:lang="gl">arquivo Tar (comprimido con LZO)</comment>
<comment xml:lang="he">ארכיון Tar (מכווץ ע״י LZO)</comment>
<comment xml:lang="hr">Tar arhiva (LZO sažeta)</comment>
- <comment xml:lang="hu">Tar archívum (LZO-val tömörítve)</comment>
+ <comment xml:lang="hu">Tar archívum (LZO tömörítésű)</comment>
<comment xml:lang="ia">Archivo Tar (comprimite con LZO)</comment>
<comment xml:lang="id">Arsip Tar (terkompresi LZO)</comment>
<comment xml:lang="it">Archivio tar (compresso con LZO)</comment>
@@ -21401,10 +22133,10 @@
<comment xml:lang="oc">archiu tar (compression LZO)</comment>
<comment xml:lang="pl">Archiwum tar (kompresja LZO)</comment>
<comment xml:lang="pt">arquivo Tar (compressão LZO)</comment>
- <comment xml:lang="pt_BR">Pacote Tar (compactado com LZO)</comment>
+ <comment xml:lang="pt-BR">Pacote Tar (compactado com LZO)</comment>
<comment xml:lang="ro">Arhivă Tar (comprimată LZO)</comment>
<comment xml:lang="ru">Архив TAR (сжатый lzo)</comment>
- <comment xml:lang="sk">Archív tar (komprimovaný pomocou LZO)</comment>
+ <comment xml:lang="sk">Archív Tar (komprimovaný pomocou LZO)</comment>
<comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z LZO)</comment>
<comment xml:lang="sq">Arkiv tar (i kompresuar me LZO)</comment>
<comment xml:lang="sr">Тар архива (запакована ЛЗО-ом)</comment>
@@ -21412,8 +22144,8 @@
<comment xml:lang="tr">Tar arşivi (LZO ile sıkıştırılmış)</comment>
<comment xml:lang="uk">архів tar (стиснений LZO)</comment>
<comment xml:lang="vi">Kho nén tar (đã nén LZO)</comment>
- <comment xml:lang="zh_CN">Tar 归档文件（LZO 压缩）</comment>
- <comment xml:lang="zh_TW">Tar 封存檔 (LZO 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">Tar 归档文件（LZO 压缩）</comment>
+ <comment xml:lang="zh-TW">Tar 封存檔 (LZO 壓縮)</comment>
<sub-class-of type="application/x-lzop"/>
<generic-icon name="package-x-generic"/>
<glob pattern="*.tar.lzo"/>
@@ -21421,6 +22153,7 @@
</mime-type>
<mime-type type="application/x-xz">
<comment>XZ archive</comment>
+ <comment xml:lang="af">XZ-argief</comment>
<comment xml:lang="ar">أرشيف XZ</comment>
<comment xml:lang="bg">Архив — XZ</comment>
<comment xml:lang="ca">arxiu XZ</comment>
@@ -21428,13 +22161,14 @@
<comment xml:lang="da">XZ-arkiv</comment>
<comment xml:lang="de">XZ-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο XZ</comment>
- <comment xml:lang="en_GB">XZ archive</comment>
+ <comment xml:lang="en-GB">XZ archive</comment>
<comment xml:lang="eo">XZ-arkivo</comment>
<comment xml:lang="es">archivador XZ</comment>
<comment xml:lang="eu">XZ artxiboa</comment>
<comment xml:lang="fi">XZ-arkisto</comment>
<comment xml:lang="fo">XZ skjalasavn</comment>
<comment xml:lang="fr">archive XZ</comment>
+ <comment xml:lang="fur">archivi XZ</comment>
<comment xml:lang="ga">cartlann XZ</comment>
<comment xml:lang="gl">ficheiro XZ</comment>
<comment xml:lang="he">ארכיון XZ</comment>
@@ -21452,7 +22186,7 @@
<comment xml:lang="oc">archiu XZ</comment>
<comment xml:lang="pl">Archiwum XZ</comment>
<comment xml:lang="pt">arquivo XZ</comment>
- <comment xml:lang="pt_BR">Pacote XZ</comment>
+ <comment xml:lang="pt-BR">Pacote XZ</comment>
<comment xml:lang="ro">Arhivă XZ</comment>
<comment xml:lang="ru">Архив XZ</comment>
<comment xml:lang="sk">Archív XZ</comment>
@@ -21461,16 +22195,17 @@
<comment xml:lang="sv">XZ-arkiv</comment>
<comment xml:lang="tr">XZ arşivi</comment>
<comment xml:lang="uk">архів XZ</comment>
- <comment xml:lang="zh_CN">XZ 归档文件</comment>
- <comment xml:lang="zh_TW">XZ 封存檔</comment>
+ <comment xml:lang="zh-CN">XZ 归档文件</comment>
+ <comment xml:lang="zh-TW">XZ 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="\xfd\x37\x7a\x58\x5a\x00" type="string" offset="0"/>
+ <match type="string" value="\xfd\x37\x7a\x58\x5a\x00" offset="0"/>
</magic>
<glob pattern="*.xz"/>
</mime-type>
<mime-type type="application/x-xz-compressed-tar">
<comment>Tar archive (XZ-compressed)</comment>
+ <comment xml:lang="af">Tar-argief (XZ-saamgepers)</comment>
<comment xml:lang="ar">أرشيف Tar (مضغوط-XZ)</comment>
<comment xml:lang="bg">Архив — tar, компресиран с XZ</comment>
<comment xml:lang="ca">arxiu tar (amb compressió XZ)</comment>
@@ -21478,17 +22213,18 @@
<comment xml:lang="da">Tar-arkiv (XZ-komprimeret)</comment>
<comment xml:lang="de">Tar-Archiv (XZ-komprimiert)</comment>
<comment xml:lang="el">Αρχείο Tar (συμπιεσμένο με XZ)</comment>
- <comment xml:lang="en_GB">Tar archive (XZ-compressed)</comment>
+ <comment xml:lang="en-GB">Tar archive (XZ-compressed)</comment>
<comment xml:lang="es">archivador Tar (comprimido con XZ)</comment>
<comment xml:lang="eu">Tar artxiboa (XZ-rekin konprimitua)</comment>
<comment xml:lang="fi">Tar-arkisto (XZ-pakattu)</comment>
<comment xml:lang="fo">Tar skjalasavn(XZ-stappað)</comment>
<comment xml:lang="fr">archive tar (compression XZ)</comment>
+ <comment xml:lang="fur">archivi Tar (comprimût cun XZ)</comment>
<comment xml:lang="ga">cartlann Tar (comhbhrúite le XZ)</comment>
<comment xml:lang="gl">arquivo Tar (comprimido con XZ)</comment>
<comment xml:lang="he">ארכיון Tar (מכווץ ע״י XZ)</comment>
<comment xml:lang="hr">Tar arhiva ( XZ sažeta)</comment>
- <comment xml:lang="hu">Tar archívum (XZ-vel tömörítve)</comment>
+ <comment xml:lang="hu">Tar archívum (XZ tömörítésű)</comment>
<comment xml:lang="ia">Archivo Tar (comprimite con XZ)</comment>
<comment xml:lang="id">Arsip Tar (terkompresi XZ)</comment>
<comment xml:lang="it">Archivio tar (compresso con XZ)</comment>
@@ -21501,24 +22237,91 @@
<comment xml:lang="oc">archiu tar (compression XZ)</comment>
<comment xml:lang="pl">Archiwum tar (kompresja XZ)</comment>
<comment xml:lang="pt">arquivo Tar (compressão XZ)</comment>
- <comment xml:lang="pt_BR">Pacote Tar (compactado com XZ)</comment>
+ <comment xml:lang="pt-BR">Pacote Tar (compactado com XZ)</comment>
<comment xml:lang="ro">Arhivă Tar (comprimată XZ)</comment>
<comment xml:lang="ru">Архив TAR (сжатый xz)</comment>
- <comment xml:lang="sk">Archív tar (komprimovaný pomocou XZ)</comment>
+ <comment xml:lang="sk">Archív Tar (komprimovaný pomocou XZ)</comment>
<comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z XZ)</comment>
<comment xml:lang="sr">Тар архива (запакована ИксЗ-ом)</comment>
<comment xml:lang="sv">Tar-arkiv (XZ-komprimerat)</comment>
<comment xml:lang="tr">Tar arşivi (XZ ile sıkıştırılmış)</comment>
<comment xml:lang="uk">архів tar (стиснений XZ)</comment>
- <comment xml:lang="zh_CN">Tar 归档文件（XZ 压缩）</comment>
- <comment xml:lang="zh_TW">Tar 封存檔 (XZ 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">Tar 归档文件（XZ 压缩）</comment>
+ <comment xml:lang="zh-TW">Tar 封存檔 (XZ 壓縮)</comment>
<sub-class-of type="application/x-xz"/>
<generic-icon name="package-x-generic"/>
<glob pattern="*.tar.xz"/>
<glob pattern="*.txz"/>
</mime-type>
+ <mime-type type="application/zstd">
+ <comment>Zstandard archive</comment>
+ <comment xml:lang="bg">Архив — Zstandard</comment>
+ <comment xml:lang="ca">arxiu Zstandard</comment>
+ <comment xml:lang="cs">archiv Zstandard</comment>
+ <comment xml:lang="da">Zstandard-arkiv</comment>
+ <comment xml:lang="de">Zstandard-Archiv</comment>
+ <comment xml:lang="en-GB">Zstandard archive</comment>
+ <comment xml:lang="es">archivador Zstandard</comment>
+ <comment xml:lang="eu">Zstandard archive</comment>
+ <comment xml:lang="fi">Zstandard-arkisto</comment>
+ <comment xml:lang="fr">archive Zstandard</comment>
+ <comment xml:lang="fur">archivi Zstandard</comment>
+ <comment xml:lang="hr">Zstandard arhiva</comment>
+ <comment xml:lang="hu">Zstandard archívum</comment>
+ <comment xml:lang="id">Arsip Zstandard</comment>
+ <comment xml:lang="it">Archivio Zstandard</comment>
+ <comment xml:lang="kk">Zstandard архиві</comment>
+ <comment xml:lang="ko">Zstandard 압축 파일</comment>
+ <comment xml:lang="pl">Archiwum Zstandard</comment>
+ <comment xml:lang="pt-BR">Pacote Zstandard</comment>
+ <comment xml:lang="ru">Архив Zstandard</comment>
+ <comment xml:lang="sk">Archív Zstandard</comment>
+ <comment xml:lang="sv">Zstandard-arkiv</comment>
+ <comment xml:lang="tr">Zstandard arşivi</comment>
+ <comment xml:lang="uk">архів Zstandard</comment>
+ <comment xml:lang="zh-CN">Zstandard 归档文件</comment>
+ <comment xml:lang="zh-TW">Zstandard 封存檔</comment>
+ <generic-icon name="package-x-generic"/>
+ <magic priority="60">
+ <match type="little32" value="0xFD2FB528" offset="0"/>
+ </magic>
+ <glob pattern="*.zst"/>
+ </mime-type>
+ <mime-type type="application/x-zstd-compressed-tar">
+ <comment>Tar archive (Zstandard-compressed)</comment>
+ <comment xml:lang="bg">Архив — tar, компресиран със Zstandard</comment>
+ <comment xml:lang="ca">arxiu tar (amb compressió Zstandard)</comment>
+ <comment xml:lang="cs">archiv Tar (komprimovaný pomocí Zstandard)</comment>
+ <comment xml:lang="da">Tar-arkiv (Zstandard-komprimeret)</comment>
+ <comment xml:lang="de">Tar-Archiv (Zstandard-komprimiert)</comment>
+ <comment xml:lang="en-GB">Tar archive (Zstandard-compressed)</comment>
+ <comment xml:lang="es">archivador Tar (comprimido con Zstandard)</comment>
+ <comment xml:lang="eu">Tar artxiboa (Zstandard-rekin konprimitua)</comment>
+ <comment xml:lang="fi">Tar-arkisto (Zstandard-pakattu)</comment>
+ <comment xml:lang="fr">archive tar (compression Zstandard)</comment>
+ <comment xml:lang="fur">archivi Tar (comprimût cun Zstandard)</comment>
+ <comment xml:lang="hr">Tar arhiva (Zstandard-sažeta)</comment>
+ <comment xml:lang="hu">Tar archívum (Zstandard tömörítésű)</comment>
+ <comment xml:lang="id">Arsip Tar (terkompresi Zstandard)</comment>
+ <comment xml:lang="it">Archivio tar (compresso con Zstandard)</comment>
+ <comment xml:lang="kk">Tar архиві (Zstandard-пен сығылған)</comment>
+ <comment xml:lang="ko">TAR 묶음 파일(Zstandard 압축)</comment>
+ <comment xml:lang="pl">Archiwum tar (kompresja Zstandard)</comment>
+ <comment xml:lang="pt-BR">Pacote Tar (compactado com Zstandard)</comment>
+ <comment xml:lang="ru">Архив TAR (сжатый zstandard)</comment>
+ <comment xml:lang="sv">Tar-arkiv (Zstandard-komprimerat)</comment>
+ <comment xml:lang="tr">Tar arşivi (Zstandard ile sıkıştırılmış)</comment>
+ <comment xml:lang="uk">архів tar archive (стиснений Zstandard)</comment>
+ <comment xml:lang="zh-CN">Tar 归档文件（Zstandard 压缩）</comment>
+ <comment xml:lang="zh-TW">Tar 封存檔 (Zstandard 壓縮)</comment>
+ <generic-icon name="package-x-generic"/>
+ <sub-class-of type="application/zstd"/>
+ <glob pattern="*.tar.zst"/>
+ <glob pattern="*.tzst"/>
+ </mime-type>
<mime-type type="application/x-xzpdf">
<comment>PDF document (XZ-compressed)</comment>
+ <comment xml:lang="af">PDF-dokument (XZ-saamgepers)</comment>
<comment xml:lang="ast">Documentu PDF (comprimíu en XZ)</comment>
<comment xml:lang="bg">Документ — PDF, компресиран с XZ</comment>
<comment xml:lang="ca">document PDF (amb compressió XZ)</comment>
@@ -21526,16 +22329,17 @@
<comment xml:lang="da">PDF-dokument (XZ-komprimeret)</comment>
<comment xml:lang="de">PDF-Dokument (XZ-komprimiert)</comment>
<comment xml:lang="el">Έγγραφο PDF (συμπιεσμένο με XZ)</comment>
- <comment xml:lang="en_GB">PDF document (XZ-compressed)</comment>
+ <comment xml:lang="en-GB">PDF document (XZ-compressed)</comment>
<comment xml:lang="es">documento PDF (comprimido con XZ)</comment>
<comment xml:lang="eu">PDF dokumentua (XZ-rekin konprimitua)</comment>
<comment xml:lang="fi">PDF-asiakirja (XZ-pakattu)</comment>
<comment xml:lang="fr">document PDF (compressé XZ)</comment>
+ <comment xml:lang="fur">document PDF (comprimût cun XZ)</comment>
<comment xml:lang="ga">cáipéis PDF (comhbhrúite le XZ)</comment>
<comment xml:lang="gl">documento PDF (comprimido en XZ)</comment>
<comment xml:lang="he">מסמך PDF (מכווץ ע״י XZ)</comment>
<comment xml:lang="hr">PDF dokument ( XZ sažet)</comment>
- <comment xml:lang="hu">PDF dokumentum (XZ-vel tömörített)</comment>
+ <comment xml:lang="hu">PDF dokumentum (XZ tömörítésű)</comment>
<comment xml:lang="ia">Documento PDF (comprimite con XZ)</comment>
<comment xml:lang="id">Dokumen PDF (terkompresi XZ)</comment>
<comment xml:lang="it">Documento PDF (compresso con XZ)</comment>
@@ -21548,7 +22352,7 @@
<comment xml:lang="oc">document PDF (compressat XZ)</comment>
<comment xml:lang="pl">Dokument PDF (kompresja XZ)</comment>
<comment xml:lang="pt">documento PDF (compressão XZ)</comment>
- <comment xml:lang="pt_BR">Documento PDF (compactado com XZ)</comment>
+ <comment xml:lang="pt-BR">Documento PDF (compactado com XZ)</comment>
<comment xml:lang="ru">Документ PDF (сжатый xz)</comment>
<comment xml:lang="sk">Dokument PDF (komprimovaný pomocou XZ)</comment>
<comment xml:lang="sl">Dokument PDF (XZ-stisnjen)</comment>
@@ -21556,29 +22360,31 @@
<comment xml:lang="sv">PDF-dokument (XZ-komprimerat)</comment>
<comment xml:lang="tr">PDF belgesi (XZ ile sıkıştırılmış)</comment>
<comment xml:lang="uk">документ PDF (стиснений xz)</comment>
- <comment xml:lang="zh_CN">PDF 文档（XZ）</comment>
- <comment xml:lang="zh_TW">PDF 文件 (XZ 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">PDF 文档（XZ）</comment>
+ <comment xml:lang="zh-TW">PDF 文件 (XZ 壓縮)</comment>
<sub-class-of type="application/x-xz"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.pdf.xz"/>
</mime-type>
<mime-type type="application/x-ustar">
<comment>Ustar archive</comment>
+ <comment xml:lang="af">Ustar-argief</comment>
<comment xml:lang="ar">أرشيف Ustar</comment>
- <comment xml:lang="be@latin">Archiŭ ustar</comment>
+ <comment xml:lang="be-Latn">Archiŭ ustar</comment>
<comment xml:lang="bg">Архив — ustar</comment>
<comment xml:lang="ca">arxiu ustar</comment>
<comment xml:lang="cs">archiv Ustar</comment>
- <comment xml:lang="da">Ustararkiv</comment>
+ <comment xml:lang="da">Ustar-arkiv</comment>
<comment xml:lang="de">Ustar-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Ustar</comment>
- <comment xml:lang="en_GB">Ustar archive</comment>
+ <comment xml:lang="en-GB">Ustar archive</comment>
<comment xml:lang="eo">Ustar-arkivo</comment>
<comment xml:lang="es">archivador de Ustar</comment>
<comment xml:lang="eu">Ustar artxiboa</comment>
<comment xml:lang="fi">Ustar-arkisto</comment>
<comment xml:lang="fo">Ustar skjalasavn</comment>
<comment xml:lang="fr">archive Ustar</comment>
+ <comment xml:lang="fur">archivi Ustar</comment>
<comment xml:lang="ga">cartlann Ustar</comment>
<comment xml:lang="gl">arquivo Ustar</comment>
<comment xml:lang="he">ארכיון Ustar</comment>
@@ -21598,10 +22404,10 @@
<comment xml:lang="oc">archiu Ustar</comment>
<comment xml:lang="pl">Archiwum ustar</comment>
<comment xml:lang="pt">arquivo Ustar</comment>
- <comment xml:lang="pt_BR">Pacote Ustar</comment>
+ <comment xml:lang="pt-BR">Pacote Ustar</comment>
<comment xml:lang="ro">Arhivă Ustar</comment>
<comment xml:lang="ru">Архив Ustar</comment>
- <comment xml:lang="sk">Archív ustar</comment>
+ <comment xml:lang="sk">Archív Ustar</comment>
<comment xml:lang="sl">Datoteka arhiva Ustar</comment>
<comment xml:lang="sq">Arkiv Ustar</comment>
<comment xml:lang="sr">Устар архива</comment>
@@ -21609,16 +22415,17 @@
<comment xml:lang="tr">Ustar arşivi</comment>
<comment xml:lang="uk">архів ustar</comment>
<comment xml:lang="vi">Kho nén ustar</comment>
- <comment xml:lang="zh_CN">Ustar 归档文件</comment>
- <comment xml:lang="zh_TW">Ustar 封存檔</comment>
+ <comment xml:lang="zh-CN">Ustar 归档文件</comment>
+ <comment xml:lang="zh-TW">Ustar 封存檔</comment>
<generic-icon name="package-x-generic"/>
<glob pattern="*.ustar"/>
</mime-type>
<mime-type type="application/x-wais-source">
<comment>WAIS source code</comment>
+ <comment xml:lang="af">WAIS-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر WAIS</comment>
<comment xml:lang="az">WAIS mənbə faylı</comment>
- <comment xml:lang="be@latin">Kryničny kod WAIS</comment>
+ <comment xml:lang="be-Latn">Kryničny kod WAIS</comment>
<comment xml:lang="bg">Изходен код — WAIS</comment>
<comment xml:lang="ca">codi font en WAIS</comment>
<comment xml:lang="cs">zdrojový kód WAIS</comment>
@@ -21626,13 +22433,14 @@
<comment xml:lang="da">WAIS-kildekode</comment>
<comment xml:lang="de">WAIS-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας WAIS</comment>
- <comment xml:lang="en_GB">WAIS source code</comment>
+ <comment xml:lang="en-GB">WAIS source code</comment>
<comment xml:lang="eo">WAIS-fontkodo</comment>
<comment xml:lang="es">código fuente en WAIS</comment>
<comment xml:lang="eu">WAIS iturburu-kodea</comment>
<comment xml:lang="fi">WAIS-lähdekoodi</comment>
<comment xml:lang="fo">WAIS keldukota</comment>
<comment xml:lang="fr">code source WAIS</comment>
+ <comment xml:lang="fur">codiç sorzint WAIS</comment>
<comment xml:lang="ga">cód foinseach WAIS</comment>
<comment xml:lang="gl">código fonte WAIS</comment>
<comment xml:lang="he">קוד מקור של WAIS</comment>
@@ -21651,9 +22459,9 @@
<comment xml:lang="nl">WAIS-broncode</comment>
<comment xml:lang="nn">WAIS-kjeldekode</comment>
<comment xml:lang="oc">còde font WAIS</comment>
- <comment xml:lang="pl">Plik źródłowy WAIS</comment>
+ <comment xml:lang="pl">Kod źródłowy WAIS</comment>
<comment xml:lang="pt">código origem WAIS</comment>
- <comment xml:lang="pt_BR">Código-fonte WAIS</comment>
+ <comment xml:lang="pt-BR">Código-fonte WAIS</comment>
<comment xml:lang="ro">Cod sursă WAIS</comment>
<comment xml:lang="ru">Исходный код WAIS</comment>
<comment xml:lang="sk">Zdrojový kód WAIS</comment>
@@ -21664,29 +22472,31 @@
<comment xml:lang="tr">WAIS kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою WAIS</comment>
<comment xml:lang="vi">Mã nguồn WAIS</comment>
- <comment xml:lang="zh_CN">WAIS 源代码</comment>
- <comment xml:lang="zh_TW">WAIS 源碼</comment>
+ <comment xml:lang="zh-CN">WAIS 源代码</comment>
+ <comment xml:lang="zh-TW">WAIS 源碼</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<glob pattern="*.src"/>
</mime-type>
<mime-type type="application/x-wpg">
<comment>WordPerfect/Drawperfect image</comment>
+ <comment xml:lang="af">WordPerfect/Drawperfect-beeld</comment>
<comment xml:lang="ar">صورة WordPerfect/Drawperfect</comment>
- <comment xml:lang="be@latin">Vyjava WordPerfect/Drawperfect</comment>
+ <comment xml:lang="be-Latn">Vyjava WordPerfect/Drawperfect</comment>
<comment xml:lang="bg">Изображение — WordPerfect/Drawperfect</comment>
<comment xml:lang="ca">imatge de WordPerfect/Drawperfect</comment>
<comment xml:lang="cs">obrázek WordPerfect/Drawperfect</comment>
<comment xml:lang="da">WordPerfect/Drawperfect-billede</comment>
<comment xml:lang="de">WordPerfect/DrawPerfect-Bild</comment>
<comment xml:lang="el">Εικόνα WordPerfect/Drawperfect</comment>
- <comment xml:lang="en_GB">WordPerfect/Drawperfect image</comment>
+ <comment xml:lang="en-GB">WordPerfect/Drawperfect image</comment>
<comment xml:lang="eo">WordPerfect/Drawperfect-bildo</comment>
<comment xml:lang="es">imagen de WordPerfect/Drawperfect</comment>
<comment xml:lang="eu">WordPerfect/Drawperfect irudia</comment>
<comment xml:lang="fi">WordPerfect/Drawperfect-kuva</comment>
<comment xml:lang="fo">WordPerfect/Drawperfect mynd</comment>
<comment xml:lang="fr">image WordPerfect/DrawPerfect</comment>
+ <comment xml:lang="fur">imagjin WordPerfect/Drawperfect</comment>
<comment xml:lang="ga">íomhá WordPerfect/Drawperfect</comment>
<comment xml:lang="gl">imaxe de WordPerfect/DrawPerfect</comment>
<comment xml:lang="he">תמונה של WordPerfect/Drawperfect</comment>
@@ -21707,7 +22517,7 @@
<comment xml:lang="oc">imatge WordPerfect/DrawPerfect</comment>
<comment xml:lang="pl">Obraz WordPerfect/DrawPerfect</comment>
<comment xml:lang="pt">imagem do WordPerfect/Drawperfect</comment>
- <comment xml:lang="pt_BR">Imagem do WordPerfect/Drawperfect</comment>
+ <comment xml:lang="pt-BR">Imagem do WordPerfect/Drawperfect</comment>
<comment xml:lang="ro">Imagine WordPerfect/Drawperfect</comment>
<comment xml:lang="ru">Изображение WordPerfect/Drawperfect</comment>
<comment xml:lang="sk">Obrázok WordPerfect/Drawperfect</comment>
@@ -21718,18 +22528,25 @@
<comment xml:lang="tr">WordPerfect/DrawPerfect görüntüsü</comment>
<comment xml:lang="uk">зображення WordPerfect/Drawperfect</comment>
<comment xml:lang="vi">Ảnh WordPerfect/Drawperfect</comment>
- <comment xml:lang="zh_CN">WordPerfect/Drawperfect 图像</comment>
- <comment xml:lang="zh_TW">WordPerfect/Drawperfect 影像</comment>
+ <comment xml:lang="zh-CN">WordPerfect/Drawperfect 图像</comment>
+ <comment xml:lang="zh-TW">WordPerfect/Drawperfect 影像</comment>
<generic-icon name="image-x-generic"/>
<glob pattern="*.wpg"/>
</mime-type>
<mime-type type="application/x-wonderswan-rom">
<comment>Bandai WonderSwan ROM</comment>
+ <comment xml:lang="bg">ROM — Bandai WonderSwan</comment>
<comment xml:lang="ca">ROM de Bandai WonderSwan</comment>
<comment xml:lang="cs">ROM pro Bandai WonderSwan</comment>
+ <comment xml:lang="da">Bandai WonderSwan-ROM</comment>
<comment xml:lang="de">Bandai WonderSwan ROM</comment>
- <comment xml:lang="en_GB">Bandai WonderSwan ROM</comment>
+ <comment xml:lang="en-GB">Bandai WonderSwan ROM</comment>
<comment xml:lang="es">ROM de Bandai WonderSwan</comment>
+ <comment xml:lang="eu">Bandai WonderSwan ROM</comment>
+ <comment xml:lang="fi">Bandai WonderSwan ROM</comment>
+ <comment xml:lang="fr">ROM Bandai WonderSwan</comment>
+ <comment xml:lang="fur">ROM Bandai WonderSwan</comment>
+ <comment xml:lang="ga">ROM Bandai WonderSwan</comment>
<comment xml:lang="hr">Bandai WonderSwan ROM</comment>
<comment xml:lang="hu">Bandai WonderSwan ROM</comment>
<comment xml:lang="id">ROM Bandai WonderSwan</comment>
@@ -21737,23 +22554,31 @@
<comment xml:lang="kk">Bandai WonderSwan ROM</comment>
<comment xml:lang="ko">반다이 원더스완 롬</comment>
<comment xml:lang="pl">Plik ROM konsoli Bandai WonderSwan</comment>
- <comment xml:lang="pt_BR">ROM de WonderSwan da Bandai</comment>
+ <comment xml:lang="pt-BR">ROM de WonderSwan da Bandai</comment>
<comment xml:lang="ru">Bandai WonderSwan ROM</comment>
<comment xml:lang="sk">ROM pre Bandai WonderSwan</comment>
<comment xml:lang="sv">Bandai WonderSwan-rom</comment>
+ <comment xml:lang="tr">Bandai WonderSwan ROM</comment>
<comment xml:lang="uk">ROM Bandai WonderSwan</comment>
- <comment xml:lang="zh_CN">万代 WonderSwan ROM</comment>
- <comment xml:lang="zh_TW">Bandai WonderSwan ROM</comment>
+ <comment xml:lang="zh-CN">万代 WonderSwan ROM</comment>
+ <comment xml:lang="zh-TW">萬代 WonderSwan ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.ws"/>
</mime-type>
<mime-type type="application/x-wonderswan-color-rom">
<comment>Bandai WonderSwan Color ROM</comment>
+ <comment xml:lang="bg">ROM — Bandai WonderSwan Color</comment>
<comment xml:lang="ca">ROM de Bandai WonderSwan Color</comment>
<comment xml:lang="cs">ROM pro Bandai WonderSwan Color</comment>
+ <comment xml:lang="da">Bandai WonderSwan Color-ROM</comment>
<comment xml:lang="de">Bandai WonderSwan Color ROM</comment>
- <comment xml:lang="en_GB">Bandai WonderSwan Color ROM</comment>
+ <comment xml:lang="en-GB">Bandai WonderSwan Color ROM</comment>
<comment xml:lang="es">ROM de Bandai WonderSwan Color</comment>
+ <comment xml:lang="eu">Bandai WonderSwan Color ROM</comment>
+ <comment xml:lang="fi">Bandai WonderSwan Color ROM</comment>
+ <comment xml:lang="fr">ROM Bandai WonderSwan Color</comment>
+ <comment xml:lang="fur">ROM Bandai WonderSwan Color</comment>
+ <comment xml:lang="ga">ROM datha Bandai WonderSwan</comment>
<comment xml:lang="hr">Bandai WonderSwan Color ROM</comment>
<comment xml:lang="hu">Bandai WonderSwan Color ROM</comment>
<comment xml:lang="id">ROM Bandai WonderSwan Color</comment>
@@ -21761,33 +22586,36 @@
<comment xml:lang="kk">Bandai WonderSwan Color ROM</comment>
<comment xml:lang="ko">반다이 원더스완 컬러 롬</comment>
<comment xml:lang="pl">Plik ROM konsoli Bandai WonderSwan Color</comment>
- <comment xml:lang="pt_BR">ROM de WonderSwan Color da Bandai</comment>
+ <comment xml:lang="pt-BR">ROM de WonderSwan Color da Bandai</comment>
<comment xml:lang="ru">Bandai WonderSwan Color ROM</comment>
<comment xml:lang="sk">ROM pre Bandai WonderSwan Color</comment>
<comment xml:lang="sv">Bandai WonderSwan Color-rom</comment>
+ <comment xml:lang="tr">Bandai WonderSwan Color ROM</comment>
<comment xml:lang="uk">ROM Bandai WonderSwan Color</comment>
- <comment xml:lang="zh_CN">万代 WonderSwan Color ROM</comment>
- <comment xml:lang="zh_TW">Bandai WonderSwan Color ROM</comment>
+ <comment xml:lang="zh-CN">万代 WonderSwan Color ROM</comment>
+ <comment xml:lang="zh-TW">萬代 WonderSwan Color ROM</comment>
<generic-icon name="application-x-executable"/>
<glob pattern="*.wsc"/>
</mime-type>
<mime-type type="application/x-x509-ca-cert">
<comment>DER/PEM/Netscape-encoded X.509 certificate</comment>
+ <comment xml:lang="af">DER/PEM/Netscape-geënkodeerde X.509-sertifikaat</comment>
<comment xml:lang="ar">شهادة DER/PEM/Netscape-encoded X.509</comment>
- <comment xml:lang="be@latin">Sertyfikat X.509, zakadavany ŭ DER/PEM/Netscape</comment>
+ <comment xml:lang="be-Latn">Sertyfikat X.509, zakadavany ŭ DER/PEM/Netscape</comment>
<comment xml:lang="bg">Сертификат — DER/PEM/Netscape X.509</comment>
<comment xml:lang="ca">certificat X.509 codificat com DER/PEM/Netscape</comment>
<comment xml:lang="cs">certifikát X.509 kódovaný jako DER/PEM/Netscape</comment>
- <comment xml:lang="da">DER-/PEM-/Netscapekodet X.509-certifikat</comment>
+ <comment xml:lang="da">DER-/PEM-/Netscape-kodet X.509-certifikat</comment>
<comment xml:lang="de">DER/PEM/Netscape-kodiertes X.509-Zertifikat</comment>
<comment xml:lang="el">Ψηφιακό πιστοποιητικό X.509 κωδικοποιημένο κατά DER/PEM/Netscape</comment>
- <comment xml:lang="en_GB">DER/PEM/Netscape-encoded X.509 certificate</comment>
+ <comment xml:lang="en-GB">DER/PEM/Netscape-encoded X.509 certificate</comment>
<comment xml:lang="eo">DER/PEM/Netscape-kodigita X.509-atestilo</comment>
<comment xml:lang="es">certificado X.509 codificado con DER/PEM/Netscape</comment>
<comment xml:lang="eu">X.509rekin kodetutako DER, PEM edo Netscape zertifikatua</comment>
<comment xml:lang="fi">DER/PEM/Netscape-koodattu X.509-varmenne</comment>
<comment xml:lang="fo">DER/PEM/Netscape-encoded X.509 váttan</comment>
<comment xml:lang="fr">certificat X.509 codé DER/PEM/Netscape</comment>
+ <comment xml:lang="fur">certificât X.509 codificât cun DER/PEM/Netscape</comment>
<comment xml:lang="ga">teastas X.509 ionchódaithe le DER/PEM/Netscape</comment>
<comment xml:lang="gl">certificado X.509 codificado con DER/PEM/Netscape</comment>
<comment xml:lang="he">אישור מסוג X.509 של DER/PEM/Netscape-encoded</comment>
@@ -21809,7 +22637,7 @@
<comment xml:lang="oc">certificat X.509 encodat DER/PEM/Netscape</comment>
<comment xml:lang="pl">Zakodowany w DER/PEM/Netscape certyfikat X.509</comment>
<comment xml:lang="pt">certificado X.509 codificado com DER/PEM/Netscape</comment>
- <comment xml:lang="pt_BR">Certificado X.509 codificado com DER/PEM/Netscape</comment>
+ <comment xml:lang="pt-BR">Certificado X.509 codificado com DER/PEM/Netscape</comment>
<comment xml:lang="ro">Certificat DER/PEM/Netscape-codat X.509</comment>
<comment xml:lang="ru">Сертификат X.509 (DER/PEM/Netscape-закодированный)</comment>
<comment xml:lang="sk">Certifikát X.509 kódovaný ako DER/PEM/Netscape</comment>
@@ -21820,8 +22648,8 @@
<comment xml:lang="tr">DER/PEM/Netscape-kodlanmış X.509 sertfikası</comment>
<comment xml:lang="uk">сертифікат X.509 у форматі DER/PEM/Netscape</comment>
<comment xml:lang="vi">Chứng nhận X.509 mã hoá bằng Netscape/PEM/DER</comment>
- <comment xml:lang="zh_CN">DER/PEM/Netscape-encoded X.509 证书</comment>
- <comment xml:lang="zh_TW">DER/PEM/Netscape 編碼的 X.509 憑證</comment>
+ <comment xml:lang="zh-CN">DER/PEM/Netscape-encoded X.509 证书</comment>
+ <comment xml:lang="zh-TW">DER/PEM/Netscape 編碼的 X.509 憑證</comment>
<generic-icon name="text-x-generic"/>
<glob pattern="*.der"/>
<glob pattern="*.crt"/>
@@ -21830,22 +22658,24 @@
</mime-type>
<mime-type type="application/x-zerosize">
<comment>empty document</comment>
+ <comment xml:lang="af">leë dokument</comment>
<comment xml:lang="ar">مستند فارغ</comment>
<comment xml:lang="ast">documentu baleru</comment>
- <comment xml:lang="be@latin">pusty dakument</comment>
+ <comment xml:lang="be-Latn">pusty dakument</comment>
<comment xml:lang="bg">Празен документ</comment>
<comment xml:lang="ca">document buit</comment>
<comment xml:lang="cs">prázdný dokument</comment>
<comment xml:lang="da">tomt dokument</comment>
<comment xml:lang="de">Leeres Dokument</comment>
<comment xml:lang="el">Κενό έγγραφο</comment>
- <comment xml:lang="en_GB">empty document</comment>
+ <comment xml:lang="en-GB">empty document</comment>
<comment xml:lang="eo">malplena dokumento</comment>
<comment xml:lang="es">documento vacío</comment>
<comment xml:lang="eu">dokumentu hutsa</comment>
<comment xml:lang="fi">tyhjä asiakirja</comment>
<comment xml:lang="fo">tómt skjal</comment>
<comment xml:lang="fr">document vide</comment>
+ <comment xml:lang="fur">document vueit</comment>
<comment xml:lang="ga">cáipéis fholamh</comment>
<comment xml:lang="gl">documeto baleiro</comment>
<comment xml:lang="he">מסמך ריק</comment>
@@ -21866,7 +22696,7 @@
<comment xml:lang="oc">document void</comment>
<comment xml:lang="pl">Pusty dokument</comment>
<comment xml:lang="pt">documento vazio</comment>
- <comment xml:lang="pt_BR">Documento vazio</comment>
+ <comment xml:lang="pt-BR">Documento vazio</comment>
<comment xml:lang="ro">document gol</comment>
<comment xml:lang="ru">Пустой документ</comment>
<comment xml:lang="sk">Prázdny dokument</comment>
@@ -21877,28 +22707,30 @@
<comment xml:lang="tr">boş belge</comment>
<comment xml:lang="uk">порожній документ</comment>
<comment xml:lang="vi">tài liệu rỗng</comment>
- <comment xml:lang="zh_CN">空文档</comment>
- <comment xml:lang="zh_TW">空白文件</comment>
+ <comment xml:lang="zh-CN">空文档</comment>
+ <comment xml:lang="zh-TW">空白文件</comment>
</mime-type>
<mime-type type="application/x-zoo">
<comment>Zoo archive</comment>
+ <comment xml:lang="af">Zoo-argief</comment>
<comment xml:lang="ar">أرشيف Zoo</comment>
<comment xml:lang="az">Zoo arxivi</comment>
- <comment xml:lang="be@latin">Archiŭ zoo</comment>
+ <comment xml:lang="be-Latn">Archiŭ zoo</comment>
<comment xml:lang="bg">Архив — zoo</comment>
<comment xml:lang="ca">arxiu zoo</comment>
<comment xml:lang="cs">archiv Zoo</comment>
<comment xml:lang="cy">Archif zoo</comment>
- <comment xml:lang="da">Zooarkiv</comment>
+ <comment xml:lang="da">Zoo-arkiv</comment>
<comment xml:lang="de">Zoo-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Zoo</comment>
- <comment xml:lang="en_GB">Zoo archive</comment>
+ <comment xml:lang="en-GB">Zoo archive</comment>
<comment xml:lang="eo">Zoo-arkivo</comment>
<comment xml:lang="es">archivador Zoo</comment>
<comment xml:lang="eu">Zoo artxiboa</comment>
<comment xml:lang="fi">Zoo-arkisto</comment>
<comment xml:lang="fo">Zoo skjalasavn</comment>
<comment xml:lang="fr">archive zoo</comment>
+ <comment xml:lang="fur">archivi Zoo</comment>
<comment xml:lang="ga">cartlann Zoo</comment>
<comment xml:lang="gl">ficheiro Zoo</comment>
<comment xml:lang="he">ארכיון Zoo</comment>
@@ -21918,10 +22750,10 @@
<comment xml:lang="oc">archiu zoo</comment>
<comment xml:lang="pl">Archiwum zoo</comment>
<comment xml:lang="pt">arquivo Zoo</comment>
- <comment xml:lang="pt_BR">Pacote Zoo</comment>
+ <comment xml:lang="pt-BR">Pacote Zoo</comment>
<comment xml:lang="ro">Arhivă Zoo</comment>
<comment xml:lang="ru">Архив ZOO</comment>
- <comment xml:lang="sk">Archív zoo</comment>
+ <comment xml:lang="sk">Archív Zoo</comment>
<comment xml:lang="sl">Datoteka arhiva ZOO</comment>
<comment xml:lang="sq">Arkiv zoo</comment>
<comment xml:lang="sr">Зoo архива</comment>
@@ -21929,31 +22761,33 @@
<comment xml:lang="tr">Zoo arşivi</comment>
<comment xml:lang="uk">архів zoo</comment>
<comment xml:lang="vi">Kho nén zoo</comment>
- <comment xml:lang="zh_CN">Zoo 归档文件</comment>
- <comment xml:lang="zh_TW">Zoo 封存檔</comment>
+ <comment xml:lang="zh-CN">Zoo 归档文件</comment>
+ <comment xml:lang="zh-TW">Zoo 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="0xfdc4a7dc" type="little32" offset="20"/>
+ <match type="little32" value="0xfdc4a7dc" offset="20"/>
</magic>
<glob pattern="*.zoo"/>
</mime-type>
<mime-type type="application/xhtml+xml">
<comment>XHTML page</comment>
+ <comment xml:lang="af">XHTML-bladsy</comment>
<comment xml:lang="ar">صفحة XHTML</comment>
- <comment xml:lang="be@latin">Staronka XHTML</comment>
+ <comment xml:lang="be-Latn">Staronka XHTML</comment>
<comment xml:lang="bg">Страница — XHTML</comment>
<comment xml:lang="ca">pàgina XHTML</comment>
<comment xml:lang="cs">stránka XHTML</comment>
<comment xml:lang="da">XHTML-side</comment>
<comment xml:lang="de">XHTML-Seite</comment>
<comment xml:lang="el">Σελίδα XHTML</comment>
- <comment xml:lang="en_GB">XHTML page</comment>
+ <comment xml:lang="en-GB">XHTML page</comment>
<comment xml:lang="eo">XHTML-paĝo</comment>
<comment xml:lang="es">página XHTML</comment>
<comment xml:lang="eu">XHTML orria</comment>
<comment xml:lang="fi">XHTML-sivu</comment>
<comment xml:lang="fo">XHTML síða</comment>
<comment xml:lang="fr">page XHTML</comment>
+ <comment xml:lang="fur">pagjine XHTML</comment>
<comment xml:lang="ga">leathanach XHTML</comment>
<comment xml:lang="gl">Páxina XHTML</comment>
<comment xml:lang="he">דף XHTML</comment>
@@ -21974,7 +22808,7 @@
<comment xml:lang="oc">pagina XHTML</comment>
<comment xml:lang="pl">Strona XHTML</comment>
<comment xml:lang="pt">página XHTML</comment>
- <comment xml:lang="pt_BR">Página XHTML</comment>
+ <comment xml:lang="pt-BR">Página XHTML</comment>
<comment xml:lang="ro">Pagină XHTML</comment>
<comment xml:lang="ru">Страница XHTML</comment>
<comment xml:lang="sk">Stránka XHTML</comment>
@@ -21985,41 +22819,45 @@
<comment xml:lang="tr">XHTML sayfası</comment>
<comment xml:lang="uk">сторінка XHTML</comment>
<comment xml:lang="vi">Trang XHTML</comment>
- <comment xml:lang="zh_CN">XHTML 页面</comment>
- <comment xml:lang="zh_TW">XHTML 網頁</comment>
+ <comment xml:lang="zh-CN">XHTML 页面</comment>
+ <comment xml:lang="zh-TW">XHTML 網頁</comment>
<acronym>XHTML</acronym>
<expanded-acronym>Extensible HyperText Markup Language</expanded-acronym>
<sub-class-of type="application/xml"/>
<generic-icon name="text-html"/>
<glob pattern="*.xhtml"/>
<glob pattern="*.xht"/>
+ <glob pattern="*.html"/>
+ <glob pattern="*.htm"/>
<magic priority="60">
- <match value="//W3C//DTD XHTML " type="string" offset="0:256"/>
- <match value="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" type="string" offset="0:256"/>
- <match value="&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml" type="string" offset="0:256"/>
- <match value="&lt;HTML xmlns=&quot;http://www.w3.org/1999/xhtml" type="string" offset="0:256"/>
+ <match type="string" value="//W3C//DTD XHTML " offset="0:256"/>
+ <match type="string" value="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" offset="0:256"/>
+ <match type="string" value="&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml" offset="0:256"/>
+ <match type="string" value="&lt;HTML xmlns=&quot;http://www.w3.org/1999/xhtml" offset="0:256"/>
</magic>
- <root-XML namespaceURI='http://www.w3.org/1999/xhtml' localName='html'/>
+ <root-XML namespaceURI="http://www.w3.org/1999/xhtml" localName="html"/>
</mime-type>
<mime-type type="application/zip">
<comment>Zip archive</comment>
+ <comment xml:lang="af">Zip-argief</comment>
<comment xml:lang="ar">أرشيف Zip</comment>
<comment xml:lang="az">Zip arxivi</comment>
- <comment xml:lang="be@latin">Archiŭ zip</comment>
+ <comment xml:lang="be-Latn">Archiŭ zip</comment>
<comment xml:lang="bg">Архив — zip</comment>
<comment xml:lang="ca">arxiu zip</comment>
<comment xml:lang="cs">archiv ZIP</comment>
<comment xml:lang="cy">Archif ZIP</comment>
- <comment xml:lang="da">Ziparkiv</comment>
+ <comment xml:lang="da">Zip-arkiv</comment>
<comment xml:lang="de">Zip-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο Zip</comment>
- <comment xml:lang="en_GB">Zip archive</comment>
+ <comment xml:lang="en-GB">Zip archive</comment>
<comment xml:lang="eo">Zip-arkivo</comment>
<comment xml:lang="es">archivador Zip</comment>
<comment xml:lang="eu">Zip artxiboa</comment>
<comment xml:lang="fi">Zip-arkisto</comment>
<comment xml:lang="fo">Zip skjalasavn</comment>
<comment xml:lang="fr">archive zip</comment>
+ <comment xml:lang="fur">archivi Zip</comment>
<comment xml:lang="ga">cartlann Zip</comment>
<comment xml:lang="gl">ficheiro Zip</comment>
<comment xml:lang="he">ארכיון Zip</comment>
@@ -22039,7 +22877,7 @@
<comment xml:lang="oc">archiu zip</comment>
<comment xml:lang="pl">Archiwum ZIP</comment>
<comment xml:lang="pt">arquivo Zip</comment>
- <comment xml:lang="pt_BR">Pacote Zip</comment>
+ <comment xml:lang="pt-BR">Pacote Zip</comment>
<comment xml:lang="ro">Arhivă zip</comment>
<comment xml:lang="ru">Архив ZIP</comment>
<comment xml:lang="sk">Archív ZIP</comment>
@@ -22050,76 +22888,71 @@
<comment xml:lang="tr">Zip arşivi</comment>
<comment xml:lang="uk">архів zip</comment>
<comment xml:lang="vi">Kho nén zip</comment>
- <comment xml:lang="zh_CN">Zip 归档文件</comment>
- <comment xml:lang="zh_TW">Zip 封存檔</comment>
+ <comment xml:lang="zh-CN">Zip 归档文件</comment>
+ <comment xml:lang="zh-TW">Zip 封存檔</comment>
<alias type="application/x-zip-compressed"/>
<alias type="application/x-zip"/>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="PK\003\004" type="string" offset="0"/>
+ <match type="string" value="PK\003\004" offset="0"/>
</magic>
<glob pattern="*.zip"/>
</mime-type>
<mime-type type="application/x-ms-wim">
- <comment>WIM disk Image</comment>
+ <comment>WIM disk image</comment>
+ <comment xml:lang="bg">Диск — WIM</comment>
<comment xml:lang="ca">imatge de disc WIM</comment>
- <comment xml:lang="cs">obraz disku WIM</comment>
<comment xml:lang="da">WIM-diskaftryk</comment>
<comment xml:lang="de">WIM-Datenträgerabbild</comment>
- <comment xml:lang="el">Εικόνα δίσκου WIM</comment>
- <comment xml:lang="en_GB">WIM disk Image</comment>
+ <comment xml:lang="en-GB">WIM disk image</comment>
<comment xml:lang="es">imagen de disco WIM</comment>
<comment xml:lang="eu">WIM disko irudia</comment>
- <comment xml:lang="fi">WIM-levytiedosto</comment>
+ <comment xml:lang="fi">WIM-levykuva</comment>
<comment xml:lang="fr">image disque WIM</comment>
- <comment xml:lang="ga">íomhá diosca WIM</comment>
- <comment xml:lang="he">דמות דיסק WIM</comment>
<comment xml:lang="hr">WIM slika diska</comment>
<comment xml:lang="hu">WIM lemezkép</comment>
- <comment xml:lang="ia">Imagine de disco WIM</comment>
<comment xml:lang="id">Image disk WIM</comment>
<comment xml:lang="it">Immagine disco WIM</comment>
<comment xml:lang="kk">WIM диск бейнесі</comment>
<comment xml:lang="ko">WIM 디스크 이미지</comment>
- <comment xml:lang="oc">imatge disc WIM</comment>
<comment xml:lang="pl">Obraz dysku WIM</comment>
- <comment xml:lang="pt">imagem de disco WIM</comment>
- <comment xml:lang="pt_BR">Imagem de disco WIM</comment>
+ <comment xml:lang="pt-BR">Imagem de disco WIM</comment>
<comment xml:lang="ru">Образ диска WIM</comment>
<comment xml:lang="sk">Obraz disku WIM</comment>
- <comment xml:lang="sr">слика диска ВИМ-а</comment>
- <comment xml:lang="sv">WIM-diskavbild</comment>
- <comment xml:lang="tr">WIM disk kalıbı</comment>
+ <comment xml:lang="sv">WIM-diskavbildning</comment>
+ <comment xml:lang="tr">WIM disk görüntüsü</comment>
<comment xml:lang="uk">образ диска WIM</comment>
- <comment xml:lang="zh_CN">WIM 磁盘映像</comment>
- <comment xml:lang="zh_TW">WIM 磁碟映像檔</comment>
+ <comment xml:lang="zh-CN">WIM 磁盘映像</comment>
+ <comment xml:lang="zh-TW">WIM 磁碟映像檔</comment>
<acronym>WIM</acronym>
<expanded-acronym>Windows Imaging Format</expanded-acronym>
<magic>
- <match value="MSWIM\000\000\000" type="string" offset="0"/>
+ <match type="string" value="MSWIM\000\000\000" offset="0"/>
</magic>
<glob pattern="*.wim"/>
<glob pattern="*.swm"/>
</mime-type>
<mime-type type="audio/ac3">
<comment>Dolby Digital audio</comment>
+ <comment xml:lang="af">Dolby Digital-oudio</comment>
<comment xml:lang="ar">Dolby Digital سمعي</comment>
<comment xml:lang="az">Dolby Digital audio</comment>
- <comment xml:lang="be@latin">Aŭdyjo Dolby Digital</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Dolby Digital</comment>
<comment xml:lang="bg">Аудио — Dolby Digital</comment>
- <comment xml:lang="ca">àudio de Dolby Digital</comment>
+ <comment xml:lang="ca">àudio Dolby Digital</comment>
<comment xml:lang="cs">zvuk Dolby Digital</comment>
<comment xml:lang="cy">Sain Dolby Digital</comment>
<comment xml:lang="da">Dolby Ditital-lyd</comment>
<comment xml:lang="de">Dolby-Digital-Audio</comment>
<comment xml:lang="el">Ψηφιακός Ήχος Dolby</comment>
- <comment xml:lang="en_GB">Dolby Digital audio</comment>
+ <comment xml:lang="en-GB">Dolby Digital audio</comment>
<comment xml:lang="eo">Sondosiero en Dolby Digital</comment>
- <comment xml:lang="es">sonido Dolby Digital</comment>
+ <comment xml:lang="es">audio Dolby Digital</comment>
<comment xml:lang="eu">Dolby audio digitala</comment>
<comment xml:lang="fi">Dolby Digital -ääni</comment>
<comment xml:lang="fo">Dolby Digital ljóður</comment>
<comment xml:lang="fr">audio Dolby Digital</comment>
+ <comment xml:lang="fur">audio Dolby Digital</comment>
<comment xml:lang="ga">fuaim Dolby Digital</comment>
<comment xml:lang="gl">son Dolby Digital</comment>
<comment xml:lang="he">שמע Dolby Digital</comment>
@@ -22141,7 +22974,7 @@
<comment xml:lang="oc">àudio Dolby Digital</comment>
<comment xml:lang="pl">Plik dźwiękowy Dolby Digital</comment>
<comment xml:lang="pt">áudio Dolby Digital</comment>
- <comment xml:lang="pt_BR">Áudio Dolby Digital</comment>
+ <comment xml:lang="pt-BR">Áudio Dolby Digital</comment>
<comment xml:lang="ro">Audio Dolby Digital</comment>
<comment xml:lang="ru">Аудио Dolby Digital</comment>
<comment xml:lang="sk">Zvuk Dolby Digital</comment>
@@ -22152,25 +22985,28 @@
<comment xml:lang="tr">Dolby Digital sesi</comment>
<comment xml:lang="uk">звук Dolby Digital</comment>
<comment xml:lang="vi">Âm thanh Dolby Digital</comment>
- <comment xml:lang="zh_CN">杜比数字音频</comment>
- <comment xml:lang="zh_TW">杜比數位音訊</comment>
+ <comment xml:lang="zh-CN">杜比数字音频</comment>
+ <comment xml:lang="zh-TW">杜比數位音訊</comment>
<magic priority="50">
- <match value="0x0b77" type="big16" offset="0"/>
+ <match type="big16" value="0x0b77" offset="0"/>
</magic>
<glob pattern="*.ac3"/>
</mime-type>
<mime-type type="audio/vnd.dts">
<comment>DTS audio</comment>
+ <comment xml:lang="af">DTS-oudio</comment>
+ <comment xml:lang="bg">Аудио — DTS</comment>
<comment xml:lang="ca">àudio DTS</comment>
<comment xml:lang="cs">zvuk DTS</comment>
<comment xml:lang="da">DTS-lyd</comment>
<comment xml:lang="de">DTS-Audio</comment>
<comment xml:lang="el">Ήχος DTS</comment>
- <comment xml:lang="en_GB">DTS audio</comment>
- <comment xml:lang="es">sonido DTS</comment>
+ <comment xml:lang="en-GB">DTS audio</comment>
+ <comment xml:lang="es">audio DTS</comment>
<comment xml:lang="eu">DTS audioa</comment>
<comment xml:lang="fi">DTS-ääni</comment>
<comment xml:lang="fr">audio DTS</comment>
+ <comment xml:lang="fur">audio DTS</comment>
<comment xml:lang="ga">fuaim DTS</comment>
<comment xml:lang="gl">Son DTS</comment>
<comment xml:lang="he">שמע DTS</comment>
@@ -22186,7 +23022,7 @@
<comment xml:lang="oc">àudio DTS</comment>
<comment xml:lang="pl">Plik dźwiękowy DTS</comment>
<comment xml:lang="pt">aúdio DTS</comment>
- <comment xml:lang="pt_BR">Áudio DTS</comment>
+ <comment xml:lang="pt-BR">Áudio DTS</comment>
<comment xml:lang="ru">Аудио DTS</comment>
<comment xml:lang="sk">Zvuk DTS</comment>
<comment xml:lang="sl">Zvok DTS</comment>
@@ -22194,29 +23030,32 @@
<comment xml:lang="sv">DTS-ljud</comment>
<comment xml:lang="tr">DTS sesi</comment>
<comment xml:lang="uk">звукові дані DTS</comment>
- <comment xml:lang="zh_CN">DTS 音频</comment>
- <comment xml:lang="zh_TW">DTS 音訊</comment>
+ <comment xml:lang="zh-CN">DTS 音频</comment>
+ <comment xml:lang="zh-TW">DTS 音訊</comment>
<magic priority="50">
- <match value="0x7FFE8001" type="big32" offset="0"/>
- <match value="0xFE7F0180" type="little32" offset="0"/>
- <match value="0x1FFFE800" type="big32" offset="0"/>
- <match value="0xFF1F00E8" type="little32" offset="0"/>
+ <match type="big32" value="0x7FFE8001" offset="0"/> <!-- 16bits core be -->
+ <match type="little32" value="0xFE7F0180" offset="0"/> <!-- 16bits core le -->
+ <match type="big32" value="0x1FFFE800" offset="0"/> <!-- 14bits core be -->
+ <match type="little32" value="0xFF1F00E8" offset="0"/> <!-- 14bits core le -->
</magic>
<alias type="audio/x-dts"/>
<glob pattern="*.dts"/>
</mime-type>
<mime-type type="audio/vnd.dts.hd">
<comment>DTSHD audio</comment>
+ <comment xml:lang="af">DTSHD-oudio</comment>
+ <comment xml:lang="bg">Аудио — DTSHD</comment>
<comment xml:lang="ca">àudio DTSHD</comment>
<comment xml:lang="cs">zvuk DTSHD</comment>
<comment xml:lang="da">DTSDH-lyd</comment>
<comment xml:lang="de">DTSHD-Audio</comment>
<comment xml:lang="el">Ήχος DTSHD</comment>
- <comment xml:lang="en_GB">DTSHD audio</comment>
- <comment xml:lang="es">sonido DTSHD</comment>
+ <comment xml:lang="en-GB">DTSHD audio</comment>
+ <comment xml:lang="es">audio DTSHD</comment>
<comment xml:lang="eu">DTSHD audioa</comment>
<comment xml:lang="fi">DTS-HD-ääni</comment>
<comment xml:lang="fr">audio DTSHD</comment>
+ <comment xml:lang="fur">audio DTSHD</comment>
<comment xml:lang="ga">fuaim DTSHD</comment>
<comment xml:lang="gl">Son DTSHD</comment>
<comment xml:lang="he">שמע DTSHD</comment>
@@ -22232,7 +23071,7 @@
<comment xml:lang="oc">àudio DTSHD</comment>
<comment xml:lang="pl">Plik dźwiękowy DTSHD</comment>
<comment xml:lang="pt">áudio DTSHD</comment>
- <comment xml:lang="pt_BR">Áudio DTSHD</comment>
+ <comment xml:lang="pt-BR">Áudio DTSHD</comment>
<comment xml:lang="ru">Аудио DTSHD</comment>
<comment xml:lang="sk">Zvuk DTSHD</comment>
<comment xml:lang="sl">Zvok DTSHD</comment>
@@ -22240,32 +23079,34 @@
<comment xml:lang="sv">DTSHD-ljud</comment>
<comment xml:lang="tr">DTSHD sesi</comment>
<comment xml:lang="uk">звукові дані DTSHD</comment>
- <comment xml:lang="zh_CN">DTSHD 音频</comment>
- <comment xml:lang="zh_TW">DTSHD 音訊</comment>
+ <comment xml:lang="zh-CN">DTSHD 音频</comment>
+ <comment xml:lang="zh-TW">DTSHD 音訊</comment>
<sub-class-of type="audio/vnd.dts"/>
<magic priority="60">
- <match value="0x64582025" type="big32" offset="0:18725"/>
+ <match type="big32" value="0x64582025" offset="0:18725"/> <!-- 16bits HD be -->
</magic>
<alias type="audio/x-dtshd"/>
<glob pattern="*.dtshd"/>
</mime-type>
<mime-type type="audio/AMR">
<comment>AMR audio</comment>
+ <comment xml:lang="af">AMR-oudio</comment>
<comment xml:lang="ar">AMR سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo AMR</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo AMR</comment>
<comment xml:lang="bg">Аудио — AMR</comment>
<comment xml:lang="ca">àudio AMR</comment>
<comment xml:lang="cs">zvuk AMR</comment>
<comment xml:lang="da">AMR-lyd</comment>
<comment xml:lang="de">AMR-Audio</comment>
<comment xml:lang="el">Ήχος AMR</comment>
- <comment xml:lang="en_GB">AMR audio</comment>
+ <comment xml:lang="en-GB">AMR audio</comment>
<comment xml:lang="eo">AMR-sondosiero</comment>
- <comment xml:lang="es">sonido AMR</comment>
+ <comment xml:lang="es">audio AMR</comment>
<comment xml:lang="eu">AMR audioa</comment>
<comment xml:lang="fi">AMR-ääni</comment>
<comment xml:lang="fo">AMR ljóður</comment>
<comment xml:lang="fr">audio AMR</comment>
+ <comment xml:lang="fur">audio AMR</comment>
<comment xml:lang="ga">fuaim AMR</comment>
<comment xml:lang="gl">son AMR</comment>
<comment xml:lang="he">שמע AMR</comment>
@@ -22286,7 +23127,7 @@
<comment xml:lang="oc">àudio AMR</comment>
<comment xml:lang="pl">Plik dźwiękowy AMR</comment>
<comment xml:lang="pt">áudio AMR</comment>
- <comment xml:lang="pt_BR">Áudio AMR</comment>
+ <comment xml:lang="pt-BR">Áudio AMR</comment>
<comment xml:lang="ro">Audio AMR</comment>
<comment xml:lang="ru">Аудио AMR</comment>
<comment xml:lang="sk">Zvuk AMR</comment>
@@ -22297,34 +23138,36 @@
<comment xml:lang="tr">AMR sesi</comment>
<comment xml:lang="uk">звук AMR</comment>
<comment xml:lang="vi">Âm thanh AMR</comment>
- <comment xml:lang="zh_CN">AMR 音频</comment>
- <comment xml:lang="zh_TW">AMR 音訊</comment>
+ <comment xml:lang="zh-CN">AMR 音频</comment>
+ <comment xml:lang="zh-TW">AMR 音訊</comment>
<acronym>AMR</acronym>
<expanded-acronym>Adaptive Multi-Rate</expanded-acronym>
<magic priority="50">
- <match value="#!AMR\n" type="string" offset="0"/>
- <match value="#!AMR_MC1.0\n" type="string" offset="0"/>
+ <match type="string" value="#!AMR\n" offset="0"/>
+ <match type="string" value="#!AMR_MC1.0\n" offset="0"/>
</magic>
<glob pattern="*.amr"/>
<alias type="audio/amr-encrypted"/>
</mime-type>
<mime-type type="audio/AMR-WB">
<comment>AMR-WB audio</comment>
+ <comment xml:lang="af">AMR-WB-oudio</comment>
<comment xml:lang="ar">AMR-WB سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo AMR-WB</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo AMR-WB</comment>
<comment xml:lang="bg">Аудио — AMR-WB</comment>
<comment xml:lang="ca">àudio AMR-WB</comment>
<comment xml:lang="cs">zvuk AMR-WB</comment>
<comment xml:lang="da">AMR-WB-lyd</comment>
<comment xml:lang="de">AMR-WB-Audio</comment>
<comment xml:lang="el">Ήχος AMR-WB</comment>
- <comment xml:lang="en_GB">AMR-WB audio</comment>
+ <comment xml:lang="en-GB">AMR-WB audio</comment>
<comment xml:lang="eo">AMR-WB-sondosiero</comment>
- <comment xml:lang="es">sonido AMR-WB</comment>
+ <comment xml:lang="es">audio AMR-WB</comment>
<comment xml:lang="eu">AMR-WB audioa</comment>
<comment xml:lang="fi">AMR-WB-ääni</comment>
<comment xml:lang="fo">AMR-WB ljóður</comment>
<comment xml:lang="fr">audio AMR-WB</comment>
+ <comment xml:lang="fur">audio AMR-WB</comment>
<comment xml:lang="ga">fuaim AMR-WB</comment>
<comment xml:lang="gl">son AMR-WB</comment>
<comment xml:lang="he">שמע AMR-WN</comment>
@@ -22345,7 +23188,7 @@
<comment xml:lang="oc">àudio AMR-WB</comment>
<comment xml:lang="pl">Plik dźwiękowy AMR-WB</comment>
<comment xml:lang="pt">áudio AMR-WB</comment>
- <comment xml:lang="pt_BR">Áudio AMR-WB</comment>
+ <comment xml:lang="pt-BR">Áudio AMR-WB</comment>
<comment xml:lang="ro">Audio AMR-WB</comment>
<comment xml:lang="ru">Аудио AMR-WB</comment>
<comment xml:lang="sk">Zvuk AMR-WB</comment>
@@ -22356,22 +23199,23 @@
<comment xml:lang="tr">AMR-WB sesi</comment>
<comment xml:lang="uk">звук AMR-WB</comment>
<comment xml:lang="vi">Âm thanh AMR-WB</comment>
- <comment xml:lang="zh_CN">AMR-WB 音频</comment>
- <comment xml:lang="zh_TW">AMR-WB 音訊</comment>
+ <comment xml:lang="zh-CN">AMR-WB 音频</comment>
+ <comment xml:lang="zh-TW">AMR-WB 音訊</comment>
<acronym>AMR-WB</acronym>
<expanded-acronym>Adaptive Multi-Rate Wideband</expanded-acronym>
<magic priority="50">
- <match value="#!AMR-WB\n" type="string" offset="0"/>
- <match value="#!AMR-WB_MC1.0\n" type="string" offset="0"/>
+ <match type="string" value="#!AMR-WB\n" offset="0"/>
+ <match type="string" value="#!AMR-WB_MC1.0\n" offset="0"/>
</magic>
<glob pattern="*.awb"/>
<alias type="audio/amr-wb-encrypted"/>
</mime-type>
<mime-type type="audio/basic">
<comment>ULAW (Sun) audio</comment>
+ <comment xml:lang="af">ULAW- (Sun) oudio</comment>
<comment xml:lang="ar">ULAW (صن) سمعي</comment>
<comment xml:lang="az">ULAW (Sun) audio faylı</comment>
- <comment xml:lang="be@latin">Aŭdyjo ULAW (Sun)</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo ULAW (Sun)</comment>
<comment xml:lang="bg">Аудио — ULAW, Sun</comment>
<comment xml:lang="ca">àudio ULAW (Sun)</comment>
<comment xml:lang="cs">zvuk ULAW (Sun)</comment>
@@ -22379,13 +23223,14 @@
<comment xml:lang="da">ULAW-lyd (Sun)</comment>
<comment xml:lang="de">ULAW-Audio (Sun)</comment>
<comment xml:lang="el">Ήχος ULAW (Sun)</comment>
- <comment xml:lang="en_GB">ULAW (Sun) audio</comment>
+ <comment xml:lang="en-GB">ULAW (Sun) audio</comment>
<comment xml:lang="eo">ULAW-sondosiero (Sun)</comment>
- <comment xml:lang="es">sonido ULAW (Sun)</comment>
+ <comment xml:lang="es">audio ULAW (Sun)</comment>
<comment xml:lang="eu">ULAW (sun) audioa</comment>
<comment xml:lang="fi">ULAW (Sun) -ääni</comment>
<comment xml:lang="fo">ULAW (Sun) ljóður</comment>
<comment xml:lang="fr">audio ULAW (Sun)</comment>
+ <comment xml:lang="fur">audio ULAW (Sun)</comment>
<comment xml:lang="ga">fuaim ULAW (Sun)</comment>
<comment xml:lang="gl">son ULAW (Sun)</comment>
<comment xml:lang="he">שמע ULAW (של Sun)</comment>
@@ -22406,7 +23251,7 @@
<comment xml:lang="oc">àudio ULAW (Sun)</comment>
<comment xml:lang="pl">Plik dźwiękowy ULAW (Sun)</comment>
<comment xml:lang="pt">áudio ULAW (Sun)</comment>
- <comment xml:lang="pt_BR">Áudio ULAW (Sun)</comment>
+ <comment xml:lang="pt-BR">Áudio ULAW (Sun)</comment>
<comment xml:lang="ro">Fișier audio ULAW (Sun)</comment>
<comment xml:lang="ru">Аудио ULAW (Sun)</comment>
<comment xml:lang="sk">Zvuk ULAW (Sun)</comment>
@@ -22417,31 +23262,33 @@
<comment xml:lang="tr">ULAW (Sun) sesi</comment>
<comment xml:lang="uk">звук ULAW (Sun)</comment>
<comment xml:lang="vi">Âm thanh ULAW (Sun)</comment>
- <comment xml:lang="zh_CN">ULAW (Sun) 音频</comment>
- <comment xml:lang="zh_TW">ULAW (Sun) 音訊</comment>
+ <comment xml:lang="zh-CN">ULAW (Sun) 音频</comment>
+ <comment xml:lang="zh-TW">ULAW (Sun) 音訊</comment>
<magic priority="40">
- <match value=".snd" type="string" offset="0"/>
+ <match type="string" value=".snd" offset="0"/>
</magic>
<glob pattern="*.au"/>
<glob pattern="*.snd"/>
</mime-type>
<mime-type type="audio/prs.sid">
<comment>Commodore 64 audio</comment>
+ <comment xml:lang="af">Commodore 64-oudio</comment>
<comment xml:lang="ar">Commodore 64 سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo Commodore 64</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Commodore 64</comment>
<comment xml:lang="bg">Аудио — Commodore 64</comment>
<comment xml:lang="ca">àudio de Commodore 64</comment>
<comment xml:lang="cs">zvuk Commodore 64</comment>
<comment xml:lang="da">Commodore 64-lyd</comment>
<comment xml:lang="de">Commodore-64-Audio</comment>
<comment xml:lang="el">Ήχος Commodore 64</comment>
- <comment xml:lang="en_GB">Commodore 64 audio</comment>
+ <comment xml:lang="en-GB">Commodore 64 audio</comment>
<comment xml:lang="eo">Sondosiero de Commodore 64</comment>
- <comment xml:lang="es">sonido de Commodore 64</comment>
+ <comment xml:lang="es">audio de Commodore 64</comment>
<comment xml:lang="eu">Commodore 64 Audioa</comment>
<comment xml:lang="fi">Commodore 64 -ääni</comment>
<comment xml:lang="fo">Commodore 64 ljóð</comment>
<comment xml:lang="fr">audio Commodore 64</comment>
+ <comment xml:lang="fur">audio Commodore 64</comment>
<comment xml:lang="ga">fuaim Commodore 64</comment>
<comment xml:lang="gl">son de Commodore 64</comment>
<comment xml:lang="he">שמע של Commodore 64</comment>
@@ -22463,7 +23310,7 @@
<comment xml:lang="oc">àudio Commodore 64</comment>
<comment xml:lang="pl">Plik dźwiękowy Commodore 64</comment>
<comment xml:lang="pt">áudio Commodore 64</comment>
- <comment xml:lang="pt_BR">Áudio Commodore 64</comment>
+ <comment xml:lang="pt-BR">Áudio Commodore 64</comment>
<comment xml:lang="ro">Audio Commodore 64</comment>
<comment xml:lang="ru">Аудио Commodore 64</comment>
<comment xml:lang="sk">Zvuk Commodore 64</comment>
@@ -22474,19 +23321,20 @@
<comment xml:lang="tr">Commodore 64 sesi</comment>
<comment xml:lang="uk">звук Commodore 64</comment>
<comment xml:lang="vi">Âm thanh Commodore 64</comment>
- <comment xml:lang="zh_CN">Commodore 64 音频</comment>
- <comment xml:lang="zh_TW">Commodore 64 音訊</comment>
+ <comment xml:lang="zh-CN">Commodore 64 音频</comment>
+ <comment xml:lang="zh-TW">Commodore 64 音訊</comment>
<magic priority="50">
- <match value="PSID" type="string" offset="0"/>
+ <match type="string" value="PSID" offset="0"/>
</magic>
<glob pattern="*.sid"/>
<glob pattern="*.psid"/>
</mime-type>
<mime-type type="audio/x-adpcm">
<comment>PCM audio</comment>
+ <comment xml:lang="af">PCM-oudio</comment>
<comment xml:lang="ar">سمعي PCM</comment>
<comment xml:lang="az">PCM audio faylı</comment>
- <comment xml:lang="be@latin">Aŭdyjo PCM</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo PCM</comment>
<comment xml:lang="bg">Аудио — PCM</comment>
<comment xml:lang="ca">àudio PCM</comment>
<comment xml:lang="cs">zvuk PCM</comment>
@@ -22494,13 +23342,14 @@
<comment xml:lang="da">PCM-lyd</comment>
<comment xml:lang="de">PCM-Audio</comment>
<comment xml:lang="el">Ήχος PCM</comment>
- <comment xml:lang="en_GB">PCM audio</comment>
+ <comment xml:lang="en-GB">PCM audio</comment>
<comment xml:lang="eo">PCM-sondosiero</comment>
- <comment xml:lang="es">sonido PCM</comment>
+ <comment xml:lang="es">audio PCM</comment>
<comment xml:lang="eu">PCM audioa</comment>
<comment xml:lang="fi">PCM-ääni</comment>
<comment xml:lang="fo">PCM ljóður</comment>
<comment xml:lang="fr">audio PCM</comment>
+ <comment xml:lang="fur">audio PCM</comment>
<comment xml:lang="ga">fuaim PCM</comment>
<comment xml:lang="gl">son PCM</comment>
<comment xml:lang="he">שמע PCM</comment>
@@ -22521,7 +23370,7 @@
<comment xml:lang="oc">àudio PCM</comment>
<comment xml:lang="pl">Plik dźwiękowy PCM</comment>
<comment xml:lang="pt">áudio PCM</comment>
- <comment xml:lang="pt_BR">Áudio PCM</comment>
+ <comment xml:lang="pt-BR">Áudio PCM</comment>
<comment xml:lang="ro">Audio PCM</comment>
<comment xml:lang="ru">Аудио PCM</comment>
<comment xml:lang="sk">Zvuk PCM</comment>
@@ -22532,29 +23381,30 @@
<comment xml:lang="tr">PCM sesi</comment>
<comment xml:lang="uk">звук PCM</comment>
<comment xml:lang="vi">Âm thanh PCM</comment>
- <comment xml:lang="zh_CN">PCM 音频</comment>
- <comment xml:lang="zh_TW">PCM 音訊</comment>
+ <comment xml:lang="zh-CN">PCM 音频</comment>
+ <comment xml:lang="zh-TW">PCM 音訊</comment>
<magic priority="50">
- <match value=".snd" type="string" offset="0">
- <match value="23" type="big32" offset="12"/>
+ <match type="string" value=".snd" offset="0">
+ <match type="big32" value="23" offset="12"/>
</match>
- <match value="0x0064732E" type="little32" offset="0">
- <match value="1" type="little32" offset="12"/>
- <match value="2" type="little32" offset="12"/>
- <match value="3" type="little32" offset="12"/>
- <match value="4" type="little32" offset="12"/>
- <match value="5" type="little32" offset="12"/>
- <match value="6" type="little32" offset="12"/>
- <match value="7" type="little32" offset="12"/>
- <match value="23" type="little32" offset="12"/>
+ <match type="little32" value="0x0064732E" offset="0">
+ <match type="little32" value="1" offset="12"/>
+ <match type="little32" value="2" offset="12"/>
+ <match type="little32" value="3" offset="12"/>
+ <match type="little32" value="4" offset="12"/>
+ <match type="little32" value="5" offset="12"/>
+ <match type="little32" value="6" offset="12"/>
+ <match type="little32" value="7" offset="12"/>
+ <match type="little32" value="23" offset="12"/>
</match>
</magic>
</mime-type>
<mime-type type="audio/x-aifc">
<comment>AIFC audio</comment>
+ <comment xml:lang="af">AIFC-oudio</comment>
<comment xml:lang="ar">AIFC سمعي</comment>
<comment xml:lang="az">AIFC audio faylı</comment>
- <comment xml:lang="be@latin">Aŭdyjo AIFC</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo AIFC</comment>
<comment xml:lang="bg">Аудио — AIFC</comment>
<comment xml:lang="ca">àudio AIFC</comment>
<comment xml:lang="cs">zvuk AIFC</comment>
@@ -22562,13 +23412,14 @@
<comment xml:lang="da">AIFC-lyd</comment>
<comment xml:lang="de">AIFC-Audio</comment>
<comment xml:lang="el">Ήχος AIFC</comment>
- <comment xml:lang="en_GB">AIFC audio</comment>
+ <comment xml:lang="en-GB">AIFC audio</comment>
<comment xml:lang="eo">AIFC-sondosiero</comment>
- <comment xml:lang="es">sonido AIFC</comment>
+ <comment xml:lang="es">audio AIFC</comment>
<comment xml:lang="eu">AIFC audioa</comment>
<comment xml:lang="fi">AIFC-ääni</comment>
<comment xml:lang="fo">AIFC ljóður</comment>
<comment xml:lang="fr">audio AIFC</comment>
+ <comment xml:lang="fur">audio AIFC</comment>
<comment xml:lang="ga">fuaim AIFC</comment>
<comment xml:lang="gl">son AIFC</comment>
<comment xml:lang="he">שמע AIFC</comment>
@@ -22590,7 +23441,7 @@
<comment xml:lang="oc">àudio AIFC</comment>
<comment xml:lang="pl">Plik dźwiękowy AIFC</comment>
<comment xml:lang="pt">áudio AIFC</comment>
- <comment xml:lang="pt_BR">Áudio AIFC</comment>
+ <comment xml:lang="pt-BR">Áudio AIFC</comment>
<comment xml:lang="ro">Fișier audio AIFC</comment>
<comment xml:lang="ru">Аудио AIFC</comment>
<comment xml:lang="sk">Zvuk AIFC</comment>
@@ -22601,13 +23452,13 @@
<comment xml:lang="tr">AIFC sesi</comment>
<comment xml:lang="uk">звук AIFC</comment>
<comment xml:lang="vi">Âm thanh AIFC</comment>
- <comment xml:lang="zh_CN">AIFC 音频</comment>
- <comment xml:lang="zh_TW">AIFC 音訊</comment>
+ <comment xml:lang="zh-CN">AIFC 音频</comment>
+ <comment xml:lang="zh-TW">AIFC 音訊</comment>
<acronym>AIFC</acronym>
<expanded-acronym>Audio Interchange File format Compressed</expanded-acronym>
<sub-class-of type="application/x-iff"/>
<magic priority="50">
- <match value="AIFC" type="string" offset="8"/>
+ <match type="string" value="AIFC" offset="8"/>
</magic>
<glob pattern="*.aifc"/>
<glob pattern="*.aiffc"/>
@@ -22615,23 +23466,25 @@
</mime-type>
<mime-type type="audio/x-aiff">
<comment>AIFF/Amiga/Mac audio</comment>
+ <comment xml:lang="af">AIFF/Amiga/Mac-oudio</comment>
<comment xml:lang="ar">AIFF/Amiga/Mac سمعي</comment>
<comment xml:lang="az">AIFF/Amiga/Mac audio faylı</comment>
- <comment xml:lang="be@latin">Aŭdyjo AIFF/Amiga/Mac</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo AIFF/Amiga/Mac</comment>
<comment xml:lang="bg">Аудио — AIFF/Amiga/Mac</comment>
<comment xml:lang="ca">àudio AIFF/Amiga/Mac</comment>
<comment xml:lang="cs">zvuk AIFF/Amiga/Mac</comment>
<comment xml:lang="cy">Sain AIFF/Amiga/Mac</comment>
- <comment xml:lang="da">AIFF-/Amiga-/Maclyd</comment>
+ <comment xml:lang="da">AIFF-/Amiga-/Mac-lyd</comment>
<comment xml:lang="de">AIFF/Amiga/Mac-Audio</comment>
<comment xml:lang="el">Ήχος AIFF/Amiga/Mac</comment>
- <comment xml:lang="en_GB">AIFF/Amiga/Mac audio</comment>
+ <comment xml:lang="en-GB">AIFF/Amiga/Mac audio</comment>
<comment xml:lang="eo">AIFF/Amiga/Mac-sondosiero</comment>
- <comment xml:lang="es">sonido AIFF/Amiga/Mac</comment>
+ <comment xml:lang="es">audio AIFF/Amiga/Mac</comment>
<comment xml:lang="eu">AIFF/Amiga/Mac audioa</comment>
<comment xml:lang="fi">AIFF/Amiga/Mac-ääni</comment>
<comment xml:lang="fo">AIFF/Amiga/Mac ljóður</comment>
<comment xml:lang="fr">audio AIFF/Amiga/Mac</comment>
+ <comment xml:lang="fur">audio AIFF/Amiga/Mac</comment>
<comment xml:lang="ga">fuaim AIFF/Amiga/Mac</comment>
<comment xml:lang="gl">son AIFF/Amiga/Mac</comment>
<comment xml:lang="he">שמע AIFF/Amiga/Mac</comment>
@@ -22653,7 +23506,7 @@
<comment xml:lang="oc">àudio AIFF/Amiga/Mac</comment>
<comment xml:lang="pl">Plik dźwiękowy AIFF/Amiga/Mac</comment>
<comment xml:lang="pt">áudio AIFF/Amiga/Mac</comment>
- <comment xml:lang="pt_BR">Áudio AIFF/Amiga/Mac</comment>
+ <comment xml:lang="pt-BR">Áudio AIFF/Amiga/Mac</comment>
<comment xml:lang="ro">Audio AIFF/Amiga/Mac</comment>
<comment xml:lang="ru">Аудио AIFF/Amiga/Mac</comment>
<comment xml:lang="sk">Zvuk AIFF/Amiga/Mac</comment>
@@ -22664,14 +23517,14 @@
<comment xml:lang="tr">AIFF/Amiga/Mac sesi</comment>
<comment xml:lang="uk">звук AIFF/Amiga/Mac</comment>
<comment xml:lang="vi">Âm thanh AIFF/Amiga/Mac</comment>
- <comment xml:lang="zh_CN">AIFF/Amiga/Mac 音频</comment>
- <comment xml:lang="zh_TW">AIFF/Amiga/Mac 音訊</comment>
+ <comment xml:lang="zh-CN">AIFF/Amiga/Mac 音频</comment>
+ <comment xml:lang="zh-TW">AIFF/Amiga/Mac 音訊</comment>
<acronym>AIFF</acronym>
<expanded-acronym>Audio Interchange File Format</expanded-acronym>
<sub-class-of type="application/x-iff"/>
<magic priority="50">
- <match value="AIFF" type="string" offset="8"/>
- <match value="8SVX" type="string" offset="8"/>
+ <match type="string" value="AIFF" offset="8"/>
+ <match type="string" value="8SVX" offset="8"/>
</magic>
<glob pattern="*.aiff"/>
<glob pattern="*.aif"/>
@@ -22679,19 +23532,20 @@
<mime-type type="audio/x-ape">
<comment>Monkey's audio</comment>
<comment xml:lang="ar">Monkey سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo Monkey's</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Monkey's</comment>
<comment xml:lang="bg">Аудио — Monkey</comment>
<comment xml:lang="ca">àudio de Monkey</comment>
<comment xml:lang="cs">zvuk Monkey's</comment>
- <comment xml:lang="da">Monkeys lyd</comment>
+ <comment xml:lang="da">Monkey's-lyd</comment>
<comment xml:lang="de">Monkey's-Audio</comment>
<comment xml:lang="el">Ήχος Monkey's</comment>
- <comment xml:lang="en_GB">Monkey's audio</comment>
- <comment xml:lang="es">sonido de Monkey</comment>
+ <comment xml:lang="en-GB">Monkey's audio</comment>
+ <comment xml:lang="es">audio de Monkey</comment>
<comment xml:lang="eu">Monkey audioa</comment>
<comment xml:lang="fi">Monkey's Audio -ääni</comment>
<comment xml:lang="fo">Monkey's ljóður</comment>
<comment xml:lang="fr">audio Monkey</comment>
+ <comment xml:lang="fur">audio Monkey's</comment>
<comment xml:lang="ga">fuaim Monkey's</comment>
<comment xml:lang="gl">son de Monkey</comment>
<comment xml:lang="he">שמע של Monkey's</comment>
@@ -22711,7 +23565,7 @@
<comment xml:lang="oc">àudio Monkey</comment>
<comment xml:lang="pl">Plik dźwiękowy Monkey's Audio</comment>
<comment xml:lang="pt">áudio Monkey</comment>
- <comment xml:lang="pt_BR">Áudio Monkey's</comment>
+ <comment xml:lang="pt-BR">Áudio Monkey's</comment>
<comment xml:lang="ro">Audio Monkey's</comment>
<comment xml:lang="ru">Аудио Monkey's</comment>
<comment xml:lang="sk">Zvuk Monkey's</comment>
@@ -22722,20 +23576,27 @@
<comment xml:lang="tr">Monkey's sesi</comment>
<comment xml:lang="uk">звук Monkey's</comment>
<comment xml:lang="vi">Âm thanh cua Monkey</comment>
- <comment xml:lang="zh_CN">Monkey's Audio 音频</comment>
- <comment xml:lang="zh_TW">Monkey's 音訊</comment>
+ <comment xml:lang="zh-CN">Monkey's Audio 音频</comment>
+ <comment xml:lang="zh-TW">Monkey's 音訊</comment>
<magic priority="50">
- <match value="MAC " type="string" offset="0"/>
+ <match type="string" value="MAC " offset="0"/>
</magic>
<glob pattern="*.ape"/>
</mime-type>
<mime-type type="audio/x-pn-audibleaudio">
<comment>Audible.Com audio</comment>
- <comment xml:lang="ca">àudio Audible.Com</comment>
+ <comment xml:lang="bg">Аудио — Audible.Com</comment>
+ <comment xml:lang="ca">àudio d'Audible.Com</comment>
<comment xml:lang="cs">zvuk Audible.Com</comment>
+ <comment xml:lang="da">Audible.Com-lyd</comment>
<comment xml:lang="de">Audible.Com-Audio</comment>
- <comment xml:lang="en_GB">Audible.Com audio</comment>
- <comment xml:lang="es">sonido de Audible.com</comment>
+ <comment xml:lang="en-GB">Audible.Com audio</comment>
+ <comment xml:lang="es">audio de Audible.com</comment>
+ <comment xml:lang="eu">Audible.Com audioa</comment>
+ <comment xml:lang="fi">Audible.Com-ääni</comment>
+ <comment xml:lang="fr">audio Audible.Com</comment>
+ <comment xml:lang="fur">audio Audible.Com</comment>
+ <comment xml:lang="ga">fuaim Audible.Com</comment>
<comment xml:lang="hr">Audible.Com zvučni zapis</comment>
<comment xml:lang="hu">Audible.Com hang</comment>
<comment xml:lang="id">Audio Audible.Com</comment>
@@ -22743,28 +23604,46 @@
<comment xml:lang="kk">Audible.Com аудиосы</comment>
<comment xml:lang="ko">Audible.Com 오디오</comment>
<comment xml:lang="pl">Plik dźwiękowy Audible.com</comment>
- <comment xml:lang="pt_BR">Áudio de audible.com</comment>
+ <comment xml:lang="pt-BR">Áudio de audible.com</comment>
<comment xml:lang="ru">Аудио Audible.Com</comment>
<comment xml:lang="sk">Audio Audible.Com</comment>
<comment xml:lang="sv">Audible.Com-ljud</comment>
+ <comment xml:lang="tr">Audible.Com sesi</comment>
<comment xml:lang="uk">звук Audible.Com</comment>
- <comment xml:lang="zh_CN">Audible.Com 音频</comment>
- <comment xml:lang="zh_TW">Audible.Com 音訊</comment>
+ <comment xml:lang="zh-CN">Audible.Com 音频</comment>
+ <comment xml:lang="zh-TW">Audible.Com 音訊</comment>
<magic priority="50">
-
- <match value="1469084982" type="big32" offset="4"/>
- <match value="aax " type="string" offset="8"/>
+ <!-- https://github.com/FFmpeg/FFmpeg/blob/master/libavformat/aadec.c#L33 -->
+ <match type="big32" value="1469084982" offset="4"/>
</magic>
<glob pattern="*.aa"/>
- <glob pattern="*.aax"/>
<alias type="audio/vnd.audible"/>
- <alias type="audio/vnd.audible.aax"/>
+ </mime-type>
+ <mime-type type="audio/vnd.audible.aax">
+ <comment>Audible Enhanced audio</comment>
+ <comment xml:lang="ca">àudio d'Audible Enhanced</comment>
+ <comment xml:lang="da">Audible Enhanced-lyd</comment>
+ <comment xml:lang="de">Audible Erweitertes Audio</comment>
+ <comment xml:lang="en-GB">Audible Enhanced audio</comment>
+ <comment xml:lang="es">audio mejorado de Audible</comment>
+ <comment xml:lang="fi">Selvä parannettu ääni</comment>
+ <comment xml:lang="hr">Audible poboljšani zvučni zapis</comment>
+ <comment xml:lang="it">Audio Audible Enhanced</comment>
+ <comment xml:lang="pl">Plik dźwiękowy Audible Enhanced</comment>
+ <comment xml:lang="pt-BR">Áudio Audible Enhanced</comment>
+ <comment xml:lang="sv">Audible förbättrat ljud</comment>
+ <comment xml:lang="uk">звук Audible Enhanced</comment>
+ <comment xml:lang="zh-CN">Audible 增强音频</comment>
+ <magic priority="50">
+ <match type="string" value="ftypaax " offset="4"/>
+ </magic>
+ <glob pattern="*.aax"/>
</mime-type>
<mime-type type="audio/x-it">
<comment>Impulse Tracker audio</comment>
<comment xml:lang="ar">Impulse Tracker سمعي</comment>
<comment xml:lang="az">Impulse Tracker audio faylı</comment>
- <comment xml:lang="be@latin">Aŭdyjo Impulse Tracker</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Impulse Tracker</comment>
<comment xml:lang="bg">Аудио — Impulse Tracker</comment>
<comment xml:lang="ca">àudio d'Impulse Tracker</comment>
<comment xml:lang="cs">zvuk Impulse Tracker</comment>
@@ -22772,13 +23651,14 @@
<comment xml:lang="da">Impulse Tracker-lyd</comment>
<comment xml:lang="de">Impulse-Tracker-Audio</comment>
<comment xml:lang="el">Ήχος Impulse Tracker</comment>
- <comment xml:lang="en_GB">Impulse Tracker audio</comment>
+ <comment xml:lang="en-GB">Impulse Tracker audio</comment>
<comment xml:lang="eo">Sondosiero de Impulse Tracker</comment>
- <comment xml:lang="es">sonido de Impulse Tracker</comment>
+ <comment xml:lang="es">audio de Impulse Tracker</comment>
<comment xml:lang="eu">Impulse Tracker audioa</comment>
<comment xml:lang="fi">Impulse Tracker -ääni</comment>
<comment xml:lang="fo">Impulse Tracker ljóður</comment>
<comment xml:lang="fr">audio Impulse Tracker</comment>
+ <comment xml:lang="fur">audio Impulse Tracker</comment>
<comment xml:lang="ga">fuaim Impulse Tracker</comment>
<comment xml:lang="gl">son de Impulse Tracker</comment>
<comment xml:lang="he">שמע של Impulse Tracker</comment>
@@ -22799,7 +23679,7 @@
<comment xml:lang="oc">àudio Impulse Tracker</comment>
<comment xml:lang="pl">Plik dźwiękowy Impulse Tracker</comment>
<comment xml:lang="pt">áudio Impulse Tracker</comment>
- <comment xml:lang="pt_BR">Áudio Impulse Tracker</comment>
+ <comment xml:lang="pt-BR">Áudio Impulse Tracker</comment>
<comment xml:lang="ro">Audio Impulse Tracker</comment>
<comment xml:lang="ru">Аудио Impulse Tracker</comment>
<comment xml:lang="sk">Zvuk Impulse Tracker</comment>
@@ -22810,30 +23690,32 @@
<comment xml:lang="tr">Impulse Tracker sesi</comment>
<comment xml:lang="uk">звук Impulse Tracker</comment>
<comment xml:lang="vi">Âm thanh Impulse Tracker</comment>
- <comment xml:lang="zh_CN">Impulse Tracker 音频</comment>
- <comment xml:lang="zh_TW">Impulse Tracker 音訊</comment>
+ <comment xml:lang="zh-CN">Impulse Tracker 音频</comment>
+ <comment xml:lang="zh-TW">Impulse Tracker 音訊</comment>
<magic priority="50">
- <match value="IMPM" type="string" offset="0"/>
+ <match type="string" value="IMPM" offset="0"/>
</magic>
<glob pattern="*.it"/>
</mime-type>
<mime-type type="audio/flac">
<comment>FLAC audio</comment>
+ <comment xml:lang="af">FLAC-oudio</comment>
<comment xml:lang="ar">FLAC سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo FLAC</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo FLAC</comment>
<comment xml:lang="bg">Аудио — FLAC</comment>
<comment xml:lang="ca">àudio FLAC</comment>
<comment xml:lang="cs">zvuk FLAC</comment>
<comment xml:lang="da">FLAC-lyd</comment>
<comment xml:lang="de">FLAC-Audio</comment>
<comment xml:lang="el">Ήχος FLAC</comment>
- <comment xml:lang="en_GB">FLAC audio</comment>
+ <comment xml:lang="en-GB">FLAC audio</comment>
<comment xml:lang="eo">FLAC-sondosiero</comment>
- <comment xml:lang="es">sonido FLAC</comment>
+ <comment xml:lang="es">audio FLAC</comment>
<comment xml:lang="eu">FLAC audioa</comment>
<comment xml:lang="fi">FLAC-ääni</comment>
<comment xml:lang="fo">FLAC ljóður</comment>
<comment xml:lang="fr">audio FLAC</comment>
+ <comment xml:lang="fur">audio FLAC</comment>
<comment xml:lang="ga">fuaim FLAC</comment>
<comment xml:lang="gl">son FLAC</comment>
<comment xml:lang="he">קובץ שמע מסוג FLAC</comment>
@@ -22855,7 +23737,7 @@
<comment xml:lang="oc">àudio FLAC</comment>
<comment xml:lang="pl">Plik dźwiękowy FLAC</comment>
<comment xml:lang="pt">áudio FLAC</comment>
- <comment xml:lang="pt_BR">Áudio FLAC</comment>
+ <comment xml:lang="pt-BR">Áudio FLAC</comment>
<comment xml:lang="ro">Audio FLAC</comment>
<comment xml:lang="ru">Аудио FLAC</comment>
<comment xml:lang="sk">Zvuk FLAC</comment>
@@ -22866,8 +23748,8 @@
<comment xml:lang="tr">FLAC sesi</comment>
<comment xml:lang="uk">звук FLAC</comment>
<comment xml:lang="vi">Âm thanh FLAC</comment>
- <comment xml:lang="zh_CN">FLAC 音频</comment>
- <comment xml:lang="zh_TW">FLAC 音訊</comment>
+ <comment xml:lang="zh-CN">FLAC 音频</comment>
+ <comment xml:lang="zh-TW">FLAC 音訊</comment>
<magic priority="50">
<match value="fLaC" type="string" offset="0"/>
</magic>
@@ -22876,21 +23758,23 @@
</mime-type>
<mime-type type="audio/x-wavpack">
<comment>WavPack audio</comment>
+ <comment xml:lang="af">WavPack-oudio</comment>
<comment xml:lang="ar">WavPack سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo WavPack</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo WavPack</comment>
<comment xml:lang="bg">Аудио — WavPack</comment>
<comment xml:lang="ca">àudio de WavPack</comment>
<comment xml:lang="cs">zvuk WavPack</comment>
<comment xml:lang="da">WavPack-lyd</comment>
<comment xml:lang="de">WavPack-Audio</comment>
<comment xml:lang="el">Ήχος WavePack</comment>
- <comment xml:lang="en_GB">WavPack audio</comment>
+ <comment xml:lang="en-GB">WavPack audio</comment>
<comment xml:lang="eo">WavPack-sondosiero</comment>
- <comment xml:lang="es">sonido WavPack</comment>
+ <comment xml:lang="es">audio WavPack</comment>
<comment xml:lang="eu">WavPack audioa</comment>
<comment xml:lang="fi">WavPack-ääni</comment>
<comment xml:lang="fo">WavPack ljóður</comment>
<comment xml:lang="fr">audio WavPack</comment>
+ <comment xml:lang="fur">audio WavPack</comment>
<comment xml:lang="ga">fuaim WavPack</comment>
<comment xml:lang="gl">son WavPack</comment>
<comment xml:lang="he">שמע WavPack</comment>
@@ -22910,7 +23794,7 @@
<comment xml:lang="oc">àudio WavPack</comment>
<comment xml:lang="pl">Plik dźwiękowy WavPack</comment>
<comment xml:lang="pt">áudio WavPack</comment>
- <comment xml:lang="pt_BR">Áudio WavPack</comment>
+ <comment xml:lang="pt-BR">Áudio WavPack</comment>
<comment xml:lang="ro">Audio WavPack</comment>
<comment xml:lang="ru">Аудио WavPack</comment>
<comment xml:lang="sk">Zvuk WavPack</comment>
@@ -22921,10 +23805,10 @@
<comment xml:lang="tr">WavPack sesi</comment>
<comment xml:lang="uk">звук WavPack</comment>
<comment xml:lang="vi">Âm thanh WavPack</comment>
- <comment xml:lang="zh_CN">WavPack 音频</comment>
- <comment xml:lang="zh_TW">WavPack 音訊</comment>
+ <comment xml:lang="zh-CN">WavPack 音频</comment>
+ <comment xml:lang="zh-TW">WavPack 音訊</comment>
<magic priority="50">
- <match value="wvpk" type="string" offset="0"/>
+ <match type="string" value="wvpk" offset="0"/>
</magic>
<glob pattern="*.wv"/>
<glob pattern="*.wvp"/>
@@ -22932,19 +23816,20 @@
<mime-type type="audio/x-wavpack-correction">
<comment>WavPack audio correction file</comment>
<comment xml:lang="ar">ملف تصحيح WavPack السمعي</comment>
- <comment xml:lang="be@latin">Fajł aŭdyjokarekcyi WavPack</comment>
+ <comment xml:lang="be-Latn">Fajł aŭdyjokarekcyi WavPack</comment>
<comment xml:lang="bg">Файл за корекции на аудио — WavPack</comment>
<comment xml:lang="ca">fitxer de correcció d'àudio de WavPack</comment>
<comment xml:lang="cs">opravný zvukový soubor WavPack</comment>
<comment xml:lang="da">WavPack-lydkorrektionsfil</comment>
<comment xml:lang="de">WavPack-Audiokorrekturdatei</comment>
<comment xml:lang="el">Αρχείο διόρθωσης ήχου WavePack</comment>
- <comment xml:lang="en_GB">WavPack audio correction file</comment>
- <comment xml:lang="es">archivo de corrección de sonido WavPack</comment>
+ <comment xml:lang="en-GB">WavPack audio correction file</comment>
+ <comment xml:lang="es">archivo de corrección de audio WavPack</comment>
<comment xml:lang="eu">WavPack audio-zuzenketaren fitxategia</comment>
<comment xml:lang="fi">WavPack-äänikorjaustiedosto</comment>
<comment xml:lang="fo">WavPack ljóðrættingarfíla</comment>
<comment xml:lang="fr">fichier de correction audio WavPack</comment>
+ <comment xml:lang="fur">file di corezion audio WavPack</comment>
<comment xml:lang="ga">comhad ceartúchán fuaime WavPack</comment>
<comment xml:lang="gl">ficheiro de corrección de son WavPack</comment>
<comment xml:lang="he">קובץ תיקון שמע של WavPack</comment>
@@ -22964,7 +23849,7 @@
<comment xml:lang="oc">fichièr de correccion àudio WavPack</comment>
<comment xml:lang="pl">Plik korekcji dźwięku WavPack</comment>
<comment xml:lang="pt">ficheiro de correção áudio WavPack</comment>
- <comment xml:lang="pt_BR">Arquivo de correção de áudio WavPack</comment>
+ <comment xml:lang="pt-BR">Arquivo de correção de áudio WavPack</comment>
<comment xml:lang="ro">Fișier audio de corecție WavPack</comment>
<comment xml:lang="ru">Файл коррекции аудио WavPack</comment>
<comment xml:lang="sk">Opravný zvukový súbor WavPack</comment>
@@ -22975,18 +23860,19 @@
<comment xml:lang="tr">WavPack ses düzeltme dosyası</comment>
<comment xml:lang="uk">файл корекції звуку WavPack</comment>
<comment xml:lang="vi">Tập tin sửa chữa âm thanh WavPack</comment>
- <comment xml:lang="zh_CN">WavPack 音频校正文件</comment>
- <comment xml:lang="zh_TW">WavPack 音訊校正檔</comment>
+ <comment xml:lang="zh-CN">WavPack 音频校正文件</comment>
+ <comment xml:lang="zh-TW">WavPack 音訊校正檔</comment>
<magic priority="50">
- <match value="wvpk" type="string" offset="0"/>
+ <match type="string" value="wvpk" offset="0"/>
</magic>
<glob pattern="*.wvc"/>
</mime-type>
<mime-type type="audio/midi">
<comment>MIDI audio</comment>
+ <comment xml:lang="af">MIDI-oudio</comment>
<comment xml:lang="ar">MIDI سمعي</comment>
<comment xml:lang="az">MIDI audio faylı</comment>
- <comment xml:lang="be@latin">Aŭdyjo MIDI</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo MIDI</comment>
<comment xml:lang="bg">Аудио — MIDI</comment>
<comment xml:lang="ca">àudio MIDI</comment>
<comment xml:lang="cs">zvuk MIDI</comment>
@@ -22994,13 +23880,14 @@
<comment xml:lang="da">MIDI-lyd</comment>
<comment xml:lang="de">MIDI-Audio</comment>
<comment xml:lang="el">Ήχος MIDI</comment>
- <comment xml:lang="en_GB">MIDI audio</comment>
+ <comment xml:lang="en-GB">MIDI audio</comment>
<comment xml:lang="eo">MIDI-sondosiero</comment>
- <comment xml:lang="es">sonido MIDI</comment>
+ <comment xml:lang="es">audio MIDI</comment>
<comment xml:lang="eu">MIDI audioa</comment>
<comment xml:lang="fi">MIDI-ääni</comment>
<comment xml:lang="fo">MIDI ljóður</comment>
<comment xml:lang="fr">audio MIDI</comment>
+ <comment xml:lang="fur">audio MIDI</comment>
<comment xml:lang="ga">fuaim MIDI</comment>
<comment xml:lang="gl">son MIDI</comment>
<comment xml:lang="he">שמע MIDI</comment>
@@ -23021,7 +23908,7 @@
<comment xml:lang="oc">àudio MIDI</comment>
<comment xml:lang="pl">Plik dźwiękowy MIDI</comment>
<comment xml:lang="pt">áudio MIDI</comment>
- <comment xml:lang="pt_BR">Áudio MIDI</comment>
+ <comment xml:lang="pt-BR">Áudio MIDI</comment>
<comment xml:lang="ro">Audio MIDI</comment>
<comment xml:lang="ru">Аудио MIDI</comment>
<comment xml:lang="sk">Zvuk MIDI</comment>
@@ -23032,11 +23919,11 @@
<comment xml:lang="tr">MIDI sesi</comment>
<comment xml:lang="uk">звук MIDI</comment>
<comment xml:lang="vi">Âm thanh MIDI</comment>
- <comment xml:lang="zh_CN">MIDI 音频</comment>
- <comment xml:lang="zh_TW">MIDI 音訊</comment>
+ <comment xml:lang="zh-CN">MIDI 音频</comment>
+ <comment xml:lang="zh-TW">MIDI 音訊</comment>
<alias type="audio/x-midi"/>
<magic priority="50">
- <match value="MThd" type="string" offset="0"/>
+ <match type="string" value="MThd" offset="0"/>
</magic>
<glob pattern="*.mid"/>
<glob pattern="*.midi"/>
@@ -23045,19 +23932,20 @@
<mime-type type="audio/x-mo3">
<comment>compressed Tracker audio</comment>
<comment xml:lang="ar">Tracker سمعي مضغوط</comment>
- <comment xml:lang="be@latin">aŭdyjo skampresavanaha Trackera</comment>
+ <comment xml:lang="be-Latn">aŭdyjo skampresavanaha Trackera</comment>
<comment xml:lang="bg">Аудио — Tracker, компресирано</comment>
<comment xml:lang="ca">àudio Tracker amb compressió</comment>
<comment xml:lang="cs">komprimovaný zvuk Tracker</comment>
- <comment xml:lang="da">Trackerkomprimeret lyd</comment>
+ <comment xml:lang="da">komprimeret trackerlyd</comment>
<comment xml:lang="de">Komprimiertes Tracker-Audio</comment>
<comment xml:lang="el">Συμπιεσμένος ήχος Tracker</comment>
- <comment xml:lang="en_GB">compressed Tracker audio</comment>
- <comment xml:lang="es">sonido de Tracker comprimido</comment>
+ <comment xml:lang="en-GB">compressed Tracker audio</comment>
+ <comment xml:lang="es">audio de Tracker comprimido</comment>
<comment xml:lang="eu">konprimitutako Tracker audioa</comment>
<comment xml:lang="fi">pakattu Tracker-ääni</comment>
<comment xml:lang="fo">stappað Tracker ljóður</comment>
<comment xml:lang="fr">audio Tracker compressé</comment>
+ <comment xml:lang="fur">audio Tracker comprimût</comment>
<comment xml:lang="ga">fuaim chomhbhrúite Tracker</comment>
<comment xml:lang="gl">son comprimido de Tracker</comment>
<comment xml:lang="he">שמע גשש מכווץ</comment>
@@ -23076,7 +23964,7 @@
<comment xml:lang="oc">àudio Tracker compressat</comment>
<comment xml:lang="pl">Skompresowany plik dźwiękowy Tracker</comment>
<comment xml:lang="pt">áudio comprimido Tracker</comment>
- <comment xml:lang="pt_BR">Áudio Tracker compactado</comment>
+ <comment xml:lang="pt-BR">Áudio Tracker compactado</comment>
<comment xml:lang="ro">Tracker audio comprimat</comment>
<comment xml:lang="ru">Сжатое аудио Tracker</comment>
<comment xml:lang="sk">Komprimovaný zvuk Tracker</comment>
@@ -23087,25 +23975,28 @@
<comment xml:lang="tr">sıkıştırılmış Tracker sesi</comment>
<comment xml:lang="uk">стиснутий звук Tracker</comment>
<comment xml:lang="vi">âm thanh Tracker đã nén</comment>
- <comment xml:lang="zh_CN">压缩的 Tracker 音频</comment>
- <comment xml:lang="zh_TW">壓縮版 Tracker 音訊</comment>
+ <comment xml:lang="zh-CN">压缩的 Tracker 音频</comment>
+ <comment xml:lang="zh-TW">壓縮版 Tracker 音訊</comment>
<magic priority="50">
- <match value="MO3" type="string" offset="0"/>
+ <match type="string" value="MO3" offset="0"/>
</magic>
<glob pattern="*.mo3"/>
</mime-type>
<mime-type type="audio/aac">
<comment>AAC audio</comment>
+ <comment xml:lang="af">AAC-oudio</comment>
+ <comment xml:lang="bg">Аудио — AAC</comment>
<comment xml:lang="ca">àudio AAC</comment>
<comment xml:lang="cs">zvuk AAC</comment>
<comment xml:lang="da">AAC-lyd</comment>
<comment xml:lang="de">AAC-Audio</comment>
<comment xml:lang="el">Ήχος AAC</comment>
- <comment xml:lang="en_GB">AAC audio</comment>
- <comment xml:lang="es">sonido AAC</comment>
+ <comment xml:lang="en-GB">AAC audio</comment>
+ <comment xml:lang="es">audio AAC</comment>
<comment xml:lang="eu">AAC audioa</comment>
<comment xml:lang="fi">AAC-ääni</comment>
<comment xml:lang="fr">audio AAC</comment>
+ <comment xml:lang="fur">audio AAC</comment>
<comment xml:lang="ga">fuaim AAC</comment>
<comment xml:lang="gl">Son AAC</comment>
<comment xml:lang="he">שמע AAC</comment>
@@ -23121,7 +24012,7 @@
<comment xml:lang="oc">àudio AAC</comment>
<comment xml:lang="pl">Plik dźwiękowy AAC</comment>
<comment xml:lang="pt">áudio AAC</comment>
- <comment xml:lang="pt_BR">Áudio AAC</comment>
+ <comment xml:lang="pt-BR">Áudio AAC</comment>
<comment xml:lang="ru">Аудио AAC</comment>
<comment xml:lang="sk">Zvuk AAC</comment>
<comment xml:lang="sl">Zvok AAC</comment>
@@ -23129,21 +24020,49 @@
<comment xml:lang="sv">AAC-ljud</comment>
<comment xml:lang="tr">AAC sesi</comment>
<comment xml:lang="uk">звукові дані AAC</comment>
- <comment xml:lang="zh_CN">AAC 音频</comment>
- <comment xml:lang="zh_TW">AAC 音訊</comment>
+ <comment xml:lang="zh-CN">AAC 音频</comment>
+ <comment xml:lang="zh-TW">AAC 音訊</comment>
<acronym>AAC</acronym>
<expanded-acronym>Advanced Audio Coding</expanded-acronym>
<magic priority="50">
- <match value="ADIF" type="string" offset="0"/>
- <match value="0xFFF0" type="big16" offset="0" mask="0xFFF6"/>
+ <match type="string" value="ADIF" offset="0"/>
+ <match type="big16" value="0xFFF0" mask="0xFFF6" offset="0"/>
</magic>
<glob pattern="*.aac"/>
<glob pattern="*.adts"/>
- <glob weight="10" pattern="*.ass"/>
+ <glob pattern="*.ass" weight="10"/>
<alias type="audio/x-aac"/>
</mime-type>
<mime-type type="audio/usac">
<comment>USAC audio</comment>
+ <comment xml:lang="af">USAC-oudio</comment>
+ <comment xml:lang="bg">Аудио — USAC</comment>
+ <comment xml:lang="ca">àudio USAC</comment>
+ <comment xml:lang="cs">zvuk USAC</comment>
+ <comment xml:lang="da">USAC-lyd</comment>
+ <comment xml:lang="de">USAC-Audio</comment>
+ <comment xml:lang="en-GB">USAC audio</comment>
+ <comment xml:lang="es">audio USAC</comment>
+ <comment xml:lang="eu">USAC audioa</comment>
+ <comment xml:lang="fi">USAC-ääni</comment>
+ <comment xml:lang="fr">audio USAC</comment>
+ <comment xml:lang="fur">audio USAC</comment>
+ <comment xml:lang="ga">fuaim USAC</comment>
+ <comment xml:lang="hr">USAC zvučni zapis</comment>
+ <comment xml:lang="hu">USAC hang</comment>
+ <comment xml:lang="id">Audio USAC</comment>
+ <comment xml:lang="it">Audio USAC</comment>
+ <comment xml:lang="kk">USAC аудиосы</comment>
+ <comment xml:lang="ko">USAC 오디오</comment>
+ <comment xml:lang="pl">Plik dźwiękowy USAC</comment>
+ <comment xml:lang="pt-BR">Áudio USAC</comment>
+ <comment xml:lang="ru">Аудио USAC</comment>
+ <comment xml:lang="sk">Zvuk USAC</comment>
+ <comment xml:lang="sv">USAC-ljud</comment>
+ <comment xml:lang="tr">USAC sesi</comment>
+ <comment xml:lang="uk">звукові дані USAC</comment>
+ <comment xml:lang="zh-CN">USAC 音频</comment>
+ <comment xml:lang="zh-TW">USAC 音訊</comment>
<acronym>USAC</acronym>
<expanded-acronym>Unified Speech and Audio Coding</expanded-acronym>
<glob pattern="*.loas"/>
@@ -23151,21 +24070,23 @@
</mime-type>
<mime-type type="audio/mp4">
<comment>MPEG-4 audio</comment>
+ <comment xml:lang="af">MPEG-4-oudio</comment>
<comment xml:lang="ar">MPEG-4 سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo MPEG-4</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo MPEG-4</comment>
<comment xml:lang="bg">Аудио — MPEG-4</comment>
<comment xml:lang="ca">àudio MPEG-4</comment>
<comment xml:lang="cs">zvuk MPEG-4</comment>
<comment xml:lang="da">MPEG4-lyd</comment>
<comment xml:lang="de">MPEG-4-Audio</comment>
<comment xml:lang="el">Ήχος MPEG-4</comment>
- <comment xml:lang="en_GB">MPEG-4 audio</comment>
+ <comment xml:lang="en-GB">MPEG-4 audio</comment>
<comment xml:lang="eo">MPEG4-sondosiero</comment>
- <comment xml:lang="es">sonido MPEG-4</comment>
+ <comment xml:lang="es">audio MPEG-4</comment>
<comment xml:lang="eu">MPEG-4 audioa</comment>
<comment xml:lang="fi">MPEG-4-ääni</comment>
<comment xml:lang="fo">MPEG-4 ljóður</comment>
<comment xml:lang="fr">audio MPEG-4</comment>
+ <comment xml:lang="fur">audio MPEG-4</comment>
<comment xml:lang="ga">fuaim MPEG-4</comment>
<comment xml:lang="gl">son MPEG-4</comment>
<comment xml:lang="he">שמע MPEG-4</comment>
@@ -23186,7 +24107,7 @@
<comment xml:lang="oc">àudio MPEG-4</comment>
<comment xml:lang="pl">Plik dźwiękowy MPEG-4</comment>
<comment xml:lang="pt">áudio MPEG-4</comment>
- <comment xml:lang="pt_BR">Áudio MPEG-4</comment>
+ <comment xml:lang="pt-BR">Áudio MPEG-4</comment>
<comment xml:lang="ro">Audio MPEG-4</comment>
<comment xml:lang="ru">Аудио MPEG-4</comment>
<comment xml:lang="sk">Zvuk MPEG-4</comment>
@@ -23197,39 +24118,65 @@
<comment xml:lang="tr">MPEG-4 sesi</comment>
<comment xml:lang="uk">звук MPEG-4</comment>
<comment xml:lang="vi">Âm thanh MPEG-4</comment>
- <comment xml:lang="zh_CN">MPEG-4 音频</comment>
- <comment xml:lang="zh_TW">MPEG-4 音訊</comment>
+ <comment xml:lang="zh-CN">MPEG-4 音频</comment>
+ <comment xml:lang="zh-TW">MPEG-4 音訊</comment>
<alias type="audio/x-m4a"/>
<alias type="audio/m4a"/>
<magic priority="50">
- <match value="ftypM4A" type="string" offset="4"/>
+ <match type="string" value="ftypM4A" offset="4"/>
</magic>
<glob pattern="*.m4a"/>
<glob pattern="*.f4a"/>
</mime-type>
<mime-type type="audio/x-m4r">
- <comment>MPEG-4 Ringtone</comment>
+ <comment>MPEG-4 ringtone</comment>
+ <comment xml:lang="bg">Аудио — MPEG-4, звънене</comment>
+ <comment xml:lang="ca">to de trucada MPEG-4</comment>
+ <comment xml:lang="da">MPEG-4-ringetone</comment>
+ <comment xml:lang="de">MPEG-4-Klingelton</comment>
+ <comment xml:lang="en-GB">MPEG-4 ringtone</comment>
+ <comment xml:lang="es">tono de llamada MPEG-4</comment>
+ <comment xml:lang="eu">MPEG-4 dei-tonua</comment>
+ <comment xml:lang="fi">MPEG-4-soittoääni</comment>
+ <comment xml:lang="fr">sonnerie MPEG-4</comment>
+ <comment xml:lang="hr">MPEG-4 melodija zvona</comment>
+ <comment xml:lang="hu">MPEG-4 csengőhang</comment>
+ <comment xml:lang="id">Nada panggil MPEG-4</comment>
+ <comment xml:lang="it">Suoneria MPEG-4</comment>
+ <comment xml:lang="kk">MPEG-4 рингтоны</comment>
+ <comment xml:lang="ko">MPEG-4 벨소리</comment>
+ <comment xml:lang="pl">Dzwonek MPEG-4</comment>
+ <comment xml:lang="pt-BR">Toque MPEG-4</comment>
+ <comment xml:lang="ru">Мелодия MPEG-4</comment>
+ <comment xml:lang="sk">Zvonenie MPEG-4</comment>
+ <comment xml:lang="sv">MPEG-4-ringsignal</comment>
+ <comment xml:lang="tr">MPEG-4 zil sesi</comment>
+ <comment xml:lang="uk">рингтон MPEG-4</comment>
+ <comment xml:lang="zh-CN">MPEG-4 铃声</comment>
+ <comment xml:lang="zh-TW">MPEG-4 鈴聲</comment>
<glob pattern="*.m4r"/>
<sub-class-of type="video/mp4"/>
</mime-type>
<mime-type type="video/mp4">
<comment>MPEG-4 video</comment>
+ <comment xml:lang="af">MPEG-4-video</comment>
<comment xml:lang="ar">MPEG-4 مرئي</comment>
<comment xml:lang="ast">Videu en MPEG-4</comment>
- <comment xml:lang="be@latin">Videa MPEG-4</comment>
+ <comment xml:lang="be-Latn">Videa MPEG-4</comment>
<comment xml:lang="bg">Видео — MPEG-4</comment>
<comment xml:lang="ca">vídeo MPEG-4</comment>
<comment xml:lang="cs">video MPEG-4</comment>
<comment xml:lang="da">MPEG4-video</comment>
<comment xml:lang="de">MPEG-4-Video</comment>
<comment xml:lang="el">Βίντεο MPEG-4</comment>
- <comment xml:lang="en_GB">MPEG-4 video</comment>
+ <comment xml:lang="en-GB">MPEG-4 video</comment>
<comment xml:lang="eo">MPEG-4-video</comment>
<comment xml:lang="es">vídeo MPEG-4</comment>
<comment xml:lang="eu">MPEG-4 bideoa</comment>
<comment xml:lang="fi">MPEG-4-video</comment>
<comment xml:lang="fo">MPEG-4 video</comment>
<comment xml:lang="fr">vidéo MPEG-4</comment>
+ <comment xml:lang="fur">video MPEG-4</comment>
<comment xml:lang="ga">físeán MPEG-4</comment>
<comment xml:lang="gl">vídeo MPEG-4</comment>
<comment xml:lang="he">וידאו MPEG-4</comment>
@@ -23250,7 +24197,7 @@
<comment xml:lang="oc">vidèo MPEG-4</comment>
<comment xml:lang="pl">Plik wideo MPEG-4</comment>
<comment xml:lang="pt">vídeo MPEG-4</comment>
- <comment xml:lang="pt_BR">Vídeo MPEG-4</comment>
+ <comment xml:lang="pt-BR">Vídeo MPEG-4</comment>
<comment xml:lang="ro">Video MPEG-4</comment>
<comment xml:lang="ru">Видео MPEG-4</comment>
<comment xml:lang="sk">Video MPEG-4</comment>
@@ -23261,15 +24208,16 @@
<comment xml:lang="tr">MPEG-4 video</comment>
<comment xml:lang="uk">відеокліп MPEG-4</comment>
<comment xml:lang="vi">Ảnh động MPEG-4</comment>
- <comment xml:lang="zh_CN">MPEG-4 视频</comment>
- <comment xml:lang="zh_TW">MPEG-4 視訊</comment>
+ <comment xml:lang="zh-CN">MPEG-4 视频</comment>
+ <comment xml:lang="zh-TW">MPEG-4 視訊</comment>
<alias type="video/mp4v-es"/>
<magic priority="50">
- <match value="ftypisom" type="string" offset="4"/>
- <match value="ftypmp42" type="string" offset="4"/>
- <match value="ftypMSNV" type="string" offset="4"/>
- <match value="ftypM4V " type="string" offset="4"/>
- <match value="ftypf4v " type="string" offset="4"/>
+ <match type="string" value="ftypisom" offset="4"/>
+ <match type="string" value="ftypmp41" offset="4"/>
+ <match type="string" value="ftypmp42" offset="4"/>
+ <match type="string" value="ftypMSNV" offset="4"/>
+ <match type="string" value="ftypM4V " offset="4"/>
+ <match type="string" value="ftypf4v " offset="4"/>
</magic>
<glob pattern="*.mp4"/>
<glob pattern="*.m4v"/>
@@ -23279,21 +24227,23 @@
</mime-type>
<mime-type type="audio/x-m4b">
<comment>MPEG-4 audio book</comment>
+ <comment xml:lang="af">MPEG-4-oudioboek</comment>
<comment xml:lang="ar">كتاب MPEG-4 السمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjokniha MPEG-4</comment>
+ <comment xml:lang="be-Latn">Aŭdyjokniha MPEG-4</comment>
<comment xml:lang="bg">Аудио книга — MPEG-4</comment>
<comment xml:lang="ca">llibre d'àudio MPEG-4</comment>
<comment xml:lang="cs">zvuková kniha MPEG-4</comment>
<comment xml:lang="da">MPEG4-lydbog</comment>
<comment xml:lang="de">MPEG-4-Hörbuch</comment>
<comment xml:lang="el">Ηχητικό βιβλίο MPEG-4</comment>
- <comment xml:lang="en_GB">MPEG-4 audio book</comment>
+ <comment xml:lang="en-GB">MPEG-4 audio book</comment>
<comment xml:lang="eo">MPEG-4-sonlibro</comment>
<comment xml:lang="es">audiolibro MPEG-4</comment>
<comment xml:lang="eu">MPEG-4 audio-liburua</comment>
<comment xml:lang="fi">MPEG-4-äänikirja</comment>
<comment xml:lang="fo">MPEG-4 ljóðbók</comment>
<comment xml:lang="fr">livre audio MPEG-4</comment>
+ <comment xml:lang="fur">audio-libri MPEG-4</comment>
<comment xml:lang="ga">closleabhar MPEG-4</comment>
<comment xml:lang="gl">sonlibro de MPEG-4</comment>
<comment xml:lang="he">ספר דיגיטלי MPEG-4</comment>
@@ -23314,7 +24264,7 @@
<comment xml:lang="oc">libre àudio MPEG-4</comment>
<comment xml:lang="pl">Książka dźwiękowa MPEG-4</comment>
<comment xml:lang="pt">livro áudio MPEG-4</comment>
- <comment xml:lang="pt_BR">Áudio livro MPEG-4</comment>
+ <comment xml:lang="pt-BR">Áudio livro MPEG-4</comment>
<comment xml:lang="ro">Carte audio MPEG-4</comment>
<comment xml:lang="ru">Аудиокнига MPEG-4</comment>
<comment xml:lang="sk">Zvuková kniha MPEG-4</comment>
@@ -23325,31 +24275,33 @@
<comment xml:lang="tr">MPEG-4 sesli kitabı</comment>
<comment xml:lang="uk">аудіокнига MPEG-4</comment>
<comment xml:lang="vi">Sách âm thanh MPEG-4</comment>
- <comment xml:lang="zh_CN">MPEG-4 有声书</comment>
- <comment xml:lang="zh_TW">MPEG-4 音訊書</comment>
+ <comment xml:lang="zh-CN">MPEG-4 有声书</comment>
+ <comment xml:lang="zh-TW">MPEG-4 音訊書</comment>
<sub-class-of type="audio/mp4"/>
<magic priority="50">
- <match value="ftypM4B" type="string" offset="4"/>
+ <match type="string" value="ftypM4B" offset="4"/>
</magic>
<glob pattern="*.m4b"/>
<glob pattern="*.f4b"/>
</mime-type>
<mime-type type="video/3gpp">
<comment>3GPP multimedia file</comment>
+ <comment xml:lang="af">3GPP-multimedialêer</comment>
<comment xml:lang="ar">ملف وسائط متعددة 3GPP</comment>
- <comment xml:lang="be@latin">Multymedyjny fajł 3GPP</comment>
+ <comment xml:lang="be-Latn">Multymedyjny fajł 3GPP</comment>
<comment xml:lang="bg">Мултимедия — 3GPP</comment>
<comment xml:lang="ca">fitxer multimèdia 3GPP</comment>
<comment xml:lang="cs">multimediální soubor 3GPP</comment>
<comment xml:lang="da">3GPP multimedie-fil</comment>
<comment xml:lang="de">3GPP-Multimediadatei</comment>
<comment xml:lang="el">Αρχείο πολυμέσων 3GPP</comment>
- <comment xml:lang="en_GB">3GPP multimedia file</comment>
+ <comment xml:lang="en-GB">3GPP multimedia file</comment>
<comment xml:lang="es">archivo multimedia 3GPP</comment>
<comment xml:lang="eu">3GPP multimediako fitxategia</comment>
<comment xml:lang="fi">3GPP-multimediatiedosto</comment>
<comment xml:lang="fo">3GGP margmiðlafíla</comment>
<comment xml:lang="fr">fichier multimédia 3GPP</comment>
+ <comment xml:lang="fur">file multimediâl 3GPP</comment>
<comment xml:lang="ga">comhad ilmheán 3GPP</comment>
<comment xml:lang="gl">ficheiro multimedia 3GPP</comment>
<comment xml:lang="he">קובץ מולטימדיה מסוג 3GPP</comment>
@@ -23370,7 +24322,7 @@
<comment xml:lang="oc">fichièr multimèdia 3GPP</comment>
<comment xml:lang="pl">Plik multimedialny 3GPP</comment>
<comment xml:lang="pt">ficheiro multimédia 3GPP</comment>
- <comment xml:lang="pt_BR">Arquivo multimídia 3GPP</comment>
+ <comment xml:lang="pt-BR">Arquivo multimídia 3GPP</comment>
<comment xml:lang="ro">Fișier multimedia 3GPP</comment>
<comment xml:lang="ru">Мультимедийный файл 3GPP</comment>
<comment xml:lang="sk">Súbor multimédií 3GPP</comment>
@@ -23378,19 +24330,19 @@
<comment xml:lang="sq">File multimedial 3GPP</comment>
<comment xml:lang="sr">3ГПП мултимедијална датотека</comment>
<comment xml:lang="sv">3GPP-multimediafil</comment>
- <comment xml:lang="tr">3GPP multimedya dosyası</comment>
+ <comment xml:lang="tr">3GPP çoklu ortam dosyası</comment>
<comment xml:lang="uk">файл мультимедійних даних 3GPP</comment>
<comment xml:lang="vi">Tập tin đa phương tiện 3GPP</comment>
- <comment xml:lang="zh_CN">3GPP 多媒体文件</comment>
- <comment xml:lang="zh_TW">3GPP 多媒體檔案</comment>
+ <comment xml:lang="zh-CN">3GPP 多媒体文件</comment>
+ <comment xml:lang="zh-TW">3GPP 多媒體檔案</comment>
<acronym>3GPP</acronym>
<expanded-acronym>3rd Generation Partnership Project</expanded-acronym>
<sub-class-of type="video/mp4"/>
<magic priority="50">
- <match value="ftyp3ge" type="string" offset="4"/>
- <match value="ftyp3gg" type="string" offset="4"/>
- <match value="ftyp3gp" type="string" offset="4"/>
- <match value="ftyp3gs" type="string" offset="4"/>
+ <match type="string" value="ftyp3ge" offset="4"/>
+ <match type="string" value="ftyp3gg" offset="4"/>
+ <match type="string" value="ftyp3gp" offset="4"/>
+ <match type="string" value="ftyp3gs" offset="4"/>
</magic>
<glob pattern="*.3gp"/>
<glob pattern="*.3gpp"/>
@@ -23406,6 +24358,7 @@
</mime-type>
<mime-type type="video/3gpp2">
<comment>3GPP2 multimedia file</comment>
+ <comment xml:lang="af">3GPP2-multimedialêer</comment>
<comment xml:lang="ar">ملف وسائط متعددة 3GPP2</comment>
<comment xml:lang="bg">Мултимедия — 3GPP2</comment>
<comment xml:lang="ca">fitxer multimèdia 3GPP2</comment>
@@ -23413,12 +24366,13 @@
<comment xml:lang="da">3GPP2 multimedie-fil</comment>
<comment xml:lang="de">3GPP2-Multimediadatei</comment>
<comment xml:lang="el">Αρχείο πολυμέσων 3GPP2</comment>
- <comment xml:lang="en_GB">3GPP2 multimedia file</comment>
+ <comment xml:lang="en-GB">3GPP2 multimedia file</comment>
<comment xml:lang="es">archivo multimedia 3GPP2</comment>
<comment xml:lang="eu">3GPP2 multimediako fitxategia</comment>
<comment xml:lang="fi">3GPP2-multimediatiedosto</comment>
<comment xml:lang="fo">3GGP2 margmiðlafíla</comment>
<comment xml:lang="fr">fichier multimédia 3GPP2</comment>
+ <comment xml:lang="fur">file multimediâl 3GPP2</comment>
<comment xml:lang="ga">comhad ilmheán 3GPP2</comment>
<comment xml:lang="gl">ficheiro multimedia 3GPP2</comment>
<comment xml:lang="he">קובץ מולטימדיה 3GPP2</comment>
@@ -23436,22 +24390,21 @@
<comment xml:lang="oc">fichièr multimèdia 3GPP2</comment>
<comment xml:lang="pl">Plik multimedialny 3GPP2</comment>
<comment xml:lang="pt">ficheiro multimédia 3GPP2</comment>
- <comment xml:lang="pt_BR">Arquivo multimídia 3GPP2</comment>
+ <comment xml:lang="pt-BR">Arquivo multimídia 3GPP2</comment>
<comment xml:lang="ro">Fișier multimedia 3GPP2</comment>
<comment xml:lang="ru">Мультимедийный файл 3GPP2</comment>
<comment xml:lang="sk">Súbor multimédií 3GPP2</comment>
<comment xml:lang="sl">Večpredstavnostna datoteka 3GPP2</comment>
<comment xml:lang="sr">3ГПП2 мултимедијална датотека</comment>
<comment xml:lang="sv">3GPP2-multimediafil</comment>
- <comment xml:lang="tr">3GPP2 multimedya dosyası</comment>
+ <comment xml:lang="tr">3GPP2 çoklu ortam dosyası</comment>
<comment xml:lang="uk">файл мультимедійних даних 3GPP2</comment>
- <comment xml:lang="zh_CN">3GPP2 多媒体文件</comment>
- <comment xml:lang="zh_TW">3GPP2 多媒體檔案</comment>
+ <comment xml:lang="zh-CN">3GPP2 多媒体文件</comment>
+ <comment xml:lang="zh-TW">3GPP2 多媒體檔案</comment>
<acronym>3GPP2</acronym>
<expanded-acronym>3rd Generation Partnership Project 2</expanded-acronym>
- <sub-class-of type="video/mp4"/>
<magic priority="50">
- <match value="ftyp3g2" type="string" offset="4"/>
+ <match type="string" value="ftyp3g2" offset="4"/>
</magic>
<glob pattern="*.3g2"/>
<glob pattern="*.3gp2"/>
@@ -23461,20 +24414,21 @@
<mime-type type="audio/x-mod">
<comment>Amiga SoundTracker audio</comment>
<comment xml:lang="ar">مقتفي صوت Amiga السمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo Amiga SoundTracker</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Amiga SoundTracker</comment>
<comment xml:lang="bg">Аудио — Amiga SoundTracker</comment>
<comment xml:lang="ca">àudio SoundTracker d'Amiga</comment>
<comment xml:lang="cs">zvuk Amiga SoundTracker</comment>
<comment xml:lang="da">Amiga SoundTracker-lyd</comment>
<comment xml:lang="de">Amiga-SoundTracker-Audio</comment>
<comment xml:lang="el">Ήχος Amiga SoundTracker</comment>
- <comment xml:lang="en_GB">Amiga SoundTracker audio</comment>
+ <comment xml:lang="en-GB">Amiga SoundTracker audio</comment>
<comment xml:lang="eo">Sondosiero de Amiga SoundTracker</comment>
- <comment xml:lang="es">sonido de Amiga SoundTracker</comment>
+ <comment xml:lang="es">audio de Amiga SoundTracker</comment>
<comment xml:lang="eu">Amiga soundtracker audioa</comment>
<comment xml:lang="fi">Amiga SoundTracker -ääni</comment>
<comment xml:lang="fo">Amiga SoundTracker ljóður</comment>
<comment xml:lang="fr">audio SoundTracker Amiga</comment>
+ <comment xml:lang="fur">audio Amiga SoundTracker</comment>
<comment xml:lang="ga">fuaim Amiga SoundTracker</comment>
<comment xml:lang="gl">son de Amiga SoundTracker</comment>
<comment xml:lang="he">קובץ שמע של Amiga SoundTracker</comment>
@@ -23496,7 +24450,7 @@
<comment xml:lang="oc">àudio SoundTracker Amiga</comment>
<comment xml:lang="pl">Plik dźwiękowy Amiga SoundTracker</comment>
<comment xml:lang="pt">áudio SoundTracker do Amiga</comment>
- <comment xml:lang="pt_BR">Áudio Amiga SoundTracker</comment>
+ <comment xml:lang="pt-BR">Áudio Amiga SoundTracker</comment>
<comment xml:lang="ro">Audio Amiga SoundTracker</comment>
<comment xml:lang="ru">Аудио Amiga SoundTracker</comment>
<comment xml:lang="sk">Zvuk Amiga SoundTracker</comment>
@@ -23507,41 +24461,60 @@
<comment xml:lang="tr">Amiga SoundTracker sesi</comment>
<comment xml:lang="uk">звук Amiga SoundTracker</comment>
<comment xml:lang="vi">Âm thanh Amiga SoundTracker</comment>
- <comment xml:lang="zh_CN">Amiga SoundTracker 音频</comment>
- <comment xml:lang="zh_TW">Amiga SoundTracker 音訊</comment>
+ <comment xml:lang="zh-CN">Amiga SoundTracker 音频</comment>
+ <comment xml:lang="zh-TW">Amiga SoundTracker 音訊</comment>
<magic priority="40">
- <match value="MTM" type="string" offset="0"/>
- <match value="MMD0" type="string" offset="0"/>
- <match value="MMD1" type="string" offset="0"/>
- <match value="if" type="string" offset="0">
-
- <match value="0x0" type="byte" offset="110" mask="0xc0">
-
- <match value="0x0" type="byte" offset="111" mask="0x80"/>
- <match value="0x80" type="byte" offset="111"/>
- </match>
-
- <match value="0x40" type="byte" offset="110">
-
- <match value="0x0" type="byte" offset="111" mask="0x80"/>
- <match value="0x80" type="byte" offset="111"/>
- </match>
- </match>
- <match value="JN" type="string" offset="0">
-
- <match value="0x0" type="byte" offset="110" mask="0xc0">
-
- <match value="0x0" type="byte" offset="111" mask="0x80"/>
- <match value="0x80" type="byte" offset="111"/>
+ <match type="string" value="MTM" offset="0"/>
+ <match type="string" value="MMD0" offset="0"/>
+ <match type="string" value="MMD1" offset="0"/>
+ <!-- 669 composer files: "if" and "JN" -->
+ <match type="byte" value="0x0" mask="0x80" offset="112">
+ <match type="string" value="if" offset="0">
+ <!-- tempo list last byte: 0-31 (0 = known false positive) -->
+ <match type="byte" value="0x0" mask="0xe0" offset="368">
+ <!-- number of samples: 0-63 -->
+ <match type="byte" value="0x0" mask="0xc0" offset="110">
+ <!-- number of patterns: 0-128 -->
+ <match type="byte" value="0x0" mask="0x80" offset="111"/>
+ <match type="byte" value="0x80" offset="111"/>
+ </match>
+ <!-- number of samples: 64 -->
+ <match type="byte" value="0x40" offset="110">
+ <match type="byte" value="0x0" mask="0x80" offset="111"/>
+ <match type="byte" value="0x80" offset="111"/>
+ </match>
+ </match>
+ <!-- tempo list last byte: 32 -->
+ <match type="byte" value="0x20" offset="368">
+ <!-- number of samples: 0-63 -->
+ <match type="byte" value="0x0" mask="0xc0" offset="110">
+ <!-- number of patterns: 0-128 -->
+ <match type="byte" value="0x0" mask="0x80" offset="111"/>
+ <match type="byte" value="0x80" offset="111"/>
+ </match>
+ <!-- number of samples: 64 -->
+ <match type="byte" value="0x40" offset="110">
+ <match type="byte" value="0x0" mask="0x80" offset="111"/>
+ <match type="byte" value="0x80" offset="111"/>
+ </match>
+ </match>
</match>
-
- <match value="0x40" type="byte" offset="110">
-
- <match value="0x0" type="byte" offset="111" mask="0x80"/>
- <match value="0x80" type="byte" offset="111"/>
+ <match type="string" value="JN" offset="0">
+ <match type="byte" value="0x0" mask="0xe0" offset="368">
+ <match type="byte" value="0x0" mask="0xc0" offset="110">
+ <match type="byte" value="0x0" mask="0x80" offset="111"/>
+ <match type="byte" value="0x80" offset="111"/>
+ </match>
+ </match>
+ <match type="byte" value="0x20" offset="368">
+ <match type="byte" value="0x40" offset="110">
+ <match type="byte" value="0x0" mask="0x80" offset="111"/>
+ <match type="byte" value="0x80" offset="111"/>
+ </match>
+ </match>
</match>
</match>
- <match value="MAS_UTrack_V00" type="string" offset="0"/>
+ <match type="string" value="MAS_UTrack_V00" offset="0"/>
</magic>
<glob pattern="*.mod"/>
<glob pattern="*.ult"/>
@@ -23553,21 +24526,23 @@
</mime-type>
<mime-type type="audio/mp2">
<comment>MP2 audio</comment>
+ <comment xml:lang="af">MP2-oudio</comment>
<comment xml:lang="ar">MP2 سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo MP2</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo MP2</comment>
<comment xml:lang="bg">Аудио — MP2</comment>
<comment xml:lang="ca">àudio MP2</comment>
<comment xml:lang="cs">zvuk MP2</comment>
<comment xml:lang="da">MP2-lyd</comment>
<comment xml:lang="de">MP2-Audio</comment>
<comment xml:lang="el">Ήχος MP2</comment>
- <comment xml:lang="en_GB">MP2 audio</comment>
+ <comment xml:lang="en-GB">MP2 audio</comment>
<comment xml:lang="eo">MP2-sondosiero</comment>
- <comment xml:lang="es">sonido MP2</comment>
+ <comment xml:lang="es">audio MP2</comment>
<comment xml:lang="eu">MP2 audioa</comment>
<comment xml:lang="fi">MP2-ääni</comment>
<comment xml:lang="fo">MP2 ljóður</comment>
<comment xml:lang="fr">audio MP2</comment>
+ <comment xml:lang="fur">audio MP2</comment>
<comment xml:lang="ga">fuaim MP2</comment>
<comment xml:lang="gl">son MP2</comment>
<comment xml:lang="he">שמע MP2</comment>
@@ -23587,7 +24562,7 @@
<comment xml:lang="oc">àudio MP2</comment>
<comment xml:lang="pl">Plik dźwiękowy MP2</comment>
<comment xml:lang="pt">áudio MP2</comment>
- <comment xml:lang="pt_BR">Áudio MP2</comment>
+ <comment xml:lang="pt-BR">Áudio MP2</comment>
<comment xml:lang="ro">Audio MP2</comment>
<comment xml:lang="ru">Аудио MP2</comment>
<comment xml:lang="sk">Zvuk MP2</comment>
@@ -23598,16 +24573,17 @@
<comment xml:lang="tr">MP2 sesi</comment>
<comment xml:lang="uk">звук MP2</comment>
<comment xml:lang="vi">Âm thanh MP2</comment>
- <comment xml:lang="zh_CN">MP2 音频</comment>
- <comment xml:lang="zh_TW">MP2 音訊</comment>
+ <comment xml:lang="zh-CN">MP2 音频</comment>
+ <comment xml:lang="zh-TW">MP2 音訊</comment>
<alias type="audio/x-mp2"/>
<glob pattern="*.mp2"/>
</mime-type>
<mime-type type="audio/mpeg">
<comment>MP3 audio</comment>
+ <comment xml:lang="af">MP3-oudio</comment>
<comment xml:lang="ar">MP3 سمعي</comment>
<comment xml:lang="az">MP3 audio faylı</comment>
- <comment xml:lang="be@latin">Aŭdyjo MP3</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo MP3</comment>
<comment xml:lang="bg">Аудио — MP3</comment>
<comment xml:lang="ca">àudio MP3</comment>
<comment xml:lang="cs">zvuk MP3</comment>
@@ -23615,13 +24591,14 @@
<comment xml:lang="da">MP3-lyd</comment>
<comment xml:lang="de">MP3-Audio</comment>
<comment xml:lang="el">Ήχος MP3</comment>
- <comment xml:lang="en_GB">MP3 audio</comment>
+ <comment xml:lang="en-GB">MP3 audio</comment>
<comment xml:lang="eo">MP3-sondosiero</comment>
- <comment xml:lang="es">sonido MP3</comment>
+ <comment xml:lang="es">audio MP3</comment>
<comment xml:lang="eu">MP3 audioa</comment>
<comment xml:lang="fi">MP3-ääni</comment>
<comment xml:lang="fo">MP3 ljóður</comment>
<comment xml:lang="fr">audio MP3</comment>
+ <comment xml:lang="fur">audio MP3</comment>
<comment xml:lang="ga">fuaim MP3</comment>
<comment xml:lang="gl">son MP3</comment>
<comment xml:lang="he">שמע MP3</comment>
@@ -23643,7 +24620,7 @@
<comment xml:lang="oc">àudio MP3</comment>
<comment xml:lang="pl">Plik dźwiękowy MP3</comment>
<comment xml:lang="pt">áudio MP3</comment>
- <comment xml:lang="pt_BR">Áudio MP3</comment>
+ <comment xml:lang="pt-BR">Áudio MP3</comment>
<comment xml:lang="ro">Audio MP3</comment>
<comment xml:lang="ru">Аудио MP3</comment>
<comment xml:lang="sk">Zvuk MP3</comment>
@@ -23654,70 +24631,26 @@
<comment xml:lang="tr">MP3 sesi</comment>
<comment xml:lang="uk">звук MP3</comment>
<comment xml:lang="vi">Âm thanh MP3</comment>
- <comment xml:lang="zh_CN">MP3 音频</comment>
- <comment xml:lang="zh_TW">MP3 音訊</comment>
+ <comment xml:lang="zh-CN">MP3 音频</comment>
+ <comment xml:lang="zh-TW">MP3 音訊</comment>
<alias type="audio/x-mp3"/>
<alias type="audio/x-mpg"/>
<alias type="audio/x-mpeg"/>
<alias type="audio/mp3"/>
<magic priority="50">
- <match value="0xfffb" type="big16" offset="0"/>
- <match value="ID3" type="string" offset="0"/>
+ <match type="big16" value="0xfffa" offset="0"/>
+ <match type="big16" value="0xfffb" offset="0"/>
+ <match type="big16" value="0xfff3" offset="0"/>
+ <match type="big16" value="0xfff2" offset="0"/>
+ <match type="big16" value="0xffe3" offset="0"/>
+ <match type="big16" value="0xffe2" offset="0"/>
+ <match type="string" value="ID3" offset="0"/>
</magic>
<glob pattern="*.mp3"/>
<glob pattern="*.mpga"/>
</mime-type>
<mime-type type="audio/x-mpegurl">
- <comment>MP3 audio (streamed)</comment>
- <comment xml:lang="ar">MP3 سمعي (تدفق)</comment>
- <comment xml:lang="be@latin">Aŭdyjo MP3 (płyń)</comment>
- <comment xml:lang="bg">Аудио — MP3, поточно</comment>
- <comment xml:lang="ca">àudio MP3 (flux)</comment>
- <comment xml:lang="cs">zvuk MP3 (proud)</comment>
- <comment xml:lang="da">MP3-lyd (strøm)</comment>
- <comment xml:lang="de">MP3-Audio (Stream)</comment>
- <comment xml:lang="el">Ήχος MP3 (εκπεμπόμενος)</comment>
- <comment xml:lang="en_GB">MP3 audio (streamed)</comment>
- <comment xml:lang="eo">MP3-sondosiero (fluigate)</comment>
- <comment xml:lang="es">sonido MP3 (en transmisión)</comment>
- <comment xml:lang="eu">MP3 audioa (korrontea)</comment>
- <comment xml:lang="fi">MP3-ääni (virtaus)</comment>
- <comment xml:lang="fo">MP3 ljóður (streymað)</comment>
- <comment xml:lang="fr">audio MP3 (flux)</comment>
- <comment xml:lang="ga">fuaim MP3 (sruthaithe)</comment>
- <comment xml:lang="gl">son MP3 (en stream)</comment>
- <comment xml:lang="he">שמע MP3 (מוזרם)</comment>
- <comment xml:lang="hr">MP3 zvučni zapis (strujanje)</comment>
- <comment xml:lang="hu">MP3 hang (sugárzott)</comment>
- <comment xml:lang="ia">Audio MP3 (fluxo)</comment>
- <comment xml:lang="id">Audio MP3 (stream)</comment>
- <comment xml:lang="it">Audio MP3 (in streaming)</comment>
- <comment xml:lang="ja">MP3 オーディオ (ストリーム)</comment>
- <comment xml:lang="ka">MP3 აუდიო (ნაკადი)</comment>
- <comment xml:lang="kk">MP3 аудиосы (ағымдық)</comment>
- <comment xml:lang="ko">MP3 오디오(스트림)</comment>
- <comment xml:lang="lt">MP3 garso įrašas (transliuojamas)</comment>
- <comment xml:lang="lv">MP3 audio (straumēts)</comment>
- <comment xml:lang="ms">Audio MP3 (aliran)</comment>
- <comment xml:lang="nb">MP3-lyd (streaming)</comment>
- <comment xml:lang="nl">MP3-audio (gestreamd)</comment>
- <comment xml:lang="nn">Strauma MP3-lyd</comment>
- <comment xml:lang="oc">àudio MP3 (flux)</comment>
- <comment xml:lang="pl">Plik dźwiękowy MP3 (strumień)</comment>
- <comment xml:lang="pt">áudio MP3 (em fluxo)</comment>
- <comment xml:lang="pt_BR">Áudio MP3 (em fluxo)</comment>
- <comment xml:lang="ro">Audio MP3 (flux)</comment>
- <comment xml:lang="ru">Аудио MP3 (потоковое)</comment>
- <comment xml:lang="sk">Zvuk MP3 (streamovaný)</comment>
- <comment xml:lang="sl">Zvočna datoteka MP3 (pretočna)</comment>
- <comment xml:lang="sq">Audio MP3 (streamed)</comment>
- <comment xml:lang="sr">МП3 звук (проточан)</comment>
- <comment xml:lang="sv">MP3-ljud (flöde)</comment>
- <comment xml:lang="tr">MP3 sesi (akış)</comment>
- <comment xml:lang="uk">звук MP3 (потоковий)</comment>
- <comment xml:lang="vi">Âm thanh MP3 (chạy luồng)</comment>
- <comment xml:lang="zh_CN">MP3 音频流媒体</comment>
- <comment xml:lang="zh_TW">MP3 音訊 (串流)</comment>
+ <comment>Media playlist</comment>
<sub-class-of type="text/plain"/>
<alias type="audio/mpegurl"/>
<alias type="application/m3u"/>
@@ -23728,77 +24661,38 @@
<glob pattern="*.m3u8"/>
<glob pattern="*.vlc"/>
<magic priority="50">
- <match value="#EXTM3U" type="string" offset="0"/>
+ <match type="string" value="#EXTM3U" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/vnd.apple.mpegurl">
- <comment>HTTP Live Streaming playlist</comment>
- <comment xml:lang="ar">قائمة بث HTTP حية</comment>
- <comment xml:lang="bg">Списък за изпълнение — поток по HTTP</comment>
- <comment xml:lang="ca">llista de reproducció en temps real HTTP</comment>
- <comment xml:lang="cs">seznam k přehrání HTTP Live Streaming</comment>
- <comment xml:lang="da">Afspilningsliste til HTTP-livestrøm</comment>
- <comment xml:lang="de">HTTP Live-Streaming-Wiedergabeliste</comment>
- <comment xml:lang="el">Λίστα αναπαραγωγής ζωντανής μετάδοσης σε HTTP</comment>
- <comment xml:lang="en_GB">HTTP Live Streaming playlist</comment>
- <comment xml:lang="es">lista de reproducción de flujo en directo HTTP</comment>
- <comment xml:lang="eu">HTTP zuzeneko korrontearen erreprodukzio-zerrenda</comment>
- <comment xml:lang="fo">HTTP beinleiðis streymaður avspælingarlisti</comment>
- <comment xml:lang="fr">liste de lecture de flux HTTP Live</comment>
- <comment xml:lang="ga">seinmliosta sruthaithe bheo HTTP</comment>
- <comment xml:lang="gl">lista de reprodución de fluxo HTTP</comment>
- <comment xml:lang="he">רשימת השמעה הזרימה של HTTP</comment>
- <comment xml:lang="hr">HTTP popis izvođenja emitiranja uživo</comment>
- <comment xml:lang="hu">HTTP élő lejátszólista</comment>
- <comment xml:lang="ia">Lista de selection HTTP Live Streaming</comment>
- <comment xml:lang="id">Daftar putar HTTP Live Streaming</comment>
- <comment xml:lang="it">Playlist Live Steaming HTTP</comment>
- <comment xml:lang="ja">HTTP ライブストリーミング再生リスト</comment>
- <comment xml:lang="kk">HTTP тірі ағым ойнау тізімі</comment>
- <comment xml:lang="ko">HTTP 라이브 스트리밍 재생 목록</comment>
- <comment xml:lang="lt">HTTP tiesioginio transliavimo grojaraštis</comment>
- <comment xml:lang="lv">HTTP dzīvās straumēšanas repertuārs</comment>
- <comment xml:lang="nl">HTTP Live Streaming afspeellijst</comment>
- <comment xml:lang="oc">lista de lectura de flux HTTP Live</comment>
- <comment xml:lang="pl">Lista odtwarzania strumieniowego na żywo HTTP</comment>
- <comment xml:lang="pt">lista de reprodução HTTP Live Streaming</comment>
- <comment xml:lang="pt_BR">Lista de Reprodução Streaming ao Vivo de HTTP</comment>
- <comment xml:lang="ro">Listă de redare difuzată ca flux HTTP</comment>
- <comment xml:lang="ru">Список воспроизведения HTTP-потока</comment>
- <comment xml:lang="sk">Zoznam stôp HTTP Live Streaming</comment>
- <comment xml:lang="sl">Seznam predvajanja živega pretoka HTTP</comment>
- <comment xml:lang="sr">ХТТП списак нумера Живог Протока</comment>
- <comment xml:lang="sv">HTTP Live Streaming-spellista</comment>
- <comment xml:lang="tr">HTTP Canlı Akış çalma listesi</comment>
- <comment xml:lang="uk">список відтворення HTTP Live Streaming</comment>
- <comment xml:lang="zh_CN">HTTP 实时流播放列表</comment>
- <comment xml:lang="zh_TW">HTTP 即時串流播放清單</comment>
+ <comment>Media playlist</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.m3u"/>
<glob pattern="*.m3u8"/>
<magic priority="70">
- <match value="#EXTM3U" type="string" offset="0">
- <match value="#EXT-X-TARGETDURATION" type="string" offset="0:128"/>
- <match value="#EXT-X-STREAM-INF" type="string" offset="0:128"/>
+ <match type="string" value="#EXTM3U" offset="0">
+ <match type="string" value="#EXT-X-TARGETDURATION" offset="0:128"/>
+ <match type="string" value="#EXT-X-STREAM-INF" offset="0:128"/>
</match>
</magic>
</mime-type>
<mime-type type="audio/x-ms-asx">
<comment>Microsoft ASX playlist</comment>
<comment xml:lang="ar">قائمة تشغيل مايكروسوفت ASX</comment>
- <comment xml:lang="be@latin">Śpis Microsoft ASX</comment>
+ <comment xml:lang="be-Latn">Śpis Microsoft ASX</comment>
<comment xml:lang="bg">Списък за изпълнение — Microsoft ASX</comment>
<comment xml:lang="ca">llista de reproducció de Microsoft ASX</comment>
<comment xml:lang="cs">seznam k přehrání Microsoft ASX</comment>
<comment xml:lang="da">Microsoft ASX-afspilningsliste</comment>
<comment xml:lang="de">Microsoft-ASX-Wiedergabeliste</comment>
<comment xml:lang="el">Λίστα αναπαραγωγής Microsoft ASX</comment>
- <comment xml:lang="en_GB">Microsoft ASX playlist</comment>
+ <comment xml:lang="en-GB">Microsoft ASX playlist</comment>
<comment xml:lang="es">lista de reproducción ASX de Microsoft</comment>
<comment xml:lang="eu">Microsoft ASX erreprodukzio-zerrenda</comment>
<comment xml:lang="fi">Microsoft ASX -soittolista</comment>
<comment xml:lang="fo">Microsoft ASX avspælingarlisti</comment>
<comment xml:lang="fr">liste de lecture Microsoft ASX</comment>
+ <comment xml:lang="fur">liste di riproduzion Microsoft ASX</comment>
<comment xml:lang="ga">seinmliosta Microsoft ASX</comment>
<comment xml:lang="gl">lista de reprodución Microsoft ASX</comment>
<comment xml:lang="he">רשימת השמעה ASX (מיקרוסופט)</comment>
@@ -23819,7 +24713,7 @@
<comment xml:lang="oc">lista de lectura Microsoft ASX</comment>
<comment xml:lang="pl">Lista odtwarzania Microsoft ASX</comment>
<comment xml:lang="pt">lista de reprodução Microsoft ASX</comment>
- <comment xml:lang="pt_BR">Lista de reprodução do Microsoft ASX</comment>
+ <comment xml:lang="pt-BR">Lista de reprodução do Microsoft ASX</comment>
<comment xml:lang="ro">Listă redare Microsoft ASX</comment>
<comment xml:lang="ru">Список воспроизведения Microsoft ASX</comment>
<comment xml:lang="sk">Zoznam skladieb Microsoft ASX</comment>
@@ -23830,8 +24724,8 @@
<comment xml:lang="tr">Microsoft ASX çalma listesi</comment>
<comment xml:lang="uk">список відтворення ASX Microsoft</comment>
<comment xml:lang="vi">Danh mục nhạc Microsoft ASX</comment>
- <comment xml:lang="zh_CN">Microsoft ASX 播放列表</comment>
- <comment xml:lang="zh_TW">微軟 ASX 播放清單</comment>
+ <comment xml:lang="zh-CN">Microsoft ASX 播放列表</comment>
+ <comment xml:lang="zh-TW">微軟 ASX 播放清單</comment>
<alias type="video/x-ms-wvx"/>
<alias type="video/x-ms-wax"/>
<alias type="video/x-ms-wmx"/>
@@ -23841,29 +24735,31 @@
<glob pattern="*.wvx"/>
<glob pattern="*.wmx"/>
<magic priority="51">
- <match value="ASF " type="string" offset="0"/>
- <match value="&lt;ASX" type="string" offset="0:64"/>
- <match value="&lt;asx" type="string" offset="0:64"/>
- <match value="&lt;Asx" type="string" offset="0:64"/>
+ <match type="string" value="ASF " offset="0"/>
+ <match type="string" value="&lt;ASX" offset="0:64"/>
+ <match type="string" value="&lt;asx" offset="0:64"/>
+ <match type="string" value="&lt;Asx" offset="0:64"/>
</magic>
</mime-type>
<mime-type type="audio/x-psf">
<comment>PSF audio</comment>
+ <comment xml:lang="af">PSF-oudio</comment>
<comment xml:lang="ar">PSF سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo PSF</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo PSF</comment>
<comment xml:lang="bg">Аудио — PSF</comment>
<comment xml:lang="ca">àudio PSF</comment>
<comment xml:lang="cs">zvuk PSF</comment>
<comment xml:lang="da">PSF-lyd</comment>
<comment xml:lang="de">PSF-Audio</comment>
<comment xml:lang="el">Ήχος PSF</comment>
- <comment xml:lang="en_GB">PSF audio</comment>
+ <comment xml:lang="en-GB">PSF audio</comment>
<comment xml:lang="eo">PSF-sondosiero</comment>
- <comment xml:lang="es">sonido PSF</comment>
+ <comment xml:lang="es">audio PSF</comment>
<comment xml:lang="eu">PSF audioa</comment>
<comment xml:lang="fi">PSF-ääni</comment>
<comment xml:lang="fo">PSF ljóður</comment>
<comment xml:lang="fr">audio PSF</comment>
+ <comment xml:lang="fur">audio PSF</comment>
<comment xml:lang="ga">fuaim PSF</comment>
<comment xml:lang="gl">son PSF</comment>
<comment xml:lang="he">שמע PSF</comment>
@@ -23883,7 +24779,7 @@
<comment xml:lang="oc">àudio PSF</comment>
<comment xml:lang="pl">Plik dźwiękowy PSF</comment>
<comment xml:lang="pt">áudio PSF</comment>
- <comment xml:lang="pt_BR">Áudio PSF</comment>
+ <comment xml:lang="pt-BR">Áudio PSF</comment>
<comment xml:lang="ro">Audio PSF</comment>
<comment xml:lang="ru">Аудио PSF</comment>
<comment xml:lang="sk">Zvuk PSF</comment>
@@ -23894,32 +24790,34 @@
<comment xml:lang="tr">PSF sesi</comment>
<comment xml:lang="uk">звук PSF</comment>
<comment xml:lang="vi">Âm thanh PSF</comment>
- <comment xml:lang="zh_CN">PSF 音频</comment>
- <comment xml:lang="zh_TW">PSF 音訊</comment>
+ <comment xml:lang="zh-CN">PSF 音频</comment>
+ <comment xml:lang="zh-TW">PSF 音訊</comment>
<acronym>PSF</acronym>
<expanded-acronym>Portable Sound Format</expanded-acronym>
<magic priority="50">
- <match value="PSF" type="string" offset="0"/>
+ <match type="string" value="PSF" offset="0"/>
</magic>
<glob pattern="*.psf"/>
</mime-type>
<mime-type type="audio/x-minipsf">
<comment>MiniPSF audio</comment>
+ <comment xml:lang="af">MiniPSF-oudio</comment>
<comment xml:lang="ar">MiniPSF سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo MiniPSF</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo MiniPSF</comment>
<comment xml:lang="bg">Аудио — MiniPSF</comment>
<comment xml:lang="ca">àudio MiniPSF</comment>
<comment xml:lang="cs">zvuk MiniPSF</comment>
<comment xml:lang="da">MiniPSF-lyd</comment>
<comment xml:lang="de">MiniPSF-Audio</comment>
<comment xml:lang="el">Ήχος MiniPSF</comment>
- <comment xml:lang="en_GB">MiniPSF audio</comment>
+ <comment xml:lang="en-GB">MiniPSF audio</comment>
<comment xml:lang="eo">MiniPSF-sondosiero</comment>
- <comment xml:lang="es">sonido MiniPSF</comment>
+ <comment xml:lang="es">audio MiniPSF</comment>
<comment xml:lang="eu">MiniPSF audioa</comment>
<comment xml:lang="fi">MiniPSF-ääni</comment>
<comment xml:lang="fo">MiniPSF ljóður</comment>
<comment xml:lang="fr">audio MiniPSF</comment>
+ <comment xml:lang="fur">audio MiniPSF</comment>
<comment xml:lang="ga">fuaim MiniPSF</comment>
<comment xml:lang="gl">son MiniPSF</comment>
<comment xml:lang="he">שמע של MiniPSP</comment>
@@ -23940,7 +24838,7 @@
<comment xml:lang="oc">àudio MiniPSF</comment>
<comment xml:lang="pl">Plik dźwiękowy MiniPSF</comment>
<comment xml:lang="pt">áudio MiniPSF</comment>
- <comment xml:lang="pt_BR">Áudio MiniPSF</comment>
+ <comment xml:lang="pt-BR">Áudio MiniPSF</comment>
<comment xml:lang="ro">Audio MiniPSF</comment>
<comment xml:lang="ru">Аудио MiniPSF</comment>
<comment xml:lang="sk">Zvuk MiniPSF</comment>
@@ -23951,8 +24849,8 @@
<comment xml:lang="tr">MiniPSF sesi</comment>
<comment xml:lang="uk">звук MiniPSF</comment>
<comment xml:lang="vi">Âm thanh MiniPSF</comment>
- <comment xml:lang="zh_CN">MiniPSF 音频</comment>
- <comment xml:lang="zh_TW">MiniPSF 音訊</comment>
+ <comment xml:lang="zh-CN">MiniPSF 音频</comment>
+ <comment xml:lang="zh-TW">MiniPSF 音訊</comment>
<acronym>MiniPSF</acronym>
<expanded-acronym>Miniature Portable Sound Format</expanded-acronym>
<sub-class-of type="audio/x-psf"/>
@@ -23960,20 +24858,22 @@
</mime-type>
<mime-type type="audio/x-psflib">
<comment>PSFlib audio library</comment>
+ <comment xml:lang="af">PSFlib-oudiobiblioteek</comment>
<comment xml:lang="ar">مكتبة PSFlib السمعية</comment>
- <comment xml:lang="be@latin">Aŭdyjobiblijateka PSFlib</comment>
+ <comment xml:lang="be-Latn">Aŭdyjobiblijateka PSFlib</comment>
<comment xml:lang="bg">Аудио библиотека — PSFlib</comment>
<comment xml:lang="ca">biblioteca d'àudio PSFlib</comment>
<comment xml:lang="cs">zvuková knihovna PSFlib</comment>
<comment xml:lang="da">PSFlib-lydbibliotek</comment>
<comment xml:lang="de">PSFlib-Audiobibliothek</comment>
<comment xml:lang="el">Βιβλιοθήκη ήχου PSFlib</comment>
- <comment xml:lang="en_GB">PSFlib audio library</comment>
- <comment xml:lang="es">biblioteca de sonido PSFlib</comment>
+ <comment xml:lang="en-GB">PSFlib audio library</comment>
+ <comment xml:lang="es">biblioteca de audio PSFlib</comment>
<comment xml:lang="eu">PSFlib audioaren liburutegia</comment>
<comment xml:lang="fi">PSFlib-äänikirjasto</comment>
<comment xml:lang="fo">PSFlib ljóðsavn</comment>
<comment xml:lang="fr">bibliothèque audio PSFlib</comment>
+ <comment xml:lang="fur">librarie audio PSFlib</comment>
<comment xml:lang="ga">leabharlann fhuaime PSFlib</comment>
<comment xml:lang="gl">Biblioteca de son PSFlib</comment>
<comment xml:lang="he">ספריית שמע PSFlib</comment>
@@ -23993,7 +24893,7 @@
<comment xml:lang="oc">bibliotèca àudio PSFlib</comment>
<comment xml:lang="pl">Biblioteka dźwiękowa PSFlib</comment>
<comment xml:lang="pt">biblioteca áudio PSFlib</comment>
- <comment xml:lang="pt_BR">Biblioteca de áudio PSFlib</comment>
+ <comment xml:lang="pt-BR">Biblioteca de áudio PSFlib</comment>
<comment xml:lang="ro">Bibliotecă audio PSFlib</comment>
<comment xml:lang="ru">Фонотека PSFlib</comment>
<comment xml:lang="sk">Zvuková knižnica PSFlib</comment>
@@ -24004,8 +24904,8 @@
<comment xml:lang="tr">PSFlib ses kitaplığı</comment>
<comment xml:lang="uk">аудіобібліотека PSFlib</comment>
<comment xml:lang="vi">Thư viện âm thanh PSFlib</comment>
- <comment xml:lang="zh_CN">PSFlib 音频库</comment>
- <comment xml:lang="zh_TW">PSFlib 音訊庫</comment>
+ <comment xml:lang="zh-CN">PSFlib 音频库</comment>
+ <comment xml:lang="zh-TW">PSFlib 音訊庫</comment>
<acronym>PSFlib</acronym>
<expanded-acronym>Portable Sound Format Library</expanded-acronym>
<sub-class-of type="audio/x-psf"/>
@@ -24013,20 +24913,22 @@
</mime-type>
<mime-type type="audio/x-ms-wma">
<comment>Windows Media audio</comment>
+ <comment xml:lang="af">Windows Media-oudio</comment>
<comment xml:lang="ar">Windows Media سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo Windows Media</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Windows Media</comment>
<comment xml:lang="bg">Аудио — Windows Media</comment>
<comment xml:lang="ca">àudio de Windows Media</comment>
<comment xml:lang="cs">zvuk Windows Media</comment>
<comment xml:lang="da">Windows Media-lyd</comment>
<comment xml:lang="de">Windows-Media-Audio</comment>
<comment xml:lang="el">Ήχος Windows Media</comment>
- <comment xml:lang="en_GB">Windows Media audio</comment>
- <comment xml:lang="es">sonido de Windows Media</comment>
+ <comment xml:lang="en-GB">Windows Media audio</comment>
+ <comment xml:lang="es">audio de Windows Media</comment>
<comment xml:lang="eu">Windows Media audioa</comment>
<comment xml:lang="fi">Windows Media -ääni</comment>
<comment xml:lang="fo">Windows Media ljóður</comment>
<comment xml:lang="fr">audio Windows Media</comment>
+ <comment xml:lang="fur">audio Windows Media</comment>
<comment xml:lang="ga">fuaim Windows Media</comment>
<comment xml:lang="gl">son de Windows Media</comment>
<comment xml:lang="he">שמע של Windows Media</comment>
@@ -24046,7 +24948,7 @@
<comment xml:lang="oc">àudio Windows Media</comment>
<comment xml:lang="pl">Plik dźwiękowy Windows Media</comment>
<comment xml:lang="pt">áudio Windows Media</comment>
- <comment xml:lang="pt_BR">Áudio do Windows Media</comment>
+ <comment xml:lang="pt-BR">Áudio do Windows Media</comment>
<comment xml:lang="ro">Audio Windows Media</comment>
<comment xml:lang="ru">Аудио Windows Media</comment>
<comment xml:lang="sk">Zvuk Windows Media</comment>
@@ -24057,28 +24959,30 @@
<comment xml:lang="tr">Windows Media sesi</comment>
<comment xml:lang="uk">звук Windows Media</comment>
<comment xml:lang="vi">Âm thanh Windows Media</comment>
- <comment xml:lang="zh_CN">Windows Media 音频</comment>
- <comment xml:lang="zh_TW">Windows Media 音訊</comment>
+ <comment xml:lang="zh-CN">Windows Media 音频</comment>
+ <comment xml:lang="zh-TW">Windows Media 音訊</comment>
<sub-class-of type="application/vnd.ms-asf"/>
<glob pattern="*.wma"/>
<alias type="audio/wma"/>
</mime-type>
<mime-type type="audio/x-musepack">
<comment>Musepack audio</comment>
+ <comment xml:lang="af">Musepack-oudio</comment>
<comment xml:lang="ar">Musepack سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo Musepack</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Musepack</comment>
<comment xml:lang="bg">Аудио — Musepack</comment>
<comment xml:lang="ca">àudio de Musepack</comment>
<comment xml:lang="cs">zvuk Musepack</comment>
- <comment xml:lang="da">Musepacklyd</comment>
+ <comment xml:lang="da">Musepack-lyd</comment>
<comment xml:lang="de">Musepack-Audio</comment>
<comment xml:lang="el">Ήχος Musepack</comment>
- <comment xml:lang="en_GB">Musepack audio</comment>
- <comment xml:lang="es">sonido Musepack</comment>
+ <comment xml:lang="en-GB">Musepack audio</comment>
+ <comment xml:lang="es">audio Musepack</comment>
<comment xml:lang="eu">Musepack audioa</comment>
<comment xml:lang="fi">Musepack-ääni</comment>
<comment xml:lang="fo">Musepack ljóður</comment>
<comment xml:lang="fr">audio Musepack</comment>
+ <comment xml:lang="fur">audio Musepack</comment>
<comment xml:lang="ga">fuaim Musepack</comment>
<comment xml:lang="gl">son de Musepack</comment>
<comment xml:lang="he">שמע של Musepack</comment>
@@ -24098,7 +25002,7 @@
<comment xml:lang="oc">àudio Musepack</comment>
<comment xml:lang="pl">Plik dźwiękowy Musepack</comment>
<comment xml:lang="pt">áudio Musepack</comment>
- <comment xml:lang="pt_BR">Áudio Musepack</comment>
+ <comment xml:lang="pt-BR">Áudio Musepack</comment>
<comment xml:lang="ro">Audio Musepack</comment>
<comment xml:lang="ru">Аудио Musepack</comment>
<comment xml:lang="sk">Zvuk Musepack</comment>
@@ -24109,10 +25013,11 @@
<comment xml:lang="tr">Musepack sesi</comment>
<comment xml:lang="uk">звук Musepack</comment>
<comment xml:lang="vi">Âm thanh Musepack</comment>
- <comment xml:lang="zh_CN">Musepack 音频</comment>
- <comment xml:lang="zh_TW">Musepack 音訊</comment>
+ <comment xml:lang="zh-CN">Musepack 音频</comment>
+ <comment xml:lang="zh-TW">Musepack 音訊</comment>
<magic priority="50">
- <match value="MP+" type="string" offset="0"/>
+ <match type="string" value="MP+" offset="0"/>
+ <match type="string" value="MPCK" offset="0"/>
</magic>
<glob pattern="*.mpc"/>
<glob pattern="*.mpp"/>
@@ -24120,22 +25025,24 @@
</mime-type>
<mime-type type="audio/vnd.rn-realaudio">
<comment>RealAudio document</comment>
+ <comment xml:lang="af">RealAudio-dokument</comment>
<comment xml:lang="ar">مستند RealAudio</comment>
<comment xml:lang="ast">Documentu RealAudio</comment>
- <comment xml:lang="be@latin">Dakument RealAudio</comment>
+ <comment xml:lang="be-Latn">Dakument RealAudio</comment>
<comment xml:lang="bg">Документ — RealAudio</comment>
<comment xml:lang="ca">document RealAudio</comment>
<comment xml:lang="cs">dokument RealAudio</comment>
<comment xml:lang="da">RealAudio-dokument</comment>
<comment xml:lang="de">RealAudio-Dokument</comment>
<comment xml:lang="el">Έγγραφο RealAudio</comment>
- <comment xml:lang="en_GB">RealAudio document</comment>
+ <comment xml:lang="en-GB">RealAudio document</comment>
<comment xml:lang="eo">RealAudio-dokumento</comment>
<comment xml:lang="es">documento RealAudio</comment>
<comment xml:lang="eu">RealAudio dokumentua</comment>
<comment xml:lang="fi">RealAudio-asiakirja</comment>
<comment xml:lang="fo">RealAudio skjal</comment>
<comment xml:lang="fr">document RealAudio</comment>
+ <comment xml:lang="fur">document RealAudio</comment>
<comment xml:lang="ga">cáipéis RealAudio</comment>
<comment xml:lang="gl">documento Realson</comment>
<comment xml:lang="he">מסמך של RealAudio</comment>
@@ -24155,7 +25062,7 @@
<comment xml:lang="oc">document RealAudio</comment>
<comment xml:lang="pl">Dokument RealAudio</comment>
<comment xml:lang="pt">documento RealAudio</comment>
- <comment xml:lang="pt_BR">Documento RealAudio</comment>
+ <comment xml:lang="pt-BR">Documento RealAudio</comment>
<comment xml:lang="ro">Document RealAudio</comment>
<comment xml:lang="ru">Документ RealAudio</comment>
<comment xml:lang="sk">Dokument RealAudio</comment>
@@ -24166,81 +25073,61 @@
<comment xml:lang="tr">RealAudio belgesi</comment>
<comment xml:lang="uk">документ RealAudio</comment>
<comment xml:lang="vi">Tài liệu âm thanh RealAudio</comment>
- <comment xml:lang="zh_CN">RealAudio 文档</comment>
- <comment xml:lang="zh_TW">RealAudio 文件</comment>
+ <comment xml:lang="zh-CN">RealAudio 文档</comment>
+ <comment xml:lang="zh-TW">RealAudio 文件</comment>
<glob pattern="*.ra"/>
<glob pattern="*.rax"/>
<alias type="audio/x-pn-realaudio"/>
<alias type="audio/vnd.m-realaudio"/>
</mime-type>
<mime-type type="application/ram">
- <comment>RealMedia Metafile</comment>
- <comment xml:lang="ar">ملف تعريف RealMedia</comment>
- <comment xml:lang="be@latin">Metafajł RealMedia</comment>
- <comment xml:lang="bg">Метафайл — RealMedia</comment>
- <comment xml:lang="ca">metafitxer RealMedia</comment>
- <comment xml:lang="cs">RealMedia Metafile</comment>
- <comment xml:lang="da">RealMedia-metafil</comment>
- <comment xml:lang="de">RealMedia-Metadatei</comment>
- <comment xml:lang="el">Metafile RealMedia</comment>
- <comment xml:lang="en_GB">RealMedia Metafile</comment>
- <comment xml:lang="es">metaarchivo RealMedia</comment>
- <comment xml:lang="eu">RealMedia metafitxategia</comment>
- <comment xml:lang="fi">RealMedia-metatiedosto</comment>
- <comment xml:lang="fo">RealMedia metafíla</comment>
- <comment xml:lang="fr">métafichier RealMedia</comment>
- <comment xml:lang="ga">Meiteachomhad RealMedia</comment>
- <comment xml:lang="gl">Metaficheiro RealMedia</comment>
- <comment xml:lang="he">קובץ מטא של RealMedia</comment>
- <comment xml:lang="hr">RealMedia meta datoteka</comment>
- <comment xml:lang="hu">RealMedia metafájl</comment>
- <comment xml:lang="ia">Metafile RealMedia</comment>
- <comment xml:lang="id">RealMedia Metafile</comment>
- <comment xml:lang="it">Metafile RealMedia</comment>
- <comment xml:lang="ja">RealMedia メタファイル</comment>
- <comment xml:lang="kk">RealMedia метафайлы</comment>
- <comment xml:lang="ko">RealMedia 메타 파일</comment>
- <comment xml:lang="lt">RealMedia metafailas</comment>
- <comment xml:lang="lv">RealMedia metadatne</comment>
- <comment xml:lang="nb">RealMedia-metafil</comment>
- <comment xml:lang="nl">RealMedia-metabestand</comment>
- <comment xml:lang="nn">RealMedia-metafil</comment>
- <comment xml:lang="oc">metafichièr RealMedia</comment>
- <comment xml:lang="pl">Metaplik RealMedia</comment>
- <comment xml:lang="pt">metaficheiro RealMedia</comment>
- <comment xml:lang="pt_BR">Meta arquivo do RealMedia</comment>
- <comment xml:lang="ro">Metafișier RealMedia</comment>
- <comment xml:lang="ru">Мета-файл RealMedia</comment>
- <comment xml:lang="sk">RealMedia Metafile</comment>
- <comment xml:lang="sl">Metadatoteka RealMedia</comment>
- <comment xml:lang="sq">Metafile RealMedia</comment>
- <comment xml:lang="sr">метадатотека Рил Медија</comment>
- <comment xml:lang="sv">RealMedia-metafil</comment>
- <comment xml:lang="tr">RealMedia Meta Dosyası</comment>
- <comment xml:lang="uk">метафайл RealMedia</comment>
- <comment xml:lang="vi">Siêu tập tin RealMedia</comment>
- <comment xml:lang="zh_CN">RealMedia 元文件</comment>
- <comment xml:lang="zh_TW">RealMedia 中介檔</comment>
+ <comment>RealMedia playlist</comment>
+ <comment xml:lang="bg">Списък за изпълнение — RealMedia</comment>
+ <comment xml:lang="ca">llista de reproducció RealMedia</comment>
+ <comment xml:lang="da">RealMedia-afspilningsliste</comment>
+ <comment xml:lang="de">RealMedia-Wiedergabeliste</comment>
+ <comment xml:lang="en-GB">RealMedia playlist</comment>
+ <comment xml:lang="es">lista de reproducción de RealMedia</comment>
+ <comment xml:lang="eu">RealMedia erreprodukzio-zerrenda</comment>
+ <comment xml:lang="fi">RealMedia-soittolista</comment>
+ <comment xml:lang="fr">liste de lecture RealMedia</comment>
+ <comment xml:lang="hr">RealMedia popis izvođenja</comment>
+ <comment xml:lang="hu">RealMedia lejátszólista</comment>
+ <comment xml:lang="id">Daftar putar RealMedia</comment>
+ <comment xml:lang="it">Playlist RealMedia</comment>
+ <comment xml:lang="kk">RealMedia ойнау тізімі</comment>
+ <comment xml:lang="ko">RealMedia 재생 목록</comment>
+ <comment xml:lang="pl">Lista odtwarzania RealMedia</comment>
+ <comment xml:lang="pt-BR">Lista de reprodução do RealMedia</comment>
+ <comment xml:lang="ru">Список воспроизведения RealMedia</comment>
+ <comment xml:lang="sk">Zoznam skladieb RealMedia</comment>
+ <comment xml:lang="sv">RealMedia-spellista</comment>
+ <comment xml:lang="tr">RealMedia çalma listesi</comment>
+ <comment xml:lang="uk">список відтворення RealMedia</comment>
+ <comment xml:lang="zh-CN">RealMedia 播放列表</comment>
+ <comment xml:lang="zh-TW">RealMedia 播放清單</comment>
<glob pattern="*.ram"/>
</mime-type>
<mime-type type="video/vnd.rn-realvideo">
<comment>RealVideo document</comment>
+ <comment xml:lang="af">RealVideo-dokument</comment>
<comment xml:lang="ar">مستند RealVideo</comment>
<comment xml:lang="ast">Documentu RealVideo</comment>
- <comment xml:lang="be@latin">Dakument RealVideo</comment>
+ <comment xml:lang="be-Latn">Dakument RealVideo</comment>
<comment xml:lang="bg">Документ — RealVideo</comment>
<comment xml:lang="ca">document RealVideo</comment>
<comment xml:lang="cs">dokument RealVideo</comment>
<comment xml:lang="da">RealAudio-dokument</comment>
<comment xml:lang="de">RealVideo-Dokument</comment>
<comment xml:lang="el">Έγγραφο RealVideo</comment>
- <comment xml:lang="en_GB">RealVideo document</comment>
+ <comment xml:lang="en-GB">RealVideo document</comment>
<comment xml:lang="eo">RealVideo-dokumento</comment>
<comment xml:lang="es">documento RealVideo</comment>
<comment xml:lang="eu">RealVideo dokumentua</comment>
<comment xml:lang="fi">RealVideo-asiakirja</comment>
<comment xml:lang="fo">RealVideo skjal</comment>
<comment xml:lang="fr">document RealVideo</comment>
+ <comment xml:lang="fur">document RealVideo</comment>
<comment xml:lang="ga">cáipéis RealVideo</comment>
<comment xml:lang="gl">documento RealVideo</comment>
<comment xml:lang="he">מסמך של RealVideo</comment>
@@ -24260,7 +25147,7 @@
<comment xml:lang="oc">document RealVideo</comment>
<comment xml:lang="pl">Dokument RealVideo</comment>
<comment xml:lang="pt">documento RealVideo</comment>
- <comment xml:lang="pt_BR">Documento RealVideo</comment>
+ <comment xml:lang="pt-BR">Documento RealVideo</comment>
<comment xml:lang="ro">Document RealVideo</comment>
<comment xml:lang="ru">Документ RealVideo</comment>
<comment xml:lang="sk">Dokument RealVideo</comment>
@@ -24268,33 +25155,35 @@
<comment xml:lang="sq">Dokument RealVideo</comment>
<comment xml:lang="sr">документ Рил Видеа</comment>
<comment xml:lang="sv">RealVideo-dokument</comment>
- <comment xml:lang="tr">RealAudio belgesi</comment>
+ <comment xml:lang="tr">RealVideo belgesi</comment>
<comment xml:lang="uk">документ RealVideo</comment>
<comment xml:lang="vi">Tài liệu ảnh động RealVideo</comment>
- <comment xml:lang="zh_CN">RealAudio 文档</comment>
- <comment xml:lang="zh_TW">RealVideo 文件</comment>
+ <comment xml:lang="zh-CN">RealAudio 文档</comment>
+ <comment xml:lang="zh-TW">RealVideo 文件</comment>
<glob pattern="*.rv"/>
<glob pattern="*.rvx"/>
<alias type="video/x-real-video"/>
</mime-type>
<mime-type type="application/vnd.rn-realmedia">
<comment>RealMedia document</comment>
+ <comment xml:lang="af">RealMedia-dokument</comment>
<comment xml:lang="ar">مستند RealMedia</comment>
<comment xml:lang="ast">Documentu RealMedia</comment>
- <comment xml:lang="be@latin">Dakument RealMedia</comment>
+ <comment xml:lang="be-Latn">Dakument RealMedia</comment>
<comment xml:lang="bg">Документ — RealMedia</comment>
<comment xml:lang="ca">document RealMedia</comment>
<comment xml:lang="cs">dokument RealMedia</comment>
<comment xml:lang="da">RealMedia-dokument</comment>
<comment xml:lang="de">RealMedia-Dokument</comment>
<comment xml:lang="el">Έγγραφο RealMedia</comment>
- <comment xml:lang="en_GB">RealMedia document</comment>
+ <comment xml:lang="en-GB">RealMedia document</comment>
<comment xml:lang="eo">RealMedia-dokumento</comment>
<comment xml:lang="es">documento RealMedia</comment>
<comment xml:lang="eu">RealMedia dokumentua</comment>
<comment xml:lang="fi">RealMedia-asiakirja</comment>
<comment xml:lang="fo">RealMedia skjal</comment>
<comment xml:lang="fr">document RealMedia</comment>
+ <comment xml:lang="fur">document RealMedia</comment>
<comment xml:lang="ga">cáipéis RealMedia</comment>
<comment xml:lang="gl">documento RealMedia</comment>
<comment xml:lang="he">מסמך של RealMedia</comment>
@@ -24314,7 +25203,7 @@
<comment xml:lang="oc">document RealMedia</comment>
<comment xml:lang="pl">Dokument RealMedia</comment>
<comment xml:lang="pt">documento RealMedia</comment>
- <comment xml:lang="pt_BR">Documento RealMedia</comment>
+ <comment xml:lang="pt-BR">Documento RealMedia</comment>
<comment xml:lang="ro">Document RealMedia</comment>
<comment xml:lang="ru">Документ RealMedia</comment>
<comment xml:lang="sk">Dokument RealMedia</comment>
@@ -24325,11 +25214,11 @@
<comment xml:lang="tr">RealMedia belgesi</comment>
<comment xml:lang="uk">документ RealMedia</comment>
<comment xml:lang="vi">Tài liệu RealMedia</comment>
- <comment xml:lang="zh_CN">RealMedia 文档</comment>
- <comment xml:lang="zh_TW">RealMedia 文件</comment>
+ <comment xml:lang="zh-CN">RealMedia 文档</comment>
+ <comment xml:lang="zh-TW">RealMedia 文件</comment>
<generic-icon name="video-x-generic"/>
<magic priority="50">
- <match value=".RMF" type="string" offset="0"/>
+ <match type="string" value=".RMF" offset="0"/>
</magic>
<glob pattern="*.rm"/>
<glob pattern="*.rmj"/>
@@ -24341,22 +25230,24 @@
</mime-type>
<mime-type type="image/vnd.rn-realpix">
<comment>RealPix document</comment>
+ <comment xml:lang="af">RealPix-dokument</comment>
<comment xml:lang="ar">مستند RealPix</comment>
<comment xml:lang="ast">Documentu RealPix</comment>
- <comment xml:lang="be@latin">Dakument RealPix</comment>
+ <comment xml:lang="be-Latn">Dakument RealPix</comment>
<comment xml:lang="bg">Документ — RealPix</comment>
<comment xml:lang="ca">document RealPix</comment>
<comment xml:lang="cs">dokument RealPix</comment>
<comment xml:lang="da">RealPix-dokument</comment>
<comment xml:lang="de">RealPix-Dokument</comment>
<comment xml:lang="el">Έγγραφο RealPix</comment>
- <comment xml:lang="en_GB">RealPix document</comment>
+ <comment xml:lang="en-GB">RealPix document</comment>
<comment xml:lang="eo">RealPix-dokumento</comment>
<comment xml:lang="es">documento RealPix</comment>
<comment xml:lang="eu">RealPix dokumentua</comment>
<comment xml:lang="fi">RealPix-asiakirja</comment>
<comment xml:lang="fo">RealPix skjal</comment>
<comment xml:lang="fr">document RealPix</comment>
+ <comment xml:lang="fur">document RealPix</comment>
<comment xml:lang="ga">cáipéis RealPix</comment>
<comment xml:lang="gl">documento RealPix</comment>
<comment xml:lang="he">מסמך של RealPix</comment>
@@ -24376,7 +25267,7 @@
<comment xml:lang="oc">document RealPix</comment>
<comment xml:lang="pl">Dokument RealPix</comment>
<comment xml:lang="pt">documento RealPix</comment>
- <comment xml:lang="pt_BR">Documento RealPix</comment>
+ <comment xml:lang="pt-BR">Documento RealPix</comment>
<comment xml:lang="ro">Document RealPix</comment>
<comment xml:lang="ru">Документ RealPix</comment>
<comment xml:lang="sk">Dokument RealPix</comment>
@@ -24387,28 +25278,30 @@
<comment xml:lang="tr">RealPix belgesi</comment>
<comment xml:lang="uk">документ RealPix</comment>
<comment xml:lang="vi">Tài liệu ảnh RealPix</comment>
- <comment xml:lang="zh_CN">RealPix 文档</comment>
- <comment xml:lang="zh_TW">RealPix 文件</comment>
+ <comment xml:lang="zh-CN">RealPix 文档</comment>
+ <comment xml:lang="zh-TW">RealPix 文件</comment>
<glob pattern="*.rp"/>
</mime-type>
<mime-type type="text/vnd.rn-realtext">
<comment>RealText document</comment>
+ <comment xml:lang="af">RealText-dokument</comment>
<comment xml:lang="ar">مستند RealText</comment>
<comment xml:lang="ast">Documentu RealText</comment>
- <comment xml:lang="be@latin">Dakument RealText</comment>
+ <comment xml:lang="be-Latn">Dakument RealText</comment>
<comment xml:lang="bg">Документ — RealText</comment>
<comment xml:lang="ca">document RealText</comment>
<comment xml:lang="cs">dokument RealText</comment>
<comment xml:lang="da">RealText-dokument</comment>
<comment xml:lang="de">RealText-Dokument</comment>
<comment xml:lang="el">Έγγραφο RealText</comment>
- <comment xml:lang="en_GB">RealText document</comment>
+ <comment xml:lang="en-GB">RealText document</comment>
<comment xml:lang="eo">RealText-dokumento</comment>
<comment xml:lang="es">documento RealText</comment>
<comment xml:lang="eu">RealText dokumentua</comment>
<comment xml:lang="fi">RealText-asiakirja</comment>
<comment xml:lang="fo">RealText skjal</comment>
<comment xml:lang="fr">document RealText</comment>
+ <comment xml:lang="fur">document RealText</comment>
<comment xml:lang="ga">cáipéis RealText</comment>
<comment xml:lang="gl">documento RealText</comment>
<comment xml:lang="he">מסמך של RealText</comment>
@@ -24428,7 +25321,7 @@
<comment xml:lang="oc">document RealText</comment>
<comment xml:lang="pl">Dokument RealText</comment>
<comment xml:lang="pt">documento RealText</comment>
- <comment xml:lang="pt_BR">Documento RealText</comment>
+ <comment xml:lang="pt-BR">Documento RealText</comment>
<comment xml:lang="ro">Document RealText</comment>
<comment xml:lang="ru">Документ RealText</comment>
<comment xml:lang="sk">Dokument RealText</comment>
@@ -24439,15 +25332,16 @@
<comment xml:lang="tr">RealText belgesi</comment>
<comment xml:lang="uk">документ RealText</comment>
<comment xml:lang="vi">Tài liệu văn bản RealText</comment>
- <comment xml:lang="zh_CN">RealText 文档</comment>
- <comment xml:lang="zh_TW">RealText 文件</comment>
+ <comment xml:lang="zh-CN">RealText 文档</comment>
+ <comment xml:lang="zh-TW">RealText 文件</comment>
<glob pattern="*.rt"/>
</mime-type>
<mime-type type="audio/x-riff">
<comment>RIFF audio</comment>
+ <comment xml:lang="af">RIFF-oudio</comment>
<comment xml:lang="ar">RIFF سمعي</comment>
<comment xml:lang="az">RIFF audio faylı</comment>
- <comment xml:lang="be@latin">Aŭdyjo RIFF</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo RIFF</comment>
<comment xml:lang="bg">Аудио — RIFF</comment>
<comment xml:lang="ca">àudio RIFF</comment>
<comment xml:lang="cs">zvuk RIFF</comment>
@@ -24455,13 +25349,14 @@
<comment xml:lang="da">RIFF-lyd</comment>
<comment xml:lang="de">RIFF-Audio</comment>
<comment xml:lang="el">Ήχος RIFF</comment>
- <comment xml:lang="en_GB">RIFF audio</comment>
+ <comment xml:lang="en-GB">RIFF audio</comment>
<comment xml:lang="eo">RIFF-sondosiero</comment>
- <comment xml:lang="es">sonido RIFF</comment>
+ <comment xml:lang="es">audio RIFF</comment>
<comment xml:lang="eu">RIFF audioa</comment>
<comment xml:lang="fi">RIFF-ääni</comment>
<comment xml:lang="fo">RIFF ljóð</comment>
<comment xml:lang="fr">audio RIFF</comment>
+ <comment xml:lang="fur">audio RIFF</comment>
<comment xml:lang="ga">fuaim RIFF</comment>
<comment xml:lang="gl">son RIFF</comment>
<comment xml:lang="he">שמע RIFF</comment>
@@ -24482,7 +25377,7 @@
<comment xml:lang="oc">àudio RIFF</comment>
<comment xml:lang="pl">Plik dźwiękowy RIFF</comment>
<comment xml:lang="pt">áudio RIFF</comment>
- <comment xml:lang="pt_BR">Áudio RIFF</comment>
+ <comment xml:lang="pt-BR">Áudio RIFF</comment>
<comment xml:lang="ro">Audio RIFF</comment>
<comment xml:lang="ru">Аудио RIFF</comment>
<comment xml:lang="sk">Zvuk RIFF</comment>
@@ -24493,20 +25388,24 @@
<comment xml:lang="tr">RIFF sesi</comment>
<comment xml:lang="uk">звук RIFF</comment>
<comment xml:lang="vi">Âm thanh RIFF</comment>
- <comment xml:lang="zh_CN">RIFF 音频</comment>
- <comment xml:lang="zh_TW">RIFF 音訊</comment>
+ <comment xml:lang="zh-CN">RIFF 音频</comment>
+ <comment xml:lang="zh-TW">RIFF 音訊</comment>
</mime-type>
<mime-type type="application/x-riff">
<comment>RIFF container</comment>
+ <comment xml:lang="af">RIFF-houer</comment>
+ <comment xml:lang="bg">Контейнер — RIFF</comment>
<comment xml:lang="ca">contenidor RIFF</comment>
<comment xml:lang="cs">kontejner RIFF</comment>
<comment xml:lang="da">RIFF-container</comment>
<comment xml:lang="de">RIFF-Container</comment>
<comment xml:lang="el">Περιέκτης RIFF</comment>
- <comment xml:lang="en_GB">RIFF container</comment>
+ <comment xml:lang="en-GB">RIFF container</comment>
<comment xml:lang="es">contenedor RIFF</comment>
<comment xml:lang="eu">RIFF edukitzailea</comment>
+ <comment xml:lang="fi">RIFF-kontti</comment>
<comment xml:lang="fr">conteneur RIFF</comment>
+ <comment xml:lang="fur">contignidôr RIFF</comment>
<comment xml:lang="ga">coimeádán RIFF</comment>
<comment xml:lang="gl">Contenedor RIFF</comment>
<comment xml:lang="he">מכולת RIFF</comment>
@@ -24520,7 +25419,7 @@
<comment xml:lang="oc">contenidor RIFF</comment>
<comment xml:lang="pl">Kontener RIFF</comment>
<comment xml:lang="pt">contentor RIFF</comment>
- <comment xml:lang="pt_BR">Contêiner RIFF</comment>
+ <comment xml:lang="pt-BR">Contêiner RIFF</comment>
<comment xml:lang="ru">Контейнер RIFF</comment>
<comment xml:lang="sk">Kontajner RIFF</comment>
<comment xml:lang="sl">Vsebnik RIFF</comment>
@@ -24528,18 +25427,18 @@
<comment xml:lang="sv">RIFF-behållare</comment>
<comment xml:lang="tr">RIFF deposu</comment>
<comment xml:lang="uk">контейнер RIFF</comment>
- <comment xml:lang="zh_CN">RIFF 容器</comment>
- <comment xml:lang="zh_TW">RIFF 容器</comment>
-
+ <comment xml:lang="zh-CN">RIFF 容器</comment>
+ <comment xml:lang="zh-TW">RIFF 容器</comment>
+ <!-- need to be lower prio than avi -->
<magic priority="45">
- <match value="RIFF" type="string" offset="0"/>
+ <match type="string" value="RIFF" offset="0"/>
</magic>
</mime-type>
<mime-type type="audio/x-s3m">
<comment>Scream Tracker 3 audio</comment>
<comment xml:lang="ar">Scream Tracker 3 سمعي</comment>
<comment xml:lang="az">Scream Tracker 3 audio faylı</comment>
- <comment xml:lang="be@latin">Aŭdyjo Scream Tracker 3</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Scream Tracker 3</comment>
<comment xml:lang="bg">Аудио — Scream Tracker 3</comment>
<comment xml:lang="ca">àudio de Scream Tracker 3</comment>
<comment xml:lang="cs">skladba Scream Tracker 3</comment>
@@ -24547,13 +25446,14 @@
<comment xml:lang="da">Scream Tracker 3-lyd</comment>
<comment xml:lang="de">Scream-Tracker-3-Audio</comment>
<comment xml:lang="el">Ήχος Scream Tracker 3</comment>
- <comment xml:lang="en_GB">Scream Tracker 3 audio</comment>
+ <comment xml:lang="en-GB">Scream Tracker 3 audio</comment>
<comment xml:lang="eo">Sondosiero de Scream Tracker 3</comment>
- <comment xml:lang="es">sonido Scream Tracker 3</comment>
+ <comment xml:lang="es">audio Scream Tracker 3</comment>
<comment xml:lang="eu">Scream Tracker 3 audioa</comment>
<comment xml:lang="fi">Scream Tracker 3 -ääni</comment>
<comment xml:lang="fo">Scream Tracker 3 ljóður</comment>
<comment xml:lang="fr">audio Scream Tracker 3</comment>
+ <comment xml:lang="fur">audio Scream Tracker 3</comment>
<comment xml:lang="ga">fuaim Scream Tracker 3</comment>
<comment xml:lang="gl">son Scream Tracker 3</comment>
<comment xml:lang="he">שמע של Scream Tracker 3</comment>
@@ -24574,7 +25474,7 @@
<comment xml:lang="oc">àudio Scream Tracker 3</comment>
<comment xml:lang="pl">Plik dźwiękowy Scream Tracker 3</comment>
<comment xml:lang="pt">áudio Scream Tracker 3</comment>
- <comment xml:lang="pt_BR">Áudio Scream Tracker 3</comment>
+ <comment xml:lang="pt-BR">Áudio Scream Tracker 3</comment>
<comment xml:lang="ro">Audio Scream Tracker 3</comment>
<comment xml:lang="ru">Аудио Scream Tracker 3</comment>
<comment xml:lang="sk">Skladba Scream Tracker 3</comment>
@@ -24585,8 +25485,8 @@
<comment xml:lang="tr">Scream Tracker 3 sesi</comment>
<comment xml:lang="uk">звук Scream Tracker 3</comment>
<comment xml:lang="vi">Âm thanh Scream Tracker 3</comment>
- <comment xml:lang="zh_CN">Scheme Tracker 3 音频</comment>
- <comment xml:lang="zh_TW">Scream Tracker 3 音訊</comment>
+ <comment xml:lang="zh-CN">Scheme Tracker 3 音频</comment>
+ <comment xml:lang="zh-TW">Scream Tracker 3 音訊</comment>
<magic priority="50">
<match value="SCRM" type="string" offset="44"/>
</magic>
@@ -24595,20 +25495,21 @@
<mime-type type="audio/x-scpls">
<comment>MP3 ShoutCast playlist</comment>
<comment xml:lang="ar">قائمة تشغيل MP3 ShoutCast</comment>
- <comment xml:lang="be@latin">Śpis piesień dla tranślacyi MP3</comment>
+ <comment xml:lang="be-Latn">Śpis piesień dla tranślacyi MP3</comment>
<comment xml:lang="bg">Списък за изпълнение — MP3 ShoutCast</comment>
<comment xml:lang="ca">llista de reproducció MP3 ShoutCast</comment>
<comment xml:lang="cs">seznam k přehrání MP3 ShoutCast</comment>
<comment xml:lang="da">MP3 ShoutCast-afspilningsliste</comment>
<comment xml:lang="de">MP3-ShoutCast-Wiedergabeliste</comment>
<comment xml:lang="el">Λίστα αναπαραγωγής MP3 ShoutCast</comment>
- <comment xml:lang="en_GB">MP3 ShoutCast playlist</comment>
+ <comment xml:lang="en-GB">MP3 ShoutCast playlist</comment>
<comment xml:lang="eo">MP3-ludlisto de ShoutCast</comment>
<comment xml:lang="es">lista de reproducción MP3 ShoutCast</comment>
<comment xml:lang="eu">MP3 ShoutCast erreprodukzio-zerrenda</comment>
<comment xml:lang="fi">MP3 ShoutCast -soittolista</comment>
<comment xml:lang="fo">MP3 ShoutCast avspælingarlisti</comment>
<comment xml:lang="fr">liste de lecture MP3 ShoutCast</comment>
+ <comment xml:lang="fur">liste di riproduzion MP3 ShoutCast</comment>
<comment xml:lang="ga">seinmliosta MP3 ShoutCast</comment>
<comment xml:lang="gl">lista de reprodución MP3 de ShoutCast</comment>
<comment xml:lang="he">רשימת השמעה MP3 של ShoutCast</comment>
@@ -24629,7 +25530,7 @@
<comment xml:lang="oc">lista de lectura MP3 ShoutCast</comment>
<comment xml:lang="pl">Lista odtwarzania MP3 ShoutCast</comment>
<comment xml:lang="pt">lista de reprodução MP3 ShoutCast</comment>
- <comment xml:lang="pt_BR">Lista de reprodução MP3 ShoutCast</comment>
+ <comment xml:lang="pt-BR">Lista de reprodução MP3 ShoutCast</comment>
<comment xml:lang="ro">Listă MP3 ShoutCast</comment>
<comment xml:lang="ru">Список воспроизведения MP3 ShoutCast</comment>
<comment xml:lang="sk">Zoznam skladieb MP3 ShoutCast</comment>
@@ -24640,14 +25541,14 @@
<comment xml:lang="tr">MP3 ShoutCast çalma listesi</comment>
<comment xml:lang="uk">список програвання MP3 ShoutCast</comment>
<comment xml:lang="vi">Danh mục nhạc MP3 ShoutCast</comment>
- <comment xml:lang="zh_CN">MP3 ShoutCast 播放列表</comment>
- <comment xml:lang="zh_TW">MP3 ShoutCast 播放清單</comment>
+ <comment xml:lang="zh-CN">MP3 ShoutCast 播放列表</comment>
+ <comment xml:lang="zh-TW">MP3 ShoutCast 播放清單</comment>
<alias type="application/pls"/>
<alias type="audio/scpls"/>
<magic priority="50">
- <match value="[playlist]" type="string" offset="0"/>
- <match value="[Playlist]" type="string" offset="0"/>
- <match value="[PLAYLIST]" type="string" offset="0"/>
+ <match type="string" value="[playlist]" offset="0"/>
+ <match type="string" value="[Playlist]" offset="0"/>
+ <match type="string" value="[PLAYLIST]" offset="0"/>
</magic>
<glob pattern="*.pls"/>
</mime-type>
@@ -24655,7 +25556,7 @@
<comment>Scream Tracker audio</comment>
<comment xml:lang="ar">Scream Tracker سمعي</comment>
<comment xml:lang="az">Scream Tracker audio faylı</comment>
- <comment xml:lang="be@latin">Aŭdyjo Scream Tracker</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo Scream Tracker</comment>
<comment xml:lang="bg">Аудио — Scream Tracker</comment>
<comment xml:lang="ca">àudio de Scream Tracker</comment>
<comment xml:lang="cs">skladba Scream Tracker</comment>
@@ -24663,13 +25564,14 @@
<comment xml:lang="da">Scream Tracker-lyd</comment>
<comment xml:lang="de">Scream-Tracker-Audio</comment>
<comment xml:lang="el">Ήχος Scream Tracker</comment>
- <comment xml:lang="en_GB">Scream Tracker audio</comment>
+ <comment xml:lang="en-GB">Scream Tracker audio</comment>
<comment xml:lang="eo">Sondosiero de Scream Tracker</comment>
- <comment xml:lang="es">sonido Scream Tracker</comment>
+ <comment xml:lang="es">audio Scream Tracker</comment>
<comment xml:lang="eu">Scream Tracker audioa</comment>
<comment xml:lang="fi">Scream Tracker -ääni</comment>
<comment xml:lang="fo">Scream Tracker ljóður</comment>
<comment xml:lang="fr">audio Scream Tracker</comment>
+ <comment xml:lang="fur">audio Scream Tracker</comment>
<comment xml:lang="ga">fuaim Scream Tracker</comment>
<comment xml:lang="gl">son Scream Tracker</comment>
<comment xml:lang="he">שמע של Scream Tracker</comment>
@@ -24690,7 +25592,7 @@
<comment xml:lang="oc">àudio Scream Tracker</comment>
<comment xml:lang="pl">Plik dźwiękowy Scream Tracker</comment>
<comment xml:lang="pt">áudio Scream Tracker</comment>
- <comment xml:lang="pt_BR">Áudio Scream Tracker</comment>
+ <comment xml:lang="pt-BR">Áudio Scream Tracker</comment>
<comment xml:lang="ro">Audio Scream Tracker</comment>
<comment xml:lang="ru">Аудио Scream Tracker</comment>
<comment xml:lang="sk">Skladba Scream Tracker</comment>
@@ -24701,20 +25603,21 @@
<comment xml:lang="tr">Scream Tracker sesi</comment>
<comment xml:lang="uk">звук Scream Tracker</comment>
<comment xml:lang="vi">Âm thanh Scream Tracker</comment>
- <comment xml:lang="zh_CN">Scream Tracker 音频</comment>
- <comment xml:lang="zh_TW">Scream Tracker 音訊</comment>
+ <comment xml:lang="zh-CN">Scream Tracker 音频</comment>
+ <comment xml:lang="zh-TW">Scream Tracker 音訊</comment>
<magic>
- <match value="!Scream!\x1A" type="string" offset="20"/>
- <match value="!SCREAM!\x1A" type="string" offset="20"/>
- <match value="BMOD2STM\x1A" type="string" offset="20"/>
+ <match type="string" value="!Scream!\x1A" offset="20"/>
+ <match type="string" value="!SCREAM!\x1A" offset="20"/>
+ <match type="string" value="BMOD2STM\x1A" offset="20"/>
</magic>
<glob pattern="*.stm"/>
</mime-type>
<mime-type type="audio/x-voc">
<comment>VOC audio</comment>
+ <comment xml:lang="af">VOC-oudio</comment>
<comment xml:lang="ar">VOC سمعي</comment>
<comment xml:lang="az">VOC audio faylı</comment>
- <comment xml:lang="be@latin">Aŭdyjo VOC</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo VOC</comment>
<comment xml:lang="bg">Аудио — VOC</comment>
<comment xml:lang="ca">àudio VOC</comment>
<comment xml:lang="cs">zvuk VOC</comment>
@@ -24722,13 +25625,14 @@
<comment xml:lang="da">VOC-lyd</comment>
<comment xml:lang="de">VOC-Audio</comment>
<comment xml:lang="el">Ήχος VOC</comment>
- <comment xml:lang="en_GB">VOC audio</comment>
+ <comment xml:lang="en-GB">VOC audio</comment>
<comment xml:lang="eo">VOC-sondosiero</comment>
- <comment xml:lang="es">sonido VOC</comment>
+ <comment xml:lang="es">audio VOC</comment>
<comment xml:lang="eu">VOC audioa</comment>
<comment xml:lang="fi">VOC-ääni</comment>
<comment xml:lang="fo">VOC ljóður</comment>
<comment xml:lang="fr">audio VOC</comment>
+ <comment xml:lang="fur">audio VOC</comment>
<comment xml:lang="ga">fuaim VOC</comment>
<comment xml:lang="gl">son VOC</comment>
<comment xml:lang="he">שמע VOC</comment>
@@ -24749,7 +25653,7 @@
<comment xml:lang="oc">àudio VOC</comment>
<comment xml:lang="pl">Plik dźwiękowy VOC</comment>
<comment xml:lang="pt">áudio VOC</comment>
- <comment xml:lang="pt_BR">Áudio VOC</comment>
+ <comment xml:lang="pt-BR">Áudio VOC</comment>
<comment xml:lang="ro">Audio VOC</comment>
<comment xml:lang="ru">Аудио VOC</comment>
<comment xml:lang="sk">Zvuk VOC</comment>
@@ -24760,15 +25664,16 @@
<comment xml:lang="tr">VOC sesi</comment>
<comment xml:lang="uk">звук VOC</comment>
<comment xml:lang="vi">Âm thanh VOC</comment>
- <comment xml:lang="zh_CN">VOC 音频</comment>
- <comment xml:lang="zh_TW">VOC 音訊</comment>
+ <comment xml:lang="zh-CN">VOC 音频</comment>
+ <comment xml:lang="zh-TW">VOC 音訊</comment>
<glob pattern="*.voc"/>
</mime-type>
<mime-type type="audio/x-wav">
<comment>WAV audio</comment>
+ <comment xml:lang="af">WAV-oudio</comment>
<comment xml:lang="ar">WAV سمعي</comment>
<comment xml:lang="az">WAV audio faylı</comment>
- <comment xml:lang="be@latin">Aŭdyjo WAV</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo WAV</comment>
<comment xml:lang="bg">Аудио — WAV</comment>
<comment xml:lang="ca">àudio WAV</comment>
<comment xml:lang="cs">zvuk WAV</comment>
@@ -24776,13 +25681,14 @@
<comment xml:lang="da">WAV-lyd</comment>
<comment xml:lang="de">WAV-Audio</comment>
<comment xml:lang="el">Ήχος WAV</comment>
- <comment xml:lang="en_GB">WAV audio</comment>
+ <comment xml:lang="en-GB">WAV audio</comment>
<comment xml:lang="eo">WAV-sonkodo</comment>
- <comment xml:lang="es">sonido WAV</comment>
+ <comment xml:lang="es">audio WAV</comment>
<comment xml:lang="eu">WAV audioa</comment>
<comment xml:lang="fi">WAV-ääni</comment>
<comment xml:lang="fo">WAV ljóður</comment>
<comment xml:lang="fr">audio WAV</comment>
+ <comment xml:lang="fur">audio WAV</comment>
<comment xml:lang="ga">fuaim WAV</comment>
<comment xml:lang="gl">son WAV</comment>
<comment xml:lang="he">שמע WAV</comment>
@@ -24803,7 +25709,7 @@
<comment xml:lang="oc">àudio WAV</comment>
<comment xml:lang="pl">Plik dźwiękowy WAV</comment>
<comment xml:lang="pt">áudio WAV</comment>
- <comment xml:lang="pt_BR">Áudio WAV</comment>
+ <comment xml:lang="pt-BR">Áudio WAV</comment>
<comment xml:lang="ro">Audio WAV</comment>
<comment xml:lang="ru">Аудио WAV</comment>
<comment xml:lang="sk">Zvuk WAV</comment>
@@ -24814,13 +25720,13 @@
<comment xml:lang="tr">WAV sesi</comment>
<comment xml:lang="uk">звук WAV</comment>
<comment xml:lang="vi">Âm thanh WAV</comment>
- <comment xml:lang="zh_CN">WAV 音频</comment>
- <comment xml:lang="zh_TW">WAV 音訊</comment>
+ <comment xml:lang="zh-CN">WAV 音频</comment>
+ <comment xml:lang="zh-TW">WAV 音訊</comment>
<alias type="audio/wav"/>
<alias type="audio/vnd.wave"/>
<magic priority="50">
- <match value="WAVE" type="string" offset="8"/>
- <match value="WAV " type="string" offset="8"/>
+ <match type="string" value="WAVE" offset="8"/>
+ <match type="string" value="WAV " offset="8"/>
</magic>
<glob pattern="*.wav"/>
</mime-type>
@@ -24828,7 +25734,7 @@
<comment>Scream Tracker instrument</comment>
<comment xml:lang="ar">آلة Scream Tracker</comment>
<comment xml:lang="az">Scream Tracker instrumenti</comment>
- <comment xml:lang="be@latin">Instrument Scream Tracker</comment>
+ <comment xml:lang="be-Latn">Instrument Scream Tracker</comment>
<comment xml:lang="bg">Инструмент — Scream Tracker</comment>
<comment xml:lang="ca">instrument de Scream Tracker</comment>
<comment xml:lang="cs">nástroj pro Scream Tracker</comment>
@@ -24836,13 +25742,14 @@
<comment xml:lang="da">Scream Tracker-instrument</comment>
<comment xml:lang="de">Scream-Tracker-Instrument</comment>
<comment xml:lang="el">Μουσικό όργανο Scream Tracker</comment>
- <comment xml:lang="en_GB">Scream Tracker instrument</comment>
+ <comment xml:lang="en-GB">Scream Tracker instrument</comment>
<comment xml:lang="eo">instrumento de Scream Tracker</comment>
<comment xml:lang="es">instrumento Scream Tracker</comment>
<comment xml:lang="eu">Scream Tracker instrumentua</comment>
<comment xml:lang="fi">Scream Tracker -soitin</comment>
<comment xml:lang="fo">Scream Tracker ljóðføri</comment>
<comment xml:lang="fr">instrument Scream Tracker</comment>
+ <comment xml:lang="fur">strument Scream Tracker</comment>
<comment xml:lang="ga">ionstraim Scream Tracker</comment>
<comment xml:lang="gl">Instrumento Scream Tracker</comment>
<comment xml:lang="he">כלי של Scream Tracker</comment>
@@ -24863,7 +25770,7 @@
<comment xml:lang="oc">instrument Scream Tracker</comment>
<comment xml:lang="pl">Instrument Scream Tracker</comment>
<comment xml:lang="pt">instrumento Scream Tracker</comment>
- <comment xml:lang="pt_BR">Instrumento Scream Tracker</comment>
+ <comment xml:lang="pt-BR">Instrumento Scream Tracker</comment>
<comment xml:lang="ro">Instrument Scream Tracker</comment>
<comment xml:lang="ru">Инструмент Scream Tracker</comment>
<comment xml:lang="sk">Nástroj pre Scream Tracker</comment>
@@ -24874,8 +25781,8 @@
<comment xml:lang="tr">Scream Tracker çalgısı</comment>
<comment xml:lang="uk">інструмент Scream Tracker</comment>
<comment xml:lang="vi">Nhạc khí Scream Tracker</comment>
- <comment xml:lang="zh_CN">Scream Tracker 乐器</comment>
- <comment xml:lang="zh_TW">Scream Tracker 樂器檔</comment>
+ <comment xml:lang="zh-CN">Scream Tracker 乐器</comment>
+ <comment xml:lang="zh-TW">Scream Tracker 樂器檔</comment>
<magic priority="50">
<match value="Extended Instrument:" type="string" offset="0"/>
</magic>
@@ -24885,7 +25792,7 @@
<comment>FastTracker II audio</comment>
<comment xml:lang="ar">FastTracker II سمعي</comment>
<comment xml:lang="az">FastTracker II audio faylı</comment>
- <comment xml:lang="be@latin">Aŭdyjo FastTracker II</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo FastTracker II</comment>
<comment xml:lang="bg">Аудио — FastTracker II</comment>
<comment xml:lang="ca">àudio de FastTracker II</comment>
<comment xml:lang="cs">zvuk FastTracker II</comment>
@@ -24893,13 +25800,14 @@
<comment xml:lang="da">FastTracker II-lyd</comment>
<comment xml:lang="de">FastTracker-II-Audio</comment>
<comment xml:lang="el">Ήχος FastTracker II</comment>
- <comment xml:lang="en_GB">FastTracker II audio</comment>
+ <comment xml:lang="en-GB">FastTracker II audio</comment>
<comment xml:lang="eo">Sondosiero de FastTracker II</comment>
- <comment xml:lang="es">sonido FastTracker II</comment>
+ <comment xml:lang="es">audio FastTracker II</comment>
<comment xml:lang="eu">FastTracker II.ren audioa</comment>
<comment xml:lang="fi">FastTracker II -ääni</comment>
<comment xml:lang="fo">FastTracker II ljóður</comment>
<comment xml:lang="fr">audio FastTracker II</comment>
+ <comment xml:lang="fur">audio FastTracker II</comment>
<comment xml:lang="ga">fuaim FastTracker II</comment>
<comment xml:lang="gl">son de FastTracker II</comment>
<comment xml:lang="he">שמע FastTracker II</comment>
@@ -24921,7 +25829,7 @@
<comment xml:lang="oc">àudio FastTracker II</comment>
<comment xml:lang="pl">Plik dźwiękowy FastTracker II</comment>
<comment xml:lang="pt">áudio FastTracker II</comment>
- <comment xml:lang="pt_BR">Áudio FastTracker II</comment>
+ <comment xml:lang="pt-BR">Áudio FastTracker II</comment>
<comment xml:lang="ro">Audio FastTracker II</comment>
<comment xml:lang="ru">Аудио FastTracker II</comment>
<comment xml:lang="sk">Zvuk FastTracker II</comment>
@@ -24932,8 +25840,8 @@
<comment xml:lang="tr">FastTracker II sesi</comment>
<comment xml:lang="uk">звук FastTracker II</comment>
<comment xml:lang="vi">Âm thanh FastTracker II</comment>
- <comment xml:lang="zh_CN">FastTracker II 音频</comment>
- <comment xml:lang="zh_TW">FastTracker II 音訊</comment>
+ <comment xml:lang="zh-CN">FastTracker II 音频</comment>
+ <comment xml:lang="zh-TW">FastTracker II 音訊</comment>
<magic priority="50">
<match value="Extended Module:" type="string" offset="0"/>
</magic>
@@ -24941,21 +25849,23 @@
</mime-type>
<mime-type type="audio/x-tta">
<comment>TrueAudio audio</comment>
+ <comment xml:lang="af">TrueAudio-oudio</comment>
<comment xml:lang="ar">TrueAudio سمعي</comment>
- <comment xml:lang="be@latin">Aŭdyjo TrueAudio</comment>
+ <comment xml:lang="be-Latn">Aŭdyjo TrueAudio</comment>
<comment xml:lang="bg">Аудио — TrueAudio</comment>
- <comment xml:lang="ca">àudio de TrueAudio</comment>
+ <comment xml:lang="ca">àudio TrueAudio</comment>
<comment xml:lang="cs">zvuk TrueAudio</comment>
<comment xml:lang="da">TrueAudio-lyd</comment>
<comment xml:lang="de">TrueAudio-Audio</comment>
<comment xml:lang="el">Ήχος TrueAudio</comment>
- <comment xml:lang="en_GB">TrueAudio audio</comment>
+ <comment xml:lang="en-GB">TrueAudio audio</comment>
<comment xml:lang="eo">TrueAudio-sondosiero</comment>
- <comment xml:lang="es">sonido TrueAudio</comment>
+ <comment xml:lang="es">audio TrueAudio</comment>
<comment xml:lang="eu">TrueAudio audioa</comment>
<comment xml:lang="fi">TrueAudio-ääni</comment>
<comment xml:lang="fo">TrueAudio ljóður</comment>
<comment xml:lang="fr">audio TrueAudio</comment>
+ <comment xml:lang="fur">audio TrueAudio</comment>
<comment xml:lang="ga">fuaim TrueAudio</comment>
<comment xml:lang="gl">son Trueson</comment>
<comment xml:lang="he">שמע TrueAudio</comment>
@@ -24975,7 +25885,7 @@
<comment xml:lang="oc">àudio TrueAudio</comment>
<comment xml:lang="pl">Plik dźwiękowy TrueAudio</comment>
<comment xml:lang="pt">áudio TrueAudio</comment>
- <comment xml:lang="pt_BR">Áudio TrueAudio</comment>
+ <comment xml:lang="pt-BR">Áudio TrueAudio</comment>
<comment xml:lang="ro">Audio TrueAudio</comment>
<comment xml:lang="ru">Аудио TrueAudio</comment>
<comment xml:lang="sk">Zvuk TrueAudio</comment>
@@ -24986,8 +25896,8 @@
<comment xml:lang="tr">TrueAudio sesi</comment>
<comment xml:lang="uk">звук TrueAudio</comment>
<comment xml:lang="vi">Âm thanh TrueAudio</comment>
- <comment xml:lang="zh_CN">TrueAudio 音频</comment>
- <comment xml:lang="zh_TW">TrueAudio 音訊</comment>
+ <comment xml:lang="zh-CN">TrueAudio 音频</comment>
+ <comment xml:lang="zh-TW">TrueAudio 音訊</comment>
<alias type="audio/tta"/>
<magic priority="50">
<match value="TTA1" type="string" offset="0"/>
@@ -24996,9 +25906,10 @@
</mime-type>
<mime-type type="image/bmp">
<comment>Windows BMP image</comment>
+ <comment xml:lang="af">Windows BMP-beeld</comment>
<comment xml:lang="ar">صورة Windows BMP</comment>
<comment xml:lang="az">Windows BMP rəsmi</comment>
- <comment xml:lang="be@latin">Vyjava Windows BMP</comment>
+ <comment xml:lang="be-Latn">Vyjava Windows BMP</comment>
<comment xml:lang="bg">Изображение — Windows BMP</comment>
<comment xml:lang="ca">imatge BMP de Windows</comment>
<comment xml:lang="cs">obrázek Windows BMP</comment>
@@ -25006,13 +25917,14 @@
<comment xml:lang="da">Windows BMP-billede</comment>
<comment xml:lang="de">Windows-BMP-Bild</comment>
<comment xml:lang="el">Εικόνα Windows BMP</comment>
- <comment xml:lang="en_GB">Windows BMP image</comment>
+ <comment xml:lang="en-GB">Windows BMP image</comment>
<comment xml:lang="eo">BMP-bildo de Vindozo</comment>
<comment xml:lang="es">imagen BMP de Windows</comment>
<comment xml:lang="eu">Windows BMP irudia</comment>
<comment xml:lang="fi">Windows BMP -kuva</comment>
<comment xml:lang="fo">Windows BMP mynd</comment>
<comment xml:lang="fr">image Windows BMP</comment>
+ <comment xml:lang="fur">imagjin Windows BMP</comment>
<comment xml:lang="ga">íomhá BMP Windows</comment>
<comment xml:lang="gl">imaxe BMP de Windows</comment>
<comment xml:lang="he">תמונת BMP של Windows</comment>
@@ -25033,7 +25945,7 @@
<comment xml:lang="oc">imatge Windows BMP</comment>
<comment xml:lang="pl">Obraz BMP Windows</comment>
<comment xml:lang="pt">imagem BMP Windows</comment>
- <comment xml:lang="pt_BR">Imagem BMP do Windows</comment>
+ <comment xml:lang="pt-BR">Imagem BMP do Windows</comment>
<comment xml:lang="ro">Imagine Windows BMP</comment>
<comment xml:lang="ru">Изображение Windows BMP</comment>
<comment xml:lang="sk">Obrázok Windows BMP</comment>
@@ -25044,14 +25956,14 @@
<comment xml:lang="tr">Windows BMP görüntüsü</comment>
<comment xml:lang="uk">зображення Windows BMP</comment>
<comment xml:lang="vi">Ảnh BMP Windows</comment>
- <comment xml:lang="zh_CN">Windows BMP 图像</comment>
- <comment xml:lang="zh_TW">Windows BMP 影像</comment>
- <magic priority="50">
- <match value="BMxxxx\000\000" type="string" offset="0" mask="0xffff00000000ffff"/>
- <match value="BM" type="string" offset="0">
- <match value="12" type="byte" offset="14"/>
- <match value="64" type="byte" offset="14"/>
- <match value="40" type="byte" offset="14"/>
+ <comment xml:lang="zh-CN">Windows BMP 图像</comment>
+ <comment xml:lang="zh-TW">Windows BMP 影像</comment>
+ <magic priority="50">
+ <match type="string" mask="0xffff00000000ffff" value="BMxxxx\000\000" offset="0"/>
+ <match type="string" value="BM" offset="0">
+ <match type="byte" value="12" offset="14"/>
+ <match type="byte" value="64" offset="14"/>
+ <match type="byte" value="40" offset="14"/>
</match>
</magic>
<glob pattern="*.bmp"/>
@@ -25061,21 +25973,23 @@
</mime-type>
<mime-type type="image/vnd.wap.wbmp">
<comment>WBMP image</comment>
+ <comment xml:lang="af">WBMP-beeld</comment>
<comment xml:lang="ar">صورة WBMP</comment>
- <comment xml:lang="be@latin">Vyjava WBMP</comment>
+ <comment xml:lang="be-Latn">Vyjava WBMP</comment>
<comment xml:lang="bg">Изображение — WBMP</comment>
<comment xml:lang="ca">imatge WBMP</comment>
<comment xml:lang="cs">obrázek WBMP</comment>
<comment xml:lang="da">WBMP-billede</comment>
<comment xml:lang="de">WBMP-Bild</comment>
<comment xml:lang="el">Εικόνα WBMP</comment>
- <comment xml:lang="en_GB">WBMP image</comment>
+ <comment xml:lang="en-GB">WBMP image</comment>
<comment xml:lang="eo">WBMP-bildo</comment>
<comment xml:lang="es">imagen WBMP</comment>
<comment xml:lang="eu">WBMP irudia</comment>
<comment xml:lang="fi">WBMP-kuva</comment>
<comment xml:lang="fo">WBMP mynd</comment>
<comment xml:lang="fr">image WBMP</comment>
+ <comment xml:lang="fur">imagjin WBMP</comment>
<comment xml:lang="ga">íomhá WBMP</comment>
<comment xml:lang="gl">imaxe WBMP</comment>
<comment xml:lang="he">תמונת WBMP</comment>
@@ -25095,7 +26009,7 @@
<comment xml:lang="oc">imatge WBMP</comment>
<comment xml:lang="pl">Obraz WBMP</comment>
<comment xml:lang="pt">imagem WBMP</comment>
- <comment xml:lang="pt_BR">Imagem WBMP</comment>
+ <comment xml:lang="pt-BR">Imagem WBMP</comment>
<comment xml:lang="ro">Imagine WBMP</comment>
<comment xml:lang="ru">Изображение WBMP</comment>
<comment xml:lang="sk">Obrázok WBMP</comment>
@@ -25106,177 +26020,77 @@
<comment xml:lang="tr">WBMP görüntüsü</comment>
<comment xml:lang="uk">зображення WBMP</comment>
<comment xml:lang="vi">Ảnh WBMP</comment>
- <comment xml:lang="zh_CN">WBMP 图像</comment>
- <comment xml:lang="zh_TW">WBMP 影像</comment>
+ <comment xml:lang="zh-CN">WBMP 图像</comment>
+ <comment xml:lang="zh-TW">WBMP 影像</comment>
<acronym>WBMP</acronym>
<expanded-acronym>WAP bitmap</expanded-acronym>
<glob pattern="*.wbmp"/>
</mime-type>
<mime-type type="image/cgm">
- <comment>Computer Graphics Metafile</comment>
- <comment xml:lang="ar">ملف تعريف رسوميات الحاسوب</comment>
- <comment xml:lang="az">Kompüter Qrafikası Meta Faylı</comment>
- <comment xml:lang="be@latin">Metafajł Computer Graphics</comment>
- <comment xml:lang="bg">Метафайл — Computer Graphics</comment>
- <comment xml:lang="ca">metafitxer de Computer Graphics</comment>
- <comment xml:lang="cs">Computer Graphics Metafile</comment>
- <comment xml:lang="cy">Delwedd ffurf CGM</comment>
- <comment xml:lang="da">Computer Graphics-metafil</comment>
- <comment xml:lang="de">CGM-Datei</comment>
- <comment xml:lang="el">Αρχείο Computer Graphics Metafile</comment>
- <comment xml:lang="en_GB">Computer Graphics Metafile</comment>
- <comment xml:lang="es">metaarchivo de Computer Graphics</comment>
- <comment xml:lang="eu">Ordenagailuko grafikoen meta-fitxategia</comment>
- <comment xml:lang="fi">Computer Graphics -metatiedosto</comment>
- <comment xml:lang="fo">Teldugrafikk metafíla</comment>
- <comment xml:lang="fr">métafichier Computer Graphics</comment>
- <comment xml:lang="ga">Meiteachomhad Grafaicí Ríomhaire</comment>
- <comment xml:lang="gl">metaficheiro de Computer Graphics</comment>
- <comment xml:lang="he">קובץ-מטה מסוג Computer Graphics</comment>
- <comment xml:lang="hr">Computer Graphics meta datoteka</comment>
- <comment xml:lang="hu">Computer Graphics-metafájl</comment>
- <comment xml:lang="ia">Metafile Computer Graphics</comment>
- <comment xml:lang="id">Computer Graphics Metafile</comment>
- <comment xml:lang="it">Computer Graphics Metafile</comment>
- <comment xml:lang="ja">コンピューターグラフィックメタファイル</comment>
- <comment xml:lang="kk">компьютерлік графика метафайлы</comment>
- <comment xml:lang="ko">컴퓨터 그래픽스 메타 파일</comment>
- <comment xml:lang="lt">Computer Graphics metafailas</comment>
- <comment xml:lang="lv">Datorgrafikas metadatne</comment>
- <comment xml:lang="ms">Failmeta Grafik Komputer</comment>
- <comment xml:lang="nb">Computer Graphics Metafile</comment>
- <comment xml:lang="nl">Computer Graphics-metabestand</comment>
- <comment xml:lang="nn">Computer Graphics Metafile</comment>
- <comment xml:lang="oc">metafichièr Computer Graphics</comment>
- <comment xml:lang="pl">Metaplik grafiki komputerowej (CGM)</comment>
- <comment xml:lang="pt">metaficheiro Computer Graphics</comment>
- <comment xml:lang="pt_BR">Meta-arquivo do Computer Graphics</comment>
- <comment xml:lang="ro">Metafișier Computer Graphics</comment>
- <comment xml:lang="ru">Метафайл компьютерной графики</comment>
- <comment xml:lang="sk">Computer Graphics Metafile</comment>
- <comment xml:lang="sl">Metadatoteka računalniške grafike (CGM)</comment>
- <comment xml:lang="sq">Metafile Computer Graphics</comment>
- <comment xml:lang="sr">Метадатотека рачунарске графике</comment>
- <comment xml:lang="sv">Computer Graphics Metafil</comment>
- <comment xml:lang="tr">Computer Graphics Meta dosyası</comment>
- <comment xml:lang="uk">метафайл комп'ютерної графіки</comment>
- <comment xml:lang="vi">Siêu tập tin đồ họa máy tính (CMF)</comment>
- <comment xml:lang="zh_CN">计算机图形图元文件 (CGM)</comment>
- <comment xml:lang="zh_TW">CGM 影像</comment>
+ <comment>CGM image</comment>
+ <comment xml:lang="bg">Изображение — CGM</comment>
+ <comment xml:lang="ca">imatge CGM</comment>
+ <comment xml:lang="da">CGM-billede</comment>
+ <comment xml:lang="de">CGM-Bild</comment>
+ <comment xml:lang="en-GB">CGM image</comment>
+ <comment xml:lang="es">imagen CGM</comment>
+ <comment xml:lang="eu">CGM irudia</comment>
+ <comment xml:lang="fi">CGM-kuva</comment>
+ <comment xml:lang="fr">image CGM</comment>
+ <comment xml:lang="hr">CGM slika</comment>
+ <comment xml:lang="hu">CGM-kép</comment>
+ <comment xml:lang="id">Citra CGM</comment>
+ <comment xml:lang="it">Immagine CGM</comment>
+ <comment xml:lang="kk">CGM суреті</comment>
+ <comment xml:lang="ko">CGM 이미지</comment>
+ <comment xml:lang="pl">Obraz CGM</comment>
+ <comment xml:lang="pt-BR">Imagem CGM</comment>
+ <comment xml:lang="ru">Изображение CGM</comment>
+ <comment xml:lang="sk">Obrázok CGM</comment>
+ <comment xml:lang="sl">Slika CGM</comment>
+ <comment xml:lang="sv">CGM-bild</comment>
+ <comment xml:lang="tr">CGM görüntüsü</comment>
+ <comment xml:lang="uk">зображення CGM</comment>
+ <comment xml:lang="zh-CN">CGM 图像</comment>
+ <comment xml:lang="zh-TW">CGM 影像</comment>
+ <acronym>CGM</acronym>
+ <expanded-acronym>Computer Graphics Metafile</expanded-acronym>
<glob pattern="*.cgm"/>
</mime-type>
- <mime-type type="image/fax-g3">
- <comment>CCITT G3 fax</comment>
- <comment xml:lang="ar">فاكس CCITT G3</comment>
- <comment xml:lang="be@latin">Faks CCITT G3</comment>
- <comment xml:lang="bg">Факс — CCITT G3</comment>
- <comment xml:lang="ca">fax CCITT G3</comment>
- <comment xml:lang="cs">fax CCITT G3</comment>
- <comment xml:lang="da">CCITT G3-fax</comment>
- <comment xml:lang="de">CCITT-G3-Fax</comment>
- <comment xml:lang="el">φαξ σε μορφή CCITT G3</comment>
- <comment xml:lang="en_GB">CCITT G3 fax</comment>
- <comment xml:lang="eo">G3-fakso de CCITT</comment>
- <comment xml:lang="es">fax de CCITT G3</comment>
- <comment xml:lang="eu">CCITT G3 faxa</comment>
- <comment xml:lang="fi">CCITT G3 -faksi</comment>
- <comment xml:lang="fo">CCITT G3 telefaks</comment>
- <comment xml:lang="fr">télécopie G3 CCITT</comment>
- <comment xml:lang="ga">facs CCITT G3</comment>
- <comment xml:lang="gl">fax de CCITT G3</comment>
- <comment xml:lang="he">פקס של CCITT G3</comment>
- <comment xml:lang="hr">CCITT G3 faks</comment>
- <comment xml:lang="hu">CCITT G3-fax</comment>
- <comment xml:lang="ia">Fax CCITT G3</comment>
- <comment xml:lang="id">Faks CCITT G3</comment>
- <comment xml:lang="it">Fax CCITT G3</comment>
- <comment xml:lang="ja">CCITT G3 FAX</comment>
- <comment xml:lang="ka">CCITT G3 ფაქსი</comment>
- <comment xml:lang="kk">CCITT G3 факсі</comment>
- <comment xml:lang="ko">CCITT G3 팩스</comment>
- <comment xml:lang="lt">CCITT G3 faksas</comment>
- <comment xml:lang="lv">CCITT G3 fakss</comment>
- <comment xml:lang="ms">Faks g3 CCITT</comment>
- <comment xml:lang="nb">CCITT G3-faks</comment>
- <comment xml:lang="nl">CCITT G3-fax</comment>
- <comment xml:lang="nn">CCITT G3-fax</comment>
- <comment xml:lang="oc">telecòpia G3 CCITT</comment>
- <comment xml:lang="pl">Faks CCITT G3</comment>
- <comment xml:lang="pt">fax CCITT G3</comment>
- <comment xml:lang="pt_BR">Fax do CCITT G3</comment>
- <comment xml:lang="ro">Fax CCITT G3</comment>
- <comment xml:lang="ru">Факс CCITT G3</comment>
- <comment xml:lang="sk">Fax CCITT G3</comment>
- <comment xml:lang="sl">Datoteka faksimila CCITT G3</comment>
- <comment xml:lang="sq">Fax CCITT G3</comment>
- <comment xml:lang="sr">ЦЦИТТ Г3 факс</comment>
- <comment xml:lang="sv">CCITT G3-fax</comment>
- <comment xml:lang="tr">CCITT G3 faksı</comment>
- <comment xml:lang="uk">факс CCITT G3</comment>
- <comment xml:lang="vi">Điện thư G3 CCITT</comment>
- <comment xml:lang="zh_CN">CCITT G3 传真</comment>
- <comment xml:lang="zh_TW">CCITT G3 傳真檔</comment>
- <glob pattern="*.g3"/>
- </mime-type>
<mime-type type="image/g3fax">
- <comment>G3 fax image</comment>
- <comment xml:lang="ar">صورة فاكس G3</comment>
- <comment xml:lang="az">G3 faks rəsmi</comment>
- <comment xml:lang="be@latin">Faksavaja vyjava G3</comment>
- <comment xml:lang="bg">Изображение — факс G3</comment>
- <comment xml:lang="ca">imatge de fax G3</comment>
- <comment xml:lang="cs">faxový obrázek G3</comment>
- <comment xml:lang="cy">Delwedd Ffacs G3</comment>
- <comment xml:lang="da">G3-faxbillede</comment>
- <comment xml:lang="de">G3-Faxbild</comment>
- <comment xml:lang="el">Εικόνα φαξ G3</comment>
- <comment xml:lang="en_GB">G3 fax image</comment>
- <comment xml:lang="eo">G3-faksbildo</comment>
- <comment xml:lang="es">imagen de fax G3</comment>
- <comment xml:lang="eu">G3 fax-irudia</comment>
- <comment xml:lang="fi">G3-faksikuva</comment>
- <comment xml:lang="fo">G3 fax mynd</comment>
- <comment xml:lang="fr">image de télécopie G3</comment>
- <comment xml:lang="ga">íomhá fhacs G3</comment>
- <comment xml:lang="gl">imaxe de fax G3</comment>
- <comment xml:lang="he">תמונת פקס של G3</comment>
- <comment xml:lang="hr">G3 slika faksa</comment>
- <comment xml:lang="hu">G3-faxkép</comment>
- <comment xml:lang="ia">Imagine de fax G3</comment>
- <comment xml:lang="id">Citra faks G3</comment>
- <comment xml:lang="it">Immagine fax G3</comment>
- <comment xml:lang="ja">G3 FAX 画像</comment>
- <comment xml:lang="ka">G3 fax გამოსახულება</comment>
- <comment xml:lang="kk">G3 факс суреті</comment>
- <comment xml:lang="ko">G3 팩스 그림</comment>
- <comment xml:lang="lt">G3 fax paveikslėlis</comment>
- <comment xml:lang="lv">G3 faksa attēls</comment>
- <comment xml:lang="ms">Imej fax G3</comment>
- <comment xml:lang="nb">G3-faksbilde</comment>
- <comment xml:lang="nl">G3 faxafbeelding</comment>
- <comment xml:lang="nn">G3 faksbilete</comment>
- <comment xml:lang="oc">imatge de telecòpia G3</comment>
- <comment xml:lang="pl">Obraz faksowy G3</comment>
- <comment xml:lang="pt">imagem de fax G3</comment>
- <comment xml:lang="pt_BR">Imagem de fax G3</comment>
- <comment xml:lang="ro">Imagine fax G3</comment>
- <comment xml:lang="ru">Факсовое изображение G3</comment>
- <comment xml:lang="sk">Obrázok fax G3</comment>
- <comment xml:lang="sl">Slikovna datoteka G3 fax</comment>
- <comment xml:lang="sq">Figurë Fax G3</comment>
- <comment xml:lang="sr">слика Г3 факса</comment>
- <comment xml:lang="sv">G3-faxbild</comment>
- <comment xml:lang="tr">G3 fax görüntüsü</comment>
- <comment xml:lang="uk">факс G3</comment>
- <comment xml:lang="vi">Ảnh điện thư G3</comment>
- <comment xml:lang="zh_CN">G3 传真图像</comment>
- <comment xml:lang="zh_TW">G3 傳真圖</comment>
+ <comment>CCITT G3 fax image</comment>
+ <comment xml:lang="bg">Изображение — CCITT G3, факс</comment>
+ <comment xml:lang="ca">imatge de fax CCITT G3</comment>
+ <comment xml:lang="da">CCITT G3-faxbillede</comment>
+ <comment xml:lang="de">CCITT-G3-Faxbild</comment>
+ <comment xml:lang="en-GB">CCITT G3 fax image</comment>
+ <comment xml:lang="es">imagen de fax CCITT G3</comment>
+ <comment xml:lang="eu">CCITT G3 fax irudia</comment>
+ <comment xml:lang="fi">CCITT G3 -faksikuva</comment>
+ <comment xml:lang="fr">image de télécopie CCITT G3</comment>
+ <comment xml:lang="hr">CCITT G3 slika faksa</comment>
+ <comment xml:lang="hu">CCITT G3-faxkép</comment>
+ <comment xml:lang="id">Citra faks CCITT G3</comment>
+ <comment xml:lang="it">Immagine fax CCIT G3</comment>
+ <comment xml:lang="kk">CCITT G3 факс суреті</comment>
+ <comment xml:lang="ko">CCITT G3 팩스 이미지</comment>
+ <comment xml:lang="pl">Obraz faksowy G3 CCITT</comment>
+ <comment xml:lang="pt-BR">Imagem de fax CCITT G3</comment>
+ <comment xml:lang="ru">Факсовое изображение CCITT G3</comment>
+ <comment xml:lang="sv">CCITT G3 faxbild</comment>
+ <comment xml:lang="tr">CCITT G3 faks görüntüsü</comment>
+ <comment xml:lang="uk">зображення факсу G3 CCITT</comment>
+ <comment xml:lang="zh-CN">CCITT G3 传真图像</comment>
+ <comment xml:lang="zh-TW">CCITT G3 傳真影像</comment>
+ <glob pattern="*.g3"/>
+ <alias type="image/fax-g3"/>
</mime-type>
<mime-type type="image/gif">
<comment>GIF image</comment>
+ <comment xml:lang="af">GIF-beeld</comment>
<comment xml:lang="ar">صورة GIF</comment>
<comment xml:lang="az">GIF rəsmi</comment>
- <comment xml:lang="be@latin">Vyjava GIF</comment>
+ <comment xml:lang="be-Latn">Vyjava GIF</comment>
<comment xml:lang="bg">Изображение — GIF</comment>
<comment xml:lang="ca">imatge GIF</comment>
<comment xml:lang="cs">obrázek GIF</comment>
@@ -25284,13 +26098,14 @@
<comment xml:lang="da">GIF-billede</comment>
<comment xml:lang="de">GIF-Bild</comment>
<comment xml:lang="el">Εικόνα GIF</comment>
- <comment xml:lang="en_GB">GIF image</comment>
+ <comment xml:lang="en-GB">GIF image</comment>
<comment xml:lang="eo">GIF-bildo</comment>
<comment xml:lang="es">imagen GIF</comment>
<comment xml:lang="eu">GIF irudia</comment>
<comment xml:lang="fi">GIF-kuva</comment>
<comment xml:lang="fo">GIF mynd</comment>
<comment xml:lang="fr">image GIF</comment>
+ <comment xml:lang="fur">imagjin GIF</comment>
<comment xml:lang="ga">íomhá GIF</comment>
<comment xml:lang="gl">imaxe GIF</comment>
<comment xml:lang="he">תמונת GIF</comment>
@@ -25312,7 +26127,7 @@
<comment xml:lang="oc">imatge GIF</comment>
<comment xml:lang="pl">Obraz GIF</comment>
<comment xml:lang="pt">imagem GIF</comment>
- <comment xml:lang="pt_BR">Imagem GIF</comment>
+ <comment xml:lang="pt-BR">Imagem GIF</comment>
<comment xml:lang="ro">Imagine GIF</comment>
<comment xml:lang="ru">Изображение GIF</comment>
<comment xml:lang="sk">Obrázok GIF</comment>
@@ -25323,15 +26138,44 @@
<comment xml:lang="tr">GIF görüntüsü</comment>
<comment xml:lang="uk">зображення GIF</comment>
<comment xml:lang="vi">Ảnh GIF</comment>
- <comment xml:lang="zh_CN">GIF 图像</comment>
- <comment xml:lang="zh_TW">GIF 影像</comment>
+ <comment xml:lang="zh-CN">GIF 图像</comment>
+ <comment xml:lang="zh-TW">GIF 影像</comment>
<magic priority="50">
- <match value="GIF8" type="string" offset="0"/>
+ <match type="string" value="GIF8" offset="0"/>
</magic>
<glob pattern="*.gif"/>
</mime-type>
<mime-type type="image/heif">
<comment>HEIF image</comment>
+ <comment xml:lang="af">HEIF-beeld</comment>
+ <comment xml:lang="bg">Изображение — HEIF</comment>
+ <comment xml:lang="ca">imatge HEIF</comment>
+ <comment xml:lang="cs">obrázek HEIF</comment>
+ <comment xml:lang="da">HEIF-billede</comment>
+ <comment xml:lang="de">HEIF-Bild</comment>
+ <comment xml:lang="en-GB">HEIF image</comment>
+ <comment xml:lang="es">imagen HEIF</comment>
+ <comment xml:lang="eu">HEIF irudia</comment>
+ <comment xml:lang="fi">HEIF-kuva</comment>
+ <comment xml:lang="fr">image HEIF</comment>
+ <comment xml:lang="fur">imagjin HEIF</comment>
+ <comment xml:lang="ga">íomhá HEIF</comment>
+ <comment xml:lang="hr">HEIF slika</comment>
+ <comment xml:lang="hu">HEIF kép</comment>
+ <comment xml:lang="id">Citra HEIF</comment>
+ <comment xml:lang="it">Immagine HEIF</comment>
+ <comment xml:lang="kk">HEIF суреті</comment>
+ <comment xml:lang="ko">HEIF 그림</comment>
+ <comment xml:lang="pl">Obraz HEIF</comment>
+ <comment xml:lang="pt-BR">Imagem HEIF</comment>
+ <comment xml:lang="ru">Изображение HEIF</comment>
+ <comment xml:lang="sk">Obrázok HEIF</comment>
+ <comment xml:lang="sl">Slika HEIF</comment>
+ <comment xml:lang="sv">HEIF-bild</comment>
+ <comment xml:lang="tr">HEIF görüntüsü</comment>
+ <comment xml:lang="uk">зображення HEIF</comment>
+ <comment xml:lang="zh-CN">HEIF 图像</comment>
+ <comment xml:lang="zh-TW">HEIF 影像</comment>
<acronym>HEIF</acronym>
<expanded-acronym>High Efficiency Image File</expanded-acronym>
<glob pattern="*.heic"/>
@@ -25342,9 +26186,10 @@
</mime-type>
<mime-type type="image/ief">
<comment>IEF image</comment>
+ <comment xml:lang="af">IEF-beeld</comment>
<comment xml:lang="ar">صورة IEF</comment>
<comment xml:lang="az">IEF rəsmi</comment>
- <comment xml:lang="be@latin">Vyjava IEF</comment>
+ <comment xml:lang="be-Latn">Vyjava IEF</comment>
<comment xml:lang="bg">Изображение — IEF</comment>
<comment xml:lang="ca">imatge IEF</comment>
<comment xml:lang="cs">obrázek IEF</comment>
@@ -25352,13 +26197,14 @@
<comment xml:lang="da">IEF-billede</comment>
<comment xml:lang="de">IEF-Bild</comment>
<comment xml:lang="el">Εικόνα IEF</comment>
- <comment xml:lang="en_GB">IEF image</comment>
+ <comment xml:lang="en-GB">IEF image</comment>
<comment xml:lang="eo">IEF-bildo</comment>
<comment xml:lang="es">imagen IEF</comment>
<comment xml:lang="eu">IEF irudia</comment>
<comment xml:lang="fi">IEF-kuva</comment>
<comment xml:lang="fo">IEF mynd</comment>
<comment xml:lang="fr">image IEF</comment>
+ <comment xml:lang="fur">imagjin IEF</comment>
<comment xml:lang="ga">íomhá IEF</comment>
<comment xml:lang="gl">imaxe IEF</comment>
<comment xml:lang="he">תמונת IEF</comment>
@@ -25379,7 +26225,7 @@
<comment xml:lang="oc">imatge IEF</comment>
<comment xml:lang="pl">Obraz IEF</comment>
<comment xml:lang="pt">imagem IEF</comment>
- <comment xml:lang="pt_BR">Imagem IEF</comment>
+ <comment xml:lang="pt-BR">Imagem IEF</comment>
<comment xml:lang="ro">Imagine IEF</comment>
<comment xml:lang="ru">Изображение IEF</comment>
<comment xml:lang="sk">Obrázok IEF</comment>
@@ -25390,15 +26236,16 @@
<comment xml:lang="tr">IEF görüntüsü</comment>
<comment xml:lang="uk">зображення IEF</comment>
<comment xml:lang="vi">Ảnh IEF</comment>
- <comment xml:lang="zh_CN">IEF 图像</comment>
- <comment xml:lang="zh_TW">IEF 影像</comment>
+ <comment xml:lang="zh-CN">IEF 图像</comment>
+ <comment xml:lang="zh-TW">IEF 影像</comment>
<glob pattern="*.ief"/>
</mime-type>
<mime-type type="image/jpeg">
<comment>JPEG image</comment>
+ <comment xml:lang="af">JPEG-beeld</comment>
<comment xml:lang="ar">صورة JPEG</comment>
<comment xml:lang="az">JPEG rəsmi</comment>
- <comment xml:lang="be@latin">Vyjava JPEG</comment>
+ <comment xml:lang="be-Latn">Vyjava JPEG</comment>
<comment xml:lang="bg">Изображение — JPEG</comment>
<comment xml:lang="ca">imatge JPEG</comment>
<comment xml:lang="cs">obrázek JPEG</comment>
@@ -25406,13 +26253,14 @@
<comment xml:lang="da">JPEG-billede</comment>
<comment xml:lang="de">JPEG-Bild</comment>
<comment xml:lang="el">Εικόνα JPEG</comment>
- <comment xml:lang="en_GB">JPEG image</comment>
+ <comment xml:lang="en-GB">JPEG image</comment>
<comment xml:lang="eo">JPEG-bildo</comment>
<comment xml:lang="es">imagen JPEG</comment>
<comment xml:lang="eu">JPEG irudia</comment>
<comment xml:lang="fi">JPEG-kuva</comment>
<comment xml:lang="fo">JPEG mynd</comment>
<comment xml:lang="fr">image JPEG</comment>
+ <comment xml:lang="fur">imagjin JPEG</comment>
<comment xml:lang="ga">íomhá JPEG</comment>
<comment xml:lang="gl">imaxe JPEG</comment>
<comment xml:lang="he">תמונת JPEG</comment>
@@ -25433,7 +26281,7 @@
<comment xml:lang="oc">imatge JPEG</comment>
<comment xml:lang="pl">Obraz JPEG</comment>
<comment xml:lang="pt">imagem JPEG</comment>
- <comment xml:lang="pt_BR">Imagem JPEG</comment>
+ <comment xml:lang="pt-BR">Imagem JPEG</comment>
<comment xml:lang="ro">Imagine JPEG</comment>
<comment xml:lang="ru">Изображение JPEG</comment>
<comment xml:lang="sk">Obrázok JPEG</comment>
@@ -25444,19 +26292,47 @@
<comment xml:lang="tr">JPEG görüntüsü</comment>
<comment xml:lang="uk">зображення JPEG</comment>
<comment xml:lang="vi">Ảnh JPEG</comment>
- <comment xml:lang="zh_CN">JPEG 图像</comment>
- <comment xml:lang="zh_TW">JPEG 影像</comment>
+ <comment xml:lang="zh-CN">JPEG 图像</comment>
+ <comment xml:lang="zh-TW">JPEG 影像</comment>
<magic priority="50">
- <match value="\377\330\377" type="string" offset="0"/>
- <match value="0xffd8" type="big16" offset="0"/>
+ <match type="string" value="\377\330\377" offset="0"/>
+ <match type="big16" value="0xffd8" offset="0"/>
</magic>
- <glob pattern="*.jpeg"/>
<glob pattern="*.jpg"/>
+ <glob pattern="*.jpeg"/>
<glob pattern="*.jpe"/>
<alias type="image/pjpeg"/>
</mime-type>
<mime-type type="video/x-mjpeg">
<comment>MJPEG video stream</comment>
+ <comment xml:lang="af">MJPEG-videostroom</comment>
+ <comment xml:lang="bg">Поток — MJPEG, видео</comment>
+ <comment xml:lang="ca">flux de vídeo MJPEG</comment>
+ <comment xml:lang="cs">datový tok videa MJPEG</comment>
+ <comment xml:lang="da">MJPEG-videostrøm</comment>
+ <comment xml:lang="de">MJPEG-Videodatenstrom</comment>
+ <comment xml:lang="en-GB">MJPEG video stream</comment>
+ <comment xml:lang="es">videotransmisión MJPEG</comment>
+ <comment xml:lang="eu">MJPEG bideo korrontea</comment>
+ <comment xml:lang="fi">MJPEG-videon suoratoisto</comment>
+ <comment xml:lang="fr">flux vidéo MJPEG</comment>
+ <comment xml:lang="fur">trasmission video MJPEG</comment>
+ <comment xml:lang="ga">sruth físe MJPEG</comment>
+ <comment xml:lang="hr">Prijenos MJPEG videa</comment>
+ <comment xml:lang="hu">MJPEG videofolyam</comment>
+ <comment xml:lang="id">Stream video MJPEG</comment>
+ <comment xml:lang="it">Stream video MJPEG</comment>
+ <comment xml:lang="kk">MJPEG видео ағыны</comment>
+ <comment xml:lang="ko">MJPEG 비디오 스트림</comment>
+ <comment xml:lang="pl">Strumień wideo MJPEG</comment>
+ <comment xml:lang="pt-BR">Fluxo de vídeo MPEG</comment>
+ <comment xml:lang="ru">Видеопоток MJPEG</comment>
+ <comment xml:lang="sk">Stream videa MJPEG</comment>
+ <comment xml:lang="sv">MJPEG-videoström</comment>
+ <comment xml:lang="tr">MJPEG video akışı</comment>
+ <comment xml:lang="uk">відеопотік MJPEG</comment>
+ <comment xml:lang="zh-CN">MJPEG 视频流</comment>
+ <comment xml:lang="zh-TW">MJPEG 視訊串流</comment>
<acronym>MJPEG</acronym>
<expanded-acronym>Motion JPEG</expanded-acronym>
<sub-class-of type="image/jpeg"/>
@@ -25465,27 +26341,35 @@
</mime-type>
<mime-type type="image/x-jp2-codestream">
<comment>JPEG-2000 codestream</comment>
+ <comment xml:lang="bg">Поток — JPEG-2000, кодирано</comment>
<comment xml:lang="ca">flux de codis JPEG-2000</comment>
<comment xml:lang="cs">datový tok JPEG-2000</comment>
+ <comment xml:lang="da">JPEG-2000-kodestrøm</comment>
<comment xml:lang="de">JPEG-2000 Codestream</comment>
- <comment xml:lang="en_GB">JPEG-2000 codestream</comment>
+ <comment xml:lang="en-GB">JPEG-2000 codestream</comment>
<comment xml:lang="es">secuencia de código JPEG-2000</comment>
+ <comment xml:lang="eu">JPEG-2000 kodekorrontea</comment>
+ <comment xml:lang="fi">JPEG-2000-koodivirta</comment>
+ <comment xml:lang="fr">flux de code JPEG-2000</comment>
+ <comment xml:lang="fur">trasmission codiç JPEG-2000</comment>
+ <comment xml:lang="ga">códsruth JPEG-2000</comment>
<comment xml:lang="hr">JPEG-2000 kôd strujanja</comment>
<comment xml:lang="hu">JPEG-2000 kódfolyam</comment>
- <comment xml:lang="id">codestream JPEG-2000</comment>
+ <comment xml:lang="id">Codestream JPEG-2000</comment>
<comment xml:lang="it">Codestream JPEG-2000</comment>
<comment xml:lang="kk">JPEG-2000 код ағыны</comment>
<comment xml:lang="ko">JPEG-2000 코드스트림</comment>
<comment xml:lang="pl">Strumień kodu JPEG-2000</comment>
- <comment xml:lang="pt_BR">Imagem JPEG-2000</comment>
+ <comment xml:lang="pt-BR">Imagem JPEG-2000</comment>
<comment xml:lang="ru">Кодовый поток JPEG-2000</comment>
<comment xml:lang="sk">JPEG-2000 codestream</comment>
<comment xml:lang="sv">JPEG-2000-kodström</comment>
+ <comment xml:lang="tr">JPEG-2000 codestream</comment>
<comment xml:lang="uk">потік коду JPEG-2000</comment>
- <comment xml:lang="zh_CN">JPEG-2000 码流</comment>
- <comment xml:lang="zh_TW">JPEG-2000 代碼串流</comment>
+ <comment xml:lang="zh-CN">JPEG-2000 码流</comment>
+ <comment xml:lang="zh-TW">JPEG-2000 代碼串流</comment>
<magic priority="50">
- <match value="0xff4fff51" type="big32" offset="0"/>
+ <match type="big32" value="0xff4fff51" offset="0"/>
</magic>
<glob pattern="*.j2c"/>
<glob pattern="*.j2k"/>
@@ -25493,12 +26377,19 @@
</mime-type>
<mime-type type="image/jp2">
<comment>JPEG-2000 JP2 image</comment>
+ <comment xml:lang="af">JPEG-2000 JP2-beeld</comment>
+ <comment xml:lang="bg">Изображение — JPEG-2000 JP2</comment>
<comment xml:lang="ca">imatge JPEG-2000 JP2</comment>
<comment xml:lang="cs">obrázek JPEG-2000 JP2</comment>
+ <comment xml:lang="da">JPEG-2000 JP2-billede</comment>
<comment xml:lang="de">JPEG-2000 JP2-Bild</comment>
- <comment xml:lang="en_GB">JPEG-2000 JP2 image</comment>
+ <comment xml:lang="en-GB">JPEG-2000 JP2 image</comment>
<comment xml:lang="es">imagen JPEG-2000 JP2</comment>
+ <comment xml:lang="eu">JPEG-2000 JP2 irudia</comment>
<comment xml:lang="fi">JPEG-2000 JP2 -kuva</comment>
+ <comment xml:lang="fr">image JPEG-2000 JP2</comment>
+ <comment xml:lang="fur">imagjin JPEG-2000 JP2</comment>
+ <comment xml:lang="ga">íomhá JPEG-2000 JP2</comment>
<comment xml:lang="hr">JPEG-2000 JP2 slika</comment>
<comment xml:lang="hu">JPEG-2000 JP2 kép</comment>
<comment xml:lang="id">Citra JPEG-2000 JP2</comment>
@@ -25506,32 +26397,41 @@
<comment xml:lang="kk">JPEG-2000 JP2 суреті</comment>
<comment xml:lang="ko">JPEG-2000 JP2 그림</comment>
<comment xml:lang="pl">Obraz JP2 JPEG-2000</comment>
- <comment xml:lang="pt_BR">Imagem JP2 de JPEG-2000</comment>
+ <comment xml:lang="pt-BR">Imagem JP2 de JPEG-2000</comment>
<comment xml:lang="ru">Изоражение JPEG-2000 JP2</comment>
<comment xml:lang="sk">Obrázok JPEG-2000 JP2</comment>
+ <comment xml:lang="sl">Slika JPEG-2000 JP2</comment>
<comment xml:lang="sv">JPEG-2000 JP2-bild</comment>
+ <comment xml:lang="tr">JPEG-2000 JP2 görüntüsü</comment>
<comment xml:lang="uk">зображення JP2 JPEG-2000</comment>
- <comment xml:lang="zh_CN">JPEG-2000 JP2 图像</comment>
- <comment xml:lang="zh_TW">JPEG-2000 JP2 影像</comment>
+ <comment xml:lang="zh-CN">JPEG-2000 JP2 图像</comment>
+ <comment xml:lang="zh-TW">JPEG-2000 JP2 影像</comment>
<acronym>JP2</acronym>
<expanded-acronym>JPEG-2000</expanded-acronym>
<alias type="image/jpeg2000"/>
<alias type="image/jpeg2000-image"/>
<alias type="image/x-jpeg2000-image"/>
<magic priority="50">
- <match value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a jp2\x20" type="string" offset="0" mask="0xffffffffffffffffffffffff0000000000000000ffffffff"/>
+ <match type="string" mask="0xffffffffffffffffffffffff0000000000000000ffffffff" value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a jp2\x20" offset="0"/>
</magic>
<glob pattern="*.jp2"/>
<glob pattern="*.jpg2"/>
</mime-type>
<mime-type type="image/jpx">
<comment>JPEG-2000 JPX image</comment>
+ <comment xml:lang="af">JPEG-2000 JPX-beeld</comment>
+ <comment xml:lang="bg">Изображение — JPEG-2000 JPX</comment>
<comment xml:lang="ca">imatge JPEG-2000 JPX</comment>
<comment xml:lang="cs">obrázek JPEG-2000 JPX</comment>
+ <comment xml:lang="da">JPEG-2000 JPX-billede</comment>
<comment xml:lang="de">JPEG-2000 JPX-Bild</comment>
- <comment xml:lang="en_GB">JPEG-2000 JPX image</comment>
+ <comment xml:lang="en-GB">JPEG-2000 JPX image</comment>
<comment xml:lang="es">imagen JPEG-2000 JPX</comment>
+ <comment xml:lang="eu">JPEG-2000 JPX irudia</comment>
<comment xml:lang="fi">JPEG-2000 JPX -kuva</comment>
+ <comment xml:lang="fr">image JPEG-2000 JPX</comment>
+ <comment xml:lang="fur">imagjinJPEG-2000 JPX</comment>
+ <comment xml:lang="ga">íomhá JPEG-2000 JPX</comment>
<comment xml:lang="hr">JPEG-2000 JPX slika</comment>
<comment xml:lang="hu">JPEG-2000 JPX kép</comment>
<comment xml:lang="id">Citra JPEG-2000 JPX</comment>
@@ -25539,29 +26439,38 @@
<comment xml:lang="kk">JPEG-2000 JPX суреті</comment>
<comment xml:lang="ko">JPEG-2000 JPX 그림</comment>
<comment xml:lang="pl">Obraz JPX JPEG-2000</comment>
- <comment xml:lang="pt_BR">Imagem JPX de JPEG-2000</comment>
+ <comment xml:lang="pt-BR">Imagem JPX de JPEG-2000</comment>
<comment xml:lang="ru">Изображение JPEG-2000 JPX</comment>
<comment xml:lang="sk">Obrázok JPEG-2000 JPX</comment>
+ <comment xml:lang="sl">Slika JPEG-2000 JPX</comment>
<comment xml:lang="sv">JPEG-2000 JPX-bild</comment>
+ <comment xml:lang="tr">JPEG-2000 JPX görüntüsü</comment>
<comment xml:lang="uk">зображення JPX JPEG-2000</comment>
- <comment xml:lang="zh_CN">JPEG-2000 JPX 图像</comment>
- <comment xml:lang="zh_TW">JPEG-2000 JPX 影像</comment>
+ <comment xml:lang="zh-CN">JPEG-2000 JPX 图像</comment>
+ <comment xml:lang="zh-TW">JPEG-2000 JPX 影像</comment>
<acronym>JPX</acronym>
<expanded-acronym>JPEG-2000 eXtended</expanded-acronym>
<magic priority="50">
- <match value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a jpx\x20" type="string" offset="0" mask="0xffffffffffffffffffffffff0000000000000000ffffffff"/>
+ <match type="string" mask="0xffffffffffffffffffffffff0000000000000000ffffffff" value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a jpx\x20" offset="0"/>
</magic>
<glob pattern="*.jpf"/>
<glob pattern="*.jpx"/>
</mime-type>
<mime-type type="image/jpm">
<comment>JPEG-2000 JPM image</comment>
+ <comment xml:lang="af">JPEG-2000 JPM-beeld</comment>
+ <comment xml:lang="bg">Изображение — JPEG-2000 JPM</comment>
<comment xml:lang="ca">imatge JPEG-2000 JPM</comment>
<comment xml:lang="cs">obrázek JPEG-2000 JPM</comment>
+ <comment xml:lang="da">JPEG-2000 JPM-billede</comment>
<comment xml:lang="de">JPEG-2000 JPM-Bild</comment>
- <comment xml:lang="en_GB">JPEG-2000 JPM image</comment>
+ <comment xml:lang="en-GB">JPEG-2000 JPM image</comment>
<comment xml:lang="es">imagen JPEG-2000 JPM</comment>
+ <comment xml:lang="eu">JPEG-2000 JPM irudia</comment>
<comment xml:lang="fi">JPEG-2000 JPM -kuva</comment>
+ <comment xml:lang="fr">image JPEG-2000 JPM</comment>
+ <comment xml:lang="fur">imagjin JPEG-2000 JPM</comment>
+ <comment xml:lang="ga">íomhá JPEG-2000 JPM</comment>
<comment xml:lang="hr">JPEG-2000 JPM slika</comment>
<comment xml:lang="hu">JPEG-2000 JPM kép</comment>
<comment xml:lang="id">Citra JPEG-2000 JPM</comment>
@@ -25569,29 +26478,38 @@
<comment xml:lang="kk">JPEG-2000 JPM суреті</comment>
<comment xml:lang="ko">JPEG-2000 JPM 그림</comment>
<comment xml:lang="pl">Obraz JPM JPEG-2000</comment>
- <comment xml:lang="pt_BR">Imagem JPM de JPEG-2000</comment>
+ <comment xml:lang="pt-BR">Imagem JPM de JPEG-2000</comment>
<comment xml:lang="ru">Изображение JPEG-2000 JPM</comment>
<comment xml:lang="sk">Obrázok JPEG-2000 JPM</comment>
+ <comment xml:lang="sl">Slika JPEG-2000 JPM</comment>
<comment xml:lang="sv">JPEG-2000 JPM-bild</comment>
+ <comment xml:lang="tr">JPEG-2000 JPM görüntüsü</comment>
<comment xml:lang="uk">зображення JPM JPEG-2000</comment>
- <comment xml:lang="zh_CN">JPEG-2000 JPM 图像</comment>
- <comment xml:lang="zh_TW">JPEG-2000 JPM 影像</comment>
+ <comment xml:lang="zh-CN">JPEG-2000 JPM 图像</comment>
+ <comment xml:lang="zh-TW">JPEG-2000 JPM 影像</comment>
<acronym>JPM</acronym>
<expanded-acronym>JPEG-2000 Mixed</expanded-acronym>
<magic priority="50">
- <match value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a jpm\x20" type="string" offset="0" mask="0xffffffffffffffffffffffff0000000000000000ffffffff"/>
+ <match type="string" mask="0xffffffffffffffffffffffff0000000000000000ffffffff" value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a jpm\x20" offset="0"/>
</magic>
<glob pattern="*.jpm"/>
<glob pattern="*.jpgm"/>
</mime-type>
<mime-type type="video/mj2">
<comment>JPEG-2000 MJ2 video</comment>
+ <comment xml:lang="af">JPEG-2000 MJ2-video</comment>
+ <comment xml:lang="bg">Видео — JPEG-2000 MJ2</comment>
<comment xml:lang="ca">vídeo JPEG-2000 MJ2</comment>
<comment xml:lang="cs">video JPEG-2000 MJ2</comment>
+ <comment xml:lang="da">JPEG-2000 MJ2-video</comment>
<comment xml:lang="de">JPEG-2000 MJ2-Video</comment>
- <comment xml:lang="en_GB">JPEG-2000 MJ2 video</comment>
+ <comment xml:lang="en-GB">JPEG-2000 MJ2 video</comment>
<comment xml:lang="es">vídeo JPEG-2000 MJ2</comment>
+ <comment xml:lang="eu">JPEG-2000 MJ2 bideoa</comment>
<comment xml:lang="fi">JPEG-2000 MJ2 -video</comment>
+ <comment xml:lang="fr">vidéo JPEG-2000 MJ2</comment>
+ <comment xml:lang="fur">video JPEG-2000 MJ2</comment>
+ <comment xml:lang="ga">íomhá JPEG-2000 MJ2</comment>
<comment xml:lang="hr">JPEG-2000 MJ2 video snimka</comment>
<comment xml:lang="hu">JPEG-2000 MJ2 videó</comment>
<comment xml:lang="id">Video JPEG-2000 MJ2</comment>
@@ -25599,70 +26517,55 @@
<comment xml:lang="kk">JPEG-2000 MJ2 видеосы</comment>
<comment xml:lang="ko">JPEG-2000 MJ2 동영상</comment>
<comment xml:lang="pl">Plik wideo MJ2 JPEG-2000</comment>
- <comment xml:lang="pt_BR">Imagem MJ2 de JPEG-2000</comment>
+ <comment xml:lang="pt-BR">Imagem MJ2 de JPEG-2000</comment>
<comment xml:lang="ru">Видео JPEG-2000 MJ2</comment>
<comment xml:lang="sk">Video JPEG-2000 MJ2</comment>
+ <comment xml:lang="sl">Video JPEG-2000 MJ2</comment>
<comment xml:lang="sv">JPEG-2000 MJ2-bild</comment>
+ <comment xml:lang="tr">JPEG-2000 MJ2 videosu</comment>
<comment xml:lang="uk">зображення MJ2 JPEG-2000</comment>
- <comment xml:lang="zh_CN">JPEG-2000 MJ2 视频</comment>
- <comment xml:lang="zh_TW">JPEG-2000 MJ2 視訊</comment>
+ <comment xml:lang="zh-CN">JPEG-2000 MJ2 视频</comment>
+ <comment xml:lang="zh-TW">JPEG-2000 MJ2 視訊</comment>
<acronym>MJ2</acronym>
<expanded-acronym>Motion JPEG-2000</expanded-acronym>
<magic priority="50">
- <match value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a mjp2" type="string" offset="0" mask="0xffffffffffffffffffffffff0000000000000000ffffffff"/>
+ <match type="string" mask="0xffffffffffffffffffffffff0000000000000000ffffffff" value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a mjp2" offset="0"/>
</magic>
<glob pattern="*.mj2"/>
<glob pattern="*.mjp2"/>
</mime-type>
<mime-type type="image/openraster">
- <comment>OpenRaster archiving image</comment>
- <comment xml:lang="ar">صورة أرشيف OpenRaster</comment>
+ <comment>OpenRaster image</comment>
<comment xml:lang="bg">Изображение — OpenRaster</comment>
- <comment xml:lang="ca">imatge d'arxivat OpenRaster</comment>
- <comment xml:lang="cs">archivační obraz OpenRaster</comment>
- <comment xml:lang="da">OpenRaster-arkivaftryk</comment>
- <comment xml:lang="de">OpenRaster-Archivierungsbild</comment>
- <comment xml:lang="el">Εικόνα αρχειοθέτησης OpenRaster</comment>
- <comment xml:lang="en_GB">OpenRaster archiving image</comment>
- <comment xml:lang="es">imagen de archivado de OpenRaster</comment>
- <comment xml:lang="eu">OpenRaster artxiboaren irudia</comment>
- <comment xml:lang="fi">OpenRaster-arkistokuva</comment>
- <comment xml:lang="fo">OpenRaster goymslumynd</comment>
- <comment xml:lang="fr">image d'archive OpenRaster</comment>
- <comment xml:lang="ga">íomhá chartlannaithe OpenRaster</comment>
- <comment xml:lang="gl">imaxe arquivada de OpenRaster</comment>
- <comment xml:lang="he">תמונת ארכיון של OpenRaster</comment>
- <comment xml:lang="hr">OpenRaster slika arhive</comment>
- <comment xml:lang="hu">OpenRaster archiválási kép</comment>
- <comment xml:lang="ia">Imagine de archivo OpenRaster</comment>
- <comment xml:lang="id">Gambar pengarsipan OpenRaster</comment>
- <comment xml:lang="it">Immagine archiviazione OpenRaster</comment>
- <comment xml:lang="ja">OpenRaster アーカイブイメージ</comment>
- <comment xml:lang="ka">OpenRaster-ის საარქივო გამოსახულება</comment>
- <comment xml:lang="kk">OpenRaster архивтеу суреті</comment>
- <comment xml:lang="ko">OpenRaster 압축 이미지</comment>
- <comment xml:lang="lt">OpenRaster archyvavimo paveikslėlis</comment>
- <comment xml:lang="lv">OpenRaster arhivēšanas attēls</comment>
- <comment xml:lang="nl">OpenRaster archiverings-image</comment>
- <comment xml:lang="oc">imatge d'archiu OpenRaster</comment>
- <comment xml:lang="pl">Archiwalny obraz OpenRaster</comment>
- <comment xml:lang="pt">imagem arquivo OpenRaster</comment>
- <comment xml:lang="pt_BR">Imagem de arquivamento OpenRaster</comment>
- <comment xml:lang="ro">Arhivă imagine OpenRaster</comment>
- <comment xml:lang="ru">Архивное изображение OpenRaster</comment>
- <comment xml:lang="sk">Archivačný obrázok OpenRaster</comment>
- <comment xml:lang="sl">Odtis arhiva OpenRaster</comment>
- <comment xml:lang="sr">слика Опен Растер архивирања</comment>
- <comment xml:lang="sv">OpenRaster-arkivbild</comment>
- <comment xml:lang="tr">OpenRaster arşivleme görüntüsü</comment>
- <comment xml:lang="uk">архівоване зображення OpenRaster</comment>
- <comment xml:lang="zh_CN">OpenRaster 归档图像</comment>
- <comment xml:lang="zh_TW">OpenRaster 封存影像</comment>
+ <comment xml:lang="ca">imatge OpenRaster</comment>
+ <comment xml:lang="da">OpenRaster-billede</comment>
+ <comment xml:lang="de">OpenRaster-Bild</comment>
+ <comment xml:lang="en-GB">OpenRaster image</comment>
+ <comment xml:lang="es">imagen OpenRaster</comment>
+ <comment xml:lang="eu">OpenRaster irudia</comment>
+ <comment xml:lang="fi">OpenRaster-kuva</comment>
+ <comment xml:lang="fr">image OpenRaster</comment>
+ <comment xml:lang="hr">OpenRaster slika</comment>
+ <comment xml:lang="hu">OpenRaster kép</comment>
+ <comment xml:lang="id">Citra OpenRaster</comment>
+ <comment xml:lang="it">Immagine OpenRaster</comment>
+ <comment xml:lang="kk">OpenRaster суреті</comment>
+ <comment xml:lang="ko">OpenRaster 그림</comment>
+ <comment xml:lang="pl">Obraz OpenRaster</comment>
+ <comment xml:lang="pt-BR">Imagem OpenRaster</comment>
+ <comment xml:lang="ru">Изображение OpenRaster</comment>
+ <comment xml:lang="sk">Obrázok OpenRaster</comment>
+ <comment xml:lang="sl">Slika OpenRaster</comment>
+ <comment xml:lang="sv">OpenRaster-bild</comment>
+ <comment xml:lang="tr">OpenRaster görüntüsü</comment>
+ <comment xml:lang="uk">зображення OpenRaster</comment>
+ <comment xml:lang="zh-CN">OpenRaster 图像</comment>
+ <comment xml:lang="zh-TW">OpenRaster 影像</comment>
<sub-class-of type="application/zip"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="mimetype" type="string" offset="30">
- <match value="image/openraster" type="string" offset="38"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="mimetype" offset="30">
+ <match type="string" value="image/openraster" offset="38"/>
</match>
</match>
</magic>
@@ -25671,19 +26574,20 @@
<mime-type type="image/x-dds">
<comment>DirectDraw surface</comment>
<comment xml:lang="ar">مساحة DirectDraw</comment>
- <comment xml:lang="be@latin">Pavierchnia DirectDraw</comment>
+ <comment xml:lang="be-Latn">Pavierchnia DirectDraw</comment>
<comment xml:lang="bg">Изображение — повърхност на DirectDraw</comment>
<comment xml:lang="ca">superfície DirectDraw</comment>
<comment xml:lang="cs">povrch DirectDraw</comment>
<comment xml:lang="da">DirectDraw-overflade</comment>
<comment xml:lang="de">DirectDraw-Oberfläche</comment>
<comment xml:lang="el">Επιφάνεια DirectDraw</comment>
- <comment xml:lang="en_GB">DirectDraw surface</comment>
+ <comment xml:lang="en-GB">DirectDraw surface</comment>
<comment xml:lang="es">superficie de DirectDraw</comment>
<comment xml:lang="eu">DirectDraw gainazala</comment>
<comment xml:lang="fi">DirectDraw-piirtoalue</comment>
<comment xml:lang="fo">DirectDraw yvirflata</comment>
<comment xml:lang="fr">surface DirectDraw</comment>
+ <comment xml:lang="fur">superficie DirectDraw</comment>
<comment xml:lang="ga">dromchla DirectDraw</comment>
<comment xml:lang="gl">superficie de DirectDraw</comment>
<comment xml:lang="he">משטח של DirectDraw</comment>
@@ -25704,7 +26608,7 @@
<comment xml:lang="oc">surfàcia DirectDraw</comment>
<comment xml:lang="pl">Powierzchnia DirectDraw</comment>
<comment xml:lang="pt">superfície DirectDraw</comment>
- <comment xml:lang="pt_BR">Superfície do DirectDraw</comment>
+ <comment xml:lang="pt-BR">Superfície do DirectDraw</comment>
<comment xml:lang="ro">Suprafață DirectDraw</comment>
<comment xml:lang="ru">Плоскость DirectDraw</comment>
<comment xml:lang="sk">Plocha DirectDraw</comment>
@@ -25715,8 +26619,8 @@
<comment xml:lang="tr">DirectDraw yüzeyi</comment>
<comment xml:lang="uk">поверхня DirectDraw</comment>
<comment xml:lang="vi">Mặt DirectDraw</comment>
- <comment xml:lang="zh_CN">DirectDraw 表面</comment>
- <comment xml:lang="zh_TW">DirectDraw 表面</comment>
+ <comment xml:lang="zh-CN">DirectDraw 表面</comment>
+ <comment xml:lang="zh-TW">DirectDraw 表面</comment>
<magic priority="50">
<match value="DDS" type="string" offset="0"/>
</magic>
@@ -25724,20 +26628,22 @@
</mime-type>
<mime-type type="image/x-xcursor">
<comment>X11 cursor</comment>
+ <comment xml:lang="af">X11-wyser</comment>
<comment xml:lang="ar">مؤشر X11</comment>
- <comment xml:lang="be@latin">Kursor X11</comment>
+ <comment xml:lang="be-Latn">Kursor X11</comment>
<comment xml:lang="bg">Курсор — X11</comment>
- <comment xml:lang="ca">cursor X11</comment>
+ <comment xml:lang="ca">cursor de X11</comment>
<comment xml:lang="cs">kurzor X11</comment>
<comment xml:lang="da">X11-markør</comment>
<comment xml:lang="de">X11-Zeiger</comment>
<comment xml:lang="el">Δρομέας X11</comment>
- <comment xml:lang="en_GB">X11 cursor</comment>
+ <comment xml:lang="en-GB">X11 cursor</comment>
<comment xml:lang="es">cursor de X11</comment>
<comment xml:lang="eu">X11 kurtsorea</comment>
<comment xml:lang="fi">X11-osoitin</comment>
<comment xml:lang="fo">X11 vísi</comment>
<comment xml:lang="fr">curseur X11</comment>
+ <comment xml:lang="fur">cursôr X11</comment>
<comment xml:lang="ga">cúrsóir X11</comment>
<comment xml:lang="gl">Cursor X11</comment>
<comment xml:lang="he">סמן של X11</comment>
@@ -25757,7 +26663,7 @@
<comment xml:lang="oc">cursor X11</comment>
<comment xml:lang="pl">Kursor X11</comment>
<comment xml:lang="pt">cursor X11</comment>
- <comment xml:lang="pt_BR">Cursor do X11</comment>
+ <comment xml:lang="pt-BR">Cursor do X11</comment>
<comment xml:lang="ro">Cursor X11</comment>
<comment xml:lang="ru">Курсор X11</comment>
<comment xml:lang="sk">Kurzor X11</comment>
@@ -25768,29 +26674,31 @@
<comment xml:lang="tr">X11 imleci</comment>
<comment xml:lang="uk">курсор X11</comment>
<comment xml:lang="vi">Con chạy X11</comment>
- <comment xml:lang="zh_CN">X11 指针</comment>
- <comment xml:lang="zh_TW">X11 滑鼠游標</comment>
+ <comment xml:lang="zh-CN">X11 指针</comment>
+ <comment xml:lang="zh-TW">X11 滑鼠游標</comment>
<magic priority="50">
- <match value="Xcur" type="string" offset="0"/>
+ <match type="string" value="Xcur" offset="0"/>
</magic>
</mime-type>
<mime-type type="image/x-exr">
<comment>EXR image</comment>
+ <comment xml:lang="af">EXR-beeld</comment>
<comment xml:lang="ar">صورة EXR</comment>
- <comment xml:lang="be@latin">Vyjava EXR</comment>
+ <comment xml:lang="be-Latn">Vyjava EXR</comment>
<comment xml:lang="bg">Изображение — EXR</comment>
<comment xml:lang="ca">imatge EXR</comment>
<comment xml:lang="cs">obrázek EXR</comment>
<comment xml:lang="da">EXR-billede</comment>
<comment xml:lang="de">EXR-Bild</comment>
<comment xml:lang="el">Εικόνα EXR</comment>
- <comment xml:lang="en_GB">EXR image</comment>
+ <comment xml:lang="en-GB">EXR image</comment>
<comment xml:lang="eo">EXR-bildo</comment>
<comment xml:lang="es">imagen EXR</comment>
<comment xml:lang="eu">EXR irudia</comment>
<comment xml:lang="fi">EXR-kuva</comment>
<comment xml:lang="fo">EXR mynd</comment>
<comment xml:lang="fr">image EXR</comment>
+ <comment xml:lang="fur">imagjin EXR</comment>
<comment xml:lang="ga">íomhá EXR</comment>
<comment xml:lang="gl">imaxe EXR</comment>
<comment xml:lang="he">תמונת EXR</comment>
@@ -25811,7 +26719,7 @@
<comment xml:lang="oc">imatge EXR</comment>
<comment xml:lang="pl">Obraz EXR</comment>
<comment xml:lang="pt">imagem EXR</comment>
- <comment xml:lang="pt_BR">Imagem EXR</comment>
+ <comment xml:lang="pt-BR">Imagem EXR</comment>
<comment xml:lang="ro">Imagine EXR</comment>
<comment xml:lang="ru">Изображение EXR</comment>
<comment xml:lang="sk">Obrázok EXR</comment>
@@ -25822,30 +26730,32 @@
<comment xml:lang="tr">EXR görüntüsü</comment>
<comment xml:lang="uk">зображення EXR</comment>
<comment xml:lang="vi">Ảnh EXR</comment>
- <comment xml:lang="zh_CN">EXR 图像</comment>
- <comment xml:lang="zh_TW">EXR 影像</comment>
+ <comment xml:lang="zh-CN">EXR 图像</comment>
+ <comment xml:lang="zh-TW">EXR 影像</comment>
<magic priority="50">
- <match value="20000630" type="little32" offset="0"/>
+ <match type="little32" value="20000630" offset="0"/>
</magic>
<glob pattern="*.exr"/>
</mime-type>
<mime-type type="image/x-pict">
<comment>Macintosh Quickdraw/PICT drawing</comment>
+ <comment xml:lang="af">Macintosh Quickdraw/PICT-tekening</comment>
<comment xml:lang="ar">رسمة ماكنتوش Quickdraw/PICT</comment>
- <comment xml:lang="be@latin">Rysunak Macintosh Quickdraw/PICT</comment>
+ <comment xml:lang="be-Latn">Rysunak Macintosh Quickdraw/PICT</comment>
<comment xml:lang="bg">Чертеж — Macintosh Quickdraw/PICT</comment>
<comment xml:lang="ca">dibuix Quickdraw/PICT de Macintosh</comment>
<comment xml:lang="cs">kresba Macintosh Quickdraw/PICT</comment>
<comment xml:lang="da">Macintosh Quickdraw/PICT-tegning</comment>
<comment xml:lang="de">Macintosh-Quickdraw/PICT-Zeichnung</comment>
<comment xml:lang="el">Σχέδιο Macintosh Quickdraw/PICT</comment>
- <comment xml:lang="en_GB">Macintosh Quickdraw/PICT drawing</comment>
+ <comment xml:lang="en-GB">Macintosh Quickdraw/PICT drawing</comment>
<comment xml:lang="eo">Quickdraw/PICT-grafikaĵo de Macintosh</comment>
<comment xml:lang="es">dibujo de Macintosh Quickdraw/PICT</comment>
<comment xml:lang="eu">Macintosh Quickdraw/PICT marrazkia</comment>
<comment xml:lang="fi">Macintosh Quickdraw/PICT -piirros</comment>
<comment xml:lang="fo">Macintosh Quickdraw/PICT tekning</comment>
<comment xml:lang="fr">dessin Macintosh Quickdraw/PICT</comment>
+ <comment xml:lang="fur">dissen Macintosh Quickdraw/PICT</comment>
<comment xml:lang="ga">líníocht Macintosh Quickdraw/PICT</comment>
<comment xml:lang="gl">debuxo de Macintosh Quickdraw/PICT</comment>
<comment xml:lang="he">ציור של Macintosh Quickdraw/PICT</comment>
@@ -25866,7 +26776,7 @@
<comment xml:lang="oc">dessenh Macintosh Quickdraw/PICT</comment>
<comment xml:lang="pl">Rysunek QuickDraw/PICT Macintosh</comment>
<comment xml:lang="pt">desenho Quickdraw/PICT de Macintosh</comment>
- <comment xml:lang="pt_BR">Desenho do Macintosh Quickdraw/PICT</comment>
+ <comment xml:lang="pt-BR">Desenho do Macintosh Quickdraw/PICT</comment>
<comment xml:lang="ro">Desen Macintosh Quickdraw/PICT</comment>
<comment xml:lang="ru">Рисунок Macintosh Quickdraw/PICT</comment>
<comment xml:lang="sk">Kresba Macintosh QuickDraw/PICT</comment>
@@ -25877,22 +26787,22 @@
<comment xml:lang="tr">Macintosh Quickdraw/PICT çizimi</comment>
<comment xml:lang="uk">малюнок Macintosh Quickdraw/PICT</comment>
<comment xml:lang="vi">Bản vẽ Quickdraw/PICT của Macintosh</comment>
- <comment xml:lang="zh_CN">Macintosh Quickdraw/PICT 绘图</comment>
- <comment xml:lang="zh_TW">Macintosh Quickdraw/PICT 繪圖</comment>
+ <comment xml:lang="zh-CN">Macintosh Quickdraw/PICT 绘图</comment>
+ <comment xml:lang="zh-TW">Macintosh Quickdraw/PICT 繪圖</comment>
<magic priority="50">
- <match value="0x0011" type="big16" offset="10">
- <match value="0x02FF" type="big16" offset="12">
- <match value="0x0C00" type="big16" offset="14">
- <match value="0xFFFE" type="big16" offset="16"/>
+ <match type="big16" value="0x0011" offset="10">
+ <match type="big16" value="0x02FF" offset="12">
+ <match type="big16" value="0x0C00" offset="14">
+ <match type="big16" value="0xFFFE" offset="16"/>
</match>
</match>
</match>
</magic>
<magic priority="50">
- <match value="0x0011" type="big16" offset="522">
- <match value="0x02FF" type="big16" offset="524">
- <match value="0x0C00" type="big16" offset="526">
- <match value="0xFFFE" type="big16" offset="528"/>
+ <match type="big16" value="0x0011" offset="522">
+ <match type="big16" value="0x02FF" offset="524">
+ <match type="big16" value="0x0C00" offset="526">
+ <match type="big16" value="0xFFFE" offset="528"/>
</match>
</match>
</match>
@@ -25904,20 +26814,22 @@
</mime-type>
<mime-type type="application/x-ufraw">
<comment>UFRaw ID image</comment>
+ <comment xml:lang="af">UFRaw ID-beeld</comment>
<comment xml:lang="ar">صورة UFRaw ID</comment>
- <comment xml:lang="be@latin">Vyjava UFRaw ID</comment>
+ <comment xml:lang="be-Latn">Vyjava UFRaw ID</comment>
<comment xml:lang="bg">Изображение — UFRaw ID</comment>
<comment xml:lang="ca">imatge ID UFRaw</comment>
<comment xml:lang="cs">obrázek ID UFRaw</comment>
<comment xml:lang="da">UFRaw ID-billede</comment>
<comment xml:lang="de">UFRaw-Bildbeschreibungsdatei</comment>
<comment xml:lang="el">Εικόνα UFRaw</comment>
- <comment xml:lang="en_GB">UFRaw ID image</comment>
+ <comment xml:lang="en-GB">UFRaw ID image</comment>
<comment xml:lang="es">imagen de identificación UFRaw</comment>
<comment xml:lang="eu">UFRaw ID irudia</comment>
<comment xml:lang="fi">UFRaw ID -kuva</comment>
<comment xml:lang="fo">UFRaw ID mynd</comment>
<comment xml:lang="fr">image ID UFRaw</comment>
+ <comment xml:lang="fur">imagjin UFRaw ID</comment>
<comment xml:lang="ga">íomhá aitheantais UFRaw</comment>
<comment xml:lang="gl">imaxe de identificación UFRaw</comment>
<comment xml:lang="he">תמונה של UFRaw ID</comment>
@@ -25937,7 +26849,7 @@
<comment xml:lang="oc">imatge ID UFRaw</comment>
<comment xml:lang="pl">Obraz UFRaw ID</comment>
<comment xml:lang="pt">imagem UFRaw ID</comment>
- <comment xml:lang="pt_BR">Imagem ID do UFRaw</comment>
+ <comment xml:lang="pt-BR">Imagem ID do UFRaw</comment>
<comment xml:lang="ro">ID imagine UFRaw</comment>
<comment xml:lang="ru">Изображение UFRaw ID</comment>
<comment xml:lang="sk">Obrázok ID UFRaw</comment>
@@ -25948,8 +26860,8 @@
<comment xml:lang="tr">UFRaw ID görüntüsü</comment>
<comment xml:lang="uk">зображення UFRaw ID</comment>
<comment xml:lang="vi">Ảnh ID UFRaw</comment>
- <comment xml:lang="zh_CN">UFRaw ID 图像</comment>
- <comment xml:lang="zh_TW">UFRaw ID 影像</comment>
+ <comment xml:lang="zh-CN">UFRaw ID 图像</comment>
+ <comment xml:lang="zh-TW">UFRaw ID 影像</comment>
<acronym>UFRaw</acronym>
<expanded-acronym>Unidentified Flying Raw</expanded-acronym>
<sub-class-of type="application/xml"/>
@@ -25958,20 +26870,22 @@
</mime-type>
<mime-type type="image/x-dcraw">
<comment>digital raw image</comment>
+ <comment xml:lang="af">digitale rou beeld</comment>
<comment xml:lang="ar">صورة رقمية خامة</comment>
- <comment xml:lang="be@latin">suvoraja ličbavaja vyjava</comment>
+ <comment xml:lang="be-Latn">suvoraja ličbavaja vyjava</comment>
<comment xml:lang="bg">Изображение — digital raw</comment>
<comment xml:lang="ca">imatge digital en cru</comment>
<comment xml:lang="cs">digitální surový obrázek</comment>
- <comment xml:lang="da">digitalt råbillede</comment>
+ <comment xml:lang="da">digitalt raw-billede</comment>
<comment xml:lang="de">Digitales Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη ψηφιακή εικόνα</comment>
- <comment xml:lang="en_GB">digital raw image</comment>
+ <comment xml:lang="en-GB">digital raw image</comment>
<comment xml:lang="es">imagen digital en bruto</comment>
<comment xml:lang="eu">irudi gordin digitala</comment>
<comment xml:lang="fi">digitaalinen raakakuva</comment>
<comment xml:lang="fo">talgild rámynd</comment>
<comment xml:lang="fr">image brute numérique</comment>
+ <comment xml:lang="fur">imagjin grese digjitâl</comment>
<comment xml:lang="ga">amhíomhá dhigiteach</comment>
<comment xml:lang="gl">imaxe en bruto dixital</comment>
<comment xml:lang="he">תמונה דיגטלית גולמית</comment>
@@ -25991,7 +26905,7 @@
<comment xml:lang="oc">imatge brut numeric</comment>
<comment xml:lang="pl">Surowy obraz cyfrowy</comment>
<comment xml:lang="pt">imagem digital em bruto</comment>
- <comment xml:lang="pt_BR">Imagem digital bruta</comment>
+ <comment xml:lang="pt-BR">Imagem digital bruta</comment>
<comment xml:lang="ro">imagine digitală brută</comment>
<comment xml:lang="ru">Необработанное цифровое изображение</comment>
<comment xml:lang="sk">Digitálny surový obrázok</comment>
@@ -26002,25 +26916,27 @@
<comment xml:lang="tr">sayısal ham görüntü</comment>
<comment xml:lang="uk">зображення цифрового негатива</comment>
<comment xml:lang="vi">ảnh thô số</comment>
- <comment xml:lang="zh_CN">数字化原始图像</comment>
- <comment xml:lang="zh_TW">數位原生影像</comment>
+ <comment xml:lang="zh-CN">数字化原始图像</comment>
+ <comment xml:lang="zh-TW">數位原始影像</comment>
</mime-type>
<mime-type type="image/x-adobe-dng">
<comment>Adobe DNG negative</comment>
+ <comment xml:lang="af">Adobe DNG-negatief</comment>
<comment xml:lang="ar">Adobe DNG negative</comment>
- <comment xml:lang="be@latin">Adobe DNG Negative</comment>
+ <comment xml:lang="be-Latn">Adobe DNG Negative</comment>
<comment xml:lang="bg">Изображение — Adobe DNG negative</comment>
<comment xml:lang="ca">negatiu DNG d'Adobe</comment>
<comment xml:lang="cs">negativ Adobe (DNG)</comment>
<comment xml:lang="da">Adobe DNG-negativ</comment>
<comment xml:lang="de">Adobe Digitales Negativ</comment>
<comment xml:lang="el">Αρνητικό Adobe DNG</comment>
- <comment xml:lang="en_GB">Adobe DNG negative</comment>
+ <comment xml:lang="en-GB">Adobe DNG negative</comment>
<comment xml:lang="es">negativo DNG de Adobe</comment>
<comment xml:lang="eu">Adobe DNG negatiboa</comment>
<comment xml:lang="fi">Adobe-DNG-negatiivi</comment>
<comment xml:lang="fo">Adobe DNG negativ</comment>
<comment xml:lang="fr">négatif DNG Adobe</comment>
+ <comment xml:lang="fur">negatîf Adobe DNG</comment>
<comment xml:lang="ga">claonchló DNG Adobe</comment>
<comment xml:lang="gl">negativo DNG de Adobe</comment>
<comment xml:lang="he">תשליל Adobe DNG</comment>
@@ -26041,7 +26957,7 @@
<comment xml:lang="oc">négatif DNG Adobe</comment>
<comment xml:lang="pl">Negatyw DNG Adobe</comment>
<comment xml:lang="pt">negativo Adobe DNG</comment>
- <comment xml:lang="pt_BR">Negativo DNG da Adobe</comment>
+ <comment xml:lang="pt-BR">Negativo DNG da Adobe</comment>
<comment xml:lang="ro">Negativ Adobe DNG</comment>
<comment xml:lang="ru">Негатив Adobe DNG</comment>
<comment xml:lang="sk">Adobe Digital Negative (DNG)</comment>
@@ -26052,32 +26968,34 @@
<comment xml:lang="tr">Adobe DNG negatifi</comment>
<comment xml:lang="uk">цифровий негатив DNG Adobe</comment>
<comment xml:lang="vi">Âm bản Adobe DNG</comment>
- <comment xml:lang="zh_CN">Adobe DNG 负片</comment>
- <comment xml:lang="zh_TW">Adobe DNG 負片</comment>
+ <comment xml:lang="zh-CN">Adobe DNG 负片</comment>
+ <comment xml:lang="zh-TW">Adobe DNG 負片</comment>
<acronym>DNG</acronym>
<expanded-acronym>Digital Negative</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
<sub-class-of type="image/tiff"/>
<glob pattern="*.dng"/>
</mime-type>
-
-
+ <!-- Canon has 2 format: CRW and CR2 !-->
+ <!-- CRW is easy !-->
<mime-type type="image/x-canon-crw">
<comment>Canon CRW raw image</comment>
+ <comment xml:lang="af">Canon CRW rou beeld</comment>
<comment xml:lang="ar">صورة Canon CRW خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Canon CRW</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Canon CRW</comment>
<comment xml:lang="bg">Изображение — Canon CRW raw</comment>
<comment xml:lang="ca">imatge en cru de Canon CRW</comment>
<comment xml:lang="cs">surový obrázek Canon CRW</comment>
- <comment xml:lang="da">Canon CRW-råbillede</comment>
+ <comment xml:lang="da">Canon CRW raw-billede</comment>
<comment xml:lang="de">Canon-CRW-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Canon CRW</comment>
- <comment xml:lang="en_GB">Canon CRW raw image</comment>
+ <comment xml:lang="en-GB">Canon CRW raw image</comment>
<comment xml:lang="es">imagen en bruto CRW de Canon</comment>
<comment xml:lang="eu">Canon CRW irudi gordina</comment>
<comment xml:lang="fi">Canon-CRW-raakakuva</comment>
<comment xml:lang="fo">Canon CRW rámynd</comment>
<comment xml:lang="fr">image brute CRW Canon</comment>
+ <comment xml:lang="fur">imagjin grese Canon CRW</comment>
<comment xml:lang="ga">amhíomhá Canon CRW</comment>
<comment xml:lang="gl">imaxe en bruto de Canon CRW</comment>
<comment xml:lang="he">תמונה גולמית של Canon CRW</comment>
@@ -26098,7 +27016,7 @@
<comment xml:lang="oc">imatge brut CRW Canon</comment>
<comment xml:lang="pl">Surowy obraz CRW Canon</comment>
<comment xml:lang="pt">imagem em bruto Canon CRW</comment>
- <comment xml:lang="pt_BR">Imagem bruta CRW da Canon</comment>
+ <comment xml:lang="pt-BR">Imagem bruta CRW da Canon</comment>
<comment xml:lang="ro">Imagine brută Canon CRW</comment>
<comment xml:lang="ru">Необработанное изображение Canon CRW</comment>
<comment xml:lang="sk">Surový obrázok Canon CRW</comment>
@@ -26109,8 +27027,8 @@
<comment xml:lang="tr">Canon CRW ham görüntüsü</comment>
<comment xml:lang="uk">цифровий негатив CRW Canon</comment>
<comment xml:lang="vi">Ảnh thô Canon CRW</comment>
- <comment xml:lang="zh_CN">佳能 CRW 原始图像</comment>
- <comment xml:lang="zh_TW">Canon CRW 原生影像</comment>
+ <comment xml:lang="zh-CN">佳能 CRW 原始图像</comment>
+ <comment xml:lang="zh-TW">Canon CRW 原始影像</comment>
<acronym>CRW</acronym>
<expanded-acronym>Canon RaW</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
@@ -26119,23 +27037,25 @@
</magic>
<glob pattern="*.crw"/>
</mime-type>
-
+ <!-- CR2 is a TIFF !-->
<mime-type type="image/x-canon-cr2">
<comment>Canon CR2 raw image</comment>
+ <comment xml:lang="af">Canon CR2 rou beeld</comment>
<comment xml:lang="ar">صورة Canon CR2 خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Canon CR2</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Canon CR2</comment>
<comment xml:lang="bg">Изображение — Canon CR2 raw</comment>
<comment xml:lang="ca">imatge en cru de Canon CR2</comment>
<comment xml:lang="cs">surový obrázek Canon CR2</comment>
- <comment xml:lang="da">Canon CR2-råbillede</comment>
+ <comment xml:lang="da">Canon CR2 raw-billede</comment>
<comment xml:lang="de">Canon-CR2-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Canon CR2</comment>
- <comment xml:lang="en_GB">Canon CR2 raw image</comment>
+ <comment xml:lang="en-GB">Canon CR2 raw image</comment>
<comment xml:lang="es">imagen en bruto CR2 de Canon</comment>
<comment xml:lang="eu">Canon CR2 irudi gordina</comment>
<comment xml:lang="fi">Canon-CR2-raakakuva</comment>
<comment xml:lang="fo">Canon CR2 rámynd</comment>
<comment xml:lang="fr">image brute CR2 Canon</comment>
+ <comment xml:lang="fur">imagjin grese Canon CR2</comment>
<comment xml:lang="ga">amhíomhá Canon CR2</comment>
<comment xml:lang="gl">imaxe en bruto de Canon CR2</comment>
<comment xml:lang="he">תמונה גולמית של Canon CR2</comment>
@@ -26156,7 +27076,7 @@
<comment xml:lang="oc">imatge brut CR2 Canon</comment>
<comment xml:lang="pl">Surowy obraz CR2 Canon</comment>
<comment xml:lang="pt">imagem em bruto Canon CR2</comment>
- <comment xml:lang="pt_BR">Imagem bruta CR2 da Canon</comment>
+ <comment xml:lang="pt-BR">Imagem bruta CR2 da Canon</comment>
<comment xml:lang="ro">Imagine brută Canon CR2</comment>
<comment xml:lang="ru">Необработанное изображение Canon CR2</comment>
<comment xml:lang="sk">Surový obrázok Canon CR2</comment>
@@ -26167,8 +27087,8 @@
<comment xml:lang="tr">Canon CR2 ham görüntüsü</comment>
<comment xml:lang="uk">цифровий негатив CR2 Canon</comment>
<comment xml:lang="vi">Ảnh thô Canon CR2</comment>
- <comment xml:lang="zh_CN">佳能 CR2 原始图像</comment>
- <comment xml:lang="zh_TW">Canon CR2 原生影像</comment>
+ <comment xml:lang="zh-CN">佳能 CR2 原始图像</comment>
+ <comment xml:lang="zh-TW">Canon CR2 原始影像</comment>
<acronym>CR2</acronym>
<expanded-acronym>Canon Raw 2</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
@@ -26177,20 +27097,22 @@
</mime-type>
<mime-type type="image/x-fuji-raf">
<comment>Fuji RAF raw image</comment>
+ <comment xml:lang="af">Fuji RAF rou beeld</comment>
<comment xml:lang="ar">صورة Fuji RAF خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Fuji RAF</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Fuji RAF</comment>
<comment xml:lang="bg">Изображение — Fuji RAF raw</comment>
<comment xml:lang="ca">imatge en cru de Fuji RAF</comment>
<comment xml:lang="cs">surový obrázek Fuji RAF</comment>
- <comment xml:lang="da">Fuji RAF-råbillede</comment>
+ <comment xml:lang="da">Fuji RAF raw-billede</comment>
<comment xml:lang="de">Fuji-RAF-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Fuji RAF</comment>
- <comment xml:lang="en_GB">Fuji RAF raw image</comment>
+ <comment xml:lang="en-GB">Fuji RAF raw image</comment>
<comment xml:lang="es">imagen en bruto RAF de Fuji</comment>
<comment xml:lang="eu">Fuji RAF irudi gordina</comment>
<comment xml:lang="fi">Fuji-RAF-raakakuva</comment>
<comment xml:lang="fo">Fuji RAF raw mynd</comment>
<comment xml:lang="fr">image brute RAF Fuji</comment>
+ <comment xml:lang="fur">imagjin grese Fuji RAF</comment>
<comment xml:lang="ga">amhíomhá Fuji RAF</comment>
<comment xml:lang="gl">imaxe en bruto de Fuji RAF</comment>
<comment xml:lang="he">תמונה גולמית של Fuji RAF</comment>
@@ -26211,7 +27133,7 @@
<comment xml:lang="oc">imatge brut RAF Fuji</comment>
<comment xml:lang="pl">Surowy obraz RAF Fuji</comment>
<comment xml:lang="pt">imagem em bruto Fuji RAF</comment>
- <comment xml:lang="pt_BR">Imagem bruta RAF da Fuji</comment>
+ <comment xml:lang="pt-BR">Imagem bruta RAF da Fuji</comment>
<comment xml:lang="ro">Imagine brută Fuji RAF</comment>
<comment xml:lang="ru">Необработанное изображение Fuji RAF</comment>
<comment xml:lang="sk">Surový obrázok Fuji RAF</comment>
@@ -26222,8 +27144,8 @@
<comment xml:lang="tr">Fuji RAF ham görüntüsü</comment>
<comment xml:lang="uk">Цифровий негатив RAF Fuji</comment>
<comment xml:lang="vi">Ảnh thô Fuji RAF</comment>
- <comment xml:lang="zh_CN">富士 RAF 原始图像</comment>
- <comment xml:lang="zh_TW">Fuji RAF 原生影像</comment>
+ <comment xml:lang="zh-CN">富士 RAF 原始图像</comment>
+ <comment xml:lang="zh-TW">Fuji RAF 原始影像</comment>
<acronym>RAF</acronym>
<expanded-acronym>RAw Format</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
@@ -26234,20 +27156,22 @@
</mime-type>
<mime-type type="image/x-kodak-dcr">
<comment>Kodak DCR raw image</comment>
+ <comment xml:lang="af">Kodak DCR rou beeld</comment>
<comment xml:lang="ar">صورة Kodak DCR خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Kodak DCR</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Kodak DCR</comment>
<comment xml:lang="bg">Изображение — Kodak DCR raw</comment>
<comment xml:lang="ca">imatge en cru de Kodak DCR</comment>
<comment xml:lang="cs">surový obrázek Kodak DCR</comment>
- <comment xml:lang="da">Kodak DCR-råbillede</comment>
+ <comment xml:lang="da">Kodak DCR raw-billede</comment>
<comment xml:lang="de">Kodak-DCR-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Kodak DCR</comment>
- <comment xml:lang="en_GB">Kodak DCR raw image</comment>
+ <comment xml:lang="en-GB">Kodak DCR raw image</comment>
<comment xml:lang="es">imagen en bruto DCR de Kodak</comment>
<comment xml:lang="eu">Kodak DCR irudi gordina</comment>
<comment xml:lang="fi">Kodak-DCR-raakakuva</comment>
<comment xml:lang="fo">Kodak DCR rámynd</comment>
<comment xml:lang="fr">image brute DCR Kodak</comment>
+ <comment xml:lang="fur">imagjin grese Kodak DCR</comment>
<comment xml:lang="ga">amhíomhá Kodak DCR</comment>
<comment xml:lang="gl">imaxe en bruto de Kodad DCR</comment>
<comment xml:lang="he">תמונה גולמית של Kodak DCR</comment>
@@ -26267,7 +27191,7 @@
<comment xml:lang="oc">imatge brut DCR Kodak</comment>
<comment xml:lang="pl">Surowy obraz DCR Kodak</comment>
<comment xml:lang="pt">imagem em bruto Kodak DCR</comment>
- <comment xml:lang="pt_BR">Imagem bruta DCR da Kodak</comment>
+ <comment xml:lang="pt-BR">Imagem bruta DCR da Kodak</comment>
<comment xml:lang="ro">Imagine brută Kodak DCR</comment>
<comment xml:lang="ru">Необработанное изображение Kodak DCR</comment>
<comment xml:lang="sk">Surový obrázok Kodak DCR</comment>
@@ -26278,8 +27202,8 @@
<comment xml:lang="tr">Kodak DCR ham görüntüsü</comment>
<comment xml:lang="uk">цифровий негатив DCR Kodak</comment>
<comment xml:lang="vi">Ảnh thô Kodak DCR</comment>
- <comment xml:lang="zh_CN">柯达 DCR 原始图像</comment>
- <comment xml:lang="zh_TW">Kodak DCR 原生影像</comment>
+ <comment xml:lang="zh-CN">柯达 DCR 原始图像</comment>
+ <comment xml:lang="zh-TW">Kodak DCR 原始影像</comment>
<acronym>DCR</acronym>
<expanded-acronym>Digital Camera Raw</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
@@ -26288,20 +27212,22 @@
</mime-type>
<mime-type type="image/x-kodak-k25">
<comment>Kodak K25 raw image</comment>
+ <comment xml:lang="af">Kodak K25 rou beeld</comment>
<comment xml:lang="ar">صورة Kodak K25 خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Kodak K25</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Kodak K25</comment>
<comment xml:lang="bg">Изображение — Kodak K25 raw</comment>
<comment xml:lang="ca">imatge en cru de Kodak K25</comment>
<comment xml:lang="cs">surový obrázek Kodak K25</comment>
- <comment xml:lang="da">Kodak K25-råbillede</comment>
+ <comment xml:lang="da">Kodak K25 raw-billede</comment>
<comment xml:lang="de">Kodak-K25-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Kodak K25</comment>
- <comment xml:lang="en_GB">Kodak K25 raw image</comment>
+ <comment xml:lang="en-GB">Kodak K25 raw image</comment>
<comment xml:lang="es">imagen en bruto K25 de Kodak</comment>
<comment xml:lang="eu">Kodak K25 raw image</comment>
<comment xml:lang="fi">Kodak-K25-raakakuva</comment>
<comment xml:lang="fo">Kodak K25 rámynd</comment>
<comment xml:lang="fr">image brute K25 Kodak</comment>
+ <comment xml:lang="fur">imagjin grese Kodak K25</comment>
<comment xml:lang="ga">amhíomhá Kodak K25</comment>
<comment xml:lang="gl">imaxe en bruto de Kodad K25</comment>
<comment xml:lang="he">תמונה גולמית של Kodak K25</comment>
@@ -26321,7 +27247,7 @@
<comment xml:lang="oc">imatge brut K25 Kodak</comment>
<comment xml:lang="pl">Surowy obraz K25 Kodak</comment>
<comment xml:lang="pt">imagem em bruto Kodak K25</comment>
- <comment xml:lang="pt_BR">Imagem bruta K25 da Kodak</comment>
+ <comment xml:lang="pt-BR">Imagem bruta K25 da Kodak</comment>
<comment xml:lang="ro">Imagine brută Kodak K25</comment>
<comment xml:lang="ru">Необработанное изображение Kodak K25</comment>
<comment xml:lang="sk">Surový obrázok Kodak K25</comment>
@@ -26332,8 +27258,8 @@
<comment xml:lang="tr">Kodak K25 ham görüntüsü</comment>
<comment xml:lang="uk">цифровий негатив K25 Kodak</comment>
<comment xml:lang="vi">Ảnh thô Kodak K25</comment>
- <comment xml:lang="zh_CN">柯达 K25 原始图像</comment>
- <comment xml:lang="zh_TW">Kodak K25 原生影像</comment>
+ <comment xml:lang="zh-CN">柯达 K25 原始图像</comment>
+ <comment xml:lang="zh-TW">Kodak K25 原始影像</comment>
<acronym>K25</acronym>
<expanded-acronym>Kodak DC25</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
@@ -26342,20 +27268,22 @@
</mime-type>
<mime-type type="image/x-kodak-kdc">
<comment>Kodak KDC raw image</comment>
+ <comment xml:lang="af">Kodak KDC rou beeld</comment>
<comment xml:lang="ar">صورة Kodak KDC خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Kodak KDC</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Kodak KDC</comment>
<comment xml:lang="bg">Изображение — Kodak KDC raw</comment>
<comment xml:lang="ca">imatge en cru de Kodak KDC</comment>
<comment xml:lang="cs">surový obrázek Kodak KDC</comment>
- <comment xml:lang="da">Kodak KDC-råbillede</comment>
+ <comment xml:lang="da">Kodak KDC raw-billede</comment>
<comment xml:lang="de">Kodak-KDC-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Kodak KDC</comment>
- <comment xml:lang="en_GB">Kodak KDC raw image</comment>
+ <comment xml:lang="en-GB">Kodak KDC raw image</comment>
<comment xml:lang="es">imagen en bruto KDC de Kodak</comment>
<comment xml:lang="eu">Kodak KDC irudi gordina</comment>
<comment xml:lang="fi">Kodak-KDC-raakakuva</comment>
<comment xml:lang="fo">Kodak KDC rámynd</comment>
<comment xml:lang="fr">image brute KDC Kodak</comment>
+ <comment xml:lang="fur">imagjin grese Kodak KDC</comment>
<comment xml:lang="ga">amhíomhá Kodak KDC</comment>
<comment xml:lang="gl">imaxe en bruto de Kodad KDC</comment>
<comment xml:lang="he">תמונה גולמית של Kodak KDC</comment>
@@ -26375,7 +27303,7 @@
<comment xml:lang="oc">imatge brut KDC Kodak</comment>
<comment xml:lang="pl">Surowy obraz KDC Kodak</comment>
<comment xml:lang="pt">imagem em bruto Kodak KDC</comment>
- <comment xml:lang="pt_BR">Imagem bruta KDC da Kodak</comment>
+ <comment xml:lang="pt-BR">Imagem bruta KDC da Kodak</comment>
<comment xml:lang="ro">Imagine brută Kodak KDC</comment>
<comment xml:lang="ru">Необработанное изображение Kodak KDC</comment>
<comment xml:lang="sk">Surový obrázok Kodak KDC</comment>
@@ -26386,8 +27314,8 @@
<comment xml:lang="tr">Kodak KDC ham görüntüsü</comment>
<comment xml:lang="uk">цифровий негатив KDC Kodak</comment>
<comment xml:lang="vi">Ảnh thô Kodak KDC</comment>
- <comment xml:lang="zh_CN">柯达 KDC 原始图像</comment>
- <comment xml:lang="zh_TW">Kodak KDC 原生影像</comment>
+ <comment xml:lang="zh-CN">柯达 KDC 原始图像</comment>
+ <comment xml:lang="zh-TW">Kodak KDC 原始影像</comment>
<acronym>KDC</acronym>
<expanded-acronym>Kodak Digital Camera</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
@@ -26399,20 +27327,22 @@
</mime-type>
<mime-type type="image/x-minolta-mrw">
<comment>Minolta MRW raw image</comment>
+ <comment xml:lang="af">Minolta MRW rou beeld</comment>
<comment xml:lang="ar">صورة Minolta MRW خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Minolta MRW</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Minolta MRW</comment>
<comment xml:lang="bg">Изображение — Minolta MRW raw</comment>
<comment xml:lang="ca">imatge en cru de Minolta MRW</comment>
<comment xml:lang="cs">surový obrázek Minolta MRW</comment>
- <comment xml:lang="da">Minolta MRW-råbillede</comment>
+ <comment xml:lang="da">Minolta MRW raw-billede</comment>
<comment xml:lang="de">Minolta-MRW-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Minolta MRW</comment>
- <comment xml:lang="en_GB">Minolta MRW raw image</comment>
+ <comment xml:lang="en-GB">Minolta MRW raw image</comment>
<comment xml:lang="es">imagen en bruto MRW de Minolta</comment>
<comment xml:lang="eu">Minolta MRW irudi gordina</comment>
<comment xml:lang="fi">Minolta-MRW-raakakuva</comment>
<comment xml:lang="fo">Minolta MRW rámynd</comment>
<comment xml:lang="fr">image brute MRW Minolta</comment>
+ <comment xml:lang="fur">imagjin grese Minolta MRW</comment>
<comment xml:lang="ga">amhíomhá Minolta MRW</comment>
<comment xml:lang="gl">imaxe RAW de Minolta MRW</comment>
<comment xml:lang="he">תמונה גולמית של Minolta MRW</comment>
@@ -26432,7 +27362,7 @@
<comment xml:lang="oc">imatge brut MRW Minolta</comment>
<comment xml:lang="pl">Surowy obraz MRW Minolta</comment>
<comment xml:lang="pt">imagem em bruto Minolta MRW</comment>
- <comment xml:lang="pt_BR">Imagem bruta MRW do Minolta</comment>
+ <comment xml:lang="pt-BR">Imagem bruta MRW do Minolta</comment>
<comment xml:lang="ro">Imagine brută Minolta MRW</comment>
<comment xml:lang="ru">Необработанное изображение Minolta MRW</comment>
<comment xml:lang="sk">Surový obrázok Minolta MRW</comment>
@@ -26443,8 +27373,8 @@
<comment xml:lang="tr">Minolta MRW ham görüntüsü</comment>
<comment xml:lang="uk">цифровий негатив MRW Minolta</comment>
<comment xml:lang="vi">Ảnh thô Minolta MRW</comment>
- <comment xml:lang="zh_CN">美能达 MRW 原始图像</comment>
- <comment xml:lang="zh_TW">Minolta MRW 原生影像</comment>
+ <comment xml:lang="zh-CN">美能达 MRW 原始图像</comment>
+ <comment xml:lang="zh-TW">Minolta MRW 原始影像</comment>
<acronym>MRW</acronym>
<expanded-acronym>Minolta RaW</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
@@ -26455,20 +27385,22 @@
</mime-type>
<mime-type type="image/x-nikon-nef">
<comment>Nikon NEF raw image</comment>
+ <comment xml:lang="af">Nikon NEF rou beeld</comment>
<comment xml:lang="ar">صورة Nikon NEF خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Nikon NEF</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Nikon NEF</comment>
<comment xml:lang="bg">Изображение — Nikon NEF raw</comment>
<comment xml:lang="ca">imatge en cru de Nikon NEF</comment>
<comment xml:lang="cs">surový obrázek Nikon NEF</comment>
- <comment xml:lang="da">Nikon NEF-råbillede</comment>
+ <comment xml:lang="da">Nikon NEF raw-billede</comment>
<comment xml:lang="de">Nikon-NEF-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Nikon NEF</comment>
- <comment xml:lang="en_GB">Nikon NEF raw image</comment>
+ <comment xml:lang="en-GB">Nikon NEF raw image</comment>
<comment xml:lang="es">imagen en bruto NEF de Nikon</comment>
<comment xml:lang="eu">Nikon NEF irudi gordina</comment>
<comment xml:lang="fi">Nikon-NEF-raakakuva</comment>
<comment xml:lang="fo">Nikon NEF rámynd</comment>
<comment xml:lang="fr">image brute NEF Nikon</comment>
+ <comment xml:lang="fur">imagjin grese Nikon NEF</comment>
<comment xml:lang="ga">amhíomhá Nikon NEF</comment>
<comment xml:lang="gl">imaxe RAW NEF Nikon</comment>
<comment xml:lang="he">תמונה גולמית של Nikon NEF</comment>
@@ -26488,7 +27420,7 @@
<comment xml:lang="oc">imatge brut NEF Nikon</comment>
<comment xml:lang="pl">Surowy obraz NEF Nikon</comment>
<comment xml:lang="pt">imagem em bruto Nikon NEF</comment>
- <comment xml:lang="pt_BR">Imagem bruta NEF da Nikon</comment>
+ <comment xml:lang="pt-BR">Imagem bruta NEF da Nikon</comment>
<comment xml:lang="ro">Imagine brută Nikon NEF</comment>
<comment xml:lang="ru">Необработанное изображение Nikon NEF</comment>
<comment xml:lang="sk">Surový obrázok Nikon NEF</comment>
@@ -26499,8 +27431,8 @@
<comment xml:lang="tr">Nikon NEF ham görüntüsü</comment>
<comment xml:lang="uk">цифровий негатив NEF Nikon</comment>
<comment xml:lang="vi">Ảnh thô Nikon NEF</comment>
- <comment xml:lang="zh_CN">尼康 NEF 原始图像</comment>
- <comment xml:lang="zh_TW">Nikon NEF 原生影像</comment>
+ <comment xml:lang="zh-CN">尼康 NEF 原始图像</comment>
+ <comment xml:lang="zh-TW">Nikon NEF 原始影像</comment>
<acronym>NEF</acronym>
<expanded-acronym>Nikon Electronic Format</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
@@ -26509,20 +27441,22 @@
</mime-type>
<mime-type type="image/x-olympus-orf">
<comment>Olympus ORF raw image</comment>
+ <comment xml:lang="af">Olympus ORF rou beeld</comment>
<comment xml:lang="ar">صورة Olympus ORF خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Olympus ORF</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Olympus ORF</comment>
<comment xml:lang="bg">Изображение — Olympus ORF raw</comment>
<comment xml:lang="ca">imatge en cru d'Olympus ORF</comment>
<comment xml:lang="cs">surový obrázek Olympus ORF</comment>
- <comment xml:lang="da">Olympus ORF-råbillede</comment>
+ <comment xml:lang="da">Olympus ORF raw-billede</comment>
<comment xml:lang="de">Olympus-ORF-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Olympus ORF</comment>
- <comment xml:lang="en_GB">Olympus ORF raw image</comment>
+ <comment xml:lang="en-GB">Olympus ORF raw image</comment>
<comment xml:lang="es">imagen en bruto ORF de Olympus</comment>
<comment xml:lang="eu">Olympus ORF irudi gordina</comment>
<comment xml:lang="fi">Olympus-ORF-raakakuva</comment>
<comment xml:lang="fo">Olympus ORF rámynd</comment>
<comment xml:lang="fr">image brute ORF Olympus</comment>
+ <comment xml:lang="fur">imagjin grese Olympus ORF</comment>
<comment xml:lang="ga">amhíomhá Olympus ORF</comment>
<comment xml:lang="gl">imaxe en bruto de Olympus ORF</comment>
<comment xml:lang="he">תמונה גולמית של Olympus ORF</comment>
@@ -26543,7 +27477,7 @@
<comment xml:lang="oc">imatge brut ORF Olympus</comment>
<comment xml:lang="pl">Surowy obraz Olympus ORF</comment>
<comment xml:lang="pt">imagem em bruto Olympus ORF</comment>
- <comment xml:lang="pt_BR">Imagem bruta ORF da Olympus</comment>
+ <comment xml:lang="pt-BR">Imagem bruta ORF da Olympus</comment>
<comment xml:lang="ro">Imagine brută Olympus ORF</comment>
<comment xml:lang="ru">Необработанное изображение Olympus ORF</comment>
<comment xml:lang="sk">Surový obrázok Olympus ORF</comment>
@@ -26554,37 +27488,39 @@
<comment xml:lang="tr">Olympus ORF ham görüntüsü</comment>
<comment xml:lang="uk">цифровий негатив ORF Olympus</comment>
<comment xml:lang="vi">Ảnh thô Olympus ORF</comment>
- <comment xml:lang="zh_CN">奥林巴斯 ORF 原始图像</comment>
- <comment xml:lang="zh_TW">Olympus ORF 原生影像</comment>
+ <comment xml:lang="zh-CN">奥林巴斯 ORF 原始图像</comment>
+ <comment xml:lang="zh-TW">Olympus ORF 原始影像</comment>
<acronym>ORF</acronym>
<expanded-acronym>Olympus Raw Format</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
<magic priority="50">
-
-
-
-
-
+ <!-- an ORF file is basically a TIFF file with a non standard !-->
+ <!-- header IIRO which is not nice since it is only composed !-->
+ <!-- of ASCII codes. Fortunately, the TIFF header is followed !-->
+ <!-- by the offset of the first TIFF ifd which is always !-->
+ <!-- 0x00000008 (Little endian) for an ORF !-->
<match value="IIRO\x08\x00\x00\x00" type="string" offset="0"/>
</magic>
<glob pattern="*.orf"/>
</mime-type>
<mime-type type="image/x-panasonic-rw">
<comment>Panasonic raw image</comment>
+ <comment xml:lang="af">Panasonic rou beeld</comment>
<comment xml:lang="ar">صورة Panasonic خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Panasonic</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Panasonic</comment>
<comment xml:lang="bg">Изображение — Panasonic raw</comment>
<comment xml:lang="ca">imatge en cru de Panasonic</comment>
<comment xml:lang="cs">surový obrázek Panasonic</comment>
- <comment xml:lang="da">Panasonicråbillede (raw)</comment>
+ <comment xml:lang="da">Panasonic raw-billede</comment>
<comment xml:lang="de">Panasonic-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Panasonic</comment>
- <comment xml:lang="en_GB">Panasonic raw image</comment>
+ <comment xml:lang="en-GB">Panasonic raw image</comment>
<comment xml:lang="es">imagen en bruto de Panasonic</comment>
<comment xml:lang="eu">Panasonic irudi gordina</comment>
<comment xml:lang="fi">Panasonic-raakakuva</comment>
<comment xml:lang="fo">Panasonic rámynd</comment>
<comment xml:lang="fr">image brute Panasonic</comment>
+ <comment xml:lang="fur">imagjin grese Panasonic</comment>
<comment xml:lang="ga">amhíomhá Panasonic</comment>
<comment xml:lang="gl">imaxe en bruto de Panasonic</comment>
<comment xml:lang="he">תמונה גולמית של Panasonic</comment>
@@ -26604,7 +27540,7 @@
<comment xml:lang="oc">imatge brut Panasonic</comment>
<comment xml:lang="pl">Obraz raw Panasonic</comment>
<comment xml:lang="pt">imagem em bruto Panasonic</comment>
- <comment xml:lang="pt_BR">Imagem bruta da Panasonic</comment>
+ <comment xml:lang="pt-BR">Imagem bruta da Panasonic</comment>
<comment xml:lang="ro">Imagine brută Panasonic</comment>
<comment xml:lang="ru">Необработанное изображение Panasonic</comment>
<comment xml:lang="sk">Surový obrázok Panasonic</comment>
@@ -26615,58 +27551,69 @@
<comment xml:lang="tr">Panasonic ham görüntüsü</comment>
<comment xml:lang="uk">цифровий негатив Panasonic</comment>
<comment xml:lang="vi">Ảnh thô Panasonic</comment>
- <comment xml:lang="zh_CN">松下原始图像</comment>
- <comment xml:lang="zh_TW">Panasonic 原生影像</comment>
+ <comment xml:lang="zh-CN">松下原始图像</comment>
+ <comment xml:lang="zh-TW">Panasonic 原始影像</comment>
<sub-class-of type="image/x-dcraw"/>
<magic priority="50">
-
+ <!-- Some kind of TIFF file with a non-standard version in prefix !-->
<match value="IIU\x00\x08\x00\x00\x00" type="string" offset="0"/>
</magic>
<glob pattern="*.raw"/>
<alias type="image/x-panasonic-raw"/>
</mime-type>
<mime-type type="image/x-panasonic-rw2">
- <comment>Panasonic raw2 image</comment>
- <comment xml:lang="bg">Изображение — Panasonic raw2</comment>
- <comment xml:lang="ca">imatge «RAW2» de Panasonic</comment>
- <comment xml:lang="cs">surový obrázek Panasonic raw2</comment>
- <comment xml:lang="da">Panasonic-rå2-billede (raw)</comment>
- <comment xml:lang="de">Panasonic raw2-Bild</comment>
- <comment xml:lang="el">Ανεπεξέργαστη εικόνα Panasonic (raw2)</comment>
- <comment xml:lang="en_GB">Panasonic raw2 image</comment>
- <comment xml:lang="es">imagen en bruto raw2 de Panasonic</comment>
- <comment xml:lang="eu">Panasonic raw2 irudia</comment>
- <comment xml:lang="fi">Panasonic raw2 -kuva</comment>
- <comment xml:lang="fr">image raw2 Panasonic</comment>
- <comment xml:lang="ga">íomhá raw2 Panasonic</comment>
- <comment xml:lang="gl">imaxe en bruto raw2 de Panasonic</comment>
- <comment xml:lang="he">תמונת raw2 של Panasonic</comment>
- <comment xml:lang="hr">Panasonic raw2 image</comment>
- <comment xml:lang="hu">Panasonic raw2 kép</comment>
- <comment xml:lang="ia">Imagine raw2 Panasonic</comment>
- <comment xml:lang="id">Image Panasonic raw2</comment>
- <comment xml:lang="it">Immagine raw2 Panasonic</comment>
- <comment xml:lang="ja">Panasonic raw2 画像</comment>
- <comment xml:lang="kk">Panasonic raw2 суреті</comment>
- <comment xml:lang="ko">파나소닉 RAW2 사진</comment>
- <comment xml:lang="lv">Panasonic raw2 jēlattēls</comment>
- <comment xml:lang="nl">Panasonic raw2 image</comment>
- <comment xml:lang="oc">imatge raw2 Panasonic</comment>
- <comment xml:lang="pl">Obraz raw2 Panasonic</comment>
+ <comment>Panasonic raw image</comment>
+ <comment xml:lang="af">Panasonic rou beeld</comment>
+ <comment xml:lang="ar">صورة Panasonic خامة</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Panasonic</comment>
+ <comment xml:lang="bg">Изображение — Panasonic raw</comment>
+ <comment xml:lang="ca">imatge en cru de Panasonic</comment>
+ <comment xml:lang="cs">surový obrázek Panasonic</comment>
+ <comment xml:lang="da">Panasonic raw-billede</comment>
+ <comment xml:lang="de">Panasonic-Rohbild</comment>
+ <comment xml:lang="el">Ανεπεξέργαστη εικόνα Panasonic</comment>
+ <comment xml:lang="en-GB">Panasonic raw image</comment>
+ <comment xml:lang="es">imagen en bruto de Panasonic</comment>
+ <comment xml:lang="eu">Panasonic irudi gordina</comment>
+ <comment xml:lang="fi">Panasonic-raakakuva</comment>
+ <comment xml:lang="fo">Panasonic rámynd</comment>
+ <comment xml:lang="fr">image brute Panasonic</comment>
+ <comment xml:lang="fur">imagjin grese Panasonic</comment>
+ <comment xml:lang="ga">amhíomhá Panasonic</comment>
+ <comment xml:lang="gl">imaxe en bruto de Panasonic</comment>
+ <comment xml:lang="he">תמונה גולמית של Panasonic</comment>
+ <comment xml:lang="hr">Panasonic osnovna slika</comment>
+ <comment xml:lang="hu">Panasonic nyers kép</comment>
+ <comment xml:lang="ia">Imagine brute Panasonic</comment>
+ <comment xml:lang="id">Citra mentah Panasonic</comment>
+ <comment xml:lang="it">Immagine raw Panasonic</comment>
+ <comment xml:lang="ja">Panasonic raw 画像</comment>
+ <comment xml:lang="kk">Panasonic өңделмеген суреті</comment>
+ <comment xml:lang="ko">파나소닉 RAW 사진</comment>
+ <comment xml:lang="lt">Panasonic neapdorotas paveikslėlis</comment>
+ <comment xml:lang="lv">Panasonic jēlattēls</comment>
+ <comment xml:lang="nb">Panasonic raw-bilde</comment>
+ <comment xml:lang="nl">onbewerkt Panasonic-beeld</comment>
+ <comment xml:lang="nn">Panasonic råbilete</comment>
+ <comment xml:lang="oc">imatge brut Panasonic</comment>
+ <comment xml:lang="pl">Obraz raw Panasonic</comment>
<comment xml:lang="pt">imagem em bruto Panasonic</comment>
- <comment xml:lang="pt_BR">Imagem raw2 da Panasonic</comment>
- <comment xml:lang="ru">Необработанное изображение Panasonic raw2</comment>
- <comment xml:lang="sk">Surový obrázok Panasonic raw2</comment>
- <comment xml:lang="sl">Slikovna datoteka Panasonic raw2</comment>
- <comment xml:lang="sr">Панасоник сирова2 слика</comment>
- <comment xml:lang="sv">Panasonic raw2-bild</comment>
- <comment xml:lang="tr">Panasonic raw2 görüntüsü</comment>
- <comment xml:lang="uk">зображення формату raw2 Panasonic</comment>
- <comment xml:lang="zh_CN">松下 raw2 图像</comment>
- <comment xml:lang="zh_TW">Panasonic raw2 影像</comment>
+ <comment xml:lang="pt-BR">Imagem bruta da Panasonic</comment>
+ <comment xml:lang="ro">Imagine brută Panasonic</comment>
+ <comment xml:lang="ru">Необработанное изображение Panasonic</comment>
+ <comment xml:lang="sk">Surový obrázok Panasonic</comment>
+ <comment xml:lang="sl">Surova slikovna datoteka Panasonic</comment>
+ <comment xml:lang="sq">Figurë raw Panasonic</comment>
+ <comment xml:lang="sr">Панасоник сирова слика</comment>
+ <comment xml:lang="sv">Panasonic-råbild</comment>
+ <comment xml:lang="tr">Panasonic ham görüntüsü</comment>
+ <comment xml:lang="uk">цифровий негатив Panasonic</comment>
+ <comment xml:lang="vi">Ảnh thô Panasonic</comment>
+ <comment xml:lang="zh-CN">松下原始图像</comment>
+ <comment xml:lang="zh-TW">Panasonic 原始影像</comment>
<sub-class-of type="image/x-dcraw"/>
<magic priority="50">
-
+ <!-- Some kind of TIFF file with a non-standard version in prefix !-->
<match value="IIU\x00\x18\x00\x00\x00" type="string" offset="0"/>
</magic>
<glob pattern="*.rw2"/>
@@ -26674,20 +27621,22 @@
</mime-type>
<mime-type type="image/x-pentax-pef">
<comment>Pentax PEF raw image</comment>
+ <comment xml:lang="af">Pentax PEF rou beeld</comment>
<comment xml:lang="ar">صورة Pentax PEF خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Pentax PEF</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Pentax PEF</comment>
<comment xml:lang="bg">Изображение — Pentax PEF raw</comment>
<comment xml:lang="ca">imatge en cru de Pentax PEF</comment>
<comment xml:lang="cs">surový obrázek Pentax PEF</comment>
- <comment xml:lang="da">Pentax PEF-råbillede</comment>
+ <comment xml:lang="da">Pentax PEF raw-billede</comment>
<comment xml:lang="de">Pentax-PEF-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Pentax PEF</comment>
- <comment xml:lang="en_GB">Pentax PEF raw image</comment>
+ <comment xml:lang="en-GB">Pentax PEF raw image</comment>
<comment xml:lang="es">imagen en bruto PEF de Pentax</comment>
<comment xml:lang="eu">Pentax PEF irudi gordina</comment>
<comment xml:lang="fi">Pentax-PEF-raakakuva</comment>
<comment xml:lang="fo">Pentax PEF rámynd</comment>
<comment xml:lang="fr">image brute PEF Pentax</comment>
+ <comment xml:lang="fur">imagjin grese Pentax PEF</comment>
<comment xml:lang="ga">amhíomhá Pentax PEF</comment>
<comment xml:lang="gl">imaxe en bruto PEF de Pentax</comment>
<comment xml:lang="he">תמונה גולמית של Pentax PEF</comment>
@@ -26707,7 +27656,7 @@
<comment xml:lang="oc">imatge brut PEF Pentax</comment>
<comment xml:lang="pl">Surowy obraz Pentax PEF</comment>
<comment xml:lang="pt">imagem em bruto Pentax PEF</comment>
- <comment xml:lang="pt_BR">Imagem bruta PEF da Pentax</comment>
+ <comment xml:lang="pt-BR">Imagem bruta PEF da Pentax</comment>
<comment xml:lang="ro">Imagine brută Pentax PEF</comment>
<comment xml:lang="ru">Необработанное изображение Pentax PEF</comment>
<comment xml:lang="sk">Surový obrázok Pentax PEF</comment>
@@ -26718,8 +27667,8 @@
<comment xml:lang="tr">Pentax PEF ham görüntüsü</comment>
<comment xml:lang="uk">цифровий негатив PEF Pentax</comment>
<comment xml:lang="vi">Ảnh thô Pentax PEF</comment>
- <comment xml:lang="zh_CN">宾得 PEF 原始图像</comment>
- <comment xml:lang="zh_TW">Pentax PEF 原生影像</comment>
+ <comment xml:lang="zh-CN">宾得 PEF 原始图像</comment>
+ <comment xml:lang="zh-TW">Pentax PEF 原始影像</comment>
<acronym>PEF</acronym>
<expanded-acronym>Pentax Electronic Format</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
@@ -26728,20 +27677,22 @@
</mime-type>
<mime-type type="image/x-sigma-x3f">
<comment>Sigma X3F raw image</comment>
+ <comment xml:lang="af">Sigma X3F rou beeld</comment>
<comment xml:lang="ar">صورة Sigma X3F خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Sigma X3F</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Sigma X3F</comment>
<comment xml:lang="bg">Изображение — Sigma X3F raw</comment>
<comment xml:lang="ca">imatge en cru de Sigma X3F</comment>
<comment xml:lang="cs">surový obrázek Sigma X3F</comment>
- <comment xml:lang="da">Sigma X3F-råbillede</comment>
+ <comment xml:lang="da">Sigma X3F raw-billede</comment>
<comment xml:lang="de">Sigma-X3F-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Sigma X3F</comment>
- <comment xml:lang="en_GB">Sigma X3F raw image</comment>
+ <comment xml:lang="en-GB">Sigma X3F raw image</comment>
<comment xml:lang="es">imagen en bruto X3F de Sigma</comment>
<comment xml:lang="eu">Sigma X3F irudi gordina</comment>
<comment xml:lang="fi">Sigma-X3F-raakakuva</comment>
<comment xml:lang="fo">Sigma X3F rámynd</comment>
<comment xml:lang="fr">image brute X3F Sigma</comment>
+ <comment xml:lang="fur">imagjin grese Sigma X3F</comment>
<comment xml:lang="ga">amhíomhá Sigma X3F</comment>
<comment xml:lang="gl">imaxe en bruto X3F de Sigma</comment>
<comment xml:lang="he">תמונה גולמית של Sigma X3F</comment>
@@ -26761,7 +27712,7 @@
<comment xml:lang="oc">imatge brut X3F Sigma</comment>
<comment xml:lang="pl">Surowy obraz X3F Sigma</comment>
<comment xml:lang="pt">imagem em bruto Sigma X3F</comment>
- <comment xml:lang="pt_BR">Imagem bruta X3F da Sigma</comment>
+ <comment xml:lang="pt-BR">Imagem bruta X3F da Sigma</comment>
<comment xml:lang="ro">Imagine brută Sigma X3F</comment>
<comment xml:lang="ru">Необработанное изображение Sigma X3F</comment>
<comment xml:lang="sk">Surový obrázok Sigma X3F</comment>
@@ -26772,15 +27723,15 @@
<comment xml:lang="tr">Sigma X3F ham görüntüsü</comment>
<comment xml:lang="uk">цифровий негатив X3F Sigma</comment>
<comment xml:lang="vi">Ảnh thô Sigma X3F</comment>
- <comment xml:lang="zh_CN">适马 X3F 原始图像</comment>
- <comment xml:lang="zh_TW">Sigma X3F 原生影像</comment>
+ <comment xml:lang="zh-CN">适马 X3F 原始图像</comment>
+ <comment xml:lang="zh-TW">Sigma X3F 原始影像</comment>
<acronym>X3F</acronym>
<expanded-acronym>X3 Foveon</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
<magic priority="50">
-
+ <!-- The header is "FOVb" (Foveon) !-->
<match value="FOVb" type="string" offset="0">
-
+ <!-- Followed by a 32bit LSB specifying the version number (major.minor) !-->
<match value="0x00FF00FF" type="little32" offset="4" mask="0xFF00FF00"/>
</match>
</magic>
@@ -26788,20 +27739,22 @@
</mime-type>
<mime-type type="image/x-sony-srf">
<comment>Sony SRF raw image</comment>
+ <comment xml:lang="af">Sony SRF rou beeld</comment>
<comment xml:lang="ar">صورة Sony SRF خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Sony SRF</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Sony SRF</comment>
<comment xml:lang="bg">Изображение — Sony SRF raw</comment>
<comment xml:lang="ca">imatge en cru de Sony SRF</comment>
<comment xml:lang="cs">surový obrázek Sony SRF</comment>
- <comment xml:lang="da">Sony SRF-råbillede</comment>
+ <comment xml:lang="da">Sony SRF raw-billede</comment>
<comment xml:lang="de">Sony-SRF-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Sony SRF</comment>
- <comment xml:lang="en_GB">Sony SRF raw image</comment>
+ <comment xml:lang="en-GB">Sony SRF raw image</comment>
<comment xml:lang="es">imagen en bruto SRF de Sony</comment>
<comment xml:lang="eu">Sony SRF irudi gordina</comment>
<comment xml:lang="fi">Sony-SRF-raakakuva</comment>
<comment xml:lang="fo">Sony SRF rámynd</comment>
<comment xml:lang="fr">image brute SRF Sony</comment>
+ <comment xml:lang="fur">imagjin grese Sony SRF</comment>
<comment xml:lang="ga">amhíomhá Sony SRF</comment>
<comment xml:lang="gl">imaxe en bruto SRF de sony</comment>
<comment xml:lang="he">תמונה גולמית של Sony SRF</comment>
@@ -26821,7 +27774,7 @@
<comment xml:lang="oc">imatge brut SRF Sony</comment>
<comment xml:lang="pl">Surowy obraz SRF Sony</comment>
<comment xml:lang="pt">imagem em bruto Sony SRF</comment>
- <comment xml:lang="pt_BR">Imagem bruta SRF da Sony</comment>
+ <comment xml:lang="pt-BR">Imagem bruta SRF da Sony</comment>
<comment xml:lang="ro">Imagine brută Sony SRF</comment>
<comment xml:lang="ru">Необработанное изображение Sony SRF</comment>
<comment xml:lang="sk">Surový obrázok Sony SRF</comment>
@@ -26832,8 +27785,8 @@
<comment xml:lang="tr">Sony SRF ham görüntüsü</comment>
<comment xml:lang="uk">цифровий негатив SRF Sony</comment>
<comment xml:lang="vi">Ảnh thô Sony SRF</comment>
- <comment xml:lang="zh_CN">索尼 SRF 原始映像</comment>
- <comment xml:lang="zh_TW">Sony SRF 原生影像</comment>
+ <comment xml:lang="zh-CN">索尼 SRF 原始映像</comment>
+ <comment xml:lang="zh-TW">Sony SRF 原始影像</comment>
<acronym>SRF</acronym>
<expanded-acronym>Sony Raw Format</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
@@ -26842,20 +27795,22 @@
</mime-type>
<mime-type type="image/x-sony-sr2">
<comment>Sony SR2 raw image</comment>
+ <comment xml:lang="af">Sony SR2 rou beeld</comment>
<comment xml:lang="ar">صورة Sony SR2 خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Sony SR2</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Sony SR2</comment>
<comment xml:lang="bg">Изображение — Sony SR2 raw</comment>
<comment xml:lang="ca">imatge en cru de Sony SR2</comment>
<comment xml:lang="cs">surový obrázek Sony SR2</comment>
- <comment xml:lang="da">Sony SR2-råbillede</comment>
+ <comment xml:lang="da">Sony SR2 raw-billede</comment>
<comment xml:lang="de">Sony-SR2-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Sony SR2</comment>
- <comment xml:lang="en_GB">Sony SR2 raw image</comment>
+ <comment xml:lang="en-GB">Sony SR2 raw image</comment>
<comment xml:lang="es">imagen en bruto SR2 de Sony</comment>
<comment xml:lang="eu">Sony SR2 irudi gordina</comment>
<comment xml:lang="fi">Sony-SR2-raakakuva</comment>
<comment xml:lang="fo">Sony SR2 rámynd</comment>
<comment xml:lang="fr">image brute SR2 Sony</comment>
+ <comment xml:lang="fur">imagjin grese Sony SR2</comment>
<comment xml:lang="ga">amhíomhá Sony SR2</comment>
<comment xml:lang="gl">imaxe en bruto SR2 de sony</comment>
<comment xml:lang="he">תמונה גולמית של Sony SR2</comment>
@@ -26875,7 +27830,7 @@
<comment xml:lang="oc">imatge brut SR2 Sony</comment>
<comment xml:lang="pl">Surowy obraz SR2 Sony</comment>
<comment xml:lang="pt">imagem em bruto Sony SR2</comment>
- <comment xml:lang="pt_BR">Imagem bruta SR2 da Sony</comment>
+ <comment xml:lang="pt-BR">Imagem bruta SR2 da Sony</comment>
<comment xml:lang="ro">Imagine brută Sony SR2</comment>
<comment xml:lang="ru">Необработанное изображение Sony SR2</comment>
<comment xml:lang="sk">Surový obrázok Sony SR2</comment>
@@ -26886,8 +27841,8 @@
<comment xml:lang="tr">Sony SR2 ham görüntüsü</comment>
<comment xml:lang="uk">цифровий негатив SR2 Sony</comment>
<comment xml:lang="vi">Ảnh thô Sony SR2</comment>
- <comment xml:lang="zh_CN">索尼 SR2 原始映像</comment>
- <comment xml:lang="zh_TW">Sony SR2 原生影像</comment>
+ <comment xml:lang="zh-CN">索尼 SR2 原始映像</comment>
+ <comment xml:lang="zh-TW">Sony SR2 原始影像</comment>
<acronym>SR2</acronym>
<expanded-acronym>Sony Raw format 2</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
@@ -26896,20 +27851,22 @@
</mime-type>
<mime-type type="image/x-sony-arw">
<comment>Sony ARW raw image</comment>
+ <comment xml:lang="af">Sony ARW rou beeld</comment>
<comment xml:lang="ar">صورة Sony ARW خامة</comment>
- <comment xml:lang="be@latin">Suvoraja vyjava Sony ARW</comment>
+ <comment xml:lang="be-Latn">Suvoraja vyjava Sony ARW</comment>
<comment xml:lang="bg">Изображение — Sony ARW raw</comment>
<comment xml:lang="ca">imatge en cru de Sony ARW</comment>
<comment xml:lang="cs">surový obrázek Sony ARW</comment>
- <comment xml:lang="da">Sony ARW-råbillede</comment>
+ <comment xml:lang="da">Sony ARW raw-billede</comment>
<comment xml:lang="de">Sony-ARW-Rohbild</comment>
<comment xml:lang="el">Ανεπεξέργαστη εικόνα Sony ARW</comment>
- <comment xml:lang="en_GB">Sony ARW raw image</comment>
+ <comment xml:lang="en-GB">Sony ARW raw image</comment>
<comment xml:lang="es">imagen en bruto ARW de Sony</comment>
<comment xml:lang="eu">Sony ARW irudi gordina</comment>
<comment xml:lang="fi">Sony-ARW-raakakuva</comment>
<comment xml:lang="fo">Sony ARW rámynd</comment>
<comment xml:lang="fr">image brute ARW Sony</comment>
+ <comment xml:lang="fur">imagjin grese Sony ARW</comment>
<comment xml:lang="ga">amhíomhá Sony ARW</comment>
<comment xml:lang="gl">imaxe en bruto ARW de sony</comment>
<comment xml:lang="he">תמונה גולמית של Sony ARW</comment>
@@ -26929,7 +27886,7 @@
<comment xml:lang="oc">imatge brut ARW Sony</comment>
<comment xml:lang="pl">Surowy obraz ARW Sony</comment>
<comment xml:lang="pt">imagem em bruto Sony ARW</comment>
- <comment xml:lang="pt_BR">Imagem bruta ARW da Sony</comment>
+ <comment xml:lang="pt-BR">Imagem bruta ARW da Sony</comment>
<comment xml:lang="ro">Imagine brută Sony ARW</comment>
<comment xml:lang="ru">Необработанное изображение Sony ARW</comment>
<comment xml:lang="sk">Surový obrázok Sony ARW</comment>
@@ -26940,8 +27897,8 @@
<comment xml:lang="tr">Sony ARW ham görüntüsü</comment>
<comment xml:lang="uk">цифровий негатив ARW Sony</comment>
<comment xml:lang="vi">Ảnh thô Sony ARW</comment>
- <comment xml:lang="zh_CN">索尼 ARW 原始映像</comment>
- <comment xml:lang="zh_TW">Sony ARW 原生影像</comment>
+ <comment xml:lang="zh-CN">索尼 ARW 原始映像</comment>
+ <comment xml:lang="zh-TW">Sony ARW 原始影像</comment>
<acronym>ARW</acronym>
<expanded-acronym>Alpha Raw format</expanded-acronym>
<sub-class-of type="image/x-dcraw"/>
@@ -26950,9 +27907,10 @@
</mime-type>
<mime-type type="image/png">
<comment>PNG image</comment>
+ <comment xml:lang="af">PNG-beeld</comment>
<comment xml:lang="ar">صورة PNG</comment>
<comment xml:lang="az">PNG rəsmi</comment>
- <comment xml:lang="be@latin">Vyjava PNG</comment>
+ <comment xml:lang="be-Latn">Vyjava PNG</comment>
<comment xml:lang="bg">Изображение — PNG</comment>
<comment xml:lang="ca">imatge PNG</comment>
<comment xml:lang="cs">obrázek PNG</comment>
@@ -26960,13 +27918,14 @@
<comment xml:lang="da">PNG-billede</comment>
<comment xml:lang="de">PNG-Bild</comment>
<comment xml:lang="el">Εικόνα PNG</comment>
- <comment xml:lang="en_GB">PNG image</comment>
+ <comment xml:lang="en-GB">PNG image</comment>
<comment xml:lang="eo">PNG-bildo</comment>
<comment xml:lang="es">imagen PNG</comment>
<comment xml:lang="eu">PNG irudia</comment>
<comment xml:lang="fi">PNG-kuva</comment>
<comment xml:lang="fo">PNG mynd</comment>
<comment xml:lang="fr">image PNG</comment>
+ <comment xml:lang="fur">imagjin PNG</comment>
<comment xml:lang="ga">íomhá PNG</comment>
<comment xml:lang="gl">imaxe PNG</comment>
<comment xml:lang="he">תמונת PNG</comment>
@@ -26987,7 +27946,7 @@
<comment xml:lang="oc">imatge PNG</comment>
<comment xml:lang="pl">Obraz PNG</comment>
<comment xml:lang="pt">imagem PNG</comment>
- <comment xml:lang="pt_BR">Imagem PNG</comment>
+ <comment xml:lang="pt-BR">Imagem PNG</comment>
<comment xml:lang="ro">Imagine PNG</comment>
<comment xml:lang="ru">Изображение PNG</comment>
<comment xml:lang="sk">Obrázok PNG</comment>
@@ -26998,79 +27957,62 @@
<comment xml:lang="tr">PNG görüntüsü</comment>
<comment xml:lang="uk">зображення PNG</comment>
<comment xml:lang="vi">Ảnh PNG</comment>
- <comment xml:lang="zh_CN">PNG 图像</comment>
- <comment xml:lang="zh_TW">PNG 影像</comment>
+ <comment xml:lang="zh-CN">PNG 图像</comment>
+ <comment xml:lang="zh-TW">PNG 影像</comment>
<magic priority="50">
- <match value="\x89PNG" type="string" offset="0"/>
+ <match type="string" value="\x89PNG" offset="0"/>
</magic>
<glob pattern="*.png"/>
</mime-type>
<mime-type type="image/rle">
- <comment>Run Length Encoded bitmap image</comment>
- <comment xml:lang="ar">تشغيل صورة نقطية طولية الترميز</comment>
- <comment xml:lang="be@latin">Bitmapnaja vyjava, zakadavanaja ŭ Run Length</comment>
- <comment xml:lang="bg">Изображение — RLE Bitmap</comment>
- <comment xml:lang="ca">imatge de mapa de bits «Run Lenght Encoded»</comment>
- <comment xml:lang="cs">obrázek bitové mapy Run Length Encoded</comment>
- <comment xml:lang="da">Run Length Encoded-bitmapbillede</comment>
+ <comment>RLE bitmap image</comment>
+ <comment xml:lang="bg">Изображение — RLE bitmap</comment>
+ <comment xml:lang="ca">imatge de mapa de bits RLE</comment>
+ <comment xml:lang="da">RLE bitmap-billede</comment>
<comment xml:lang="de">Lauflängenkodiertes Bitmap-Bild</comment>
- <comment xml:lang="el">Εικόνα bitmap κωδικοποιημένου μήκος εκτέλεσης</comment>
- <comment xml:lang="en_GB">Run Length Encoded bitmap image</comment>
- <comment xml:lang="es">mapa de bits con codificación del tamaño durante la ejecución</comment>
- <comment xml:lang="eu">'Run Lenght Encoded' bitmap irudia</comment>
- <comment xml:lang="fi">RLE-koodattu bittikartta</comment>
- <comment xml:lang="fr">image matricielle Run Length Encoded</comment>
- <comment xml:lang="ga">íomhá ghiotánmhapach ionchódaithe fad reatha</comment>
- <comment xml:lang="gl">mapa de bits con codificación do tamaño durante a execución</comment>
- <comment xml:lang="he">מקודד מפת סיביות של Run Length</comment>
- <comment xml:lang="hr">Run Length Encoded bitmap slika</comment>
- <comment xml:lang="hu">Run Length Encoded bitkép</comment>
- <comment xml:lang="ia">Imagine raster in codification Run-Length</comment>
- <comment xml:lang="id">Citra peta bit Run Length Encoded</comment>
- <comment xml:lang="it">Immagine bitmap RLE (Run Length Encoded)</comment>
- <comment xml:lang="ja">ランレングス符号化ビットマップ画像</comment>
- <comment xml:lang="kk">RLE сығылған растрлік суреті</comment>
- <comment xml:lang="ko">RLE 인코딩된 비트맵 그림</comment>
- <comment xml:lang="lt">Run Length Encoded rastrinis paveikslėlis</comment>
- <comment xml:lang="lv">Secīgo atkārtojumu kodēts bitkartes attēls</comment>
- <comment xml:lang="nb">Run Length Encoded bitmap bilde</comment>
- <comment xml:lang="nl">RLE-gecodeerde bitmap-afbeelding</comment>
- <comment xml:lang="nn">Run Length Encoded punktgrafikk</comment>
- <comment xml:lang="oc">imatge matriciala Run Length Encoded</comment>
+ <comment xml:lang="en-GB">RLE bitmap image</comment>
+ <comment xml:lang="es">imagen de mapa de bits RLE</comment>
+ <comment xml:lang="eu">RLE bitmap irudia</comment>
+ <comment xml:lang="fi">RLE-bittikarttakuva</comment>
+ <comment xml:lang="fr">image matricielle RLE</comment>
+ <comment xml:lang="hr">RLE bitmap slika</comment>
+ <comment xml:lang="hu">RLE bitkép</comment>
+ <comment xml:lang="id">Citra bitmap RLE</comment>
+ <comment xml:lang="it">Immagine bitmap RLE</comment>
+ <comment xml:lang="kk">RLE растрлық суреті</comment>
+ <comment xml:lang="ko">RLE 비트맵 그림</comment>
<comment xml:lang="pl">Obraz bitmapy RLE</comment>
- <comment xml:lang="pt">mapa de bitas Run Length Encoded</comment>
- <comment xml:lang="pt_BR">Classe de comprimento imagem bitmap codificada</comment>
- <comment xml:lang="ro">Imagine bitmap codată RLE</comment>
- <comment xml:lang="ru">Растровое изображение, сжатое RLE</comment>
- <comment xml:lang="sk">Bitmapový obrázok Run Length Encoded</comment>
- <comment xml:lang="sl">Zaporedno kodirana bitna slika (RLE)</comment>
- <comment xml:lang="sq">Figurë bitmap RLE (Run Length Encoded)</comment>
- <comment xml:lang="sr">битмап слика кодирана дужином скупине</comment>
- <comment xml:lang="sv">Körlängdskodad bitmappbild</comment>
- <comment xml:lang="tr">Run Length Encoded bit eşlem görüntüsü</comment>
+ <comment xml:lang="pt-BR">Imagem bitmap RLE</comment>
+ <comment xml:lang="ru">Растровое изображение RLE</comment>
+ <comment xml:lang="sl">Bitna slika RLE</comment>
+ <comment xml:lang="sv">RLE bitmappsbild</comment>
+ <comment xml:lang="tr">RLE bit eşlem görüntüsü</comment>
<comment xml:lang="uk">растрове зображення RLE</comment>
- <comment xml:lang="vi">Ảnh mảng mã hóa chiều dài chạy (RLE)</comment>
- <comment xml:lang="zh_CN">游程编码位图</comment>
- <comment xml:lang="zh_TW">Run Length Encoded 點陣影像</comment>
+ <comment xml:lang="zh-CN">RLE 位图图像</comment>
+ <comment xml:lang="zh-TW">RLE 點陣影像</comment>
+ <acronym>RLE</acronym>
+ <expanded-acronym>Run Length Encoded</expanded-acronym>
<glob pattern="*.rle"/>
</mime-type>
<mime-type type="image/svg+xml">
<comment>SVG image</comment>
+ <comment xml:lang="af">SVG-beeld</comment>
<comment xml:lang="ar">صورة SVG</comment>
- <comment xml:lang="be@latin">Vyjava SVG</comment>
+ <comment xml:lang="be-Latn">Vyjava SVG</comment>
<comment xml:lang="bg">Изображение — SVG</comment>
<comment xml:lang="ca">imatge SVG</comment>
<comment xml:lang="cs">obrázek SVG</comment>
<comment xml:lang="da">SVG-billede</comment>
<comment xml:lang="de">SVG-Bild</comment>
<comment xml:lang="el">Εικόνα SVG</comment>
- <comment xml:lang="en_GB">SVG image</comment>
+ <comment xml:lang="en-GB">SVG image</comment>
<comment xml:lang="eo">SVG-bildo</comment>
<comment xml:lang="es">imagen SVG</comment>
<comment xml:lang="eu">SVG irudia</comment>
<comment xml:lang="fi">SVG-kuva</comment>
<comment xml:lang="fo">SVG mynd</comment>
<comment xml:lang="fr">image SVG</comment>
+ <comment xml:lang="fur">imagjin SVG</comment>
<comment xml:lang="ga">íomhá SVG</comment>
<comment xml:lang="gl">imaxe SVG</comment>
<comment xml:lang="he">תמונת SVG</comment>
@@ -27090,7 +28032,7 @@
<comment xml:lang="oc">imatge SVG</comment>
<comment xml:lang="pl">Obraz SVG</comment>
<comment xml:lang="pt">imagem SVG</comment>
- <comment xml:lang="pt_BR">Imagem SVG</comment>
+ <comment xml:lang="pt-BR">Imagem SVG</comment>
<comment xml:lang="ro">Imagine SVG</comment>
<comment xml:lang="ru">Изображение SVG</comment>
<comment xml:lang="sk">Obrázok SVG</comment>
@@ -27101,41 +28043,49 @@
<comment xml:lang="tr">SVG görüntüsü</comment>
<comment xml:lang="uk">зображення SVG</comment>
<comment xml:lang="vi">Ảnh SVG</comment>
- <comment xml:lang="zh_CN">SVG 图像</comment>
- <comment xml:lang="zh_TW">SVG 影像</comment>
+ <comment xml:lang="zh-CN">SVG 图像</comment>
+ <comment xml:lang="zh-TW">SVG 影像</comment>
<acronym>SVG</acronym>
<expanded-acronym>Scalable Vector Graphics</expanded-acronym>
<sub-class-of type="application/xml"/>
<magic priority="80">
- <match value="&lt;!DOCTYPE svg" type="string" offset="0:256"/>
- <match value="&lt;svg" type="string" offset="0:256"/>
+ <match type="string" value="&lt;!DOCTYPE svg" offset="0:256"/>
+ </magic>
+ <magic priority="80">
+ <match type="string" value="&lt;!-- Created with Inkscape" offset="0"/>
+ <match type="string" value="&lt;svg" offset="0"/>
+ </magic>
+ <magic priority="45">
+ <match type="string" value="&lt;svg" offset="1:256"/>
</magic>
<glob pattern="*.svg"/>
<root-XML namespaceURI="http://www.w3.org/2000/svg" localName="svg"/>
</mime-type>
<mime-type type="image/svg+xml-compressed">
<comment>compressed SVG image</comment>
+ <comment xml:lang="af">saamgepersde SVG-beeld</comment>
<comment xml:lang="ar">صورة SVG مضغوطة</comment>
- <comment xml:lang="be@latin">skampresavanaja vyjava SVG</comment>
+ <comment xml:lang="be-Latn">skampresavanaja vyjava SVG</comment>
<comment xml:lang="bg">Изображение — SVG, компресирано</comment>
<comment xml:lang="ca">imatge SVG amb compressió</comment>
<comment xml:lang="cs">komprimovaný obrázek SVG</comment>
<comment xml:lang="da">SVG-komprimeret billede</comment>
<comment xml:lang="de">Komprimiertes SVG-Bild</comment>
<comment xml:lang="el">Συμπιεσμένη εικόνα SVG</comment>
- <comment xml:lang="en_GB">compressed SVG image</comment>
+ <comment xml:lang="en-GB">compressed SVG image</comment>
<comment xml:lang="es">imagen SVG comprimida</comment>
<comment xml:lang="eu">konprimitutako SVG irudia</comment>
<comment xml:lang="fi">pakattu SVG-kuva</comment>
<comment xml:lang="fo">stappað SVG mynd</comment>
<comment xml:lang="fr">image SVG compressée</comment>
+ <comment xml:lang="fur">imagjin SVG comprimude</comment>
<comment xml:lang="ga">íomhá SVG comhbhrúite</comment>
<comment xml:lang="gl">imaxe SVG comprimida</comment>
<comment xml:lang="he">תמונת SVG מכווצת</comment>
<comment xml:lang="hr">Sažeta SVG slika</comment>
<comment xml:lang="hu">tömörített SVG kép</comment>
<comment xml:lang="ia">Imagine SVG comprimite</comment>
- <comment xml:lang="id">Citra SVG terkompresi</comment>
+ <comment xml:lang="id">citra SVG terkompresi</comment>
<comment xml:lang="it">Immagine SVG compressa</comment>
<comment xml:lang="ja">圧縮 SVG 画像</comment>
<comment xml:lang="kk">сығылған SVG суреті</comment>
@@ -27148,7 +28098,7 @@
<comment xml:lang="oc">imatge SVG compressat</comment>
<comment xml:lang="pl">Skompresowany obraz SVG</comment>
<comment xml:lang="pt">imagem SVG comprimida</comment>
- <comment xml:lang="pt_BR">Imagem SVG compactada</comment>
+ <comment xml:lang="pt-BR">Imagem SVG compactada</comment>
<comment xml:lang="ro">imagine comprimată SVG</comment>
<comment xml:lang="ru">Сжатое изображение SVG</comment>
<comment xml:lang="sk">Komprimovaný obrázok SVG</comment>
@@ -27159,8 +28109,8 @@
<comment xml:lang="tr">sıkıştırılmış SVG görüntüsü</comment>
<comment xml:lang="uk">стиснене зображення SVG</comment>
<comment xml:lang="vi">ảnh SVG đã nén</comment>
- <comment xml:lang="zh_CN">压缩的 SVG 图像</comment>
- <comment xml:lang="zh_TW">壓縮版 SVG 影像</comment>
+ <comment xml:lang="zh-CN">压缩的 SVG 图像</comment>
+ <comment xml:lang="zh-TW">壓縮版 SVG 影像</comment>
<acronym>SVG</acronym>
<expanded-acronym>Scalable Vector Graphics</expanded-acronym>
<sub-class-of type="application/gzip"/>
@@ -27168,21 +28118,23 @@
</mime-type>
<mime-type type="image/tiff">
<comment>TIFF image</comment>
+ <comment xml:lang="af">TIFF-beeld</comment>
<comment xml:lang="ar">صورة TIFF</comment>
- <comment xml:lang="be@latin">Vyjava TIFF</comment>
+ <comment xml:lang="be-Latn">Vyjava TIFF</comment>
<comment xml:lang="bg">Изображение — TIFF</comment>
<comment xml:lang="ca">imatge TIFF</comment>
<comment xml:lang="cs">obrázek TIFF</comment>
<comment xml:lang="da">TIFF-billede</comment>
<comment xml:lang="de">TIFF-Bild</comment>
<comment xml:lang="el">Εικόνα TIFF</comment>
- <comment xml:lang="en_GB">TIFF image</comment>
+ <comment xml:lang="en-GB">TIFF image</comment>
<comment xml:lang="eo">TIFF-bildo</comment>
<comment xml:lang="es">imagen TIFF</comment>
<comment xml:lang="eu">TIFF irudia</comment>
<comment xml:lang="fi">TIFF-kuva</comment>
<comment xml:lang="fo">TIFF mynd</comment>
<comment xml:lang="fr">image TIFF</comment>
+ <comment xml:lang="fur">imagjin TIFF</comment>
<comment xml:lang="ga">íomhá TIFF</comment>
<comment xml:lang="gl">imaxe TIFF</comment>
<comment xml:lang="he">תמונת TIFF</comment>
@@ -27203,7 +28155,7 @@
<comment xml:lang="oc">imatge TIFF</comment>
<comment xml:lang="pl">Obraz TIFF</comment>
<comment xml:lang="pt">imagem TIFF</comment>
- <comment xml:lang="pt_BR">Imagem TIFF</comment>
+ <comment xml:lang="pt-BR">Imagem TIFF</comment>
<comment xml:lang="ro">Imagine TIFF</comment>
<comment xml:lang="ru">Изображение TIFF</comment>
<comment xml:lang="sk">Obrázok TIFF</comment>
@@ -27214,28 +28166,32 @@
<comment xml:lang="tr">TIFF görüntüsü</comment>
<comment xml:lang="uk">зображення TIFF</comment>
<comment xml:lang="vi">Ảnh TIFF</comment>
- <comment xml:lang="zh_CN">TIFF 图像</comment>
- <comment xml:lang="zh_TW">TIFF 影像</comment>
+ <comment xml:lang="zh-CN">TIFF 图像</comment>
+ <comment xml:lang="zh-TW">TIFF 影像</comment>
<acronym>TIFF</acronym>
<expanded-acronym>Tagged Image File Format</expanded-acronym>
<magic priority="50">
- <match value="MM\x00\x2a" type="string" offset="0"/>
- <match value="II\x2a\x00" type="string" offset="0"/>
+ <match type="string" value="MM\x00\x2a" offset="0"/>
+ <match type="string" value="II\x2a\x00" offset="0"/>
</magic>
<glob pattern="*.tif"/>
<glob pattern="*.tiff"/>
</mime-type>
<mime-type type="image/x-tiff-multipage">
<comment>Multi-page TIFF image</comment>
+ <comment xml:lang="af">Multibladsy TIFF-beeld</comment>
+ <comment xml:lang="bg">Изображение — TIFF, много страници</comment>
<comment xml:lang="ca">imatge TIFF multipàgina</comment>
<comment xml:lang="cs">vícestránkový obrázek TIFF</comment>
<comment xml:lang="da">Flersidet TIFF-billede</comment>
<comment xml:lang="de">Mehrseitiges TIFF-Bild</comment>
<comment xml:lang="el">Πολυσέλιδη εικόνα TIFF</comment>
- <comment xml:lang="en_GB">Multi-page TIFF image</comment>
+ <comment xml:lang="en-GB">Multi-page TIFF image</comment>
<comment xml:lang="es">imagen TIFF de varias páginas</comment>
+ <comment xml:lang="eu">Multi-page TIFF irudia</comment>
<comment xml:lang="fi">Monisivuinen TIFF-kuva</comment>
<comment xml:lang="fr">Image TIFF multi-page</comment>
+ <comment xml:lang="fur">imagjin a plui pagjinis TIFF</comment>
<comment xml:lang="ga">íomhá il-leathanach TIFF</comment>
<comment xml:lang="gl">Imaxe TIFF multipáxina</comment>
<comment xml:lang="he">תמונת TIFF עם ריבוי עמודים</comment>
@@ -27249,7 +28205,7 @@
<comment xml:lang="oc">Imatge TIFF multipagina</comment>
<comment xml:lang="pl">Wielostronnicowy obraz TIFF</comment>
<comment xml:lang="pt">imagem TIFF multipágina</comment>
- <comment xml:lang="pt_BR">Imagem TIFF multipágina</comment>
+ <comment xml:lang="pt-BR">Imagem TIFF multipágina</comment>
<comment xml:lang="ru">Многостраничное изображение TIFF</comment>
<comment xml:lang="sk">Viacstránkový obrázok TIFF</comment>
<comment xml:lang="sl">Večstranska slika TIFF</comment>
@@ -27257,17 +28213,18 @@
<comment xml:lang="sv">Flersidig TIFF-bild</comment>
<comment xml:lang="tr">Çok sayfalı TIFF görüntüsü</comment>
<comment xml:lang="uk">багатосторінкове зображення TIFF</comment>
- <comment xml:lang="zh_CN">多页 TIFF 图像</comment>
- <comment xml:lang="zh_TW">多頁 TIFF 影像</comment>
+ <comment xml:lang="zh-CN">多页 TIFF 图像</comment>
+ <comment xml:lang="zh-TW">多頁 TIFF 影像</comment>
<acronym>TIFF</acronym>
<expanded-acronym>Tagged Image File Format</expanded-acronym>
<sub-class-of type="image/tiff"/>
</mime-type>
<mime-type type="image/vnd.dwg">
<comment>AutoCAD image</comment>
+ <comment xml:lang="af">AutoCAD-beeld</comment>
<comment xml:lang="ar">صورة AutoCAD</comment>
<comment xml:lang="az">AutoCAD rəsmi</comment>
- <comment xml:lang="be@latin">Vyjava AutoCAD</comment>
+ <comment xml:lang="be-Latn">Vyjava AutoCAD</comment>
<comment xml:lang="bg">Изображение — AutoCAD</comment>
<comment xml:lang="ca">imatge d'AutoCAD</comment>
<comment xml:lang="cs">výkres AutoCAD</comment>
@@ -27275,13 +28232,14 @@
<comment xml:lang="da">AutoCAD-billede</comment>
<comment xml:lang="de">AutoCAD-Bild</comment>
<comment xml:lang="el">Εικόνα AutoCAD</comment>
- <comment xml:lang="en_GB">AutoCAD image</comment>
+ <comment xml:lang="en-GB">AutoCAD image</comment>
<comment xml:lang="eo">AutoCAD-bildo</comment>
<comment xml:lang="es">imagen de AutoCAD</comment>
<comment xml:lang="eu">AutoCAD-eko irudia</comment>
<comment xml:lang="fi">AutoCAD-kuva</comment>
<comment xml:lang="fo">AutoCAD mynd</comment>
<comment xml:lang="fr">image AutoCAD</comment>
+ <comment xml:lang="fur">imagjin AutoCAD</comment>
<comment xml:lang="ga">íomhá AutoCAD</comment>
<comment xml:lang="gl">imaxe de AutoCAD</comment>
<comment xml:lang="he">תמונה של AutoCAD</comment>
@@ -27303,7 +28261,7 @@
<comment xml:lang="oc">imatge AutoCAD</comment>
<comment xml:lang="pl">Obraz AutoCAD</comment>
<comment xml:lang="pt">imagem AutoCAD</comment>
- <comment xml:lang="pt_BR">Imagem do AutoCAD</comment>
+ <comment xml:lang="pt-BR">Imagem do AutoCAD</comment>
<comment xml:lang="ro">Imagine AutoCAD</comment>
<comment xml:lang="ru">Изображение AutoCAD</comment>
<comment xml:lang="sk">Obrázok AutoCAD</comment>
@@ -27314,27 +28272,29 @@
<comment xml:lang="tr">AutoCAD görüntüsü</comment>
<comment xml:lang="uk">зображення AutoCAD</comment>
<comment xml:lang="vi">Ảnh AutoCAD</comment>
- <comment xml:lang="zh_CN">AutoCAD 图像</comment>
- <comment xml:lang="zh_TW">AutoCAD 影像</comment>
+ <comment xml:lang="zh-CN">AutoCAD 图像</comment>
+ <comment xml:lang="zh-TW">AutoCAD 影像</comment>
<glob pattern="*.dwg"/>
</mime-type>
<mime-type type="image/vnd.dxf">
<comment>DXF vector image</comment>
+ <comment xml:lang="af">DXF-vektorbeeld</comment>
<comment xml:lang="ar">صورة DXF نقطية</comment>
- <comment xml:lang="be@latin">Vektarnaja vyjava DXF</comment>
+ <comment xml:lang="be-Latn">Vektarnaja vyjava DXF</comment>
<comment xml:lang="bg">Изображение — DXF</comment>
<comment xml:lang="ca">imatge vectorial DXF</comment>
<comment xml:lang="cs">vektorový obrázek DXF</comment>
<comment xml:lang="da">DXF-vektorbillede</comment>
<comment xml:lang="de">DXF-Vektorbild</comment>
<comment xml:lang="el">Διανυσματική εικόνα DXF</comment>
- <comment xml:lang="en_GB">DXF vector image</comment>
+ <comment xml:lang="en-GB">DXF vector image</comment>
<comment xml:lang="eo">vektora DXF-bildo</comment>
<comment xml:lang="es">imagen vectorial DXF</comment>
<comment xml:lang="eu">DXF bektore-grafikoa</comment>
<comment xml:lang="fi">DXF-vektorikuva</comment>
<comment xml:lang="fo">DXF vektormynd</comment>
<comment xml:lang="fr">image vectorielle DXF</comment>
+ <comment xml:lang="fur">imagjin vetoriâl DXF</comment>
<comment xml:lang="ga">íomhá veicteoireach DXF</comment>
<comment xml:lang="gl">imaxe de vector DXF</comment>
<comment xml:lang="he">תמונת DXF וקטורית</comment>
@@ -27356,7 +28316,7 @@
<comment xml:lang="oc">imatge vectorial DXF</comment>
<comment xml:lang="pl">Obraz wektorowy DXF</comment>
<comment xml:lang="pt">imagem de vectores DXF</comment>
- <comment xml:lang="pt_BR">Imagem vetorial DXF</comment>
+ <comment xml:lang="pt-BR">Imagem vetorial DXF</comment>
<comment xml:lang="ro">Imagine vectorială DXF</comment>
<comment xml:lang="ru">Векторное изображение DXF</comment>
<comment xml:lang="sk">Vektorový obrázok DXF</comment>
@@ -27367,78 +28327,63 @@
<comment xml:lang="tr">DXF vektör görüntüsü</comment>
<comment xml:lang="uk">векторне зображення DXF</comment>
<comment xml:lang="vi">Ảnh véc-tơ DXF</comment>
- <comment xml:lang="zh_CN">DXF 矢量图像</comment>
- <comment xml:lang="zh_TW">DXF 向量圖</comment>
+ <comment xml:lang="zh-CN">DXF 矢量图像</comment>
+ <comment xml:lang="zh-TW">DXF 向量圖</comment>
<glob pattern="*.dxf"/>
<magic priority="50">
- <match value="\nHEADER\n" type="string" offset="0:64"/>
- <match value="\x0d\nHEADER\x0d\n" type="string" offset="0:64"/>
+ <match type="string" value="\nHEADER\n" offset="0:64"/>
+ <match type="string" value="\x0d\nHEADER\x0d\n" offset="0:64"/>
</magic>
</mime-type>
<mime-type type="image/vnd.ms-modi">
- <comment>Microsoft Document Imaging format</comment>
- <comment xml:lang="ar">صيغة مستند تصوير مايكروسوفت</comment>
- <comment xml:lang="ast">Formatu d'imáxenes de Microsoft Document</comment>
- <comment xml:lang="bg">Изображение — Microsoft Document Imaging</comment>
- <comment xml:lang="ca">format Microsoft Document Imaging</comment>
- <comment xml:lang="cs">formát Microsoft Document Imaging</comment>
- <comment xml:lang="da">Microsofts dokumentbilledformat</comment>
- <comment xml:lang="de">Microsoft-Document-Imaging-Bildformat</comment>
- <comment xml:lang="el">Μορφή Microsoft Document Imaging</comment>
- <comment xml:lang="en_GB">Microsoft Document Imaging format</comment>
- <comment xml:lang="es">formato de imagen para documentos de Microsoft</comment>
- <comment xml:lang="eu">Microsoft Document Imaging formatua</comment>
- <comment xml:lang="fi">Microsoft Document Imaging -muoto</comment>
- <comment xml:lang="fo">Microsoft Document Imaging snið</comment>
- <comment xml:lang="fr">format Document Imaging Microsoft</comment>
- <comment xml:lang="ga">formáid Microsoft Document Imaging</comment>
- <comment xml:lang="gl">formato de Microsoft Document Imaging</comment>
- <comment xml:lang="he">תבנית של Microsoft Document Imaging</comment>
- <comment xml:lang="hr">Microsoft Document Imaging format</comment>
- <comment xml:lang="hu">Microsoft Document Imaging formátum</comment>
- <comment xml:lang="ia">File in formato Microsoft Document Imaging</comment>
- <comment xml:lang="id">Format Microsoft Document Imaging</comment>
- <comment xml:lang="it">Formato MDI (Microsoft Document Imaging)</comment>
- <comment xml:lang="ja">Microsoft ドキュメントイメージフォーマット</comment>
- <comment xml:lang="kk">Microsoft Document Imaging пішімі</comment>
- <comment xml:lang="ko">Microsoft 문서 이미지 형식</comment>
- <comment xml:lang="lt">Microsoft Document Imaging formatas</comment>
- <comment xml:lang="lv">Microsoft dokumentu attēlošanas formāts</comment>
- <comment xml:lang="nl">Microsoft Document Imaging</comment>
- <comment xml:lang="oc">format Document Imaging Microsoft</comment>
- <comment xml:lang="pl">Format Microsoft Document Imaging</comment>
- <comment xml:lang="pt">formato Microsoft Document Imaging</comment>
- <comment xml:lang="pt_BR">Formato do Microsoft Document Imaging</comment>
- <comment xml:lang="ro">Format Microsoft Document Imaging</comment>
- <comment xml:lang="ru">Формат Microsoft Document Imaging</comment>
- <comment xml:lang="sk">Formát Microsoft Document Imaging</comment>
- <comment xml:lang="sl">Zapis Microsoft Document Imaging</comment>
- <comment xml:lang="sr">запис слика Мајкрософтовог документа</comment>
- <comment xml:lang="sv">Microsoft Document Imaging-format</comment>
- <comment xml:lang="tr">Microsoft Belge Görüntüleme biçimi</comment>
- <comment xml:lang="uk">формат Microsoft Document Imaging</comment>
- <comment xml:lang="vi">Định dạng tạo ảnh tài liệu Microsoft</comment>
- <comment xml:lang="zh_CN">Microsoft Document Imaging 格式</comment>
- <comment xml:lang="zh_TW">微軟文件影像格式</comment>
+ <comment>MDI image</comment>
+ <comment xml:lang="bg">Изображение — MDI</comment>
+ <comment xml:lang="ca">imatge MDI</comment>
+ <comment xml:lang="da">MDI-billede</comment>
+ <comment xml:lang="de">MDI-Bild</comment>
+ <comment xml:lang="en-GB">MDI image</comment>
+ <comment xml:lang="es">imagen MDI</comment>
+ <comment xml:lang="eu">MDI irudia</comment>
+ <comment xml:lang="fi">MDI-kuva</comment>
+ <comment xml:lang="fr">image MDI</comment>
+ <comment xml:lang="hr">MDI slika</comment>
+ <comment xml:lang="hu">MDI-kép</comment>
+ <comment xml:lang="id">Citra MDI</comment>
+ <comment xml:lang="it">Immagine MDI</comment>
+ <comment xml:lang="kk">MDI суреті</comment>
+ <comment xml:lang="ko">MDI 그림</comment>
+ <comment xml:lang="pl">Obraz MDI</comment>
+ <comment xml:lang="pt-BR">Imagem MDI</comment>
+ <comment xml:lang="ru">Изображение MDI</comment>
+ <comment xml:lang="sk">Obrázok MDI</comment>
+ <comment xml:lang="sl">Slika MDI</comment>
+ <comment xml:lang="sv">MDI-bild</comment>
+ <comment xml:lang="tr">MDI görüntüsü</comment>
+ <comment xml:lang="uk">зображення MDI</comment>
+ <comment xml:lang="zh-CN">MDI 图像</comment>
+ <comment xml:lang="zh-TW">MDI 影像</comment>
<acronym>MDI</acronym>
<expanded-acronym>Microsoft Document Imaging</expanded-acronym>
<glob pattern="*.mdi"/>
<magic priority="50">
- <match value="\x45\x50\x2A\x00" type="string" offset="0"/>
+ <match type="string" value="\x45\x50\x2A\x00" offset="0"/>
</magic>
</mime-type>
<mime-type type="image/webp">
<comment>WebP image</comment>
+ <comment xml:lang="af">WebP-beeld</comment>
+ <comment xml:lang="bg">Изображение — WebP</comment>
<comment xml:lang="ca">imatge WebP</comment>
<comment xml:lang="cs">obrázek WebP</comment>
<comment xml:lang="da">WebP-billede</comment>
<comment xml:lang="de">WebP-Bild</comment>
<comment xml:lang="el">Εικόνα WebP</comment>
- <comment xml:lang="en_GB">WebP image</comment>
+ <comment xml:lang="en-GB">WebP image</comment>
<comment xml:lang="es">imagen WebP</comment>
<comment xml:lang="eu">WebP irudia</comment>
<comment xml:lang="fi">WebP-kuva</comment>
<comment xml:lang="fr">image WebP</comment>
+ <comment xml:lang="fur">imagjin WebP</comment>
<comment xml:lang="ga">íomhá WebP</comment>
<comment xml:lang="gl">Imaxe WebP</comment>
<comment xml:lang="he">תמונת WebP</comment>
@@ -27452,7 +28397,7 @@
<comment xml:lang="oc">imatge WebP</comment>
<comment xml:lang="pl">Obraz WebP</comment>
<comment xml:lang="pt">imagem WebP</comment>
- <comment xml:lang="pt_BR">Imagem WebP</comment>
+ <comment xml:lang="pt-BR">Imagem WebP</comment>
<comment xml:lang="ru">Изображение WebP</comment>
<comment xml:lang="sk">Obrázok WebP</comment>
<comment xml:lang="sl">Slika WebP</comment>
@@ -27460,20 +28405,21 @@
<comment xml:lang="sv">WebP-bild</comment>
<comment xml:lang="tr">WebP görüntüsü</comment>
<comment xml:lang="uk">зображення WebP</comment>
- <comment xml:lang="zh_CN">WebP 图像</comment>
- <comment xml:lang="zh_TW">WebP 影像</comment>
+ <comment xml:lang="zh-CN">WebP 图像</comment>
+ <comment xml:lang="zh-TW">WebP 影像</comment>
<magic priority="50">
- <match value="RIFF" type="string" offset="0">
- <match value="WEBP" type="string" offset="8"/>
+ <match type="string" value="RIFF" offset="0">
+ <match type="string" value="WEBP" offset="8"/>
</match>
</magic>
<glob pattern="*.webp"/>
</mime-type>
<mime-type type="image/x-3ds">
<comment>3D Studio image</comment>
+ <comment xml:lang="af">3D Studio-beeld</comment>
<comment xml:lang="ar">صورة استديو ثلاثية الأبعاد</comment>
<comment xml:lang="az">3D Studio rəsmi</comment>
- <comment xml:lang="be@latin">Vyjava 3D Studio</comment>
+ <comment xml:lang="be-Latn">Vyjava 3D Studio</comment>
<comment xml:lang="bg">Изображение — 3D Studio</comment>
<comment xml:lang="ca">imatge de 3D Studio</comment>
<comment xml:lang="cs">obrázek 3D Studio</comment>
@@ -27481,13 +28427,14 @@
<comment xml:lang="da">3D Studio-billede</comment>
<comment xml:lang="de">3D-Studio-Bild</comment>
<comment xml:lang="el">Εικόνα 3D Studio</comment>
- <comment xml:lang="en_GB">3D Studio image</comment>
+ <comment xml:lang="en-GB">3D Studio image</comment>
<comment xml:lang="eo">bildo de 3D Studio</comment>
<comment xml:lang="es">imagen de 3D Studio</comment>
<comment xml:lang="eu">3D Studio-ko irudia</comment>
<comment xml:lang="fi">3D Studio -kuva</comment>
<comment xml:lang="fo">3D Studio mynd</comment>
<comment xml:lang="fr">image 3D Studio</comment>
+ <comment xml:lang="fur">imagjin 3D Studio</comment>
<comment xml:lang="ga">íomhá 3D Studio</comment>
<comment xml:lang="gl">Imaxe de 3D Studio</comment>
<comment xml:lang="he">תמונת 3D Studio</comment>
@@ -27509,7 +28456,7 @@
<comment xml:lang="oc">imatge 3D Studio</comment>
<comment xml:lang="pl">Obraz 3D Studio</comment>
<comment xml:lang="pt">imagem 3D Studio</comment>
- <comment xml:lang="pt_BR">Imagem do 3D Studio</comment>
+ <comment xml:lang="pt-BR">Imagem do 3D Studio</comment>
<comment xml:lang="ro">Imagine 3D Studio</comment>
<comment xml:lang="ru">Сцена 3D Studio</comment>
<comment xml:lang="sk">Obrázok 3D Studio</comment>
@@ -27520,27 +28467,32 @@
<comment xml:lang="tr">3D Studio görüntüsü</comment>
<comment xml:lang="uk">зображення 3D Studio</comment>
<comment xml:lang="vi">Ảnh xuởng vẽ 3D</comment>
- <comment xml:lang="zh_CN">3D Studio 图像</comment>
- <comment xml:lang="zh_TW">3D Studio 影像</comment>
+ <comment xml:lang="zh-CN">3D Studio 图像</comment>
+ <comment xml:lang="zh-TW">3D Studio 影像</comment>
<glob pattern="*.3ds"/>
+ <magic priority="30">
+ <match offset="0" type="big16" value="0x4d4d"/>
+ </magic>
</mime-type>
<mime-type type="image/x-applix-graphics">
<comment>Applix Graphics image</comment>
+ <comment xml:lang="af">Applix Graphics-beeld</comment>
<comment xml:lang="ar">صورة رسوميات Applix</comment>
- <comment xml:lang="be@latin">Vyjava Applix Graphics</comment>
+ <comment xml:lang="be-Latn">Vyjava Applix Graphics</comment>
<comment xml:lang="bg">Изображение — Applix Graphics</comment>
<comment xml:lang="ca">imatge d'Applix Graphics</comment>
<comment xml:lang="cs">obrázek Applix Graphics</comment>
<comment xml:lang="da">Applix Graphics-billede</comment>
<comment xml:lang="de">Applix-Graphics-Bild</comment>
<comment xml:lang="el">Εικόνα Applix Graphics</comment>
- <comment xml:lang="en_GB">Applix Graphics image</comment>
+ <comment xml:lang="en-GB">Applix Graphics image</comment>
<comment xml:lang="eo">bildo de Applix Graphics</comment>
<comment xml:lang="es">imagen de Applix Graphics</comment>
<comment xml:lang="eu">Applix Graphics irudia</comment>
<comment xml:lang="fi">Applix Graphics -kuva</comment>
<comment xml:lang="fo">Applix Graphics mynd</comment>
<comment xml:lang="fr">image Applix Graphics</comment>
+ <comment xml:lang="fur">imagjin Applix Graphics</comment>
<comment xml:lang="ga">íomhá Applix Graphics</comment>
<comment xml:lang="gl">imaxe de Applix Graphics</comment>
<comment xml:lang="he">תמונה של Applix Graphics</comment>
@@ -27562,7 +28514,7 @@
<comment xml:lang="oc">imatge Applix Graphics</comment>
<comment xml:lang="pl">Obraz Applix Graphics</comment>
<comment xml:lang="pt">imagem Applix Graphics</comment>
- <comment xml:lang="pt_BR">Imagem do Applix Graphics</comment>
+ <comment xml:lang="pt-BR">Imagem do Applix Graphics</comment>
<comment xml:lang="ro">Imagine Applix Graphics</comment>
<comment xml:lang="ru">Изображение Applix Graphics</comment>
<comment xml:lang="sk">Obrázok Applix Graphics</comment>
@@ -27573,36 +28525,38 @@
<comment xml:lang="tr">Applix Graphics görüntüsü</comment>
<comment xml:lang="uk">зображення Applix Graphics</comment>
<comment xml:lang="vi">Ảnh Applix Graphics</comment>
- <comment xml:lang="zh_CN">Applix Graphics 图像</comment>
- <comment xml:lang="zh_TW">Applix Graphics 影像</comment>
+ <comment xml:lang="zh-CN">Applix Graphics 图像</comment>
+ <comment xml:lang="zh-TW">Applix Graphics 影像</comment>
<magic priority="50">
- <match value="*BEGIN" type="string" offset="0">
- <match value="GRAPHICS" type="string" offset="7"/>
+ <match type="string" value="*BEGIN" offset="0">
+ <match type="string" value="GRAPHICS" offset="7"/>
</match>
</magic>
<glob pattern="*.ag"/>
</mime-type>
<mime-type type="image/x-bzeps">
<comment>EPS image (bzip-compressed)</comment>
+ <comment xml:lang="af">EPS-beeld (bzip-saamgepers)</comment>
<comment xml:lang="ar">صورة EPS (مضغوط-bzip)</comment>
- <comment xml:lang="be@latin">Vyjava EPS (bzip-skampresavanaja)</comment>
+ <comment xml:lang="be-Latn">Vyjava EPS (bzip-skampresavanaja)</comment>
<comment xml:lang="bg">Изображение — EPS, компресирано с bzip</comment>
<comment xml:lang="ca">imatge EPS (amb compressió bzip)</comment>
<comment xml:lang="cs">obrázek EPS (komprimovaný pomocí bzip)</comment>
<comment xml:lang="da">EPS-billede (bzip-komprimeret)</comment>
<comment xml:lang="de">EPS-Bild (bzip-komprimiert)</comment>
<comment xml:lang="el">Εικόνα EPS (συμπιεσμένη bzip)</comment>
- <comment xml:lang="en_GB">EPS image (bzip-compressed)</comment>
+ <comment xml:lang="en-GB">EPS image (bzip-compressed)</comment>
<comment xml:lang="es">imagen EPS (comprimida con bzip)</comment>
<comment xml:lang="eu">EPS irudia (bzip-ekin konprimitua)</comment>
<comment xml:lang="fi">EPS-kuva (bzip-pakattu)</comment>
<comment xml:lang="fo">EPS mynd (bzip-stappað)</comment>
<comment xml:lang="fr">image EPS (compressée bzip)</comment>
+ <comment xml:lang="fur">imagjin EPS (comprimude cun bzip)</comment>
<comment xml:lang="ga">íomhá EPS (comhbhrúite le bzip)</comment>
<comment xml:lang="gl">imaxe EPS (comprimida con bzip)</comment>
<comment xml:lang="he">תמונת EPS (מכווץ בbzip)</comment>
<comment xml:lang="hr">EPS slika (bzip sažeta)</comment>
- <comment xml:lang="hu">EPS kép (bzip-tömörítésű)</comment>
+ <comment xml:lang="hu">EPS kép (bzip tömörítésű)</comment>
<comment xml:lang="ia">Imagine EPS (comprimite con bzip)</comment>
<comment xml:lang="id">Citra EPS (terkompresi bzip)</comment>
<comment xml:lang="it">Immagine EPS (compressa con bzip)</comment>
@@ -27618,7 +28572,7 @@
<comment xml:lang="oc">imatge EPS (compressat bzip)</comment>
<comment xml:lang="pl">Obraz EPS (kompresja bzip)</comment>
<comment xml:lang="pt">imagem EPS (compressão bzip)</comment>
- <comment xml:lang="pt_BR">Imagem EPS (compactada com bzip)</comment>
+ <comment xml:lang="pt-BR">Imagem EPS (compactada com bzip)</comment>
<comment xml:lang="ro">Imagine EPS (compresie bzip)</comment>
<comment xml:lang="ru">Изображение EPS (сжатое bzip)</comment>
<comment xml:lang="sk">Obrázok EPS (komprimovaný pomocou bzip)</comment>
@@ -27629,8 +28583,8 @@
<comment xml:lang="tr">EPS görüntüsü (bzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">зображення EPS (стиснене bzip)</comment>
<comment xml:lang="vi">Ảnh EPS (đã nén bzip)</comment>
- <comment xml:lang="zh_CN">EPS 图像（bzip 压缩）</comment>
- <comment xml:lang="zh_TW">EPS 影像 (bzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">EPS 图像（bzip 压缩）</comment>
+ <comment xml:lang="zh-TW">EPS 影像 (bzip 壓縮)</comment>
<sub-class-of type="application/x-bzip"/>
<glob pattern="*.eps.bz2"/>
<glob pattern="*.epsi.bz2"/>
@@ -27638,9 +28592,10 @@
</mime-type>
<mime-type type="image/x-cmu-raster">
<comment>CMU raster image</comment>
+ <comment xml:lang="af">CMU-roosterbeeld</comment>
<comment xml:lang="ar">صورة CMU نقطية</comment>
<comment xml:lang="az">CMU raster rəsmi</comment>
- <comment xml:lang="be@latin">Rastravaja vyjava CMU</comment>
+ <comment xml:lang="be-Latn">Rastravaja vyjava CMU</comment>
<comment xml:lang="bg">Изображение — CMU raster</comment>
<comment xml:lang="ca">imatge ràster CMU</comment>
<comment xml:lang="cs">rastrový obrázek CMU</comment>
@@ -27648,13 +28603,14 @@
<comment xml:lang="da">CMU-rasterbillede</comment>
<comment xml:lang="de">CMU-Rasterbild</comment>
<comment xml:lang="el">Εικόνα ράστερ CMU</comment>
- <comment xml:lang="en_GB">CMU raster image</comment>
+ <comment xml:lang="en-GB">CMU raster image</comment>
<comment xml:lang="eo">rastruma bildo de CMU</comment>
<comment xml:lang="es">imagen ráster CMU</comment>
<comment xml:lang="eu">CMU bilbe-irudia</comment>
<comment xml:lang="fi">CMU-rasterikuva</comment>
<comment xml:lang="fo">CMU raster mynd</comment>
<comment xml:lang="fr">image raster CMU</comment>
+ <comment xml:lang="fur">imagjin raster CMU</comment>
<comment xml:lang="ga">íomhá rastar CMU</comment>
<comment xml:lang="gl">imaxe raster CMU</comment>
<comment xml:lang="he">תמונת סריקה CMU</comment>
@@ -27676,7 +28632,7 @@
<comment xml:lang="oc">imatge raster CMU</comment>
<comment xml:lang="pl">Obraz rastrowy CMU</comment>
<comment xml:lang="pt">imagem raster CMU</comment>
- <comment xml:lang="pt_BR">Imagem raster CMU</comment>
+ <comment xml:lang="pt-BR">Imagem raster CMU</comment>
<comment xml:lang="ro">Imagine raster CMU</comment>
<comment xml:lang="ru">Растровое изображение CMU</comment>
<comment xml:lang="sk">Rastrový obrázok CMU</comment>
@@ -27687,33 +28643,35 @@
<comment xml:lang="tr">CMU tarama görüntüsü</comment>
<comment xml:lang="uk">растрове зображення CMU</comment>
<comment xml:lang="vi">Ảnh mành CMU</comment>
- <comment xml:lang="zh_CN">CMU 光栅图像</comment>
- <comment xml:lang="zh_TW">CMU raster 影像</comment>
+ <comment xml:lang="zh-CN">CMU 光栅图像</comment>
+ <comment xml:lang="zh-TW">CMU raster 影像</comment>
<glob pattern="*.ras"/>
</mime-type>
<mime-type type="image/x-compressed-xcf">
<comment>compressed GIMP image</comment>
+ <comment xml:lang="af">saamgepersde GIMP-beeld</comment>
<comment xml:lang="ar">صورة GIMP مضغوطة</comment>
- <comment xml:lang="be@latin">skampresavanaja vyjava GIMP</comment>
+ <comment xml:lang="be-Latn">skampresavanaja vyjava GIMP</comment>
<comment xml:lang="bg">Изображение — GIMP, компресирано</comment>
<comment xml:lang="ca">imatge GIMP amb compressió</comment>
<comment xml:lang="cs">komprimovaný obrázek GIMP</comment>
<comment xml:lang="da">komprimeret GIMP-billede</comment>
<comment xml:lang="de">Komprimiertes GIMP-Bild</comment>
<comment xml:lang="el">Συμπιεσμένη εικόνα GIMP</comment>
- <comment xml:lang="en_GB">compressed GIMP image</comment>
+ <comment xml:lang="en-GB">compressed GIMP image</comment>
<comment xml:lang="es">imagen GIMP comprimida</comment>
<comment xml:lang="eu">konprimitutako GIMP irudia</comment>
<comment xml:lang="fi">pakattu GIMP-kuva</comment>
<comment xml:lang="fo">stappað GIMP mynd</comment>
<comment xml:lang="fr">image GIMP compressée</comment>
+ <comment xml:lang="fur">imagjin GIMP comprimude</comment>
<comment xml:lang="ga">íomhá GIMP comhbhrúite</comment>
<comment xml:lang="gl">imaxe de GIMP comprimida</comment>
<comment xml:lang="he">תמונת GIMP מכווצת</comment>
<comment xml:lang="hr">Sažeta GIMP slika</comment>
<comment xml:lang="hu">tömörített GIMP kép</comment>
<comment xml:lang="ia">Imagine GIMP comprimite</comment>
- <comment xml:lang="id">Citra GIMP terkompresi</comment>
+ <comment xml:lang="id">citra GIMP terkompresi</comment>
<comment xml:lang="it">Immagine GIMP compressa</comment>
<comment xml:lang="ja">圧縮 GIMP 画像</comment>
<comment xml:lang="kk">сығылған GIMP суреті</comment>
@@ -27726,7 +28684,7 @@
<comment xml:lang="oc">imatge GIMP compressat</comment>
<comment xml:lang="pl">Skompresowany obraz GIMP</comment>
<comment xml:lang="pt">imagem GIMP comprimida</comment>
- <comment xml:lang="pt_BR">Imagem do GIMP compactada</comment>
+ <comment xml:lang="pt-BR">Imagem do GIMP compactada</comment>
<comment xml:lang="ro">imagine comprimată GIMP</comment>
<comment xml:lang="ru">Сжатое изображение GIMP</comment>
<comment xml:lang="sk">Komprimovaný obrázok GIMP</comment>
@@ -27737,28 +28695,30 @@
<comment xml:lang="tr">sıkıştırılmış GIMP görüntüsü</comment>
<comment xml:lang="uk">стиснене зображення GIMP</comment>
<comment xml:lang="vi">ảnh GIMP đã nén</comment>
- <comment xml:lang="zh_CN">压缩的 GIMP 图像</comment>
- <comment xml:lang="zh_TW">壓縮版 GIMP 影像</comment>
+ <comment xml:lang="zh-CN">压缩的 GIMP 图像</comment>
+ <comment xml:lang="zh-TW">壓縮版 GIMP 影像</comment>
<glob pattern="*.xcf.gz"/>
<glob pattern="*.xcf.bz2"/>
</mime-type>
<mime-type type="application/dicom">
<comment>DICOM image</comment>
+ <comment xml:lang="af">DICOM-beeld</comment>
<comment xml:lang="ar">صورة DICOM</comment>
- <comment xml:lang="be@latin">Vyjava DICOM</comment>
+ <comment xml:lang="be-Latn">Vyjava DICOM</comment>
<comment xml:lang="bg">Изображение — DICOM</comment>
<comment xml:lang="ca">imatge DICOM</comment>
<comment xml:lang="cs">obrázek DICOM</comment>
<comment xml:lang="da">DICOM-billede</comment>
<comment xml:lang="de">DICOM-Bild</comment>
<comment xml:lang="el">Εικόνα DICOM</comment>
- <comment xml:lang="en_GB">DICOM image</comment>
+ <comment xml:lang="en-GB">DICOM image</comment>
<comment xml:lang="eo">DICOM-bildo</comment>
<comment xml:lang="es">imagen DICOM</comment>
<comment xml:lang="eu">DICOM irudia</comment>
<comment xml:lang="fi">DICOM-kuva</comment>
<comment xml:lang="fo">DICOM mynd</comment>
<comment xml:lang="fr">image DICOM</comment>
+ <comment xml:lang="fur">imagjin DICOM</comment>
<comment xml:lang="ga">íomhá DICOM</comment>
<comment xml:lang="gl">imaxe DICOM</comment>
<comment xml:lang="he">תמונת DICOM</comment>
@@ -27779,7 +28739,7 @@
<comment xml:lang="oc">imatge DICOM</comment>
<comment xml:lang="pl">Obraz DICOM</comment>
<comment xml:lang="pt">imagem DICOM</comment>
- <comment xml:lang="pt_BR">Imagem DICOM</comment>
+ <comment xml:lang="pt-BR">Imagem DICOM</comment>
<comment xml:lang="ro">Imagine DICOM</comment>
<comment xml:lang="ru">Изображение DICOM</comment>
<comment xml:lang="sk">Obrázok DICOM</comment>
@@ -27790,35 +28750,37 @@
<comment xml:lang="tr">DICOM görüntüsü</comment>
<comment xml:lang="uk">зображення DICOM</comment>
<comment xml:lang="vi">Ảnh DICOM</comment>
- <comment xml:lang="zh_CN">DICOM 图像</comment>
- <comment xml:lang="zh_TW">DICOM 影像</comment>
+ <comment xml:lang="zh-CN">DICOM 图像</comment>
+ <comment xml:lang="zh-TW">DICOM 影像</comment>
<acronym>DICOM</acronym>
<expanded-acronym>Digital Imaging and Communications in Medicine</expanded-acronym>
<generic-icon name="image-x-generic"/>
<glob pattern="dicomdir"/>
<glob pattern="*.dcm"/>
<magic priority="50">
- <match value="DICM" type="string" offset="128"/>
+ <match type="string" value="DICM" offset="128"/>
</magic>
</mime-type>
<mime-type type="application/x-docbook+xml">
<comment>DocBook document</comment>
+ <comment xml:lang="af">DocBook-dokument</comment>
<comment xml:lang="ar">مستند DocBook</comment>
<comment xml:lang="ast">Documentu DocBook</comment>
- <comment xml:lang="be@latin">Dakument DocBook</comment>
+ <comment xml:lang="be-Latn">Dakument DocBook</comment>
<comment xml:lang="bg">Документ — DocBook</comment>
<comment xml:lang="ca">document DocBook</comment>
<comment xml:lang="cs">dokument DocBook</comment>
<comment xml:lang="da">DocBook-dokument</comment>
<comment xml:lang="de">DocBook-Dokument</comment>
<comment xml:lang="el">Έγγραφο DocBook</comment>
- <comment xml:lang="en_GB">DocBook document</comment>
+ <comment xml:lang="en-GB">DocBook document</comment>
<comment xml:lang="eo">DocBook-dokumento</comment>
<comment xml:lang="es">documento DocBook</comment>
<comment xml:lang="eu">DocBook dokumentua</comment>
<comment xml:lang="fi">DocBook-asiakirja</comment>
<comment xml:lang="fo">DocBook skjal</comment>
<comment xml:lang="fr">document DocBook</comment>
+ <comment xml:lang="fur">document DocBook</comment>
<comment xml:lang="ga">cáipéis DocBook</comment>
<comment xml:lang="gl">documento de DocBook</comment>
<comment xml:lang="he">מסמך DocBook</comment>
@@ -27839,7 +28801,7 @@
<comment xml:lang="oc">document DocBook</comment>
<comment xml:lang="pl">Dokument DocBook</comment>
<comment xml:lang="pt">documento DocBook</comment>
- <comment xml:lang="pt_BR">Documento DocBook</comment>
+ <comment xml:lang="pt-BR">Documento DocBook</comment>
<comment xml:lang="ro">Document DocBook</comment>
<comment xml:lang="ru">Документ DocBook</comment>
<comment xml:lang="sk">Dokument DocBook</comment>
@@ -27850,8 +28812,8 @@
<comment xml:lang="tr">DocBook belgesi</comment>
<comment xml:lang="uk">документ DocBook</comment>
<comment xml:lang="vi">Tài liệu DocBook</comment>
- <comment xml:lang="zh_CN">DocBook 文档</comment>
- <comment xml:lang="zh_TW">DocBook 文件</comment>
+ <comment xml:lang="zh-CN">DocBook 文档</comment>
+ <comment xml:lang="zh-TW">DocBook 文件</comment>
<sub-class-of type="application/xml"/>
<generic-icon name="x-office-document"/>
<magic priority="90">
@@ -27867,21 +28829,23 @@
</mime-type>
<mime-type type="image/x-dib">
<comment>DIB image</comment>
+ <comment xml:lang="af">DIB-beeld</comment>
<comment xml:lang="ar">صورة DIB</comment>
- <comment xml:lang="be@latin">Vyjava DIB</comment>
+ <comment xml:lang="be-Latn">Vyjava DIB</comment>
<comment xml:lang="bg">Изображение — DIB</comment>
<comment xml:lang="ca">imatge DIB</comment>
<comment xml:lang="cs">obrázek DIB</comment>
<comment xml:lang="da">DIB-billede</comment>
<comment xml:lang="de">DIB-Bild</comment>
<comment xml:lang="el">Εικόνα DIB</comment>
- <comment xml:lang="en_GB">DIB image</comment>
+ <comment xml:lang="en-GB">DIB image</comment>
<comment xml:lang="eo">DIB-bildo</comment>
<comment xml:lang="es">imagen DIB</comment>
<comment xml:lang="eu">DIB irudia</comment>
<comment xml:lang="fi">DIB-kuva</comment>
<comment xml:lang="fo">DIB mynd</comment>
<comment xml:lang="fr">image DIB</comment>
+ <comment xml:lang="fur">imagjin DIB</comment>
<comment xml:lang="ga">íomhá DIB</comment>
<comment xml:lang="gl">imaxe DIB</comment>
<comment xml:lang="he">תמונת DIB</comment>
@@ -27902,7 +28866,7 @@
<comment xml:lang="oc">imatge DIB</comment>
<comment xml:lang="pl">Obraz DIB</comment>
<comment xml:lang="pt">imagem DIB</comment>
- <comment xml:lang="pt_BR">Imagem DIB</comment>
+ <comment xml:lang="pt-BR">Imagem DIB</comment>
<comment xml:lang="ro">Imagine DIB</comment>
<comment xml:lang="ru">Изображение DIB</comment>
<comment xml:lang="sk">Obrázok DIB</comment>
@@ -27913,31 +28877,33 @@
<comment xml:lang="tr">DIB görüntüsü</comment>
<comment xml:lang="uk">зображення DIB</comment>
<comment xml:lang="vi">Ảnh DIB</comment>
- <comment xml:lang="zh_CN">DIB 图像</comment>
- <comment xml:lang="zh_TW">DIB 影像</comment>
+ <comment xml:lang="zh-CN">DIB 图像</comment>
+ <comment xml:lang="zh-TW">DIB 影像</comment>
<acronym>DIB</acronym>
<expanded-acronym>Device Independent Bitmap</expanded-acronym>
<magic priority="50">
- <match value="\x28\00\00\00" type="string" offset="0"/>
+ <match type="string" value="\x28\00\00\00" offset="0"/>
</magic>
</mime-type>
<mime-type type="image/vnd.djvu">
<comment>DjVu image</comment>
+ <comment xml:lang="af">DjVu-beeld</comment>
<comment xml:lang="ar">صورة DjVu</comment>
- <comment xml:lang="be@latin">Vyjava DjVu</comment>
+ <comment xml:lang="be-Latn">Vyjava DjVu</comment>
<comment xml:lang="bg">Изображение — DjVu</comment>
<comment xml:lang="ca">imatge DjVu</comment>
<comment xml:lang="cs">obrázek DjVu</comment>
<comment xml:lang="da">DjVu-billede</comment>
<comment xml:lang="de">DjVu-Bild</comment>
<comment xml:lang="el">Εικόνα DjVu</comment>
- <comment xml:lang="en_GB">DjVu image</comment>
+ <comment xml:lang="en-GB">DjVu image</comment>
<comment xml:lang="eo">DjVu-bildo</comment>
<comment xml:lang="es">imagen DjVu</comment>
<comment xml:lang="eu">DjVU-ko irudia</comment>
<comment xml:lang="fi">DjVu-kuva</comment>
<comment xml:lang="fo">DjVu mynd</comment>
<comment xml:lang="fr">image DjVu</comment>
+ <comment xml:lang="fur">imagjin DjVu</comment>
<comment xml:lang="ga">íomhá DjVu</comment>
<comment xml:lang="gl">imaxe de DjVu</comment>
<comment xml:lang="he">תמונת DjVu</comment>
@@ -27959,7 +28925,7 @@
<comment xml:lang="oc">imatge DjVu</comment>
<comment xml:lang="pl">Obraz DjVu</comment>
<comment xml:lang="pt">imagem DjVu</comment>
- <comment xml:lang="pt_BR">Imagem DjVu</comment>
+ <comment xml:lang="pt-BR">Imagem DjVu</comment>
<comment xml:lang="ro">Imagine DjVu</comment>
<comment xml:lang="ru">Изображение DjVu</comment>
<comment xml:lang="sk">Obrázok DjVu</comment>
@@ -27970,16 +28936,16 @@
<comment xml:lang="tr">DjVu görüntüsü</comment>
<comment xml:lang="uk">зображення DjVu</comment>
<comment xml:lang="vi">Ảnh DjVu</comment>
- <comment xml:lang="zh_CN">DjVu 图像</comment>
- <comment xml:lang="zh_TW">DjVu 影像</comment>
+ <comment xml:lang="zh-CN">DjVu 图像</comment>
+ <comment xml:lang="zh-TW">DjVu 影像</comment>
<alias type="image/x-djvu"/>
<alias type="image/x.djvu"/>
<magic priority="80">
- <match value="AT&amp;TFORM" type="string" offset="0">
- <match value="DJVU" type="string" offset="12"/>
+ <match type="string" offset="0" value="AT&amp;TFORM">
+ <match type="string" offset="12" value="DJVU"/>
</match>
- <match value="FORM" type="string" offset="0">
- <match value="DJVU" type="string" offset="8"/>
+ <match type="string" offset="0" value="FORM">
+ <match type="string" offset="8" value="DJVU"/>
</match>
</magic>
<glob pattern="*.djvu"/>
@@ -27987,17 +28953,20 @@
</mime-type>
<mime-type type="image/vnd.djvu+multipage">
<comment>DjVu document</comment>
+ <comment xml:lang="af">DjVu-dokument</comment>
<comment xml:lang="ast">Documentu DjVu</comment>
+ <comment xml:lang="bg">Документ — DjVu</comment>
<comment xml:lang="ca">document DjVu</comment>
<comment xml:lang="cs">dokument DjVu</comment>
<comment xml:lang="da">DjVu-dokument</comment>
<comment xml:lang="de">DjVu-Dokument</comment>
<comment xml:lang="el">Έγγραφο DjVu</comment>
- <comment xml:lang="en_GB">DjVu document</comment>
+ <comment xml:lang="en-GB">DjVu document</comment>
<comment xml:lang="es">documento DjVu</comment>
<comment xml:lang="eu">DjVu dokumentua</comment>
<comment xml:lang="fi">DjVu-asiakirja</comment>
<comment xml:lang="fr">document DjVu</comment>
+ <comment xml:lang="fur">document DjVu</comment>
<comment xml:lang="ga">cáipéis DjVu</comment>
<comment xml:lang="he">מסמך DjVu</comment>
<comment xml:lang="hr">DjVu dokument</comment>
@@ -28010,22 +28979,23 @@
<comment xml:lang="oc">document DjVu</comment>
<comment xml:lang="pl">Dokument DjVu</comment>
<comment xml:lang="pt">documento DjVu</comment>
- <comment xml:lang="pt_BR">Documento DjVu</comment>
+ <comment xml:lang="pt-BR">Documento DjVu</comment>
<comment xml:lang="ru">Документ DjVu</comment>
<comment xml:lang="sk">Dokument DjVu</comment>
+ <comment xml:lang="sl">Dokument DjVu</comment>
<comment xml:lang="sr">ДјВу документ</comment>
<comment xml:lang="sv">DjVu-dokument</comment>
<comment xml:lang="tr">DjVu belgesi</comment>
<comment xml:lang="uk">документ DjVu</comment>
- <comment xml:lang="zh_CN">DjVu 文档</comment>
- <comment xml:lang="zh_TW">DjVu 文件</comment>
+ <comment xml:lang="zh-CN">DjVu 文档</comment>
+ <comment xml:lang="zh-TW">DjVu 文件</comment>
<generic-icon name="x-office-document"/>
<magic priority="80">
- <match value="AT&amp;TFORM" type="string" offset="0">
- <match value="DJVM" type="string" offset="12"/>
+ <match type="string" offset="0" value="AT&amp;TFORM">
+ <match type="string" offset="12" value="DJVM"/>
</match>
- <match value="FORM" type="string" offset="0">
- <match value="DJVM" type="string" offset="8"/>
+ <match type="string" offset="0" value="FORM">
+ <match type="string" offset="8" value="DJVM"/>
</match>
</magic>
<sub-class-of type="image/vnd.djvu"/>
@@ -28034,21 +29004,23 @@
</mime-type>
<mime-type type="image/dpx">
<comment>DPX image</comment>
+ <comment xml:lang="af">DPX-beeld</comment>
<comment xml:lang="ar">صورة DPX</comment>
- <comment xml:lang="be@latin">Vyjava DPX</comment>
+ <comment xml:lang="be-Latn">Vyjava DPX</comment>
<comment xml:lang="bg">Изображение — DPX</comment>
<comment xml:lang="ca">imatge DPX</comment>
<comment xml:lang="cs">obrázek DPX</comment>
<comment xml:lang="da">DPX-billede</comment>
<comment xml:lang="de">DPX-Bild</comment>
<comment xml:lang="el">Εικόνα DPX</comment>
- <comment xml:lang="en_GB">DPX image</comment>
+ <comment xml:lang="en-GB">DPX image</comment>
<comment xml:lang="eo">DPX-bildo</comment>
<comment xml:lang="es">imagen DPX</comment>
<comment xml:lang="eu">DPX irudia</comment>
<comment xml:lang="fi">DPX-kuva</comment>
<comment xml:lang="fo">DPX mynd</comment>
<comment xml:lang="fr">image DPX</comment>
+ <comment xml:lang="fur">imagjin DPX</comment>
<comment xml:lang="ga">íomhá DPX</comment>
<comment xml:lang="gl">imaxe DPX</comment>
<comment xml:lang="he">תמונת DPX</comment>
@@ -28069,7 +29041,7 @@
<comment xml:lang="oc">imatge DPX</comment>
<comment xml:lang="pl">Obraz DPX</comment>
<comment xml:lang="pt">imagem DPX</comment>
- <comment xml:lang="pt_BR">Imagem DPX</comment>
+ <comment xml:lang="pt-BR">Imagem DPX</comment>
<comment xml:lang="ro">Imagine DPX</comment>
<comment xml:lang="ru">Изображение DPX</comment>
<comment xml:lang="sk">Obrázok DPX</comment>
@@ -28080,31 +29052,33 @@
<comment xml:lang="tr">DPX görüntüsü</comment>
<comment xml:lang="uk">зображення DPX</comment>
<comment xml:lang="vi">Ảnh DPX</comment>
- <comment xml:lang="zh_CN">DPX 图像</comment>
- <comment xml:lang="zh_TW">DPX 影像</comment>
+ <comment xml:lang="zh-CN">DPX 图像</comment>
+ <comment xml:lang="zh-TW">DPX 影像</comment>
<acronym>DPX</acronym>
<expanded-acronym>Digital Moving Picture Exchange</expanded-acronym>
<magic priority="50">
- <match value="0x53445058" type="big32" offset="0"/>
+ <match type="big32" value="0x53445058" offset="0"/>
</magic>
</mime-type>
<mime-type type="image/x-eps">
<comment>EPS image</comment>
+ <comment xml:lang="af">EPS-beeld</comment>
<comment xml:lang="ar">صورة EPS</comment>
- <comment xml:lang="be@latin">Vyjava EPS</comment>
+ <comment xml:lang="be-Latn">Vyjava EPS</comment>
<comment xml:lang="bg">Изображение — EPS</comment>
<comment xml:lang="ca">imatge EPS</comment>
<comment xml:lang="cs">obrázek EPS</comment>
<comment xml:lang="da">EPS-billede</comment>
<comment xml:lang="de">EPS-Bild</comment>
<comment xml:lang="el">Εικόνα EPS</comment>
- <comment xml:lang="en_GB">EPS image</comment>
+ <comment xml:lang="en-GB">EPS image</comment>
<comment xml:lang="eo">EPS-bildo</comment>
<comment xml:lang="es">imagen EPS</comment>
<comment xml:lang="eu">EPS irudia</comment>
<comment xml:lang="fi">EPS-kuva</comment>
<comment xml:lang="fo">EPS mynd</comment>
<comment xml:lang="fr">image EPS</comment>
+ <comment xml:lang="fur">imagjin EPS</comment>
<comment xml:lang="ga">íomhá EPS</comment>
<comment xml:lang="gl">imaxe EPS</comment>
<comment xml:lang="he">תמונת EPS</comment>
@@ -28125,7 +29099,7 @@
<comment xml:lang="oc">imatge EPS</comment>
<comment xml:lang="pl">Obraz EPS</comment>
<comment xml:lang="pt">imagem EPS</comment>
- <comment xml:lang="pt_BR">Imagem EPS</comment>
+ <comment xml:lang="pt-BR">Imagem EPS</comment>
<comment xml:lang="ro">Imagine EPS</comment>
<comment xml:lang="ru">Изображение EPS</comment>
<comment xml:lang="sk">Obrázok EPS</comment>
@@ -28136,19 +29110,19 @@
<comment xml:lang="tr">EPS görüntüsü</comment>
<comment xml:lang="uk">зображення EPS</comment>
<comment xml:lang="vi">Ảnh EPS</comment>
- <comment xml:lang="zh_CN">EPS 图像</comment>
- <comment xml:lang="zh_TW">EPS 影像</comment>
+ <comment xml:lang="zh-CN">EPS 图像</comment>
+ <comment xml:lang="zh-TW">EPS 影像</comment>
<acronym>EPS</acronym>
<expanded-acronym>Encapsulated PostScript</expanded-acronym>
<sub-class-of type="application/postscript"/>
<magic priority="90">
- <match value="%!" type="string" offset="0">
- <match value="EPS" type="string" offset="15"/>
+ <match type="string" value="%!" offset="0">
+ <match type="string" value="EPS" offset="15"/>
</match>
- <match value="\004%!" type="string" offset="0">
- <match value="EPS" type="string" offset="16"/>
+ <match type="string" value="\004%!" offset="0">
+ <match type="string" value="EPS" offset="16"/>
</match>
- <match value="0xC5D0D3C6" type="big32" offset="0"/>
+ <match type="big32" value="0xC5D0D3C6" offset="0"/>
</magic>
<glob pattern="*.eps"/>
<glob pattern="*.epsi"/>
@@ -28156,22 +29130,24 @@
</mime-type>
<mime-type type="image/fits">
<comment>FITS document</comment>
+ <comment xml:lang="af">FITS-dokument</comment>
<comment xml:lang="ar">مستند FITS</comment>
<comment xml:lang="ast">Documentu FITS</comment>
- <comment xml:lang="be@latin">Dakument FITS</comment>
+ <comment xml:lang="be-Latn">Dakument FITS</comment>
<comment xml:lang="bg">Документ — FITS</comment>
<comment xml:lang="ca">document FITS</comment>
<comment xml:lang="cs">dokument FITS</comment>
<comment xml:lang="da">FITS-dokument</comment>
<comment xml:lang="de">FITS-Dokument</comment>
<comment xml:lang="el">Έγγραφο FITS</comment>
- <comment xml:lang="en_GB">FITS document</comment>
+ <comment xml:lang="en-GB">FITS document</comment>
<comment xml:lang="eo">FITS-dokumento</comment>
<comment xml:lang="es">documento FITS</comment>
<comment xml:lang="eu">FITS dokumentua</comment>
<comment xml:lang="fi">FITS-asiakirja</comment>
<comment xml:lang="fo">FITS skjal</comment>
<comment xml:lang="fr">document FITS</comment>
+ <comment xml:lang="fur">document FITS</comment>
<comment xml:lang="ga">cáipéis FITS</comment>
<comment xml:lang="gl">documento FICT</comment>
<comment xml:lang="he">מסמך FITS</comment>
@@ -28192,7 +29168,7 @@
<comment xml:lang="oc">document FITS</comment>
<comment xml:lang="pl">Dokument FITS</comment>
<comment xml:lang="pt">documento FITS</comment>
- <comment xml:lang="pt_BR">Documento FITS</comment>
+ <comment xml:lang="pt-BR">Documento FITS</comment>
<comment xml:lang="ro">Document FITS</comment>
<comment xml:lang="ru">Документ FITS</comment>
<comment xml:lang="sk">Dokument FITS</comment>
@@ -28203,33 +29179,35 @@
<comment xml:lang="tr">FITS belgesi</comment>
<comment xml:lang="uk">документ FITS</comment>
<comment xml:lang="vi">Tài liệu FITS</comment>
- <comment xml:lang="zh_CN">FITS 文档</comment>
- <comment xml:lang="zh_TW">FITS 文件</comment>
+ <comment xml:lang="zh-CN">FITS 文档</comment>
+ <comment xml:lang="zh-TW">FITS 文件</comment>
<acronym>FITS</acronym>
<expanded-acronym>Flexible Image Transport System</expanded-acronym>
<magic priority="50">
- <match value="SIMPLE =" type="string" offset="0"/>
+ <match type="string" value="SIMPLE =" offset="0"/>
</magic>
<glob pattern="*.fits"/>
<alias type="image/x-fits"/>
</mime-type>
<mime-type type="image/x-fpx">
<comment>FPX image</comment>
+ <comment xml:lang="af">FPX-beeld</comment>
<comment xml:lang="ar">صورة FPX</comment>
- <comment xml:lang="be@latin">Vyjava FPX</comment>
+ <comment xml:lang="be-Latn">Vyjava FPX</comment>
<comment xml:lang="bg">Изображение — FPX</comment>
<comment xml:lang="ca">imatge FPX</comment>
<comment xml:lang="cs">obrázek FPX</comment>
<comment xml:lang="da">FPX-billede</comment>
<comment xml:lang="de">FPX-Bild</comment>
<comment xml:lang="el">Εικόνα FPX</comment>
- <comment xml:lang="en_GB">FPX image</comment>
+ <comment xml:lang="en-GB">FPX image</comment>
<comment xml:lang="eo">FPX-bildo</comment>
<comment xml:lang="es">imagen FPX</comment>
<comment xml:lang="eu">FPX irudia</comment>
<comment xml:lang="fi">FPX-kuva</comment>
<comment xml:lang="fo">FPX mynd</comment>
<comment xml:lang="fr">image FPX</comment>
+ <comment xml:lang="fur">imagjin FPX</comment>
<comment xml:lang="ga">íomhá FPX</comment>
<comment xml:lang="gl">imaxe FPX</comment>
<comment xml:lang="he">תמונת FPX</comment>
@@ -28250,7 +29228,7 @@
<comment xml:lang="oc">imatge FPX</comment>
<comment xml:lang="pl">Obraz FPX</comment>
<comment xml:lang="pt">imagem FPX</comment>
- <comment xml:lang="pt_BR">Imagem FPX</comment>
+ <comment xml:lang="pt-BR">Imagem FPX</comment>
<comment xml:lang="ro">Imagine FPX</comment>
<comment xml:lang="ru">Изображение FPX</comment>
<comment xml:lang="sk">Obrázok FPX</comment>
@@ -28261,35 +29239,37 @@
<comment xml:lang="tr">FPX görüntüsü</comment>
<comment xml:lang="uk">зображення FPX</comment>
<comment xml:lang="vi">Ảnh FPX</comment>
- <comment xml:lang="zh_CN">FPX 图像</comment>
- <comment xml:lang="zh_TW">FPX 影像</comment>
+ <comment xml:lang="zh-CN">FPX 图像</comment>
+ <comment xml:lang="zh-TW">FPX 影像</comment>
<acronym>FPX</acronym>
<expanded-acronym>FlashPiX</expanded-acronym>
<magic priority="50">
- <match value="0x46506978" type="big32" offset="0"/>
+ <match type="big32" value="0x46506978" offset="0"/>
</magic>
</mime-type>
<mime-type type="image/x-gzeps">
<comment>EPS image (gzip-compressed)</comment>
+ <comment xml:lang="af">EPS-beeld (gzip-saamgepers)</comment>
<comment xml:lang="ar">صورة EPS (مضغوط-gzip)</comment>
- <comment xml:lang="be@latin">Vyjava EPS (gzip-skampresavanaja)</comment>
+ <comment xml:lang="be-Latn">Vyjava EPS (gzip-skampresavanaja)</comment>
<comment xml:lang="bg">Изображение — EPS, компресирано с gzip</comment>
<comment xml:lang="ca">imatge EPS (amb compressió gzip)</comment>
<comment xml:lang="cs">obrázek EPS (komprimovaný pomocí gzip)</comment>
<comment xml:lang="da">EPS-billede (gzip-komprimeret)</comment>
<comment xml:lang="de">EPS-Bild (gzip-komprimiert)</comment>
<comment xml:lang="el">Εικόνα EPS (συμπιεσμένη gzip)</comment>
- <comment xml:lang="en_GB">EPS image (gzip-compressed)</comment>
+ <comment xml:lang="en-GB">EPS image (gzip-compressed)</comment>
<comment xml:lang="es">imagen EPS (comprimida con gzip)</comment>
<comment xml:lang="eu">EPS irudia (gzip-ekin konprimitua)</comment>
<comment xml:lang="fi">EPS-kuva (gzip-pakattu)</comment>
<comment xml:lang="fo">EPS mynd (gzip-stappað)</comment>
<comment xml:lang="fr">image EPS (compressée gzip)</comment>
+ <comment xml:lang="fur">imagjin EPS (comprimude cun gzip)</comment>
<comment xml:lang="ga">íomhá EPS (comhbhrúite le gzip)</comment>
<comment xml:lang="gl">imaxe EPS (comprimida con gzip)</comment>
<comment xml:lang="he">תמונת EPS (מכווץ ע״י gzip)</comment>
<comment xml:lang="hr">EPS slika (gzip sažeta)</comment>
- <comment xml:lang="hu">EPS kép (gzip-tömörítésű)</comment>
+ <comment xml:lang="hu">EPS kép (gzip tömörítésű)</comment>
<comment xml:lang="ia">Imagine EPS (comprimite con gzip)</comment>
<comment xml:lang="id">Citra EPS (terkompresi gzip)</comment>
<comment xml:lang="it">Immagine EPS (compressa con gzip)</comment>
@@ -28305,7 +29285,7 @@
<comment xml:lang="oc">imatge EPS (compressat gzip)</comment>
<comment xml:lang="pl">Obraz EPS (kompresja gzip)</comment>
<comment xml:lang="pt">imagem EPS (compressão gzip)</comment>
- <comment xml:lang="pt_BR">Imagem EPS (compactada com gzip)</comment>
+ <comment xml:lang="pt-BR">Imagem EPS (compactada com gzip)</comment>
<comment xml:lang="ro">Imagine EPS (compresie gzip)</comment>
<comment xml:lang="ru">Изображение EPS (сжатое gzip)</comment>
<comment xml:lang="sk">Obrázok EPS (komprimovaný pomocou gzip)</comment>
@@ -28316,8 +29296,8 @@
<comment xml:lang="tr">EPS görüntüsü (gzip ile sıkıştırılmış)</comment>
<comment xml:lang="uk">зображення EPS (стиснене gzip)</comment>
<comment xml:lang="vi">Ảnh EPS (đã nén gzip)</comment>
- <comment xml:lang="zh_CN">EPS 图像（gzip 压缩）</comment>
- <comment xml:lang="zh_TW">EPS 影像 (gzip 格式壓縮)</comment>
+ <comment xml:lang="zh-CN">EPS 图像（gzip 压缩）</comment>
+ <comment xml:lang="zh-TW">EPS 影像 (gzip 壓縮)</comment>
<sub-class-of type="application/gzip"/>
<glob pattern="*.eps.gz"/>
<glob pattern="*.epsi.gz"/>
@@ -28325,16 +29305,19 @@
</mime-type>
<mime-type type="image/vnd.microsoft.icon">
<comment>Windows icon</comment>
+ <comment xml:lang="af">Windows-ikoon</comment>
+ <comment xml:lang="bg">Икона — Windows</comment>
<comment xml:lang="ca">icona de Windows</comment>
<comment xml:lang="cs">ikona Windows</comment>
<comment xml:lang="da">Windows-ikon</comment>
<comment xml:lang="de">Windows-Symbol</comment>
<comment xml:lang="el">Εικονίδιο Windows</comment>
- <comment xml:lang="en_GB">Windows icon</comment>
+ <comment xml:lang="en-GB">Windows icon</comment>
<comment xml:lang="es">icono de Windows</comment>
<comment xml:lang="eu">Windows ikonoa</comment>
<comment xml:lang="fi">Windows-kuvake</comment>
<comment xml:lang="fr">icône Windows</comment>
+ <comment xml:lang="fur">icone Windows</comment>
<comment xml:lang="ga">deilbhín Windows</comment>
<comment xml:lang="he">סמל של Windows</comment>
<comment xml:lang="hr">Windows ikona</comment>
@@ -28343,11 +29326,11 @@
<comment xml:lang="id">Ikon Windows</comment>
<comment xml:lang="it">Icona Windows</comment>
<comment xml:lang="kk">Windows таңбашасы</comment>
- <comment xml:lang="ko">윈도우 아이콘</comment>
+ <comment xml:lang="ko">Windows 아이콘</comment>
<comment xml:lang="oc">icòna Windows</comment>
<comment xml:lang="pl">Ikona Windows</comment>
<comment xml:lang="pt">ícone Windows</comment>
- <comment xml:lang="pt_BR">Ícone do Windows</comment>
+ <comment xml:lang="pt-BR">Ícone do Windows</comment>
<comment xml:lang="ru">Значок Windows</comment>
<comment xml:lang="sk">Ikona Windows</comment>
<comment xml:lang="sl">Ikona Windows</comment>
@@ -28355,11 +29338,11 @@
<comment xml:lang="sv">Windows-ikon</comment>
<comment xml:lang="tr">Windows simgesi</comment>
<comment xml:lang="uk">піктограма Windows</comment>
- <comment xml:lang="zh_CN">Windows 图标</comment>
- <comment xml:lang="zh_TW">Windows 圖示</comment>
+ <comment xml:lang="zh-CN">Windows 图标</comment>
+ <comment xml:lang="zh-TW">Windows 圖示</comment>
<magic priority="50">
- <match value="\0\0\1\0" type="string" offset="0">
- <match value="\0" type="string" offset="5"/>
+ <match type="string" value="\0\0\1\0" offset="0">
+ <match type="string" value="\0" offset="5"/>
</match>
</magic>
<glob pattern="*.ico"/>
@@ -28372,21 +29355,23 @@
</mime-type>
<mime-type type="image/x-icns">
<comment>MacOS X icon</comment>
+ <comment xml:lang="af">MacOS X-ikoon</comment>
<comment xml:lang="ar">أيقونة MacOS X</comment>
- <comment xml:lang="be@latin">Ikona MacOS X</comment>
+ <comment xml:lang="be-Latn">Ikona MacOS X</comment>
<comment xml:lang="bg">Икона — MacOS X</comment>
<comment xml:lang="ca">icona MacOS X</comment>
<comment xml:lang="cs">ikona MacOS X</comment>
<comment xml:lang="da">MacOS X-ikon</comment>
<comment xml:lang="de">MacOS-X-Symbol</comment>
<comment xml:lang="el">Εικονίδιο MacOS X</comment>
- <comment xml:lang="en_GB">MacOS X icon</comment>
+ <comment xml:lang="en-GB">MacOS X icon</comment>
<comment xml:lang="eo">MacOS-X-piktogramo</comment>
<comment xml:lang="es">icono de OS X</comment>
<comment xml:lang="eu">MacOS X ikonoa</comment>
<comment xml:lang="fi">MacOS X -kuvake</comment>
<comment xml:lang="fo">MacOS X ímynd</comment>
<comment xml:lang="fr">icône MacOS X</comment>
+ <comment xml:lang="fur">icone MacOS X</comment>
<comment xml:lang="ga">deilbhín MacOS X</comment>
<comment xml:lang="gl">Icona de MacOS X</comment>
<comment xml:lang="he">סמל בתקן MacOS X</comment>
@@ -28407,7 +29392,7 @@
<comment xml:lang="oc">icòna MacOS X</comment>
<comment xml:lang="pl">Ikona Mac OS X</comment>
<comment xml:lang="pt">ćone MacOS X</comment>
- <comment xml:lang="pt_BR">Ícone do MacOS X</comment>
+ <comment xml:lang="pt-BR">Ícone do MacOS X</comment>
<comment xml:lang="ro">Iconiță MacOS X</comment>
<comment xml:lang="ru">Значок MacOS X</comment>
<comment xml:lang="sk">Ikona MacOS X</comment>
@@ -28418,18 +29403,19 @@
<comment xml:lang="tr">MacOS X simgesi</comment>
<comment xml:lang="uk">піктограма MacOS X</comment>
<comment xml:lang="vi">Biểu tượng MacOS X</comment>
- <comment xml:lang="zh_CN">MacOS X 图标</comment>
- <comment xml:lang="zh_TW">MacOS X 圖示</comment>
+ <comment xml:lang="zh-CN">MacOS X 图标</comment>
+ <comment xml:lang="zh-TW">MacOS X 圖示</comment>
<glob pattern="*.icns"/>
<magic priority="50">
- <match value="icns" type="string" offset="0"/>
+ <match type="string" value="icns" offset="0"/>
</magic>
</mime-type>
<mime-type type="image/x-ilbm">
<comment>ILBM image</comment>
+ <comment xml:lang="af">ILBM-beeld</comment>
<comment xml:lang="ar">صورة ILBM</comment>
<comment xml:lang="az">ILBM rəsmi</comment>
- <comment xml:lang="be@latin">Vyjava ILBM</comment>
+ <comment xml:lang="be-Latn">Vyjava ILBM</comment>
<comment xml:lang="bg">Изображение — ILBM</comment>
<comment xml:lang="ca">imatge ILBM</comment>
<comment xml:lang="cs">obrázek ILMB</comment>
@@ -28437,13 +29423,14 @@
<comment xml:lang="da">ILBM-billede</comment>
<comment xml:lang="de">ILBM-Bild</comment>
<comment xml:lang="el">Εικόνα ILBM</comment>
- <comment xml:lang="en_GB">ILBM image</comment>
+ <comment xml:lang="en-GB">ILBM image</comment>
<comment xml:lang="eo">ILBM-bildo</comment>
<comment xml:lang="es">imagen ILBM</comment>
<comment xml:lang="eu">ILBM irudia</comment>
<comment xml:lang="fi">ILBM-kuva</comment>
<comment xml:lang="fo">ILBM mynd</comment>
<comment xml:lang="fr">image ILBM</comment>
+ <comment xml:lang="fur">imagjin ILBM</comment>
<comment xml:lang="ga">íomhá ILBM</comment>
<comment xml:lang="gl">imaxe ILBM</comment>
<comment xml:lang="he">תמונת ILBM</comment>
@@ -28464,7 +29451,7 @@
<comment xml:lang="oc">imatge ILBM</comment>
<comment xml:lang="pl">Obraz ILBM</comment>
<comment xml:lang="pt">imagem ILBM</comment>
- <comment xml:lang="pt_BR">Imagem ILBM</comment>
+ <comment xml:lang="pt-BR">Imagem ILBM</comment>
<comment xml:lang="ro">Imagine ILBM</comment>
<comment xml:lang="ru">Изображение ILBM</comment>
<comment xml:lang="sk">Obrázok ILMB</comment>
@@ -28475,8 +29462,8 @@
<comment xml:lang="tr">ILBM görüntüsü</comment>
<comment xml:lang="uk">зображення ILBM</comment>
<comment xml:lang="vi">Ảnh ILBM</comment>
- <comment xml:lang="zh_CN">ILBM 图像</comment>
- <comment xml:lang="zh_TW">ILBM 影像</comment>
+ <comment xml:lang="zh-CN">ILBM 图像</comment>
+ <comment xml:lang="zh-TW">ILBM 影像</comment>
<acronym>ILBM</acronym>
<expanded-acronym>InterLeaved BitMap</expanded-acronym>
<sub-class-of type="application/x-iff"/>
@@ -28491,9 +29478,10 @@
</mime-type>
<mime-type type="image/x-jng">
<comment>JNG image</comment>
+ <comment xml:lang="af">JNG-beeld</comment>
<comment xml:lang="ar">صورة JNG</comment>
<comment xml:lang="az">JNG rəsmi</comment>
- <comment xml:lang="be@latin">Vyjava JNG</comment>
+ <comment xml:lang="be-Latn">Vyjava JNG</comment>
<comment xml:lang="bg">Изображение — JNG</comment>
<comment xml:lang="ca">imatge JNG</comment>
<comment xml:lang="cs">obrázek JNG</comment>
@@ -28501,13 +29489,14 @@
<comment xml:lang="da">JNG-billede</comment>
<comment xml:lang="de">JNG-Bild</comment>
<comment xml:lang="el">Εικόνα JNG</comment>
- <comment xml:lang="en_GB">JNG image</comment>
+ <comment xml:lang="en-GB">JNG image</comment>
<comment xml:lang="eo">JNG-bildo</comment>
<comment xml:lang="es">imagen JNG</comment>
<comment xml:lang="eu">JNG irudia</comment>
<comment xml:lang="fi">JNG-kuva</comment>
<comment xml:lang="fo">JNG mynd</comment>
<comment xml:lang="fr">image JNG</comment>
+ <comment xml:lang="fur">imagjin JNG</comment>
<comment xml:lang="ga">íomhá JNG</comment>
<comment xml:lang="gl">imaxe JNG</comment>
<comment xml:lang="he">תמונת JNG</comment>
@@ -28528,7 +29517,7 @@
<comment xml:lang="oc">imatge JNG</comment>
<comment xml:lang="pl">Obraz JNG</comment>
<comment xml:lang="pt">imagem JNG</comment>
- <comment xml:lang="pt_BR">Imagem JNG</comment>
+ <comment xml:lang="pt-BR">Imagem JNG</comment>
<comment xml:lang="ro">Imagine JNG</comment>
<comment xml:lang="ru">Изображение JNG</comment>
<comment xml:lang="sk">Obrázok JNG</comment>
@@ -28539,17 +29528,18 @@
<comment xml:lang="tr">JNG görüntüsü</comment>
<comment xml:lang="uk">зображення JNG</comment>
<comment xml:lang="vi">Ảnh JNG</comment>
- <comment xml:lang="zh_CN">JNG 图像</comment>
- <comment xml:lang="zh_TW">JNG 影像</comment>
+ <comment xml:lang="zh-CN">JNG 图像</comment>
+ <comment xml:lang="zh-TW">JNG 影像</comment>
<acronym>JNG</acronym>
<expanded-acronym>JPEG Network Graphics</expanded-acronym>
<glob pattern="*.jng"/>
</mime-type>
<mime-type type="image/x-lwo">
<comment>LightWave object</comment>
+ <comment xml:lang="af">LightWave-objek</comment>
<comment xml:lang="ar">كائن LightWave</comment>
<comment xml:lang="az">LightWave cismi</comment>
- <comment xml:lang="be@latin">Abjekt LightWave</comment>
+ <comment xml:lang="be-Latn">Abjekt LightWave</comment>
<comment xml:lang="bg">Обект — LightWave</comment>
<comment xml:lang="ca">objecte de LightWave</comment>
<comment xml:lang="cs">objekt LightWave</comment>
@@ -28557,13 +29547,14 @@
<comment xml:lang="da">LightWave-objekt</comment>
<comment xml:lang="de">LightWave-Objekt</comment>
<comment xml:lang="el">Αντικείμενο LightWave</comment>
- <comment xml:lang="en_GB">LightWave object</comment>
+ <comment xml:lang="en-GB">LightWave object</comment>
<comment xml:lang="eo">LightWave-objekto</comment>
<comment xml:lang="es">objeto de LightWave</comment>
<comment xml:lang="eu">LightWave objektua</comment>
<comment xml:lang="fi">LightWave-esine</comment>
<comment xml:lang="fo">LightWave lutur</comment>
<comment xml:lang="fr">objet LightWave</comment>
+ <comment xml:lang="fur">ogjet LightWave</comment>
<comment xml:lang="ga">réad LightWave</comment>
<comment xml:lang="gl">obxecto de LightWave</comment>
<comment xml:lang="he">עצם LightWave</comment>
@@ -28584,7 +29575,7 @@
<comment xml:lang="oc">objècte LightWave</comment>
<comment xml:lang="pl">Obiekt LightWave</comment>
<comment xml:lang="pt">Objecto LightWave</comment>
- <comment xml:lang="pt_BR">Objeto LightWave</comment>
+ <comment xml:lang="pt-BR">Objeto LightWave</comment>
<comment xml:lang="ro">Obiect LightWave</comment>
<comment xml:lang="ru">Объект LightWave</comment>
<comment xml:lang="sk">Objekt LightWave</comment>
@@ -28595,16 +29586,17 @@
<comment xml:lang="tr">LightWave nesnesi</comment>
<comment xml:lang="uk">об'єкт LightWave</comment>
<comment xml:lang="vi">Đối tượng LightWave</comment>
- <comment xml:lang="zh_CN">LightWave 对象</comment>
- <comment xml:lang="zh_TW">LightWave 物件</comment>
+ <comment xml:lang="zh-CN">LightWave 对象</comment>
+ <comment xml:lang="zh-TW">LightWave 物件</comment>
<glob pattern="*.lwo"/>
<glob pattern="*.lwob"/>
</mime-type>
<mime-type type="image/x-lws">
<comment>LightWave scene</comment>
+ <comment xml:lang="af">LightWave-toneel</comment>
<comment xml:lang="ar">مشهد LightWave</comment>
<comment xml:lang="az">LightWave səhnəsi</comment>
- <comment xml:lang="be@latin">Scena LightWave</comment>
+ <comment xml:lang="be-Latn">Scena LightWave</comment>
<comment xml:lang="bg">Сцена — LightWave</comment>
<comment xml:lang="ca">escena de LightWave</comment>
<comment xml:lang="cs">scéna LightWave</comment>
@@ -28612,13 +29604,14 @@
<comment xml:lang="da">LightWave-scene</comment>
<comment xml:lang="de">LightWave-Szene</comment>
<comment xml:lang="el">Σκηνή LightWave</comment>
- <comment xml:lang="en_GB">LightWave scene</comment>
+ <comment xml:lang="en-GB">LightWave scene</comment>
<comment xml:lang="eo">LightWave-sceno</comment>
<comment xml:lang="es">escena de LightWave</comment>
<comment xml:lang="eu">LightWave eszena</comment>
<comment xml:lang="fi">LightWave-maisema</comment>
<comment xml:lang="fo">LightWave leikmynd</comment>
<comment xml:lang="fr">scène LightWave</comment>
+ <comment xml:lang="fur">sene LightWave</comment>
<comment xml:lang="ga">radharc LightWave</comment>
<comment xml:lang="gl">escena de LightWave</comment>
<comment xml:lang="he">סצנה של LightWave</comment>
@@ -28639,7 +29632,7 @@
<comment xml:lang="oc">scèna LightWave</comment>
<comment xml:lang="pl">Scena Lightwave</comment>
<comment xml:lang="pt">cenário LightWave</comment>
- <comment xml:lang="pt_BR">Cena LightWave</comment>
+ <comment xml:lang="pt-BR">Cena LightWave</comment>
<comment xml:lang="ro">Scenă LightWave</comment>
<comment xml:lang="ru">Сцена LightWave</comment>
<comment xml:lang="sk">Scéna LightWave</comment>
@@ -28650,26 +29643,28 @@
<comment xml:lang="tr">LightWave sahnesi</comment>
<comment xml:lang="uk">сцена LightWave</comment>
<comment xml:lang="vi">Cảnh LightWave</comment>
- <comment xml:lang="zh_CN">LightWave 场景</comment>
- <comment xml:lang="zh_TW">LightWave 場景</comment>
+ <comment xml:lang="zh-CN">LightWave 场景</comment>
+ <comment xml:lang="zh-TW">LightWave 場景</comment>
<glob pattern="*.lws"/>
</mime-type>
<mime-type type="image/x-macpaint">
<comment>MacPaint Bitmap image</comment>
+ <comment xml:lang="af">MacPaint-roosterbeeld</comment>
<comment xml:lang="ar">صورة MacPaint Bitmap</comment>
- <comment xml:lang="be@latin">Bitmapnaja vyjava MacPaint</comment>
+ <comment xml:lang="be-Latn">Bitmapnaja vyjava MacPaint</comment>
<comment xml:lang="bg">Изображение — MacPaint Bitmap</comment>
<comment xml:lang="ca">imatge de mapa de bits MacPaint</comment>
<comment xml:lang="cs">obrázek MacPaint Bitmap</comment>
<comment xml:lang="da">MacPaint BitMap-billede</comment>
<comment xml:lang="de">MacPaint-Bitmap-Datei</comment>
<comment xml:lang="el">Εικόνα Bitmap MacPaint</comment>
- <comment xml:lang="en_GB">MacPaint Bitmap image</comment>
+ <comment xml:lang="en-GB">MacPaint Bitmap image</comment>
<comment xml:lang="es">imagen de mapa de bits de MacPaint</comment>
<comment xml:lang="eu">MacPaint Bitmap irudia</comment>
<comment xml:lang="fi">MacPaint-bittikartta</comment>
<comment xml:lang="fo">MacPaint Bitmap mynd</comment>
<comment xml:lang="fr">image matricielle MacPaint</comment>
+ <comment xml:lang="fur">imagjin bitmap MacPaint</comment>
<comment xml:lang="ga">íomhá ghiotánmhapach MacPaint</comment>
<comment xml:lang="gl">imaxe de mapa de bits MacPaint</comment>
<comment xml:lang="he">תמונת מפת-סיביות של MacPaint</comment>
@@ -28689,7 +29684,7 @@
<comment xml:lang="oc">imatge matricial MacPaint</comment>
<comment xml:lang="pl">Obraz bitmapowy MacPaint</comment>
<comment xml:lang="pt">imagem MacPaint Bitmap</comment>
- <comment xml:lang="pt_BR">Imagem de bitmap do MacPaint</comment>
+ <comment xml:lang="pt-BR">Imagem de bitmap do MacPaint</comment>
<comment xml:lang="ro">Imagine MacPaint Bitmap</comment>
<comment xml:lang="ru">Растровое изображение MacPaint</comment>
<comment xml:lang="sk">Obrázok MacPaint Bitmap</comment>
@@ -28700,26 +29695,28 @@
<comment xml:lang="tr">MacPaint bit eşlem görüntüsü</comment>
<comment xml:lang="uk">растрове зображення MacPaint</comment>
<comment xml:lang="vi">Ảnh mảng MacPaint</comment>
- <comment xml:lang="zh_CN">MacPaint 位图</comment>
- <comment xml:lang="zh_TW">MacPaint 點陣影像</comment>
+ <comment xml:lang="zh-CN">MacPaint 位图</comment>
+ <comment xml:lang="zh-TW">MacPaint 點陣影像</comment>
<glob pattern="*.pntg"/>
</mime-type>
<mime-type type="image/x-msod">
<comment>Office drawing</comment>
+ <comment xml:lang="af">Office-tekening</comment>
<comment xml:lang="ar">تصميم أوفيس</comment>
- <comment xml:lang="be@latin">Ofisny rysunak</comment>
+ <comment xml:lang="be-Latn">Ofisny rysunak</comment>
<comment xml:lang="bg">Чертеж — Office</comment>
<comment xml:lang="ca">dibuix d'Office</comment>
<comment xml:lang="cs">kresba Office</comment>
<comment xml:lang="da">Officetegning</comment>
<comment xml:lang="de">Office-Zeichnung</comment>
<comment xml:lang="el">Σχέδιο Office</comment>
- <comment xml:lang="en_GB">Office drawing</comment>
+ <comment xml:lang="en-GB">Office drawing</comment>
<comment xml:lang="es">dibujo de Office</comment>
<comment xml:lang="eu">Office marrazkia</comment>
<comment xml:lang="fi">Office-piirros</comment>
<comment xml:lang="fo">Office tekning</comment>
<comment xml:lang="fr">dessin Office</comment>
+ <comment xml:lang="fur">dissen di Office</comment>
<comment xml:lang="ga">líníocht Office</comment>
<comment xml:lang="gl">debuxo de Office</comment>
<comment xml:lang="he">ציור של Office</comment>
@@ -28739,7 +29736,7 @@
<comment xml:lang="oc">dessenh Office</comment>
<comment xml:lang="pl">Rysunek Office</comment>
<comment xml:lang="pt">desenho Office</comment>
- <comment xml:lang="pt_BR">Desenho do Office</comment>
+ <comment xml:lang="pt-BR">Desenho do Office</comment>
<comment xml:lang="ro">Desen Office</comment>
<comment xml:lang="ru">Рисунок Office</comment>
<comment xml:lang="sk">Kresba Office</comment>
@@ -28750,27 +29747,29 @@
<comment xml:lang="tr">Ofis çizimi</comment>
<comment xml:lang="uk">малюнок Office</comment>
<comment xml:lang="vi">Bản vẽ Office</comment>
- <comment xml:lang="zh_CN">Office 绘图</comment>
- <comment xml:lang="zh_TW">Office 繪圖</comment>
+ <comment xml:lang="zh-CN">Office 绘图</comment>
+ <comment xml:lang="zh-TW">Office 繪圖</comment>
<glob pattern="*.msod"/>
</mime-type>
<mime-type type="image/x-niff">
<comment>NIFF image</comment>
+ <comment xml:lang="af">NIFF-beeld</comment>
<comment xml:lang="ar">صورة NIFF</comment>
- <comment xml:lang="be@latin">Vyjava NIFF</comment>
+ <comment xml:lang="be-Latn">Vyjava NIFF</comment>
<comment xml:lang="bg">Изображение — NIFF</comment>
<comment xml:lang="ca">imatge NIFF</comment>
<comment xml:lang="cs">obrázek NIFF</comment>
<comment xml:lang="da">NIFF-billede</comment>
<comment xml:lang="de">NIFF-Bild</comment>
<comment xml:lang="el">Εικόνα NIFF</comment>
- <comment xml:lang="en_GB">NIFF image</comment>
+ <comment xml:lang="en-GB">NIFF image</comment>
<comment xml:lang="eo">NIFF-bildo</comment>
<comment xml:lang="es">imagen NIFF</comment>
<comment xml:lang="eu">NIFF irudia</comment>
<comment xml:lang="fi">NIFF-kuva</comment>
<comment xml:lang="fo">NIFF mynd</comment>
<comment xml:lang="fr">image NIFF</comment>
+ <comment xml:lang="fur">imagjin NIFF</comment>
<comment xml:lang="ga">íomhá NIFF</comment>
<comment xml:lang="gl">imaxe NIFF</comment>
<comment xml:lang="he">תמונת NIFF</comment>
@@ -28790,7 +29789,7 @@
<comment xml:lang="oc">imatge NIFF</comment>
<comment xml:lang="pl">Obraz NIFF</comment>
<comment xml:lang="pt">imagem NIFF</comment>
- <comment xml:lang="pt_BR">Imagem NIFF</comment>
+ <comment xml:lang="pt-BR">Imagem NIFF</comment>
<comment xml:lang="ro">Imagine NIF</comment>
<comment xml:lang="ru">Изображение NIFF</comment>
<comment xml:lang="sk">Obrázok NIFF</comment>
@@ -28801,29 +29800,31 @@
<comment xml:lang="tr">NIFF görüntüsü</comment>
<comment xml:lang="uk">зображення NIFF</comment>
<comment xml:lang="vi">Ảnh NIFF</comment>
- <comment xml:lang="zh_CN">NIFF 图像</comment>
- <comment xml:lang="zh_TW">NIFF 影像</comment>
+ <comment xml:lang="zh-CN">NIFF 图像</comment>
+ <comment xml:lang="zh-TW">NIFF 影像</comment>
<magic priority="80">
- <match value="IIN1" type="string" offset="0"/>
+ <match type="string" value="IIN1" offset="0"/>
</magic>
</mime-type>
<mime-type type="image/vnd.zbrush.pcx">
<comment>PCX image</comment>
+ <comment xml:lang="af">PCX-beeld</comment>
<comment xml:lang="ar">صورة PCX</comment>
- <comment xml:lang="be@latin">Vyjava PCX</comment>
+ <comment xml:lang="be-Latn">Vyjava PCX</comment>
<comment xml:lang="bg">Изображение — PCX</comment>
<comment xml:lang="ca">imatge PCX</comment>
<comment xml:lang="cs">obrázek PCX</comment>
<comment xml:lang="da">PCX-billede</comment>
<comment xml:lang="de">PCX-Bild</comment>
<comment xml:lang="el">Εικόνα PCX</comment>
- <comment xml:lang="en_GB">PCX image</comment>
+ <comment xml:lang="en-GB">PCX image</comment>
<comment xml:lang="eo">PCX-bildo</comment>
<comment xml:lang="es">imagen PCX</comment>
<comment xml:lang="eu">PCX irudia</comment>
<comment xml:lang="fi">PCX-kuva</comment>
<comment xml:lang="fo">PCX mynd</comment>
<comment xml:lang="fr">image PCX</comment>
+ <comment xml:lang="fur">imagjin PCX</comment>
<comment xml:lang="ga">íomhá PCX</comment>
<comment xml:lang="gl">imaxe PCX</comment>
<comment xml:lang="he">תמונת PCX</comment>
@@ -28843,7 +29844,7 @@
<comment xml:lang="oc">imatge PCX</comment>
<comment xml:lang="pl">Obraz PCX</comment>
<comment xml:lang="pt">imagem PCX</comment>
- <comment xml:lang="pt_BR">Imagem PCX</comment>
+ <comment xml:lang="pt-BR">Imagem PCX</comment>
<comment xml:lang="ro">Imagine PCX</comment>
<comment xml:lang="ru">Изображение PCX</comment>
<comment xml:lang="sk">Obrázok PCX</comment>
@@ -28854,16 +29855,16 @@
<comment xml:lang="tr">PCX görüntüsü</comment>
<comment xml:lang="uk">зображення PCX</comment>
<comment xml:lang="vi">Ảnh PCX</comment>
- <comment xml:lang="zh_CN">PCX 图像</comment>
- <comment xml:lang="zh_TW">PCX 影像</comment>
+ <comment xml:lang="zh-CN">PCX 图像</comment>
+ <comment xml:lang="zh-TW">PCX 影像</comment>
<acronym>PCX</acronym>
<expanded-acronym>PiCture eXchange</expanded-acronym>
<magic priority="50">
- <match value="10" type="byte" offset="0">
- <match value="0" type="byte" offset="1"/>
- <match value="2" type="byte" offset="1"/>
- <match value="3" type="byte" offset="1"/>
- <match value="5" type="byte" offset="1"/>
+ <match type="byte" value="10" offset="0">
+ <match type="byte" value="0" offset="1"/>
+ <match type="byte" value="2" offset="1"/>
+ <match type="byte" value="3" offset="1"/>
+ <match type="byte" value="5" offset="1"/>
</match>
</magic>
<glob pattern="*.pcx"/>
@@ -28871,21 +29872,23 @@
</mime-type>
<mime-type type="image/x-photo-cd">
<comment>PCD image</comment>
+ <comment xml:lang="af">PCD-beeld</comment>
<comment xml:lang="ar">صورة PCD</comment>
- <comment xml:lang="be@latin">Vyjava PCD</comment>
+ <comment xml:lang="be-Latn">Vyjava PCD</comment>
<comment xml:lang="bg">Изображение — PCD</comment>
<comment xml:lang="ca">imatge PCD</comment>
<comment xml:lang="cs">obrázek PCD</comment>
<comment xml:lang="da">PCD-billede</comment>
<comment xml:lang="de">PCD-Bild</comment>
<comment xml:lang="el">Εικόνα PCD</comment>
- <comment xml:lang="en_GB">PCD image</comment>
+ <comment xml:lang="en-GB">PCD image</comment>
<comment xml:lang="eo">PCD-bildo</comment>
<comment xml:lang="es">imagen PCD</comment>
<comment xml:lang="eu">PCD irudia</comment>
<comment xml:lang="fi">PCD-kuva</comment>
<comment xml:lang="fo">PCD mynd</comment>
<comment xml:lang="fr">image PCD</comment>
+ <comment xml:lang="fur">imagjin PCD</comment>
<comment xml:lang="ga">íomhá PCD</comment>
<comment xml:lang="gl">imaxe PCD</comment>
<comment xml:lang="he">תמונת PCD</comment>
@@ -28906,7 +29909,7 @@
<comment xml:lang="oc">imatge PCD</comment>
<comment xml:lang="pl">Obraz PCD</comment>
<comment xml:lang="pt">imagem PCD</comment>
- <comment xml:lang="pt_BR">Imagem PCD</comment>
+ <comment xml:lang="pt-BR">Imagem PCD</comment>
<comment xml:lang="ro">Imagine PCD</comment>
<comment xml:lang="ru">Изображение PCD</comment>
<comment xml:lang="sk">Obrázok PCD</comment>
@@ -28917,17 +29920,18 @@
<comment xml:lang="tr">PCD görüntüsü</comment>
<comment xml:lang="uk">зображення PCD</comment>
<comment xml:lang="vi">Ảnh PCD</comment>
- <comment xml:lang="zh_CN">PCD 图像</comment>
- <comment xml:lang="zh_TW">PCD 影像</comment>
+ <comment xml:lang="zh-CN">PCD 图像</comment>
+ <comment xml:lang="zh-TW">PCD 影像</comment>
<acronym>PCD</acronym>
<expanded-acronym>PhotoCD</expanded-acronym>
<glob pattern="*.pcd"/>
</mime-type>
<mime-type type="image/x-portable-anymap">
<comment>PNM image</comment>
+ <comment xml:lang="af">PNM-beeld</comment>
<comment xml:lang="ar">صورة PNM</comment>
<comment xml:lang="az">PNM rəsmi</comment>
- <comment xml:lang="be@latin">Vyjava PNM</comment>
+ <comment xml:lang="be-Latn">Vyjava PNM</comment>
<comment xml:lang="bg">Изображение — PNM</comment>
<comment xml:lang="ca">imatge PNM</comment>
<comment xml:lang="cs">obrázek PNM</comment>
@@ -28935,13 +29939,14 @@
<comment xml:lang="da">PNM-billede</comment>
<comment xml:lang="de">PNM-Bild</comment>
<comment xml:lang="el">Εικόνα PNM</comment>
- <comment xml:lang="en_GB">PNM image</comment>
+ <comment xml:lang="en-GB">PNM image</comment>
<comment xml:lang="eo">PNM-bildo</comment>
<comment xml:lang="es">imagen PNM</comment>
<comment xml:lang="eu">PNM irudia</comment>
<comment xml:lang="fi">PNM-kuva</comment>
<comment xml:lang="fo">PNM mynd</comment>
<comment xml:lang="fr">image PNM</comment>
+ <comment xml:lang="fur">imagjin PNM</comment>
<comment xml:lang="ga">íomhá PNM</comment>
<comment xml:lang="gl">imaxe PNM</comment>
<comment xml:lang="he">תמונת PNM</comment>
@@ -28962,7 +29967,7 @@
<comment xml:lang="oc">imatge PNM</comment>
<comment xml:lang="pl">Obraz PNM</comment>
<comment xml:lang="pt">imagem PNM</comment>
- <comment xml:lang="pt_BR">Imagem PNM</comment>
+ <comment xml:lang="pt-BR">Imagem PNM</comment>
<comment xml:lang="ro">Imagine PNM</comment>
<comment xml:lang="ru">Изображение PNM</comment>
<comment xml:lang="sk">Obrázok PNM</comment>
@@ -28973,14 +29978,15 @@
<comment xml:lang="tr">PNM görüntüsü</comment>
<comment xml:lang="uk">зображення PNM</comment>
<comment xml:lang="vi">Ảnh PNM</comment>
- <comment xml:lang="zh_CN">PNM 图像</comment>
- <comment xml:lang="zh_TW">PNM 影像</comment>
+ <comment xml:lang="zh-CN">PNM 图像</comment>
+ <comment xml:lang="zh-TW">PNM 影像</comment>
<glob pattern="*.pnm"/>
</mime-type>
<mime-type type="image/x-portable-bitmap">
<comment>PBM image</comment>
+ <comment xml:lang="af">PBM-beeld</comment>
<comment xml:lang="ar">صورة PBM</comment>
- <comment xml:lang="be@latin">Vyjava PBM</comment>
+ <comment xml:lang="be-Latn">Vyjava PBM</comment>
<comment xml:lang="bg">Изображение — PBM</comment>
<comment xml:lang="ca">imatge PBM</comment>
<comment xml:lang="cs">obrázek PBM</comment>
@@ -28988,13 +29994,14 @@
<comment xml:lang="da">PBM-billede</comment>
<comment xml:lang="de">PBM-Bild</comment>
<comment xml:lang="el">Εικόνα PBM</comment>
- <comment xml:lang="en_GB">PBM image</comment>
+ <comment xml:lang="en-GB">PBM image</comment>
<comment xml:lang="eo">PBM-bildo</comment>
<comment xml:lang="es">imagen PBM</comment>
<comment xml:lang="eu">PBM irudia</comment>
<comment xml:lang="fi">PBM-kuva</comment>
<comment xml:lang="fo">PBM mynd</comment>
<comment xml:lang="fr">image PBM</comment>
+ <comment xml:lang="fur">imagjin PBM</comment>
<comment xml:lang="ga">íomhá PBM</comment>
<comment xml:lang="gl">imaxe PBM</comment>
<comment xml:lang="he">תמונת PBM</comment>
@@ -29015,7 +30022,7 @@
<comment xml:lang="oc">imatge PBM</comment>
<comment xml:lang="pl">Obraz PBM</comment>
<comment xml:lang="pt">imagem PBM</comment>
- <comment xml:lang="pt_BR">Imagem PBM</comment>
+ <comment xml:lang="pt-BR">Imagem PBM</comment>
<comment xml:lang="ro">Imagine PBM</comment>
<comment xml:lang="ru">Изображение PBM</comment>
<comment xml:lang="sk">Obrázok PBM</comment>
@@ -29026,31 +30033,32 @@
<comment xml:lang="tr">PBM görüntüsü</comment>
<comment xml:lang="uk">зображення PBM</comment>
<comment xml:lang="vi">Ảnh PBM</comment>
- <comment xml:lang="zh_CN">PBM 图像</comment>
- <comment xml:lang="zh_TW">PBM 影像</comment>
+ <comment xml:lang="zh-CN">PBM 图像</comment>
+ <comment xml:lang="zh-TW">PBM 影像</comment>
<acronym>PBM</acronym>
<expanded-acronym>Portable BitMap</expanded-acronym>
<sub-class-of type="image/x-portable-anymap"/>
<magic priority="50">
- <match value="P1" type="string" offset="0">
- <match value="0x0a" type="byte" offset="2"/>
- <match value="0x20" type="byte" offset="2"/>
- <match value="0x09" type="byte" offset="2"/>
- <match value="0x0d" type="byte" offset="2"/>
+ <match type="string" value="P1" offset="0">
+ <match type="byte" value="0x0a" offset="2"/>
+ <match type="byte" value="0x20" offset="2"/>
+ <match type="byte" value="0x09" offset="2"/>
+ <match type="byte" value="0x0d" offset="2"/>
</match>
- <match value="P4" type="string" offset="0">
- <match value="0x0a" type="byte" offset="2"/>
- <match value="0x20" type="byte" offset="2"/>
- <match value="0x09" type="byte" offset="2"/>
- <match value="0x0d" type="byte" offset="2"/>
+ <match type="string" value="P4" offset="0">
+ <match type="byte" value="0x0a" offset="2"/>
+ <match type="byte" value="0x20" offset="2"/>
+ <match type="byte" value="0x09" offset="2"/>
+ <match type="byte" value="0x0d" offset="2"/>
</match>
</magic>
<glob pattern="*.pbm"/>
</mime-type>
<mime-type type="image/x-portable-graymap">
<comment>PGM image</comment>
+ <comment xml:lang="af">PGM-beeld</comment>
<comment xml:lang="ar">صورة PGM</comment>
- <comment xml:lang="be@latin">Vyjava PGM</comment>
+ <comment xml:lang="be-Latn">Vyjava PGM</comment>
<comment xml:lang="bg">Изображение — PGM</comment>
<comment xml:lang="ca">imatge PGM</comment>
<comment xml:lang="cs">obrázek PGM</comment>
@@ -29058,13 +30066,14 @@
<comment xml:lang="da">PGM-billede</comment>
<comment xml:lang="de">PGM-Bild</comment>
<comment xml:lang="el">Εικόνα PGM</comment>
- <comment xml:lang="en_GB">PGM image</comment>
+ <comment xml:lang="en-GB">PGM image</comment>
<comment xml:lang="eo">PGM-bildo</comment>
<comment xml:lang="es">imagen PGM</comment>
<comment xml:lang="eu">PGM irudia</comment>
<comment xml:lang="fi">PGM-kuva</comment>
<comment xml:lang="fo">PGM mynd</comment>
<comment xml:lang="fr">image PGM</comment>
+ <comment xml:lang="fur">imagjin PGM</comment>
<comment xml:lang="ga">íomhá PGM</comment>
<comment xml:lang="gl">imaxe PGM</comment>
<comment xml:lang="he">תמונת PGM</comment>
@@ -29084,7 +30093,7 @@
<comment xml:lang="oc">imatge PGM</comment>
<comment xml:lang="pl">Obraz PGM</comment>
<comment xml:lang="pt">imagem PGM</comment>
- <comment xml:lang="pt_BR">Imagem PGM</comment>
+ <comment xml:lang="pt-BR">Imagem PGM</comment>
<comment xml:lang="ro">Imagine PGM</comment>
<comment xml:lang="ru">Изображение PGM</comment>
<comment xml:lang="sk">Obrázok PGM</comment>
@@ -29095,31 +30104,32 @@
<comment xml:lang="tr">PGM görüntüsü</comment>
<comment xml:lang="uk">зображення PGM</comment>
<comment xml:lang="vi">Ảnh PGM</comment>
- <comment xml:lang="zh_CN">PGM 图像</comment>
- <comment xml:lang="zh_TW">PGM 影像</comment>
+ <comment xml:lang="zh-CN">PGM 图像</comment>
+ <comment xml:lang="zh-TW">PGM 影像</comment>
<acronym>PGM</acronym>
<expanded-acronym>Portable GrayMap</expanded-acronym>
<sub-class-of type="image/x-portable-anymap"/>
<magic priority="50">
- <match value="P2" type="string" offset="0">
- <match value="0x0a" type="byte" offset="2"/>
- <match value="0x20" type="byte" offset="2"/>
- <match value="0x09" type="byte" offset="2"/>
- <match value="0x0d" type="byte" offset="2"/>
+ <match type="string" value="P2" offset="0">
+ <match type="byte" value="0x0a" offset="2"/>
+ <match type="byte" value="0x20" offset="2"/>
+ <match type="byte" value="0x09" offset="2"/>
+ <match type="byte" value="0x0d" offset="2"/>
</match>
- <match value="P5" type="string" offset="0">
- <match value="0x0a" type="byte" offset="2"/>
- <match value="0x20" type="byte" offset="2"/>
- <match value="0x09" type="byte" offset="2"/>
- <match value="0x0d" type="byte" offset="2"/>
+ <match type="string" value="P5" offset="0">
+ <match type="byte" value="0x0a" offset="2"/>
+ <match type="byte" value="0x20" offset="2"/>
+ <match type="byte" value="0x09" offset="2"/>
+ <match type="byte" value="0x0d" offset="2"/>
</match>
</magic>
<glob pattern="*.pgm"/>
</mime-type>
<mime-type type="image/x-portable-pixmap">
<comment>PPM image</comment>
+ <comment xml:lang="af">PPM-beeld</comment>
<comment xml:lang="ar">صورة PPM</comment>
- <comment xml:lang="be@latin">Vyjava PPM</comment>
+ <comment xml:lang="be-Latn">Vyjava PPM</comment>
<comment xml:lang="bg">Изображение — PPM</comment>
<comment xml:lang="ca">imatge PPM</comment>
<comment xml:lang="cs">obrázek PPM</comment>
@@ -29127,13 +30137,14 @@
<comment xml:lang="da">PPM-billede</comment>
<comment xml:lang="de">PPM-Bild</comment>
<comment xml:lang="el">Εικόνα PPM</comment>
- <comment xml:lang="en_GB">PPM image</comment>
+ <comment xml:lang="en-GB">PPM image</comment>
<comment xml:lang="eo">PPM-bildo</comment>
<comment xml:lang="es">imagen PPM</comment>
<comment xml:lang="eu">PPM irudia</comment>
<comment xml:lang="fi">PPM-kuva</comment>
<comment xml:lang="fo">PPM mynd</comment>
<comment xml:lang="fr">image PPM</comment>
+ <comment xml:lang="fur">imagjin PPM</comment>
<comment xml:lang="ga">íomhá PPM</comment>
<comment xml:lang="gl">imaxe PPM</comment>
<comment xml:lang="he">תמונת PPM</comment>
@@ -29153,7 +30164,7 @@
<comment xml:lang="oc">imatge PPM</comment>
<comment xml:lang="pl">Obraz PPM</comment>
<comment xml:lang="pt">imagem PPM</comment>
- <comment xml:lang="pt_BR">Imagem PPM</comment>
+ <comment xml:lang="pt-BR">Imagem PPM</comment>
<comment xml:lang="ro">Imagine PPM</comment>
<comment xml:lang="ru">Изображение PPM</comment>
<comment xml:lang="sk">Obrázok PPM</comment>
@@ -29164,29 +30175,30 @@
<comment xml:lang="tr">PPM görüntüsü</comment>
<comment xml:lang="uk">зображення PPM</comment>
<comment xml:lang="vi">Ảnh PPM</comment>
- <comment xml:lang="zh_CN">PPM 图像</comment>
- <comment xml:lang="zh_TW">PPM 影像</comment>
+ <comment xml:lang="zh-CN">PPM 图像</comment>
+ <comment xml:lang="zh-TW">PPM 影像</comment>
<acronym>PPM</acronym>
<expanded-acronym>Portable PixMap</expanded-acronym>
<sub-class-of type="image/x-portable-anymap"/>
<magic priority="50">
- <match value="P3" type="string" offset="0">
- <match value="0x0a" type="byte" offset="2"/>
- <match value="0x20" type="byte" offset="2"/>
- <match value="0x09" type="byte" offset="2"/>
- <match value="0x0d" type="byte" offset="2"/>
+ <match type="string" value="P3" offset="0">
+ <match type="byte" value="0x0a" offset="2"/>
+ <match type="byte" value="0x20" offset="2"/>
+ <match type="byte" value="0x09" offset="2"/>
+ <match type="byte" value="0x0d" offset="2"/>
</match>
- <match value="P6" type="string" offset="0">
- <match value="0x0a" type="byte" offset="2"/>
- <match value="0x20" type="byte" offset="2"/>
- <match value="0x09" type="byte" offset="2"/>
- <match value="0x0d" type="byte" offset="2"/>
+ <match type="string" value="P6" offset="0">
+ <match type="byte" value="0x0a" offset="2"/>
+ <match type="byte" value="0x20" offset="2"/>
+ <match type="byte" value="0x09" offset="2"/>
+ <match type="byte" value="0x0d" offset="2"/>
</match>
</magic>
<glob pattern="*.ppm"/>
</mime-type>
<mime-type type="image/vnd.adobe.photoshop">
<comment>Photoshop image</comment>
+ <comment xml:lang="af">Photoshop-beeld</comment>
<comment xml:lang="ar">صورة فوتوشوب</comment>
<comment xml:lang="bg">Изображение — Photoshop</comment>
<comment xml:lang="ca">imatge de Photoshop</comment>
@@ -29194,13 +30206,14 @@
<comment xml:lang="da">Photoshop-billede</comment>
<comment xml:lang="de">Photoshop-Bild</comment>
<comment xml:lang="el">Εικόνα Photoshop</comment>
- <comment xml:lang="en_GB">Photoshop image</comment>
+ <comment xml:lang="en-GB">Photoshop image</comment>
<comment xml:lang="eo">Photoshop-bildo</comment>
<comment xml:lang="es">imagen de Photoshop</comment>
<comment xml:lang="eu">Photoshop irudia</comment>
<comment xml:lang="fi">Photoshop-kuva</comment>
<comment xml:lang="fo">Photoshop mynd</comment>
<comment xml:lang="fr">image Photoshop</comment>
+ <comment xml:lang="fur">imagjin Photoshop</comment>
<comment xml:lang="ga">íomhá Photoshop</comment>
<comment xml:lang="gl">imaxe de Photoshop</comment>
<comment xml:lang="he">תמונת Photoshop</comment>
@@ -29219,7 +30232,7 @@
<comment xml:lang="oc">imatge Photoshop</comment>
<comment xml:lang="pl">Obraz Photoshop</comment>
<comment xml:lang="pt">imagem Photoshop</comment>
- <comment xml:lang="pt_BR">Imagem do Photoshop</comment>
+ <comment xml:lang="pt-BR">Imagem do Photoshop</comment>
<comment xml:lang="ro">Imagine Photoshop</comment>
<comment xml:lang="ru">Изображение Photoshop</comment>
<comment xml:lang="sk">Obrázok Photoshop</comment>
@@ -29229,10 +30242,10 @@
<comment xml:lang="tr">Photoshop görüntüsü</comment>
<comment xml:lang="uk">зображення Photoshop</comment>
<comment xml:lang="vi">Ảnh Photoshop</comment>
- <comment xml:lang="zh_CN">Photoshop 图像</comment>
- <comment xml:lang="zh_TW">Photoshop 影像</comment>
+ <comment xml:lang="zh-CN">Photoshop 图像</comment>
+ <comment xml:lang="zh-TW">Photoshop 影像</comment>
<magic priority="50">
- <match value="8BPS \000\000\000\000" type="string" offset="0" mask="0xffffffff0000ffffffff"/>
+ <match type="string" mask="0xffffffff0000ffffffff" value="8BPS \000\000\000\000" offset="0"/>
</magic>
<glob pattern="*.psd"/>
<alias type="image/psd"/>
@@ -29244,9 +30257,10 @@
</mime-type>
<mime-type type="image/x-rgb">
<comment>RGB image</comment>
+ <comment xml:lang="af">RGB-beeld</comment>
<comment xml:lang="ar">صورة RGB</comment>
<comment xml:lang="az">RGB rəsmi</comment>
- <comment xml:lang="be@latin">Vyjava RGB</comment>
+ <comment xml:lang="be-Latn">Vyjava RGB</comment>
<comment xml:lang="bg">Изображение — RGB</comment>
<comment xml:lang="ca">imatge RGB</comment>
<comment xml:lang="cs">obrázek RGB</comment>
@@ -29254,13 +30268,14 @@
<comment xml:lang="da">RGB-billede</comment>
<comment xml:lang="de">RGB-Bild</comment>
<comment xml:lang="el">Εικόνα RGB</comment>
- <comment xml:lang="en_GB">RGB image</comment>
+ <comment xml:lang="en-GB">RGB image</comment>
<comment xml:lang="eo">RGB-bildo</comment>
<comment xml:lang="es">imagen RGB</comment>
<comment xml:lang="eu">RGB irudia</comment>
<comment xml:lang="fi">RGB-kuva</comment>
<comment xml:lang="fo">RGB mynd</comment>
<comment xml:lang="fr">image RGB</comment>
+ <comment xml:lang="fur">imagjin RGB</comment>
<comment xml:lang="ga">íomhá RGB</comment>
<comment xml:lang="gl">imaxe RGB</comment>
<comment xml:lang="he">תמונת RGB</comment>
@@ -29281,7 +30296,7 @@
<comment xml:lang="oc">imatge RGB</comment>
<comment xml:lang="pl">Obraz RGB</comment>
<comment xml:lang="pt">imagem RGB</comment>
- <comment xml:lang="pt_BR">Imagem RGB</comment>
+ <comment xml:lang="pt-BR">Imagem RGB</comment>
<comment xml:lang="ro">Imagine RGB</comment>
<comment xml:lang="ru">Изображение RGB</comment>
<comment xml:lang="sk">Obrázok RGB</comment>
@@ -29292,27 +30307,29 @@
<comment xml:lang="tr">RGB görüntüsü</comment>
<comment xml:lang="uk">зображення RGB</comment>
<comment xml:lang="vi">Ảnh kiểu RGB</comment>
- <comment xml:lang="zh_CN">RGB 图像</comment>
- <comment xml:lang="zh_TW">RGB 影像</comment>
+ <comment xml:lang="zh-CN">RGB 图像</comment>
+ <comment xml:lang="zh-TW">RGB 影像</comment>
<glob pattern="*.rgb"/>
</mime-type>
<mime-type type="image/x-sgi">
<comment>SGI image</comment>
+ <comment xml:lang="af">SGI-beeld</comment>
<comment xml:lang="ar">صورة SGI</comment>
- <comment xml:lang="be@latin">Vyjava SGI</comment>
+ <comment xml:lang="be-Latn">Vyjava SGI</comment>
<comment xml:lang="bg">Изображение — SGI</comment>
<comment xml:lang="ca">imatge SGI</comment>
<comment xml:lang="cs">obrázek SGI</comment>
<comment xml:lang="da">SGI-billede</comment>
<comment xml:lang="de">SGI-Bild</comment>
<comment xml:lang="el">Εικόνα SGI</comment>
- <comment xml:lang="en_GB">SGI image</comment>
+ <comment xml:lang="en-GB">SGI image</comment>
<comment xml:lang="eo">SGI-bildo</comment>
<comment xml:lang="es">imagen SGI</comment>
<comment xml:lang="eu">SGI irudia</comment>
<comment xml:lang="fi">SGI-kuva</comment>
<comment xml:lang="fo">SGI mynd</comment>
<comment xml:lang="fr">image SGI</comment>
+ <comment xml:lang="fur">imagjin SGI</comment>
<comment xml:lang="ga">íomhá SGI</comment>
<comment xml:lang="gl">imaxe SGI</comment>
<comment xml:lang="he">תמונת SGI</comment>
@@ -29332,7 +30349,7 @@
<comment xml:lang="oc">imatge SGI</comment>
<comment xml:lang="pl">Obraz SGI</comment>
<comment xml:lang="pt">imagem SGI</comment>
- <comment xml:lang="pt_BR">Imagem SGI</comment>
+ <comment xml:lang="pt-BR">Imagem SGI</comment>
<comment xml:lang="ro">Imagine SGI</comment>
<comment xml:lang="ru">Изображение SGI</comment>
<comment xml:lang="sk">Obrázok SGI</comment>
@@ -29343,26 +30360,28 @@
<comment xml:lang="tr">SGI görüntüsü</comment>
<comment xml:lang="uk">зображення SGI</comment>
<comment xml:lang="vi">Ảnh SGI</comment>
- <comment xml:lang="zh_CN">SGI 图像</comment>
- <comment xml:lang="zh_TW">SGI 影像</comment>
+ <comment xml:lang="zh-CN">SGI 图像</comment>
+ <comment xml:lang="zh-TW">SGI 影像</comment>
<glob pattern="*.sgi"/>
</mime-type>
<mime-type type="image/x-sun-raster">
<comment>Sun raster image</comment>
+ <comment xml:lang="af">Sun-roosterbeeld</comment>
<comment xml:lang="ar">صورة Sun raster</comment>
- <comment xml:lang="be@latin">Rastravaja vyjava Sun</comment>
+ <comment xml:lang="be-Latn">Rastravaja vyjava Sun</comment>
<comment xml:lang="bg">Изображение — Sun raster</comment>
<comment xml:lang="ca">imatge ràster Sun</comment>
<comment xml:lang="cs">rastrový obrázek Sun</comment>
<comment xml:lang="da">Sun rasterbillede</comment>
<comment xml:lang="de">Sun-Rasterbild</comment>
<comment xml:lang="el">Εικόνα Sun raster</comment>
- <comment xml:lang="en_GB">Sun raster image</comment>
+ <comment xml:lang="en-GB">Sun raster image</comment>
<comment xml:lang="es">imagen rasterizada de Sun</comment>
<comment xml:lang="eu">Sun raster irudia</comment>
<comment xml:lang="fi">Sun-rasterikuva</comment>
<comment xml:lang="fo">Sun raster mynd</comment>
<comment xml:lang="fr">image raster Sun</comment>
+ <comment xml:lang="fur">imagjin raster Sun</comment>
<comment xml:lang="ga">íomhá rastar Sun</comment>
<comment xml:lang="gl">imaxe ráster de Sun</comment>
<comment xml:lang="he">תמונה סרוקה של Sun</comment>
@@ -29382,7 +30401,7 @@
<comment xml:lang="oc">imatge raster Sun</comment>
<comment xml:lang="pl">Obraz rastrowy Sun</comment>
<comment xml:lang="pt">imagem raster Sun</comment>
- <comment xml:lang="pt_BR">Imagem raster da Sun</comment>
+ <comment xml:lang="pt-BR">Imagem raster da Sun</comment>
<comment xml:lang="ro">Imagine rasterizată Sun</comment>
<comment xml:lang="ru">Растровое изображение Sun</comment>
<comment xml:lang="sk">Rastrový obrázok Sun</comment>
@@ -29393,30 +30412,32 @@
<comment xml:lang="tr">Sun raster görüntüsü</comment>
<comment xml:lang="uk">растрове зображення Sun</comment>
<comment xml:lang="vi">Ảnh mành Sun</comment>
- <comment xml:lang="zh_CN">Sun 光栅图像</comment>
- <comment xml:lang="zh_TW">Sun raster 影像</comment>
+ <comment xml:lang="zh-CN">Sun 光栅图像</comment>
+ <comment xml:lang="zh-TW">Sun raster 影像</comment>
<magic priority="50">
- <match value="0x59a66a95" type="big32" offset="0"/>
+ <match type="big32" value="0x59a66a95" offset="0"/>
</magic>
<glob pattern="*.sun"/>
</mime-type>
<mime-type type="image/x-tga">
<comment>TGA image</comment>
+ <comment xml:lang="af">TGA-beeld</comment>
<comment xml:lang="ar">صورة TGA</comment>
- <comment xml:lang="be@latin">Vyjava TGA</comment>
+ <comment xml:lang="be-Latn">Vyjava TGA</comment>
<comment xml:lang="bg">Изображение — TGA</comment>
<comment xml:lang="ca">imatge TGA</comment>
<comment xml:lang="cs">obrázek TGA</comment>
<comment xml:lang="da">TGA-billede</comment>
<comment xml:lang="de">TGA-Bild</comment>
<comment xml:lang="el">Εικόνα TGA</comment>
- <comment xml:lang="en_GB">TGA image</comment>
+ <comment xml:lang="en-GB">TGA image</comment>
<comment xml:lang="eo">TGA-bildo</comment>
<comment xml:lang="es">imagen TGA</comment>
<comment xml:lang="eu">TGA irudia</comment>
<comment xml:lang="fi">TGA-kuva</comment>
<comment xml:lang="fo">TGA mynd</comment>
<comment xml:lang="fr">image TGA</comment>
+ <comment xml:lang="fur">imagjin TGA</comment>
<comment xml:lang="ga">íomhá TGA</comment>
<comment xml:lang="gl">imaxe TGA</comment>
<comment xml:lang="he">תמונת TGA</comment>
@@ -29436,7 +30457,7 @@
<comment xml:lang="oc">imatge TGA</comment>
<comment xml:lang="pl">Obraz TGA</comment>
<comment xml:lang="pt">imagem TGA</comment>
- <comment xml:lang="pt_BR">Imagem TGA</comment>
+ <comment xml:lang="pt-BR">Imagem TGA</comment>
<comment xml:lang="ro">Imagine TGA</comment>
<comment xml:lang="ru">Изображение TGA</comment>
<comment xml:lang="sk">Obrázok TGA</comment>
@@ -29447,23 +30468,23 @@
<comment xml:lang="tr">TGA görüntüsü</comment>
<comment xml:lang="uk">зображення TGA</comment>
<comment xml:lang="vi">Ảnh TGA</comment>
- <comment xml:lang="zh_CN">TGA 图像</comment>
- <comment xml:lang="zh_TW">TGA 影像</comment>
+ <comment xml:lang="zh-CN">TGA 图像</comment>
+ <comment xml:lang="zh-TW">TGA 影像</comment>
<acronym>TGA</acronym>
<expanded-acronym>Truevision Graphics Adapter</expanded-acronym>
<magic priority="10">
- <match value="\1\1" type="string" offset="1"/>
- <match value="\1\11" type="string" offset="1"/>
- <match value="\0\3" type="string" offset="1"/>
- <match value="\0\xa" type="string" offset="1"/>
- <match value="\0\xb" type="string" offset="1"/>
- </magic>
- <magic priority="50">
- <match value="\0\2" type="string" offset="1">
- <match value="0x08" type="byte" offset="16"/>
- <match value="0x10" type="byte" offset="16"/>
- <match value="0x18" type="byte" offset="16"/>
- <match value="0x20" type="byte" offset="16"/>
+ <match type="string" value="\1\1" offset="1"/>
+ <match type="string" value="\1\11" offset="1"/>
+ <match type="string" value="\0\3" offset="1"/>
+ <match type="string" value="\0\xa" offset="1"/>
+ <match type="string" value="\0\xb" offset="1"/>
+ </magic>
+ <magic priority="50">
+ <match type="string" value="\0\2" offset="1">
+ <match type="byte" value="0x08" offset="16"/>
+ <match type="byte" value="0x10" offset="16"/>
+ <match type="byte" value="0x18" offset="16"/>
+ <match type="byte" value="0x20" offset="16"/>
</match>
</magic>
<glob pattern="*.tga"/>
@@ -29471,25 +30492,33 @@
<glob pattern="*.tpic"/>
<glob pattern="*.vda"/>
<glob pattern="*.vst"/>
+ <alias type="application/tga"/>
+ <alias type="application/x-targa"/>
+ <alias type="application/x-tga"/>
+ <alias type="image/targa"/>
+ <alias type="image/tga"/>
<alias type="image/x-icb"/>
+ <alias type="image/x-targa"/>
</mime-type>
<mime-type type="image/x-win-bitmap">
<comment>Windows cursor</comment>
+ <comment xml:lang="af">Windows-wyser</comment>
<comment xml:lang="ar">مؤشر ويندوز</comment>
- <comment xml:lang="be@latin">Kursor Windows</comment>
+ <comment xml:lang="be-Latn">Kursor Windows</comment>
<comment xml:lang="bg">Курсор — Windows</comment>
<comment xml:lang="ca">cursor de Windows</comment>
<comment xml:lang="cs">kurzor Windows</comment>
<comment xml:lang="da">Windowsmarkør</comment>
<comment xml:lang="de">Windows-Cursor</comment>
<comment xml:lang="el">Δρομέας Windows</comment>
- <comment xml:lang="en_GB">Windows cursor</comment>
+ <comment xml:lang="en-GB">Windows cursor</comment>
<comment xml:lang="eo">Windows-kursoro</comment>
<comment xml:lang="es">cursor de Windows</comment>
<comment xml:lang="eu">Windows kurtsorea</comment>
<comment xml:lang="fi">Windows-osoitin</comment>
<comment xml:lang="fo">Windows vísi</comment>
<comment xml:lang="fr">curseur Windows</comment>
+ <comment xml:lang="fur">cursôr di Windows</comment>
<comment xml:lang="ga">cúrsóir Windows</comment>
<comment xml:lang="gl">Cursor de Windows</comment>
<comment xml:lang="he">סמן של Windows</comment>
@@ -29510,7 +30539,7 @@
<comment xml:lang="oc">cursor Windows</comment>
<comment xml:lang="pl">Kursor Windows</comment>
<comment xml:lang="pt">cursor Windows</comment>
- <comment xml:lang="pt_BR">Cursor do Windows</comment>
+ <comment xml:lang="pt-BR">Cursor do Windows</comment>
<comment xml:lang="ro">Cursor Windows</comment>
<comment xml:lang="ru">Курсор Windows</comment>
<comment xml:lang="sk">Kurzor Windows</comment>
@@ -29521,31 +30550,33 @@
<comment xml:lang="tr">Windows imleci</comment>
<comment xml:lang="uk">курсор Windows</comment>
<comment xml:lang="vi">Con chạy Windows</comment>
- <comment xml:lang="zh_CN">Windows 光标</comment>
- <comment xml:lang="zh_TW">Windows 滑鼠游標</comment>
+ <comment xml:lang="zh-CN">Windows 光标</comment>
+ <comment xml:lang="zh-TW">Windows 滑鼠游標</comment>
<magic priority="50">
- <match value="\0\0\2\0" type="string" offset="0">
- <match value="\0" type="string" offset="5"/>
+ <match type="string" value="\0\0\2\0" offset="0">
+ <match type="string" value="\0" offset="5"/>
</match>
</magic>
<glob pattern="*.cur"/>
</mime-type>
<mime-type type="application/x-navi-animation">
<comment>Windows animated cursor</comment>
+ <comment xml:lang="af">Windows geanimeerde wyser</comment>
<comment xml:lang="ar">مؤشر ويندوز المتحرك</comment>
- <comment xml:lang="be@latin">Animavany kursor Windows</comment>
+ <comment xml:lang="be-Latn">Animavany kursor Windows</comment>
<comment xml:lang="bg">Курсор — Windows, анимиран</comment>
<comment xml:lang="ca">cursor animat de Windows</comment>
<comment xml:lang="cs">animovaný kurzor Windows</comment>
<comment xml:lang="da">Windowsanimeret markør</comment>
<comment xml:lang="de">Animierter Windows-Cursor</comment>
<comment xml:lang="el">Κινούμενος δρομέας Windows</comment>
- <comment xml:lang="en_GB">Windows animated cursor</comment>
+ <comment xml:lang="en-GB">Windows animated cursor</comment>
<comment xml:lang="es">cursor animado de Windows</comment>
<comment xml:lang="eu">Windows-eko kurtsore animatua</comment>
<comment xml:lang="fi">animoitu Windows-osoitin</comment>
<comment xml:lang="fo">Windows livindaigjørdur vísi</comment>
<comment xml:lang="fr">curseur animé Windows</comment>
+ <comment xml:lang="fur">cursôr animât di Windows</comment>
<comment xml:lang="ga">cúrsóir beoite Windows</comment>
<comment xml:lang="gl">Cursor animado de Windows</comment>
<comment xml:lang="he">סמן מונפש של Windows</comment>
@@ -29564,7 +30595,7 @@
<comment xml:lang="oc">cursor animat Windows</comment>
<comment xml:lang="pl">Animowany kursor Windows</comment>
<comment xml:lang="pt">cursor animado Windows</comment>
- <comment xml:lang="pt_BR">Cursor animado do Windows</comment>
+ <comment xml:lang="pt-BR">Cursor animado do Windows</comment>
<comment xml:lang="ro">Cursor animat Windows</comment>
<comment xml:lang="ru">Анимированный курсор Windows</comment>
<comment xml:lang="sk">Animovaný kurzor Windows</comment>
@@ -29575,32 +30606,34 @@
<comment xml:lang="tr">Windows canlandırmalı imleci</comment>
<comment xml:lang="uk">анімований курсор Windows</comment>
<comment xml:lang="vi">Con chạy hoạt họa Windows</comment>
- <comment xml:lang="zh_CN">Windows 动态光标</comment>
- <comment xml:lang="zh_TW">Windows 滑鼠動畫游標</comment>
+ <comment xml:lang="zh-CN">Windows 动态光标</comment>
+ <comment xml:lang="zh-TW">Windows 滑鼠動畫游標</comment>
<magic priority="50">
- <match value="RIFF" type="string" offset="0">
- <match value="ACON" type="string" offset="8"/>
+ <match type="string" value="RIFF" offset="0">
+ <match type="string" value="ACON" offset="8"/>
</match>
</magic>
<glob pattern="*.ani"/>
</mime-type>
<mime-type type="image/emf">
<comment>EMF image</comment>
+ <comment xml:lang="af">EMF-beeld</comment>
<comment xml:lang="ar">صورة EMF</comment>
- <comment xml:lang="be@latin">Vyjava EMF</comment>
+ <comment xml:lang="be-Latn">Vyjava EMF</comment>
<comment xml:lang="bg">Изображение — EMF</comment>
<comment xml:lang="ca">imatge EMF</comment>
<comment xml:lang="cs">obrázek EMF</comment>
<comment xml:lang="da">EMF-billede</comment>
<comment xml:lang="de">EMF-Bild</comment>
<comment xml:lang="el">Εικόνα EMF</comment>
- <comment xml:lang="en_GB">EMF image</comment>
+ <comment xml:lang="en-GB">EMF image</comment>
<comment xml:lang="eo">EMF-bildo</comment>
<comment xml:lang="es">imagen EMF</comment>
<comment xml:lang="eu">EMF irudia</comment>
<comment xml:lang="fi">EMF-kuva</comment>
<comment xml:lang="fo">EMF mynd</comment>
<comment xml:lang="fr">image EMF</comment>
+ <comment xml:lang="fur">imagjin EMF</comment>
<comment xml:lang="ga">íomhá EMF</comment>
<comment xml:lang="gl">imaxe EMF</comment>
<comment xml:lang="he">תמונת EMF</comment>
@@ -29621,7 +30654,7 @@
<comment xml:lang="oc">imatge EMF</comment>
<comment xml:lang="pl">Obraz EMF</comment>
<comment xml:lang="pt">imagem EMF</comment>
- <comment xml:lang="pt_BR">Imagem EMF</comment>
+ <comment xml:lang="pt-BR">Imagem EMF</comment>
<comment xml:lang="ro">Imagine EMF</comment>
<comment xml:lang="ru">Изображение EMF</comment>
<comment xml:lang="sk">Obrázok EMF</comment>
@@ -29632,8 +30665,8 @@
<comment xml:lang="tr">EMF görüntüsü</comment>
<comment xml:lang="uk">зображення EMF</comment>
<comment xml:lang="vi">Ảnh EMF</comment>
- <comment xml:lang="zh_CN">EMF 图像</comment>
- <comment xml:lang="zh_TW">EMF 影像</comment>
+ <comment xml:lang="zh-CN">EMF 图像</comment>
+ <comment xml:lang="zh-TW">EMF 影像</comment>
<acronym>EMF</acronym>
<expanded-acronym>Enhanced MetaFile</expanded-acronym>
<glob pattern="*.emf"/>
@@ -29641,10 +30674,10 @@
<alias type="application/x-emf"/>
<alias type="application/emf"/>
<magic priority="50">
- <match value="0x00000001" type="little32" offset="0">
- <match value="0x464D4520" type="little32" offset="40">
- <match value="0x00010000" type="little32" offset="44">
- <match value="0x0000" type="little16" offset="58"/>
+ <match type="little32" offset="0" value="0x00000001">
+ <match type="little32" offset="40" value="0x464D4520">
+ <match type="little32" offset="44" value="0x00010000">
+ <match type="little16" offset="58" value="0x0000"/>
</match>
</match>
</match>
@@ -29652,21 +30685,23 @@
</mime-type>
<mime-type type="image/wmf">
<comment>WMF image</comment>
+ <comment xml:lang="af">WMF-beeld</comment>
<comment xml:lang="ar">صورة WMF</comment>
- <comment xml:lang="be@latin">Vyjava WMF</comment>
+ <comment xml:lang="be-Latn">Vyjava WMF</comment>
<comment xml:lang="bg">Изображение — WMF</comment>
<comment xml:lang="ca">imatge WMF</comment>
<comment xml:lang="cs">obrázek WMF</comment>
<comment xml:lang="da">WMF-billede</comment>
<comment xml:lang="de">WMF-Bild</comment>
<comment xml:lang="el">Εικόνα WML</comment>
- <comment xml:lang="en_GB">WMF image</comment>
+ <comment xml:lang="en-GB">WMF image</comment>
<comment xml:lang="eo">WMF-bildo</comment>
<comment xml:lang="es">imagen WMF</comment>
<comment xml:lang="eu">WMF irudia</comment>
<comment xml:lang="fi">WMF-kuva</comment>
<comment xml:lang="fo">WMF mynd</comment>
<comment xml:lang="fr">image WMF</comment>
+ <comment xml:lang="fur">imagjin WMF</comment>
<comment xml:lang="ga">íomhá WMF</comment>
<comment xml:lang="gl">imaxe WMF</comment>
<comment xml:lang="he">תמונת WMF</comment>
@@ -29686,7 +30721,7 @@
<comment xml:lang="oc">imatge WMF</comment>
<comment xml:lang="pl">Obraz WMF</comment>
<comment xml:lang="pt">imagem WMF</comment>
- <comment xml:lang="pt_BR">Imagem WMF</comment>
+ <comment xml:lang="pt-BR">Imagem WMF</comment>
<comment xml:lang="ro">Imagine WMF</comment>
<comment xml:lang="ru">Изображение WMF</comment>
<comment xml:lang="sk">Obrázok WMF</comment>
@@ -29697,21 +30732,21 @@
<comment xml:lang="tr">WMF görüntüsü</comment>
<comment xml:lang="uk">зображення WMF</comment>
<comment xml:lang="vi">Ảnh WMF</comment>
- <comment xml:lang="zh_CN">WMF 图像</comment>
- <comment xml:lang="zh_TW">WMF 影像</comment>
+ <comment xml:lang="zh-CN">WMF 图像</comment>
+ <comment xml:lang="zh-TW">WMF 影像</comment>
<acronym>WMF</acronym>
<expanded-acronym>Windows Metafile</expanded-acronym>
<magic priority="50">
-
- <match value="0x9AC6CDD7" type="little32" offset="0">
-
- <match value="0x0001" type="little16" offset="22">
- <match value="0x0009" type="little16" offset="24"/>
+ <!-- Placeable Metafile Header !-->
+ <match type="little32" offset="0" value="0x9AC6CDD7">
+ <!-- Followed by the standard Windows Metafile Header !-->
+ <match type="little16" offset="22" value="0x0001">
+ <match type="little16" offset="24" value="0x0009"/>
</match>
</match>
-
- <match value="0x0001" type="little16" offset="0">
- <match value="0x0009" type="little16" offset="2"/>
+ <!-- or just the standard Windows Metafile Header !-->
+ <match type="little16" offset="0" value="0x0001">
+ <match type="little16" offset="2" value="0x0009"/>
</match>
</magic>
<glob pattern="*.wmf"/>
@@ -29723,21 +30758,23 @@
</mime-type>
<mime-type type="image/x-xbitmap">
<comment>XBM image</comment>
+ <comment xml:lang="af">XBM-beeld</comment>
<comment xml:lang="ar">صورة XBM</comment>
- <comment xml:lang="be@latin">Vyjava XBM</comment>
+ <comment xml:lang="be-Latn">Vyjava XBM</comment>
<comment xml:lang="bg">Изображение — XBM</comment>
<comment xml:lang="ca">imatge XBM</comment>
<comment xml:lang="cs">obrázek XBM</comment>
<comment xml:lang="da">XBM-billede</comment>
<comment xml:lang="de">XBM-Bild</comment>
<comment xml:lang="el">Εικόνα XBM</comment>
- <comment xml:lang="en_GB">XBM image</comment>
+ <comment xml:lang="en-GB">XBM image</comment>
<comment xml:lang="eo">XBM-bildo</comment>
<comment xml:lang="es">imagen XBM</comment>
<comment xml:lang="eu">XBM irudia</comment>
<comment xml:lang="fi">XBM-kuva</comment>
<comment xml:lang="fo">XBM mynd</comment>
<comment xml:lang="fr">image XBM</comment>
+ <comment xml:lang="fur">imagjin XBM</comment>
<comment xml:lang="ga">íomhá XBM</comment>
<comment xml:lang="gl">imaxe XBM</comment>
<comment xml:lang="he">תמונת XBM</comment>
@@ -29757,7 +30794,7 @@
<comment xml:lang="oc">imatge XBM</comment>
<comment xml:lang="pl">Obraz XBM</comment>
<comment xml:lang="pt">imagem XBM</comment>
- <comment xml:lang="pt_BR">Imagem XBM</comment>
+ <comment xml:lang="pt-BR">Imagem XBM</comment>
<comment xml:lang="ro">Imagine XBM</comment>
<comment xml:lang="ru">Изображение XBM</comment>
<comment xml:lang="sk">Obrázok XBM</comment>
@@ -29768,29 +30805,31 @@
<comment xml:lang="tr">XBM görüntüsü</comment>
<comment xml:lang="uk">зображення XBM</comment>
<comment xml:lang="vi">Ảnh XBM</comment>
- <comment xml:lang="zh_CN">XBM 图像</comment>
- <comment xml:lang="zh_TW">XBM 影像</comment>
+ <comment xml:lang="zh-CN">XBM 图像</comment>
+ <comment xml:lang="zh-TW">XBM 影像</comment>
<acronym>XBM</acronym>
<expanded-acronym>X BitMap</expanded-acronym>
<glob pattern="*.xbm"/>
</mime-type>
<mime-type type="image/x-xcf">
<comment>GIMP image</comment>
+ <comment xml:lang="af">GIMP-beeld</comment>
<comment xml:lang="ar">صورة GIMP</comment>
- <comment xml:lang="be@latin">Vyjava GIMP</comment>
+ <comment xml:lang="be-Latn">Vyjava GIMP</comment>
<comment xml:lang="bg">Изображение — GIMP</comment>
<comment xml:lang="ca">imatge de GIMP</comment>
<comment xml:lang="cs">obrázek GIMP</comment>
<comment xml:lang="da">GIMP-billede</comment>
<comment xml:lang="de">GIMP-Bild</comment>
<comment xml:lang="el">Εικόνα GIMP</comment>
- <comment xml:lang="en_GB">GIMP image</comment>
+ <comment xml:lang="en-GB">GIMP image</comment>
<comment xml:lang="eo">GIMP-bildo</comment>
<comment xml:lang="es">imagen del GIMP</comment>
<comment xml:lang="eu">GIMP irudia</comment>
<comment xml:lang="fi">GIMP-kuva</comment>
<comment xml:lang="fo">GIMP mynd</comment>
<comment xml:lang="fr">image GIMP</comment>
+ <comment xml:lang="fur">imagjin GIMP</comment>
<comment xml:lang="ga">íomhá GIMP</comment>
<comment xml:lang="gl">imaxe de GIMP</comment>
<comment xml:lang="he">תמונת GIMP</comment>
@@ -29812,7 +30851,7 @@
<comment xml:lang="oc">imatge GIMP</comment>
<comment xml:lang="pl">Obraz GIMP</comment>
<comment xml:lang="pt">imagem GIMP</comment>
- <comment xml:lang="pt_BR">Imagem do GIMP</comment>
+ <comment xml:lang="pt-BR">Imagem do GIMP</comment>
<comment xml:lang="ro">Imagine GIMP</comment>
<comment xml:lang="ru">Изображение GIMP</comment>
<comment xml:lang="sk">Obrázok GIMP</comment>
@@ -29823,21 +30862,29 @@
<comment xml:lang="tr">GIMP görüntüsü</comment>
<comment xml:lang="uk">зображення GIMP</comment>
<comment xml:lang="vi">Ảnh GIMP</comment>
- <comment xml:lang="zh_CN">GIMP 图像</comment>
- <comment xml:lang="zh_TW">GIMP 影像</comment>
+ <comment xml:lang="zh-CN">GIMP 图像</comment>
+ <comment xml:lang="zh-TW">GIMP 影像</comment>
<glob pattern="*.xcf"/>
<magic priority="50">
- <match value="gimp xcf file" type="string" offset="0"/>
- <match value="gimp xcf v" type="string" offset="0"/>
+ <match type="string" value="gimp xcf file" offset="0"/>
+ <match type="string" value="gimp xcf v" offset="0"/>
</magic>
</mime-type>
<mime-type type="image/x-gimp-gbr">
<comment>GIMP brush</comment>
+ <comment xml:lang="af">GIMP-kwas</comment>
+ <comment xml:lang="bg">Четка — GIMP</comment>
<comment xml:lang="ca">pinzell de GIMP</comment>
<comment xml:lang="cs">štětec GIMP</comment>
+ <comment xml:lang="da">GIMP-pensel</comment>
<comment xml:lang="de">GIMP-Pinsel</comment>
- <comment xml:lang="en_GB">GIMP brush</comment>
+ <comment xml:lang="en-GB">GIMP brush</comment>
<comment xml:lang="es">pincel del GIMP</comment>
+ <comment xml:lang="eu">GIMP pintzela</comment>
+ <comment xml:lang="fi">GIMP-sivellin</comment>
+ <comment xml:lang="fr">brosse GIMP</comment>
+ <comment xml:lang="fur">pinel GIMP</comment>
+ <comment xml:lang="ga">scuab GIMP</comment>
<comment xml:lang="hr">GIMP kist</comment>
<comment xml:lang="hu">GIMP ecset</comment>
<comment xml:lang="id">Kuas GIMP</comment>
@@ -29845,47 +30892,65 @@
<comment xml:lang="kk">GIMP бояу жаққышы</comment>
<comment xml:lang="ko">GIMP 붓</comment>
<comment xml:lang="pl">Pędzel programu GIMP</comment>
- <comment xml:lang="pt_BR">Pincel do GIMP</comment>
+ <comment xml:lang="pt-BR">Pincel do GIMP</comment>
<comment xml:lang="ru">Кисть GIMP</comment>
<comment xml:lang="sk">Štetec aplikácie GIMP</comment>
+ <comment xml:lang="sl">Čopič GIMP</comment>
<comment xml:lang="sv">GIMP-pensel</comment>
+ <comment xml:lang="tr">GIMP fırçası</comment>
<comment xml:lang="uk">пензель GIMP</comment>
- <comment xml:lang="zh_CN">GIMP 笔刷</comment>
- <comment xml:lang="zh_TW">GIMP 筆刷</comment>
+ <comment xml:lang="zh-CN">GIMP 笔刷</comment>
+ <comment xml:lang="zh-TW">GIMP 筆刷</comment>
<glob pattern="*.gbr"/>
<magic priority="50">
- <match value="GIMP" type="string" offset="20"/>
+ <match type="string" value="GIMP" offset="20"/>
</magic>
</mime-type>
<mime-type type="image/x-gimp-gih">
<comment>GIMP brush pipe</comment>
+ <comment xml:lang="bg">Конвейер с четки — GIMP</comment>
<comment xml:lang="ca">conducte del pinzell de GIMP</comment>
<comment xml:lang="cs">zřetězení štětců GIMP</comment>
+ <comment xml:lang="da">GIMP-penselrør</comment>
<comment xml:lang="de">GIMP-Pinselanimation</comment>
- <comment xml:lang="en_GB">GIMP brush pipe</comment>
+ <comment xml:lang="en-GB">GIMP brush pipe</comment>
<comment xml:lang="es">pincel animado del GIMP</comment>
- <comment xml:lang="hr">GIMP valjkasti kist</comment>
+ <comment xml:lang="eu">GIMP pintzel hodia pipe</comment>
+ <comment xml:lang="fi">GIMP-sivellinputki</comment>
+ <comment xml:lang="fr">brosse animée GIMP</comment>
+ <comment xml:lang="fur">condot pinel GIMP</comment>
+ <comment xml:lang="ga">píopa scuaba GIMP</comment>
+ <comment xml:lang="hr">Proces GIMP kista</comment>
<comment xml:lang="hu">GIMP ecsetcsatorna</comment>
<comment xml:lang="id">Pipa kuas GIMP</comment>
<comment xml:lang="it">Pipe pennello GIMP</comment>
<comment xml:lang="kk">GIMP бояу жаққыш түтігі</comment>
<comment xml:lang="ko">GIMP 붓 파이프</comment>
<comment xml:lang="pl">Potok pędzla programu GIMP</comment>
- <comment xml:lang="pt_BR">Tubo de pincel do GIMP</comment>
+ <comment xml:lang="pt-BR">Tubo de pincel do GIMP</comment>
<comment xml:lang="ru">Анимированная кисть GIMP</comment>
<comment xml:lang="sv">GIMP-penselrör</comment>
+ <comment xml:lang="tr">GIMP fırça borusu</comment>
<comment xml:lang="uk">канал пензлів GIMP</comment>
- <comment xml:lang="zh_CN">GIMP 管刷</comment>
- <comment xml:lang="zh_TW">GIMP 筆刷導管</comment>
+ <comment xml:lang="zh-CN">GIMP 管刷</comment>
+ <comment xml:lang="zh-TW">GIMP 筆刷導管</comment>
<glob pattern="*.gih"/>
</mime-type>
<mime-type type="image/x-gimp-pat">
<comment>GIMP pattern</comment>
+ <comment xml:lang="af">GIMP-patroon</comment>
+ <comment xml:lang="bg">Шарка — GIMP</comment>
<comment xml:lang="ca">patró de GIMP</comment>
<comment xml:lang="cs">vzorek GIMP</comment>
+ <comment xml:lang="da">GIMP-mønster</comment>
<comment xml:lang="de">GIMP-Muster</comment>
- <comment xml:lang="en_GB">GIMP pattern</comment>
+ <comment xml:lang="en-GB">GIMP pattern</comment>
<comment xml:lang="es">patrón del GIMP</comment>
+ <comment xml:lang="eu">GIMP eredua</comment>
+ <comment xml:lang="fi">GIMP-kuvio</comment>
+ <comment xml:lang="fr">motif GIMP</comment>
+ <comment xml:lang="fur">motîf GIMP</comment>
+ <comment xml:lang="ga">patrún GIMP</comment>
<comment xml:lang="hr">GIMP uzorak</comment>
<comment xml:lang="hu">GIMP minta</comment>
<comment xml:lang="id">Pola GIMP</comment>
@@ -29893,35 +30958,39 @@
<comment xml:lang="kk">GIMP оюы</comment>
<comment xml:lang="ko">GIMP 패턴</comment>
<comment xml:lang="pl">Deseń programu GIMP</comment>
- <comment xml:lang="pt_BR">Textura do GIMP</comment>
+ <comment xml:lang="pt-BR">Textura do GIMP</comment>
<comment xml:lang="ru">Шаблон GIMP</comment>
<comment xml:lang="sk">Vzor aplikácie GIMP</comment>
+ <comment xml:lang="sl">Vzorec GIMP</comment>
<comment xml:lang="sv">GIMP-mönster</comment>
+ <comment xml:lang="tr">GIMP deseni</comment>
<comment xml:lang="uk">візерунок GIMP</comment>
- <comment xml:lang="zh_CN">GIMP 图案</comment>
- <comment xml:lang="zh_TW">GIMP 樣式</comment>
+ <comment xml:lang="zh-CN">GIMP 图案</comment>
+ <comment xml:lang="zh-TW">GIMP 樣式</comment>
<glob pattern="*.pat"/>
<magic priority="50">
- <match value="GPAT" type="string" offset="20"/>
+ <match type="string" value="GPAT" offset="20"/>
</magic>
</mime-type>
<mime-type type="image/x-xfig">
<comment>XFig image</comment>
+ <comment xml:lang="af">XFig-beeld</comment>
<comment xml:lang="ar">صورة XFig</comment>
- <comment xml:lang="be@latin">Vyjava XFig</comment>
+ <comment xml:lang="be-Latn">Vyjava XFig</comment>
<comment xml:lang="bg">Изображение — XFig</comment>
<comment xml:lang="ca">imatge de XFig</comment>
<comment xml:lang="cs">obrázek XFig</comment>
<comment xml:lang="da">XFig-billede</comment>
<comment xml:lang="de">XFig-Bild</comment>
<comment xml:lang="el">Εικόνα XFig</comment>
- <comment xml:lang="en_GB">XFig image</comment>
+ <comment xml:lang="en-GB">XFig image</comment>
<comment xml:lang="eo">XFig-bildo</comment>
<comment xml:lang="es">imagen de XFig</comment>
<comment xml:lang="eu">XFig irudia</comment>
<comment xml:lang="fi">XFig-kuva</comment>
<comment xml:lang="fo">XFig mynd</comment>
<comment xml:lang="fr">image XFig</comment>
+ <comment xml:lang="fur">imagjin XFig</comment>
<comment xml:lang="ga">íomhá XFig</comment>
<comment xml:lang="gl">imaxe de XFig</comment>
<comment xml:lang="he">תמונת XFig</comment>
@@ -29942,7 +31011,7 @@
<comment xml:lang="oc">imatge XFig</comment>
<comment xml:lang="pl">Obraz XFig</comment>
<comment xml:lang="pt">imagem XFig</comment>
- <comment xml:lang="pt_BR">Imagem do XFig</comment>
+ <comment xml:lang="pt-BR">Imagem do XFig</comment>
<comment xml:lang="ro">Imagine XFig</comment>
<comment xml:lang="ru">Изображение XFig</comment>
<comment xml:lang="sk">Obrázok XFig</comment>
@@ -29953,17 +31022,18 @@
<comment xml:lang="tr">XFig görüntüsü</comment>
<comment xml:lang="uk">зображення XFig</comment>
<comment xml:lang="vi">Ảnh XFig</comment>
- <comment xml:lang="zh_CN">XFig 图像</comment>
- <comment xml:lang="zh_TW">XFig 影像</comment>
+ <comment xml:lang="zh-CN">XFig 图像</comment>
+ <comment xml:lang="zh-TW">XFig 影像</comment>
<glob pattern="*.fig"/>
<magic priority="50">
- <match value="#FIG" type="string" offset="0"/>
+ <match type="string" value="#FIG" offset="0"/>
</magic>
</mime-type>
<mime-type type="image/x-xpixmap">
<comment>XPM image</comment>
+ <comment xml:lang="af">XPM-beeld</comment>
<comment xml:lang="ar">صورة XPM</comment>
- <comment xml:lang="be@latin">Vyjava XPM</comment>
+ <comment xml:lang="be-Latn">Vyjava XPM</comment>
<comment xml:lang="bg">Изображение — XPM</comment>
<comment xml:lang="ca">imatge XPM</comment>
<comment xml:lang="cs">obrázek XPM</comment>
@@ -29971,13 +31041,14 @@
<comment xml:lang="da">XPM-billede</comment>
<comment xml:lang="de">XPM-Bild</comment>
<comment xml:lang="el">Εικόνα XPM</comment>
- <comment xml:lang="en_GB">XPM image</comment>
+ <comment xml:lang="en-GB">XPM image</comment>
<comment xml:lang="eo">XPM-bildo</comment>
<comment xml:lang="es">imagen XPM</comment>
<comment xml:lang="eu">XPM irudia</comment>
<comment xml:lang="fi">XPM-kuva</comment>
<comment xml:lang="fo">XPM mynd</comment>
<comment xml:lang="fr">image XPM</comment>
+ <comment xml:lang="fur">imagjin XPM</comment>
<comment xml:lang="ga">íomhá XPM</comment>
<comment xml:lang="gl">imaxe XPM</comment>
<comment xml:lang="he">תמונת XPM</comment>
@@ -29997,7 +31068,7 @@
<comment xml:lang="oc">imatge XPM</comment>
<comment xml:lang="pl">Obraz XPM</comment>
<comment xml:lang="pt">imagem XPM</comment>
- <comment xml:lang="pt_BR">Imagem XPM</comment>
+ <comment xml:lang="pt-BR">Imagem XPM</comment>
<comment xml:lang="ro">Imagine XPM</comment>
<comment xml:lang="ru">Изображение XPM</comment>
<comment xml:lang="sk">Obrázok XPM</comment>
@@ -30008,21 +31079,22 @@
<comment xml:lang="tr">XPM görüntüsü</comment>
<comment xml:lang="uk">зображення XPM</comment>
<comment xml:lang="vi">Ảnh XPM</comment>
- <comment xml:lang="zh_CN">XPM 图像</comment>
- <comment xml:lang="zh_TW">XPM 影像</comment>
+ <comment xml:lang="zh-CN">XPM 图像</comment>
+ <comment xml:lang="zh-TW">XPM 影像</comment>
<acronym>XPM</acronym>
<expanded-acronym>X PixMap</expanded-acronym>
<magic priority="50">
- <match value="/* XPM" type="string" offset="0"/>
+ <match type="string" value="/* XPM" offset="0"/>
</magic>
<glob pattern="*.xpm"/>
<alias type="image/x-xpm"/>
</mime-type>
<mime-type type="image/x-xwindowdump">
<comment>X window image</comment>
+ <comment xml:lang="af">X window-beeld</comment>
<comment xml:lang="ar">صورة X window</comment>
<comment xml:lang="az">X window rəsmi</comment>
- <comment xml:lang="be@latin">Vyjava vakna X</comment>
+ <comment xml:lang="be-Latn">Vyjava vakna X</comment>
<comment xml:lang="bg">Изображение — X Window</comment>
<comment xml:lang="ca">imatge de X window</comment>
<comment xml:lang="cs">obrázek X window</comment>
@@ -30030,13 +31102,14 @@
<comment xml:lang="da">X-billede</comment>
<comment xml:lang="de">X-Window-Bild</comment>
<comment xml:lang="el">Εικόνα περιβάλλοντος X</comment>
- <comment xml:lang="en_GB">X window image</comment>
+ <comment xml:lang="en-GB">X window image</comment>
<comment xml:lang="eo">bildo de X window</comment>
<comment xml:lang="es">imagen de ventana de X</comment>
<comment xml:lang="eu">X window irudia</comment>
<comment xml:lang="fi">X-ikkunakuva</comment>
<comment xml:lang="fo">X vindeyga mynd</comment>
<comment xml:lang="fr">image X window</comment>
+ <comment xml:lang="fur">imagjin X window</comment>
<comment xml:lang="ga">íomhá X-windows</comment>
<comment xml:lang="gl">imaxe de X Window</comment>
<comment xml:lang="he">תמונת חלון של X</comment>
@@ -30057,7 +31130,7 @@
<comment xml:lang="oc">imatge X window</comment>
<comment xml:lang="pl">Obraz X Window</comment>
<comment xml:lang="pt">imagem de janela X</comment>
- <comment xml:lang="pt_BR">Imagem de janela do X</comment>
+ <comment xml:lang="pt-BR">Imagem de janela do X</comment>
<comment xml:lang="ro">Imagine X window</comment>
<comment xml:lang="ru">Изображение X window</comment>
<comment xml:lang="sk">Obrázok X window</comment>
@@ -30068,28 +31141,30 @@
<comment xml:lang="tr">X pencere görüntüsü</comment>
<comment xml:lang="uk">зображення X window</comment>
<comment xml:lang="vi">Ảnh cửa sổ X</comment>
- <comment xml:lang="zh_CN">X Window 图像</comment>
- <comment xml:lang="zh_TW">X window 影像</comment>
+ <comment xml:lang="zh-CN">X Window 图像</comment>
+ <comment xml:lang="zh-TW">X window 影像</comment>
<glob pattern="*.xwd"/>
</mime-type>
<mime-type type="inode/blockdevice">
<comment>block device</comment>
+ <comment xml:lang="af">bloktoestel</comment>
<comment xml:lang="ar">جهاز كتلي</comment>
<comment xml:lang="ast">preséu de bloques</comment>
- <comment xml:lang="be@latin">blokavaja pryłada</comment>
+ <comment xml:lang="be-Latn">blokavaja pryłada</comment>
<comment xml:lang="bg">Блоково устройство</comment>
<comment xml:lang="ca">dispositiu de blocs</comment>
<comment xml:lang="cs">blokové zařízení</comment>
<comment xml:lang="da">blokenhed</comment>
<comment xml:lang="de">Blockorientiertes Gerät</comment>
<comment xml:lang="el">Συσκευή block</comment>
- <comment xml:lang="en_GB">block device</comment>
+ <comment xml:lang="en-GB">block device</comment>
<comment xml:lang="eo">bloka disponaĵo</comment>
<comment xml:lang="es">dispositivo de bloques</comment>
<comment xml:lang="eu">bloke-gailua</comment>
<comment xml:lang="fi">laitetiedosto</comment>
<comment xml:lang="fo">blokka tóleind</comment>
<comment xml:lang="fr">périphérique de blocs</comment>
+ <comment xml:lang="fur">dispositîf a blocs</comment>
<comment xml:lang="ga">gléas bloc</comment>
<comment xml:lang="gl">dispositivo de bloque</comment>
<comment xml:lang="he">התקן בלוק</comment>
@@ -30110,7 +31185,7 @@
<comment xml:lang="oc">periferic de blòts</comment>
<comment xml:lang="pl">Urządzenie blokowe</comment>
<comment xml:lang="pt">dispositivo de bloco</comment>
- <comment xml:lang="pt_BR">Dispositivo de bloco</comment>
+ <comment xml:lang="pt-BR">Dispositivo de bloco</comment>
<comment xml:lang="ro">dispozitiv bloc</comment>
<comment xml:lang="ru">Блочное устройство</comment>
<comment xml:lang="sk">Blokové zariadenie</comment>
@@ -30121,27 +31196,29 @@
<comment xml:lang="tr">blok aygıtı</comment>
<comment xml:lang="uk">блоковий пристрій</comment>
<comment xml:lang="vi">thiết bị khối</comment>
- <comment xml:lang="zh_CN">块设备</comment>
- <comment xml:lang="zh_TW">區塊裝置</comment>
+ <comment xml:lang="zh-CN">块设备</comment>
+ <comment xml:lang="zh-TW">區塊裝置</comment>
</mime-type>
<mime-type type="inode/chardevice">
<comment>character device</comment>
+ <comment xml:lang="af">karaktertoestel</comment>
<comment xml:lang="ar">جهاز حرفي</comment>
<comment xml:lang="ast">preséu de caráuteres</comment>
- <comment xml:lang="be@latin">znakavaja pryłada</comment>
+ <comment xml:lang="be-Latn">znakavaja pryłada</comment>
<comment xml:lang="bg">Символно устройство</comment>
<comment xml:lang="ca">dispositiu de caràcters</comment>
<comment xml:lang="cs">znakové zařízení</comment>
<comment xml:lang="da">tegnenhed</comment>
<comment xml:lang="de">Zeichenorientiertes Gerät</comment>
<comment xml:lang="el">Συσκευή χαρακτήρων</comment>
- <comment xml:lang="en_GB">character device</comment>
+ <comment xml:lang="en-GB">character device</comment>
<comment xml:lang="eo">signa disponaĵo</comment>
<comment xml:lang="es">dispositivo de caracteres</comment>
<comment xml:lang="eu">karaktereen gailua</comment>
<comment xml:lang="fi">merkkilaite</comment>
<comment xml:lang="fo">stavatóleind</comment>
<comment xml:lang="fr">périphérique de caractères</comment>
+ <comment xml:lang="fur">dispositîf a caratars</comment>
<comment xml:lang="ga">gléas carachtar</comment>
<comment xml:lang="gl">dispositivo de caracter</comment>
<comment xml:lang="he">התקן תכונה</comment>
@@ -30162,7 +31239,7 @@
<comment xml:lang="oc">periferic de caractèrs</comment>
<comment xml:lang="pl">Urządzenie znakowe</comment>
<comment xml:lang="pt">dispositivo de caracteres</comment>
- <comment xml:lang="pt_BR">Dispositivo de caractere</comment>
+ <comment xml:lang="pt-BR">Dispositivo de caractere</comment>
<comment xml:lang="ro">dispozitiv caracter</comment>
<comment xml:lang="ru">Символьное устройство</comment>
<comment xml:lang="sk">Znakové zariadenie</comment>
@@ -30173,27 +31250,29 @@
<comment xml:lang="tr">karakter aygıtı</comment>
<comment xml:lang="uk">символьний пристрій</comment>
<comment xml:lang="vi">thiết bị ký tự</comment>
- <comment xml:lang="zh_CN">字符设备</comment>
- <comment xml:lang="zh_TW">字元裝置</comment>
+ <comment xml:lang="zh-CN">字符设备</comment>
+ <comment xml:lang="zh-TW">字元裝置</comment>
</mime-type>
<mime-type type="inode/directory">
<comment>folder</comment>
+ <comment xml:lang="af">gids</comment>
<comment xml:lang="ar">مجلّد</comment>
<comment xml:lang="ast">carpeta</comment>
- <comment xml:lang="be@latin">kataloh</comment>
+ <comment xml:lang="be-Latn">kataloh</comment>
<comment xml:lang="bg">Папка</comment>
<comment xml:lang="ca">carpeta</comment>
<comment xml:lang="cs">složka</comment>
<comment xml:lang="da">mappe</comment>
<comment xml:lang="de">Ordner</comment>
<comment xml:lang="el">Φάκελος</comment>
- <comment xml:lang="en_GB">folder</comment>
+ <comment xml:lang="en-GB">folder</comment>
<comment xml:lang="eo">dosierujo</comment>
<comment xml:lang="es">carpeta</comment>
<comment xml:lang="eu">karpeta</comment>
<comment xml:lang="fi">kansio</comment>
<comment xml:lang="fo">mappa</comment>
<comment xml:lang="fr">dossier</comment>
+ <comment xml:lang="fur">cartele</comment>
<comment xml:lang="ga">fillteán</comment>
<comment xml:lang="gl">cartafol</comment>
<comment xml:lang="he">תיקייה</comment>
@@ -30214,7 +31293,7 @@
<comment xml:lang="oc">dorsièr</comment>
<comment xml:lang="pl">Katalog</comment>
<comment xml:lang="pt">pasta</comment>
- <comment xml:lang="pt_BR">Pasta</comment>
+ <comment xml:lang="pt-BR">Pasta</comment>
<comment xml:lang="ro">dosar</comment>
<comment xml:lang="ru">Папка</comment>
<comment xml:lang="sk">Priečinok</comment>
@@ -30225,28 +31304,30 @@
<comment xml:lang="tr">dizin</comment>
<comment xml:lang="uk">тека</comment>
<comment xml:lang="vi">thư mục</comment>
- <comment xml:lang="zh_CN">文件夹</comment>
- <comment xml:lang="zh_TW">資料夾</comment>
+ <comment xml:lang="zh-CN">文件夹</comment>
+ <comment xml:lang="zh-TW">資料夾</comment>
<generic-icon name="folder"/>
<alias type="x-directory/normal"/>
</mime-type>
<mime-type type="inode/fifo">
<comment>pipe</comment>
+ <comment xml:lang="af">pyp</comment>
<comment xml:lang="ar">إنبوب</comment>
- <comment xml:lang="be@latin">kanvejer</comment>
+ <comment xml:lang="be-Latn">kanvejer</comment>
<comment xml:lang="bg">Конвейер</comment>
<comment xml:lang="ca">conducte</comment>
<comment xml:lang="cs">roura</comment>
<comment xml:lang="da">datakanal</comment>
<comment xml:lang="de">Pipe</comment>
<comment xml:lang="el">Διοχέτευση</comment>
- <comment xml:lang="en_GB">pipe</comment>
+ <comment xml:lang="en-GB">pipe</comment>
<comment xml:lang="eo">dukto</comment>
- <comment xml:lang="es">tubería</comment>
+ <comment xml:lang="es">canalización</comment>
<comment xml:lang="eu">kanalizazioa</comment>
<comment xml:lang="fi">putki</comment>
<comment xml:lang="fo">rør</comment>
<comment xml:lang="fr">tube</comment>
+ <comment xml:lang="fur">condot</comment>
<comment xml:lang="ga">píopa</comment>
<comment xml:lang="gl">tubería</comment>
<comment xml:lang="he">צינור</comment>
@@ -30267,7 +31348,7 @@
<comment xml:lang="oc">tub</comment>
<comment xml:lang="pl">Potok</comment>
<comment xml:lang="pt">canal</comment>
- <comment xml:lang="pt_BR">Pipe</comment>
+ <comment xml:lang="pt-BR">Pipe</comment>
<comment xml:lang="ro">canal pipe</comment>
<comment xml:lang="ru">Канал</comment>
<comment xml:lang="sk">Rúra</comment>
@@ -30278,27 +31359,29 @@
<comment xml:lang="tr">boru</comment>
<comment xml:lang="uk">канал</comment>
<comment xml:lang="vi">ống dẫn</comment>
- <comment xml:lang="zh_CN">管道</comment>
- <comment xml:lang="zh_TW">管線</comment>
+ <comment xml:lang="zh-CN">管道</comment>
+ <comment xml:lang="zh-TW">管線</comment>
</mime-type>
<mime-type type="inode/mount-point">
<comment>mount point</comment>
+ <comment xml:lang="af">hegpunt</comment>
<comment xml:lang="ar">نقطة الوصْل</comment>
<comment xml:lang="ast">puntu de montaxe</comment>
- <comment xml:lang="be@latin">punkt mantavańnia</comment>
+ <comment xml:lang="be-Latn">punkt mantavańnia</comment>
<comment xml:lang="bg">Точка на монтиране</comment>
<comment xml:lang="ca">punt de muntatge</comment>
<comment xml:lang="cs">přípojné místo</comment>
<comment xml:lang="da">monteringspunkt</comment>
<comment xml:lang="de">Einhängepunkt</comment>
<comment xml:lang="el">Σημείο προσάρτησης</comment>
- <comment xml:lang="en_GB">mount point</comment>
+ <comment xml:lang="en-GB">mount point</comment>
<comment xml:lang="eo">surmetingo</comment>
<comment xml:lang="es">punto de montaje</comment>
<comment xml:lang="eu">muntatze-puntua</comment>
<comment xml:lang="fi">liitospiste</comment>
<comment xml:lang="fo">ísetingarpunkt</comment>
<comment xml:lang="fr">point d'accès</comment>
+ <comment xml:lang="fur">pont di montaç</comment>
<comment xml:lang="ga">pointe feistithe</comment>
<comment xml:lang="gl">punto de montaxe</comment>
<comment xml:lang="he">נקודת עיגון</comment>
@@ -30319,7 +31402,7 @@
<comment xml:lang="oc">punt d'accès</comment>
<comment xml:lang="pl">Punkt montowania</comment>
<comment xml:lang="pt">ponto de montagem</comment>
- <comment xml:lang="pt_BR">Ponto de montagem</comment>
+ <comment xml:lang="pt-BR">Ponto de montagem</comment>
<comment xml:lang="ro">loc montare</comment>
<comment xml:lang="ru">Точка монтирования</comment>
<comment xml:lang="sk">Miesto pripojenia</comment>
@@ -30330,27 +31413,29 @@
<comment xml:lang="tr">bağlama noktası</comment>
<comment xml:lang="uk">точка монтування</comment>
<comment xml:lang="vi">điểm lắp</comment>
- <comment xml:lang="zh_CN">挂载点</comment>
- <comment xml:lang="zh_TW">掛載點</comment>
+ <comment xml:lang="zh-CN">挂载点</comment>
+ <comment xml:lang="zh-TW">掛載點</comment>
<sub-class-of type="inode/directory"/>
</mime-type>
<mime-type type="inode/socket">
<comment>socket</comment>
+ <comment xml:lang="af">sok</comment>
<comment xml:lang="ar">مقبس</comment>
- <comment xml:lang="be@latin">sokiet</comment>
+ <comment xml:lang="be-Latn">sokiet</comment>
<comment xml:lang="bg">Гнездо</comment>
<comment xml:lang="ca">sòcol</comment>
<comment xml:lang="cs">socket</comment>
<comment xml:lang="da">sokkel</comment>
<comment xml:lang="de">Socket</comment>
<comment xml:lang="el">Υποδοχή</comment>
- <comment xml:lang="en_GB">socket</comment>
+ <comment xml:lang="en-GB">socket</comment>
<comment xml:lang="eo">kontaktoskatolo</comment>
<comment xml:lang="es">socket</comment>
<comment xml:lang="eu">socketa</comment>
<comment xml:lang="fi">pistoke</comment>
<comment xml:lang="fo">sokkul</comment>
<comment xml:lang="fr">connecteur réseau</comment>
+ <comment xml:lang="fur">socket</comment>
<comment xml:lang="ga">soicéad</comment>
<comment xml:lang="gl">socket</comment>
<comment xml:lang="he">נקודת חיבור</comment>
@@ -30371,7 +31456,7 @@
<comment xml:lang="oc">connector ret</comment>
<comment xml:lang="pl">Gniazdo</comment>
<comment xml:lang="pt">tomada</comment>
- <comment xml:lang="pt_BR">Socket</comment>
+ <comment xml:lang="pt-BR">Socket</comment>
<comment xml:lang="ro">socket</comment>
<comment xml:lang="ru">Сокет</comment>
<comment xml:lang="sk">Soket</comment>
@@ -30382,15 +31467,16 @@
<comment xml:lang="tr">soket</comment>
<comment xml:lang="uk">сокет</comment>
<comment xml:lang="vi">ổ cắm</comment>
- <comment xml:lang="zh_CN">套接字</comment>
- <comment xml:lang="zh_TW">socket</comment>
+ <comment xml:lang="zh-CN">套接字</comment>
+ <comment xml:lang="zh-TW">socket</comment>
</mime-type>
<mime-type type="inode/symlink">
<comment>symbolic link</comment>
+ <comment xml:lang="af">simboliese skakel</comment>
<comment xml:lang="ar">وصلة رمزية</comment>
<comment xml:lang="ast">enllaz simbólicu</comment>
<comment xml:lang="az">simvolik körpü</comment>
- <comment xml:lang="be@latin">symbalnaja spasyłka</comment>
+ <comment xml:lang="be-Latn">symbalnaja spasyłka</comment>
<comment xml:lang="bg">Символна връзка</comment>
<comment xml:lang="ca">enllaç simbòlic</comment>
<comment xml:lang="cs">symbolický odkaz</comment>
@@ -30398,13 +31484,14 @@
<comment xml:lang="da">symbolsk henvisning</comment>
<comment xml:lang="de">Symbolische Verknüpfung</comment>
<comment xml:lang="el">Συμβολικός σύνδεσμος</comment>
- <comment xml:lang="en_GB">symbolic link</comment>
+ <comment xml:lang="en-GB">symbolic link</comment>
<comment xml:lang="eo">simbola ligilo</comment>
<comment xml:lang="es">enlace simbólico</comment>
<comment xml:lang="eu">esteka sinbolikoa</comment>
<comment xml:lang="fi">symbolinen linkki</comment>
<comment xml:lang="fo">tykislig leinkja</comment>
<comment xml:lang="fr">lien symbolique</comment>
+ <comment xml:lang="fur">colegament simbolic</comment>
<comment xml:lang="ga">nasc siombalach</comment>
<comment xml:lang="gl">ligazón simbólica</comment>
<comment xml:lang="he">קישור סימבולי</comment>
@@ -30426,7 +31513,7 @@
<comment xml:lang="oc">ligam simbolic</comment>
<comment xml:lang="pl">Dowiązanie symboliczne</comment>
<comment xml:lang="pt">ligação simbólica</comment>
- <comment xml:lang="pt_BR">Ligação simbólica</comment>
+ <comment xml:lang="pt-BR">Ligação simbólica</comment>
<comment xml:lang="ro">legătură simbolică</comment>
<comment xml:lang="ru">Символьная ссылка</comment>
<comment xml:lang="sk">Symbolický odkaz</comment>
@@ -30434,17 +31521,18 @@
<comment xml:lang="sq">Lidhje simbolike</comment>
<comment xml:lang="sr">симболичка веза</comment>
<comment xml:lang="sv">symbolisk länk</comment>
- <comment xml:lang="tr">sembolik bağlantı</comment>
+ <comment xml:lang="tr">simgesel bağlantı</comment>
<comment xml:lang="uk">символічне посилання</comment>
<comment xml:lang="vi">liên kết tượng trưng</comment>
- <comment xml:lang="zh_CN">符号链接</comment>
- <comment xml:lang="zh_TW">符號鏈結</comment>
+ <comment xml:lang="zh-CN">符号链接</comment>
+ <comment xml:lang="zh-TW">符號連結</comment>
</mime-type>
<mime-type type="message/delivery-status">
<comment>mail delivery report</comment>
+ <comment xml:lang="af">posafleweringverslag</comment>
<comment xml:lang="ar">تقرير تسليم البريد</comment>
<comment xml:lang="az">poçt yollama raportu</comment>
- <comment xml:lang="be@latin">rapart ab dastaŭcy pošty</comment>
+ <comment xml:lang="be-Latn">rapart ab dastaŭcy pošty</comment>
<comment xml:lang="bg">Отчет за пристигналата поща</comment>
<comment xml:lang="ca">informe de lliurament de correu</comment>
<comment xml:lang="cs">zpráva o doručení pošty</comment>
@@ -30452,13 +31540,14 @@
<comment xml:lang="da">postleveringsrapport</comment>
<comment xml:lang="de">E-Mail-Zustellungsbericht</comment>
<comment xml:lang="el">Αναφορά παράδοσης μηνύματος</comment>
- <comment xml:lang="en_GB">mail delivery report</comment>
+ <comment xml:lang="en-GB">mail delivery report</comment>
<comment xml:lang="eo">raporto pri transdono de retpoŝto</comment>
<comment xml:lang="es">informe de entrega de correo</comment>
<comment xml:lang="eu">posta banaketako txostena</comment>
<comment xml:lang="fi">viestin jakeluilmoitus</comment>
<comment xml:lang="fo">post útberingarfrásøgn</comment>
<comment xml:lang="fr">rapport de livraison de courriels</comment>
+ <comment xml:lang="fur">rapuart di consegne pueste</comment>
<comment xml:lang="ga">tuairisc sheachadta r-phoist</comment>
<comment xml:lang="gl">informe de entrega de correo</comment>
<comment xml:lang="he">דוח העברת דואר</comment>
@@ -30479,7 +31568,7 @@
<comment xml:lang="oc">rapòrt de liurason de corrièrs electronics</comment>
<comment xml:lang="pl">Raport z dostarczenia poczty</comment>
<comment xml:lang="pt">relatório de entrega de email</comment>
- <comment xml:lang="pt_BR">Relatório de entrega de correspondência</comment>
+ <comment xml:lang="pt-BR">Relatório de entrega de correspondência</comment>
<comment xml:lang="ro">raport de trimitere email</comment>
<comment xml:lang="ru">Отчёт о доставке сообщения</comment>
<comment xml:lang="sk">Správa o doručení pošty</comment>
@@ -30490,8 +31579,8 @@
<comment xml:lang="tr">posta iletim raporu</comment>
<comment xml:lang="uk">звіт про доставку пошти</comment>
<comment xml:lang="vi">thông báo phát thư</comment>
- <comment xml:lang="zh_CN">邮件投递报告</comment>
- <comment xml:lang="zh_TW">郵件寄送回報</comment>
+ <comment xml:lang="zh-CN">邮件投递报告</comment>
+ <comment xml:lang="zh-TW">郵件寄送回報</comment>
<generic-icon name="text-x-generic"/>
<sub-class-of type="text/plain"/>
</mime-type>
@@ -30499,7 +31588,7 @@
<comment>mail disposition report</comment>
<comment xml:lang="ar">تقرير ترتيب البريد</comment>
<comment xml:lang="az">poçt qayıtma raportu</comment>
- <comment xml:lang="be@latin">rapart ab raźmiaščeńni pošty</comment>
+ <comment xml:lang="be-Latn">rapart ab raźmiaščeńni pošty</comment>
<comment xml:lang="bg">Отчет за състоянието на пощата</comment>
<comment xml:lang="ca">informe de disposició de correu</comment>
<comment xml:lang="cs">zpráva o předání pošty</comment>
@@ -30507,13 +31596,14 @@
<comment xml:lang="da">postdisponeringsrapport</comment>
<comment xml:lang="de">E-Mail-Übertragungsbericht</comment>
<comment xml:lang="el">Αναφορά διάθεσης μηνύματος</comment>
- <comment xml:lang="en_GB">mail disposition report</comment>
+ <comment xml:lang="en-GB">mail disposition report</comment>
<comment xml:lang="eo">raporto pri dispono de retpoŝto</comment>
<comment xml:lang="es">informe de disposición de correo</comment>
<comment xml:lang="eu">posta joerako txostena</comment>
<comment xml:lang="fi">viestin kuittausilmoitus</comment>
<comment xml:lang="fo">post avhendingarfrásøgn</comment>
<comment xml:lang="fr">rapport de disposition de courriels</comment>
+ <comment xml:lang="fur">rapuart di disposizion pueste</comment>
<comment xml:lang="ga">tuairisc chóirithe r-phoist</comment>
<comment xml:lang="gl">informe de disposición de correo</comment>
<comment xml:lang="he">דוח אספקת דואר</comment>
@@ -30534,7 +31624,7 @@
<comment xml:lang="oc">rapòrt de disposicion de corrièrs electronics</comment>
<comment xml:lang="pl">Raport z wysyłania poczty</comment>
<comment xml:lang="pt">relatório de disposição de email</comment>
- <comment xml:lang="pt_BR">Relatório de disposição de correspondência</comment>
+ <comment xml:lang="pt-BR">Relatório de disposição de correspondência</comment>
<comment xml:lang="ro">confirmare primire email</comment>
<comment xml:lang="ru">Отчёт о перемещении почты</comment>
<comment xml:lang="sk">Správa o odovzdaní pošty</comment>
@@ -30545,16 +31635,17 @@
<comment xml:lang="tr">posta silinme raporu</comment>
<comment xml:lang="uk">звіт про розташування пошти</comment>
<comment xml:lang="vi">thông báo chuyển nhượng thư</comment>
- <comment xml:lang="zh_CN">邮件接收报告</comment>
- <comment xml:lang="zh_TW">郵件處置回報</comment>
+ <comment xml:lang="zh-CN">邮件接收报告</comment>
+ <comment xml:lang="zh-TW">郵件處置回報</comment>
<generic-icon name="text-x-generic"/>
<sub-class-of type="text/plain"/>
</mime-type>
<mime-type type="message/external-body">
<comment>reference to remote file</comment>
+ <comment xml:lang="af">verwysing na afgeleë lêer</comment>
<comment xml:lang="ar">مرجع إلى ملف بعيد</comment>
<comment xml:lang="az">uzaq fayla göstəriş</comment>
- <comment xml:lang="be@latin">spasyłka da addalenaha fajłu</comment>
+ <comment xml:lang="be-Latn">spasyłka da addalenaha fajłu</comment>
<comment xml:lang="bg">Препратка към отдалечен файл</comment>
<comment xml:lang="ca">referència a fitxer remot</comment>
<comment xml:lang="cs">odkaz na vzdálený soubor</comment>
@@ -30562,13 +31653,14 @@
<comment xml:lang="da">reference til fjern fil</comment>
<comment xml:lang="de">Verweis auf entfernte Datei</comment>
<comment xml:lang="el">Αναφορά σε απομακρυσμένο αρχείο</comment>
- <comment xml:lang="en_GB">reference to remote file</comment>
+ <comment xml:lang="en-GB">reference to remote file</comment>
<comment xml:lang="eo">referenco al fora dosiero</comment>
<comment xml:lang="es">referencia a un archivo remoto</comment>
<comment xml:lang="eu">erreferentzia urruneko fitxategiari</comment>
<comment xml:lang="fi">viittaus etätiedostoon</comment>
<comment xml:lang="fo">tilvísing til fjarfílu</comment>
<comment xml:lang="fr">référence au fichier distant</comment>
+ <comment xml:lang="fur">riferiment a file rimot</comment>
<comment xml:lang="ga">tagairt do chomhad cianda</comment>
<comment xml:lang="gl">referencia a un ficheiro remoto</comment>
<comment xml:lang="he">התיחסות לקובץ מרוחק</comment>
@@ -30589,7 +31681,7 @@
<comment xml:lang="oc">referéncia al fichièr distant</comment>
<comment xml:lang="pl">Odwołanie do pliku zdalnego</comment>
<comment xml:lang="pt">referência a um ficheiro remoto</comment>
- <comment xml:lang="pt_BR">Referência para arquivo remoto</comment>
+ <comment xml:lang="pt-BR">Referência para arquivo remoto</comment>
<comment xml:lang="ro">referință fișier la distanță</comment>
<comment xml:lang="ru">Ссылка на удалённый файл</comment>
<comment xml:lang="sk">Odkaz na vzdialený súbor</comment>
@@ -30597,32 +31689,34 @@
<comment xml:lang="sq">Referim për tek file në distancë</comment>
<comment xml:lang="sr">упута на удаљену датотеку</comment>
<comment xml:lang="sv">referens till fjärrfil</comment>
- <comment xml:lang="tr">uzaktaki dosyaya başvuru</comment>
+ <comment xml:lang="tr">uzaktaki dosyaya atıf</comment>
<comment xml:lang="uk">посилання на віддалений файл</comment>
<comment xml:lang="vi">tham chiếu đến tập tin ở xa</comment>
- <comment xml:lang="zh_CN">到远程文件的引用</comment>
- <comment xml:lang="zh_TW">遠端檔案的參照</comment>
+ <comment xml:lang="zh-CN">到远程文件的引用</comment>
+ <comment xml:lang="zh-TW">遠端檔案的參照</comment>
<generic-icon name="text-x-generic"/>
</mime-type>
<mime-type type="message/news">
<comment>Usenet news message</comment>
+ <comment xml:lang="af">Usenet-nuusboodskap</comment>
<comment xml:lang="ar">رسالة أخبار Usenet</comment>
<comment xml:lang="az">Usenet xəbərlər ismarışı</comment>
- <comment xml:lang="be@latin">Navina Usenet</comment>
+ <comment xml:lang="be-Latn">Navina Usenet</comment>
<comment xml:lang="bg">Съобщение — Usenet</comment>
<comment xml:lang="ca">missatge de notícies Usenet</comment>
<comment xml:lang="cs">příspěvek do diskusních skupin Usenet</comment>
<comment xml:lang="cy">Neges newyddion Usenet</comment>
- <comment xml:lang="da">Usenetnyhedsmeddelelse</comment>
+ <comment xml:lang="da">Usenet-nyhedsmeddelelse</comment>
<comment xml:lang="de">Usenet-News-Nachricht</comment>
<comment xml:lang="el">Μήνυμα ομάδων συζητήσεων Usenet</comment>
- <comment xml:lang="en_GB">Usenet news message</comment>
+ <comment xml:lang="en-GB">Usenet news message</comment>
<comment xml:lang="eo">novaĵmesaĝo de Usenet</comment>
<comment xml:lang="es">mensaje de noticias de Usenet</comment>
<comment xml:lang="eu">Usenet berrien mezua</comment>
<comment xml:lang="fi">nyyssiviesti</comment>
<comment xml:lang="fo">Usenet news boð</comment>
<comment xml:lang="fr">message de groupe d'échange Usenet</comment>
+ <comment xml:lang="fur">messaç gnovis Usenet</comment>
<comment xml:lang="ga">teachtaireacht nuachta Usenet</comment>
<comment xml:lang="gl">mensaxes de noticias de Usenet</comment>
<comment xml:lang="he">הודעת חדשות של Usenet</comment>
@@ -30643,7 +31737,7 @@
<comment xml:lang="oc">messatge de grop d'escambi Usenet</comment>
<comment xml:lang="pl">Wiadomość grupy dyskusyjnej</comment>
<comment xml:lang="pt">mensagem de notícias Usenet</comment>
- <comment xml:lang="pt_BR">Mensagem de notícias da Usenet</comment>
+ <comment xml:lang="pt-BR">Mensagem de notícias da Usenet</comment>
<comment xml:lang="ro">Mesaj Usenet de știri </comment>
<comment xml:lang="ru">Новостное сообщение Usenet</comment>
<comment xml:lang="sk">Príspevok do diskusných skupín Usenet</comment>
@@ -30654,21 +31748,22 @@
<comment xml:lang="tr">Usenet haber iletisi</comment>
<comment xml:lang="uk">повідомлення новин Usenet</comment>
<comment xml:lang="vi">Thông điệp tin tức USENET</comment>
- <comment xml:lang="zh_CN">Usenet 新闻信</comment>
- <comment xml:lang="zh_TW">Usenet 新聞訊息</comment>
+ <comment xml:lang="zh-CN">Usenet 新闻信</comment>
+ <comment xml:lang="zh-TW">Usenet 新聞訊息</comment>
<generic-icon name="text-x-generic"/>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="Article" type="string" offset="0"/>
- <match value="Path:" type="string" offset="0"/>
- <match value="Xref:" type="string" offset="0"/>
+ <match type="string" value="Article" offset="0"/>
+ <match type="string" value="Path:" offset="0"/>
+ <match type="string" value="Xref:" offset="0"/>
</magic>
</mime-type>
<mime-type type="message/partial">
<comment>partial email message</comment>
+ <comment xml:lang="af">gedeeltelike e-posboodskap</comment>
<comment xml:lang="ar">رسالة البريد الإلكتروني الجزئية</comment>
<comment xml:lang="az">qismi poçt ismarışı</comment>
- <comment xml:lang="be@latin">niapoŭny list email</comment>
+ <comment xml:lang="be-Latn">niapoŭny list email</comment>
<comment xml:lang="bg">Част от електронно писмо</comment>
<comment xml:lang="ca">missatge de correu electrònic parcial</comment>
<comment xml:lang="cs">částečná e-mailová zpráva</comment>
@@ -30676,12 +31771,13 @@
<comment xml:lang="da">delvis postmeddelelse</comment>
<comment xml:lang="de">E-Mail-Nachrichtenfragment</comment>
<comment xml:lang="el">Τμηματικό ηλ. μήνυμα</comment>
- <comment xml:lang="en_GB">partial email message</comment>
+ <comment xml:lang="en-GB">partial email message</comment>
<comment xml:lang="eo">parta retpoŝta mesaĝo</comment>
<comment xml:lang="es">mensaje de correo electrónico parcial</comment>
<comment xml:lang="eu">posta mezu partziala</comment>
<comment xml:lang="fi">osittainen sähköpostiviesti</comment>
<comment xml:lang="fr">message partiel de courriel</comment>
+ <comment xml:lang="fur">messaç e-mail parziâl</comment>
<comment xml:lang="ga">teachtaireacht ríomhphoist neamhiomlán</comment>
<comment xml:lang="gl">mensaxe de correo electrónico parcial</comment>
<comment xml:lang="he">מסר דוא״ל חלקי</comment>
@@ -30702,7 +31798,7 @@
<comment xml:lang="oc">messatge parcial de corrièr electronic</comment>
<comment xml:lang="pl">Częściowa wiadomość e-mail</comment>
<comment xml:lang="pt">mensagem parcial de email</comment>
- <comment xml:lang="pt_BR">Mensagem de e-mail parcial</comment>
+ <comment xml:lang="pt-BR">Mensagem de e-mail parcial</comment>
<comment xml:lang="ro">mesaj de email parțial</comment>
<comment xml:lang="ru">Фрагмент сообщения электронной почты</comment>
<comment xml:lang="sk">Čiastočná e-mailová správa</comment>
@@ -30713,28 +31809,30 @@
<comment xml:lang="tr">kısmi eposta iletisi</comment>
<comment xml:lang="uk">часткове поштове повідомлення</comment>
<comment xml:lang="vi">thư điện tử riêng phần</comment>
- <comment xml:lang="zh_CN">部分电子邮件</comment>
- <comment xml:lang="zh_TW">部份電子郵件訊息</comment>
+ <comment xml:lang="zh-CN">部分电子邮件</comment>
+ <comment xml:lang="zh-TW">部份電子郵件訊息</comment>
<generic-icon name="text-x-generic"/>
<sub-class-of type="text/plain"/>
</mime-type>
<mime-type type="message/rfc822">
<comment>email message</comment>
+ <comment xml:lang="af">e-posboodskap</comment>
<comment xml:lang="ar">رسالة البريد الإلكتروني</comment>
- <comment xml:lang="be@latin">list email</comment>
+ <comment xml:lang="be-Latn">list email</comment>
<comment xml:lang="bg">Съобщение по електронната поща</comment>
<comment xml:lang="ca">missatge de correu electrònic</comment>
<comment xml:lang="cs">e-mailová zpráva</comment>
<comment xml:lang="da">postmeddelelse</comment>
<comment xml:lang="de">E-Mail-Nachricht</comment>
<comment xml:lang="el">Ηλ. μήνυμα</comment>
- <comment xml:lang="en_GB">email message</comment>
+ <comment xml:lang="en-GB">email message</comment>
<comment xml:lang="eo">retpoŝta mesaĝo</comment>
<comment xml:lang="es">mensaje de correo electrónico</comment>
<comment xml:lang="eu">helbide elektronikoen mezua</comment>
<comment xml:lang="fi">sähköpostiviesti</comment>
<comment xml:lang="fo">t-post boð</comment>
<comment xml:lang="fr">message de courriel</comment>
+ <comment xml:lang="fur">messaç e-mail</comment>
<comment xml:lang="ga">teachtaireacht ríomhphoist</comment>
<comment xml:lang="gl">mensaxe de correo electrónico</comment>
<comment xml:lang="he">הודעת דואר אלקטרוני</comment>
@@ -30755,7 +31853,7 @@
<comment xml:lang="oc">messatge de corrièr electronic</comment>
<comment xml:lang="pl">Wiadomość e-mail</comment>
<comment xml:lang="pt">mensagem de email</comment>
- <comment xml:lang="pt_BR">Mensagem de e-mail</comment>
+ <comment xml:lang="pt-BR">Mensagem de e-mail</comment>
<comment xml:lang="ro">mesaj email</comment>
<comment xml:lang="ru">Почтовое сообщение</comment>
<comment xml:lang="sk">E-mailová správa</comment>
@@ -30766,29 +31864,30 @@
<comment xml:lang="tr">eposta iletisi</comment>
<comment xml:lang="uk">повідомлення email</comment>
<comment xml:lang="vi">thư điện tử</comment>
- <comment xml:lang="zh_CN">电子邮件</comment>
- <comment xml:lang="zh_TW">電子郵件內容</comment>
+ <comment xml:lang="zh-CN">电子邮件</comment>
+ <comment xml:lang="zh-TW">電子郵件內容</comment>
<generic-icon name="text-x-generic"/>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="#! rnews" type="string" offset="0"/>
- <match value="Forward to" type="string" offset="0"/>
- <match value="From:" type="string" offset="0"/>
- <match value="N#! rnews" type="string" offset="0"/>
- <match value="Pipe to" type="string" offset="0"/>
- <match value="Received:" type="string" offset="0"/>
- <match value="Relay-Version:" type="string" offset="0"/>
- <match value="Return-Path:" type="string" offset="0"/>
- <match value="Return-path:" type="string" offset="0"/>
- <match value="Subject: " type="string" offset="0"/>
+ <match type="string" value="#! rnews" offset="0"/>
+ <match type="string" value="Forward to" offset="0"/>
+ <match type="string" value="From:" offset="0"/>
+ <match type="string" value="N#! rnews" offset="0"/>
+ <match type="string" value="Pipe to" offset="0"/>
+ <match type="string" value="Received:" offset="0"/>
+ <match type="string" value="Relay-Version:" offset="0"/>
+ <match type="string" value="Return-Path:" offset="0"/>
+ <match type="string" value="Return-path:" offset="0"/>
+ <match type="string" value="Subject: " offset="0"/>
</magic>
<glob pattern="*.eml"/>
</mime-type>
<mime-type type="message/x-gnu-rmail">
<comment>GNU mail message</comment>
+ <comment xml:lang="af">GNU-posboodskap</comment>
<comment xml:lang="ar">رسالة بريد جنو</comment>
<comment xml:lang="az">GNU poçt ismarışı</comment>
- <comment xml:lang="be@latin">List GNU</comment>
+ <comment xml:lang="be-Latn">List GNU</comment>
<comment xml:lang="bg">Съобщение — GNU mail</comment>
<comment xml:lang="ca">missatge de GNU mail</comment>
<comment xml:lang="cs">zpráva GNU mail</comment>
@@ -30796,13 +31895,14 @@
<comment xml:lang="da">GNU-postmeddelelse</comment>
<comment xml:lang="de">GNU-Mail-Nachricht</comment>
<comment xml:lang="el">Μήνυμα αλληλογραφίας GNU</comment>
- <comment xml:lang="en_GB">GNU mail message</comment>
+ <comment xml:lang="en-GB">GNU mail message</comment>
<comment xml:lang="eo">mesaĝo de GNU mail</comment>
<comment xml:lang="es">mensaje de correo de GNU</comment>
<comment xml:lang="eu">GNU posta mezua</comment>
<comment xml:lang="fi">GNU-postiviesti</comment>
<comment xml:lang="fo">GNU mail boð</comment>
<comment xml:lang="fr">message de courriel GNU</comment>
+ <comment xml:lang="fur">messaç di pueste GNU</comment>
<comment xml:lang="ga">teachtaireacht r-phoist GNU</comment>
<comment xml:lang="gl">mensaxe de correo electrónico de GNU</comment>
<comment xml:lang="he">הודעת דואר של GNU</comment>
@@ -30824,7 +31924,7 @@
<comment xml:lang="oc">messatge de corrièr electronic GNU</comment>
<comment xml:lang="pl">Wiadomość pocztowa GNU</comment>
<comment xml:lang="pt">mensagem de email GNU</comment>
- <comment xml:lang="pt_BR">Mensagem de e-mail GNU</comment>
+ <comment xml:lang="pt-BR">Mensagem de e-mail GNU</comment>
<comment xml:lang="ro">Mesaj GNU mail</comment>
<comment xml:lang="ru">Почтовое сообщение GNU</comment>
<comment xml:lang="sk">Správa GNU mail</comment>
@@ -30835,58 +31935,63 @@
<comment xml:lang="tr">GNU posta iletisi</comment>
<comment xml:lang="uk">поштове повідомлення GNU</comment>
<comment xml:lang="vi">Thư điện tử của GNU</comment>
- <comment xml:lang="zh_CN">GNU mail 信件</comment>
- <comment xml:lang="zh_TW">GNU 郵件訊息</comment>
+ <comment xml:lang="zh-CN">GNU mail 信件</comment>
+ <comment xml:lang="zh-TW">GNU 郵件訊息</comment>
<generic-icon name="text-x-generic"/>
<glob pattern="RMAIL"/>
</mime-type>
<mime-type type="model/iges">
<comment>IGES document</comment>
+ <comment xml:lang="af">IGES-dokument</comment>
<comment xml:lang="ast">Documentu IGES</comment>
+ <comment xml:lang="bg">Документ — IGES</comment>
<comment xml:lang="ca">document IGES</comment>
<comment xml:lang="cs">dokument IGES</comment>
<comment xml:lang="da">IGES-dokument</comment>
<comment xml:lang="de">IGES-Dokument</comment>
- <comment xml:lang="en_GB">IGES document</comment>
+ <comment xml:lang="en-GB">IGES document</comment>
<comment xml:lang="es">documento IGES</comment>
<comment xml:lang="eu">IGES dokumentua</comment>
<comment xml:lang="fi">IGES-asiakirja</comment>
<comment xml:lang="fr">document IGES</comment>
+ <comment xml:lang="fur">document IGES</comment>
<comment xml:lang="ga">cáipéis IGES</comment>
<comment xml:lang="he">מסמך IGES</comment>
<comment xml:lang="hr">IGES dokument</comment>
<comment xml:lang="hu">IGES dokumentum</comment>
- <comment xml:lang="id">dokumen IGES</comment>
+ <comment xml:lang="id">Dokumen IGES</comment>
<comment xml:lang="it">Documento IGES</comment>
<comment xml:lang="kk">IGES құжаты</comment>
<comment xml:lang="ko">IGES 문서</comment>
<comment xml:lang="pl">Dokument IGES</comment>
- <comment xml:lang="pt_BR">Documento IGES</comment>
+ <comment xml:lang="pt-BR">Documento IGES</comment>
<comment xml:lang="ru">Документ IGES</comment>
<comment xml:lang="sk">Dokument IGES</comment>
+ <comment xml:lang="sl">Dokument IGES</comment>
<comment xml:lang="sr">ИГЕС документ</comment>
<comment xml:lang="sv">IGES-dokument</comment>
<comment xml:lang="tr">IGES belgesi</comment>
<comment xml:lang="uk">документ IGES</comment>
- <comment xml:lang="zh_CN">IGES 文档</comment>
- <comment xml:lang="zh_TW">IGES 文件</comment>
+ <comment xml:lang="zh-CN">IGES 文档</comment>
+ <comment xml:lang="zh-TW">IGES 文件</comment>
<acronym>IGES</acronym>
<expanded-acronym>Initial Graphics Exchange Specification</expanded-acronym>
<generic-icon name="x-office-document"/>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="S 1\x0a" type="string" offset="72"/>
- <match value="S0000001\x0a" type="string" offset="72"/>
+ <match type="string" value="S 1\x0a" offset="72"/>
+ <match type="string" value="S0000001\x0a" offset="72"/>
</magic>
<glob pattern="*.igs"/>
<glob pattern="*.iges"/>
</mime-type>
<mime-type type="model/vrml">
<comment>VRML document</comment>
+ <comment xml:lang="af">VRML-dokument</comment>
<comment xml:lang="ar">مستند VRML</comment>
<comment xml:lang="ast">Documentu VRML</comment>
<comment xml:lang="az">VRML sənədi</comment>
- <comment xml:lang="be@latin">Dakument VRML</comment>
+ <comment xml:lang="be-Latn">Dakument VRML</comment>
<comment xml:lang="bg">Документ — VRML</comment>
<comment xml:lang="ca">document VRML</comment>
<comment xml:lang="cs">dokument VRML</comment>
@@ -30894,13 +31999,14 @@
<comment xml:lang="da">VRML-dokument</comment>
<comment xml:lang="de">VRML-Dokument</comment>
<comment xml:lang="el">Έγγραφο VRML</comment>
- <comment xml:lang="en_GB">VRML document</comment>
+ <comment xml:lang="en-GB">VRML document</comment>
<comment xml:lang="eo">VRML-dokumento</comment>
<comment xml:lang="es">documento VRML</comment>
<comment xml:lang="eu">VRML dokumentua</comment>
<comment xml:lang="fi">VRML-asiakirja</comment>
<comment xml:lang="fo">VRML skjal</comment>
<comment xml:lang="fr">document VRML</comment>
+ <comment xml:lang="fur">document VRML</comment>
<comment xml:lang="ga">cáipéis VRML</comment>
<comment xml:lang="gl">documento VRML</comment>
<comment xml:lang="he">מסמך VRML</comment>
@@ -30921,7 +32027,7 @@
<comment xml:lang="oc">document VRML</comment>
<comment xml:lang="pl">Dokument VRML</comment>
<comment xml:lang="pt">documento VRML</comment>
- <comment xml:lang="pt_BR">Documento VRML</comment>
+ <comment xml:lang="pt-BR">Documento VRML</comment>
<comment xml:lang="ro">Document VRML</comment>
<comment xml:lang="ru">Документ VRML</comment>
<comment xml:lang="sk">Dokument VRML</comment>
@@ -30932,14 +32038,14 @@
<comment xml:lang="tr">VRML belgesi</comment>
<comment xml:lang="uk">документ VRML</comment>
<comment xml:lang="vi">Tài liệu VRML</comment>
- <comment xml:lang="zh_CN">VRML 文档</comment>
- <comment xml:lang="zh_TW">VRML 文件</comment>
+ <comment xml:lang="zh-CN">VRML 文档</comment>
+ <comment xml:lang="zh-TW">VRML 文件</comment>
<acronym>VRML</acronym>
<expanded-acronym>Virtual Reality Modeling Language</expanded-acronym>
<generic-icon name="x-office-document"/>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="#VRML " type="string" offset="0"/>
+ <match type="string" value="#VRML " offset="0"/>
</magic>
<glob pattern="*.vrm"/>
<glob pattern="*.vrml"/>
@@ -30947,9 +32053,10 @@
</mime-type>
<mime-type type="multipart/alternative">
<comment>message in several formats</comment>
+ <comment xml:lang="af">boodskap in verskeie formate</comment>
<comment xml:lang="ar">رسالة في عدة صيغ</comment>
<comment xml:lang="az">verici formatlarında ismarış</comment>
- <comment xml:lang="be@latin">paviedamleńnie ŭ niekalkich farmatach</comment>
+ <comment xml:lang="be-Latn">paviedamleńnie ŭ niekalkich farmatach</comment>
<comment xml:lang="bg">Съобщение в няколко формата</comment>
<comment xml:lang="ca">missatge en diversos formats</comment>
<comment xml:lang="cs">zpráva v několika formátech</comment>
@@ -30957,13 +32064,14 @@
<comment xml:lang="da">meddelelse i flere formater</comment>
<comment xml:lang="de">Nachricht in mehreren Formaten</comment>
<comment xml:lang="el">Μήνυμα σε διάφορες μορφές</comment>
- <comment xml:lang="en_GB">message in several formats</comment>
+ <comment xml:lang="en-GB">message in several formats</comment>
<comment xml:lang="eo">mesaĝo en pluraj formatoj</comment>
<comment xml:lang="es">mensaje en varios formatos</comment>
<comment xml:lang="eu">hainbat formatuko mezua</comment>
<comment xml:lang="fi">viesti useissa muodoissa</comment>
<comment xml:lang="fo">boð í fleiri sniðum</comment>
<comment xml:lang="fr">message en formats divers</comment>
+ <comment xml:lang="fur">messaç in diviers formâts</comment>
<comment xml:lang="ga">teachtaireacht i bhformáidí éagsúla</comment>
<comment xml:lang="gl">mensaxe en varios formatos</comment>
<comment xml:lang="he">הודעה במספר תבניות</comment>
@@ -30974,7 +32082,7 @@
<comment xml:lang="it">Messaggio in diversi formati</comment>
<comment xml:lang="ja">いくつかの形式でのメッセージ</comment>
<comment xml:lang="kk">бірнеше пішімдегі мәлімдеме</comment>
- <comment xml:lang="ko">여러가지 형식의 메시지</comment>
+ <comment xml:lang="ko">여러 가지 형식의 메시지</comment>
<comment xml:lang="lt">laiškas keletu formatų</comment>
<comment xml:lang="lv">ziņojums dažādos formātos</comment>
<comment xml:lang="ms">Mesej dalam beberapa format</comment>
@@ -30984,7 +32092,7 @@
<comment xml:lang="oc">messatge en formats divèrses</comment>
<comment xml:lang="pl">Wiadomość w wielu formatach</comment>
<comment xml:lang="pt">mensagem em vários formatos</comment>
- <comment xml:lang="pt_BR">Mensagem em vários formatos</comment>
+ <comment xml:lang="pt-BR">Mensagem em vários formatos</comment>
<comment xml:lang="ro">mesaj în diferite formate</comment>
<comment xml:lang="ru">Сообщение в нескольких форматах</comment>
<comment xml:lang="sk">Správa v niekoľkých formátoch</comment>
@@ -30995,14 +32103,15 @@
<comment xml:lang="tr">farklı biçimlerde ileti</comment>
<comment xml:lang="uk">повідомлення у кількох форматах</comment>
<comment xml:lang="vi">thông điệp có vài định dạng</comment>
- <comment xml:lang="zh_CN">各种格式的信件</comment>
- <comment xml:lang="zh_TW">多種格式的訊息</comment>
+ <comment xml:lang="zh-CN">各种格式的信件</comment>
+ <comment xml:lang="zh-TW">多種格式的訊息</comment>
</mime-type>
<mime-type type="multipart/appledouble">
<comment>Macintosh AppleDouble-encoded file</comment>
+ <comment xml:lang="af">Macintosh AppleDouble-geënkodeerde lêer</comment>
<comment xml:lang="ar">ملف Macintosh AppleDouble مشفر</comment>
<comment xml:lang="az">Macintosh AppleDouble-kodlanmış fayl</comment>
- <comment xml:lang="be@latin">Fajł Macintosh, AppleDouble-zakadavany</comment>
+ <comment xml:lang="be-Latn">Fajł Macintosh, AppleDouble-zakadavany</comment>
<comment xml:lang="bg">Файл — кодиран с Macintosh AppleDouble</comment>
<comment xml:lang="ca">fitxer codificat AppleDouble de Macintosh</comment>
<comment xml:lang="cs">soubor kódovaný pomocí Macintosh AppleDouble</comment>
@@ -31010,17 +32119,18 @@
<comment xml:lang="da">Macintosh AppleDouble-kodet fil</comment>
<comment xml:lang="de">Macintosh-Datei (AppleDouble-kodiert)</comment>
<comment xml:lang="el">Αρχείο Macintosh κωδικοποίησης AppleDouble</comment>
- <comment xml:lang="en_GB">Macintosh AppleDouble-encoded file</comment>
+ <comment xml:lang="en-GB">Macintosh AppleDouble-encoded file</comment>
<comment xml:lang="eo">dosiero kodigita laŭ Macintosh AppleDouble</comment>
<comment xml:lang="es">archivo Macintosh codificado con AppleDouble</comment>
<comment xml:lang="eu">Macintosh AppleDouble-rekin kodetutako fitxategia</comment>
<comment xml:lang="fi">Macintosh AppleDouble -koodattu tiedosto</comment>
<comment xml:lang="fo">Macintosh AppleDouble-bronglað fíla</comment>
<comment xml:lang="fr">fichier codé Macintosh AppleDouble</comment>
+ <comment xml:lang="fur">file codificât in Macintosh AppleDouble</comment>
<comment xml:lang="ga">comhad ionchódaithe le Macintosh AppleDouble</comment>
<comment xml:lang="gl">ficheiro de Macintosh codificado con AppleDouble</comment>
<comment xml:lang="he">קובץ מסוג Macintosh AppleDouble-encoded</comment>
- <comment xml:lang="hr">Macintosh AppleDouble-kodirana datoteka</comment>
+ <comment xml:lang="hr">Macintosh AppleDouble-kôdirana datoteka</comment>
<comment xml:lang="hu">Macintosh AppleDouble kódolású fájl</comment>
<comment xml:lang="ia">File codificate in AppleDouble de Macintosh</comment>
<comment xml:lang="id">Berkas tersandi Macintosh AppleDouble</comment>
@@ -31037,7 +32147,7 @@
<comment xml:lang="oc">fichièr encodat Macintosh AppleDouble</comment>
<comment xml:lang="pl">Zakodowany w AppleDouble plik Macintosh</comment>
<comment xml:lang="pt">ficheiro codificado em AppleDouble de Macintosh</comment>
- <comment xml:lang="pt_BR">Arquivo do Macintosh codificado com AppleDouble</comment>
+ <comment xml:lang="pt-BR">Arquivo do Macintosh codificado com AppleDouble</comment>
<comment xml:lang="ro">Fișier codat Macintosh AppleDouble</comment>
<comment xml:lang="ru">Файл, закодированный Macintosh AppleDouble</comment>
<comment xml:lang="sk">Súbor kódovaný pomocou Macintosh AppleDouble</comment>
@@ -31048,14 +32158,14 @@
<comment xml:lang="tr">Macintosh AppleDouble-şifreli dosyası</comment>
<comment xml:lang="uk">файл закодований Macintosh AppleDouble</comment>
<comment xml:lang="vi">Tập tin đã mã hoá Apple-Double của Macintosh</comment>
- <comment xml:lang="zh_CN">Macintosh AppleDouble 编码的文件</comment>
- <comment xml:lang="zh_TW">Macintosh AppleDouble 編碼檔</comment>
+ <comment xml:lang="zh-CN">Macintosh AppleDouble 编码的文件</comment>
+ <comment xml:lang="zh-TW">Macintosh AppleDouble 編碼檔</comment>
</mime-type>
<mime-type type="multipart/digest">
<comment>message digest</comment>
<comment xml:lang="ar">خلاصة الرسالة</comment>
<comment xml:lang="az">ismarış daycesti</comment>
- <comment xml:lang="be@latin">digest paviedamleńniaŭ</comment>
+ <comment xml:lang="be-Latn">digest paviedamleńniaŭ</comment>
<comment xml:lang="bg">Извадка от съобщение</comment>
<comment xml:lang="ca">recopilació de missatges</comment>
<comment xml:lang="cs">přehled zpráv</comment>
@@ -31063,13 +32173,14 @@
<comment xml:lang="da">meddelelsessammendrag</comment>
<comment xml:lang="de">Nachrichtensammlung</comment>
<comment xml:lang="el">Περίληψη μηνύματος</comment>
- <comment xml:lang="en_GB">message digest</comment>
+ <comment xml:lang="en-GB">message digest</comment>
<comment xml:lang="eo">mesaĝaro</comment>
<comment xml:lang="es">recopilación de mensajes</comment>
<comment xml:lang="eu">mezu laburra</comment>
<comment xml:lang="fi">viestikokoelma</comment>
<comment xml:lang="fo">boð samandráttur</comment>
<comment xml:lang="fr">condensé de message</comment>
+ <comment xml:lang="fur">sunt di messaç</comment>
<comment xml:lang="ga">achoimre theachtaireachtaí</comment>
<comment xml:lang="gl">recompilación de mensaxe</comment>
<comment xml:lang="he">תקציר ההודעה</comment>
@@ -31090,7 +32201,7 @@
<comment xml:lang="oc">condensé de messatge</comment>
<comment xml:lang="pl">Wiadomość przetwarzania</comment>
<comment xml:lang="pt">grupo de mensagens</comment>
- <comment xml:lang="pt_BR">Resumo de mensagem</comment>
+ <comment xml:lang="pt-BR">Resumo de mensagem</comment>
<comment xml:lang="ro">colecție mesaje email</comment>
<comment xml:lang="ru">Дайджест сообщения</comment>
<comment xml:lang="sk">Prehľad správ</comment>
@@ -31098,17 +32209,18 @@
<comment xml:lang="sq">Shpërndarje mesazhesh</comment>
<comment xml:lang="sr">гомила порука</comment>
<comment xml:lang="sv">meddelandesamling</comment>
- <comment xml:lang="tr">mesaj özeti</comment>
+ <comment xml:lang="tr">ileti özeti</comment>
<comment xml:lang="uk">збірка повідомлень</comment>
<comment xml:lang="vi">bản tóm tắt thông điệp</comment>
- <comment xml:lang="zh_CN">信件摘要</comment>
- <comment xml:lang="zh_TW">訊息摘要</comment>
+ <comment xml:lang="zh-CN">信件摘要</comment>
+ <comment xml:lang="zh-TW">訊息摘要</comment>
</mime-type>
<mime-type type="multipart/encrypted">
<comment>encrypted message</comment>
+ <comment xml:lang="af">geënkripteerde boodskap</comment>
<comment xml:lang="ar">رسالة مشفرة</comment>
<comment xml:lang="az">şifrələnmiş ismarış</comment>
- <comment xml:lang="be@latin">zašyfravanaje paviedamleńnie</comment>
+ <comment xml:lang="be-Latn">zašyfravanaje paviedamleńnie</comment>
<comment xml:lang="bg">Шифрирано съобщение</comment>
<comment xml:lang="ca">missatge xifrat</comment>
<comment xml:lang="cs">zašifrovaná zpráva</comment>
@@ -31116,13 +32228,14 @@
<comment xml:lang="da">krypteret meddelelse</comment>
<comment xml:lang="de">Verschlüsselte Nachricht</comment>
<comment xml:lang="el">Κρυπτογραφημένο μήνυμα</comment>
- <comment xml:lang="en_GB">encrypted message</comment>
+ <comment xml:lang="en-GB">encrypted message</comment>
<comment xml:lang="eo">ĉifrita mesaĝo</comment>
<comment xml:lang="es">mensaje cifrado</comment>
- <comment xml:lang="eu">mezu enkriptatua</comment>
+ <comment xml:lang="eu">zifratutako mezua</comment>
<comment xml:lang="fi">salattu viesti</comment>
<comment xml:lang="fo">bronglað boð</comment>
<comment xml:lang="fr">message chiffré</comment>
+ <comment xml:lang="fur">messaç cifrât</comment>
<comment xml:lang="ga">teachtaireacht chriptithe</comment>
<comment xml:lang="gl">mensaxe cifrado</comment>
<comment xml:lang="he">הודעה מוצפנת</comment>
@@ -31143,7 +32256,7 @@
<comment xml:lang="oc">messatge chifrat</comment>
<comment xml:lang="pl">Wiadomość zaszyfrowana</comment>
<comment xml:lang="pt">mensagem encriptada</comment>
- <comment xml:lang="pt_BR">Mensagem criptografada</comment>
+ <comment xml:lang="pt-BR">Mensagem criptografada</comment>
<comment xml:lang="ro">mesaj criptat</comment>
<comment xml:lang="ru">Зашифрованное сообщение</comment>
<comment xml:lang="sk">Zašifrovaná správa</comment>
@@ -31151,30 +32264,32 @@
<comment xml:lang="sq">Mesazh i kriptuar</comment>
<comment xml:lang="sr">шифрована порука</comment>
<comment xml:lang="sv">krypterat meddelande</comment>
- <comment xml:lang="tr">şifrelenmiş mesaj</comment>
+ <comment xml:lang="tr">şifrelenmiş ileti</comment>
<comment xml:lang="uk">шифроване повідомлення</comment>
<comment xml:lang="vi">thông điệp đã mật mã</comment>
- <comment xml:lang="zh_CN">加密信件</comment>
- <comment xml:lang="zh_TW">加密訊息</comment>
+ <comment xml:lang="zh-CN">加密信件</comment>
+ <comment xml:lang="zh-TW">加密訊息</comment>
</mime-type>
<mime-type type="multipart/mixed">
<comment>compound documents</comment>
+ <comment xml:lang="af">saamgestelde dokumente</comment>
<comment xml:lang="ar">مستندات مركبة</comment>
<comment xml:lang="ast">documentos compuestos</comment>
- <comment xml:lang="be@latin">składanyja dakumenty</comment>
+ <comment xml:lang="be-Latn">składanyja dakumenty</comment>
<comment xml:lang="bg">Съставни документи</comment>
<comment xml:lang="ca">documents compostos</comment>
<comment xml:lang="cs">složené dokumenty</comment>
<comment xml:lang="da">sammensatte dokumenter</comment>
<comment xml:lang="de">Verbunddokumente</comment>
<comment xml:lang="el">Σύνθετα έγγραφα</comment>
- <comment xml:lang="en_GB">compound documents</comment>
+ <comment xml:lang="en-GB">compound documents</comment>
<comment xml:lang="eo">parentezaj dokumentoj</comment>
<comment xml:lang="es">documentos compuestos</comment>
<comment xml:lang="eu">konposatutako dokumentuak</comment>
<comment xml:lang="fi">yhdisteasiakirjat</comment>
<comment xml:lang="fo">samansett skjøl</comment>
<comment xml:lang="fr">documents composés</comment>
+ <comment xml:lang="fur">documents composcj</comment>
<comment xml:lang="ga">cáipéisí comhshuite</comment>
<comment xml:lang="gl">documentos compostos</comment>
<comment xml:lang="he">מסמכים מורכבים</comment>
@@ -31195,7 +32310,7 @@
<comment xml:lang="oc">documents compausats</comment>
<comment xml:lang="pl">Dokumenty złożone</comment>
<comment xml:lang="pt">documentos compostos</comment>
- <comment xml:lang="pt_BR">Documentos compostos</comment>
+ <comment xml:lang="pt-BR">Documentos compostos</comment>
<comment xml:lang="ro">documente compuse</comment>
<comment xml:lang="ru">Составные документы</comment>
<comment xml:lang="sk">Zložené dokumenty</comment>
@@ -31203,18 +32318,19 @@
<comment xml:lang="sq">dokumente të përbërë</comment>
<comment xml:lang="sr">сједињени документи</comment>
<comment xml:lang="sv">sammansatta dokument</comment>
- <comment xml:lang="tr">birleşik belgeleri</comment>
+ <comment xml:lang="tr">bileşik belgeler</comment>
<comment xml:lang="uk">складні документи</comment>
<comment xml:lang="vi">tài liệu ghép</comment>
- <comment xml:lang="zh_CN">组合文档</comment>
- <comment xml:lang="zh_TW">複合文件</comment>
+ <comment xml:lang="zh-CN">组合文档</comment>
+ <comment xml:lang="zh-TW">複合文件</comment>
</mime-type>
<mime-type type="multipart/related">
<comment>compound document</comment>
+ <comment xml:lang="af">saamgestelde dokument</comment>
<comment xml:lang="ar">مستند مركب</comment>
<comment xml:lang="ast">documentu compuestu</comment>
<comment xml:lang="az">birləşik sənəd</comment>
- <comment xml:lang="be@latin">składany dakument</comment>
+ <comment xml:lang="be-Latn">składany dakument</comment>
<comment xml:lang="bg">Съставен документ</comment>
<comment xml:lang="ca">document compost</comment>
<comment xml:lang="cs">složený dokument</comment>
@@ -31222,13 +32338,14 @@
<comment xml:lang="da">sammensat dokument</comment>
<comment xml:lang="de">Verbunddokument</comment>
<comment xml:lang="el">Σύνθετο έγγραφο</comment>
- <comment xml:lang="en_GB">compound document</comment>
+ <comment xml:lang="en-GB">compound document</comment>
<comment xml:lang="eo">parenteza dokumento</comment>
<comment xml:lang="es">documento compuesto</comment>
<comment xml:lang="eu">konposatutako dokumentua</comment>
<comment xml:lang="fi">yhdisteasiakirja</comment>
<comment xml:lang="fo">samansett skjal</comment>
<comment xml:lang="fr">document composé</comment>
+ <comment xml:lang="fur">document compost</comment>
<comment xml:lang="ga">cáipéis comhshuite</comment>
<comment xml:lang="gl">documento composto</comment>
<comment xml:lang="he">מסמך מורכב</comment>
@@ -31249,7 +32366,7 @@
<comment xml:lang="oc">document compausat</comment>
<comment xml:lang="pl">Dokument złożony</comment>
<comment xml:lang="pt">documento composto</comment>
- <comment xml:lang="pt_BR">Documento composto</comment>
+ <comment xml:lang="pt-BR">Documento composto</comment>
<comment xml:lang="ro">document compus</comment>
<comment xml:lang="ru">Составной документ</comment>
<comment xml:lang="sk">Zložený dokument</comment>
@@ -31260,14 +32377,14 @@
<comment xml:lang="tr">bileşik belge</comment>
<comment xml:lang="uk">складний документ</comment>
<comment xml:lang="vi">tài liệu ghép</comment>
- <comment xml:lang="zh_CN">组合文档</comment>
- <comment xml:lang="zh_TW">複合文件</comment>
+ <comment xml:lang="zh-CN">组合文档</comment>
+ <comment xml:lang="zh-TW">複合文件</comment>
</mime-type>
<mime-type type="multipart/report">
<comment>mail system report</comment>
<comment xml:lang="ar">تقرير نظام البريد</comment>
<comment xml:lang="az">poçt sistemi raportu</comment>
- <comment xml:lang="be@latin">rapart paštovaj systemy</comment>
+ <comment xml:lang="be-Latn">rapart paštovaj systemy</comment>
<comment xml:lang="bg">Отчет за пощенската система</comment>
<comment xml:lang="ca">informe de sistema de correu</comment>
<comment xml:lang="cs">zpráva poštovního systému</comment>
@@ -31275,13 +32392,14 @@
<comment xml:lang="da">postsystemrapport</comment>
<comment xml:lang="de">E-Mail-Systembericht</comment>
<comment xml:lang="el">Αναφορά συστήματος ηλ. ταχυδρομείου</comment>
- <comment xml:lang="en_GB">mail system report</comment>
+ <comment xml:lang="en-GB">mail system report</comment>
<comment xml:lang="eo">raporto de retpoŝta sistemo</comment>
<comment xml:lang="es">informe del sistema de correo</comment>
<comment xml:lang="eu">posta sistemako txostena</comment>
<comment xml:lang="fi">viestijärjestelmän ilmoitus</comment>
<comment xml:lang="fo">postkervisfrásøgn</comment>
<comment xml:lang="fr">rapport système de courriels</comment>
+ <comment xml:lang="fur">rapuart di sisteme de pueste</comment>
<comment xml:lang="ga">tuairisc chórais r-phoist</comment>
<comment xml:lang="gl">informe do sistema de correo</comment>
<comment xml:lang="he">דו״ח של מערכת הדואר</comment>
@@ -31302,7 +32420,7 @@
<comment xml:lang="oc">rapòrt sistèma de corrièrs electronics</comment>
<comment xml:lang="pl">Raport systemu pocztowego</comment>
<comment xml:lang="pt">relatório de sistema de email</comment>
- <comment xml:lang="pt_BR">Relatório do sistema de correspondência</comment>
+ <comment xml:lang="pt-BR">Relatório do sistema de correspondência</comment>
<comment xml:lang="ro">raport sistem email</comment>
<comment xml:lang="ru">Отчёт почтовой системы</comment>
<comment xml:lang="sk">Správa poštového systému</comment>
@@ -31313,14 +32431,15 @@
<comment xml:lang="tr">posta sistem raporu</comment>
<comment xml:lang="uk">звіт поштової системи</comment>
<comment xml:lang="vi">thông báo hệ thống thư</comment>
- <comment xml:lang="zh_CN">邮件系统报告</comment>
- <comment xml:lang="zh_TW">郵件系統回報</comment>
+ <comment xml:lang="zh-CN">邮件系统报告</comment>
+ <comment xml:lang="zh-TW">郵件系統回報</comment>
</mime-type>
<mime-type type="multipart/signed">
<comment>signed message</comment>
+ <comment xml:lang="af">getekende boodskap</comment>
<comment xml:lang="ar">رسالة موقّعة</comment>
<comment xml:lang="az">imzalanmış ismarış</comment>
- <comment xml:lang="be@latin">padpisanaje paviedamleńnie</comment>
+ <comment xml:lang="be-Latn">padpisanaje paviedamleńnie</comment>
<comment xml:lang="bg">Подписано съобщение</comment>
<comment xml:lang="ca">missatge signat</comment>
<comment xml:lang="cs">podepsaná zpráva</comment>
@@ -31328,13 +32447,14 @@
<comment xml:lang="da">signeret meddelelse</comment>
<comment xml:lang="de">Signierte Nachricht</comment>
<comment xml:lang="el">Υπογεγραμμένο μήνυμα</comment>
- <comment xml:lang="en_GB">signed message</comment>
+ <comment xml:lang="en-GB">signed message</comment>
<comment xml:lang="eo">pruvita mesaĝo</comment>
<comment xml:lang="es">mensaje firmado</comment>
<comment xml:lang="eu">sinatutako mezua</comment>
<comment xml:lang="fi">allekirjoitettu viesti</comment>
<comment xml:lang="fo">undirskrivað boð</comment>
<comment xml:lang="fr">message signé</comment>
+ <comment xml:lang="fur">messaç firmât</comment>
<comment xml:lang="ga">teachtaireacht sínithe</comment>
<comment xml:lang="gl">mensaxe firmado</comment>
<comment xml:lang="he">הודעה חתומה</comment>
@@ -31355,7 +32475,7 @@
<comment xml:lang="oc">messatge signat</comment>
<comment xml:lang="pl">Podpisana wiadomość</comment>
<comment xml:lang="pt">mensagem assinada</comment>
- <comment xml:lang="pt_BR">Mensagem assinada</comment>
+ <comment xml:lang="pt-BR">Mensagem assinada</comment>
<comment xml:lang="ro">mesaj semnat</comment>
<comment xml:lang="ru">Подписанное сообщение</comment>
<comment xml:lang="sk">Podpísaná správa</comment>
@@ -31366,26 +32486,27 @@
<comment xml:lang="tr">imzalı ileti</comment>
<comment xml:lang="uk">підписане повідомлення</comment>
<comment xml:lang="vi">thông điệp đã ký</comment>
- <comment xml:lang="zh_CN">签名信件</comment>
- <comment xml:lang="zh_TW">簽署的訊息</comment>
+ <comment xml:lang="zh-CN">签名信件</comment>
+ <comment xml:lang="zh-TW">已簽署的訊息</comment>
</mime-type>
<mime-type type="multipart/x-mixed-replace">
<comment>stream of data (server push)</comment>
<comment xml:lang="ar">دفق بيانات (دفع خادم)</comment>
- <comment xml:lang="be@latin">płyń źviestak (ad servera)</comment>
- <comment xml:lang="bg">Поток от данни, от страна на сървър</comment>
+ <comment xml:lang="be-Latn">płyń źviestak (ad servera)</comment>
+ <comment xml:lang="bg">Поток от данни — пратени от сървър</comment>
<comment xml:lang="ca">flux de dades (enviat pel servidor)</comment>
<comment xml:lang="cs">proud dat (posílaný serverem)</comment>
<comment xml:lang="da">datastrøm (serverskubbet)</comment>
<comment xml:lang="de">Datenstrom (Server-Push)</comment>
<comment xml:lang="el">Ροή δεδομένων (στελλόμενα από διακομιστή)</comment>
- <comment xml:lang="en_GB">stream of data (server push)</comment>
+ <comment xml:lang="en-GB">stream of data (server push)</comment>
<comment xml:lang="eo">datumstrio (puŝata per servilo)</comment>
<comment xml:lang="es">flujo de datos (por iniciativa del servidor)</comment>
<comment xml:lang="eu">datu-korrontea (zerbitzari igortzailea)</comment>
<comment xml:lang="fi">tietovirta (palvelin työntää)</comment>
<comment xml:lang="fo">streymur av dáta (ambætara skump)</comment>
<comment xml:lang="fr">flux de données (émis par le serveur)</comment>
+ <comment xml:lang="fur">flus di dâts (pe iniziative dal servidôr)</comment>
<comment xml:lang="ga">sruth sonraí (brú freastalaí)</comment>
<comment xml:lang="gl">fluxo de datos (por iniciativa do servidor)</comment>
<comment xml:lang="he">מידע בזרימה (דחיפה ע״י השרת)</comment>
@@ -31406,7 +32527,7 @@
<comment xml:lang="oc">flux de donadas (emés pel servidor)</comment>
<comment xml:lang="pl">Strumień danych (wymuszenie serwera)</comment>
<comment xml:lang="pt">fluxo de dados (empurrados pelo servidor)</comment>
- <comment xml:lang="pt_BR">Fluxo de dados (por iniciativa do servidor)</comment>
+ <comment xml:lang="pt-BR">Fluxo de dados (por iniciativa do servidor)</comment>
<comment xml:lang="ro">flux de date (de la server)</comment>
<comment xml:lang="ru">Поток данных (server push)</comment>
<comment xml:lang="sk">Prúd dát (posielaný serverom)</comment>
@@ -31417,26 +32538,28 @@
<comment xml:lang="tr">veri akışı (sunucudan gönderilen)</comment>
<comment xml:lang="uk">потік даних (від сервера)</comment>
<comment xml:lang="vi">luồng dữ liệu (trình phục vụ đẩy)</comment>
- <comment xml:lang="zh_CN">数据流（服务器推送）</comment>
- <comment xml:lang="zh_TW">資料串流 (server push)</comment>
+ <comment xml:lang="zh-CN">数据流（服务器推送）</comment>
+ <comment xml:lang="zh-TW">資料串流 (server push)</comment>
</mime-type>
<mime-type type="text/calendar">
<comment>VCS/ICS calendar</comment>
+ <comment xml:lang="af">VCS/ICS-kalender</comment>
<comment xml:lang="ar">سجل VCS/ICS</comment>
- <comment xml:lang="be@latin">Kalandar VCS/ICS</comment>
+ <comment xml:lang="be-Latn">Kalandar VCS/ICS</comment>
<comment xml:lang="bg">Календар — VCS/ICS</comment>
<comment xml:lang="ca">calendari VCS/ICS</comment>
<comment xml:lang="cs">kalendář VCS/ICS</comment>
<comment xml:lang="da">VCS/ICS-kalender</comment>
<comment xml:lang="de">VCS/ICS-Kalender</comment>
<comment xml:lang="el">Ημερολόγιο VCS/ICS</comment>
- <comment xml:lang="en_GB">VCS/ICS calendar</comment>
+ <comment xml:lang="en-GB">VCS/ICS calendar</comment>
<comment xml:lang="eo">VCS/ICS-kalendaro</comment>
<comment xml:lang="es">calendario VCS/ICS</comment>
<comment xml:lang="eu">VCS/ICS egutegia</comment>
<comment xml:lang="fi">VCS/ICS-kalenteri</comment>
<comment xml:lang="fo">VCS/ICS kalendari</comment>
<comment xml:lang="fr">calendrier VCS/ICS</comment>
+ <comment xml:lang="fur">calendari VCS/ICS</comment>
<comment xml:lang="ga">féilire VCS/ICS</comment>
<comment xml:lang="gl">Calendario VCS/ICS</comment>
<comment xml:lang="he">לוח שנה VCS/ICS</comment>
@@ -31456,7 +32579,7 @@
<comment xml:lang="oc">calendièr VCS/ICS</comment>
<comment xml:lang="pl">Kalendarz VCS/ICS</comment>
<comment xml:lang="pt">calendário VCS/ICS</comment>
- <comment xml:lang="pt_BR">Calendário VCS/ICS</comment>
+ <comment xml:lang="pt-BR">Calendário VCS/ICS</comment>
<comment xml:lang="ro">Calendar VCS/ICS</comment>
<comment xml:lang="ru">Календарь VCS/ICS</comment>
<comment xml:lang="sk">Kalendár VCS/ICS</comment>
@@ -31467,37 +32590,39 @@
<comment xml:lang="tr">VCS/ICS takvimi</comment>
<comment xml:lang="uk">календар VCS/ICS</comment>
<comment xml:lang="vi">Lịch VCS/ICS</comment>
- <comment xml:lang="zh_CN">VCS/ICS 日历</comment>
- <comment xml:lang="zh_TW">VCS/ICS 行事曆</comment>
+ <comment xml:lang="zh-CN">VCS/ICS 日历</comment>
+ <comment xml:lang="zh-TW">VCS/ICS 行事曆</comment>
<acronym>VCS/ICS</acronym>
<expanded-acronym>vCalendar/iCalendar</expanded-acronym>
<sub-class-of type="text/plain"/>
<alias type="text/x-vcalendar"/>
<alias type="application/ics"/>
<magic priority="50">
- <match value="BEGIN:VCALENDAR" type="string" offset="0"/>
- <match value="begin:vcalendar" type="string" offset="0"/>
+ <match type="string" value="BEGIN:VCALENDAR" offset="0"/>
+ <match type="string" value="begin:vcalendar" offset="0"/>
</magic>
<glob pattern="*.vcs"/>
<glob pattern="*.ics"/>
</mime-type>
<mime-type type="text/css">
<comment>CSS stylesheet</comment>
+ <comment xml:lang="af">CSS-stylblad</comment>
<comment xml:lang="ar">نمط CSS</comment>
- <comment xml:lang="be@latin">Arkuš stylaŭ CSS</comment>
+ <comment xml:lang="be-Latn">Arkuš stylaŭ CSS</comment>
<comment xml:lang="bg">Стилове — CSS</comment>
<comment xml:lang="ca">llista d'estil CSS</comment>
<comment xml:lang="cs">stylopis CSS</comment>
<comment xml:lang="da">CSS-stilark</comment>
<comment xml:lang="de">CSS-Stilvorlage</comment>
<comment xml:lang="el">Φύλλο στυλ CSS</comment>
- <comment xml:lang="en_GB">CSS stylesheet</comment>
+ <comment xml:lang="en-GB">CSS stylesheet</comment>
<comment xml:lang="eo">CSS-stilfolio</comment>
<comment xml:lang="es">hoja de estilos CSS</comment>
<comment xml:lang="eu">CSS estilo-orria</comment>
<comment xml:lang="fi">CSS-tyylitiedosto</comment>
<comment xml:lang="fo">CSS sniðark</comment>
<comment xml:lang="fr">feuille de style CSS</comment>
+ <comment xml:lang="fur">sfuei di stîl CSS</comment>
<comment xml:lang="ga">stílbhileog CSS</comment>
<comment xml:lang="gl">folla de estilos CSS</comment>
<comment xml:lang="he">גליון עיצוב CSS</comment>
@@ -31518,7 +32643,7 @@
<comment xml:lang="oc">fuèlh d'estil CSS</comment>
<comment xml:lang="pl">Arkusz stylów CSS</comment>
<comment xml:lang="pt">folha de estilos CSS</comment>
- <comment xml:lang="pt_BR">Folha de estilo CSS</comment>
+ <comment xml:lang="pt-BR">Folha de estilo CSS</comment>
<comment xml:lang="ro">Pagină de stil CSS</comment>
<comment xml:lang="ru">Таблица стилей CSS</comment>
<comment xml:lang="sk">Štýly CSS</comment>
@@ -31529,8 +32654,8 @@
<comment xml:lang="tr">CSS stil kağıdı</comment>
<comment xml:lang="uk">таблиця стилів CSS</comment>
<comment xml:lang="vi">Tờ kiểu dáng CSS</comment>
- <comment xml:lang="zh_CN">CSS 样式表</comment>
- <comment xml:lang="zh_TW">CSS 樣式表</comment>
+ <comment xml:lang="zh-CN">CSS 样式表</comment>
+ <comment xml:lang="zh-TW">CSS 樣式表</comment>
<acronym>CSS</acronym>
<expanded-acronym>Cascading Style Sheets</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -31538,21 +32663,23 @@
</mime-type>
<mime-type type="text/vcard">
<comment>electronic business card</comment>
+ <comment xml:lang="af">elektroniese beskigheidskaartjie</comment>
<comment xml:lang="ar">بطاقة أعمال إلكترونية</comment>
- <comment xml:lang="be@latin">elektronnaja biznes-kartka</comment>
+ <comment xml:lang="be-Latn">elektronnaja biznes-kartka</comment>
<comment xml:lang="bg">Електронна визитна картичка</comment>
<comment xml:lang="ca">targeta de visita electrònica</comment>
<comment xml:lang="cs">elektronická navštívenka</comment>
<comment xml:lang="da">elektronisk visitkort</comment>
<comment xml:lang="de">Elektronische Visitenkarte</comment>
<comment xml:lang="el">Ηλεκτρονική επαγγελματική κάρτα</comment>
- <comment xml:lang="en_GB">electronic business card</comment>
+ <comment xml:lang="en-GB">electronic business card</comment>
<comment xml:lang="eo">elektronika vizitkarto</comment>
<comment xml:lang="es">tarjeta de visita electrónica</comment>
<comment xml:lang="eu">enpresako txartel elektronikoa</comment>
<comment xml:lang="fi">sähköinen käyntikortti</comment>
<comment xml:lang="fo">elektroniskt handilskort</comment>
<comment xml:lang="fr">carte de visite électronique</comment>
+ <comment xml:lang="fur">biliet di visite eletronic</comment>
<comment xml:lang="ga">cárta gnó leictreonach</comment>
<comment xml:lang="gl">tarxeta de negocio electrónica</comment>
<comment xml:lang="he">כרטיס ביקור אלקטרוני</comment>
@@ -31571,7 +32698,7 @@
<comment xml:lang="oc">carta de visita electronica</comment>
<comment xml:lang="pl">Wizytówka elektroniczna</comment>
<comment xml:lang="pt">cartão de visita eletrónico</comment>
- <comment xml:lang="pt_BR">Cartão de visitas eletrônico</comment>
+ <comment xml:lang="pt-BR">Cartão de visitas eletrônico</comment>
<comment xml:lang="ro">carte de vizită electronică</comment>
<comment xml:lang="ru">Электронная визитная карточка</comment>
<comment xml:lang="sk">Elektronická vizitka</comment>
@@ -31582,14 +32709,14 @@
<comment xml:lang="tr">elektronik iş kartı</comment>
<comment xml:lang="uk">електронна бізнес-картка</comment>
<comment xml:lang="vi">danh thiếp điện tử</comment>
- <comment xml:lang="zh_CN">电子商务卡</comment>
- <comment xml:lang="zh_TW">電子商務名片</comment>
+ <comment xml:lang="zh-CN">电子商务卡</comment>
+ <comment xml:lang="zh-TW">電子商務名片</comment>
<alias type="text/directory"/>
<alias type="text/x-vcard"/>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="BEGIN:VCARD" type="string" offset="0"/>
- <match value="begin:vcard" type="string" offset="0"/>
+ <match type="string" value="BEGIN:VCARD" offset="0"/>
+ <match type="string" value="begin:vcard" offset="0"/>
</magic>
<glob pattern="*.vcard"/>
<glob pattern="*.vcf"/>
@@ -31598,17 +32725,20 @@
</mime-type>
<mime-type type="text/turtle">
<comment>Turtle document</comment>
+ <comment xml:lang="af">Turtle-dokument</comment>
<comment xml:lang="ast">Documentu Turtle</comment>
+ <comment xml:lang="bg">Документ — Turtle</comment>
<comment xml:lang="ca">document Turtle</comment>
<comment xml:lang="cs">dokument Turtle</comment>
<comment xml:lang="da">Turtle-dokument</comment>
<comment xml:lang="de">Turtle-Dokument</comment>
<comment xml:lang="el">Έγγραφο Turtle</comment>
- <comment xml:lang="en_GB">Turtle document</comment>
+ <comment xml:lang="en-GB">Turtle document</comment>
<comment xml:lang="es">documento de Turtle</comment>
<comment xml:lang="eu">Turtle dokumentua</comment>
<comment xml:lang="fi">Turtle-asiakirja</comment>
<comment xml:lang="fr">document Turtle</comment>
+ <comment xml:lang="fur">document Turtle</comment>
<comment xml:lang="ga">cáipéis Turtle</comment>
<comment xml:lang="he">מסמך Turtle</comment>
<comment xml:lang="hr">Turtle dokument</comment>
@@ -31621,43 +32751,46 @@
<comment xml:lang="oc">document Turtle</comment>
<comment xml:lang="pl">Dokument Turtle</comment>
<comment xml:lang="pt">documento Turtle</comment>
- <comment xml:lang="pt_BR">Documento Turtle</comment>
+ <comment xml:lang="pt-BR">Documento Turtle</comment>
<comment xml:lang="ru">Документ Turtle</comment>
<comment xml:lang="sk">Dokument Turtle</comment>
+ <comment xml:lang="sl">Dokument Turtle</comment>
<comment xml:lang="sr">Тартл документ</comment>
<comment xml:lang="sv">Turtle-dokument</comment>
<comment xml:lang="tr">Turtle belgesi</comment>
<comment xml:lang="uk">документ Turtle</comment>
- <comment xml:lang="zh_CN">Turtle 文档</comment>
- <comment xml:lang="zh_TW">Turtle 文件</comment>
+ <comment xml:lang="zh-CN">Turtle 文档</comment>
+ <comment xml:lang="zh-TW">Turtle 文件</comment>
<glob pattern="*.ttl"/>
<sub-class-of type="text/plain"/>
</mime-type>
<mime-type type="text/x-txt2tags">
<comment>txt2tags document</comment>
+ <comment xml:lang="af">txt2tags-dokument</comment>
<comment xml:lang="ar">مستند txt2tags</comment>
<comment xml:lang="ast">Documentu txt2tags</comment>
- <comment xml:lang="be@latin">dakument txt2tags</comment>
+ <comment xml:lang="be-Latn">dakument txt2tags</comment>
<comment xml:lang="bg">Документ — txt2tags</comment>
<comment xml:lang="ca">document txt2tags</comment>
<comment xml:lang="cs">dokument txt2tags</comment>
<comment xml:lang="da">txt2tags-dokument</comment>
<comment xml:lang="de">txt2tags-Dokument</comment>
<comment xml:lang="el">Έγγραφο txt2tags</comment>
- <comment xml:lang="en_GB">txt2tags document</comment>
+ <comment xml:lang="en-GB">txt2tags document</comment>
<comment xml:lang="eo">txt2tags-dokumento</comment>
<comment xml:lang="es">documento txt2tags</comment>
<comment xml:lang="eu">txt2tags dokumentua</comment>
<comment xml:lang="fi">txt2tags-asiakirja</comment>
<comment xml:lang="fo">txt2tags skjal</comment>
<comment xml:lang="fr">document txt2tags</comment>
+ <comment xml:lang="fur">document txt2tags</comment>
<comment xml:lang="ga">cáipéis txt2tags</comment>
<comment xml:lang="gl">documento txt2tags</comment>
<comment xml:lang="he">מסמך txt2tags</comment>
<comment xml:lang="hr">txt2tags dokument</comment>
<comment xml:lang="hu">txt2tags dokumentum</comment>
<comment xml:lang="ia">Documento txt2tags</comment>
- <comment xml:lang="id">Dokumen txt2tags</comment>
+ <comment xml:lang="id">dokumen txt2tags</comment>
<comment xml:lang="it">Documento txt2tags</comment>
<comment xml:lang="ja">txt2tags ドキュメント</comment>
<comment xml:lang="ka">txt2tags დოკუმენტი</comment>
@@ -31671,7 +32804,7 @@
<comment xml:lang="oc">document txt2tags</comment>
<comment xml:lang="pl">Dokument txt2tags</comment>
<comment xml:lang="pt">documento txt2tags</comment>
- <comment xml:lang="pt_BR">Documento do txt2tags</comment>
+ <comment xml:lang="pt-BR">Documento do txt2tags</comment>
<comment xml:lang="ro">document txt2tags</comment>
<comment xml:lang="ru">Документ txt2tags</comment>
<comment xml:lang="sk">Dokument txt2tags</comment>
@@ -31682,29 +32815,31 @@
<comment xml:lang="tr">txt2tags belgesi</comment>
<comment xml:lang="uk">документ txt2tags</comment>
<comment xml:lang="vi">tài liệu txt2tags</comment>
- <comment xml:lang="zh_CN">txt2tags 文档</comment>
- <comment xml:lang="zh_TW">txt2tags 文件</comment>
+ <comment xml:lang="zh-CN">txt2tags 文档</comment>
+ <comment xml:lang="zh-TW">txt2tags 文件</comment>
<sub-class-of type="text/plain"/>
<magic priority="60">
- <match value="%!postproc" type="string" offset="0"/>
- <match value="%!encoding" type="string" offset="0"/>
+ <match type="string" value="%!postproc" offset="0"/>
+ <match type="string" value="%!encoding" offset="0"/>
</magic>
<glob pattern="*.t2t"/>
</mime-type>
<mime-type type="text/x-verilog">
<comment>Verilog source code</comment>
+ <comment xml:lang="af">Verilog-bronkode</comment>
<comment xml:lang="bg">Изходен код — Verilog</comment>
<comment xml:lang="ca">codi font en Verilog</comment>
<comment xml:lang="cs">zdrojový kód v jazyce Verilog</comment>
<comment xml:lang="da">Verilog-kildekode</comment>
<comment xml:lang="de">Verilog-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Verilog</comment>
- <comment xml:lang="en_GB">Verilog source code</comment>
+ <comment xml:lang="en-GB">Verilog source code</comment>
<comment xml:lang="eo">Verilog-fontkodo</comment>
<comment xml:lang="es">código fuente en Verilog</comment>
<comment xml:lang="eu">Verilog iturburu-kodea</comment>
<comment xml:lang="fi">Verilog-lähdekoodi</comment>
<comment xml:lang="fr">code source Verilog</comment>
+ <comment xml:lang="fur">codiç sorzint Verilog</comment>
<comment xml:lang="ga">cód foinseach Verilog</comment>
<comment xml:lang="gl">código fonte en Verilog</comment>
<comment xml:lang="he">קוד מקור של </comment>
@@ -31721,7 +32856,7 @@
<comment xml:lang="oc">còde font Verilog</comment>
<comment xml:lang="pl">Kod źródłowy Verilog</comment>
<comment xml:lang="pt">código origem Verilog</comment>
- <comment xml:lang="pt_BR">Código-fonte Verilog</comment>
+ <comment xml:lang="pt-BR">Código-fonte Verilog</comment>
<comment xml:lang="ru">Исходный код Verilog</comment>
<comment xml:lang="sk">Zdrojový kód Verilog</comment>
<comment xml:lang="sl">Datoteka izvorne kode Verilog</comment>
@@ -31729,24 +32864,25 @@
<comment xml:lang="sv">Verilog-källkod</comment>
<comment xml:lang="tr">Verilog kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Verilog</comment>
- <comment xml:lang="zh_CN">Verilog 源代码</comment>
- <comment xml:lang="zh_TW">Verilog 源碼</comment>
+ <comment xml:lang="zh-CN">Verilog 源代码</comment>
+ <comment xml:lang="zh-TW">Verilog 源碼</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.v"/>
</mime-type>
<mime-type type="text/x-svhdr">
<comment>SystemVerilog header</comment>
<comment xml:lang="bg">Заглавен файл — SystemVerilog</comment>
- <comment xml:lang="ca">capçalera de SystemVerilog</comment>
+ <comment xml:lang="ca">capçalera en SystemVerilog</comment>
<comment xml:lang="cs">záhlaví SystemVerilog</comment>
<comment xml:lang="da">SystemVerilog-teksthoved</comment>
<comment xml:lang="de">SystemVerilog-Header</comment>
<comment xml:lang="el">Κεφαλίδα SystemVerilog</comment>
- <comment xml:lang="en_GB">SystemVerilog header</comment>
+ <comment xml:lang="en-GB">SystemVerilog header</comment>
<comment xml:lang="es">cabeceras de SystemVerilog</comment>
<comment xml:lang="eu">SystemVerilog goiburua</comment>
<comment xml:lang="fi">SystemVerilog-otsake</comment>
<comment xml:lang="fr">en-tête </comment>
+ <comment xml:lang="fur">intestazion SystemVerilog</comment>
<comment xml:lang="ga">ceanntásc SystemVerilog</comment>
<comment xml:lang="gl">Cabeceiras de SystemVerilog</comment>
<comment xml:lang="he">כותרת SystemVerilog</comment>
@@ -31763,7 +32899,7 @@
<comment xml:lang="oc">entèsta SystemVerilog</comment>
<comment xml:lang="pl">Nagłówek SystemVerilog</comment>
<comment xml:lang="pt">cabeçalho SystemVerilog</comment>
- <comment xml:lang="pt_BR">Cabeçalho de SystemVerilog</comment>
+ <comment xml:lang="pt-BR">Cabeçalho de SystemVerilog</comment>
<comment xml:lang="ru">Заголовочный файл SystemVerilog</comment>
<comment xml:lang="sk">Hlavičky SystemVerilog</comment>
<comment xml:lang="sl">Datoteka glave SystemVerilog</comment>
@@ -31771,24 +32907,26 @@
<comment xml:lang="sv">SystemVerilog-headerfil</comment>
<comment xml:lang="tr">SystemVerilog başlığı</comment>
<comment xml:lang="uk">заголовки SystemVerilog</comment>
- <comment xml:lang="zh_CN">SystemVerilog 头文件</comment>
- <comment xml:lang="zh_TW">SystemVerilog 標頭</comment>
+ <comment xml:lang="zh-CN">SystemVerilog 头文件</comment>
+ <comment xml:lang="zh-TW">SystemVerilog 標頭</comment>
<sub-class-of type="text/x-verilog"/>
<glob pattern="*.svh"/>
</mime-type>
<mime-type type="text/x-svsrc">
<comment>SystemVerilog source code</comment>
+ <comment xml:lang="af">SystemVerilog-bronkode</comment>
<comment xml:lang="bg">Изходен код — SystemVerilog</comment>
<comment xml:lang="ca">codi font en SystemVerilog</comment>
<comment xml:lang="cs">zdrojový kód SystemVerilog</comment>
<comment xml:lang="da">SystemVerilog-kildekode</comment>
<comment xml:lang="de">SystemVerilog-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας SystemVerilog</comment>
- <comment xml:lang="en_GB">SystemVerilog source code</comment>
+ <comment xml:lang="en-GB">SystemVerilog source code</comment>
<comment xml:lang="es">código fuente en SystemVerilog</comment>
<comment xml:lang="eu">SystemVerilog iturburu-kodea</comment>
<comment xml:lang="fi">SystemVerilog-lähdekoodi</comment>
<comment xml:lang="fr">code source </comment>
+ <comment xml:lang="fur">codiç sorzint SystemVerilog</comment>
<comment xml:lang="ga">cód foinseach SystemVerilog</comment>
<comment xml:lang="gl">código fonte en SystemVerilog</comment>
<comment xml:lang="he">קוד מקור של SystemVerilog</comment>
@@ -31805,7 +32943,7 @@
<comment xml:lang="oc">còde font SystemVerilog</comment>
<comment xml:lang="pl">Kod źródłowy SystemVerilog</comment>
<comment xml:lang="pt">código origem SystemVerilog</comment>
- <comment xml:lang="pt_BR">Código-fonte de SystemVerilog</comment>
+ <comment xml:lang="pt-BR">Código-fonte de SystemVerilog</comment>
<comment xml:lang="ru">Исходный код SystemVerilog</comment>
<comment xml:lang="sk">Zdrojový kód SystemVerilog</comment>
<comment xml:lang="sl">Datoteka izvorne kode SystemVerilog</comment>
@@ -31813,25 +32951,27 @@
<comment xml:lang="sv">SystemVerilog-källkod</comment>
<comment xml:lang="tr">SystemVerilog kaynak kodu</comment>
<comment xml:lang="uk">вихідний файл мовою SystemVerilog</comment>
- <comment xml:lang="zh_CN">SystemVerilog 源代码</comment>
- <comment xml:lang="zh_TW">SystemVerilog 源碼</comment>
+ <comment xml:lang="zh-CN">SystemVerilog 源代码</comment>
+ <comment xml:lang="zh-TW">SystemVerilog 源碼</comment>
<sub-class-of type="text/x-verilog"/>
<glob pattern="*.sv"/>
</mime-type>
<mime-type type="text/x-vhdl">
<comment>VHDL source code</comment>
+ <comment xml:lang="af">VHDL-bronkode</comment>
<comment xml:lang="bg">Изходен код — VHDL</comment>
<comment xml:lang="ca">codi font en VHDL</comment>
<comment xml:lang="cs">zdrojový kód v jazyce VHDL</comment>
<comment xml:lang="da">VHDL-kildekode</comment>
<comment xml:lang="de">VHDL-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας VHDL</comment>
- <comment xml:lang="en_GB">VHDL source code</comment>
+ <comment xml:lang="en-GB">VHDL source code</comment>
<comment xml:lang="eo">VHDL-fontkodo</comment>
<comment xml:lang="es">código fuente en VHDL</comment>
<comment xml:lang="eu">VHDL iturburu-kodea</comment>
<comment xml:lang="fi">VHDL-lähdekoodi</comment>
<comment xml:lang="fr">code source VHDL</comment>
+ <comment xml:lang="fur">codiç sorzint VHDL</comment>
<comment xml:lang="ga">cód foinseach VHDL</comment>
<comment xml:lang="gl">código fonte en VHDL</comment>
<comment xml:lang="he">קוד מקור של VHDL</comment>
@@ -31848,7 +32988,7 @@
<comment xml:lang="oc">còde font VHDL</comment>
<comment xml:lang="pl">Kod źródłowy VHDL</comment>
<comment xml:lang="pt">código origem VHDL</comment>
- <comment xml:lang="pt_BR">Código-fonte VHDL</comment>
+ <comment xml:lang="pt-BR">Código-fonte VHDL</comment>
<comment xml:lang="ru">Исходный код VHDL</comment>
<comment xml:lang="sk">Zdrojový kód VHDL</comment>
<comment xml:lang="sl">Datoteka izvorne kode VHDL</comment>
@@ -31856,8 +32996,8 @@
<comment xml:lang="sv">VHDL-källkod</comment>
<comment xml:lang="tr">VHDL kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою VHDL</comment>
- <comment xml:lang="zh_CN">VHDL 源代码</comment>
- <comment xml:lang="zh_TW">VHDL 源碼</comment>
+ <comment xml:lang="zh-CN">VHDL 源代码</comment>
+ <comment xml:lang="zh-TW">VHDL 源碼</comment>
<acronym>VHDL</acronym>
<expanded-acronym>Very-High-Speed Integrated Circuit Hardware Description Language</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -31866,10 +33006,11 @@
</mime-type>
<mime-type type="text/enriched">
<comment>enriched text document</comment>
+ <comment xml:lang="af">verrykte teksdokument</comment>
<comment xml:lang="ar">مستند نصي مغنى</comment>
<comment xml:lang="ast">documentu de testu arriquecíu</comment>
<comment xml:lang="az">zəngin mətn sənədi</comment>
- <comment xml:lang="be@latin">azdobleny tekstavy dakument</comment>
+ <comment xml:lang="be-Latn">azdobleny tekstavy dakument</comment>
<comment xml:lang="bg">Документ с обогатен текст</comment>
<comment xml:lang="ca">document de text enriquit</comment>
<comment xml:lang="cs">rozšířený textový dokument</comment>
@@ -31877,13 +33018,14 @@
<comment xml:lang="da">beriget tekstdokument</comment>
<comment xml:lang="de">Angereichertes Textdokument</comment>
<comment xml:lang="el">Έγγραφο εμπλουτισμένου κειμένου</comment>
- <comment xml:lang="en_GB">enriched text document</comment>
+ <comment xml:lang="en-GB">enriched text document</comment>
<comment xml:lang="eo">riĉigita teksta dokumento</comment>
<comment xml:lang="es">documento de texto enriquecido</comment>
<comment xml:lang="eu">aberastutako testu dokumentua</comment>
<comment xml:lang="fi">rikastettu tekstiasiakirja</comment>
<comment xml:lang="fo">ríkað tekstskjal</comment>
<comment xml:lang="fr">document texte enrichi</comment>
+ <comment xml:lang="fur">document di test inricjît</comment>
<comment xml:lang="ga">cáipéis téacs saibhrithe</comment>
<comment xml:lang="gl">documento de texto enriquecido</comment>
<comment xml:lang="he">מסמך טקסט מועשר</comment>
@@ -31904,7 +33046,7 @@
<comment xml:lang="oc">document tèxte enriquit</comment>
<comment xml:lang="pl">Wzbogacony dokument tekstowy</comment>
<comment xml:lang="pt">documento de texto rico</comment>
- <comment xml:lang="pt_BR">Documento de texto enriquecido</comment>
+ <comment xml:lang="pt-BR">Documento de texto enriquecido</comment>
<comment xml:lang="ro">document text îmbogățit</comment>
<comment xml:lang="ru">Форматированный текстовый документ</comment>
<comment xml:lang="sk">Rozšírený textový dokument</comment>
@@ -31915,15 +33057,16 @@
<comment xml:lang="tr">zenginleştirilmiş metin belgesi</comment>
<comment xml:lang="uk">форматований текстовий документ</comment>
<comment xml:lang="vi">tài liệu văn bản có kiểu dáng</comment>
- <comment xml:lang="zh_CN">浓缩文本文档 (ETF)</comment>
- <comment xml:lang="zh_TW">豐富化文字文件</comment>
+ <comment xml:lang="zh-CN">浓缩文本文档 (ETF)</comment>
+ <comment xml:lang="zh-TW">豐富化文字文件</comment>
<sub-class-of type="text/plain"/>
</mime-type>
<mime-type type="text/htmlh">
<comment>help page</comment>
+ <comment xml:lang="af">hulpbladsy</comment>
<comment xml:lang="ar">صفحة المساعدة</comment>
<comment xml:lang="az">yardım səhifəsi</comment>
- <comment xml:lang="be@latin">staronka dapamohi</comment>
+ <comment xml:lang="be-Latn">staronka dapamohi</comment>
<comment xml:lang="bg">Страница от помощта</comment>
<comment xml:lang="ca">pàgina d'ajuda</comment>
<comment xml:lang="cs">stránka nápovědy</comment>
@@ -31931,13 +33074,14 @@
<comment xml:lang="da">hjælpeside</comment>
<comment xml:lang="de">Hilfeseite</comment>
<comment xml:lang="el">Σελίδα βοήθειας</comment>
- <comment xml:lang="en_GB">help page</comment>
+ <comment xml:lang="en-GB">help page</comment>
<comment xml:lang="eo">help-paĝo</comment>
<comment xml:lang="es">página de ayuda</comment>
<comment xml:lang="eu">laguntzako orria</comment>
<comment xml:lang="fi">ohjesivu</comment>
<comment xml:lang="fo">hjálparsíða</comment>
<comment xml:lang="fr">page d'aide</comment>
+ <comment xml:lang="fur">pagjine di jutori</comment>
<comment xml:lang="ga">leathanach cabhrach</comment>
<comment xml:lang="gl">páxina de axuda</comment>
<comment xml:lang="he">דף עזרה</comment>
@@ -31958,7 +33102,7 @@
<comment xml:lang="oc">pagina d'ajuda</comment>
<comment xml:lang="pl">Strona pomocy</comment>
<comment xml:lang="pt">página de ajuda</comment>
- <comment xml:lang="pt_BR">Página de ajuda</comment>
+ <comment xml:lang="pt-BR">Página de ajuda</comment>
<comment xml:lang="ro">pagină de ajutor</comment>
<comment xml:lang="ru">Страница справки</comment>
<comment xml:lang="sk">Stránka Pomocníka</comment>
@@ -31969,27 +33113,29 @@
<comment xml:lang="tr">yardım sayfası</comment>
<comment xml:lang="uk">сторінка довідки</comment>
<comment xml:lang="vi">trang trợ giúp</comment>
- <comment xml:lang="zh_CN">帮助页面</comment>
- <comment xml:lang="zh_TW">求助頁面</comment>
+ <comment xml:lang="zh-CN">帮助页面</comment>
+ <comment xml:lang="zh-TW">求助頁面</comment>
<sub-class-of type="text/plain"/>
</mime-type>
<mime-type type="text/plain">
<comment>plain text document</comment>
+ <comment xml:lang="af">skoonteksdokument</comment>
<comment xml:lang="ar">مستند نصي مجرد</comment>
<comment xml:lang="ast">documentu de testu planu</comment>
- <comment xml:lang="be@latin">prosty tekstavy dakument</comment>
+ <comment xml:lang="be-Latn">prosty tekstavy dakument</comment>
<comment xml:lang="bg">Документ с неформатиран текст</comment>
<comment xml:lang="ca">document de text pla</comment>
<comment xml:lang="cs">prostý textový dokument</comment>
<comment xml:lang="da">rent tekstdokument</comment>
<comment xml:lang="de">Einfaches Textdokument</comment>
<comment xml:lang="el">Έγγραφο απλού κειμένου</comment>
- <comment xml:lang="en_GB">plain text document</comment>
+ <comment xml:lang="en-GB">plain text document</comment>
<comment xml:lang="eo">plata teksta dokumento</comment>
<comment xml:lang="es">documento de texto sencillo</comment>
<comment xml:lang="eu">testu soileko dokumentua</comment>
<comment xml:lang="fi">perustekstiasiakirja</comment>
<comment xml:lang="fr">document texte brut</comment>
+ <comment xml:lang="fur">document di test sempliç</comment>
<comment xml:lang="ga">cáipéis ghnáth-théacs</comment>
<comment xml:lang="gl">documento de texto sinxelo</comment>
<comment xml:lang="he">מסמך טקסט פשוט</comment>
@@ -32010,7 +33156,7 @@
<comment xml:lang="oc">document tèxte brut</comment>
<comment xml:lang="pl">Zwykły dokument tekstowy</comment>
<comment xml:lang="pt">documento em texto simples</comment>
- <comment xml:lang="pt_BR">Documento de Texto</comment>
+ <comment xml:lang="pt-BR">Documento de Texto</comment>
<comment xml:lang="ro">document text simplu</comment>
<comment xml:lang="ru">Текстовый документ</comment>
<comment xml:lang="sk">Obyčajný textový dokument</comment>
@@ -32021,11 +33167,11 @@
<comment xml:lang="tr">düz metin belgesi</comment>
<comment xml:lang="uk">звичайний текстовий документ</comment>
<comment xml:lang="vi">tài liệu nhập thô</comment>
- <comment xml:lang="zh_CN">纯文本文档</comment>
- <comment xml:lang="zh_TW">純文字文件</comment>
+ <comment xml:lang="zh-CN">纯文本文档</comment>
+ <comment xml:lang="zh-TW">純文字文件</comment>
<magic priority="50">
- <match value="This is TeX," type="string" offset="0"/>
- <match value="This is METAFONT," type="string" offset="0"/>
+ <match type="string" value="This is TeX," offset="0"/>
+ <match type="string" value="This is METAFONT," offset="0"/>
</magic>
<glob pattern="*.txt"/>
<glob pattern="*.asc"/>
@@ -32033,21 +33179,23 @@
</mime-type>
<mime-type type="application/rdf+xml">
<comment>RDF file</comment>
+ <comment xml:lang="af">RDF-lêer</comment>
<comment xml:lang="ar">ملف RDF</comment>
- <comment xml:lang="be@latin">Fajł RDF</comment>
+ <comment xml:lang="be-Latn">Fajł RDF</comment>
<comment xml:lang="bg">Файл — RDF</comment>
<comment xml:lang="ca">fitxer RDF</comment>
<comment xml:lang="cs">soubor RDF</comment>
<comment xml:lang="da">RDF-fil</comment>
<comment xml:lang="de">RDF-Datei</comment>
<comment xml:lang="el">Αρχείο RDF</comment>
- <comment xml:lang="en_GB">RDF file</comment>
+ <comment xml:lang="en-GB">RDF file</comment>
<comment xml:lang="eo">RDF-dosiero</comment>
<comment xml:lang="es">archivo RDF</comment>
<comment xml:lang="eu">RDF fitxategia</comment>
<comment xml:lang="fi">RDF-tiedosto</comment>
<comment xml:lang="fo">RDF fíla</comment>
<comment xml:lang="fr">fichier RDF</comment>
+ <comment xml:lang="fur">file RDF</comment>
<comment xml:lang="ga">comhad RDF</comment>
<comment xml:lang="gl">ficheiro RDF</comment>
<comment xml:lang="he">קובץ RDF</comment>
@@ -32067,7 +33215,7 @@
<comment xml:lang="oc">fichièr RDF</comment>
<comment xml:lang="pl">Plik RDF</comment>
<comment xml:lang="pt">ficheiro RDF</comment>
- <comment xml:lang="pt_BR">Arquivo RDF</comment>
+ <comment xml:lang="pt-BR">Arquivo RDF</comment>
<comment xml:lang="ro">Fișier RDF</comment>
<comment xml:lang="ru">Файл RDF</comment>
<comment xml:lang="sk">Súbor RDF</comment>
@@ -32078,8 +33226,8 @@
<comment xml:lang="tr">RDF dosyası</comment>
<comment xml:lang="uk">файл RDF</comment>
<comment xml:lang="vi">Tập tin RDF</comment>
- <comment xml:lang="zh_CN">RDF 文件</comment>
- <comment xml:lang="zh_TW">RDF 檔</comment>
+ <comment xml:lang="zh-CN">RDF 文件</comment>
+ <comment xml:lang="zh-TW">RDF 檔</comment>
<acronym>RDF</acronym>
<expanded-acronym>Resource Description Framework</expanded-acronym>
<alias type="text/rdf"/>
@@ -32089,17 +33237,55 @@
<glob pattern="*.owl"/>
<root-XML namespaceURI="http://www.w3.org/1999/02/22-rdf-syntax-ns#" localName="RDF"/>
</mime-type>
+ <mime-type type="text/x-rst">
+ <comment>reStructuredText document</comment>
+ <comment xml:lang="af">reStructuredText-dokument</comment>
+ <comment xml:lang="bg">Документ — reStructuredText</comment>
+ <comment xml:lang="ca">document reStructuredText</comment>
+ <comment xml:lang="cs">dokument reStructuredText</comment>
+ <comment xml:lang="da">reStructuredText-dokument</comment>
+ <comment xml:lang="de">reStructuredText-Dokument</comment>
+ <comment xml:lang="en-GB">reStructuredText document</comment>
+ <comment xml:lang="es">documento en reStructuredText</comment>
+ <comment xml:lang="eu">reStructuredText document</comment>
+ <comment xml:lang="fi">reStructuredText-asiakirja</comment>
+ <comment xml:lang="fr">document reStructuredText</comment>
+ <comment xml:lang="fur">document reStructuredText</comment>
+ <comment xml:lang="ga">cáipéis reStructuredText</comment>
+ <comment xml:lang="hr">reStructuredText dokument</comment>
+ <comment xml:lang="hu">reStructuredText dokumentum</comment>
+ <comment xml:lang="id">dokumen reStructuredText</comment>
+ <comment xml:lang="it">Documento reStructuredText</comment>
+ <comment xml:lang="kk">reStructuredText құжаты</comment>
+ <comment xml:lang="ko">reStructuredText 문서</comment>
+ <comment xml:lang="pl">Dokument reStructuredText</comment>
+ <comment xml:lang="pt-BR">Documento reStructuredText</comment>
+ <comment xml:lang="ru">Документ reStructuredText</comment>
+ <comment xml:lang="sk">Dokument reStructuredText</comment>
+ <comment xml:lang="sl">Dokument reStructuredText</comment>
+ <comment xml:lang="sv">reStructuredText-dokument</comment>
+ <comment xml:lang="tr">reStructuredText belgesi</comment>
+ <comment xml:lang="uk">документ reStructuredText</comment>
+ <comment xml:lang="zh-CN">reStructuredText 文档</comment>
+ <comment xml:lang="zh-TW">reStructuredText 文件</comment>
+ <sub-class-of type="text/plain"/>
+ <glob pattern="*.rst"/>
+ </mime-type>
<mime-type type="application/owl+xml">
<comment>OWL XML file</comment>
+ <comment xml:lang="af">OWL XML-lêer</comment>
+ <comment xml:lang="bg">Файл — OWL XML</comment>
<comment xml:lang="ca">fitxer XML OWL</comment>
<comment xml:lang="cs">soubor OWL XML</comment>
<comment xml:lang="da">OWL XML-fil</comment>
<comment xml:lang="de">OWL-XML-Datei</comment>
<comment xml:lang="el">Αρχείο OWL XML</comment>
- <comment xml:lang="en_GB">OWL XML file</comment>
+ <comment xml:lang="en-GB">OWL XML file</comment>
<comment xml:lang="es">archivo en XML OWL</comment>
<comment xml:lang="eu">OWL XML fitxategia</comment>
+ <comment xml:lang="fi">OWL XML -tiedosto</comment>
<comment xml:lang="fr">fichier XML OWL</comment>
+ <comment xml:lang="fur">file OWL XML</comment>
<comment xml:lang="ga">comhad XML OWL</comment>
<comment xml:lang="hr">OWL XML datoteka</comment>
<comment xml:lang="hu">OWL XML-fájl</comment>
@@ -32111,21 +33297,22 @@
<comment xml:lang="oc">fichièr OWL XML</comment>
<comment xml:lang="pl">Plik XML OWL</comment>
<comment xml:lang="pt">ficheiro OWL XML</comment>
- <comment xml:lang="pt_BR">Arquivo OWL XML</comment>
+ <comment xml:lang="pt-BR">Arquivo OWL XML</comment>
<comment xml:lang="ru">Файл XML OWL</comment>
<comment xml:lang="sk">Súbor XML OWL</comment>
+ <comment xml:lang="sl">Datoteka OWL XML</comment>
<comment xml:lang="sr">ОВЛ ИксМЛ датотека</comment>
<comment xml:lang="sv">OWL XML-fil</comment>
<comment xml:lang="tr">OWL XML dosyası</comment>
<comment xml:lang="uk">файл XML OWL</comment>
- <comment xml:lang="zh_CN">OWL XML 文件</comment>
- <comment xml:lang="zh_TW">OWL XML 檔案</comment>
+ <comment xml:lang="zh-CN">OWL XML 文件</comment>
+ <comment xml:lang="zh-TW">OWL XML 檔案</comment>
<acronym>OWL</acronym>
<expanded-acronym>Web Ontology Language</expanded-acronym>
<sub-class-of type="application/xml"/>
<glob pattern="*.owx"/>
<magic>
- <match value="&lt;Ontology" type="string" offset="0:256"/>
+ <match type="string" value="&lt;Ontology" offset="0:256"/>
</magic>
<root-XML namespaceURI="http://www.w3.org/2002/07/owl#" localName="Ontology"/>
</mime-type>
@@ -32133,7 +33320,7 @@
<comment>email headers</comment>
<comment xml:lang="ar">ترويسة البريد الإلكتروني</comment>
<comment xml:lang="az">epoçt başlıqları</comment>
- <comment xml:lang="be@latin">paštovyja zahałoŭki</comment>
+ <comment xml:lang="be-Latn">paštovyja zahałoŭki</comment>
<comment xml:lang="bg">Заглавни части на електронни писма</comment>
<comment xml:lang="ca">capçaleres de correu electrònic</comment>
<comment xml:lang="cs">záhlaví e-mailu</comment>
@@ -32141,13 +33328,14 @@
<comment xml:lang="da">posthoveder</comment>
<comment xml:lang="de">E-Mail-Kopfzeilen</comment>
<comment xml:lang="el">Κεφαλίδες ηλ. μηνυμάτων</comment>
- <comment xml:lang="en_GB">email headers</comment>
+ <comment xml:lang="en-GB">email headers</comment>
<comment xml:lang="eo">retpoŝtaj ĉapoj</comment>
<comment xml:lang="es">cabeceras de correo electrónico</comment>
<comment xml:lang="eu">helbide elektronikoen goiburuak</comment>
<comment xml:lang="fi">sähköpostiotsakkeet</comment>
<comment xml:lang="fo">t-post tekshøvd</comment>
<comment xml:lang="fr">en-têtes de courriel</comment>
+ <comment xml:lang="fur">intestazions e-mail</comment>
<comment xml:lang="ga">ceanntásca ríomhphoist</comment>
<comment xml:lang="gl">cabeceiras de correo electrónico</comment>
<comment xml:lang="he">כותרת דוא״ל</comment>
@@ -32168,7 +33356,7 @@
<comment xml:lang="oc">entèstas de corrièr electronic</comment>
<comment xml:lang="pl">Nagłówki wiadomości e-mail</comment>
<comment xml:lang="pt">cabeçalhos de email</comment>
- <comment xml:lang="pt_BR">Cabeçalhos de e-mail</comment>
+ <comment xml:lang="pt-BR">Cabeçalhos de e-mail</comment>
<comment xml:lang="ro">antete email</comment>
<comment xml:lang="ru">Почтовые заголовки</comment>
<comment xml:lang="sk">Hlavičky e-mailu</comment>
@@ -32179,16 +33367,17 @@
<comment xml:lang="tr">eposta başlığı</comment>
<comment xml:lang="uk">заголовки email</comment>
<comment xml:lang="vi">dòng đầu thư điện tử</comment>
- <comment xml:lang="zh_CN">电子邮件头</comment>
- <comment xml:lang="zh_TW">電子郵件標頭</comment>
+ <comment xml:lang="zh-CN">电子邮件头</comment>
+ <comment xml:lang="zh-TW">電子郵件標頭</comment>
<sub-class-of type="text/plain"/>
</mime-type>
<mime-type type="text/richtext">
<comment>rich text document</comment>
+ <comment xml:lang="af">rykteksdokument</comment>
<comment xml:lang="ar">مستند نصي غني</comment>
<comment xml:lang="ast">documentu de testu ricu</comment>
<comment xml:lang="az">zəngin mətn sənədi</comment>
- <comment xml:lang="be@latin">azdobleny tekstavy dakument</comment>
+ <comment xml:lang="be-Latn">azdobleny tekstavy dakument</comment>
<comment xml:lang="bg">Документ — rich text</comment>
<comment xml:lang="ca">document de text enriquit</comment>
<comment xml:lang="cs">textový dokument RTF</comment>
@@ -32196,12 +33385,13 @@
<comment xml:lang="da">richtekstdokument</comment>
<comment xml:lang="de">RTF-Textdokument</comment>
<comment xml:lang="el">Έγγραφο εμπλουτισμένου κειμένου (RTF)</comment>
- <comment xml:lang="en_GB">rich text document</comment>
+ <comment xml:lang="en-GB">rich text document</comment>
<comment xml:lang="eo">riĉteksta dokumento</comment>
<comment xml:lang="es">documento de texto enriquecido</comment>
<comment xml:lang="eu">aberastutako testu formatua</comment>
<comment xml:lang="fi">RTF-asiakirja</comment>
<comment xml:lang="fr">document « rich text »</comment>
+ <comment xml:lang="fur">document rich text</comment>
<comment xml:lang="ga">cáipéis mhéith-théacs</comment>
<comment xml:lang="gl">documento do texto enriquecido</comment>
<comment xml:lang="he">מסמך טקסט עשיר</comment>
@@ -32222,7 +33412,7 @@
<comment xml:lang="oc">document « rich text »</comment>
<comment xml:lang="pl">Dokument Rich Text</comment>
<comment xml:lang="pt">documento em texto rico</comment>
- <comment xml:lang="pt_BR">Documento rich text</comment>
+ <comment xml:lang="pt-BR">Documento rich text</comment>
<comment xml:lang="ro">document text îmbogățit</comment>
<comment xml:lang="ru">Документ с форматированным текстом</comment>
<comment xml:lang="sk">Textový dokument RTF</comment>
@@ -32233,27 +33423,29 @@
<comment xml:lang="tr">zengin metin belgesi</comment>
<comment xml:lang="uk">форматований текстовий документ</comment>
<comment xml:lang="vi">tài liệu văn bản có kiểu dáng (RTF)</comment>
- <comment xml:lang="zh_CN">富文本文档 (RTF)</comment>
- <comment xml:lang="zh_TW">豐富文字文件</comment>
+ <comment xml:lang="zh-CN">富文本文档 (RTF)</comment>
+ <comment xml:lang="zh-TW">豐富文字文件 (RTF)</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.rtx"/>
</mime-type>
<mime-type type="application/rss+xml">
<comment>RSS summary</comment>
+ <comment xml:lang="af">RSS-opsomming</comment>
<comment xml:lang="ar">ملخص RSS</comment>
- <comment xml:lang="be@latin">Karotki ahlad RSS</comment>
+ <comment xml:lang="be-Latn">Karotki ahlad RSS</comment>
<comment xml:lang="bg">Обобщение за сайтове — RSS</comment>
<comment xml:lang="ca">resum RSS</comment>
<comment xml:lang="cs">souhrn RSS</comment>
<comment xml:lang="da">RSS-sammendrag</comment>
<comment xml:lang="de">RSS-Zusammenfassung</comment>
<comment xml:lang="el">Σύνοψη RSS</comment>
- <comment xml:lang="en_GB">RSS summary</comment>
- <comment xml:lang="es">resumen de RSS</comment>
+ <comment xml:lang="en-GB">RSS summary</comment>
+ <comment xml:lang="es">suministro RSS</comment>
<comment xml:lang="eu">RSS laburpena</comment>
<comment xml:lang="fi">RSS-tiivistelmä</comment>
<comment xml:lang="fo">RSS samandráttur</comment>
<comment xml:lang="fr">résumé RSS</comment>
+ <comment xml:lang="fur">somari RSS</comment>
<comment xml:lang="ga">achoimre RSS</comment>
<comment xml:lang="gl">Resumo RSS</comment>
<comment xml:lang="he">תקציר RSS</comment>
@@ -32273,7 +33465,7 @@
<comment xml:lang="oc">resumit RSS</comment>
<comment xml:lang="pl">Podsumowanie RSS</comment>
<comment xml:lang="pt">resumo RSS</comment>
- <comment xml:lang="pt_BR">Resumo RSS</comment>
+ <comment xml:lang="pt-BR">Resumo RSS</comment>
<comment xml:lang="ro">Rezumat RSS</comment>
<comment xml:lang="ru">Сводка RSS</comment>
<comment xml:lang="sk">Súhrn RSS</comment>
@@ -32284,8 +33476,8 @@
<comment xml:lang="tr">RSS özeti</comment>
<comment xml:lang="uk">зведення сайту RSS</comment>
<comment xml:lang="vi">Bản tóm tắt RSS</comment>
- <comment xml:lang="zh_CN">RSS 摘要</comment>
- <comment xml:lang="zh_TW">RSS 摘要</comment>
+ <comment xml:lang="zh-CN">RSS 摘要</comment>
+ <comment xml:lang="zh-TW">RSS 摘要</comment>
<acronym>RSS</acronym>
<expanded-acronym>RDF Site Summary</expanded-acronym>
<alias type="text/rss"/>
@@ -32293,25 +33485,26 @@
<generic-icon name="text-html"/>
<glob pattern="*.rss"/>
<magic priority="70">
- <match value="&lt;rss " type="string" offset="0:256"/>
- <match value="&lt;RSS " type="string" offset="0:256"/>
+ <match type="string" value="&lt;rss " offset="0:256"/>
+ <match type="string" value="&lt;RSS " offset="0:256"/>
</magic>
</mime-type>
<mime-type type="application/atom+xml">
<comment>Atom syndication feed</comment>
<comment xml:lang="ar">مروج تغذية Atom</comment>
- <comment xml:lang="be@latin">Syndykacyjny kanał navinaŭ Atom</comment>
+ <comment xml:lang="be-Latn">Syndykacyjny kanał navinaŭ Atom</comment>
<comment xml:lang="bg">Емисия — Atom</comment>
<comment xml:lang="ca">canal de sindicació Atom</comment>
<comment xml:lang="cs">kanál Atom</comment>
- <comment xml:lang="da">Atom syndication-feed</comment>
+ <comment xml:lang="da">Atom-syndikeringsfeed</comment>
<comment xml:lang="de">Atom-Nachrichtenquelle</comment>
<comment xml:lang="el">Τροφοδοσία διανομής Atom</comment>
- <comment xml:lang="en_GB">Atom syndication feed</comment>
- <comment xml:lang="es">canal de noticias Atom</comment>
+ <comment xml:lang="en-GB">Atom syndication feed</comment>
+ <comment xml:lang="es">suministro de sindicación Atom</comment>
<comment xml:lang="eu">Atom harpidetze-iturria</comment>
<comment xml:lang="fi">Atom-yhdistevirta</comment>
<comment xml:lang="fr">fil de syndication Atom</comment>
+ <comment xml:lang="fur">canâl di notiziis Atom</comment>
<comment xml:lang="ga">fotha sindeacáitithe Atom</comment>
<comment xml:lang="gl">fonte de sindicación Atom</comment>
<comment xml:lang="he">הזנה דרך הרשת של Atom</comment>
@@ -32331,7 +33524,7 @@
<comment xml:lang="oc">fial de sindicacion Atom</comment>
<comment xml:lang="pl">Kanał Atom</comment>
<comment xml:lang="pt">feed Atom</comment>
- <comment xml:lang="pt_BR">Fonte de notícias Atom</comment>
+ <comment xml:lang="pt-BR">Fonte de notícias Atom</comment>
<comment xml:lang="ro">Flux agregare Atom</comment>
<comment xml:lang="ru">Лента новостей Atom</comment>
<comment xml:lang="sk">Kanál Atom</comment>
@@ -32342,31 +33535,32 @@
<comment xml:lang="tr">Atom besleme kaynağı</comment>
<comment xml:lang="uk">трансляція подач Atom</comment>
<comment xml:lang="vi">Nguồn tin tức Atom</comment>
- <comment xml:lang="zh_CN">Atom 聚合种子</comment>
- <comment xml:lang="zh_TW">Atom 聯合供稿饋流</comment>
+ <comment xml:lang="zh-CN">Atom 聚合种子</comment>
+ <comment xml:lang="zh-TW">Atom 聯合供稿饋流</comment>
<sub-class-of type="application/xml"/>
<generic-icon name="text-html"/>
<glob pattern="*.atom"/>
<magic priority="70">
- <match value="&lt;feed " type="string" offset="0:256"/>
+ <match type="string" value="&lt;feed " offset="0:256"/>
</magic>
<root-XML namespaceURI="http://www.w3.org/2005/Atom" localName="feed"/>
</mime-type>
<mime-type type="text/x-opml+xml">
<comment>OPML syndication feed</comment>
<comment xml:lang="ar">مروج تغذية OPML</comment>
- <comment xml:lang="be@latin">Syndykacyjny kanał OPML</comment>
+ <comment xml:lang="be-Latn">Syndykacyjny kanał OPML</comment>
<comment xml:lang="bg">Емисия — OPML</comment>
<comment xml:lang="ca">canal de sindicació OPML</comment>
<comment xml:lang="cs">kanál OPML</comment>
<comment xml:lang="da">OPML-syndikeringsfeed</comment>
<comment xml:lang="de">OPML-Nachrichtenquelle</comment>
<comment xml:lang="el">Τροφοδοσία OPML</comment>
- <comment xml:lang="en_GB">OPML syndication feed</comment>
- <comment xml:lang="es">canal de noticias OPML</comment>
+ <comment xml:lang="en-GB">OPML syndication feed</comment>
+ <comment xml:lang="es">suministro de sindicación OPML</comment>
<comment xml:lang="eu">OPML harpidetze-iturria</comment>
<comment xml:lang="fi">OPML-yhdistevirta</comment>
<comment xml:lang="fr">fil de syndication OPML</comment>
+ <comment xml:lang="fur">canâl di notiziis OPML</comment>
<comment xml:lang="ga">fotha sindeacáitithe OPML</comment>
<comment xml:lang="gl">fonte de sindicación OPML</comment>
<comment xml:lang="he">הזנה דרך הרשת OPML</comment>
@@ -32386,7 +33580,7 @@
<comment xml:lang="oc">fial de sindicacion OPML</comment>
<comment xml:lang="pl">Kanał OPML</comment>
<comment xml:lang="pt">feed OPML</comment>
- <comment xml:lang="pt_BR">Fonte de notícias OPML</comment>
+ <comment xml:lang="pt-BR">Fonte de notícias OPML</comment>
<comment xml:lang="ro">Flux OPML syndication</comment>
<comment xml:lang="ru">Лента новостей OPML</comment>
<comment xml:lang="sk">Kanál OPML</comment>
@@ -32397,21 +33591,22 @@
<comment xml:lang="tr">OPML besleme kaynağı</comment>
<comment xml:lang="uk">трансляція подач OPML</comment>
<comment xml:lang="vi">Nguồn tin tức OPML</comment>
- <comment xml:lang="zh_CN">OPML 聚合种子</comment>
- <comment xml:lang="zh_TW">OPML 聯合供稿饋流</comment>
+ <comment xml:lang="zh-CN">OPML 聚合种子</comment>
+ <comment xml:lang="zh-TW">OPML 聯合供稿饋流</comment>
<sub-class-of type="application/xml"/>
<alias type="text/x-opml"/>
<generic-icon name="text-html"/>
<glob pattern="*.opml"/>
<magic priority="70">
- <match value="&lt;opml " type="string" offset="0:256"/>
+ <match type="string" value="&lt;opml " offset="0:256"/>
</magic>
</mime-type>
<mime-type type="text/sgml">
<comment>SGML document</comment>
+ <comment xml:lang="af">SGML-dokument</comment>
<comment xml:lang="ar">مستند SGML</comment>
<comment xml:lang="ast">Documentu SGML</comment>
- <comment xml:lang="be@latin">Dakument SGML</comment>
+ <comment xml:lang="be-Latn">Dakument SGML</comment>
<comment xml:lang="bg">Документ — SGML</comment>
<comment xml:lang="ca">document SGML</comment>
<comment xml:lang="cs">dokument SGML</comment>
@@ -32419,13 +33614,14 @@
<comment xml:lang="da">SGML-dokument</comment>
<comment xml:lang="de">SGML-Dokument</comment>
<comment xml:lang="el">Έγγραφο SGML</comment>
- <comment xml:lang="en_GB">SGML document</comment>
+ <comment xml:lang="en-GB">SGML document</comment>
<comment xml:lang="eo">SGML-dokumento</comment>
<comment xml:lang="es">documento SGML</comment>
<comment xml:lang="eu">SGML dokumentua</comment>
<comment xml:lang="fi">SGML-asiakirja</comment>
<comment xml:lang="fo">SGML skjal</comment>
<comment xml:lang="fr">document SGML</comment>
+ <comment xml:lang="fur">document SGML</comment>
<comment xml:lang="ga">cáipéis SGML</comment>
<comment xml:lang="gl">documento SGML</comment>
<comment xml:lang="he">מסמך SGML</comment>
@@ -32446,7 +33642,7 @@
<comment xml:lang="oc">document SGML</comment>
<comment xml:lang="pl">Dokument SGML</comment>
<comment xml:lang="pt">documento SGML</comment>
- <comment xml:lang="pt_BR">Documento SGML</comment>
+ <comment xml:lang="pt-BR">Documento SGML</comment>
<comment xml:lang="ro">Document SGML</comment>
<comment xml:lang="ru">Документ SGML</comment>
<comment xml:lang="sk">Dokument SGML</comment>
@@ -32457,8 +33653,8 @@
<comment xml:lang="tr">SGML belgesi</comment>
<comment xml:lang="uk">документ SGML</comment>
<comment xml:lang="vi">Tài liệu SGML</comment>
- <comment xml:lang="zh_CN">SGML 文档</comment>
- <comment xml:lang="zh_TW">SGML 文件</comment>
+ <comment xml:lang="zh-CN">SGML 文档</comment>
+ <comment xml:lang="zh-TW">SGML 文件</comment>
<acronym>SGML</acronym>
<expanded-acronym>Standard Generalized Markup Language</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -32469,19 +33665,20 @@
<comment>spreadsheet interchange document</comment>
<comment xml:lang="ar">مستند تبادل الجدول</comment>
<comment xml:lang="ast">documentu d'intercambéu de fueyes de cálculu</comment>
- <comment xml:lang="be@latin">dakument dla abmienu raźlikovymi arkušami</comment>
- <comment xml:lang="bg">Документ за обмяна между програми за електронни таблици</comment>
+ <comment xml:lang="be-Latn">dakument dla abmienu raźlikovymi arkušami</comment>
+ <comment xml:lang="bg">Документ — обмяна между електронни таблици</comment>
<comment xml:lang="ca">document d'intercanvi de full de càlcul</comment>
<comment xml:lang="cs">sešitový výměnný dokument</comment>
<comment xml:lang="da">regnearksudvekslingsdokument</comment>
<comment xml:lang="de">Tabellenkalkulations-Austauschdokument</comment>
<comment xml:lang="el">Έγγραφο ανταλλαγής λογιστικού φύλλου</comment>
- <comment xml:lang="en_GB">spreadsheet interchange document</comment>
- <comment xml:lang="es">documento de intercambio de hojas de cálculo</comment>
+ <comment xml:lang="en-GB">spreadsheet interchange document</comment>
+ <comment xml:lang="es">documento de intercambio de hoja de cálculo</comment>
<comment xml:lang="eu">kalkulu-orriak trukatzeko dokumentua</comment>
<comment xml:lang="fi">taulukkovälitysasiakirja</comment>
<comment xml:lang="fo">rokniarks umbýtisskjal</comment>
<comment xml:lang="fr">document d'échange de feuilles de calcul</comment>
+ <comment xml:lang="fur">document di interscambi par sfuei di calcul</comment>
<comment xml:lang="ga">cáipéis idirmhalartaithe scarbhileog</comment>
<comment xml:lang="gl">documento de intercambio de follas de cálculo</comment>
<comment xml:lang="he">מסמך גליון נתונים מתחלף</comment>
@@ -32501,7 +33698,7 @@
<comment xml:lang="oc">document d'escambi de fuèlhs de calcul</comment>
<comment xml:lang="pl">Dokument wymiany arkuszy kalkulacyjnych</comment>
<comment xml:lang="pt">documento de troca interna de folhas de cálculo</comment>
- <comment xml:lang="pt_BR">Documento de intercâmbio de planilhas</comment>
+ <comment xml:lang="pt-BR">Documento de intercâmbio de planilhas</comment>
<comment xml:lang="ro">document schimb filă de calcul</comment>
<comment xml:lang="ru">Документ Spreadsheet Interchange</comment>
<comment xml:lang="sk">Zošitový prenosový dokument</comment>
@@ -32509,35 +33706,37 @@
<comment xml:lang="sq">Dokument shkëmbimi për fletë llogaritje</comment>
<comment xml:lang="sr">документ размене табеле</comment>
<comment xml:lang="sv">spreadsheet interchange-dokument</comment>
- <comment xml:lang="tr">hesap tablosu değişim belgesi</comment>
+ <comment xml:lang="tr">hesap çizelgesi değişim belgesi</comment>
<comment xml:lang="uk">документ обміну ел. таблицями</comment>
<comment xml:lang="vi">tài liệu hoán đổi bảng tính</comment>
- <comment xml:lang="zh_CN">电子表格交换文档</comment>
- <comment xml:lang="zh_TW">試算表交換文件</comment>
+ <comment xml:lang="zh-CN">电子表格交换文档</comment>
+ <comment xml:lang="zh-TW">試算表交換文件</comment>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="ID;" type="string" offset="0"/>
+ <match type="string" value="ID;" offset="0"/>
</magic>
<glob pattern="*.sylk"/>
<glob pattern="*.slk"/>
</mime-type>
<mime-type type="text/tab-separated-values">
<comment>TSV document</comment>
+ <comment xml:lang="af">TSV-dokument</comment>
<comment xml:lang="ar">مستند TSV</comment>
<comment xml:lang="ast">Documentu TSV</comment>
- <comment xml:lang="be@latin">Dakument TSV</comment>
+ <comment xml:lang="be-Latn">Dakument TSV</comment>
<comment xml:lang="bg">Документ — TSV</comment>
<comment xml:lang="ca">document TSV</comment>
<comment xml:lang="cs">dokument TSV</comment>
<comment xml:lang="da">TSV-dokument</comment>
<comment xml:lang="de">TSV-Dokument</comment>
<comment xml:lang="el">Έγγραφο TSV</comment>
- <comment xml:lang="en_GB">TSV document</comment>
+ <comment xml:lang="en-GB">TSV document</comment>
<comment xml:lang="es">documento TSV</comment>
<comment xml:lang="eu">TSV dokumentua</comment>
<comment xml:lang="fi">TSV-asiakirja</comment>
<comment xml:lang="fo">TSV skjal</comment>
<comment xml:lang="fr">document TSV</comment>
+ <comment xml:lang="fur">document TSV</comment>
<comment xml:lang="ga">cáipéis TSV</comment>
<comment xml:lang="gl">documento TSV</comment>
<comment xml:lang="he">מסמך TSV</comment>
@@ -32557,7 +33756,7 @@
<comment xml:lang="oc">document TSV</comment>
<comment xml:lang="pl">Dokument TSV</comment>
<comment xml:lang="pt">documento TSV</comment>
- <comment xml:lang="pt_BR">Documento TSV</comment>
+ <comment xml:lang="pt-BR">Documento TSV</comment>
<comment xml:lang="ro">Document TSV</comment>
<comment xml:lang="ru">Документ TSV</comment>
<comment xml:lang="sk">Dokument TSV</comment>
@@ -32568,8 +33767,8 @@
<comment xml:lang="tr">TSV belgesi</comment>
<comment xml:lang="uk">документ TSV</comment>
<comment xml:lang="vi">Tài liệu TSV</comment>
- <comment xml:lang="zh_CN">TSV 文档</comment>
- <comment xml:lang="zh_TW">TSV 文件</comment>
+ <comment xml:lang="zh-CN">TSV 文档</comment>
+ <comment xml:lang="zh-TW">TSV 文件</comment>
<acronym>TSV</acronym>
<expanded-acronym>Tab Separated Values</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -32577,6 +33776,7 @@
</mime-type>
<mime-type type="text/vnd.graphviz">
<comment>Graphviz DOT graph</comment>
+ <comment xml:lang="af">Graphviz DOT-grafiek</comment>
<comment xml:lang="ar">مبيان Graphviz DOT</comment>
<comment xml:lang="bg">Граф — Graphviz DOT</comment>
<comment xml:lang="ca">gràfic Graphviz DOT</comment>
@@ -32584,12 +33784,13 @@
<comment xml:lang="da">Graphviz DOT-graf</comment>
<comment xml:lang="de">Graphviz-DOT-Graph</comment>
<comment xml:lang="el">Γράφημα Graphviz DOT</comment>
- <comment xml:lang="en_GB">Graphviz DOT graph</comment>
+ <comment xml:lang="en-GB">Graphviz DOT graph</comment>
<comment xml:lang="es">gráfico de Graphviz DOT</comment>
<comment xml:lang="eu">Graphviz DOT grafikoa</comment>
<comment xml:lang="fi">Graphviz DOT -graafi</comment>
<comment xml:lang="fo">Graphviz DOT ritmynd</comment>
<comment xml:lang="fr">graphe Graphviz DOT</comment>
+ <comment xml:lang="fur">grafic Graphviz DOT</comment>
<comment xml:lang="ga">graf DOT Graphviz</comment>
<comment xml:lang="gl">gráfica DOT de Graphviz</comment>
<comment xml:lang="he">תרשים של Graphviz DOT</comment>
@@ -32607,7 +33808,7 @@
<comment xml:lang="oc">graf Graphviz DOT</comment>
<comment xml:lang="pl">Wykres DOT Graphviz</comment>
<comment xml:lang="pt">gráfico Graphviz DOT</comment>
- <comment xml:lang="pt_BR">Gráfico do Graphviz DOT</comment>
+ <comment xml:lang="pt-BR">Gráfico do Graphviz DOT</comment>
<comment xml:lang="ro">Grafic Graphviz DOT</comment>
<comment xml:lang="ru">Диаграмма Graphviz DOT</comment>
<comment xml:lang="sk">Graf Graphviz DOT</comment>
@@ -32617,36 +33818,38 @@
<comment xml:lang="tr">Graphviz DOT grafiği</comment>
<comment xml:lang="uk">граф DOT Graphviz</comment>
<comment xml:lang="vi">Biểu đồ DOT Graphviz</comment>
- <comment xml:lang="zh_CN">Graphviz DOT 图形</comment>
- <comment xml:lang="zh_TW">Graphviz DOT 圖</comment>
+ <comment xml:lang="zh-CN">Graphviz DOT 图形</comment>
+ <comment xml:lang="zh-TW">Graphviz DOT 圖表</comment>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="digraph " type="string" offset="0"/>
- <match value="strict digraph " type="string" offset="0"/>
- <match value="graph " type="string" offset="0"/>
- <match value="strict graph " type="string" offset="0"/>
+ <match type="string" value="digraph " offset="0"/>
+ <match type="string" value="strict digraph " offset="0"/>
+ <match type="string" value="graph " offset="0"/>
+ <match type="string" value="strict graph " offset="0"/>
</magic>
<glob pattern="*.gv"/>
<glob pattern="*.dot"/>
</mime-type>
<mime-type type="text/vnd.sun.j2me.app-descriptor">
<comment>JAD document</comment>
+ <comment xml:lang="af">JAD-dokument</comment>
<comment xml:lang="ar">مستند JAD</comment>
<comment xml:lang="ast">Documentu JAD</comment>
- <comment xml:lang="be@latin">Dakument JAD</comment>
+ <comment xml:lang="be-Latn">Dakument JAD</comment>
<comment xml:lang="bg">Документ — JAD</comment>
<comment xml:lang="ca">document JAD</comment>
<comment xml:lang="cs">dokument JAD</comment>
<comment xml:lang="da">JAD-dokument</comment>
<comment xml:lang="de">JAD-Dokument</comment>
<comment xml:lang="el">Έγγραφο JAD</comment>
- <comment xml:lang="en_GB">JAD document</comment>
+ <comment xml:lang="en-GB">JAD document</comment>
<comment xml:lang="eo">JAD-dokumento</comment>
<comment xml:lang="es">documento JAD</comment>
<comment xml:lang="eu">JAD dokumentua</comment>
<comment xml:lang="fi">JAD-asiakirja</comment>
<comment xml:lang="fo">JAD skjal</comment>
<comment xml:lang="fr">document JAD</comment>
+ <comment xml:lang="fur">document JAD</comment>
<comment xml:lang="ga">cáipéis JAD</comment>
<comment xml:lang="gl">documento JAD</comment>
<comment xml:lang="he">מסמך JAD</comment>
@@ -32666,7 +33869,7 @@
<comment xml:lang="oc">document JAD</comment>
<comment xml:lang="pl">Dokument JAD</comment>
<comment xml:lang="pt">documento JAD</comment>
- <comment xml:lang="pt_BR">Documento JAD</comment>
+ <comment xml:lang="pt-BR">Documento JAD</comment>
<comment xml:lang="ro">Document JAD</comment>
<comment xml:lang="ru">Документ JAD</comment>
<comment xml:lang="sk">Dokument JAD</comment>
@@ -32677,21 +33880,22 @@
<comment xml:lang="tr">JAD belgesi</comment>
<comment xml:lang="uk">документ JAD</comment>
<comment xml:lang="vi">Tài liệu JAD</comment>
- <comment xml:lang="zh_CN">JAD 文档</comment>
- <comment xml:lang="zh_TW">JAD 文件</comment>
+ <comment xml:lang="zh-CN">JAD 文档</comment>
+ <comment xml:lang="zh-TW">JAD 文件</comment>
<acronym>JAD</acronym>
<expanded-acronym>Java Application Descriptor</expanded-acronym>
<magic priority="50">
- <match value="MIDlet-" type="string" offset="0"/>
+ <match type="string" value="MIDlet-" offset="0"/>
</magic>
<glob pattern="*.jad"/>
</mime-type>
<mime-type type="text/vnd.wap.wml">
<comment>WML document</comment>
+ <comment xml:lang="af">WML-dokument</comment>
<comment xml:lang="ar">مستند WML</comment>
<comment xml:lang="ast">Documentu WML</comment>
<comment xml:lang="az">WML sənədi</comment>
- <comment xml:lang="be@latin">Dakument WML</comment>
+ <comment xml:lang="be-Latn">Dakument WML</comment>
<comment xml:lang="bg">Документ — WML</comment>
<comment xml:lang="ca">document WML</comment>
<comment xml:lang="cs">dokument WML</comment>
@@ -32699,13 +33903,14 @@
<comment xml:lang="da">WML-dokument</comment>
<comment xml:lang="de">WML-Dokument</comment>
<comment xml:lang="el">Έγγραφο WML</comment>
- <comment xml:lang="en_GB">WML document</comment>
+ <comment xml:lang="en-GB">WML document</comment>
<comment xml:lang="eo">WML-dokumento</comment>
<comment xml:lang="es">documento WML</comment>
<comment xml:lang="eu">WML dokumentua</comment>
<comment xml:lang="fi">WML-asiakirja</comment>
<comment xml:lang="fo">WML skjal</comment>
<comment xml:lang="fr">document WML</comment>
+ <comment xml:lang="fur">document WML</comment>
<comment xml:lang="ga">cáipéis WML</comment>
<comment xml:lang="gl">documento WML</comment>
<comment xml:lang="he">מסמך WML</comment>
@@ -32726,7 +33931,7 @@
<comment xml:lang="oc">document WML</comment>
<comment xml:lang="pl">Dokument WML</comment>
<comment xml:lang="pt">documento WML</comment>
- <comment xml:lang="pt_BR">Documento WML</comment>
+ <comment xml:lang="pt-BR">Documento WML</comment>
<comment xml:lang="ro">Document WML</comment>
<comment xml:lang="ru">Документ WML</comment>
<comment xml:lang="sk">Dokument WML</comment>
@@ -32737,8 +33942,8 @@
<comment xml:lang="tr">WML belgesi</comment>
<comment xml:lang="uk">документ WML</comment>
<comment xml:lang="vi">Tài liệu WML</comment>
- <comment xml:lang="zh_CN">WML 文档</comment>
- <comment xml:lang="zh_TW">WML 文件</comment>
+ <comment xml:lang="zh-CN">WML 文档</comment>
+ <comment xml:lang="zh-TW">WML 文件</comment>
<acronym>WML</acronym>
<expanded-acronym>Wireless Markup Language</expanded-acronym>
<sub-class-of type="application/xml"/>
@@ -32746,20 +33951,22 @@
</mime-type>
<mime-type type="text/vnd.wap.wmlscript">
<comment>WMLScript program</comment>
+ <comment xml:lang="af">WMLScript-program</comment>
<comment xml:lang="ar">برنامج WMLScript</comment>
- <comment xml:lang="be@latin">Prahrama WMLScript</comment>
+ <comment xml:lang="be-Latn">Prahrama WMLScript</comment>
<comment xml:lang="bg">Програма — WMLScript</comment>
<comment xml:lang="ca">programa WMLScript</comment>
<comment xml:lang="cs">program WMLScript</comment>
<comment xml:lang="da">WMLScript-program</comment>
<comment xml:lang="de">WMLScript-Programm</comment>
<comment xml:lang="el">Πρόγραμμα WMLScript</comment>
- <comment xml:lang="en_GB">WMLScript program</comment>
+ <comment xml:lang="en-GB">WMLScript program</comment>
<comment xml:lang="es">programa en WMLScript</comment>
<comment xml:lang="eu">WMLScript programa</comment>
<comment xml:lang="fi">WMLScript-ohjelma</comment>
<comment xml:lang="fo">WMLScript forrit</comment>
<comment xml:lang="fr">programme WMLScript</comment>
+ <comment xml:lang="fur">program WMLScript</comment>
<comment xml:lang="ga">ríomhchlár WMLScript</comment>
<comment xml:lang="gl">programa en WMLScript</comment>
<comment xml:lang="he">תכנית של WMLScript</comment>
@@ -32779,7 +33986,7 @@
<comment xml:lang="oc">programa WMLEscript</comment>
<comment xml:lang="pl">Pogram WMLScript</comment>
<comment xml:lang="pt">programa WMLScript</comment>
- <comment xml:lang="pt_BR">Programa WMLScript</comment>
+ <comment xml:lang="pt-BR">Programa WMLScript</comment>
<comment xml:lang="ro">Program WMLScript</comment>
<comment xml:lang="ru">Программа WMLScript</comment>
<comment xml:lang="sk">Program WMLScript</comment>
@@ -32790,27 +33997,60 @@
<comment xml:lang="tr">WMLScript programı</comment>
<comment xml:lang="uk">програма мовою WMLScript</comment>
<comment xml:lang="vi">Chương trình WMLScript</comment>
- <comment xml:lang="zh_CN">WMLScript 程序</comment>
- <comment xml:lang="zh_TW">WMLScript 程式</comment>
+ <comment xml:lang="zh-CN">WMLScript 程序</comment>
+ <comment xml:lang="zh-TW">WMLScript 程式</comment>
<glob pattern="*.wmls"/>
</mime-type>
+ <mime-type type="text/vnd.senx.warpscript">
+ <comment>WarpScript source code</comment>
+ <comment xml:lang="bg">Изходен код — WarpScript</comment>
+ <comment xml:lang="ca">codi font en WarpScript</comment>
+ <comment xml:lang="cs">zdrojový kód v jazyce WarpScript</comment>
+ <comment xml:lang="da">WarpScript-kildekode</comment>
+ <comment xml:lang="de">WarpScript-Quelltext</comment>
+ <comment xml:lang="en-GB">WarpScript source code</comment>
+ <comment xml:lang="es">código fuente en WarpScript</comment>
+ <comment xml:lang="eu">WarpScript iturburu-kodea</comment>
+ <comment xml:lang="fi">WarpScript-lähdekoodi</comment>
+ <comment xml:lang="fr">code source WarpScript</comment>
+ <comment xml:lang="fur">codiç sorzint WarpScript</comment>
+ <comment xml:lang="hr">WarpScript izvorni kôd</comment>
+ <comment xml:lang="hu">WarpScript forráskód</comment>
+ <comment xml:lang="id">Kode sumber WarpScript</comment>
+ <comment xml:lang="it">Codice sorgente WarpScript</comment>
+ <comment xml:lang="kk">WarpScript бастапқы коды</comment>
+ <comment xml:lang="ko">WarpScript 소스 코드</comment>
+ <comment xml:lang="pl">Kod źródłowy WarpScript</comment>
+ <comment xml:lang="pt-BR">Código-fonte WarpScript</comment>
+ <comment xml:lang="ru">Исходный код WarpScript</comment>
+ <comment xml:lang="sl">Izvorna koda WarpScript</comment>
+ <comment xml:lang="sv">WarpScript-källkod</comment>
+ <comment xml:lang="tr">WarpScript kaynak kodu</comment>
+ <comment xml:lang="uk">вихідний код мовою WarpScript</comment>
+ <comment xml:lang="zh-CN">WarpScript 源代码</comment>
+ <comment xml:lang="zh-TW">WarpScript 原始碼</comment>
+ <sub-class-of type="text/plain"/>
+ <glob pattern="*.mc2"/>
+ </mime-type>
<mime-type type="application/x-ace">
<comment>ACE archive</comment>
+ <comment xml:lang="af">ACE-argief</comment>
<comment xml:lang="ar">أرشيف ACE</comment>
- <comment xml:lang="be@latin">Archiŭ ACE</comment>
+ <comment xml:lang="be-Latn">Archiŭ ACE</comment>
<comment xml:lang="bg">Архив — ACE</comment>
<comment xml:lang="ca">arxiu ACE</comment>
<comment xml:lang="cs">archiv ACE</comment>
<comment xml:lang="da">ACE-arkiv</comment>
<comment xml:lang="de">ACE-Archiv</comment>
<comment xml:lang="el">Συμπιεσμένο αρχείο ACE</comment>
- <comment xml:lang="en_GB">ACE archive</comment>
+ <comment xml:lang="en-GB">ACE archive</comment>
<comment xml:lang="eo">ACE-arkivo</comment>
<comment xml:lang="es">archivador ACE</comment>
<comment xml:lang="eu">ACE artxiboa</comment>
<comment xml:lang="fi">ACE-arkisto</comment>
<comment xml:lang="fo">ACE skjalasavn</comment>
<comment xml:lang="fr">archive ACE</comment>
+ <comment xml:lang="fur">archivi ACE</comment>
<comment xml:lang="ga">cartlann ACE</comment>
<comment xml:lang="gl">arquivo ACE</comment>
<comment xml:lang="he">ארכיון ACE</comment>
@@ -32831,7 +34071,7 @@
<comment xml:lang="oc">archiu ACE</comment>
<comment xml:lang="pl">Archiwum ACE</comment>
<comment xml:lang="pt">arquivo ACE</comment>
- <comment xml:lang="pt_BR">Pacote ACE</comment>
+ <comment xml:lang="pt-BR">Pacote ACE</comment>
<comment xml:lang="ro">Arhivă ACE</comment>
<comment xml:lang="ru">Архив ACE</comment>
<comment xml:lang="sk">Archív ACE</comment>
@@ -32842,31 +34082,33 @@
<comment xml:lang="tr">ACE arşivi</comment>
<comment xml:lang="uk">архів ACE</comment>
<comment xml:lang="vi">Kho nén ACE</comment>
- <comment xml:lang="zh_CN">ACE 归档文件</comment>
- <comment xml:lang="zh_TW">ACE 封存檔</comment>
+ <comment xml:lang="zh-CN">ACE 归档文件</comment>
+ <comment xml:lang="zh-TW">ACE 封存檔</comment>
<generic-icon name="package-x-generic"/>
<magic priority="60">
- <match value="**ACE**" type="string" offset="7"/>
+ <match type="string" value="**ACE**" offset="7"/>
</magic>
<glob pattern="*.ace"/>
</mime-type>
<mime-type type="text/x-adasrc">
<comment>Ada source code</comment>
+ <comment xml:lang="af">Ada-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر Ada</comment>
- <comment xml:lang="be@latin">Kryničny kod Ada</comment>
+ <comment xml:lang="be-Latn">Kryničny kod Ada</comment>
<comment xml:lang="bg">Изходен код — Ada</comment>
<comment xml:lang="ca">codi font en Ada</comment>
<comment xml:lang="cs">zdrojový kód v jazyce Ada</comment>
<comment xml:lang="da">Ada-kildekode</comment>
<comment xml:lang="de">Ada-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Ada</comment>
- <comment xml:lang="en_GB">Ada source code</comment>
+ <comment xml:lang="en-GB">Ada source code</comment>
<comment xml:lang="eo">Ada-fontkodo</comment>
<comment xml:lang="es">código fuente en Ada</comment>
<comment xml:lang="eu">Ada iturburu-kodea</comment>
<comment xml:lang="fi">Ada-lähdekoodi</comment>
<comment xml:lang="fo">Ada keldukota</comment>
<comment xml:lang="fr">code source Ada</comment>
+ <comment xml:lang="fur">codiç sorzint Ada</comment>
<comment xml:lang="ga">cód foinseach Ada</comment>
<comment xml:lang="gl">código fonte en Ada</comment>
<comment xml:lang="he">קוד מקור Ada</comment>
@@ -32888,7 +34130,7 @@
<comment xml:lang="oc">còde font Ada</comment>
<comment xml:lang="pl">Kod źródłowy Ada</comment>
<comment xml:lang="pt">código origem Ada</comment>
- <comment xml:lang="pt_BR">Código-fonte Ada</comment>
+ <comment xml:lang="pt-BR">Código-fonte Ada</comment>
<comment xml:lang="ro">Cod sursă Ada</comment>
<comment xml:lang="ru">Исходный код Ada</comment>
<comment xml:lang="sk">Zdrojový kód jazyka Ada</comment>
@@ -32899,29 +34141,31 @@
<comment xml:lang="tr">Ada kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Ada</comment>
<comment xml:lang="vi">Mã nguồn Ada</comment>
- <comment xml:lang="zh_CN">Ada 源代码</comment>
- <comment xml:lang="zh_TW">Ada 源碼</comment>
+ <comment xml:lang="zh-CN">Ada 源代码</comment>
+ <comment xml:lang="zh-TW">Ada 源碼</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.adb"/>
<glob pattern="*.ads"/>
</mime-type>
<mime-type type="text/x-authors">
<comment>author list</comment>
+ <comment xml:lang="af">outeurlys</comment>
<comment xml:lang="ar">لائحة المؤلف</comment>
- <comment xml:lang="be@latin">śpis aŭtaraŭ</comment>
+ <comment xml:lang="be-Latn">śpis aŭtaraŭ</comment>
<comment xml:lang="bg">Списък на авторите</comment>
<comment xml:lang="ca">llista d'autors</comment>
<comment xml:lang="cs">seznam autorů</comment>
<comment xml:lang="da">forfatterliste</comment>
<comment xml:lang="de">Autorenliste</comment>
<comment xml:lang="el">Κατάλογος συγγραφέων</comment>
- <comment xml:lang="en_GB">author list</comment>
+ <comment xml:lang="en-GB">author list</comment>
<comment xml:lang="eo">listo de aŭtoroj</comment>
<comment xml:lang="es">lista de autores</comment>
<comment xml:lang="eu">egile-zerrenda</comment>
<comment xml:lang="fi">tekijäluettelo</comment>
<comment xml:lang="fo">høvundalisti</comment>
<comment xml:lang="fr">liste d'auteurs</comment>
+ <comment xml:lang="fur">liste di autôrs</comment>
<comment xml:lang="ga">liosta údar</comment>
<comment xml:lang="gl">lista de autores</comment>
<comment xml:lang="he">רשימת יוצרים</comment>
@@ -32942,7 +34186,7 @@
<comment xml:lang="oc">lista d'autors</comment>
<comment xml:lang="pl">Lista autorów</comment>
<comment xml:lang="pt">lista de autores</comment>
- <comment xml:lang="pt_BR">Lista de autores</comment>
+ <comment xml:lang="pt-BR">Lista de autores</comment>
<comment xml:lang="ro">listă autori</comment>
<comment xml:lang="ru">Список авторов</comment>
<comment xml:lang="sk">Zoznam autorov</comment>
@@ -32953,29 +34197,31 @@
<comment xml:lang="tr">yazar listesi</comment>
<comment xml:lang="uk">перелік авторів</comment>
<comment xml:lang="vi">danh sách tác giả</comment>
- <comment xml:lang="zh_CN">作者列表</comment>
- <comment xml:lang="zh_TW">作者清單</comment>
+ <comment xml:lang="zh-CN">作者列表</comment>
+ <comment xml:lang="zh-TW">作者清單</comment>
<sub-class-of type="text/plain"/>
<glob pattern="AUTHORS"/>
</mime-type>
<mime-type type="text/x-bibtex">
<comment>BibTeX document</comment>
+ <comment xml:lang="af">BibTeX-dokument</comment>
<comment xml:lang="ar">مستند BibTeX</comment>
<comment xml:lang="ast">Documentu de BibTeX</comment>
- <comment xml:lang="be@latin">Dakument BibTeX</comment>
+ <comment xml:lang="be-Latn">Dakument BibTeX</comment>
<comment xml:lang="bg">Документ — BibTeX</comment>
<comment xml:lang="ca">document BibTeX</comment>
<comment xml:lang="cs">dokument BibTeX</comment>
<comment xml:lang="da">BibTeX-dokument</comment>
<comment xml:lang="de">BibTeX-Dokument</comment>
<comment xml:lang="el">Έγγραφο BibTeX</comment>
- <comment xml:lang="en_GB">BibTeX document</comment>
+ <comment xml:lang="en-GB">BibTeX document</comment>
<comment xml:lang="eo">BibTeX-dokumento</comment>
<comment xml:lang="es">documento BibTeX</comment>
<comment xml:lang="eu">BibTeX dokumentua</comment>
<comment xml:lang="fi">BibTeX-asiakirja</comment>
<comment xml:lang="fo">BibTeX skjal</comment>
<comment xml:lang="fr">document BibTeX</comment>
+ <comment xml:lang="fur">document BibTeX</comment>
<comment xml:lang="ga">cáipéis BibTeX</comment>
<comment xml:lang="gl">documento BibTex</comment>
<comment xml:lang="he">מסמך BibTeX</comment>
@@ -32996,7 +34242,7 @@
<comment xml:lang="oc">document BibTeX</comment>
<comment xml:lang="pl">Dokument BibTeX</comment>
<comment xml:lang="pt">documento BibTeX</comment>
- <comment xml:lang="pt_BR">Documento BibTeX</comment>
+ <comment xml:lang="pt-BR">Documento BibTeX</comment>
<comment xml:lang="ro">Document BibTeX</comment>
<comment xml:lang="ru">Документ BibTeX</comment>
<comment xml:lang="sk">Dokument BibTeX</comment>
@@ -33007,30 +34253,31 @@
<comment xml:lang="tr">BibTeX belgesi</comment>
<comment xml:lang="uk">документ BibTeX</comment>
<comment xml:lang="vi">Tài liệu BibTeX</comment>
- <comment xml:lang="zh_CN">BibTeX 文档</comment>
- <comment xml:lang="zh_TW">BibTeX 文件</comment>
+ <comment xml:lang="zh-CN">BibTeX 文档</comment>
+ <comment xml:lang="zh-TW">BibTeX 文件</comment>
<sub-class-of type="text/plain"/>
<magic>
- <match value="% This file was created with JabRef" type="string" offset="0"/>
+ <match type="string" value="% This file was created with JabRef" offset="0"/>
</magic>
<glob pattern="*.bib"/>
</mime-type>
<mime-type type="text/x-c++hdr">
<comment>C++ header</comment>
<comment xml:lang="ar">ترويسة سي++</comment>
- <comment xml:lang="be@latin">Zahałoŭny fajł C++</comment>
+ <comment xml:lang="be-Latn">Zahałoŭny fajł C++</comment>
<comment xml:lang="bg">Заглавен файл — C++</comment>
<comment xml:lang="ca">capçalera en C++</comment>
<comment xml:lang="cs">hlavičkový soubor C++</comment>
<comment xml:lang="da">C++-posthoved</comment>
<comment xml:lang="de">C++-Header</comment>
<comment xml:lang="el">Κεφαλίδα C++</comment>
- <comment xml:lang="en_GB">C++ header</comment>
+ <comment xml:lang="en-GB">C++ header</comment>
<comment xml:lang="es">cabecera de código fuente en C++</comment>
<comment xml:lang="eu">C++ goiburua</comment>
<comment xml:lang="fi">C++-otsake</comment>
<comment xml:lang="fo">C++ tekshøvd</comment>
<comment xml:lang="fr">en-tête C++</comment>
+ <comment xml:lang="fur">intestazion C++</comment>
<comment xml:lang="ga">ceanntásc C++</comment>
<comment xml:lang="gl">cabeceira de código fonte en C++</comment>
<comment xml:lang="he">כותר C++‎</comment>
@@ -33051,7 +34298,7 @@
<comment xml:lang="oc">entèsta C++</comment>
<comment xml:lang="pl">Plik nagłówkowy C++</comment>
<comment xml:lang="pt">cabeçalho C++</comment>
- <comment xml:lang="pt_BR">Cabeçalho C++</comment>
+ <comment xml:lang="pt-BR">Cabeçalho C++</comment>
<comment xml:lang="ro">Antet C++</comment>
<comment xml:lang="ru">Заголовочный файл C++</comment>
<comment xml:lang="sk">Hlavičky jazyka C++</comment>
@@ -33062,8 +34309,8 @@
<comment xml:lang="tr">C++ başlığı</comment>
<comment xml:lang="uk">файл заголовків мовою C++</comment>
<comment xml:lang="vi">Phần đầu mã nguồn C++</comment>
- <comment xml:lang="zh_CN">C++ 头文件</comment>
- <comment xml:lang="zh_TW">C++ 標頭檔</comment>
+ <comment xml:lang="zh-CN">C++ 头文件</comment>
+ <comment xml:lang="zh-TW">C++ 標頭檔</comment>
<sub-class-of type="text/x-chdr"/>
<glob pattern="*.hh"/>
<glob pattern="*.hp"/>
@@ -33073,21 +34320,23 @@
</mime-type>
<mime-type type="text/x-c++src">
<comment>C++ source code</comment>
+ <comment xml:lang="af">C++-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر سي++</comment>
- <comment xml:lang="be@latin">Kryničny kod C++</comment>
+ <comment xml:lang="be-Latn">Kryničny kod C++</comment>
<comment xml:lang="bg">Изходен код — C++</comment>
<comment xml:lang="ca">codi font en C++</comment>
<comment xml:lang="cs">zdrojový kód v jazyce C++</comment>
<comment xml:lang="da">C++-kildekode</comment>
<comment xml:lang="de">C++-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας C++</comment>
- <comment xml:lang="en_GB">C++ source code</comment>
+ <comment xml:lang="en-GB">C++ source code</comment>
<comment xml:lang="eo">C++-fontkodo</comment>
<comment xml:lang="es">código fuente en C++</comment>
<comment xml:lang="eu">C++ iturburu-kodea</comment>
<comment xml:lang="fi">C++-lähdekoodi</comment>
<comment xml:lang="fo">C++ keldukota</comment>
<comment xml:lang="fr">code source C++</comment>
+ <comment xml:lang="fur">codiç sorzint C++</comment>
<comment xml:lang="ga">cód foinseach C++</comment>
<comment xml:lang="gl">código fonte de C++</comment>
<comment xml:lang="he">קוד מקור של C++‎</comment>
@@ -33109,7 +34358,7 @@
<comment xml:lang="oc">còde font C++</comment>
<comment xml:lang="pl">Kod źródłowy C++</comment>
<comment xml:lang="pt">código origem C++</comment>
- <comment xml:lang="pt_BR">Código-fonte C++</comment>
+ <comment xml:lang="pt-BR">Código-fonte C++</comment>
<comment xml:lang="ro">Cod sursă C++</comment>
<comment xml:lang="ru">Исходный код C++</comment>
<comment xml:lang="sk">Zdrojový kód jazyka C++</comment>
@@ -33120,8 +34369,8 @@
<comment xml:lang="tr">C++ kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою C++</comment>
<comment xml:lang="vi">Mã nguồn C++</comment>
- <comment xml:lang="zh_CN">C++ 源代码</comment>
- <comment xml:lang="zh_TW">C++ 源碼</comment>
+ <comment xml:lang="zh-CN">C++ 源代码</comment>
+ <comment xml:lang="zh-TW">C++ 源碼</comment>
<sub-class-of type="text/x-csrc"/>
<glob pattern="*.cpp"/>
<glob pattern="*.cxx"/>
@@ -33131,21 +34380,23 @@
</mime-type>
<mime-type type="text/x-changelog">
<comment>ChangeLog document</comment>
+ <comment xml:lang="af">ChangeLog-dokument</comment>
<comment xml:lang="ar">مستند ChangeLog</comment>
<comment xml:lang="ast">Documentu de rexistru de cambeos</comment>
- <comment xml:lang="be@latin">Dakument zafiksavanych źmienaŭ ChangeLog</comment>
+ <comment xml:lang="be-Latn">Dakument zafiksavanych źmienaŭ ChangeLog</comment>
<comment xml:lang="bg">Дневник за промени — ChangeLog</comment>
<comment xml:lang="ca">document de registre de canvis</comment>
<comment xml:lang="cs">dokument ChangeLog</comment>
<comment xml:lang="da">ChangeLot-dokument</comment>
<comment xml:lang="de">Änderungsprotokoll-Dokument</comment>
<comment xml:lang="el">Έγγραφο ChangeLog</comment>
- <comment xml:lang="en_GB">ChangeLog document</comment>
+ <comment xml:lang="en-GB">ChangeLog document</comment>
<comment xml:lang="es">documento de registro de cambios</comment>
<comment xml:lang="eu">ChangeLog dokumentua</comment>
<comment xml:lang="fi">Muutoslokiasiakirja</comment>
<comment xml:lang="fo">ChangeLog skjal</comment>
<comment xml:lang="fr">document ChangeLog</comment>
+ <comment xml:lang="fur">document ChangeLog</comment>
<comment xml:lang="ga">cáipéis ChangeLog</comment>
<comment xml:lang="gl">documento Changelog</comment>
<comment xml:lang="he">מסמך של ChangeLog</comment>
@@ -33166,7 +34417,7 @@
<comment xml:lang="oc">document ChangeLog</comment>
<comment xml:lang="pl">Dokument zmian (ChangeLog)</comment>
<comment xml:lang="pt">documento ChangeLog</comment>
- <comment xml:lang="pt_BR">Documento ChangeLog</comment>
+ <comment xml:lang="pt-BR">Documento ChangeLog</comment>
<comment xml:lang="ro">Document ChangeLog</comment>
<comment xml:lang="ru">Протокол изменений</comment>
<comment xml:lang="sk">Dokument ChangeLog</comment>
@@ -33174,30 +34425,31 @@
<comment xml:lang="sq">Dokument ChangeLog</comment>
<comment xml:lang="sr">документ дневника измена</comment>
<comment xml:lang="sv">Ändringsloggsdokument</comment>
- <comment xml:lang="tr">Değişim Günlüğü belgesi</comment>
+ <comment xml:lang="tr">ChangeLog belgesi</comment>
<comment xml:lang="uk">документ ChangeLog</comment>
<comment xml:lang="vi">Tài liệu ChangeLog (ghi lưu thay đổi)</comment>
- <comment xml:lang="zh_CN">变更日志文档</comment>
- <comment xml:lang="zh_TW">ChangeLog 文件</comment>
+ <comment xml:lang="zh-CN">变更日志文档</comment>
+ <comment xml:lang="zh-TW">ChangeLog 文件</comment>
<sub-class-of type="text/plain"/>
<glob pattern="ChangeLog"/>
</mime-type>
<mime-type type="text/x-chdr">
<comment>C header</comment>
<comment xml:lang="ar">ترويسة C</comment>
- <comment xml:lang="be@latin">Zahałoŭny fajł C</comment>
+ <comment xml:lang="be-Latn">Zahałoŭny fajł C</comment>
<comment xml:lang="bg">Заглавен файл — C</comment>
<comment xml:lang="ca">capçalera en C</comment>
<comment xml:lang="cs">hlavičkový soubor C</comment>
<comment xml:lang="da">C-posthoved</comment>
<comment xml:lang="de">C-Header</comment>
<comment xml:lang="el">Κεφαλίδα C</comment>
- <comment xml:lang="en_GB">C header</comment>
+ <comment xml:lang="en-GB">C header</comment>
<comment xml:lang="es">cabecera de código fuente en C</comment>
<comment xml:lang="eu">C goiburua</comment>
<comment xml:lang="fi">C-otsake</comment>
<comment xml:lang="fo">C tekshøvd</comment>
<comment xml:lang="fr">en-tête C</comment>
+ <comment xml:lang="fur">intestazion C</comment>
<comment xml:lang="ga">ceanntásc C</comment>
<comment xml:lang="gl">cabeceira de códifo fonte de C</comment>
<comment xml:lang="he">כותר C</comment>
@@ -33218,7 +34470,7 @@
<comment xml:lang="oc">entèsta C</comment>
<comment xml:lang="pl">Plik nagłówkowy C</comment>
<comment xml:lang="pt">cabeçalho C</comment>
- <comment xml:lang="pt_BR">Cabeçalho C</comment>
+ <comment xml:lang="pt-BR">Cabeçalho C</comment>
<comment xml:lang="ro">Antet C</comment>
<comment xml:lang="ru">Заголовочный файл C</comment>
<comment xml:lang="sk">Hlavičky jazyka C</comment>
@@ -33229,28 +34481,30 @@
<comment xml:lang="tr">C başlığı</comment>
<comment xml:lang="uk">файл заголовків мовою C</comment>
<comment xml:lang="vi">Phần đầu mã nguồn C</comment>
- <comment xml:lang="zh_CN">C 程序头文件</comment>
- <comment xml:lang="zh_TW">C 標頭檔</comment>
+ <comment xml:lang="zh-CN">C 程序头文件</comment>
+ <comment xml:lang="zh-TW">C 標頭檔</comment>
<sub-class-of type="text/x-csrc"/>
<glob pattern="*.h"/>
</mime-type>
<mime-type type="text/x-cmake">
<comment>CMake source code</comment>
+ <comment xml:lang="af">CMake-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر CMake</comment>
- <comment xml:lang="be@latin">Kryničny kod CMake</comment>
+ <comment xml:lang="be-Latn">Kryničny kod CMake</comment>
<comment xml:lang="bg">Изходен код — CMake</comment>
<comment xml:lang="ca">codi font en CMake</comment>
<comment xml:lang="cs">zdrojový kód CMake</comment>
<comment xml:lang="da">CMake-kildekode</comment>
<comment xml:lang="de">CMake-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας CMake</comment>
- <comment xml:lang="en_GB">CMake source code</comment>
+ <comment xml:lang="en-GB">CMake source code</comment>
<comment xml:lang="eo">CMake-fontkodo</comment>
<comment xml:lang="es">código fuente en CMake</comment>
<comment xml:lang="eu">CMake iturburu-kodea</comment>
<comment xml:lang="fi">CMake-lähdekoodi</comment>
<comment xml:lang="fo">CMake keldukota</comment>
<comment xml:lang="fr">code source CMake</comment>
+ <comment xml:lang="fur">codiç sorzint CMake</comment>
<comment xml:lang="ga">cód foinseach CMake</comment>
<comment xml:lang="gl">código fonte de CMake</comment>
<comment xml:lang="he">קוד מקור של CMake</comment>
@@ -33271,7 +34525,7 @@
<comment xml:lang="oc">còde font CMake</comment>
<comment xml:lang="pl">Kod źródłowy CMake</comment>
<comment xml:lang="pt">código origem CMake</comment>
- <comment xml:lang="pt_BR">Código-fonte CMake</comment>
+ <comment xml:lang="pt-BR">Código-fonte CMake</comment>
<comment xml:lang="ro">Cod sursă CMake</comment>
<comment xml:lang="ru">Исходный код CMake</comment>
<comment xml:lang="sk">Zdrojový kód CMake</comment>
@@ -33282,30 +34536,55 @@
<comment xml:lang="tr">CMake kaynak kodu</comment>
<comment xml:lang="uk">вихідний код CMake</comment>
<comment xml:lang="vi">Mã nguồn CMake</comment>
- <comment xml:lang="zh_CN">CMake 源代码</comment>
- <comment xml:lang="zh_TW">CMake 源碼</comment>
+ <comment xml:lang="zh-CN">CMake 源代码</comment>
+ <comment xml:lang="zh-TW">CMake 源碼</comment>
<glob pattern="*.cmake"/>
<glob pattern="CMakeLists.txt"/>
<sub-class-of type="text/plain"/>
</mime-type>
+ <mime-type type="text/x-common-lisp">
+ <comment>Common Lisp source code</comment>
+ <comment xml:lang="ca">codi font en Common Lisp</comment>
+ <comment xml:lang="da">Common Lisp-kildekode</comment>
+ <comment xml:lang="de">Common-Lisp-Quelltext</comment>
+ <comment xml:lang="en-GB">Common Lisp source code</comment>
+ <comment xml:lang="es">código fuente en Common Lisp</comment>
+ <comment xml:lang="fi">Yleinen Lisp-lähdekoodi</comment>
+ <comment xml:lang="fr">code source Common Lisp</comment>
+ <comment xml:lang="hr">Common Lisp izvorni kôd</comment>
+ <comment xml:lang="it">Codice sorgente Common Lisp</comment>
+ <comment xml:lang="pl">Kod źródłowy Common Lisp</comment>
+ <comment xml:lang="pt-BR">Código-fonte Common Lisp</comment>
+ <comment xml:lang="sv">Common Lisp-källkod</comment>
+ <comment xml:lang="uk">вихідний код мовою Common Lisp</comment>
+ <comment xml:lang="zh-CN">Common Lisp 源代码</comment>
+ <comment xml:lang="zh-TW">Common Lisp 源碼</comment>
+ <sub-class-of type="text/plain"/>
+ <glob pattern="*.asd"/>
+ <glob pattern="*.fasl"/>
+ <glob pattern="*.lisp"/>
+ <glob pattern="*.ros"/>
+ </mime-type>
<mime-type type="text/csv">
<comment>CSV document</comment>
+ <comment xml:lang="af">CSV-dokument</comment>
<comment xml:lang="ar">مستند CSV</comment>
<comment xml:lang="ast">Documentu CVS</comment>
- <comment xml:lang="be@latin">Dakument CSV</comment>
+ <comment xml:lang="be-Latn">Dakument CSV</comment>
<comment xml:lang="bg">Документ — CSV</comment>
<comment xml:lang="ca">document CSV</comment>
<comment xml:lang="cs">dokument CSV</comment>
<comment xml:lang="da">CSV-dokument</comment>
<comment xml:lang="de">CSV-Dokument</comment>
<comment xml:lang="el">Έγγραφο CSV</comment>
- <comment xml:lang="en_GB">CSV document</comment>
+ <comment xml:lang="en-GB">CSV document</comment>
<comment xml:lang="eo">CSV-dokumento</comment>
<comment xml:lang="es">documento CSV</comment>
<comment xml:lang="eu">CSV dokumentua</comment>
<comment xml:lang="fi">CSV-asiakirja</comment>
<comment xml:lang="fo">CSV skjal</comment>
<comment xml:lang="fr">document CSV</comment>
+ <comment xml:lang="fur">document CSV</comment>
<comment xml:lang="ga">cáipéis CSV</comment>
<comment xml:lang="gl">documento CSV</comment>
<comment xml:lang="he">מסמך CSV</comment>
@@ -33326,7 +34605,7 @@
<comment xml:lang="oc">document CSV</comment>
<comment xml:lang="pl">Dokument CSV</comment>
<comment xml:lang="pt">documento CSV</comment>
- <comment xml:lang="pt_BR">Documento CSV</comment>
+ <comment xml:lang="pt-BR">Documento CSV</comment>
<comment xml:lang="ro">Document CSV</comment>
<comment xml:lang="ru">Документ CSV</comment>
<comment xml:lang="sk">Dokument CSV</comment>
@@ -33337,8 +34616,8 @@
<comment xml:lang="tr">CSV belgesi</comment>
<comment xml:lang="uk">документ CSV</comment>
<comment xml:lang="vi">Tài liệu CSV</comment>
- <comment xml:lang="zh_CN">CSV 文档</comment>
- <comment xml:lang="zh_TW">CSV 文件</comment>
+ <comment xml:lang="zh-CN">CSV 文档</comment>
+ <comment xml:lang="zh-TW">CSV 文件</comment>
<acronym>CSV</acronym>
<expanded-acronym>Comma Separated Values</expanded-acronym>
<alias type="text/x-comma-separated-values"/>
@@ -33348,15 +34627,19 @@
</mime-type>
<mime-type type="text/csv-schema">
<comment>CSV Schema document</comment>
+ <comment xml:lang="af">CSV Schema-dokument</comment>
<comment xml:lang="ast">Documentu d'esquema CSV</comment>
+ <comment xml:lang="bg">Документ — схема на CSV</comment>
<comment xml:lang="ca">document Schema de CSV</comment>
<comment xml:lang="cs">dokument schématu CSV</comment>
<comment xml:lang="da">CSV Schema-dokument</comment>
<comment xml:lang="de">CSV-Schemadokument</comment>
- <comment xml:lang="en_GB">CSV Schema document</comment>
+ <comment xml:lang="en-GB">CSV Schema document</comment>
<comment xml:lang="es">documento esquemático CSV</comment>
<comment xml:lang="eu">CSV Schema dokumentua</comment>
+ <comment xml:lang="fi">CSV Schema asiakirja</comment>
<comment xml:lang="fr">document schéma CSV</comment>
+ <comment xml:lang="fur">document scheme CSV</comment>
<comment xml:lang="ga">cáipéis scéimre CSV</comment>
<comment xml:lang="he">מסמך פריסת CSV</comment>
<comment xml:lang="hr">CSV Shema dokument</comment>
@@ -33368,15 +34651,16 @@
<comment xml:lang="ko">CSV 스키마 문서</comment>
<comment xml:lang="pl">Dokument schematu CSV</comment>
<comment xml:lang="pt">documento CSV Schema</comment>
- <comment xml:lang="pt_BR">Documento CSV Schema</comment>
+ <comment xml:lang="pt-BR">Documento CSV Schema</comment>
<comment xml:lang="ru">Документ CSV Schema</comment>
<comment xml:lang="sk">Dokument schémy CSV</comment>
+ <comment xml:lang="sl">Dokument CSV Schema</comment>
<comment xml:lang="sr">документ ЦСВ шеме</comment>
<comment xml:lang="sv">CSV Schema-dokument</comment>
<comment xml:lang="tr">CSV Şeması belgesi</comment>
<comment xml:lang="uk">документ Schema у форматі CSV</comment>
- <comment xml:lang="zh_CN">CSV 架构文档</comment>
- <comment xml:lang="zh_TW">CSV Schema 文件</comment>
+ <comment xml:lang="zh-CN">CSV 架构文档</comment>
+ <comment xml:lang="zh-TW">CSV Schema 文件</comment>
<acronym>CSV</acronym>
<expanded-acronym>Comma Separated Values</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -33384,21 +34668,23 @@
</mime-type>
<mime-type type="text/x-copying">
<comment>license terms</comment>
+ <comment xml:lang="af">lisensievoorwaardes</comment>
<comment xml:lang="ar">شروط الترخيص</comment>
<comment xml:lang="ast">términos de llicencia</comment>
- <comment xml:lang="be@latin">licenzijnyja ŭmovy</comment>
+ <comment xml:lang="be-Latn">licenzijnyja ŭmovy</comment>
<comment xml:lang="bg">Лицензни условия</comment>
<comment xml:lang="ca">condicions de llicència</comment>
<comment xml:lang="cs">licenční podmínky</comment>
<comment xml:lang="da">licensbetingelser</comment>
<comment xml:lang="de">Lizenzbedingungen</comment>
<comment xml:lang="el">Όροι άδειας</comment>
- <comment xml:lang="en_GB">licence terms</comment>
+ <comment xml:lang="en-GB">licence terms</comment>
<comment xml:lang="es">términos de licencia</comment>
<comment xml:lang="eu">lizentzia baldintzak</comment>
<comment xml:lang="fi">lisenssiehdot</comment>
<comment xml:lang="fo">loyvistreytir</comment>
<comment xml:lang="fr">termes de licence</comment>
+ <comment xml:lang="fur">tiermins di licence</comment>
<comment xml:lang="ga">téarmaí ceadúnais</comment>
<comment xml:lang="gl">termos de licenza</comment>
<comment xml:lang="he">תנאי רישיון</comment>
@@ -33418,7 +34704,7 @@
<comment xml:lang="oc">tèrmes de licéncia</comment>
<comment xml:lang="pl">Warunki licencji</comment>
<comment xml:lang="pt">termos de licença</comment>
- <comment xml:lang="pt_BR">Termos de licença</comment>
+ <comment xml:lang="pt-BR">Termos de licença</comment>
<comment xml:lang="ro">termeni de licență</comment>
<comment xml:lang="ru">Лицензионное соглашение</comment>
<comment xml:lang="sk">Licenčné podmienky</comment>
@@ -33429,27 +34715,30 @@
<comment xml:lang="tr">lisans koşulları</comment>
<comment xml:lang="uk">ліцензійні умови</comment>
<comment xml:lang="vi">điều kiện giấy phép</comment>
- <comment xml:lang="zh_CN">软件许可条款</comment>
- <comment xml:lang="zh_TW">授權條款</comment>
+ <comment xml:lang="zh-CN">软件许可条款</comment>
+ <comment xml:lang="zh-TW">授權條款</comment>
<sub-class-of type="text/plain"/>
<glob pattern="COPYING"/>
</mime-type>
<mime-type type="text/x-credits">
<comment>author credits</comment>
+ <comment xml:lang="af">outeurerkenning</comment>
<comment xml:lang="ar">شكر وتقدير المؤلف</comment>
<comment xml:lang="ast">creitos del autor</comment>
- <comment xml:lang="be@latin">zasłuhi aŭtara</comment>
+ <comment xml:lang="be-Latn">zasłuhi aŭtara</comment>
<comment xml:lang="bg">Благодарности към авторите</comment>
<comment xml:lang="ca">atribucions d'autor</comment>
<comment xml:lang="cs">autorské zásluhy</comment>
<comment xml:lang="da">bidragydere</comment>
<comment xml:lang="de">Autorendanksagung</comment>
<comment xml:lang="el">Μνεία συγγραφέων</comment>
- <comment xml:lang="en_GB">author credits</comment>
+ <comment xml:lang="en-GB">author credits</comment>
<comment xml:lang="es">reconocimiento de autoría</comment>
+ <comment xml:lang="eu">egile-kredituak</comment>
<comment xml:lang="fi">tekijöiden kiitokset</comment>
<comment xml:lang="fo">høvundaheiður</comment>
<comment xml:lang="fr">remerciements</comment>
+ <comment xml:lang="fur">ricognossiments autôrs</comment>
<comment xml:lang="ga">admhálacha údar</comment>
<comment xml:lang="gl">créditos de autor</comment>
<comment xml:lang="he">קרדיטים של היוצר</comment>
@@ -33469,7 +34758,7 @@
<comment xml:lang="oc">mercejaments</comment>
<comment xml:lang="pl">Podziękowania autorów programu</comment>
<comment xml:lang="pt">créditos de autor</comment>
- <comment xml:lang="pt_BR">Créditos do autor</comment>
+ <comment xml:lang="pt-BR">Créditos do autor</comment>
<comment xml:lang="ro">mulțumiri autori</comment>
<comment xml:lang="ru">Авторы программы</comment>
<comment xml:lang="sk">Autorské zásluhy</comment>
@@ -33480,28 +34769,30 @@
<comment xml:lang="tr">yazar bilgileri</comment>
<comment xml:lang="uk">подяки авторам програми</comment>
<comment xml:lang="vi">công trạng tác giả</comment>
- <comment xml:lang="zh_CN">软件作者致谢</comment>
- <comment xml:lang="zh_TW">作者致謝名單</comment>
+ <comment xml:lang="zh-CN">软件作者致谢</comment>
+ <comment xml:lang="zh-TW">作者致謝名單</comment>
<sub-class-of type="text/plain"/>
<glob pattern="CREDITS"/>
</mime-type>
<mime-type type="text/x-csrc">
<comment>C source code</comment>
+ <comment xml:lang="af">C-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر سي</comment>
- <comment xml:lang="be@latin">Kryničny kod C</comment>
+ <comment xml:lang="be-Latn">Kryničny kod C</comment>
<comment xml:lang="bg">Изходен код — C</comment>
<comment xml:lang="ca">codi font en C</comment>
<comment xml:lang="cs">zdrojový kód v jazyce C</comment>
<comment xml:lang="da">C-kildekode</comment>
<comment xml:lang="de">C-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας C</comment>
- <comment xml:lang="en_GB">C source code</comment>
+ <comment xml:lang="en-GB">C source code</comment>
<comment xml:lang="eo">C-fontkodo</comment>
<comment xml:lang="es">código fuente en C</comment>
<comment xml:lang="eu">C iturburu-kodea</comment>
<comment xml:lang="fi">C-lähdekoodi</comment>
<comment xml:lang="fo">C keldukota</comment>
<comment xml:lang="fr">code source C</comment>
+ <comment xml:lang="fur">codiç sorzint C</comment>
<comment xml:lang="ga">cód foinseach C</comment>
<comment xml:lang="gl">código fonte en C</comment>
<comment xml:lang="he">קוד מקור של C</comment>
@@ -33523,7 +34814,7 @@
<comment xml:lang="oc">còde font C</comment>
<comment xml:lang="pl">Kod źródłowy C</comment>
<comment xml:lang="pt">código origem C</comment>
- <comment xml:lang="pt_BR">Código-fonte C</comment>
+ <comment xml:lang="pt-BR">Código-fonte C</comment>
<comment xml:lang="ro">Cod sursă C</comment>
<comment xml:lang="ru">Исходный код C</comment>
<comment xml:lang="sk">Zdrojový kód jazyka C</comment>
@@ -33534,34 +34825,36 @@
<comment xml:lang="tr">C kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою C</comment>
<comment xml:lang="vi">Mã nguồn C</comment>
- <comment xml:lang="zh_CN">C 源代码</comment>
- <comment xml:lang="zh_TW">C 源碼</comment>
+ <comment xml:lang="zh-CN">C 源代码</comment>
+ <comment xml:lang="zh-TW">C 源碼</comment>
<sub-class-of type="text/plain"/>
<alias type="text/x-c"/>
<glob pattern="*.c" case-sensitive="true"/>
<magic priority="30">
- <match value="/*" type="string" offset="0"/>
- <match value="//" type="string" offset="0"/>
- <match value="#include" type="string" offset="0"/>
+ <match type="string" value="/*" offset="0"/>
+ <match type="string" value="//" offset="0"/>
+ <match type="string" value="#include" offset="0"/>
</magic>
</mime-type>
<mime-type type="text/x-csharp">
<comment>C# source code</comment>
+ <comment xml:lang="af">C#-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر سي#</comment>
- <comment xml:lang="be@latin">Kryničny kod C#</comment>
+ <comment xml:lang="be-Latn">Kryničny kod C#</comment>
<comment xml:lang="bg">Изходен код — C#</comment>
<comment xml:lang="ca">codi font en C#</comment>
<comment xml:lang="cs">zdrojový kód v jazyce C#</comment>
<comment xml:lang="da">C#-kildekode</comment>
<comment xml:lang="de">C#-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας C#</comment>
- <comment xml:lang="en_GB">C# source code</comment>
+ <comment xml:lang="en-GB">C# source code</comment>
<comment xml:lang="eo">C#-fontkodo</comment>
<comment xml:lang="es">código fuente en C#</comment>
<comment xml:lang="eu">C# iturburu-kodea</comment>
<comment xml:lang="fi">C#-lähdekoodi</comment>
<comment xml:lang="fo">C# keldukota</comment>
<comment xml:lang="fr">code source C#</comment>
+ <comment xml:lang="fur">codiç sorzint C#</comment>
<comment xml:lang="ga">cód foinseach C#</comment>
<comment xml:lang="gl">código fonte en C#</comment>
<comment xml:lang="he">קוד מקור של C#‎</comment>
@@ -33583,7 +34876,7 @@
<comment xml:lang="oc">còde font C#</comment>
<comment xml:lang="pl">Kod źródłowy C#</comment>
<comment xml:lang="pt">código origem C#</comment>
- <comment xml:lang="pt_BR">Código-fonte C#</comment>
+ <comment xml:lang="pt-BR">Código-fonte C#</comment>
<comment xml:lang="ro">Cod sursă C#</comment>
<comment xml:lang="ru">Исходный код C#</comment>
<comment xml:lang="sk">Zdrojový kód jazyka C#</comment>
@@ -33594,28 +34887,30 @@
<comment xml:lang="tr">C# kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою C#</comment>
<comment xml:lang="vi">Mã nguồn C#</comment>
- <comment xml:lang="zh_CN">C# 源代码</comment>
- <comment xml:lang="zh_TW">C# 源碼</comment>
+ <comment xml:lang="zh-CN">C# 源代码</comment>
+ <comment xml:lang="zh-TW">C# 源碼</comment>
<sub-class-of type="text/x-csrc"/>
<glob pattern="*.cs"/>
</mime-type>
<mime-type type="text/x-vala">
<comment>Vala source code</comment>
+ <comment xml:lang="af">Vala-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر Vala</comment>
- <comment xml:lang="be@latin">Kryničny kod Vala</comment>
+ <comment xml:lang="be-Latn">Kryničny kod Vala</comment>
<comment xml:lang="bg">Изходен код — Vala</comment>
<comment xml:lang="ca">codi font en Vala</comment>
<comment xml:lang="cs">zdrojový kód v jazyce Vala</comment>
- <comment xml:lang="da">Valakildekode</comment>
+ <comment xml:lang="da">Vala-kildekode</comment>
<comment xml:lang="de">Vala-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Vala</comment>
- <comment xml:lang="en_GB">Vala source code</comment>
+ <comment xml:lang="en-GB">Vala source code</comment>
<comment xml:lang="eo">Vala-fontkodo</comment>
<comment xml:lang="es">código fuente en Vala</comment>
<comment xml:lang="eu">Vala iturburu-kodea</comment>
<comment xml:lang="fi">Vala-lähdekoodi</comment>
<comment xml:lang="fo">Vala keldukota</comment>
<comment xml:lang="fr">code source Vala</comment>
+ <comment xml:lang="fur">codiç sorzint Vala</comment>
<comment xml:lang="ga">cód foinseach Vala</comment>
<comment xml:lang="gl">código fonte en Vala</comment>
<comment xml:lang="he">קוד מקור של Vala</comment>
@@ -33635,7 +34930,7 @@
<comment xml:lang="oc">còde font Vala</comment>
<comment xml:lang="pl">Kod źródłowy Vala</comment>
<comment xml:lang="pt">código origem Vala</comment>
- <comment xml:lang="pt_BR">Código-fonte Vala</comment>
+ <comment xml:lang="pt-BR">Código-fonte Vala</comment>
<comment xml:lang="ro">Cod sursă Vala</comment>
<comment xml:lang="ru">Исходный код Vala</comment>
<comment xml:lang="sk">Zdrojový kód Vala</comment>
@@ -33646,26 +34941,28 @@
<comment xml:lang="tr">Vala kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Vala</comment>
<comment xml:lang="vi">Mã nguồn Vala</comment>
- <comment xml:lang="zh_CN">Vala 源代码</comment>
- <comment xml:lang="zh_TW">Vala 源碼</comment>
+ <comment xml:lang="zh-CN">Vala 源代码</comment>
+ <comment xml:lang="zh-TW">Vala 源碼</comment>
<sub-class-of type="text/x-csrc"/>
<glob pattern="*.vala"/>
<glob pattern="*.vapi"/>
</mime-type>
<mime-type type="text/x-ooc">
<comment>OOC source code</comment>
+ <comment xml:lang="af">OOC-bronkode</comment>
<comment xml:lang="bg">Изходен код — OOC</comment>
<comment xml:lang="ca">codi font en OOC</comment>
<comment xml:lang="cs">zdrojový kód OOC</comment>
<comment xml:lang="da">OOC-kildekode</comment>
<comment xml:lang="de">OOC-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας OOC</comment>
- <comment xml:lang="en_GB">OOC source code</comment>
+ <comment xml:lang="en-GB">OOC source code</comment>
<comment xml:lang="eo">OOC-fontkodo</comment>
<comment xml:lang="es">código fuente en OOC</comment>
<comment xml:lang="eu">OOC iturburu-kodea</comment>
<comment xml:lang="fi">OOC-lähdekoodi</comment>
<comment xml:lang="fr">source code OOC</comment>
+ <comment xml:lang="fur">codiç sorzint OOC</comment>
<comment xml:lang="ga">cód foinseach OOC</comment>
<comment xml:lang="gl">código fonte de OOC</comment>
<comment xml:lang="he">קוד מקור של OOC</comment>
@@ -33683,7 +34980,7 @@
<comment xml:lang="oc">font còde OOC</comment>
<comment xml:lang="pl">Kod źródłowy OOC</comment>
<comment xml:lang="pt">código origem OOC</comment>
- <comment xml:lang="pt_BR">Código-fonte OOC</comment>
+ <comment xml:lang="pt-BR">Código-fonte OOC</comment>
<comment xml:lang="ru">Исходный код OOC</comment>
<comment xml:lang="sk">Zdrojový kód OOC</comment>
<comment xml:lang="sl">Izvorna koda OOC</comment>
@@ -33691,8 +34988,8 @@
<comment xml:lang="sv">OOC-källkod</comment>
<comment xml:lang="tr">OOC kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою OOC</comment>
- <comment xml:lang="zh_CN">OOC 源代码</comment>
- <comment xml:lang="zh_TW">OOC 源碼</comment>
+ <comment xml:lang="zh-CN">OOC 源代码</comment>
+ <comment xml:lang="zh-TW">OOC 源碼</comment>
<acronym>OOC</acronym>
<expanded-acronym>Out Of Class</expanded-acronym>
<sub-class-of type="text/x-csrc"/>
@@ -33700,9 +34997,10 @@
</mime-type>
<mime-type type="text/x-dcl">
<comment>DCL script</comment>
+ <comment xml:lang="af">DCL-skrip</comment>
<comment xml:lang="ar">سكربت DCL</comment>
<comment xml:lang="az">DCL skripti</comment>
- <comment xml:lang="be@latin">Skrypt DCL</comment>
+ <comment xml:lang="be-Latn">Skrypt DCL</comment>
<comment xml:lang="bg">Скрипт — DCL</comment>
<comment xml:lang="ca">script DCL</comment>
<comment xml:lang="cs">skript DCL</comment>
@@ -33710,13 +35008,14 @@
<comment xml:lang="da">DCL-program</comment>
<comment xml:lang="de">DCL-Skript</comment>
<comment xml:lang="el">Δέσμη ενεργειών DCL</comment>
- <comment xml:lang="en_GB">DCL script</comment>
+ <comment xml:lang="en-GB">DCL script</comment>
<comment xml:lang="eo">DCL-skripto</comment>
<comment xml:lang="es">secuencia de órdenes en DCL</comment>
<comment xml:lang="eu">DCL script-a</comment>
<comment xml:lang="fi">DCL-komentotiedosto</comment>
<comment xml:lang="fo">DCL boðrøð</comment>
<comment xml:lang="fr">script DCL</comment>
+ <comment xml:lang="fur">script DCL</comment>
<comment xml:lang="ga">script DCL</comment>
<comment xml:lang="gl">script de DCL</comment>
<comment xml:lang="he">תסריט DCL</comment>
@@ -33738,7 +35037,7 @@
<comment xml:lang="oc">escript DCL</comment>
<comment xml:lang="pl">Skrypt DCL</comment>
<comment xml:lang="pt">script DCL</comment>
- <comment xml:lang="pt_BR">Script DCL</comment>
+ <comment xml:lang="pt-BR">Script DCL</comment>
<comment xml:lang="ro">Script DCL</comment>
<comment xml:lang="ru">Сценарий DCL</comment>
<comment xml:lang="sk">Skript DCL</comment>
@@ -33749,8 +35048,8 @@
<comment xml:lang="tr">DCL betiği</comment>
<comment xml:lang="uk">скрипт DCL</comment>
<comment xml:lang="vi">Văn lệnh DCL</comment>
- <comment xml:lang="zh_CN">DCL 脚本</comment>
- <comment xml:lang="zh_TW">DCL 指令稿</comment>
+ <comment xml:lang="zh-CN">DCL 脚本</comment>
+ <comment xml:lang="zh-TW">DCL 指令稿</comment>
<acronym>DCL</acronym>
<expanded-acronym>Data Conversion Laboratory</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -33758,10 +35057,11 @@
</mime-type>
<mime-type type="text/x-dsl">
<comment>DSSSL document</comment>
+ <comment xml:lang="af">DSSSL-dokument</comment>
<comment xml:lang="ar">مستند DSSSL</comment>
<comment xml:lang="ast">Documentu DSSSL</comment>
<comment xml:lang="az">DSSSL sənədi</comment>
- <comment xml:lang="be@latin">Dakument DSSSL</comment>
+ <comment xml:lang="be-Latn">Dakument DSSSL</comment>
<comment xml:lang="bg">Документ — DSSSL</comment>
<comment xml:lang="ca">document DSSSL</comment>
<comment xml:lang="cs">dokument DSSSL</comment>
@@ -33769,13 +35069,14 @@
<comment xml:lang="da">DSSSL-dokument</comment>
<comment xml:lang="de">DSSSL-Dokument</comment>
<comment xml:lang="el">Έγγραφο DSSSL</comment>
- <comment xml:lang="en_GB">DSSSL document</comment>
+ <comment xml:lang="en-GB">DSSSL document</comment>
<comment xml:lang="eo">DSSSL-dokumento</comment>
<comment xml:lang="es">documento DSSSL</comment>
<comment xml:lang="eu">DSSSL dokumentua</comment>
<comment xml:lang="fi">DSSSL-asiakirja</comment>
<comment xml:lang="fo">DSSSL skjal</comment>
<comment xml:lang="fr">document DSSSL</comment>
+ <comment xml:lang="fur">document DSSSL</comment>
<comment xml:lang="ga">cáipéis DSSSL</comment>
<comment xml:lang="gl">documento DSSSL</comment>
<comment xml:lang="he">מסמך DSSSL</comment>
@@ -33797,7 +35098,7 @@
<comment xml:lang="oc">document DSSSL</comment>
<comment xml:lang="pl">Dokument DSSSL</comment>
<comment xml:lang="pt">documento DSSSL</comment>
- <comment xml:lang="pt_BR">Documento DSSSL</comment>
+ <comment xml:lang="pt-BR">Documento DSSSL</comment>
<comment xml:lang="ro">Document DSSSL</comment>
<comment xml:lang="ru">Документ DSSSL</comment>
<comment xml:lang="sk">Dokument DSSSL</comment>
@@ -33808,8 +35109,8 @@
<comment xml:lang="tr">DSSSL belgesi</comment>
<comment xml:lang="uk">документ DSSSL</comment>
<comment xml:lang="vi">Tài liệu DSSSL</comment>
- <comment xml:lang="zh_CN">DSSSL 文档</comment>
- <comment xml:lang="zh_TW">DSSSL 文件</comment>
+ <comment xml:lang="zh-CN">DSSSL 文档</comment>
+ <comment xml:lang="zh-TW">DSSSL 文件</comment>
<acronym>DSSSL</acronym>
<expanded-acronym>Document Style Semantics and Specification Language</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -33817,21 +35118,23 @@
</mime-type>
<mime-type type="text/x-dsrc">
<comment>D source code</comment>
+ <comment xml:lang="af">D-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر D</comment>
- <comment xml:lang="be@latin">Kryničny kod D</comment>
+ <comment xml:lang="be-Latn">Kryničny kod D</comment>
<comment xml:lang="bg">Изходен код — D</comment>
<comment xml:lang="ca">codi font en D</comment>
<comment xml:lang="cs">zdrojový kód v jazyce D</comment>
<comment xml:lang="da">D-kildekode</comment>
<comment xml:lang="de">D-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας D</comment>
- <comment xml:lang="en_GB">D source code</comment>
+ <comment xml:lang="en-GB">D source code</comment>
<comment xml:lang="eo">D-fontkodo</comment>
<comment xml:lang="es">código fuente en D</comment>
<comment xml:lang="eu">D iturburu-kodea</comment>
<comment xml:lang="fi">D-lähdekoodi</comment>
<comment xml:lang="fo">D keldukota</comment>
<comment xml:lang="fr">code source D</comment>
+ <comment xml:lang="fur">codiç sorzint D</comment>
<comment xml:lang="ga">cód foinseach D</comment>
<comment xml:lang="gl">código fonte de D</comment>
<comment xml:lang="he">קוד מקור לשפת D</comment>
@@ -33852,7 +35155,7 @@
<comment xml:lang="oc">còde font D</comment>
<comment xml:lang="pl">Kod źródłowy D</comment>
<comment xml:lang="pt">código origem D</comment>
- <comment xml:lang="pt_BR">Código-fonte D</comment>
+ <comment xml:lang="pt-BR">Código-fonte D</comment>
<comment xml:lang="ro">Cod sursă D</comment>
<comment xml:lang="ru">Исходный код D</comment>
<comment xml:lang="sk">Zdrojový kód jazyka D</comment>
@@ -33863,29 +35166,31 @@
<comment xml:lang="tr">D kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою D</comment>
<comment xml:lang="vi">Mã nguồn D</comment>
- <comment xml:lang="zh_CN">D 源代码</comment>
- <comment xml:lang="zh_TW">D 源碼</comment>
+ <comment xml:lang="zh-CN">D 源代码</comment>
+ <comment xml:lang="zh-TW">D 源碼</comment>
<sub-class-of type="text/x-csrc"/>
<glob pattern="*.d"/>
<glob pattern="*.di"/>
</mime-type>
<mime-type type="application/xml-dtd">
<comment>DTD file</comment>
+ <comment xml:lang="af">DTD-lêer</comment>
<comment xml:lang="ar">ملف DTD</comment>
- <comment xml:lang="be@latin">Fajł DTD</comment>
+ <comment xml:lang="be-Latn">Fajł DTD</comment>
<comment xml:lang="bg">Документ — DTD</comment>
<comment xml:lang="ca">fitxer DTD</comment>
<comment xml:lang="cs">soubor DTD</comment>
<comment xml:lang="da">DTD-fil</comment>
<comment xml:lang="de">DTD-Datei</comment>
<comment xml:lang="el">Αρχείο DTD</comment>
- <comment xml:lang="en_GB">DTD file</comment>
+ <comment xml:lang="en-GB">DTD file</comment>
<comment xml:lang="eo">DTD-dosiero</comment>
<comment xml:lang="es">archivo DTD</comment>
<comment xml:lang="eu">DTD fitxategia</comment>
<comment xml:lang="fi">DTD-tiedosto</comment>
<comment xml:lang="fo">DTD fíla</comment>
<comment xml:lang="fr">fichier DTD</comment>
+ <comment xml:lang="fur">file DTD</comment>
<comment xml:lang="ga">comhad DTD</comment>
<comment xml:lang="gl">ficheiro DTD</comment>
<comment xml:lang="he">מסמך DTD</comment>
@@ -33906,7 +35211,7 @@
<comment xml:lang="oc">fichièr DTD</comment>
<comment xml:lang="pl">Plik DTD</comment>
<comment xml:lang="pt">ficheiro DTD</comment>
- <comment xml:lang="pt_BR">Arquivo DTD</comment>
+ <comment xml:lang="pt-BR">Arquivo DTD</comment>
<comment xml:lang="ro">Fișier DTD</comment>
<comment xml:lang="ru">Файл DTD</comment>
<comment xml:lang="sk">Súbor DTD</comment>
@@ -33917,8 +35222,8 @@
<comment xml:lang="tr">DTD dosyası</comment>
<comment xml:lang="uk">файл DTD</comment>
<comment xml:lang="vi">Tập tin DTD</comment>
- <comment xml:lang="zh_CN">DTD 文件</comment>
- <comment xml:lang="zh_TW">DTD 檔</comment>
+ <comment xml:lang="zh-CN">DTD 文件</comment>
+ <comment xml:lang="zh-TW">DTD 檔</comment>
<acronym>DTD</acronym>
<expanded-acronym>Document Type Definition</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -33928,21 +35233,23 @@
</mime-type>
<mime-type type="text/x-eiffel">
<comment>Eiffel source code</comment>
+ <comment xml:lang="af">Eiffel-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر Eiffel</comment>
- <comment xml:lang="be@latin">Kryničny kod Eiffel</comment>
+ <comment xml:lang="be-Latn">Kryničny kod Eiffel</comment>
<comment xml:lang="bg">Изходен код — Eiffel</comment>
<comment xml:lang="ca">codi font en Eiffel</comment>
<comment xml:lang="cs">zdrojový kód v jazyce Eiffel</comment>
- <comment xml:lang="da">Eiffelkildekode</comment>
+ <comment xml:lang="da">Eiffel-kildekode</comment>
<comment xml:lang="de">Eiffel-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Eiffel</comment>
- <comment xml:lang="en_GB">Eiffel source code</comment>
+ <comment xml:lang="en-GB">Eiffel source code</comment>
<comment xml:lang="eo">Eiffel-fontkodo</comment>
<comment xml:lang="es">código fuente en Eiffel</comment>
<comment xml:lang="eu">Eiffel iturburu-kodea</comment>
<comment xml:lang="fi">Eiffel-lähdekoodi</comment>
<comment xml:lang="fo">Eiffel keldukota</comment>
<comment xml:lang="fr">code source Eiffel</comment>
+ <comment xml:lang="fur">codiç sorzint Eiffel</comment>
<comment xml:lang="ga">cód foinseach Eiffel</comment>
<comment xml:lang="gl">código fone de Eiffel</comment>
<comment xml:lang="he">קוד מקור של Eiffel</comment>
@@ -33963,7 +35270,7 @@
<comment xml:lang="oc">còde font Eiffel</comment>
<comment xml:lang="pl">Kod źródłowy Eiffel</comment>
<comment xml:lang="pt">código origem Eiffel</comment>
- <comment xml:lang="pt_BR">Código-fonte Eiffel</comment>
+ <comment xml:lang="pt-BR">Código-fonte Eiffel</comment>
<comment xml:lang="ro">Cod sursă Eiffel</comment>
<comment xml:lang="ru">Исходный код Eiffel</comment>
<comment xml:lang="sk">Zdrojový kód Eiffel</comment>
@@ -33974,17 +35281,18 @@
<comment xml:lang="tr">Eiffel kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Eiffel</comment>
<comment xml:lang="vi">Mã nguồn Eiffel</comment>
- <comment xml:lang="zh_CN">Eiffel 源代码</comment>
- <comment xml:lang="zh_TW">Eiffel 源碼</comment>
+ <comment xml:lang="zh-CN">Eiffel 源代码</comment>
+ <comment xml:lang="zh-TW">Eiffel 源碼</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.e"/>
<glob pattern="*.eif"/>
</mime-type>
<mime-type type="text/x-emacs-lisp">
<comment>Emacs Lisp source code</comment>
+ <comment xml:lang="af">Emacs Lisp-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر Emacs Lisp</comment>
<comment xml:lang="az">Emacs Lisp mənbə kodu</comment>
- <comment xml:lang="be@latin">Kryničny kod Emacs Lisp</comment>
+ <comment xml:lang="be-Latn">Kryničny kod Emacs Lisp</comment>
<comment xml:lang="bg">Изходен код — Emacs Lisp</comment>
<comment xml:lang="ca">codi font en Emacs Lisp</comment>
<comment xml:lang="cs">zdrojový kód Emacs Lisp</comment>
@@ -33992,13 +35300,14 @@
<comment xml:lang="da">Emacs Lisp-kildekode</comment>
<comment xml:lang="de">Emacs-Lisp-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Emacs Lisp</comment>
- <comment xml:lang="en_GB">Emacs Lisp source code</comment>
+ <comment xml:lang="en-GB">Emacs Lisp source code</comment>
<comment xml:lang="eo">fontkodo en Emacs Lisp</comment>
<comment xml:lang="es">código fuente en Lisp de Emacs</comment>
<comment xml:lang="eu">Emacs Lisp iturburu-kodea</comment>
<comment xml:lang="fi">Emacs Lisp -lähdekoodi</comment>
<comment xml:lang="fo">Emacs Lisp keldukota</comment>
<comment xml:lang="fr">code source Emacs Lisp</comment>
+ <comment xml:lang="fur">codiç sorzint Emacs Lisp</comment>
<comment xml:lang="ga">cód foinseach Emacs Lisp</comment>
<comment xml:lang="gl">código fonte de Emacs Lisp</comment>
<comment xml:lang="he">קוד מקור של Emcas Lisp</comment>
@@ -34018,9 +35327,9 @@
<comment xml:lang="nl">Emacs Lisp-broncode</comment>
<comment xml:lang="nn">Emacs Lisp kjeldekode</comment>
<comment xml:lang="oc">còde font Emacs Lisp</comment>
- <comment xml:lang="pl">Plik źródłowy Emacs Lisp</comment>
+ <comment xml:lang="pl">Kod źródłowy Emacs Lisp</comment>
<comment xml:lang="pt">código origem Emacs Lisp</comment>
- <comment xml:lang="pt_BR">Código-fonte Lisp do Emacs</comment>
+ <comment xml:lang="pt-BR">Código-fonte Lisp do Emacs</comment>
<comment xml:lang="ro">Cod sursă Emacs Lisp</comment>
<comment xml:lang="ru">Исходный код Emacs Lisp</comment>
<comment xml:lang="sk">Zdrojový kód Emacs Lisp</comment>
@@ -34031,32 +35340,34 @@
<comment xml:lang="tr">Emacs Lisp kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Emacs Lisp</comment>
<comment xml:lang="vi">Mã nguồn Lisp Emacs</comment>
- <comment xml:lang="zh_CN">Emacs Lisp 源代码</comment>
- <comment xml:lang="zh_TW">Emacs Lisp 源碼</comment>
+ <comment xml:lang="zh-CN">Emacs Lisp 源代码</comment>
+ <comment xml:lang="zh-TW">Emacs Lisp 源碼</comment>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="\012(" type="string" offset="0"/>
- <match value=";ELC\023\000\000\000" type="string" offset="0"/>
+ <match type="string" value="\012(" offset="0"/>
+ <match type="string" value=";ELC\023\000\000\000" offset="0"/>
</magic>
<glob pattern="*.el"/>
</mime-type>
<mime-type type="text/x-erlang">
<comment>Erlang source code</comment>
+ <comment xml:lang="af">Erlang-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر Erlang</comment>
- <comment xml:lang="be@latin">Kryničny kod Erlang</comment>
+ <comment xml:lang="be-Latn">Kryničny kod Erlang</comment>
<comment xml:lang="bg">Изходен код — Erlang</comment>
<comment xml:lang="ca">codi font en Erlang</comment>
<comment xml:lang="cs">zdrojový kód v jazyce Erlang</comment>
- <comment xml:lang="da">Erlangkildekode</comment>
+ <comment xml:lang="da">Erlang-kildekode</comment>
<comment xml:lang="de">Erlang-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Erlang</comment>
- <comment xml:lang="en_GB">Erlang source code</comment>
+ <comment xml:lang="en-GB">Erlang source code</comment>
<comment xml:lang="eo">Erlang-fontkodo</comment>
<comment xml:lang="es">código fuente en Erlang</comment>
<comment xml:lang="eu">Erlang iturburu-kodea</comment>
<comment xml:lang="fi">Erlang-lähdekoodi</comment>
<comment xml:lang="fo">Erlang keldukota</comment>
<comment xml:lang="fr">code source Erlang</comment>
+ <comment xml:lang="fur">codiç sorzint Erlang</comment>
<comment xml:lang="ga">cód foinseach Erlang</comment>
<comment xml:lang="gl">código fonte de Erlang</comment>
<comment xml:lang="he">קוד מקור של Erlang</comment>
@@ -34077,7 +35388,7 @@
<comment xml:lang="oc">còde font Erlang</comment>
<comment xml:lang="pl">Kod źródłowy Erlang</comment>
<comment xml:lang="pt">código origem Erlang</comment>
- <comment xml:lang="pt_BR">Código-fonte Erlang</comment>
+ <comment xml:lang="pt-BR">Código-fonte Erlang</comment>
<comment xml:lang="ro">Cod sursă Erlang</comment>
<comment xml:lang="ru">Исходный код Erlang</comment>
<comment xml:lang="sk">Zdrojový kód Erlang</comment>
@@ -34088,30 +35399,32 @@
<comment xml:lang="tr">Erlang kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Erlang</comment>
<comment xml:lang="vi">Mã nguồn Erlang</comment>
- <comment xml:lang="zh_CN">Erlang 源代码</comment>
- <comment xml:lang="zh_TW">Erlang 源碼</comment>
+ <comment xml:lang="zh-CN">Erlang 源代码</comment>
+ <comment xml:lang="zh-TW">Erlang 源碼</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.erl"/>
</mime-type>
<mime-type type="text/x-fortran">
<comment>Fortran source code</comment>
+ <comment xml:lang="af">Fortran-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر Fortran</comment>
<comment xml:lang="az">Fortran mənbə kodu</comment>
- <comment xml:lang="be@latin">Kryničny kod Fortran</comment>
+ <comment xml:lang="be-Latn">Kryničny kod Fortran</comment>
<comment xml:lang="bg">Изходен код — Fortran</comment>
<comment xml:lang="ca">codi font en Fortran</comment>
<comment xml:lang="cs">zdrojový kód v jazyce Fortran</comment>
<comment xml:lang="cy">Ffynhonnell rhaglen FORTRAN</comment>
- <comment xml:lang="da">Fortrankildekode</comment>
+ <comment xml:lang="da">Fortran-kildekode</comment>
<comment xml:lang="de">Fortran-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Fortran</comment>
- <comment xml:lang="en_GB">Fortran source code</comment>
+ <comment xml:lang="en-GB">Fortran source code</comment>
<comment xml:lang="eo">Fotran-fontkodo</comment>
<comment xml:lang="es">código fuente en Fortran</comment>
<comment xml:lang="eu">Fortran-en iturburu-kodea</comment>
<comment xml:lang="fi">Fortran-lähdekoodi</comment>
<comment xml:lang="fo">Fortran keldukota</comment>
<comment xml:lang="fr">code source Fortran</comment>
+ <comment xml:lang="fur">codiç sorzint Fortran</comment>
<comment xml:lang="ga">cód foinseach Fortran</comment>
<comment xml:lang="gl">código fonte de Fortran</comment>
<comment xml:lang="he">קוד מקור של Fortran</comment>
@@ -34133,7 +35446,7 @@
<comment xml:lang="oc">còde font Fortran</comment>
<comment xml:lang="pl">Kod źródłowy Fortran</comment>
<comment xml:lang="pt">código origem Fortran</comment>
- <comment xml:lang="pt_BR">Código-fonte Fortran</comment>
+ <comment xml:lang="pt-BR">Código-fonte Fortran</comment>
<comment xml:lang="ro">Cod sursă Fortran</comment>
<comment xml:lang="ru">Исходный код Fortran</comment>
<comment xml:lang="sk">Zdrojový kód Fortran</comment>
@@ -34144,8 +35457,8 @@
<comment xml:lang="tr">Fortran kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Fortran</comment>
<comment xml:lang="vi">Mã nguồn Fortran</comment>
- <comment xml:lang="zh_CN">Fortran 源代码</comment>
- <comment xml:lang="zh_TW">Fortran 源碼</comment>
+ <comment xml:lang="zh-CN">Fortran 源代码</comment>
+ <comment xml:lang="zh-TW">Fortran 源碼</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.f"/>
<glob pattern="*.f90"/>
@@ -34154,16 +35467,19 @@
</mime-type>
<mime-type type="text/x-genie">
<comment>Genie source code</comment>
- <comment xml:lang="ca">codi font de Genius</comment>
+ <comment xml:lang="af">Genie-bronkode</comment>
+ <comment xml:lang="bg">Изходен код — Genie</comment>
+ <comment xml:lang="ca">codi font en Genie</comment>
<comment xml:lang="cs">zdrojový kód v jazyce Genie</comment>
<comment xml:lang="da">Genie-kildekode</comment>
<comment xml:lang="de">Genie-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Genie</comment>
- <comment xml:lang="en_GB">Genie source code</comment>
+ <comment xml:lang="en-GB">Genie source code</comment>
<comment xml:lang="es">código fuente en Genie</comment>
<comment xml:lang="eu">Genie iturburu-kodea</comment>
<comment xml:lang="fi">Genie-lähdekoodi</comment>
<comment xml:lang="fr">code source Genie</comment>
+ <comment xml:lang="fur">codiç sorzint Genie</comment>
<comment xml:lang="ga">cód foinseach Genie</comment>
<comment xml:lang="he">קוד מקור של Genie</comment>
<comment xml:lang="hr">Genie izvorni kôd</comment>
@@ -34176,7 +35492,7 @@
<comment xml:lang="oc">còde font Genie</comment>
<comment xml:lang="pl">Kod źródłowy Genie</comment>
<comment xml:lang="pt">código origem Genie</comment>
- <comment xml:lang="pt_BR">Código-fonte Genie</comment>
+ <comment xml:lang="pt-BR">Código-fonte Genie</comment>
<comment xml:lang="ru">Исходный код Genie</comment>
<comment xml:lang="sk">Zdrojový kód Genie</comment>
<comment xml:lang="sl">Izvorna koda Genie</comment>
@@ -34184,30 +35500,32 @@
<comment xml:lang="sv">Genie-källkod</comment>
<comment xml:lang="tr">Genie kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Genie</comment>
- <comment xml:lang="zh_CN">Genie 源代码</comment>
- <comment xml:lang="zh_TW">Genie 源碼</comment>
+ <comment xml:lang="zh-CN">Genie 源代码</comment>
+ <comment xml:lang="zh-TW">Genie 源碼</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.gs" case-sensitive="true"/>
<generic-icon name="text-x-generic"/>
</mime-type>
<mime-type type="text/x-gettext-translation">
<comment>translation file</comment>
+ <comment xml:lang="af">vertaallêer</comment>
<comment xml:lang="ar">ملف الترجمة</comment>
<comment xml:lang="ast">ficheru de traducción</comment>
- <comment xml:lang="be@latin">fajł pierakładu</comment>
+ <comment xml:lang="be-Latn">fajł pierakładu</comment>
<comment xml:lang="bg">Превод</comment>
<comment xml:lang="ca">fitxer de traducció</comment>
<comment xml:lang="cs">soubor překladu</comment>
<comment xml:lang="da">oversættelsesfil</comment>
<comment xml:lang="de">Übersetzungsdatei</comment>
<comment xml:lang="el">Αρχείο μετάφρασης</comment>
- <comment xml:lang="en_GB">translation file</comment>
+ <comment xml:lang="en-GB">translation file</comment>
<comment xml:lang="eo">tradukad-dosiero</comment>
<comment xml:lang="es">archivo de traducción</comment>
<comment xml:lang="eu">itzulpen-fitxategia</comment>
<comment xml:lang="fi">käännöstiedosto</comment>
<comment xml:lang="fo">týðingarfíla</comment>
<comment xml:lang="fr">fichier de traduction</comment>
+ <comment xml:lang="fur">file di traduzion</comment>
<comment xml:lang="ga">comhad aistriúcháin</comment>
<comment xml:lang="gl">ficheiro de tradución</comment>
<comment xml:lang="he">קובץ תרגום</comment>
@@ -34228,7 +35546,7 @@
<comment xml:lang="oc">fichièr de traduccion</comment>
<comment xml:lang="pl">Plik tłumaczenia</comment>
<comment xml:lang="pt">ficheiro de tradução</comment>
- <comment xml:lang="pt_BR">Arquivo de tradução</comment>
+ <comment xml:lang="pt-BR">Arquivo de tradução</comment>
<comment xml:lang="ro">fișier traducere</comment>
<comment xml:lang="ru">Файл переводов</comment>
<comment xml:lang="sk">Súbor prekladu</comment>
@@ -34239,8 +35557,8 @@
<comment xml:lang="tr">çeviri dosyası</comment>
<comment xml:lang="uk">файл перекладу</comment>
<comment xml:lang="vi">tập tin dịch</comment>
- <comment xml:lang="zh_CN">翻译文件</comment>
- <comment xml:lang="zh_TW">翻譯檔</comment>
+ <comment xml:lang="zh-CN">翻译文件</comment>
+ <comment xml:lang="zh-TW">翻譯檔</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.po"/>
<alias type="text/x-po"/>
@@ -34248,22 +35566,24 @@
</mime-type>
<mime-type type="text/x-gettext-translation-template">
<comment>translation template</comment>
+ <comment xml:lang="af">vertaalsjabloon</comment>
<comment xml:lang="ar">قالب الترجمة</comment>
<comment xml:lang="ast">plantía de traducción</comment>
- <comment xml:lang="be@latin">šablon dla pierakładu</comment>
+ <comment xml:lang="be-Latn">šablon dla pierakładu</comment>
<comment xml:lang="bg">Шаблон за преводи</comment>
<comment xml:lang="ca">plantilla de traducció</comment>
<comment xml:lang="cs">šablona překladu</comment>
<comment xml:lang="da">oversættelsesskabelon</comment>
<comment xml:lang="de">Übersetzungsvorlage</comment>
<comment xml:lang="el">Πρότυπο μετάφρασης</comment>
- <comment xml:lang="en_GB">translation template</comment>
+ <comment xml:lang="en-GB">translation template</comment>
<comment xml:lang="eo">tradukad-ŝablono</comment>
<comment xml:lang="es">plantilla de traducción</comment>
<comment xml:lang="eu">itzulpenen txantiloia</comment>
<comment xml:lang="fi">käännösmalli</comment>
<comment xml:lang="fo">týðingarformur</comment>
<comment xml:lang="fr">modèle de traduction</comment>
+ <comment xml:lang="fur">model di traduzion</comment>
<comment xml:lang="ga">teimpléad aistriúcháin</comment>
<comment xml:lang="gl">plantilla de tradución</comment>
<comment xml:lang="he">תבנית תרגום</comment>
@@ -34284,7 +35604,7 @@
<comment xml:lang="oc">modèl de traduccion</comment>
<comment xml:lang="pl">Szablon tłumaczenia</comment>
<comment xml:lang="pt">modelo de tradução</comment>
- <comment xml:lang="pt_BR">Modelo de tradução</comment>
+ <comment xml:lang="pt-BR">Modelo de tradução</comment>
<comment xml:lang="ro">șablon de traducere</comment>
<comment xml:lang="ru">Шаблон переводов</comment>
<comment xml:lang="sk">Šablóna prekladu</comment>
@@ -34295,63 +35615,65 @@
<comment xml:lang="tr">çeviri şablonu</comment>
<comment xml:lang="uk">шаблон перекладу</comment>
<comment xml:lang="vi">mẫu dịch</comment>
- <comment xml:lang="zh_CN">翻译模板</comment>
- <comment xml:lang="zh_TW">翻譯模版</comment>
+ <comment xml:lang="zh-CN">翻译模板</comment>
+ <comment xml:lang="zh-TW">翻譯模版</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.pot"/>
<alias type="text/x-pot"/>
<magic priority="50">
- <match value='#, fuzzy\nmsgid \"\"\nmsgstr \"\"\n\"Project-Id-Version:' type="string" offset="0:256"/>
+ <match type="string" value="#, fuzzy\nmsgid \&quot;\&quot;\nmsgstr \&quot;\&quot;\n\&quot;Project-Id-Version:" offset="0:256"/>
</magic>
</mime-type>
<mime-type type="text/x-gherkin">
- <comment>feature specification in Gherkin format</comment>
- <comment xml:lang="ca">especificació de funcionalitat en format Gherkin</comment>
- <comment xml:lang="cs">specifikace vlastností ve formátu Gherkin</comment>
- <comment xml:lang="da">funktionspecifikation i Gherkin-format</comment>
- <comment xml:lang="de">Funktionsspezifikation im Gherkin-Format</comment>
- <comment xml:lang="en_GB">feature specification in Gherkin format</comment>
- <comment xml:lang="es">especificación de funcionalidad en formato Gherkin</comment>
- <comment xml:lang="fr">spécification fonctionnelle au format Gherkin</comment>
- <comment xml:lang="ga">sonraíocht gnéithe i bhformáid Gherkin</comment>
- <comment xml:lang="he">פירוט תכונות בתבנית Gherkin</comment>
- <comment xml:lang="hr">opis značajke u Gherkin formatu</comment>
- <comment xml:lang="hu">funkcióleírás Gherkin formátumban</comment>
- <comment xml:lang="id">spesifikasi fitur dalam format Gherkin</comment>
- <comment xml:lang="it">Specifica di funzionalità in formato Gherkin</comment>
- <comment xml:lang="kk">Gherkin пішіміндегі функционалды анықтамалар</comment>
- <comment xml:lang="ko">Gherkin 형식의 기능 명세</comment>
- <comment xml:lang="pl">Specyfikacja funkcji w formacie Gherkin</comment>
- <comment xml:lang="pt_BR">Especificação de recurso no formato Gherkin</comment>
- <comment xml:lang="ru">Функциональные определения в формате Gherkin</comment>
- <comment xml:lang="sk">Špecifikácia funkcie vo formáte Gherkin</comment>
- <comment xml:lang="sr">одредба функције у запису Геркина</comment>
- <comment xml:lang="sv">egenskapsspecifikation i Gherkin-format</comment>
- <comment xml:lang="tr">Gherkin biçiminde özellik belirtimi</comment>
- <comment xml:lang="uk">специфікація можливості у форматі Gherkin</comment>
- <comment xml:lang="zh_CN">Gherkin 格式中的功能规范</comment>
- <comment xml:lang="zh_TW">Gherkin 格式的特徵規格</comment>
+ <comment>Gherkin document</comment>
+ <comment xml:lang="bg">Документ — Gherkin</comment>
+ <comment xml:lang="ca">document Gherkin</comment>
+ <comment xml:lang="da">Gherkin-dokument</comment>
+ <comment xml:lang="de">Gherkin-Dokument</comment>
+ <comment xml:lang="en-GB">Gherkin document</comment>
+ <comment xml:lang="es">documento de Gherkin</comment>
+ <comment xml:lang="eu">Gherkin dokumentua</comment>
+ <comment xml:lang="fi">Gherkin-asiakirja</comment>
+ <comment xml:lang="fr">document Gherkin</comment>
+ <comment xml:lang="hr">Gherkin dokument</comment>
+ <comment xml:lang="hu">Gherkin dokumentum</comment>
+ <comment xml:lang="id">Dokumen Gherkin</comment>
+ <comment xml:lang="it">Documento Gherkin</comment>
+ <comment xml:lang="kk">Gherkin құжаты</comment>
+ <comment xml:lang="ko">게르킨 문서</comment>
+ <comment xml:lang="pl">Dokument Gherkin</comment>
+ <comment xml:lang="pt-BR">Documento Gherkin</comment>
+ <comment xml:lang="ru">Документ Gherkin</comment>
+ <comment xml:lang="sk">Dokument Gherkin</comment>
+ <comment xml:lang="sl">Dokument Gherkin</comment>
+ <comment xml:lang="sv">Gherkin-dokument</comment>
+ <comment xml:lang="tr">Gherkin belgesi</comment>
+ <comment xml:lang="uk">документ Gherkin</comment>
+ <comment xml:lang="zh-CN">Gherkin 文档</comment>
+ <comment xml:lang="zh-TW">Gherkin 文件</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.feature"/>
</mime-type>
<mime-type type="text/html">
<comment>HTML document</comment>
+ <comment xml:lang="af">HTML-dokument</comment>
<comment xml:lang="ar">مستند HTML</comment>
<comment xml:lang="ast">Documentu HTML</comment>
- <comment xml:lang="be@latin">Dakument HTML</comment>
+ <comment xml:lang="be-Latn">Dakument HTML</comment>
<comment xml:lang="bg">Документ — HTML</comment>
<comment xml:lang="ca">document HTML</comment>
<comment xml:lang="cs">dokument HTML</comment>
<comment xml:lang="da">HTML-dokument</comment>
<comment xml:lang="de">HTML-Dokument</comment>
<comment xml:lang="el">Έγγραφο HTML</comment>
- <comment xml:lang="en_GB">HTML document</comment>
+ <comment xml:lang="en-GB">HTML document</comment>
<comment xml:lang="eo">HTML-dokumento</comment>
<comment xml:lang="es">documento HTML</comment>
<comment xml:lang="eu">HTML dokumentua</comment>
<comment xml:lang="fi">HTML-asiakirja</comment>
<comment xml:lang="fo">HTML skjal</comment>
<comment xml:lang="fr">document HTML</comment>
+ <comment xml:lang="fur">document HTML</comment>
<comment xml:lang="ga">cáipéis HTML</comment>
<comment xml:lang="gl">documento HTML</comment>
<comment xml:lang="he">מסמך HTML</comment>
@@ -34371,7 +35693,7 @@
<comment xml:lang="oc">document HTML</comment>
<comment xml:lang="pl">Dokument HTML</comment>
<comment xml:lang="pt">documento HTML</comment>
- <comment xml:lang="pt_BR">Documento HTML</comment>
+ <comment xml:lang="pt-BR">Documento HTML</comment>
<comment xml:lang="ro">Document HTML</comment>
<comment xml:lang="ru">Документ HTML</comment>
<comment xml:lang="sk">Dokument HTML</comment>
@@ -34382,161 +35704,122 @@
<comment xml:lang="tr">HTML belgesi</comment>
<comment xml:lang="uk">документ HTML</comment>
<comment xml:lang="vi">Tài liệu HTML</comment>
- <comment xml:lang="zh_CN">HTML 文档</comment>
- <comment xml:lang="zh_TW">HTML 文件</comment>
+ <comment xml:lang="zh-CN">HTML 文档</comment>
+ <comment xml:lang="zh-TW">HTML 文件</comment>
<acronym>HTML</acronym>
<expanded-acronym>HyperText Markup Language</expanded-acronym>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="&lt;!DOCTYPE HTML" type="string" offset="0:256"/>
- <match value="&lt;!doctype html" type="string" offset="0:256"/>
- <match value="&lt;HEAD" type="string" offset="0:256"/>
- <match value="&lt;head" type="string" offset="0:256"/>
- <match value="&lt;TITLE" type="string" offset="0:256"/>
- <match value="&lt;title" type="string" offset="0:256"/>
- <match value="&lt;HTML" type="string" offset="0:256"/>
- <match value="&lt;html" type="string" offset="0:256"/>
- <match value="&lt;SCRIPT" type="string" offset="0:256"/>
- <match value="&lt;script" type="string" offset="0:256"/>
- <match value="&lt;BODY" type="string" offset="0"/>
- <match value="&lt;body" type="string" offset="0"/>
- <match value="&lt;!--" type="string" offset="0"/>
- <match value="&lt;h1" type="string" offset="0"/>
- <match value="&lt;H1" type="string" offset="0"/>
- <match value="&lt;!doctype HTML" type="string" offset="0"/>
- <match value="&lt;!DOCTYPE html" type="string" offset="0"/>
+ <match type="string" value="&lt;!DOCTYPE HTML" offset="0:256"/>
+ <match type="string" value="&lt;!doctype html" offset="0:256"/>
+ <match type="string" value="&lt;!DOCTYPE html" offset="0:256"/>
+ <match type="string" value="&lt;HEAD" offset="0:256"/>
+ <match type="string" value="&lt;head" offset="0:256"/>
+ <match type="string" value="&lt;HTML" offset="0:256"/>
+ <match type="string" value="&lt;html" offset="0:256"/>
+ <match type="string" value="&lt;SCRIPT" offset="0:256"/>
+ <match type="string" value="&lt;script" offset="0:256"/>
+ <match type="string" value="&lt;BODY" offset="0"/>
+ <match type="string" value="&lt;body" offset="0"/>
+ <match type="string" value="&lt;h1" offset="0"/>
+ <match type="string" value="&lt;H1" offset="0"/>
+ <match type="string" value="&lt;!doctype HTML" offset="0"/>
</magic>
- <glob pattern="*.html"/>
- <glob pattern="*.htm"/>
+ <magic priority="40">
+ <match type="string" value="&lt;!--" offset="0"/>
+ <match type="string" value="&lt;TITLE" offset="0:256"/>
+ <match type="string" value="&lt;title" offset="0:256"/>
+ </magic>
+ <glob pattern="*.html" weight="80"/>
+ <glob pattern="*.htm" weight="80"/>
</mime-type>
<mime-type type="text/cache-manifest">
- <comment>Web application cache manifest</comment>
- <comment xml:lang="ar">قائمة التخزين الموقت لتطبيق الويب</comment>
- <comment xml:lang="bg">Манифест за кеша на уеб приложение</comment>
- <comment xml:lang="ca">manifest de memòria cau d'aplicació Web</comment>
- <comment xml:lang="cs">manifest mezipaměti webové aplikace</comment>
- <comment xml:lang="da">Manifest for internetprogrammellemlager</comment>
- <comment xml:lang="de">Webanwendungscache-Manifest</comment>
- <comment xml:lang="el">Δηλωτικό λανθάνουσας μνήμης εφαρμογής Ιστού</comment>
- <comment xml:lang="en_GB">Web application cache manifest</comment>
- <comment xml:lang="es">manifiesto de antememoria de aplicación web</comment>
- <comment xml:lang="eu">Web aplikazioaren cache-aren agiria</comment>
- <comment xml:lang="fo">Net nýtsluskipanarkova manifest</comment>
- <comment xml:lang="fr">manifeste de cache d'application Web</comment>
- <comment xml:lang="ga">lastliosta taisce d'fheidhmchlár Gréasáin</comment>
- <comment xml:lang="gl">manifesto de caché de aplicativo web</comment>
- <comment xml:lang="he">הצהרה של מטמון של תוכנית ברשת</comment>
- <comment xml:lang="hr">Web aplikacija prikaza predmemorije</comment>
- <comment xml:lang="hu">Webalkalmazás gyorsítótár-összefoglalója</comment>
- <comment xml:lang="ia">Manifesto de cache de application web</comment>
- <comment xml:lang="id">Manifes singgahan aplikasi web</comment>
- <comment xml:lang="it">Manifesto cache applicazione Web</comment>
- <comment xml:lang="ja">Web アプリケーションキャッシュ manifest</comment>
- <comment xml:lang="kk">Веб қолданбасының кэш манифесті</comment>
- <comment xml:lang="ko">웹 애플리케이션 캐시 정의</comment>
- <comment xml:lang="lt">Žiniatinklio programos podėlio manifestas</comment>
- <comment xml:lang="lv">Tīmekļa lietotņu keša manifests</comment>
- <comment xml:lang="nl">Webapplicatie cache manifest</comment>
- <comment xml:lang="oc">manifèste d'escondedor d'aplicacion Web</comment>
- <comment xml:lang="pl">Manifest pamięci podręcznej aplikacji WWW</comment>
- <comment xml:lang="pt">manifesto de cache de aplicação web</comment>
- <comment xml:lang="pt_BR">Manifest de cache de aplicação web</comment>
- <comment xml:lang="ro">Manifest de cache pentru aplicații web</comment>
- <comment xml:lang="ru">Манифест кэша веб-приложения</comment>
- <comment xml:lang="sk">Manifest vyrovnávacej pamäte webovej aplikácie</comment>
- <comment xml:lang="sl">Predpomnilnik spletnega programa</comment>
- <comment xml:lang="sr">проглас оставе Веб програма</comment>
- <comment xml:lang="sv">Cachemanifest för webbapplikation</comment>
- <comment xml:lang="tr">Web uygulama önbelleği bildirimi</comment>
- <comment xml:lang="uk">маніфест кешу веб-програми</comment>
- <comment xml:lang="zh_CN">网络应用程序缓存清单</comment>
- <comment xml:lang="zh_TW">網頁應用程式快取聲明</comment>
+ <comment>Web application cache file</comment>
+ <comment xml:lang="bg">Кеш — уеб приложение</comment>
+ <comment xml:lang="ca">fitxer de memòria cau d'aplicació Web</comment>
+ <comment xml:lang="da">Webprogrammellemlagerfil</comment>
+ <comment xml:lang="de">Webanwendungscache-Datei</comment>
+ <comment xml:lang="en-GB">Web application cache file</comment>
+ <comment xml:lang="es">archivo de antememoria de aplicación web</comment>
+ <comment xml:lang="eu">Web-aplikazio katxe fitxategia</comment>
+ <comment xml:lang="fi">Web-sovelluksen välimuistitiedosto</comment>
+ <comment xml:lang="fr">fichier de cache d'application Web</comment>
+ <comment xml:lang="hr"> Web aplikacija datoteka predmemorije </comment>
+ <comment xml:lang="hu">Webalkalmazás gyorsítótárfájl</comment>
+ <comment xml:lang="id">Berkas singgahan aplikasi web</comment>
+ <comment xml:lang="it">File cache applicazione Web</comment>
+ <comment xml:lang="kk">Веб қолданбасының кэш файлы</comment>
+ <comment xml:lang="ko">웹 애플리케이션 캐시 파일</comment>
+ <comment xml:lang="pl">Plik pamięci podręcznej aplikacji WWW</comment>
+ <comment xml:lang="pt-BR">Arquivo de cache de aplicativo Web</comment>
+ <comment xml:lang="ru">Файл кэша веб-приложения</comment>
+ <comment xml:lang="sv">Webbapplikation cachefil</comment>
+ <comment xml:lang="tr">Web uygulama önbellek dosyası</comment>
+ <comment xml:lang="uk">файл кешу вебпрограми</comment>
+ <comment xml:lang="zh-CN">Web 应用缓存文件</comment>
<sub-class-of type="text/plain"/>
<magic>
- <match value="CACHE MANIFEST" type="string" offset="0">
- <match value="\x20" type="string" offset="14"/>
- <match value="\x09" type="string" offset="14"/>
- <match value="\x0a" type="string" offset="14"/>
- <match value="\x0d" type="string" offset="14"/>
+ <match type="string" value="CACHE MANIFEST" offset="0">
+ <match type="string" value="\x20" offset="14"/>
+ <match type="string" value="\x09" offset="14"/>
+ <match type="string" value="\x0a" offset="14"/>
+ <match type="string" value="\x0d" offset="14"/>
</match>
</magic>
<glob pattern="*.manifest"/>
</mime-type>
<mime-type type="text/x-google-video-pointer">
- <comment>Google Video Pointer</comment>
- <comment xml:lang="ar">مؤشر فيديو جوجل</comment>
- <comment xml:lang="ast">Google Video Pointer</comment>
- <comment xml:lang="be@latin">Pakazalnik Google Video</comment>
- <comment xml:lang="bg">Документ-указател към видео на Google</comment>
- <comment xml:lang="ca">apuntador a vídeo de Google</comment>
- <comment xml:lang="cs">Google Video Pointer</comment>
- <comment xml:lang="da">Google Video-peger</comment>
- <comment xml:lang="de">Google Video-Zeiger</comment>
- <comment xml:lang="el">Google Video Pointer</comment>
- <comment xml:lang="en_GB">Google Video Pointer</comment>
- <comment xml:lang="es">lista de reproducción de Google Video (GVP)</comment>
- <comment xml:lang="eu">Google Video-ren erreprodukzio-zerrenda</comment>
- <comment xml:lang="fi">Google-video-osoitin</comment>
- <comment xml:lang="fo">Google Video Pointer</comment>
- <comment xml:lang="fr">pointeur vidéo Google</comment>
- <comment xml:lang="ga">pointeoir Google Video</comment>
- <comment xml:lang="gl">punteiro de vídeo de Google</comment>
- <comment xml:lang="he">מצביע וידאו של Google</comment>
- <comment xml:lang="hr">Google Video pretraživač</comment>
- <comment xml:lang="hu">Google Video Pointer</comment>
- <comment xml:lang="ia">Punctator Google Video</comment>
- <comment xml:lang="id">Google Video Pointer</comment>
- <comment xml:lang="it">Puntatore Google Video</comment>
- <comment xml:lang="ja">Google ビデオポインター</comment>
- <comment xml:lang="kk">Google Video Pointer</comment>
- <comment xml:lang="ko">Google 동영상 포인터</comment>
- <comment xml:lang="lt">Google Video Pointer</comment>
- <comment xml:lang="lv">Google Video Pointer</comment>
- <comment xml:lang="nb">Peker til Google Video</comment>
- <comment xml:lang="nl">Google-videoverwijzing</comment>
- <comment xml:lang="nn">Google Video-peikar</comment>
- <comment xml:lang="oc">puntador vidèo Google</comment>
- <comment xml:lang="pl">Lista odtwarzania Google Video</comment>
- <comment xml:lang="pt">Ponteiro Google Video</comment>
- <comment xml:lang="pt_BR">Ponteiro do Google Vídeo</comment>
- <comment xml:lang="ro">Indicator Google Video</comment>
- <comment xml:lang="ru">Google Video Pointer</comment>
- <comment xml:lang="sk">Google Video Pointer</comment>
- <comment xml:lang="sl">Kazalec Google Video</comment>
- <comment xml:lang="sq">Puntues Google Video</comment>
- <comment xml:lang="sr">Гуглов видео показивач</comment>
- <comment xml:lang="sv">Google Video-pekare</comment>
- <comment xml:lang="tr">Google Video İşaretçisi</comment>
- <comment xml:lang="uk">вказівник відео Google</comment>
- <comment xml:lang="vi">Con trỏ ảnh động Google</comment>
- <comment xml:lang="zh_CN">Google 视频指向</comment>
- <comment xml:lang="zh_TW">Google Video Pointer</comment>
- <magic priority="50">
- <match value="#.download.the.free.Google.Video.Player" type="string" offset="0"/>
- <match value="# download the free Google Video Player" type="string" offset="0"/>
+ <comment>Google Video Pointer shortcut</comment>
+ <comment xml:lang="bg">Отметка — Google Video</comment>
+ <comment xml:lang="ca">drecera d'apuntador a vídeo de Google</comment>
+ <comment xml:lang="da">Google Video Pointer-genvej</comment>
+ <comment xml:lang="de">Google-Video-Zeigerverweis</comment>
+ <comment xml:lang="en-GB">Google Video Pointer shortcut</comment>
+ <comment xml:lang="es">atajo de Google Video Pointer</comment>
+ <comment xml:lang="eu">Google Video Pointer lasterbidea</comment>
+ <comment xml:lang="fi">Google Video Pointer -pikakuvake</comment>
+ <comment xml:lang="fr">raccourci de pointeur vidéo Google</comment>
+ <comment xml:lang="hr">Google Video pretraživač prečac</comment>
+ <comment xml:lang="hu">Google Video Pointer parancsikon</comment>
+ <comment xml:lang="id">Pintasan Google Video Pointer</comment>
+ <comment xml:lang="it">Scorciatoia Google Video Pointer</comment>
+ <comment xml:lang="kk">Google Video Pointer жарлығы</comment>
+ <comment xml:lang="ko">구글 동영상 포인터 바로 가기</comment>
+ <comment xml:lang="pl">Skrót listy odtwarzania Google Video</comment>
+ <comment xml:lang="pt-BR">Atalho do Google Video Pointer</comment>
+ <comment xml:lang="ru">Ссылка Google Video Pointer</comment>
+ <comment xml:lang="sv">Google Video Pointer-genväg</comment>
+ <comment xml:lang="tr">Google Video Pointer kısayolu</comment>
+ <comment xml:lang="uk">скорочення вказівника відео Google</comment>
+ <comment xml:lang="zh-CN">Google Video Pointer 快捷方式</comment>
+ <magic priority="50">
+ <match type="string" value="#.download.the.free.Google.Video.Player" offset="0"/>
+ <match type="string" value="# download the free Google Video Player" offset="0"/>
</magic>
<glob pattern="*.gvp"/>
<alias type="text/google-video-pointer"/>
</mime-type>
<mime-type type="text/x-haskell">
<comment>Haskell source code</comment>
+ <comment xml:lang="af">Haskell-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر Haskell</comment>
<comment xml:lang="az">Haskell mənbə kodu</comment>
- <comment xml:lang="be@latin">Kryničny kod Haskell</comment>
- <comment xml:lang="bg">Изходен код на Haskell</comment>
+ <comment xml:lang="be-Latn">Kryničny kod Haskell</comment>
+ <comment xml:lang="bg">Изходен код — Haskell</comment>
<comment xml:lang="ca">codi font en Haskell</comment>
<comment xml:lang="cs">zdrojový kód v jazyce Haskell</comment>
<comment xml:lang="cy">Ffynhonnell rhaglen Haskell</comment>
- <comment xml:lang="da">Haskellkildekode</comment>
+ <comment xml:lang="da">Haskell-kildekode</comment>
<comment xml:lang="de">Haskell-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Haskell</comment>
- <comment xml:lang="en_GB">Haskell source code</comment>
+ <comment xml:lang="en-GB">Haskell source code</comment>
<comment xml:lang="eo">Haskell-fontkodo</comment>
<comment xml:lang="es">código fuente en Haskell</comment>
<comment xml:lang="eu">Haskell iturburu-kodea</comment>
<comment xml:lang="fi">Haskell-lähdekoodi</comment>
<comment xml:lang="fo">Haskell keldukota</comment>
<comment xml:lang="fr">code source Haskell</comment>
+ <comment xml:lang="fur">codiç sorzint Haskell</comment>
<comment xml:lang="ga">cód foinseach Haskell</comment>
<comment xml:lang="gl">código fonte de Haskell</comment>
<comment xml:lang="he">קוד מקור של Haskell</comment>
@@ -34557,7 +35840,7 @@
<comment xml:lang="oc">còde font Haskell</comment>
<comment xml:lang="pl">Kod źródłowy Haskell</comment>
<comment xml:lang="pt">código origem Haskell</comment>
- <comment xml:lang="pt_BR">Código-fonte Haskell</comment>
+ <comment xml:lang="pt-BR">Código-fonte Haskell</comment>
<comment xml:lang="ro">Cod sursă Haskell</comment>
<comment xml:lang="ru">Исходный код Haskell</comment>
<comment xml:lang="sk">Zdrojový kód Haskell</comment>
@@ -34568,17 +35851,18 @@
<comment xml:lang="tr">Haskell kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Haskell</comment>
<comment xml:lang="vi">Mã nguồn Haskell</comment>
- <comment xml:lang="zh_CN">Haskell 源代码</comment>
- <comment xml:lang="zh_TW">Haskell 源碼</comment>
+ <comment xml:lang="zh-CN">Haskell 源代码</comment>
+ <comment xml:lang="zh-TW">Haskell 源碼</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.hs"/>
</mime-type>
<mime-type type="text/x-idl">
<comment>IDL document</comment>
+ <comment xml:lang="af">IDL-dokument</comment>
<comment xml:lang="ar">مستند IDL</comment>
<comment xml:lang="ast">Documentu IDL</comment>
<comment xml:lang="az">IDL sənədi</comment>
- <comment xml:lang="be@latin">Dakument IDL</comment>
+ <comment xml:lang="be-Latn">Dakument IDL</comment>
<comment xml:lang="bg">Документ — IDL</comment>
<comment xml:lang="ca">document IDL</comment>
<comment xml:lang="cs">dokument IDL</comment>
@@ -34586,13 +35870,14 @@
<comment xml:lang="da">IDL-dokument</comment>
<comment xml:lang="de">IDL-Dokument</comment>
<comment xml:lang="el">Έγγραφο IDL</comment>
- <comment xml:lang="en_GB">IDL document</comment>
+ <comment xml:lang="en-GB">IDL document</comment>
<comment xml:lang="eo">IDL-dokumento</comment>
<comment xml:lang="es">documento IDL</comment>
<comment xml:lang="eu">IDL dokumentua</comment>
<comment xml:lang="fi">IDL-asiakirja</comment>
<comment xml:lang="fo">IDL skjal</comment>
<comment xml:lang="fr">document IDL</comment>
+ <comment xml:lang="fur">document IDL</comment>
<comment xml:lang="ga">cáipéis IDL</comment>
<comment xml:lang="gl">documento IDL</comment>
<comment xml:lang="he">מסמך IDL</comment>
@@ -34613,7 +35898,7 @@
<comment xml:lang="oc">document IDL</comment>
<comment xml:lang="pl">Dokument IDL</comment>
<comment xml:lang="pt">documento IDL</comment>
- <comment xml:lang="pt_BR">Documento IDL</comment>
+ <comment xml:lang="pt-BR">Documento IDL</comment>
<comment xml:lang="ro">Document IDL</comment>
<comment xml:lang="ru">Документ IDL</comment>
<comment xml:lang="sk">Dokument IDL</comment>
@@ -34624,8 +35909,8 @@
<comment xml:lang="tr">IDL belgesi</comment>
<comment xml:lang="uk">документ IDL</comment>
<comment xml:lang="vi">Tài liệu IDL</comment>
- <comment xml:lang="zh_CN">IDL 文档</comment>
- <comment xml:lang="zh_TW">IDL 文件</comment>
+ <comment xml:lang="zh-CN">IDL 文档</comment>
+ <comment xml:lang="zh-TW">IDL 文件</comment>
<acronym>IDL</acronym>
<expanded-acronym>Interface Definition Language</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -34633,21 +35918,23 @@
</mime-type>
<mime-type type="text/x-install">
<comment>installation instructions</comment>
+ <comment xml:lang="af">installasie-instruksies</comment>
<comment xml:lang="ar">تعليمات التثبيت</comment>
<comment xml:lang="ast">instrucciones d'instalación</comment>
- <comment xml:lang="be@latin">instrukcyja dla instalavańnia</comment>
+ <comment xml:lang="be-Latn">instrukcyja dla instalavańnia</comment>
<comment xml:lang="bg">Инструкции за инсталация</comment>
<comment xml:lang="ca">instruccions d'instal·lació</comment>
<comment xml:lang="cs">návod k instalaci</comment>
<comment xml:lang="da">installationsinstruktioner</comment>
<comment xml:lang="de">Installationsanleitung</comment>
<comment xml:lang="el">Οδηγίες εγκατάστασης</comment>
- <comment xml:lang="en_GB">installation instructions</comment>
+ <comment xml:lang="en-GB">installation instructions</comment>
<comment xml:lang="es">instrucciones de instalación</comment>
<comment xml:lang="eu">instalazioaren instrukzioak</comment>
<comment xml:lang="fi">asennusohjeet</comment>
<comment xml:lang="fo">innleggingar vegleiðing</comment>
<comment xml:lang="fr">instructions d'installation</comment>
+ <comment xml:lang="fur">istruzions di instalazion</comment>
<comment xml:lang="ga">treoracha suiteála</comment>
<comment xml:lang="gl">instrucións de instalación</comment>
<comment xml:lang="he">הוראות התקנה</comment>
@@ -34667,7 +35954,7 @@
<comment xml:lang="oc">instructions d'installacion</comment>
<comment xml:lang="pl">Instrukcje instalacji</comment>
<comment xml:lang="pt">instruções de instalação</comment>
- <comment xml:lang="pt_BR">Instruções de instalação</comment>
+ <comment xml:lang="pt-BR">Instruções de instalação</comment>
<comment xml:lang="ro">instrucțiuni de instalare</comment>
<comment xml:lang="ru">Инструкции по установке</comment>
<comment xml:lang="sk">Návod na inštaláciu</comment>
@@ -34678,28 +35965,30 @@
<comment xml:lang="tr">kurulum yönergeleri</comment>
<comment xml:lang="uk">інструкції з встановлення</comment>
<comment xml:lang="vi">hướng dẫn cài đặt</comment>
- <comment xml:lang="zh_CN">软件安装指南</comment>
- <comment xml:lang="zh_TW">安裝指引</comment>
+ <comment xml:lang="zh-CN">软件安装指南</comment>
+ <comment xml:lang="zh-TW">安裝指引</comment>
<sub-class-of type="text/plain"/>
<glob pattern="INSTALL"/>
</mime-type>
<mime-type type="text/x-java">
<comment>Java source code</comment>
+ <comment xml:lang="af">Java-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر Java</comment>
- <comment xml:lang="be@latin">Kryničny kod Java</comment>
- <comment xml:lang="bg">Изходен код на Java</comment>
+ <comment xml:lang="be-Latn">Kryničny kod Java</comment>
+ <comment xml:lang="bg">Изходен код — Java</comment>
<comment xml:lang="ca">codi font en Java</comment>
<comment xml:lang="cs">zdrojový kód v jazyce Java</comment>
- <comment xml:lang="da">Javakildekode</comment>
+ <comment xml:lang="da">Java-kildekode</comment>
<comment xml:lang="de">Java-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Java</comment>
- <comment xml:lang="en_GB">Java source code</comment>
+ <comment xml:lang="en-GB">Java source code</comment>
<comment xml:lang="eo">Java-fontkodo</comment>
<comment xml:lang="es">código fuente en Java</comment>
<comment xml:lang="eu">Java iturburu-kodea</comment>
<comment xml:lang="fi">Java-lähdekoodi</comment>
<comment xml:lang="fo">Java keldukota</comment>
<comment xml:lang="fr">code source Java</comment>
+ <comment xml:lang="fur">codiç sorzint Java</comment>
<comment xml:lang="ga">cód foinseach Java</comment>
<comment xml:lang="gl">código fonte de Java</comment>
<comment xml:lang="he">קוד מקור ב־Java</comment>
@@ -34720,7 +36009,7 @@
<comment xml:lang="oc">còde font Java</comment>
<comment xml:lang="pl">Kod źródłowy Java</comment>
<comment xml:lang="pt">código origem Java</comment>
- <comment xml:lang="pt_BR">Código-fonte Java</comment>
+ <comment xml:lang="pt-BR">Código-fonte Java</comment>
<comment xml:lang="ro">Cod sursă Java</comment>
<comment xml:lang="ru">Исходный код Java</comment>
<comment xml:lang="sk">Zdrojový kód Java</comment>
@@ -34731,28 +36020,30 @@
<comment xml:lang="tr">Java kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Java</comment>
<comment xml:lang="vi">Mã nguồn Java</comment>
- <comment xml:lang="zh_CN">Java 源代码</comment>
- <comment xml:lang="zh_TW">Java 源碼</comment>
+ <comment xml:lang="zh-CN">Java 源代码</comment>
+ <comment xml:lang="zh-TW">Java 源碼</comment>
<sub-class-of type="text/x-csrc"/>
<glob pattern="*.java"/>
</mime-type>
<mime-type type="text/x-ldif">
<comment>LDIF address book</comment>
+ <comment xml:lang="af">LDIF-adresboek</comment>
<comment xml:lang="ar">دفتر عناوين LDIF</comment>
- <comment xml:lang="be@latin">Adrasnaja kniha LDIF</comment>
+ <comment xml:lang="be-Latn">Adrasnaja kniha LDIF</comment>
<comment xml:lang="bg">Адресна книга — LDIF</comment>
<comment xml:lang="ca">llibreta d'adreces LDIF</comment>
<comment xml:lang="cs">adresář LDIF</comment>
<comment xml:lang="da">LDIF-adressebog</comment>
<comment xml:lang="de">LDIF-Adressbuch</comment>
<comment xml:lang="el">Βιβλίο διευθύνσεων LDIF</comment>
- <comment xml:lang="en_GB">LDIF address book</comment>
+ <comment xml:lang="en-GB">LDIF address book</comment>
<comment xml:lang="eo">LDIF-adresaro</comment>
<comment xml:lang="es">libreta de direcciones LDIF</comment>
<comment xml:lang="eu">LDIF helbide-liburua</comment>
<comment xml:lang="fi">LDIF-osoitekirja</comment>
<comment xml:lang="fo">LDIF adressubók</comment>
<comment xml:lang="fr">carnet d'adresses LDIF</comment>
+ <comment xml:lang="fur">rubriche LDIF</comment>
<comment xml:lang="ga">leabhar seoltaí LDIF</comment>
<comment xml:lang="gl">lista de enderezos LDIF</comment>
<comment xml:lang="he">ספר כתובות של LDIF</comment>
@@ -34772,7 +36063,7 @@
<comment xml:lang="oc">quasernet d'adreças LDIF</comment>
<comment xml:lang="pl">Książka adresowa LDIF</comment>
<comment xml:lang="pt">livro de endereços LDIF</comment>
- <comment xml:lang="pt_BR">Livro de endereços LDIF</comment>
+ <comment xml:lang="pt-BR">Livro de endereços LDIF</comment>
<comment xml:lang="ro">Agendă LDIF</comment>
<comment xml:lang="ru">Адресная книга LDIF</comment>
<comment xml:lang="sk">Adresár LDIF</comment>
@@ -34783,33 +36074,35 @@
<comment xml:lang="tr">LDIF adres defteri</comment>
<comment xml:lang="uk">адресна книга LDIF</comment>
<comment xml:lang="vi">Sổ địa chỉ LDIF</comment>
- <comment xml:lang="zh_CN">LDIF 地址簿</comment>
- <comment xml:lang="zh_TW">LDIF 通訊錄</comment>
+ <comment xml:lang="zh-CN">LDIF 地址簿</comment>
+ <comment xml:lang="zh-TW">LDIF 通訊錄</comment>
<acronym>LDIF</acronym>
<expanded-acronym>LDAP Data Interchange Format</expanded-acronym>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="dn: cn=" type="string" offset="0"/>
- <match value="dn: mail=" type="string" offset="0"/>
+ <match type="string" value="dn: cn=" offset="0"/>
+ <match type="string" value="dn: mail=" offset="0"/>
</magic>
<glob pattern="*.ldif"/>
</mime-type>
<mime-type type="text/x-lilypond">
<comment>Lilypond music sheet</comment>
+ <comment xml:lang="af">Lilypond-musiekblad</comment>
<comment xml:lang="ar">صفحة موسيقى Lilypond</comment>
- <comment xml:lang="be@latin">Muzyčny arkuš Lilypond</comment>
+ <comment xml:lang="be-Latn">Muzyčny arkuš Lilypond</comment>
<comment xml:lang="bg">Нотация на Lilypond</comment>
<comment xml:lang="ca">full de música Lilypond</comment>
<comment xml:lang="cs">notový papír Lilypond</comment>
<comment xml:lang="da">Lilypondmusikkort</comment>
<comment xml:lang="de">Lilypond-Notenblatt</comment>
<comment xml:lang="el">Παρτιτούρα Lilypond</comment>
- <comment xml:lang="en_GB">Lilypond music sheet</comment>
+ <comment xml:lang="en-GB">Lilypond music sheet</comment>
<comment xml:lang="es">partitura de LilyPond</comment>
<comment xml:lang="eu">Lilypond musika-orria</comment>
<comment xml:lang="fi">Lilypond-nuotit</comment>
<comment xml:lang="fo">Lilypond tónleika ark</comment>
<comment xml:lang="fr">partition musicale Lilypond</comment>
+ <comment xml:lang="fur">spartît Lilypond</comment>
<comment xml:lang="ga">bileog cheoil Lilypond</comment>
<comment xml:lang="gl">folla de música de Lilypond</comment>
<comment xml:lang="he">דף מוזיקה של Lilypond</comment>
@@ -34828,7 +36121,7 @@
<comment xml:lang="oc">particion musicala Lilypond</comment>
<comment xml:lang="pl">Plik partytury Lilypond</comment>
<comment xml:lang="pt">folha de música Lilypond</comment>
- <comment xml:lang="pt_BR">Partitura do Lilypond</comment>
+ <comment xml:lang="pt-BR">Partitura do Lilypond</comment>
<comment xml:lang="ro">Fișă muzică Lilypond</comment>
<comment xml:lang="ru">Список музыки Lilypond</comment>
<comment xml:lang="sk">Notový papier Lilypond</comment>
@@ -34839,28 +36132,30 @@
<comment xml:lang="tr">Lilypond müzik sayfası</comment>
<comment xml:lang="uk">нотний запис Lilypond</comment>
<comment xml:lang="vi">Bản nhạc Lilypond</comment>
- <comment xml:lang="zh_CN">Lilypond 乐谱</comment>
- <comment xml:lang="zh_TW">Lilypond 樂譜</comment>
+ <comment xml:lang="zh-CN">Lilypond 乐谱</comment>
+ <comment xml:lang="zh-TW">Lilypond 樂譜</comment>
<glob pattern="*.ly"/>
<sub-class-of type="text/plain"/>
</mime-type>
<mime-type type="text/x-literate-haskell">
<comment>LHS source code</comment>
+ <comment xml:lang="af">LHS-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر LHS</comment>
- <comment xml:lang="be@latin">Kryničny kod LHS</comment>
- <comment xml:lang="bg">Изходен код на LHS</comment>
+ <comment xml:lang="be-Latn">Kryničny kod LHS</comment>
+ <comment xml:lang="bg">Изходен код — LHS</comment>
<comment xml:lang="ca">codi font en LHS</comment>
<comment xml:lang="cs">zdrojový kód LHS</comment>
<comment xml:lang="da">LHS-kildekode</comment>
<comment xml:lang="de">LHS-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας LHS</comment>
- <comment xml:lang="en_GB">LHS source code</comment>
+ <comment xml:lang="en-GB">LHS source code</comment>
<comment xml:lang="eo">LHS-fontkodo</comment>
<comment xml:lang="es">código fuente en LHS</comment>
<comment xml:lang="eu">LHS iturburu-kodea</comment>
<comment xml:lang="fi">LHS-lähdekoodi</comment>
<comment xml:lang="fo">LHS keld</comment>
<comment xml:lang="fr">code source LHS</comment>
+ <comment xml:lang="fur">codiç sorzint LHS</comment>
<comment xml:lang="ga">cód foinseach LHS</comment>
<comment xml:lang="gl">código fonte en LHS</comment>
<comment xml:lang="he">קוד מקור של LHS</comment>
@@ -34880,7 +36175,7 @@
<comment xml:lang="oc">còde font LHS</comment>
<comment xml:lang="pl">Kod źródłowy LHS</comment>
<comment xml:lang="pt">código origem LHS</comment>
- <comment xml:lang="pt_BR">Código-fonte LHS</comment>
+ <comment xml:lang="pt-BR">Código-fonte LHS</comment>
<comment xml:lang="ro">Cod sursă LHS</comment>
<comment xml:lang="ru">Исходный код LHS</comment>
<comment xml:lang="sk">Zdrojový kód LHS</comment>
@@ -34891,8 +36186,8 @@
<comment xml:lang="tr">LHS kaynak kodu</comment>
<comment xml:lang="uk">вихідний код LHS</comment>
<comment xml:lang="vi">Mã nguồn LHS</comment>
- <comment xml:lang="zh_CN">LHS 源代码</comment>
- <comment xml:lang="zh_TW">LHS 源碼</comment>
+ <comment xml:lang="zh-CN">LHS 源代码</comment>
+ <comment xml:lang="zh-TW">LHS 源碼</comment>
<acronym>LHS</acronym>
<expanded-acronym>Literate Haskell source code</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -34902,20 +36197,21 @@
<comment>application log</comment>
<comment xml:lang="ar">سجل التطبيق</comment>
<comment xml:lang="ast">rexistru d'aplicación</comment>
- <comment xml:lang="be@latin">časopis aplikacyi</comment>
- <comment xml:lang="bg">Файл-дневник на приложение</comment>
+ <comment xml:lang="be-Latn">časopis aplikacyi</comment>
+ <comment xml:lang="bg">Журнал със съобщения</comment>
<comment xml:lang="ca">registre d'aplicació</comment>
<comment xml:lang="cs">záznam aplikace</comment>
<comment xml:lang="da">programlog</comment>
<comment xml:lang="de">Anwendungsprotokoll</comment>
<comment xml:lang="el">Καταγραφή εφαρμογή</comment>
- <comment xml:lang="en_GB">application log</comment>
+ <comment xml:lang="en-GB">application log</comment>
<comment xml:lang="eo">protokolo de aplikaĵo</comment>
<comment xml:lang="es">registro de aplicación</comment>
<comment xml:lang="eu">aplikazio egunkaria</comment>
<comment xml:lang="fi">sovelluksen lokitiedosto</comment>
<comment xml:lang="fo">nýtsluskipan logg</comment>
<comment xml:lang="fr">journal d'application</comment>
+ <comment xml:lang="fur">regjistri aplicazion</comment>
<comment xml:lang="ga">logchomhad feidhmchláir</comment>
<comment xml:lang="gl">rexistro de aplicativo</comment>
<comment xml:lang="he">יומן יישום</comment>
@@ -34936,7 +36232,7 @@
<comment xml:lang="oc">jornal d'aplicacion</comment>
<comment xml:lang="pl">Dziennik programu</comment>
<comment xml:lang="pt">diário de aplicação</comment>
- <comment xml:lang="pt_BR">Registro de aplicativo</comment>
+ <comment xml:lang="pt-BR">Registro de aplicativo</comment>
<comment xml:lang="ro">înregistrare aplicație</comment>
<comment xml:lang="ru">Журнал сообщений</comment>
<comment xml:lang="sk">Záznam aplikácie</comment>
@@ -34947,64 +36243,36 @@
<comment xml:lang="tr">uygulama günlüğü</comment>
<comment xml:lang="uk">журнал програми</comment>
<comment xml:lang="vi">bản ghi ứng dụng</comment>
- <comment xml:lang="zh_CN">应用程序日志</comment>
- <comment xml:lang="zh_TW">程式紀錄檔</comment>
+ <comment xml:lang="zh-CN">应用程序日志</comment>
+ <comment xml:lang="zh-TW">程式紀錄檔</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.log"/>
</mime-type>
<mime-type type="text/x-makefile">
- <comment>Makefile</comment>
- <comment xml:lang="ar">ملف Makefile</comment>
- <comment xml:lang="az">İnşa faylı</comment>
- <comment xml:lang="be@latin">Makefile</comment>
- <comment xml:lang="bg">Файл — make</comment>
- <comment xml:lang="ca">Makefile</comment>
- <comment xml:lang="cs">Makefile</comment>
- <comment xml:lang="cy">Ffeil "make"</comment>
- <comment xml:lang="da">Bygningsfil</comment>
- <comment xml:lang="de">Makefile</comment>
- <comment xml:lang="el">Makefile</comment>
- <comment xml:lang="en_GB">Makefile</comment>
- <comment xml:lang="eo">Muntodosiero</comment>
- <comment xml:lang="es">Makefile</comment>
- <comment xml:lang="eu">Makefile</comment>
- <comment xml:lang="fi">Makefile</comment>
- <comment xml:lang="fo">Makefile</comment>
- <comment xml:lang="fr">makefile</comment>
- <comment xml:lang="ga">Makefile</comment>
- <comment xml:lang="gl">Makefile</comment>
- <comment xml:lang="he">Makefile</comment>
- <comment xml:lang="hr">Makefile</comment>
- <comment xml:lang="hu">Makefile</comment>
- <comment xml:lang="ia">Makefile</comment>
- <comment xml:lang="id">Makefile</comment>
- <comment xml:lang="it">Makefile</comment>
- <comment xml:lang="ja">Makefile</comment>
- <comment xml:lang="ka">Makefile</comment>
- <comment xml:lang="kk">Makefile (жинау файлы)</comment>
- <comment xml:lang="ko">Makefile</comment>
- <comment xml:lang="lt">Makefile</comment>
- <comment xml:lang="lv">Makefile</comment>
- <comment xml:lang="ms">Makefile</comment>
- <comment xml:lang="nb">Makefile</comment>
- <comment xml:lang="nl">Makefile</comment>
- <comment xml:lang="nn">Makefile</comment>
- <comment xml:lang="oc">makefile</comment>
- <comment xml:lang="pl">Plik make</comment>
- <comment xml:lang="pt">Makefile</comment>
- <comment xml:lang="pt_BR">Makefile (arquivo do make)</comment>
- <comment xml:lang="ro">Makefile</comment>
- <comment xml:lang="ru">Файл Makefile</comment>
- <comment xml:lang="sk">Makefile</comment>
- <comment xml:lang="sl">Datoteka Makefile</comment>
- <comment xml:lang="sq">Makefile</comment>
- <comment xml:lang="sr">датотека стварања</comment>
- <comment xml:lang="sv">Makefil</comment>
- <comment xml:lang="tr">Makefile</comment>
- <comment xml:lang="uk">файл проекту make</comment>
- <comment xml:lang="vi">Tập tin tạo ứng dụng (Makefile)</comment>
- <comment xml:lang="zh_CN">Makefile</comment>
- <comment xml:lang="zh_TW">Makefile</comment>
+ <comment>Makefile build file</comment>
+ <comment xml:lang="bg">Проект — Makefile</comment>
+ <comment xml:lang="ca">fitxer de construcció Makefile</comment>
+ <comment xml:lang="da">Makefile build-fil</comment>
+ <comment xml:lang="de">Makefile Build-Datei</comment>
+ <comment xml:lang="en-GB">Makefile build file</comment>
+ <comment xml:lang="es">archivo de generación Makefile</comment>
+ <comment xml:lang="eu">Makefile build fitxategia</comment>
+ <comment xml:lang="fi">Makefile rakennustiedosto</comment>
+ <comment xml:lang="fr">fichier de construction Makefile</comment>
+ <comment xml:lang="hr">Makefile datoteka izgradnje</comment>
+ <comment xml:lang="hu">Makefile összeállítási fájl</comment>
+ <comment xml:lang="id">Berkas build Makefile</comment>
+ <comment xml:lang="it">File compilazione Makefile</comment>
+ <comment xml:lang="kk">Makefile құрастыру файлы</comment>
+ <comment xml:lang="ko">Makefile 빌드 파일</comment>
+ <comment xml:lang="pl">Plik budowania Makefile</comment>
+ <comment xml:lang="pt-BR">Arquivo de compilação Makefile</comment>
+ <comment xml:lang="ru">Сборочный файл Makefile</comment>
+ <comment xml:lang="sk">Súbor zostavenia Makefile</comment>
+ <comment xml:lang="sv">Makefile-byggfil</comment>
+ <comment xml:lang="tr">Makefile derleme dosyası</comment>
+ <comment xml:lang="uk">файл збирання Makefile</comment>
+ <comment xml:lang="zh-CN">Makefile 构建文件</comment>
<sub-class-of type="text/plain"/>
<glob pattern="makefile"/>
<glob pattern="GNUmakefile"/>
@@ -35012,12 +36280,13 @@
<glob pattern="*.mak"/>
<glob weight="10" pattern="Makefile.*"/>
<magic priority="50">
- <match value="#!/usr/bin/make" type="string" offset="0"/>
- <match value="#! /usr/bin/make" type="string" offset="0"/>
+ <match type="string" value="#!/usr/bin/make" offset="0"/>
+ <match type="string" value="#! /usr/bin/make" offset="0"/>
</magic>
</mime-type>
<mime-type type="text/markdown">
<comment>Markdown document</comment>
+ <comment xml:lang="af">Markdown-dokument</comment>
<comment xml:lang="ast">Documentu Markdown</comment>
<comment xml:lang="bg">Документ — Markdown</comment>
<comment xml:lang="ca">document Markdown</comment>
@@ -35025,11 +36294,12 @@
<comment xml:lang="da">Markdown-dokument</comment>
<comment xml:lang="de">Markdown-Dokument</comment>
<comment xml:lang="el">Έγγραφο Markdown</comment>
- <comment xml:lang="en_GB">Markdown document</comment>
+ <comment xml:lang="en-GB">Markdown document</comment>
<comment xml:lang="es">documento Markdown</comment>
<comment xml:lang="eu">Markdown dokumentua</comment>
<comment xml:lang="fi">Markdown-asiakirja</comment>
<comment xml:lang="fr">document Markdown</comment>
+ <comment xml:lang="fur">document Markdown</comment>
<comment xml:lang="ga">cáipéis Markdown</comment>
<comment xml:lang="gl">documento de Markdown</comment>
<comment xml:lang="he">מסמך Markdown</comment>
@@ -35046,7 +36316,7 @@
<comment xml:lang="oc">document Markdown</comment>
<comment xml:lang="pl">Dokument Markdown</comment>
<comment xml:lang="pt">documento Markdown</comment>
- <comment xml:lang="pt_BR">Documento Markdown</comment>
+ <comment xml:lang="pt-BR">Documento Markdown</comment>
<comment xml:lang="ru">Документ Markdown</comment>
<comment xml:lang="sk">Dokument Markdown</comment>
<comment xml:lang="sl">Dokument Markdown</comment>
@@ -35054,8 +36324,8 @@
<comment xml:lang="sv">Markdown-dokument</comment>
<comment xml:lang="tr">Markdown belgesi</comment>
<comment xml:lang="uk">документ Markdown</comment>
- <comment xml:lang="zh_CN">Markdown 文档</comment>
- <comment xml:lang="zh_TW">Markdown 文件</comment>
+ <comment xml:lang="zh-CN">Markdown 文档</comment>
+ <comment xml:lang="zh-TW">Markdown 文件</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.md"/>
<glob pattern="*.mkd"/>
@@ -35065,19 +36335,20 @@
<mime-type type="text/x-moc">
<comment>Qt MOC file</comment>
<comment xml:lang="ar">ملف Qt MOC</comment>
- <comment xml:lang="be@latin">Fajł Qt MOC</comment>
+ <comment xml:lang="be-Latn">Fajł Qt MOC</comment>
<comment xml:lang="bg">Файл — Qt MOC</comment>
<comment xml:lang="ca">fitxer MOC de Qt</comment>
<comment xml:lang="cs">soubor Qt MOC</comment>
<comment xml:lang="da">Qt MOC-fil</comment>
<comment xml:lang="de">Qt-MOC-Datei</comment>
<comment xml:lang="el">Αρχείο Qt MOC</comment>
- <comment xml:lang="en_GB">Qt MOC file</comment>
+ <comment xml:lang="en-GB">Qt MOC file</comment>
<comment xml:lang="es">archivo MOC Qt</comment>
<comment xml:lang="eu">Qt MOC fitxategia</comment>
<comment xml:lang="fi">Qt MOC -tiedosto</comment>
<comment xml:lang="fo">Qt MOC fíla</comment>
<comment xml:lang="fr">fichier Qt MOC</comment>
+ <comment xml:lang="fur">file Qt MOC</comment>
<comment xml:lang="ga">comhad MOC Qt</comment>
<comment xml:lang="gl">ficheiro MOC Qt</comment>
<comment xml:lang="he">קובץ Qt MOC</comment>
@@ -35097,7 +36368,7 @@
<comment xml:lang="oc">fichièr Qt MOC</comment>
<comment xml:lang="pl">Plik Qt MOC</comment>
<comment xml:lang="pt">ficheiro Qt MOC</comment>
- <comment xml:lang="pt_BR">Arquivo Qt MOC</comment>
+ <comment xml:lang="pt-BR">Arquivo Qt MOC</comment>
<comment xml:lang="ro">Fișier Qt MOC</comment>
<comment xml:lang="ru">Файл Qt MOC</comment>
<comment xml:lang="sk">Súbor Qt MOC</comment>
@@ -35108,8 +36379,8 @@
<comment xml:lang="tr">Qt MOC dosyası</comment>
<comment xml:lang="uk">файл-метаоб'єкт Qt</comment>
<comment xml:lang="vi">Tập tin MOC của Qt</comment>
- <comment xml:lang="zh_CN">Qt 元对象编译器文件</comment>
- <comment xml:lang="zh_TW">Qt MOC 檔</comment>
+ <comment xml:lang="zh-CN">Qt 元对象编译器文件</comment>
+ <comment xml:lang="zh-TW">Qt MOC 檔</comment>
<acronym>Qt MOC</acronym>
<expanded-acronym>Qt Meta Object Compiler</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -35117,20 +36388,22 @@
</mime-type>
<mime-type type="text/x-ms-regedit">
<comment>Windows Registry extract</comment>
+ <comment xml:lang="af">Windows-registerlêeruittreksel</comment>
<comment xml:lang="ar">استخراج مسجل ويندوز</comment>
- <comment xml:lang="be@latin">Element rehistru Windows</comment>
+ <comment xml:lang="be-Latn">Element rehistru Windows</comment>
<comment xml:lang="bg">Извадка от регистъра на Windows</comment>
<comment xml:lang="ca">extracte de Windows Registry</comment>
<comment xml:lang="cs">výtah registru Windows</comment>
- <comment xml:lang="da">Windows Registy-udtrækning</comment>
+ <comment xml:lang="da">Windows registreringsdatabase-udtrækning</comment>
<comment xml:lang="de">Windows-Registry-Auszug</comment>
<comment xml:lang="el">Αποσυμπίεση Windows Registry</comment>
- <comment xml:lang="en_GB">Windows Registry extract</comment>
+ <comment xml:lang="en-GB">Windows Registry extract</comment>
<comment xml:lang="es">extracto del registro de Windows</comment>
<comment xml:lang="eu">Windows-eko erregistro erauzlea</comment>
<comment xml:lang="fi">Windows-rekisteritietue</comment>
<comment xml:lang="fo">Windows Registry úrdráttur</comment>
<comment xml:lang="fr">extrait de registre Windows</comment>
+ <comment xml:lang="fur">estrat dal regjistri di Windows</comment>
<comment xml:lang="ga">sliocht as Clárlann Windows</comment>
<comment xml:lang="gl">Extracto do rexistro de Windows</comment>
<comment xml:lang="he">קובץ רשומות מערכת של Windows</comment>
@@ -35150,7 +36423,7 @@
<comment xml:lang="oc">extrait de registre Windows</comment>
<comment xml:lang="pl">Wycinek rejestru Windows</comment>
<comment xml:lang="pt">extrato do registo do Windows</comment>
- <comment xml:lang="pt_BR">Extrator de registro do Windows</comment>
+ <comment xml:lang="pt-BR">Extrator de registro do Windows</comment>
<comment xml:lang="ro">Extras al registrului Windows</comment>
<comment xml:lang="ru">Фрагмент Windows Registry</comment>
<comment xml:lang="sk">Časť registrov Windows</comment>
@@ -35161,138 +36434,99 @@
<comment xml:lang="tr">Windows Kayıt Defteri özü</comment>
<comment xml:lang="uk">частина реєстру Windows</comment>
<comment xml:lang="vi">Bản trích Registry Windows</comment>
- <comment xml:lang="zh_CN">Windows 注册表提取</comment>
- <comment xml:lang="zh_TW">Windows Registry 抽出</comment>
+ <comment xml:lang="zh-CN">Windows 注册表提取</comment>
+ <comment xml:lang="zh-TW">Windows Registry 抽出</comment>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="REGEDIT" type="string" offset="0"/>
- <match value="Windows Registry Editor Version 5.00" type="string" offset="0"/>
- <match value="\xff\xfeW\x00i\x00n\x00d\x00o\x00w\x00s\x00 \x00R\x00e\x00g\x00i\x00s\x00t\x00r\x00y\x00 \x00E\x00d\x00i\x00t\x00o\x00r\x00" type="string" offset="0"/>
+ <match type="string" value="REGEDIT" offset="0"/>
+ <match type="string" value="Windows Registry Editor Version 5.00" offset="0"/>
+ <match type="string" value="\xff\xfeW\x00i\x00n\x00d\x00o\x00w\x00s\x00 \x00R\x00e\x00g\x00i\x00s\x00t\x00r\x00y\x00 \x00E\x00d\x00i\x00t\x00o\x00r\x00" offset="0"/>
</magic>
<glob pattern="*.reg"/>
</mime-type>
<mime-type type="text/x-mof">
- <comment>Managed Object Format</comment>
- <comment xml:lang="ar">صيغة كائن مدار</comment>
- <comment xml:lang="be@latin">Farmat Managed Object</comment>
- <comment xml:lang="bg">Управлявани обекти — MOF</comment>
- <comment xml:lang="ca">format d'objecte gestionat</comment>
- <comment xml:lang="cs">Managed Object Format</comment>
- <comment xml:lang="da">Håndteret objektformat</comment>
- <comment xml:lang="de">Managed Object Format</comment>
- <comment xml:lang="el">Μορφή διαχειριζόμενου αντικειμένου</comment>
- <comment xml:lang="en_GB">Managed Object Format</comment>
- <comment xml:lang="es">formato de objeto gestionado</comment>
- <comment xml:lang="eu">Kudeatutako objektu formatua</comment>
- <comment xml:lang="fi">Managed Object Format</comment>
- <comment xml:lang="fr">format Managed Object</comment>
- <comment xml:lang="ga">formáid réada bainistithe</comment>
- <comment xml:lang="gl">formato de obxecto xestionado</comment>
- <comment xml:lang="he">תבנית פריט מנוהל</comment>
- <comment xml:lang="hr">Managed Object Format</comment>
- <comment xml:lang="hu">Felügyelt objektum (MO) formátum</comment>
- <comment xml:lang="ia">File in formato Managed Object</comment>
- <comment xml:lang="id">Managed Object Format</comment>
- <comment xml:lang="it">Managed Object Format</comment>
- <comment xml:lang="ja">管理オブジェクトフォーマット</comment>
- <comment xml:lang="kk">Басқарылатын объект пішімі</comment>
- <comment xml:lang="ko">관리되는 객체 형식</comment>
- <comment xml:lang="lt">Sutvarkytų objektų formatas</comment>
- <comment xml:lang="lv">Pārvaldītu objektu formāts</comment>
- <comment xml:lang="nb">Managed Object Format</comment>
- <comment xml:lang="nl">Managed Object Format</comment>
- <comment xml:lang="nn">Managed Object Format</comment>
- <comment xml:lang="oc">format Managed Object</comment>
- <comment xml:lang="pl">Plik Managed Object Format</comment>
- <comment xml:lang="pt">formato Managed Object</comment>
- <comment xml:lang="pt_BR">Formato de objeto gerenciado</comment>
- <comment xml:lang="ro">Managed Object Format</comment>
- <comment xml:lang="ru">Формат управляемого объекта</comment>
- <comment xml:lang="sk">Formát Managed Object</comment>
- <comment xml:lang="sl">Datoteka Managed Object</comment>
- <comment xml:lang="sq">Managed Object Format</comment>
- <comment xml:lang="sr">запис управљаног објекта</comment>
- <comment xml:lang="sv">Managed Object Format</comment>
- <comment xml:lang="tr">Yönetilen Nesne Biçimi</comment>
- <comment xml:lang="uk">формат керування об’єктами</comment>
- <comment xml:lang="vi">Định dạng Đối tượng đã Quản lý</comment>
- <comment xml:lang="zh_CN">托管对象格式</comment>
- <comment xml:lang="zh_TW">Managed Object Format</comment>
+ <comment>MOF file</comment>
+ <comment xml:lang="bg">Модел — MOF</comment>
+ <comment xml:lang="ca">fitxer MOF</comment>
+ <comment xml:lang="da">MOF-fil</comment>
+ <comment xml:lang="de">MOF-Datei</comment>
+ <comment xml:lang="en-GB">MOF file</comment>
+ <comment xml:lang="es">archivo MOF</comment>
+ <comment xml:lang="eu">MOF fitxategia</comment>
+ <comment xml:lang="fi">MOF-tiedosto</comment>
+ <comment xml:lang="fr">fichier MOF</comment>
+ <comment xml:lang="hr">MOF datoteka</comment>
+ <comment xml:lang="hu">MOF fájl</comment>
+ <comment xml:lang="id">Berkas MOF</comment>
+ <comment xml:lang="it">File MOF</comment>
+ <comment xml:lang="kk">MOF файлы</comment>
+ <comment xml:lang="ko">MOF 파일</comment>
+ <comment xml:lang="pl">Plik MOF</comment>
+ <comment xml:lang="pt-BR">Arquivo MOF</comment>
+ <comment xml:lang="ru">Файл MOF</comment>
+ <comment xml:lang="sk">Súbor MOF</comment>
+ <comment xml:lang="sl">Datoteka MOF</comment>
+ <comment xml:lang="sv">MOF-fil</comment>
+ <comment xml:lang="tr">MOF dosyası</comment>
+ <comment xml:lang="uk">файл MOF</comment>
+ <comment xml:lang="zh-CN">MOF 文件</comment>
+ <comment xml:lang="zh-TW">MOF 檔</comment>
+ <acronym>MOF</acronym>
+ <expanded-acronym>Windows Managed Object File</expanded-acronym>
<sub-class-of type="text/x-csrc"/>
<glob pattern="*.mof"/>
</mime-type>
<mime-type type="text/x-mup">
- <comment>Mup publication</comment>
- <comment xml:lang="ar">منشور Mup</comment>
- <comment xml:lang="be@latin">Publikacyja Mup</comment>
- <comment xml:lang="bg">Издание — Mup</comment>
- <comment xml:lang="ca">publicació Mup</comment>
- <comment xml:lang="cs">publikace Mup</comment>
- <comment xml:lang="da">Mupudgivelse</comment>
- <comment xml:lang="de">Mup-Veröffentlichung</comment>
- <comment xml:lang="el">Δημοσίευση Mup</comment>
- <comment xml:lang="en_GB">Mup publication</comment>
- <comment xml:lang="es">publicación Mup</comment>
- <comment xml:lang="eu">Mup publikazioa</comment>
- <comment xml:lang="fi">Mup-julkaisu</comment>
- <comment xml:lang="fo">Mup útgáva</comment>
- <comment xml:lang="fr">publication Mup</comment>
- <comment xml:lang="ga">foilseachán Mup</comment>
- <comment xml:lang="gl">publicación Mup</comment>
- <comment xml:lang="he">פרסום של Mup</comment>
- <comment xml:lang="hr">Mup publikacija</comment>
- <comment xml:lang="hu">Mup publikáció</comment>
- <comment xml:lang="ia">Publication Mup</comment>
- <comment xml:lang="id">Publikasi Mup</comment>
- <comment xml:lang="it">Pubblicazione Mup</comment>
- <comment xml:lang="ja">Mup 出版ファイル</comment>
- <comment xml:lang="kk">Mup жариялымы</comment>
- <comment xml:lang="ko">Mup 출판물</comment>
- <comment xml:lang="lt">Mup leidinys</comment>
- <comment xml:lang="lv">Mup publikācija</comment>
- <comment xml:lang="nb">Mup publikasjon</comment>
- <comment xml:lang="nl">Mup-publicatie</comment>
- <comment xml:lang="nn">Mup-publikasjon</comment>
- <comment xml:lang="oc">publication Mup</comment>
- <comment xml:lang="pl">Publikacja Mup</comment>
- <comment xml:lang="pt">publicação Mup</comment>
- <comment xml:lang="pt_BR">Publicação do Mup</comment>
- <comment xml:lang="ro">Publicație Mup</comment>
- <comment xml:lang="ru">Публикация Mup</comment>
- <comment xml:lang="sk">Publikácie Mup</comment>
- <comment xml:lang="sl">Datoteka objave Mup</comment>
- <comment xml:lang="sq">Publikim Mup</comment>
- <comment xml:lang="sr">Муп објава</comment>
- <comment xml:lang="sv">Mup-publicering</comment>
- <comment xml:lang="tr">Mup uygulaması</comment>
- <comment xml:lang="uk">публікація Mup</comment>
- <comment xml:lang="vi">Bản xuất Mup</comment>
- <comment xml:lang="zh_CN">Mup 应用程序</comment>
- <comment xml:lang="zh_TW">Mup 出版品</comment>
+ <comment>Mup musical composition document</comment>
+ <comment xml:lang="bg">Музикална композиция — Mup</comment>
+ <comment xml:lang="ca">document de composició musical Mup</comment>
+ <comment xml:lang="da">Mup-musiksamling-dokument</comment>
+ <comment xml:lang="de">Mup-Musikkompositions-Dokument</comment>
+ <comment xml:lang="en-GB">Mup musical composition document</comment>
+ <comment xml:lang="es">documento de composición musical de Mup</comment>
+ <comment xml:lang="eu">Mup konposizio musikal dokumentua</comment>
+ <comment xml:lang="fi">Mup-sävellysdokumentti</comment>
+ <comment xml:lang="fr">document de composition musicale Mup</comment>
+ <comment xml:lang="hr">Mup dokument glazbene kompozicije</comment>
+ <comment xml:lang="hu">Mup zenei kompozíciós dokumentum</comment>
+ <comment xml:lang="id">Dokumen komposisi musik Mup</comment>
+ <comment xml:lang="it">Documento composizione musicale Mup</comment>
+ <comment xml:lang="kk">Mup музыкалық композиция құжаты</comment>
+ <comment xml:lang="ko">mup 작곡 문서</comment>
+ <comment xml:lang="pl">Dokument kompozycji muzycznej Mup</comment>
+ <comment xml:lang="pt-BR">Documento de composição musical Mup</comment>
+ <comment xml:lang="sk">Dokument hudobnej kompozície Mup</comment>
+ <comment xml:lang="sv">Mup musikkompositionsdokument</comment>
+ <comment xml:lang="tr">Mup musical composition belgesi</comment>
+ <comment xml:lang="uk">документ музичного запису твору Mup</comment>
+ <comment xml:lang="zh-CN">Mup 乐曲文档</comment>
+ <comment xml:lang="zh-TW">Mup 音樂組合文件</comment>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="//!Mup" type="string" offset="0"/>
+ <match type="string" value="//!Mup" offset="0"/>
</magic>
<glob pattern="*.mup"/>
<glob pattern="*.not"/>
</mime-type>
<mime-type type="text/x-objcsrc">
<comment>Objective-C source code</comment>
+ <comment xml:lang="af">Objective-C-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر الهدف-C </comment>
- <comment xml:lang="be@latin">Kryničny kod Objective-C</comment>
+ <comment xml:lang="be-Latn">Kryničny kod Objective-C</comment>
<comment xml:lang="bg">Изходен код — Objective C</comment>
<comment xml:lang="ca">codi font en Objective-C</comment>
<comment xml:lang="cs">zdrojový kód v jazyce Objective-C</comment>
<comment xml:lang="da">Objektiv C-kildekode</comment>
<comment xml:lang="de">Objective-C-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Objective-C</comment>
- <comment xml:lang="en_GB">Objective-C source code</comment>
+ <comment xml:lang="en-GB">Objective-C source code</comment>
<comment xml:lang="eo">fontkodo en Objective-C</comment>
<comment xml:lang="es">código fuente en Objective-C</comment>
<comment xml:lang="eu">Objective-C iturburu-kodea</comment>
<comment xml:lang="fi">Objective-C-lähdekoodi</comment>
<comment xml:lang="fo">Objective-C keldukota</comment>
<comment xml:lang="fr">code source Objective-C</comment>
+ <comment xml:lang="fur">codiç sorzint Objective-C</comment>
<comment xml:lang="ga">cód foinseach Objective-C</comment>
<comment xml:lang="gl">código fonte de Objective-C</comment>
<comment xml:lang="he">קוד מקור של Objective-C</comment>
@@ -35314,7 +36548,7 @@
<comment xml:lang="oc">còde font Objective-C</comment>
<comment xml:lang="pl">Kod źródłowy Objective-C</comment>
<comment xml:lang="pt">código origem Objective-C</comment>
- <comment xml:lang="pt_BR">Código-fonte Objective-C</comment>
+ <comment xml:lang="pt-BR">Código-fonte Objective-C</comment>
<comment xml:lang="ro">Cod sursă Objective-C</comment>
<comment xml:lang="ru">Исходный код Objective-C</comment>
<comment xml:lang="sk">Zdrojový kód Objective-C</comment>
@@ -35325,31 +36559,33 @@
<comment xml:lang="tr">Objective-C kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Objective-C</comment>
<comment xml:lang="vi">Mã nguồn Objective-C</comment>
- <comment xml:lang="zh_CN">Objective-C 源代码</comment>
- <comment xml:lang="zh_TW">Objective-C 源碼</comment>
+ <comment xml:lang="zh-CN">Objective-C 源代码</comment>
+ <comment xml:lang="zh-TW">Objective-C 源碼</comment>
<sub-class-of type="text/x-csrc"/>
<magic priority="30">
- <match value="#import" type="string" offset="0"/>
+ <match type="string" value="#import" offset="0"/>
</magic>
<glob pattern="*.m"/>
</mime-type>
<mime-type type="text/x-ocaml">
<comment>OCaml source code</comment>
+ <comment xml:lang="af">OCaml-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر OCaml</comment>
- <comment xml:lang="be@latin">Kryničny kod OCaml</comment>
+ <comment xml:lang="be-Latn">Kryničny kod OCaml</comment>
<comment xml:lang="bg">Изходен код — OCaml</comment>
<comment xml:lang="ca">codi font en OCaml</comment>
<comment xml:lang="cs">zdrojový kód v jazyce OCaml</comment>
<comment xml:lang="da">OCaml-kildekode</comment>
<comment xml:lang="de">OCaml-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας OCaml</comment>
- <comment xml:lang="en_GB">OCaml source code</comment>
+ <comment xml:lang="en-GB">OCaml source code</comment>
<comment xml:lang="eo">OCaml-fontkodo</comment>
<comment xml:lang="es">código fuente en OCaml</comment>
<comment xml:lang="eu">OCaml iturburu-kodea</comment>
<comment xml:lang="fi">OCaml-lähdekoodi</comment>
<comment xml:lang="fo">OCaml keldukota</comment>
<comment xml:lang="fr">code source OCaml</comment>
+ <comment xml:lang="fur">codiç sorzint OCaml</comment>
<comment xml:lang="ga">cód foinseach OCaml</comment>
<comment xml:lang="gl">código fonte de OCaml</comment>
<comment xml:lang="he">קוד מקור של OCaml</comment>
@@ -35369,7 +36605,7 @@
<comment xml:lang="oc">còde font OCaml</comment>
<comment xml:lang="pl">Kod źródłowy OCaml</comment>
<comment xml:lang="pt">código origem OCaml</comment>
- <comment xml:lang="pt_BR">Código-fonte OCaml</comment>
+ <comment xml:lang="pt-BR">Código-fonte OCaml</comment>
<comment xml:lang="ro">Cod sursă OCaml</comment>
<comment xml:lang="ru">Исходный код OCaml</comment>
<comment xml:lang="sk">Zdrojový kód OCaml</comment>
@@ -35380,19 +36616,26 @@
<comment xml:lang="tr">OCaml kaynak kodu</comment>
<comment xml:lang="uk">первинний код мовою OCaml</comment>
<comment xml:lang="vi">Mã nguồn OCaml</comment>
- <comment xml:lang="zh_CN">OCaml 源代码</comment>
- <comment xml:lang="zh_TW">OCaml 源碼</comment>
+ <comment xml:lang="zh-CN">OCaml 源代码</comment>
+ <comment xml:lang="zh-TW">OCaml 源碼</comment>
<glob pattern="*.ml"/>
<glob pattern="*.mli"/>
</mime-type>
<mime-type type="text/x-opencl-src">
<comment>OpenCL source code</comment>
+ <comment xml:lang="af">OpenCL-bronkode</comment>
+ <comment xml:lang="bg">Изходен код — OpenCL</comment>
<comment xml:lang="ca">codi font en OpenCL</comment>
<comment xml:lang="cs">zdrojový kód v jazyce OpenCL</comment>
+ <comment xml:lang="da">OpenCL-kildekode</comment>
<comment xml:lang="de">OpenCL-Quelltext</comment>
- <comment xml:lang="en_GB">OpenCL source code</comment>
+ <comment xml:lang="en-GB">OpenCL source code</comment>
<comment xml:lang="es">código fuente en OpenCL</comment>
+ <comment xml:lang="eu">OpenCL iturburu-kodea</comment>
<comment xml:lang="fi">OpenCL-lähdekoodi</comment>
+ <comment xml:lang="fr">code source OpenCL</comment>
+ <comment xml:lang="fur">codiç sorzint OpenCL</comment>
+ <comment xml:lang="ga">cód foinseach OpenCL</comment>
<comment xml:lang="hr">OpenCL izvorni kôd</comment>
<comment xml:lang="hu">OpenCL forráskód</comment>
<comment xml:lang="id">Kode sumber OpenCL</comment>
@@ -35400,91 +36643,75 @@
<comment xml:lang="kk">OpenCL бастапқы коды</comment>
<comment xml:lang="ko">OpenCL 소스 코드</comment>
<comment xml:lang="pl">Kod źródłowy OpenCL</comment>
- <comment xml:lang="pt_BR">Código-fonte do OpenCL</comment>
+ <comment xml:lang="pt-BR">Código-fonte OpenCL</comment>
<comment xml:lang="ru">Исходный код OpenGL</comment>
<comment xml:lang="sk">Zdrojový kód OpenCL</comment>
+ <comment xml:lang="sl">Izvorna koda OpenCL</comment>
<comment xml:lang="sv">OpenCL-källkod</comment>
+ <comment xml:lang="tr">OpenCL kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою OpenCL</comment>
- <comment xml:lang="zh_CN">OpenCL 源代码</comment>
- <comment xml:lang="zh_TW">OpenCL 源碼</comment>
+ <comment xml:lang="zh-CN">OpenCL 源代码</comment>
+ <comment xml:lang="zh-TW">OpenCL 源碼</comment>
<acronym>OpenCL</acronym>
<expanded-acronym>Open Computing Language</expanded-acronym>
<sub-class-of type="text/x-csrc"/>
<glob pattern="*.cl"/>
</mime-type>
<mime-type type="text/x-matlab">
- <comment>MATLAB script/function</comment>
- <comment xml:lang="ar">سكربت/وظيفة MATLAB</comment>
- <comment xml:lang="be@latin">Skrypt/funkcyja MATLAB</comment>
- <comment xml:lang="bg">Скрипт/функция — MATLAB</comment>
- <comment xml:lang="ca">script/funció MATLAB</comment>
- <comment xml:lang="cs">skript/funkce MATLAB</comment>
- <comment xml:lang="da">MATLAB-program/-funktion</comment>
- <comment xml:lang="de">MATLAB-Skript/-Funktion</comment>
- <comment xml:lang="el">Δέσμη ενεργειών/συνάρτηση MATLAB</comment>
- <comment xml:lang="en_GB">MATLAB script/function</comment>
- <comment xml:lang="es">secuencia de órdenes/función de MATLAB</comment>
- <comment xml:lang="eu">MATLAB script/funtzioa</comment>
- <comment xml:lang="fi">MATLAB-komentotiedosto/funktio</comment>
- <comment xml:lang="fo">MATLAB boðrøð/funka</comment>
- <comment xml:lang="fr">script/fonction MATLAB</comment>
- <comment xml:lang="ga">script/feidhm MATLAB</comment>
- <comment xml:lang="gl">función/script de MATLAB</comment>
- <comment xml:lang="he">תסריט/פונקציית MATLAB</comment>
- <comment xml:lang="hr">MATLAB skripta/funkcija</comment>
- <comment xml:lang="hu">MATLAB parancsfájl/funkció</comment>
- <comment xml:lang="ia">Script/function MATLAB</comment>
- <comment xml:lang="id">Skrip/fungsi MATLAB</comment>
- <comment xml:lang="it">Script/Funzione MATLAB</comment>
- <comment xml:lang="ja">MATLAB スクリプト/関数</comment>
- <comment xml:lang="kk">MATLAB сценарий/функциясы</comment>
- <comment xml:lang="ko">MATLAB 스크립트/함수</comment>
- <comment xml:lang="lt">MATLAB scenarijus / funkcija</comment>
- <comment xml:lang="lv">MATLAB skripts/funkcija</comment>
- <comment xml:lang="nb">Skript/funksjon for MATLAB</comment>
- <comment xml:lang="nl">MATLAB-script/functie</comment>
- <comment xml:lang="nn">MATLAB-skript/funksjon</comment>
- <comment xml:lang="oc">escript/fonction MATLAB</comment>
- <comment xml:lang="pl">Skrypt/funkcja MATLAB</comment>
- <comment xml:lang="pt">script/função MATLAB</comment>
- <comment xml:lang="pt_BR">Script/função do MATLAB</comment>
- <comment xml:lang="ro">Funcție/script MATLAB</comment>
- <comment xml:lang="ru">Сценарий/функция MATLAB</comment>
- <comment xml:lang="sk">Skript/funkcia MATLAB</comment>
- <comment xml:lang="sl">Skriptna datoteka MATLAB</comment>
- <comment xml:lang="sq">Script/Funksion MATLAB</comment>
- <comment xml:lang="sr">скрипта/функција МАТЛАБ-а</comment>
- <comment xml:lang="sv">MATLAB-skript/funktion</comment>
- <comment xml:lang="tr">MATLAB betiği/fonksiyonu</comment>
- <comment xml:lang="uk">скрипт/функція MATLAB</comment>
- <comment xml:lang="vi">Văn lệnh/chức năng MATLAB</comment>
- <comment xml:lang="zh_CN">MATLAB 脚本/函数</comment>
- <comment xml:lang="zh_TW">MATLAB 指令稿/函式</comment>
+ <comment>MATLAB file</comment>
+ <comment xml:lang="bg">Файл — MATLAB</comment>
+ <comment xml:lang="ca">fitxer MATLAB</comment>
+ <comment xml:lang="da">MATLAB-fil</comment>
+ <comment xml:lang="de">MATLAB-Datei</comment>
+ <comment xml:lang="en-GB">MATLAB file</comment>
+ <comment xml:lang="es">archivo de MATLAB</comment>
+ <comment xml:lang="eu">MATLAB fitxategia</comment>
+ <comment xml:lang="fi">MATLAB-tiedosto</comment>
+ <comment xml:lang="fr">fichier MATLAB</comment>
+ <comment xml:lang="hr">MATLAB datoteka</comment>
+ <comment xml:lang="hu">MATLAB fájl</comment>
+ <comment xml:lang="id">Berkas MATLAB</comment>
+ <comment xml:lang="it">File MATLAB</comment>
+ <comment xml:lang="kk">MATLAB файлы</comment>
+ <comment xml:lang="ko">MATLAB 파일</comment>
+ <comment xml:lang="pl">Plik MATLAB</comment>
+ <comment xml:lang="pt-BR">Arquivo do MATLAB</comment>
+ <comment xml:lang="ru">Файл MATLAB</comment>
+ <comment xml:lang="sk">Súbor MATLAB</comment>
+ <comment xml:lang="sl">Datoteka MATLAB</comment>
+ <comment xml:lang="sv">MATLAB-fil</comment>
+ <comment xml:lang="tr">MATLAB dosyası</comment>
+ <comment xml:lang="uk">файл MATLAB</comment>
+ <comment xml:lang="zh-CN">MATLAB 文件</comment>
+ <comment xml:lang="zh-TW">MATLAB 檔</comment>
<sub-class-of type="text/plain"/>
<magic priority="10">
- <match value="%" type="string" offset="0"/>
+ <match type="string" value="%" offset="0"/>
</magic>
<magic priority="10">
- <match value="##" type="string" offset="0"/>
+ <match type="string" value="##" offset="0"/>
</magic>
<magic priority="50">
- <match value="function" type="string" offset="0"/>
+ <match type="string" value="function" offset="0"/>
</magic>
<glob pattern="*.m"/>
<alias type="text/x-octave"/>
</mime-type>
<mime-type type="text/x-meson">
<comment>Meson source code</comment>
+ <comment xml:lang="af">Meson-bronkode</comment>
+ <comment xml:lang="bg">Изходен код — Meson</comment>
<comment xml:lang="ca">codi font en Meson</comment>
<comment xml:lang="cs">zdrojový kód Meson</comment>
<comment xml:lang="da">Meson-kildekode</comment>
<comment xml:lang="de">Meson-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Meson</comment>
- <comment xml:lang="en_GB">Meson source code</comment>
+ <comment xml:lang="en-GB">Meson source code</comment>
<comment xml:lang="es">código fuente en Meson</comment>
<comment xml:lang="eu">Meson iturburu-kodea</comment>
<comment xml:lang="fi">Meson-lähdekoodi</comment>
<comment xml:lang="fr">code source Meson</comment>
+ <comment xml:lang="fur">codiç sorzint Meson</comment>
<comment xml:lang="ga">cód foinseach Meson</comment>
<comment xml:lang="he">קוד מקור Meson</comment>
<comment xml:lang="hr">Meson izvorni kôd</comment>
@@ -35497,31 +36724,35 @@
<comment xml:lang="oc">còde font Meson</comment>
<comment xml:lang="pl">Kod źródłowy Meson</comment>
<comment xml:lang="pt">código origem Meson</comment>
- <comment xml:lang="pt_BR">Código-fonte Meson</comment>
+ <comment xml:lang="pt-BR">Código-fonte Meson</comment>
<comment xml:lang="ru">Исходный код Meson</comment>
<comment xml:lang="sk">Zdrojový kód Meson</comment>
+ <comment xml:lang="sl">Izvorna koda Meson</comment>
<comment xml:lang="sr">Месон изворни ко̂д</comment>
<comment xml:lang="sv">Meson-källkod</comment>
<comment xml:lang="tr">Meson kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Meson</comment>
- <comment xml:lang="zh_CN">Meson 源代码</comment>
- <comment xml:lang="zh_TW">Meson 源碼</comment>
+ <comment xml:lang="zh-CN">Meson 源代码</comment>
+ <comment xml:lang="zh-TW">Meson 源碼</comment>
<glob pattern="meson.build"/>
<glob pattern="meson_options.txt"/>
<sub-class-of type="text/plain"/>
</mime-type>
<mime-type type="text/x-modelica">
<comment>Modelica model</comment>
+ <comment xml:lang="af">Modelica-model</comment>
+ <comment xml:lang="bg">Модел — Modelica</comment>
<comment xml:lang="ca">model de Modelica</comment>
<comment xml:lang="cs">model Modelica</comment>
<comment xml:lang="da">Modelica-model</comment>
<comment xml:lang="de">Modelica-Modell</comment>
<comment xml:lang="el">Μοντέλο Modelica</comment>
- <comment xml:lang="en_GB">Modelica model</comment>
+ <comment xml:lang="en-GB">Modelica model</comment>
<comment xml:lang="es">modelo de Modelica</comment>
<comment xml:lang="eu">Modelica modeloa</comment>
<comment xml:lang="fi">Modelica-malli</comment>
<comment xml:lang="fr">modèle Modelica</comment>
+ <comment xml:lang="fur">model Modelica</comment>
<comment xml:lang="ga">samhail Modelica</comment>
<comment xml:lang="gl">Modelo de Modelica</comment>
<comment xml:lang="he">דגם של Modelica</comment>
@@ -35537,7 +36768,7 @@
<comment xml:lang="oc">modèl Modelica</comment>
<comment xml:lang="pl">Model Modelica</comment>
<comment xml:lang="pt">modelo Modelica</comment>
- <comment xml:lang="pt_BR">Modelo da Modelica</comment>
+ <comment xml:lang="pt-BR">Modelo da Modelica</comment>
<comment xml:lang="ru">Модель Modelica</comment>
<comment xml:lang="sk">Model Modelica</comment>
<comment xml:lang="sl">Model Modelica</comment>
@@ -35545,43 +36776,45 @@
<comment xml:lang="sv">Modelica-modell</comment>
<comment xml:lang="tr">Modelica modeli</comment>
<comment xml:lang="uk">модель Modelica</comment>
- <comment xml:lang="zh_CN">Modelica 模型</comment>
- <comment xml:lang="zh_TW">Modelica 模型</comment>
+ <comment xml:lang="zh-CN">Modelica 模型</comment>
+ <comment xml:lang="zh-TW">Modelica 模型</comment>
<sub-class-of type="text/plain"/>
<magic priority="10">
- <match value="//" type="string" offset="0"/>
+ <match type="string" value="//" offset="0"/>
</magic>
<magic priority="50">
- <match value="function" type="string" offset="0"/>
+ <match type="string" value="function" offset="0"/>
</magic>
<magic priority="50">
- <match value="class" type="string" offset="0"/>
+ <match type="string" value="class" offset="0"/>
</magic>
<magic priority="50">
- <match value="model" type="string" offset="0"/>
+ <match type="string" value="model" offset="0"/>
</magic>
<magic priority="50">
- <match value="record" type="string" offset="0"/>
+ <match type="string" value="record" offset="0"/>
</magic>
<glob pattern="*.mo"/>
</mime-type>
<mime-type type="text/x-pascal">
<comment>Pascal source code</comment>
+ <comment xml:lang="af">Pascal-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر باسكال</comment>
- <comment xml:lang="be@latin">Kryničny kod Pascal</comment>
+ <comment xml:lang="be-Latn">Kryničny kod Pascal</comment>
<comment xml:lang="bg">Изходен код — Pascal</comment>
<comment xml:lang="ca">codi font en Pascal</comment>
<comment xml:lang="cs">zdrojový kód v jazyce Pascal</comment>
- <comment xml:lang="da">Pascalkildekode</comment>
+ <comment xml:lang="da">Pascal-kildekode</comment>
<comment xml:lang="de">Pascal-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Pascal</comment>
- <comment xml:lang="en_GB">Pascal source code</comment>
+ <comment xml:lang="en-GB">Pascal source code</comment>
<comment xml:lang="eo">Pascal-fontkodo</comment>
<comment xml:lang="es">código fuente en Pascal</comment>
<comment xml:lang="eu">Pascal iturburu-kodea</comment>
<comment xml:lang="fi">Pascal-lähdekoodi</comment>
<comment xml:lang="fo">Pascal keldukota</comment>
<comment xml:lang="fr">code source Pascal</comment>
+ <comment xml:lang="fur">codiç sorzint Pascal</comment>
<comment xml:lang="ga">cód foinseach Pascal</comment>
<comment xml:lang="gl">código fonte en Pascal</comment>
<comment xml:lang="he">קוד מקור של Pascal</comment>
@@ -35602,7 +36835,7 @@
<comment xml:lang="oc">còde font Pascal</comment>
<comment xml:lang="pl">Kod źródłowy Pascal</comment>
<comment xml:lang="pt">código origem Pascal</comment>
- <comment xml:lang="pt_BR">Código-fonte Pascal</comment>
+ <comment xml:lang="pt-BR">Código-fonte Pascal</comment>
<comment xml:lang="ro">Cod sursă Pascal</comment>
<comment xml:lang="ru">Исходный код Pascal</comment>
<comment xml:lang="sk">Zdrojový kód Pascal</comment>
@@ -35613,29 +36846,31 @@
<comment xml:lang="tr">Pascal kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Pascal</comment>
<comment xml:lang="vi">Mã nguồn Pascal</comment>
- <comment xml:lang="zh_CN">Pascal 源代码</comment>
- <comment xml:lang="zh_TW">Pascal 源碼</comment>
+ <comment xml:lang="zh-CN">Pascal 源代码</comment>
+ <comment xml:lang="zh-TW">Pascal 源碼</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.p"/>
<glob pattern="*.pas"/>
</mime-type>
<mime-type type="text/x-patch">
<comment>differences between files</comment>
+ <comment xml:lang="af">verskille tussen lêers</comment>
<comment xml:lang="ar">الاختلافات بين الملفات</comment>
- <comment xml:lang="be@latin">adroźnieńni pamiž fajłami</comment>
+ <comment xml:lang="be-Latn">adroźnieńni pamiž fajłami</comment>
<comment xml:lang="bg">Разлики между файлове</comment>
<comment xml:lang="ca">diferències entre fitxers</comment>
<comment xml:lang="cs">rozdíly mezi soubory</comment>
<comment xml:lang="da">forskel mellem filer</comment>
<comment xml:lang="de">Unterschiede zwischen Dateien</comment>
<comment xml:lang="el">Διαφορές μεταξύ αρχείων</comment>
- <comment xml:lang="en_GB">differences between files</comment>
+ <comment xml:lang="en-GB">differences between files</comment>
<comment xml:lang="eo">diferencoj inter dosieroj</comment>
<comment xml:lang="es">diferencias entre archivos</comment>
<comment xml:lang="eu">fitxategien arteko ezberdintasunak</comment>
<comment xml:lang="fi">tiedostojen väliset erot</comment>
<comment xml:lang="fo">munur millum fílur</comment>
<comment xml:lang="fr">différences entre fichiers</comment>
+ <comment xml:lang="fur">diferencis tra file</comment>
<comment xml:lang="ga">difríochtaí idir chomhaid</comment>
<comment xml:lang="gl">diferenzas entre ficheiros</comment>
<comment xml:lang="he">הבדל בין קבצים</comment>
@@ -35656,7 +36891,7 @@
<comment xml:lang="oc">différences entre fichièrs</comment>
<comment xml:lang="pl">Różnica pomiędzy plikami</comment>
<comment xml:lang="pt">diferenças entre ficheiros</comment>
- <comment xml:lang="pt_BR">Diferenças entre arquivos</comment>
+ <comment xml:lang="pt-BR">Diferenças entre arquivos</comment>
<comment xml:lang="ro">diferențe între fișiere</comment>
<comment xml:lang="ru">Различия между файлами</comment>
<comment xml:lang="sk">Rozdiely medzi súbormi</comment>
@@ -35667,39 +36902,41 @@
<comment xml:lang="tr">dosyalar arasındaki fark</comment>
<comment xml:lang="uk">різниця між файлами</comment>
<comment xml:lang="vi">khác biệt giữa các tập tin</comment>
- <comment xml:lang="zh_CN">文件的区别</comment>
- <comment xml:lang="zh_TW">檔案內容差異</comment>
+ <comment xml:lang="zh-CN">文件的区别</comment>
+ <comment xml:lang="zh-TW">檔案內容差異</comment>
<alias type="text/x-diff"/>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="diff\t" type="string" offset="0"/>
- <match value="diff " type="string" offset="0"/>
- <match value="***\t" type="string" offset="0"/>
- <match value="*** " type="string" offset="0"/>
- <match value="=== " type="string" offset="0"/>
- <match value="--- " type="string" offset="0"/>
- <match value="Only in\t" type="string" offset="0"/>
- <match value="Only in " type="string" offset="0"/>
- <match value="Common subdirectories: " type="string" offset="0"/>
- <match value="Index:" type="string" offset="0"/>
+ <match type="string" value="diff\t" offset="0"/>
+ <match type="string" value="diff " offset="0"/>
+ <match type="string" value="***\t" offset="0"/>
+ <match type="string" value="*** " offset="0"/>
+ <match type="string" value="=== " offset="0"/>
+ <match type="string" value="--- " offset="0"/>
+ <match type="string" value="Only in\t" offset="0"/>
+ <match type="string" value="Only in " offset="0"/>
+ <match type="string" value="Common subdirectories: " offset="0"/>
+ <match type="string" value="Index:" offset="0"/>
</magic>
<glob pattern="*.diff"/>
<glob pattern="*.patch"/>
</mime-type>
<mime-type type="text/x-go">
<comment>Go source code</comment>
+ <comment xml:lang="af">Go-bronkode</comment>
<comment xml:lang="bg">Изходен код — Go</comment>
<comment xml:lang="ca">codi font en Go</comment>
<comment xml:lang="cs">zdrojový kód v jazyce Go</comment>
<comment xml:lang="da">Go-kildekode</comment>
<comment xml:lang="de">Go-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Go</comment>
- <comment xml:lang="en_GB">Go source code</comment>
+ <comment xml:lang="en-GB">Go source code</comment>
<comment xml:lang="eo">Go-fontkodo</comment>
<comment xml:lang="es">código fuente en Go</comment>
<comment xml:lang="eu">Go iturburu-kodea</comment>
<comment xml:lang="fi">Go-lähdekoodi</comment>
<comment xml:lang="fr">code source Go</comment>
+ <comment xml:lang="fur">codiç sorzint Go</comment>
<comment xml:lang="ga">cód foinseach Go</comment>
<comment xml:lang="gl">código fonte de Go</comment>
<comment xml:lang="he">קוד מקור של Go</comment>
@@ -35717,7 +36954,7 @@
<comment xml:lang="oc">còde font Go</comment>
<comment xml:lang="pl">Kod źródłowy Go</comment>
<comment xml:lang="pt">cigo origem Go</comment>
- <comment xml:lang="pt_BR">Código-fonte Go</comment>
+ <comment xml:lang="pt-BR">Código-fonte Go</comment>
<comment xml:lang="ru">Исходный код Go</comment>
<comment xml:lang="sk">Zdrojový kód Go</comment>
<comment xml:lang="sl">Izvorna koda Go</comment>
@@ -35725,23 +36962,26 @@
<comment xml:lang="sv">Go-källkod</comment>
<comment xml:lang="tr">Go kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Go</comment>
- <comment xml:lang="zh_CN">Go 源代码</comment>
- <comment xml:lang="zh_TW">Go 源碼</comment>
+ <comment xml:lang="zh-CN">Go 源代码</comment>
+ <comment xml:lang="zh-TW">Go 源碼</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.go"/>
</mime-type>
<mime-type type="text/x-scons">
<comment>SCons configuration file</comment>
+ <comment xml:lang="af">SCons-opstellingslêer</comment>
+ <comment xml:lang="bg">Настройки — SCons</comment>
<comment xml:lang="ca">fitxer de configuració de SCons</comment>
<comment xml:lang="cs">konfigurační soubor SCons</comment>
<comment xml:lang="da">SCons-konfigurationsfil</comment>
<comment xml:lang="de">SCons-Konfigurationsdatei</comment>
<comment xml:lang="el">Αρχείο ρυθμίσεων SCons</comment>
- <comment xml:lang="en_GB">SCons configuration file</comment>
+ <comment xml:lang="en-GB">SCons configuration file</comment>
<comment xml:lang="es">archivo de configuración de SCons</comment>
<comment xml:lang="eu">SCons konfigurazio-fitxategia</comment>
<comment xml:lang="fi">SCons-asetustiedosto</comment>
<comment xml:lang="fr">fichier de configuration SCons</comment>
+ <comment xml:lang="fur">file di configurazion SCons</comment>
<comment xml:lang="ga">comhad cumraíochta SCons</comment>
<comment xml:lang="he">קובץ תצורה של SCons</comment>
<comment xml:lang="hr">SCons datoteka podešavanja</comment>
@@ -35754,7 +36994,7 @@
<comment xml:lang="oc">fichièr de configuracion SCons</comment>
<comment xml:lang="pl">Plik konfiguracji SCons</comment>
<comment xml:lang="pt">ficheiro de configuração SCons</comment>
- <comment xml:lang="pt_BR">Arquivo de configuração do SCons</comment>
+ <comment xml:lang="pt-BR">Arquivo de configuração do SCons</comment>
<comment xml:lang="ru">Файл настроек SCons</comment>
<comment xml:lang="sk">Konfiguračný súbor SCons</comment>
<comment xml:lang="sl">Prilagoditvena datoteka SCons</comment>
@@ -35762,8 +37002,8 @@
<comment xml:lang="sv">SCons-konfigurationsfil</comment>
<comment xml:lang="tr">SCons yapılandırma dosyası</comment>
<comment xml:lang="uk">файл налаштувань SCons</comment>
- <comment xml:lang="zh_CN">SCons 配置文件</comment>
- <comment xml:lang="zh_TW">SCons 組態檔</comment>
+ <comment xml:lang="zh-CN">SCons 配置文件</comment>
+ <comment xml:lang="zh-TW">SCons 組態檔</comment>
<sub-class-of type="text/x-python"/>
<glob pattern="SConstruct"/>
<glob pattern="SConscript"/>
@@ -35771,12 +37011,19 @@
</mime-type>
<mime-type type="text/x-python3">
<comment>Python 3 script</comment>
+ <comment xml:lang="af">Python 3-skrip</comment>
+ <comment xml:lang="bg">Скрипт — Python 3</comment>
<comment xml:lang="ca">script Python 3</comment>
<comment xml:lang="cs">skript v jazyce Python 3</comment>
+ <comment xml:lang="da">Python 3-program</comment>
<comment xml:lang="de">Python-3-Skript</comment>
- <comment xml:lang="en_GB">Python 3 script</comment>
+ <comment xml:lang="en-GB">Python 3 script</comment>
<comment xml:lang="es">secuencia de órdenes en Python 3</comment>
+ <comment xml:lang="eu">Python 3 script-a</comment>
<comment xml:lang="fi">Python 3 -skripti</comment>
+ <comment xml:lang="fr">script Python 3</comment>
+ <comment xml:lang="fur">script Python 3</comment>
+ <comment xml:lang="ga">script Python 3</comment>
<comment xml:lang="hr">Python3 skripta</comment>
<comment xml:lang="hu">Python 3 parancsfájl</comment>
<comment xml:lang="id">Skrip Python 3</comment>
@@ -35784,47 +37031,51 @@
<comment xml:lang="kk">Python 3 скрипті</comment>
<comment xml:lang="ko">파이썬 3 스크립트</comment>
<comment xml:lang="pl">Skrypt Python 3</comment>
- <comment xml:lang="pt_BR">Script Python 3</comment>
+ <comment xml:lang="pt-BR">Script Python 3</comment>
<comment xml:lang="ru">Сценарий Python 3</comment>
<comment xml:lang="sk">Skript Python 3</comment>
+ <comment xml:lang="sl">Skript Python 3</comment>
<comment xml:lang="sv">Python 3-skript</comment>
+ <comment xml:lang="tr">Python 3 betiği</comment>
<comment xml:lang="uk">скрипт мовою Python 3</comment>
- <comment xml:lang="zh_CN">Python 3 脚本</comment>
- <comment xml:lang="zh_TW">Python 3 指令稿</comment>
- <sub-class-of type='text/x-python'/>
- <magic priority="60">
- <match value="#!/bin/python3" type="string" offset="0"/>
- <match value="#! /bin/python3" type="string" offset="0"/>
- <match value='eval \"exec /bin/python3' type="string" offset="0"/>
- <match value="#!/usr/bin/python3" type="string" offset="0"/>
- <match value="#! /usr/bin/python3" type="string" offset="0"/>
- <match value='eval \"exec /usr/bin/python3' type="string" offset="0"/>
- <match value="#!/usr/local/bin/python3" type="string" offset="0"/>
- <match value="#! /usr/local/bin/python3" type="string" offset="0"/>
- <match value='eval \"exec /usr/local/bin/python3' type="string" offset="0"/>
- <match value='/bin/env python3' type="string" offset="2:16"/>
- </magic>
- <glob weight="50" pattern="*.py"/>
- <glob weight="60" pattern="*.py3"/>
- <glob weight="60" pattern="*.py3x"/>
+ <comment xml:lang="zh-CN">Python 3 脚本</comment>
+ <comment xml:lang="zh-TW">Python 3 指令稿</comment>
+ <sub-class-of type="text/x-python"/>
+ <magic priority="60"><!-- higher priority than text/x-python -->
+ <match type="string" value="#!/bin/python3" offset="0"/>
+ <match type="string" value="#! /bin/python3" offset="0"/>
+ <match type="string" value="eval \&quot;exec /bin/python3" offset="0"/>
+ <match type="string" value="#!/usr/bin/python3" offset="0"/>
+ <match type="string" value="#! /usr/bin/python3" offset="0"/>
+ <match type="string" value="eval \&quot;exec /usr/bin/python3" offset="0"/>
+ <match type="string" value="#!/usr/local/bin/python3" offset="0"/>
+ <match type="string" value="#! /usr/local/bin/python3" offset="0"/>
+ <match type="string" value="eval \&quot;exec /usr/local/bin/python3" offset="0"/>
+ <match type="string" value="/bin/env python3" offset="2:16"/>
+ </magic>
+ <glob pattern="*.py" weight="50"/><!-- lower priority than in text/x-python -->
+ <glob pattern="*.py3" weight="60"/>
+ <glob pattern="*.py3x" weight="60"/>
</mime-type>
<mime-type type="text/x-python">
<comment>Python script</comment>
+ <comment xml:lang="af">Python-skrip</comment>
<comment xml:lang="ar">سكربت بايثون</comment>
- <comment xml:lang="be@latin">Skrypt Python</comment>
+ <comment xml:lang="be-Latn">Skrypt Python</comment>
<comment xml:lang="bg">Скрипт — Python</comment>
<comment xml:lang="ca">script Python</comment>
<comment xml:lang="cs">skript v jazyce Python</comment>
- <comment xml:lang="da">Pythonprogram</comment>
+ <comment xml:lang="da">Python-program</comment>
<comment xml:lang="de">Python-Skript</comment>
<comment xml:lang="el">Δέσμη ενεργειών Python</comment>
- <comment xml:lang="en_GB">Python script</comment>
+ <comment xml:lang="en-GB">Python script</comment>
<comment xml:lang="eo">Python-skripto</comment>
<comment xml:lang="es">secuencia de órdenes en Python</comment>
<comment xml:lang="eu">Python script-a</comment>
<comment xml:lang="fi">Python-komentotiedosto</comment>
<comment xml:lang="fo">Python boðrøð</comment>
<comment xml:lang="fr">script Python</comment>
+ <comment xml:lang="fur">script Python</comment>
<comment xml:lang="ga">script Python</comment>
<comment xml:lang="gl">Script en Python</comment>
<comment xml:lang="he">תסריט Python</comment>
@@ -35845,7 +37096,7 @@
<comment xml:lang="oc">escript Python</comment>
<comment xml:lang="pl">Skrypt Python</comment>
<comment xml:lang="pt">script Python</comment>
- <comment xml:lang="pt_BR">Script Python</comment>
+ <comment xml:lang="pt-BR">Script Python</comment>
<comment xml:lang="ro">Script Python</comment>
<comment xml:lang="ru">Сценарий Python</comment>
<comment xml:lang="sk">Skript Python</comment>
@@ -35856,43 +37107,56 @@
<comment xml:lang="tr">Python betiği</comment>
<comment xml:lang="uk">скрипт мовою Python</comment>
<comment xml:lang="vi">Văn lệnh Python</comment>
- <comment xml:lang="zh_CN">Python 脚本</comment>
- <comment xml:lang="zh_TW">Python 指令稿</comment>
- <sub-class-of type='application/x-executable'/>
+ <comment xml:lang="zh-CN">Python 脚本</comment>
+ <comment xml:lang="zh-TW">Python 指令稿</comment>
+ <sub-class-of type="application/x-executable"/>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="#!/bin/python" type="string" offset="0"/>
- <match value="#! /bin/python" type="string" offset="0"/>
- <match value='eval \"exec /bin/python' type="string" offset="0"/>
- <match value="#!/usr/bin/python" type="string" offset="0"/>
- <match value="#! /usr/bin/python" type="string" offset="0"/>
- <match value='eval \"exec /usr/bin/python' type="string" offset="0"/>
- <match value="#!/usr/local/bin/python" type="string" offset="0"/>
- <match value="#! /usr/local/bin/python" type="string" offset="0"/>
- <match value='eval \"exec /usr/local/bin/python' type="string" offset="0"/>
- <match value='/bin/env python' type="string" offset="2:16"/>
- </magic>
- <glob weight="60" pattern="*.py"/>
- <glob weight="60" pattern="*.pyx"/>
- <glob weight="60" pattern="*.wsgi"/>
+ <match type="string" value="#!/bin/python" offset="0"/>
+ <match type="string" value="#! /bin/python" offset="0"/>
+ <match type="string" value="eval \&quot;exec /bin/python" offset="0"/>
+ <match type="string" value="#!/usr/bin/python" offset="0"/>
+ <match type="string" value="#! /usr/bin/python" offset="0"/>
+ <match type="string" value="eval \&quot;exec /usr/bin/python" offset="0"/>
+ <match type="string" value="#!/usr/local/bin/python" offset="0"/>
+ <match type="string" value="#! /usr/local/bin/python" offset="0"/>
+ <match type="string" value="eval \&quot;exec /usr/local/bin/python" offset="0"/>
+ <match type="string" value="/bin/env python" offset="2:16"/>
+ </magic>
+ <glob pattern="*.py" weight="60"/>
+ <glob pattern="*.pyx" weight="60"/>
+ <glob pattern="*.wsgi" weight="60"/>
+ </mime-type>
+ <mime-type type="text/x-sagemath">
+ <comment>SageMath script</comment>
+ <comment xml:lang="ca">script SageMath</comment>
+ <comment xml:lang="fi">SageMath skripti</comment>
+ <comment xml:lang="it">Script SageMath</comment>
+ <comment xml:lang="pl">Skrypt SageMath</comment>
+ <comment xml:lang="pt-BR">Script SageMath</comment>
+ <comment xml:lang="uk">скрипт SageMath</comment>
+ <sub-class-of type="text/x-python"/>
+ <glob pattern="*.sage" weight="60"/>
</mime-type>
<mime-type type="text/x-lua">
<comment>Lua script</comment>
+ <comment xml:lang="af">Lua-skrip</comment>
<comment xml:lang="ar">سكربت Lua</comment>
- <comment xml:lang="be@latin">Skrypt Lua</comment>
+ <comment xml:lang="be-Latn">Skrypt Lua</comment>
<comment xml:lang="bg">Скрипт на Lua</comment>
<comment xml:lang="ca">script Lua</comment>
<comment xml:lang="cs">skript v jazyce Lua</comment>
- <comment xml:lang="da">Luaprogram</comment>
+ <comment xml:lang="da">Lua-program</comment>
<comment xml:lang="de">Lua-Skript</comment>
<comment xml:lang="el">Δέσμη ενεργειών Lua</comment>
- <comment xml:lang="en_GB">Lua script</comment>
+ <comment xml:lang="en-GB">Lua script</comment>
<comment xml:lang="eo">Lua-skripto</comment>
<comment xml:lang="es">secuencia de órdenes en Lua</comment>
<comment xml:lang="eu">Lua script-a</comment>
<comment xml:lang="fi">Lua-komentotiedosto</comment>
<comment xml:lang="fo">Lua boðrøð</comment>
<comment xml:lang="fr">script Lua</comment>
+ <comment xml:lang="fur">script Lua</comment>
<comment xml:lang="ga">script Lua</comment>
<comment xml:lang="gl">script de Lua</comment>
<comment xml:lang="he">תסריט Lua</comment>
@@ -35912,7 +37176,7 @@
<comment xml:lang="oc">escript Lua</comment>
<comment xml:lang="pl">Skrypt Lua</comment>
<comment xml:lang="pt">script Lua</comment>
- <comment xml:lang="pt_BR">Script Lua</comment>
+ <comment xml:lang="pt-BR">Script Lua</comment>
<comment xml:lang="ro">Script Lua</comment>
<comment xml:lang="ru">Сценарий Lua</comment>
<comment xml:lang="sk">Skript Lua</comment>
@@ -35923,24 +37187,25 @@
<comment xml:lang="tr">Lua betiği</comment>
<comment xml:lang="uk">скрипт Lua</comment>
<comment xml:lang="vi">Văn lệnh Lua</comment>
- <comment xml:lang="zh_CN">Lua 脚本</comment>
- <comment xml:lang="zh_TW">Lua 指令稿</comment>
- <sub-class-of type='application/x-executable'/>
+ <comment xml:lang="zh-CN">Lua 脚本</comment>
+ <comment xml:lang="zh-TW">Lua 指令稿</comment>
+ <sub-class-of type="application/x-executable"/>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="/bin/lua" type="string" offset="2:16"/>
- <match value="/bin/luajit" type="string" offset="2:16"/>
- <match value="/bin/env lua" type="string" offset="2:16"/>
- <match value="/bin/env luajit" type="string" offset="2:16"/>
+ <match type="string" value="/bin/lua" offset="2:16"/>
+ <match type="string" value="/bin/luajit" offset="2:16"/>
+ <match type="string" value="/bin/env lua" offset="2:16"/>
+ <match type="string" value="/bin/env luajit" offset="2:16"/>
</magic>
<glob pattern="*.lua"/>
</mime-type>
<mime-type type="text/x-readme">
<comment>README document</comment>
+ <comment xml:lang="af">README-dokument</comment>
<comment xml:lang="ar">مستند README</comment>
<comment xml:lang="ast">Documentu LLEIME</comment>
<comment xml:lang="az">README sənədi</comment>
- <comment xml:lang="be@latin">Dakument README</comment>
+ <comment xml:lang="be-Latn">Dakument README</comment>
<comment xml:lang="bg">Документ — „Да се прочете“</comment>
<comment xml:lang="ca">document README</comment>
<comment xml:lang="cs">dokument README</comment>
@@ -35948,13 +37213,14 @@
<comment xml:lang="da">README-dokument</comment>
<comment xml:lang="de">README-Dokument</comment>
<comment xml:lang="el">Έγγραφο README</comment>
- <comment xml:lang="en_GB">README document</comment>
+ <comment xml:lang="en-GB">README document</comment>
<comment xml:lang="eo">README-dokumento</comment>
<comment xml:lang="es">documento README</comment>
<comment xml:lang="eu">README dokumentua</comment>
<comment xml:lang="fi">LUEMINUT-asiakirja</comment>
<comment xml:lang="fo">README skjal</comment>
<comment xml:lang="fr">document LISEZ-MOI</comment>
+ <comment xml:lang="fur">document README</comment>
<comment xml:lang="ga">cáipéis README</comment>
<comment xml:lang="gl">documento README</comment>
<comment xml:lang="he">מסמך README</comment>
@@ -35975,7 +37241,7 @@
<comment xml:lang="oc">document LISEZ-MOI</comment>
<comment xml:lang="pl">Dokument README</comment>
<comment xml:lang="pt">documento LEIA-ME</comment>
- <comment xml:lang="pt_BR">Documento README</comment>
+ <comment xml:lang="pt-BR">Documento README</comment>
<comment xml:lang="ro">Document README</comment>
<comment xml:lang="ru">Документ README</comment>
<comment xml:lang="sk">Dokument README</comment>
@@ -35983,32 +37249,34 @@
<comment xml:lang="sq">Dokument README</comment>
<comment xml:lang="sr">документ ПРОЧИТАЈМЕ</comment>
<comment xml:lang="sv">README-dokument</comment>
- <comment xml:lang="tr">BENİOKU belgesi</comment>
+ <comment xml:lang="tr">README belgesi</comment>
<comment xml:lang="uk">документ README</comment>
<comment xml:lang="vi">Tài liệu Đọc Đi (README)</comment>
- <comment xml:lang="zh_CN">README 文档</comment>
- <comment xml:lang="zh_TW">README 說明文件</comment>
+ <comment xml:lang="zh-CN">README 文档</comment>
+ <comment xml:lang="zh-TW">README 說明文件</comment>
<sub-class-of type="text/plain"/>
<glob weight="10" pattern="README*"/>
</mime-type>
<mime-type type="text/x-nfo">
<comment>NFO document</comment>
+ <comment xml:lang="af">NFO-dokument</comment>
<comment xml:lang="ar">مستند NFO</comment>
<comment xml:lang="ast">Documentu NFO</comment>
- <comment xml:lang="be@latin">Dakument NFO</comment>
+ <comment xml:lang="be-Latn">Dakument NFO</comment>
<comment xml:lang="bg">Документ — NFO</comment>
<comment xml:lang="ca">document NFO</comment>
<comment xml:lang="cs">dokument NFO</comment>
<comment xml:lang="da">NFO-dokument</comment>
<comment xml:lang="de">NFO-Dokument</comment>
<comment xml:lang="el">Έγγραφο NFO</comment>
- <comment xml:lang="en_GB">NFO document</comment>
+ <comment xml:lang="en-GB">NFO document</comment>
<comment xml:lang="eo">NFO-dokumento</comment>
<comment xml:lang="es">documento NFO</comment>
<comment xml:lang="eu">NFO dokumentua</comment>
<comment xml:lang="fi">NFO-asiakirja</comment>
<comment xml:lang="fo">NFO skjal</comment>
<comment xml:lang="fr">document NFO</comment>
+ <comment xml:lang="fur">document NFO</comment>
<comment xml:lang="ga">cáipéis NFO</comment>
<comment xml:lang="gl">documento NFO</comment>
<comment xml:lang="he">מסמך NFO</comment>
@@ -36028,7 +37296,7 @@
<comment xml:lang="oc">document NFO</comment>
<comment xml:lang="pl">Dokument NFO</comment>
<comment xml:lang="pt">documento NFO</comment>
- <comment xml:lang="pt_BR">Documento NFO</comment>
+ <comment xml:lang="pt-BR">Documento NFO</comment>
<comment xml:lang="ro">Document NFO</comment>
<comment xml:lang="ru">Документ NFO</comment>
<comment xml:lang="sk">Dokument NFO</comment>
@@ -36039,27 +37307,29 @@
<comment xml:lang="tr">NFO belgesi</comment>
<comment xml:lang="uk">документ NFO</comment>
<comment xml:lang="vi">Tài liệu NFO</comment>
- <comment xml:lang="zh_CN">NFO 文档</comment>
- <comment xml:lang="zh_TW">NFO 文件</comment>
+ <comment xml:lang="zh-CN">NFO 文档</comment>
+ <comment xml:lang="zh-TW">NFO 文件</comment>
<sub-class-of type="text/x-readme"/>
<glob pattern="*.nfo"/>
</mime-type>
<mime-type type="text/x-rpm-spec">
<comment>RPM spec file</comment>
+ <comment xml:lang="af">RPM-spesifikasielêer</comment>
<comment xml:lang="ar">ملف مواصفات RPM</comment>
- <comment xml:lang="be@latin">Specyfikacyjny fajł RPM</comment>
+ <comment xml:lang="be-Latn">Specyfikacyjny fajł RPM</comment>
<comment xml:lang="bg">Файл — спецификация за RPM</comment>
<comment xml:lang="ca">fitxer spec RPM</comment>
<comment xml:lang="cs">soubor specifikace RPM</comment>
<comment xml:lang="da">RPM spec-fil</comment>
<comment xml:lang="de">RPM-Spezifikationsdatei</comment>
<comment xml:lang="el">Αρχείο spec RPM</comment>
- <comment xml:lang="en_GB">RPM spec file</comment>
+ <comment xml:lang="en-GB">RPM spec file</comment>
<comment xml:lang="es">archivo de especificaciones RPM</comment>
<comment xml:lang="eu">RPM espezifikazio fitxategia</comment>
<comment xml:lang="fi">RPM spec -tiedosto</comment>
<comment xml:lang="fo">RPM tøknilýsingarfíla</comment>
<comment xml:lang="fr">fichier de spécification RPM</comment>
+ <comment xml:lang="fur">file di specifiche RPM</comment>
<comment xml:lang="ga">comhad spec RPM</comment>
<comment xml:lang="gl">ficheiro de especificacións RPM</comment>
<comment xml:lang="he">קובץ מפרט RPM</comment>
@@ -36079,7 +37349,7 @@
<comment xml:lang="oc">fichièr d'especificacion RPM</comment>
<comment xml:lang="pl">Plik spec RPM</comment>
<comment xml:lang="pt">ficheiro de especificações RPM</comment>
- <comment xml:lang="pt_BR">Arquivo de especificação RPM</comment>
+ <comment xml:lang="pt-BR">Arquivo de especificação RPM</comment>
<comment xml:lang="ro">Fișier RPM spec</comment>
<comment xml:lang="ru">Файл описания RPM</comment>
<comment xml:lang="sk">Súbor RPM spec</comment>
@@ -36090,61 +37360,70 @@
<comment xml:lang="tr">RPM spec dosyası</comment>
<comment xml:lang="uk">spec-файл RPM</comment>
<comment xml:lang="vi">Tập tin đặc tả RPM</comment>
- <comment xml:lang="zh_CN">RPM spec 文件</comment>
- <comment xml:lang="zh_TW">RPM spec 規格檔</comment>
+ <comment xml:lang="zh-CN">RPM spec 文件</comment>
+ <comment xml:lang="zh-TW">RPM spec 規格檔</comment>
<acronym>RPM</acronym>
<expanded-acronym>Red Hat Package Manager</expanded-acronym>
<sub-class-of type="text/plain"/>
<glob pattern="*.spec"/>
<magic priority="50">
- <match value="Summary: " type="string" offset="0"/>
- <match value="%define " type="string" offset="0"/>
+ <match type="string" value="Summary: " offset="0"/>
+ <match type="string" value="%define " offset="0"/>
</magic>
</mime-type>
<mime-type type="text/x-sass">
<comment>Sass CSS pre-processor file</comment>
+ <comment xml:lang="af">Sass CSS-voorverwerkerlêer</comment>
+ <comment xml:lang="bg">Директиви за препроцесора — Sass CSS</comment>
<comment xml:lang="ca">fitxer preprocessador CSS Sass</comment>
<comment xml:lang="cs">soubor preprocesoru Sass CSS</comment>
- <comment xml:lang="da">Sass CSS-forbrænderfil</comment>
+ <comment xml:lang="da">Sass CSS pre-processor-fil</comment>
<comment xml:lang="de">Sass-CSS-Präprozessordatei</comment>
- <comment xml:lang="en_GB">Sass CSS pre-processor file</comment>
+ <comment xml:lang="en-GB">Sass CSS pre-processor file</comment>
<comment xml:lang="es">archivo de preprocesador de CSS Sass</comment>
+ <comment xml:lang="eu">Sass CSS fitxategi prozesatu gabea</comment>
+ <comment xml:lang="fi">Sass CSS pre-processor -tiedosto</comment>
<comment xml:lang="fr">fichier de prétraitement CSS Sass</comment>
+ <comment xml:lang="fur">file di pre-elaborazion di CSS Sass</comment>
<comment xml:lang="ga">comhad réamhphróiseálaí CSS Sass</comment>
<comment xml:lang="he">קובץ קדם עיבוד Sass CSS</comment>
<comment xml:lang="hr">Sass CSS datoteka predobrade</comment>
<comment xml:lang="hu">Sass CSS előfeldolgozó fájl</comment>
- <comment xml:lang="id">berkas pre-processor Sass CSS</comment>
+ <comment xml:lang="id">Berkas pre-processor Sass CSS</comment>
<comment xml:lang="it">File CSS Sass</comment>
<comment xml:lang="kk">Sass CSS препроцессор файлы</comment>
<comment xml:lang="ko">Sass CSS 전처리기 파일</comment>
<comment xml:lang="pl">Plik preprocesora CSS Sass</comment>
- <comment xml:lang="pt_BR">Arquivo de pré-processamento Sass CSS</comment>
+ <comment xml:lang="pt-BR">Arquivo de pré-processamento Sass CSS</comment>
<comment xml:lang="ru">Файл препроцессора Sass CSS</comment>
<comment xml:lang="sk">Súbor Sass CSS pre-procesora</comment>
<comment xml:lang="sr">датотека Сас ЦСС пре-процесора</comment>
<comment xml:lang="sv">Sass CSS-preprocessorfil</comment>
<comment xml:lang="tr">Sass CSS önişlemci dosyası</comment>
<comment xml:lang="uk">файл препроцесора CSS Sass</comment>
- <comment xml:lang="zh_CN">Sass CSS 预处理器文件</comment>
- <comment xml:lang="zh_TW">Sass CSS 處理器前檔案</comment>
+ <comment xml:lang="zh-CN">Sass CSS 预处理器文件</comment>
+ <comment xml:lang="zh-TW">Sass CSS 處理器前檔案</comment>
+ <acronym>Sass</acronym>
+ <expanded-acronym>Syntactically Awesome Style Sheets</expanded-acronym>
<sub-class-of type="text/plain"/>
<glob pattern="*.sass"/>
<generic-icon name="text-x-generic"/>
</mime-type>
<mime-type type="text/x-scala">
<comment>Scala source code</comment>
+ <comment xml:lang="af">Scala-bronkode</comment>
<comment xml:lang="bg">Изходен код — Scala</comment>
<comment xml:lang="ca">codi font en Scala</comment>
<comment xml:lang="cs">zdrojový kód Scala</comment>
<comment xml:lang="da">Scala-kildekode</comment>
<comment xml:lang="de">Scala-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Scala</comment>
- <comment xml:lang="en_GB">Scala source code</comment>
+ <comment xml:lang="en-GB">Scala source code</comment>
<comment xml:lang="es">código fuente en Scala</comment>
<comment xml:lang="eu">Scala iturburu-kodea</comment>
<comment xml:lang="fi">Scala-lähdekoodi</comment>
<comment xml:lang="fr">code source Scala</comment>
+ <comment xml:lang="fur">codiç sorzint Scala</comment>
<comment xml:lang="ga">cód foinseach Scala</comment>
<comment xml:lang="gl">código fnote en Scala</comment>
<comment xml:lang="he">קוד מקור של Scala</comment>
@@ -36162,7 +37441,7 @@
<comment xml:lang="oc">còde font Scala</comment>
<comment xml:lang="pl">Kod źródłowy Scala</comment>
<comment xml:lang="pt">código origem Scala</comment>
- <comment xml:lang="pt_BR">Código-fonte Scala</comment>
+ <comment xml:lang="pt-BR">Código-fonte Scala</comment>
<comment xml:lang="ru">Исходный код Scala</comment>
<comment xml:lang="sk">Zdrojový kód Scala</comment>
<comment xml:lang="sl">Izvorna koda Scala</comment>
@@ -36170,30 +37449,32 @@
<comment xml:lang="sv">Scala-källkod</comment>
<comment xml:lang="tr">Scala kaynak kodu</comment>
<comment xml:lang="uk">вихідний код мовою Scala</comment>
- <comment xml:lang="zh_CN">Scala 源代码</comment>
- <comment xml:lang="zh_TW">Scala 源碼</comment>
+ <comment xml:lang="zh-CN">Scala 源代码</comment>
+ <comment xml:lang="zh-TW">Scala 源碼</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.scala"/>
</mime-type>
<mime-type type="text/x-scheme">
<comment>Scheme source code</comment>
+ <comment xml:lang="af">Scheme-bronkode</comment>
<comment xml:lang="ar">شفرة مصدر Scheme</comment>
<comment xml:lang="az">Sxem mənbə kodu</comment>
- <comment xml:lang="be@latin">Kryničny kod Scheme</comment>
+ <comment xml:lang="be-Latn">Kryničny kod Scheme</comment>
<comment xml:lang="bg">Изходен код — Scheme</comment>
<comment xml:lang="ca">codi font en Scheme</comment>
<comment xml:lang="cs">zdrojový kód Scheme</comment>
<comment xml:lang="cy">Ffynhonnell Rhaglen Scheme</comment>
- <comment xml:lang="da">Schemekildekode</comment>
+ <comment xml:lang="da">Scheme-kildekode</comment>
<comment xml:lang="de">Scheme-Quelltext</comment>
<comment xml:lang="el">Πηγαίος κώδικας Scheme</comment>
- <comment xml:lang="en_GB">Scheme source code</comment>
+ <comment xml:lang="en-GB">Scheme source code</comment>
<comment xml:lang="eo">Scheme-fontkodo</comment>
<comment xml:lang="es">código fuente en Scheme</comment>
<comment xml:lang="eu">Scheme iturburu-kodea</comment>
<comment xml:lang="fi">Scheme-lähdekoodi</comment>
<comment xml:lang="fo">Scheme keldukota</comment>
<comment xml:lang="fr">code source Scheme</comment>
+ <comment xml:lang="fur">codiç sorzint Scheme</comment>
<comment xml:lang="ga">cód foinseach Scheme</comment>
<comment xml:lang="gl">código fonte en Scheme</comment>
<comment xml:lang="he">קוד מקור של Scheme</comment>
@@ -36214,7 +37495,7 @@
<comment xml:lang="oc">còde font Scheme</comment>
<comment xml:lang="pl">Kod źródłowy Scheme</comment>
<comment xml:lang="pt">código origem Scheme</comment>
- <comment xml:lang="pt_BR">Código-fonte Scheme</comment>
+ <comment xml:lang="pt-BR">Código-fonte Scheme</comment>
<comment xml:lang="ro">Cod sursă Scheme</comment>
<comment xml:lang="ru">Исходный код Scheme</comment>
<comment xml:lang="sk">Zdrojový kód Scheme</comment>
@@ -36225,49 +37506,50 @@
<comment xml:lang="tr">Scheme kaynak kodu</comment>
<comment xml:lang="uk">вихідний файл мовою Scheme</comment>
<comment xml:lang="vi">Mã nguồn Scheme</comment>
- <comment xml:lang="zh_CN">Scheme 源代码</comment>
- <comment xml:lang="zh_TW">Scheme 源碼</comment>
+ <comment xml:lang="zh-CN">Scheme 源代码</comment>
+ <comment xml:lang="zh-TW">Scheme 源碼</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.scm"/>
<glob pattern="*.ss"/>
</mime-type>
<mime-type type="text/x-scss">
- <comment>Sass CSS pre-processor file</comment>
- <comment xml:lang="ca">fitxer preprocessador CSS Sass</comment>
- <comment xml:lang="cs">soubor preprocesoru Sass CSS</comment>
- <comment xml:lang="da">Sass CSS-forbrænderfil</comment>
- <comment xml:lang="de">Sass-CSS-Präprozessordatei</comment>
- <comment xml:lang="en_GB">Sass CSS pre-processor file</comment>
- <comment xml:lang="es">archivo de preprocesador de CSS Sass</comment>
- <comment xml:lang="fr">fichier de prétraitement CSS Sass</comment>
- <comment xml:lang="ga">comhad réamhphróiseálaí CSS Sass</comment>
- <comment xml:lang="he">קובץ קדם עיבוד Sass CSS</comment>
- <comment xml:lang="hr">Sass CSS datoteka predobrade</comment>
- <comment xml:lang="hu">Sass CSS előfeldolgozó fájl</comment>
- <comment xml:lang="id">berkas pre-processor Sass CSS</comment>
- <comment xml:lang="it">File CSS Sass</comment>
- <comment xml:lang="kk">Sass CSS препроцессор файлы</comment>
- <comment xml:lang="ko">Sass CSS 전처리기 파일</comment>
- <comment xml:lang="pl">Plik preprocesora CSS Sass</comment>
- <comment xml:lang="pt_BR">Arquivo de pré-processamento Sass CSS</comment>
- <comment xml:lang="ru">Файл препроцессора Sass CSS</comment>
- <comment xml:lang="sk">Súbor Sass CSS pre-procesora</comment>
- <comment xml:lang="sr">датотека Сас ЦСС пре-процесора</comment>
- <comment xml:lang="sv">Sass CSS-preprocessorfil</comment>
- <comment xml:lang="tr">Sass CSS önişlemci dosyası</comment>
- <comment xml:lang="uk">файл препроцесора CSS Sass</comment>
- <comment xml:lang="zh_CN">Sass CSS 预处理器文件</comment>
- <comment xml:lang="zh_TW">Sass CSS 處理器前檔案</comment>
+ <comment>SCSS pre-processor file</comment>
+ <comment xml:lang="bg">Директиви за препроцесора — SCSS</comment>
+ <comment xml:lang="ca">fitxer preprocessador SCSS</comment>
+ <comment xml:lang="da">SCSS pre-processor-fil</comment>
+ <comment xml:lang="de">SCSS-Präprozessordatei</comment>
+ <comment xml:lang="en-GB">SCSS pre-processor file</comment>
+ <comment xml:lang="es">archivo de preprocesador SCSS</comment>
+ <comment xml:lang="eu">SCSS fitxategi prozesatu gabea</comment>
+ <comment xml:lang="fi">SCSS pre-processor -tiedosto</comment>
+ <comment xml:lang="fr">fichier de prétraitement SCSS</comment>
+ <comment xml:lang="hr">SCSS datoteka predobrade</comment>
+ <comment xml:lang="hu">SCSS előfeldolgozófájl</comment>
+ <comment xml:lang="id">Berkas preprosesor SCSS</comment>
+ <comment xml:lang="it">File SCSS</comment>
+ <comment xml:lang="kk">SCSS препроцессор файлы</comment>
+ <comment xml:lang="ko">SCSS 전처리 파일</comment>
+ <comment xml:lang="pl">Plik preprocesora SCSS</comment>
+ <comment xml:lang="pt-BR">Arquivo de pré-processamento SCSS</comment>
+ <comment xml:lang="ru">Файл препроцессора SCSS</comment>
+ <comment xml:lang="sv">SCSS förprocessorfil</comment>
+ <comment xml:lang="tr">SCSS ön işleyici dosyası</comment>
+ <comment xml:lang="uk">файл засобу попередньої обробки SCSS</comment>
+ <comment xml:lang="zh-CN">SCSS 预处理文件</comment>
+ <comment xml:lang="zh-TW">SCSS 前處理器檔</comment>
+ <acronym>SCSS</acronym>
+ <expanded-acronym>Sassy CSS</expanded-acronym>
<sub-class-of type="text/plain"/>
<glob pattern="*.scss"/>
<generic-icon name="text-x-generic"/>
</mime-type>
<mime-type type="text/x-setext">
<comment>Setext document</comment>
+ <comment xml:lang="af">Setext-dokument</comment>
<comment xml:lang="ar">مستند Setext</comment>
<comment xml:lang="ast">Documentu Setext</comment>
<comment xml:lang="az">Setext sənədi</comment>
- <comment xml:lang="be@latin">Dakument Setext</comment>
+ <comment xml:lang="be-Latn">Dakument Setext</comment>
<comment xml:lang="bg">Документ — Setext</comment>
<comment xml:lang="ca">document Setext</comment>
<comment xml:lang="cs">dokument Setext</comment>
@@ -36275,13 +37557,14 @@
<comment xml:lang="da">Setextdokument</comment>
<comment xml:lang="de">Setext-Dokument</comment>
<comment xml:lang="el">Έγγραφο Setext</comment>
- <comment xml:lang="en_GB">Setext document</comment>
+ <comment xml:lang="en-GB">Setext document</comment>
<comment xml:lang="eo">Setext-dokumento</comment>
<comment xml:lang="es">documento Setext</comment>
<comment xml:lang="eu">Setext dokumentua</comment>
<comment xml:lang="fi">Setext-asiakirja</comment>
<comment xml:lang="fo">Setext skjal</comment>
<comment xml:lang="fr">document Setext</comment>
+ <comment xml:lang="fur">document Setext</comment>
<comment xml:lang="ga">cáipéis Setext</comment>
<comment xml:lang="gl">documento Settext</comment>
<comment xml:lang="he">מסמך של Setext</comment>
@@ -36302,7 +37585,7 @@
<comment xml:lang="oc">document Setext</comment>
<comment xml:lang="pl">Dokument Setext</comment>
<comment xml:lang="pt">documento Setext</comment>
- <comment xml:lang="pt_BR">Documento Setext</comment>
+ <comment xml:lang="pt-BR">Documento Setext</comment>
<comment xml:lang="ro">Document Setext</comment>
<comment xml:lang="ru">Документ Setext</comment>
<comment xml:lang="sk">Dokument Setext</comment>
@@ -36313,16 +37596,17 @@
<comment xml:lang="tr">Setext belgesi</comment>
<comment xml:lang="uk">документ Setext</comment>
<comment xml:lang="vi">Tài liệu Setext</comment>
- <comment xml:lang="zh_CN">Setext 文档</comment>
- <comment xml:lang="zh_TW">Setext 文件</comment>
+ <comment xml:lang="zh-CN">Setext 文档</comment>
+ <comment xml:lang="zh-TW">Setext 文件</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.etx"/>
</mime-type>
<mime-type type="application/sql">
<comment>SQL code</comment>
+ <comment xml:lang="af">SQL-kode</comment>
<comment xml:lang="ar">شفرة SQL</comment>
<comment xml:lang="az">SQL kodu</comment>
- <comment xml:lang="be@latin">Kod SQL</comment>
+ <comment xml:lang="be-Latn">Kod SQL</comment>
<comment xml:lang="bg">Код — SQL</comment>
<comment xml:lang="ca">codi en SQL</comment>
<comment xml:lang="cs">kód SQL</comment>
@@ -36330,13 +37614,14 @@
<comment xml:lang="da">SQL-kode</comment>
<comment xml:lang="de">SQL-Befehle</comment>
<comment xml:lang="el">Κώδικας SQL</comment>
- <comment xml:lang="en_GB">SQL code</comment>
+ <comment xml:lang="en-GB">SQL code</comment>
<comment xml:lang="eo">SQL-kodo</comment>
<comment xml:lang="es">código SQL</comment>
<comment xml:lang="eu">SQL kodea</comment>
<comment xml:lang="fi">SQL-koodi</comment>
<comment xml:lang="fo">SQL kota</comment>
<comment xml:lang="fr">code SQL</comment>
+ <comment xml:lang="fur">codiç SQL</comment>
<comment xml:lang="ga">cód SQL</comment>
<comment xml:lang="gl">código SQL</comment>
<comment xml:lang="he">קוד SQL</comment>
@@ -36357,7 +37642,7 @@
<comment xml:lang="oc">còde SQL</comment>
<comment xml:lang="pl">Kod SQL</comment>
<comment xml:lang="pt">código SQL</comment>
- <comment xml:lang="pt_BR">Código SQL</comment>
+ <comment xml:lang="pt-BR">Código SQL</comment>
<comment xml:lang="ro">Cod SQL</comment>
<comment xml:lang="ru">Код SQL</comment>
<comment xml:lang="sk">Kód SQL</comment>
@@ -36368,29 +37653,31 @@
<comment xml:lang="tr">SQL kodu</comment>
<comment xml:lang="uk">код SQL</comment>
<comment xml:lang="vi">Mã SQL</comment>
- <comment xml:lang="zh_CN">SQL 代码</comment>
- <comment xml:lang="zh_TW">SQL 程式碼</comment>
+ <comment xml:lang="zh-CN">SQL 代码</comment>
+ <comment xml:lang="zh-TW">SQL 程式碼</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.sql"/>
<alias type="text/x-sql"/>
</mime-type>
- <mime-type type="text/x-tcl">
+ <mime-type type="text/tcl">
<comment>Tcl script</comment>
+ <comment xml:lang="af">Tcl-skrip</comment>
<comment xml:lang="ar">سكربت Tcl</comment>
- <comment xml:lang="be@latin">Skrypt Tcl</comment>
+ <comment xml:lang="be-Latn">Skrypt Tcl</comment>
<comment xml:lang="bg">Скрипт — Tcl</comment>
<comment xml:lang="ca">script Tcl</comment>
<comment xml:lang="cs">skript Tcl</comment>
<comment xml:lang="da">Tcl-program</comment>
<comment xml:lang="de">Tcl-Skript</comment>
<comment xml:lang="el">Δέσμη ενεργειών Tcl</comment>
- <comment xml:lang="en_GB">Tcl script</comment>
+ <comment xml:lang="en-GB">Tcl script</comment>
<comment xml:lang="eo">Tcl-skripto</comment>
<comment xml:lang="es">secuencia de órdenes en Tcl</comment>
<comment xml:lang="eu">Tcl script-a</comment>
<comment xml:lang="fi">Tcl-komentotiedosto</comment>
<comment xml:lang="fo">Tcl boðrøð</comment>
<comment xml:lang="fr">script Tcl</comment>
+ <comment xml:lang="fur">script Tcl</comment>
<comment xml:lang="ga">script Tcl</comment>
<comment xml:lang="gl">Script en Tcl</comment>
<comment xml:lang="he">תסריט Tcl</comment>
@@ -36411,7 +37698,7 @@
<comment xml:lang="oc">escript Tcl</comment>
<comment xml:lang="pl">Skrypt Tcl</comment>
<comment xml:lang="pt">script Tcl</comment>
- <comment xml:lang="pt_BR">Script Tcl</comment>
+ <comment xml:lang="pt-BR">Script Tcl</comment>
<comment xml:lang="ro">Script Tcl</comment>
<comment xml:lang="ru">Сценарий Tcl</comment>
<comment xml:lang="sk">Skript Tcl</comment>
@@ -36422,17 +37709,19 @@
<comment xml:lang="tr">Tcl betiği</comment>
<comment xml:lang="uk">скрипт Tcl</comment>
<comment xml:lang="vi">Văn lệnh Tcl</comment>
- <comment xml:lang="zh_CN">Tcl 脚本</comment>
- <comment xml:lang="zh_TW">Tcl 描述語言檔</comment>
+ <comment xml:lang="zh-CN">Tcl 脚本</comment>
+ <comment xml:lang="zh-TW">Tcl 描述語言檔</comment>
+ <alias type="text/x-tcl"/>
<sub-class-of type="text/plain"/>
<glob pattern="*.tcl"/>
<glob pattern="*.tk"/>
</mime-type>
<mime-type type="text/x-tex">
<comment>TeX document</comment>
+ <comment xml:lang="af">TeX-dokument</comment>
<comment xml:lang="ar">مستند TeX</comment>
<comment xml:lang="ast">Documentu TeX</comment>
- <comment xml:lang="be@latin">Dakument TeX</comment>
+ <comment xml:lang="be-Latn">Dakument TeX</comment>
<comment xml:lang="bg">Документ — TeX</comment>
<comment xml:lang="ca">document TeX</comment>
<comment xml:lang="cs">dokument TeX</comment>
@@ -36440,13 +37729,14 @@
<comment xml:lang="da">TeX-dokument</comment>
<comment xml:lang="de">TeX-Dokument</comment>
<comment xml:lang="el">Έγγραφο TeX</comment>
- <comment xml:lang="en_GB">TeX document</comment>
+ <comment xml:lang="en-GB">TeX document</comment>
<comment xml:lang="eo">TeX-dokumento</comment>
<comment xml:lang="es">documento de TeX</comment>
<comment xml:lang="eu">TeX dokumentua</comment>
<comment xml:lang="fi">TeX-asiakirja</comment>
<comment xml:lang="fo">TeX skjal</comment>
<comment xml:lang="fr">document TeX</comment>
+ <comment xml:lang="fur">document TeX</comment>
<comment xml:lang="ga">cáipéis TeX</comment>
<comment xml:lang="gl">documenton TeX</comment>
<comment xml:lang="he">מסמך TeX</comment>
@@ -36467,7 +37757,7 @@
<comment xml:lang="oc">document TeX</comment>
<comment xml:lang="pl">Dokument TeX</comment>
<comment xml:lang="pt">documento TeX</comment>
- <comment xml:lang="pt_BR">Documento TeX</comment>
+ <comment xml:lang="pt-BR">Documento TeX</comment>
<comment xml:lang="ro">Document TeX</comment>
<comment xml:lang="ru">Документ TeX</comment>
<comment xml:lang="sk">Dokument TeX</comment>
@@ -36478,8 +37768,8 @@
<comment xml:lang="tr">TeX belgesi</comment>
<comment xml:lang="uk">документ TeX</comment>
<comment xml:lang="vi">Tài liệu TeX</comment>
- <comment xml:lang="zh_CN">TeX 文档</comment>
- <comment xml:lang="zh_TW">TeX 文件</comment>
+ <comment xml:lang="zh-CN">TeX 文档</comment>
+ <comment xml:lang="zh-TW">TeX 文件</comment>
<sub-class-of type="text/plain"/>
<alias type="application/x-tex"/>
<glob pattern="*.tex"/>
@@ -36490,18 +37780,19 @@
<glob pattern="*.ins"/>
<glob pattern="*.latex"/>
<magic priority="10">
- <match value="%" type="string" offset="0"/>
+ <match type="string" value="%" offset="0"/>
</magic>
<magic priority="50">
- <match value="documentclass" type="string" offset="1"/>
+ <match type="string" value="documentclass" offset="1"/>
</magic>
</mime-type>
<mime-type type="text/x-texinfo">
<comment>TeXInfo document</comment>
+ <comment xml:lang="af">TeXInfo-dokument</comment>
<comment xml:lang="ar">مستند TeXInfo</comment>
<comment xml:lang="ast">Documentu TeXInfo</comment>
<comment xml:lang="az">TeXInfo sənədi</comment>
- <comment xml:lang="be@latin">Dakument TeXInfo</comment>
+ <comment xml:lang="be-Latn">Dakument TeXInfo</comment>
<comment xml:lang="bg">Документ — TeXInfo</comment>
<comment xml:lang="ca">document TeXInfo</comment>
<comment xml:lang="cs">dokument TeXInfo</comment>
@@ -36509,13 +37800,14 @@
<comment xml:lang="da">TeXInfo-dokument</comment>
<comment xml:lang="de">TeXInfo-Dokument</comment>
<comment xml:lang="el">Έγγραφο TeXInfo</comment>
- <comment xml:lang="en_GB">TeXInfo document</comment>
+ <comment xml:lang="en-GB">TeXInfo document</comment>
<comment xml:lang="eo">TeXInfo-dokumento</comment>
<comment xml:lang="es">documento de TeXInfo</comment>
<comment xml:lang="eu">TeXInfo dokumentua</comment>
<comment xml:lang="fi">TeXInfo-asiakirja</comment>
<comment xml:lang="fo">TeXInfo skjal</comment>
<comment xml:lang="fr">document TeXInfo</comment>
+ <comment xml:lang="fur">document TeXInfo</comment>
<comment xml:lang="ga">cáipéis TeXInfo</comment>
<comment xml:lang="gl">documento TeXInfo</comment>
<comment xml:lang="he">מסמך של TeXInfo</comment>
@@ -36536,7 +37828,7 @@
<comment xml:lang="oc">document TeXInfo</comment>
<comment xml:lang="pl">Dokument TeXInfo</comment>
<comment xml:lang="pt">documento TeXInfo</comment>
- <comment xml:lang="pt_BR">Documento TeXInfo</comment>
+ <comment xml:lang="pt-BR">Documento TeXInfo</comment>
<comment xml:lang="ro">Document TexInfo</comment>
<comment xml:lang="ru">Документ TeXInfo</comment>
<comment xml:lang="sk">Dokument TeXInfo</comment>
@@ -36547,30 +37839,32 @@
<comment xml:lang="tr">TeXInfo belgesi</comment>
<comment xml:lang="uk">документ TeXInfo</comment>
<comment xml:lang="vi">Tài liệu TeXInfo</comment>
- <comment xml:lang="zh_CN">TeXInfo 文档</comment>
- <comment xml:lang="zh_TW">TeXInfo 文件</comment>
+ <comment xml:lang="zh-CN">TeXInfo 文档</comment>
+ <comment xml:lang="zh-TW">TeXInfo 文件</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.texi"/>
<glob pattern="*.texinfo"/>
</mime-type>
<mime-type type="text/x-troff-me">
<comment>Troff ME input document</comment>
+ <comment xml:lang="af">Troff ME-toevoerdokument</comment>
<comment xml:lang="ar">مستند Troff ME input</comment>
<comment xml:lang="ast">Documentu d'entrada de Troff ME</comment>
- <comment xml:lang="be@latin">Uvodny dakument Troff ME</comment>
+ <comment xml:lang="be-Latn">Uvodny dakument Troff ME</comment>
<comment xml:lang="bg">Изходен документ — Troff ME</comment>
<comment xml:lang="ca">document d'entrada Troff ME</comment>
<comment xml:lang="cs">vstupní dokument Troff ME</comment>
<comment xml:lang="da">Troff ME inddata-dokument</comment>
<comment xml:lang="de">Troff-ME-Eingabedokument</comment>
<comment xml:lang="el">Έγγραφο εντολών troff ME</comment>
- <comment xml:lang="en_GB">Troff ME input document</comment>
+ <comment xml:lang="en-GB">Troff ME input document</comment>
<comment xml:lang="eo">eniga dokumento de Troff ME</comment>
<comment xml:lang="es">documento de entrada Troff ME</comment>
<comment xml:lang="eu">Troff ME sarrerako dokumentua</comment>
<comment xml:lang="fi">Troff ME -syöteasiakirja</comment>
<comment xml:lang="fo">Troff ME inntaksskjal</comment>
<comment xml:lang="fr">document d'entrée Troff ME</comment>
+ <comment xml:lang="fur">document di jentrade Troff ME</comment>
<comment xml:lang="ga">cáipéis ionchurtha Troff ME</comment>
<comment xml:lang="gl">documento de entrada Troff ME</comment>
<comment xml:lang="he">מסמך קלט של Troff ME</comment>
@@ -36591,7 +37885,7 @@
<comment xml:lang="oc">document d'entrada Troff ME</comment>
<comment xml:lang="pl">Dokument wejściowy Troff ME</comment>
<comment xml:lang="pt">documento origem Troff ME</comment>
- <comment xml:lang="pt_BR">Documento de entrada Troff ME</comment>
+ <comment xml:lang="pt-BR">Documento de entrada Troff ME</comment>
<comment xml:lang="ro">Document intrare Troff ME</comment>
<comment xml:lang="ru">Входной документ Troff ME</comment>
<comment xml:lang="sk">Vstupný dokument Troff ME</comment>
@@ -36602,29 +37896,31 @@
<comment xml:lang="tr">Troff ME girdi belgesi</comment>
<comment xml:lang="uk">вхідний документ Troff ME</comment>
<comment xml:lang="vi">Tài liệu nhập ME Troff</comment>
- <comment xml:lang="zh_CN">Troff ME 输入文档</comment>
- <comment xml:lang="zh_TW">Troff ME 輸入文件</comment>
+ <comment xml:lang="zh-CN">Troff ME 输入文档</comment>
+ <comment xml:lang="zh-TW">Troff ME 輸入文件</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.me"/>
</mime-type>
<mime-type type="text/x-troff-mm">
<comment>Troff MM input document</comment>
+ <comment xml:lang="af">Troff MM-toevoerdokument</comment>
<comment xml:lang="ar">مستند Troff MM input</comment>
<comment xml:lang="ast">Documentu d'entrada de Troff MM</comment>
- <comment xml:lang="be@latin">Uvodny dakument Troff MM</comment>
+ <comment xml:lang="be-Latn">Uvodny dakument Troff MM</comment>
<comment xml:lang="bg">Изходен документ — Troff MM</comment>
<comment xml:lang="ca">document d'entrada Troff MM</comment>
<comment xml:lang="cs">vstupní dokument Troff MM</comment>
<comment xml:lang="da">Troff MM inddata-dokument</comment>
<comment xml:lang="de">Troff-MM-Eingabedokument</comment>
<comment xml:lang="el">Έγγραφο εντολών troff MM</comment>
- <comment xml:lang="en_GB">Troff MM input document</comment>
+ <comment xml:lang="en-GB">Troff MM input document</comment>
<comment xml:lang="eo">eniga dokumento de Troff MM</comment>
<comment xml:lang="es">documento de entrada Troff MM</comment>
<comment xml:lang="eu">Troff MM sarrerako dokumentua</comment>
<comment xml:lang="fi">Troff MM -syöteasiakirja</comment>
<comment xml:lang="fo">Troff MM inntaksskjal</comment>
<comment xml:lang="fr">document d'entrée Troff MM</comment>
+ <comment xml:lang="fur">document di jentrade Troff MM</comment>
<comment xml:lang="ga">cáipéis ionchurtha Troff MM</comment>
<comment xml:lang="gl">documento de entrada Troff MM</comment>
<comment xml:lang="he">מסמך קלט של Troff MM</comment>
@@ -36645,7 +37941,7 @@
<comment xml:lang="oc">document d'entrada Troff MM</comment>
<comment xml:lang="pl">Dokument wejściowy Troff MM</comment>
<comment xml:lang="pt">documento origem Troff MM</comment>
- <comment xml:lang="pt_BR">Documento de entrada Troff MM</comment>
+ <comment xml:lang="pt-BR">Documento de entrada Troff MM</comment>
<comment xml:lang="ro">Document intrare Troff MM</comment>
<comment xml:lang="ru">Входной документ Troff MM</comment>
<comment xml:lang="sk">Vstupný dokument Troff MM</comment>
@@ -36656,29 +37952,31 @@
<comment xml:lang="tr">Troff MM girdi belgesi</comment>
<comment xml:lang="uk">вхідний документ Troff MM</comment>
<comment xml:lang="vi">Tài liệu nhập MM Troff</comment>
- <comment xml:lang="zh_CN">Troff MM 输入文档</comment>
- <comment xml:lang="zh_TW">Troff MM 輸入文件</comment>
+ <comment xml:lang="zh-CN">Troff MM 输入文档</comment>
+ <comment xml:lang="zh-TW">Troff MM 輸入文件</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.mm"/>
</mime-type>
<mime-type type="text/x-troff-ms">
<comment>Troff MS input document</comment>
+ <comment xml:lang="af">Troff MS-toevoerdokument</comment>
<comment xml:lang="ar">مستند Troff MS input</comment>
<comment xml:lang="ast">Documentu d'entrada de Troff MS</comment>
- <comment xml:lang="be@latin">Uvodny dakument Troff MS</comment>
+ <comment xml:lang="be-Latn">Uvodny dakument Troff MS</comment>
<comment xml:lang="bg">Изходен документ — Troff MS</comment>
<comment xml:lang="ca">document d'entrada Troff MS</comment>
<comment xml:lang="cs">vstupní dokument Troff MS</comment>
<comment xml:lang="da">Troff MS inddata-dokument</comment>
<comment xml:lang="de">Troff-MS-Eingabedokument</comment>
<comment xml:lang="el">Έγγραφο εντολών troff MS</comment>
- <comment xml:lang="en_GB">Troff MS input document</comment>
+ <comment xml:lang="en-GB">Troff MS input document</comment>
<comment xml:lang="eo">eniga dokumento de Troff MS</comment>
<comment xml:lang="es">documento de entrada Troff MS</comment>
<comment xml:lang="eu">Troff MS sarrerako dokumentua</comment>
<comment xml:lang="fi">Troff MS -syöteasiakirja</comment>
<comment xml:lang="fo">Troff MS inntaksskjal</comment>
<comment xml:lang="fr">document d'entrée Troff MS</comment>
+ <comment xml:lang="fur">document di jentrade Troff MS</comment>
<comment xml:lang="ga">cáipéis ionchurtha Troff MS</comment>
<comment xml:lang="gl">documento de entrada Troff MS</comment>
<comment xml:lang="he">מסמך קלט של Troff MS</comment>
@@ -36699,7 +37997,7 @@
<comment xml:lang="oc">document d'entrada Troff MS</comment>
<comment xml:lang="pl">Dokument wejściowy Troff MS</comment>
<comment xml:lang="pt">documento origem Troff MS</comment>
- <comment xml:lang="pt_BR">Documento de entrada Troff MS</comment>
+ <comment xml:lang="pt-BR">Documento de entrada Troff MS</comment>
<comment xml:lang="ro">Document intrare Troff MS</comment>
<comment xml:lang="ru">Входной документ Troff MS</comment>
<comment xml:lang="sk">Vstupný dokument Troff MS</comment>
@@ -36710,59 +38008,65 @@
<comment xml:lang="tr">Troff MS girdi belgesi</comment>
<comment xml:lang="uk">вхідний документ Troff MS</comment>
<comment xml:lang="vi">Tài liệu nhập MS Troff</comment>
- <comment xml:lang="zh_CN">Troff MS 输入文档</comment>
- <comment xml:lang="zh_TW">Troff MS 輸入文件</comment>
+ <comment xml:lang="zh-CN">Troff MS 输入文档</comment>
+ <comment xml:lang="zh-TW">Troff MS 輸入文件</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.ms"/>
</mime-type>
<mime-type type="text/x-twig">
<comment>Twig template</comment>
+ <comment xml:lang="af">Twig-sjabloon</comment>
+ <comment xml:lang="bg">Шаблон — Twig</comment>
<comment xml:lang="ca">plantilla Twig</comment>
<comment xml:lang="cs">šablona Twig</comment>
<comment xml:lang="da">Twig-skabelon</comment>
<comment xml:lang="de">Twig-Vorlage</comment>
- <comment xml:lang="en_GB">Twig template</comment>
+ <comment xml:lang="en-GB">Twig template</comment>
<comment xml:lang="es">plantilla de Twig</comment>
<comment xml:lang="eu">Twig txantiloia</comment>
+ <comment xml:lang="fi">Twig-malli</comment>
<comment xml:lang="fr">modèle Twig</comment>
+ <comment xml:lang="fur">model Twig</comment>
<comment xml:lang="ga">teimpléad Twig</comment>
<comment xml:lang="he">תבנית Twig</comment>
<comment xml:lang="hr">Twig predložak</comment>
<comment xml:lang="hu">Twig-sablon</comment>
- <comment xml:lang="id">templat Twig</comment>
+ <comment xml:lang="id">Templat Twig</comment>
<comment xml:lang="it">Modello twig</comment>
<comment xml:lang="kk">Twig үлгісі</comment>
<comment xml:lang="ko">Twig 문서 서식</comment>
<comment xml:lang="pl">Szablon Twig</comment>
- <comment xml:lang="pt_BR">Modelo Twig</comment>
+ <comment xml:lang="pt-BR">Modelo Twig</comment>
<comment xml:lang="ru">Шаблон Twig</comment>
<comment xml:lang="sk">Šablóna Twig</comment>
<comment xml:lang="sr">Твиг шаблон</comment>
<comment xml:lang="sv">Twig-mall</comment>
<comment xml:lang="tr">Twig şablonu</comment>
<comment xml:lang="uk">шаблон twig</comment>
- <comment xml:lang="zh_CN">Twig 模板</comment>
- <comment xml:lang="zh_TW">Twig 範本</comment>
+ <comment xml:lang="zh-CN">Twig 模板</comment>
+ <comment xml:lang="zh-TW">Twig 範本</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.twig"/>
<generic-icon name="text-x-generic-template"/>
</mime-type>
<mime-type type="text/x-uil">
<comment>X-Motif UIL table</comment>
+ <comment xml:lang="af">X-Motif UIL-tabel</comment>
<comment xml:lang="ar">جدول X-Motif UIL</comment>
- <comment xml:lang="be@latin">Tablica X-Motif UIL</comment>
+ <comment xml:lang="be-Latn">Tablica X-Motif UIL</comment>
<comment xml:lang="bg">Таблица — X-Motif UIL</comment>
<comment xml:lang="ca">taula UIL de X-Motif</comment>
<comment xml:lang="cs">tabulka X-Motif UIL</comment>
<comment xml:lang="da">X-Motif UIL-tabel</comment>
<comment xml:lang="de">X-Motif-UIL-Tabelle</comment>
<comment xml:lang="el">Πίνακας X-Motif UIL</comment>
- <comment xml:lang="en_GB">X-Motif UIL table</comment>
+ <comment xml:lang="en-GB">X-Motif UIL table</comment>
<comment xml:lang="es">tabla de X-Motif UIL</comment>
<comment xml:lang="eu">X-Motif UIL taula</comment>
<comment xml:lang="fi">X-Motif UIL -taulukko</comment>
<comment xml:lang="fo">X-Motif UIL talva</comment>
<comment xml:lang="fr">table X-Motif UIL</comment>
+ <comment xml:lang="fur">tabele X-Motif UIL</comment>
<comment xml:lang="ga">tábla X-Motif UIL</comment>
<comment xml:lang="gl">Táboa de X-Motif UIL</comment>
<comment xml:lang="he">טבלה של X-Motif UIL</comment>
@@ -36783,7 +38087,7 @@
<comment xml:lang="oc">taula X-Motif UIL</comment>
<comment xml:lang="pl">Tabela UIL X-Motif</comment>
<comment xml:lang="pt">tabela UIL do X-Motif</comment>
- <comment xml:lang="pt_BR">Tabela UIL do X-Motif</comment>
+ <comment xml:lang="pt-BR">Tabela UIL do X-Motif</comment>
<comment xml:lang="ro">Tabel X-Motif UIL</comment>
<comment xml:lang="ru">Таблица UIL X-Motif</comment>
<comment xml:lang="sk">Tabuľka X-Motif UIL</comment>
@@ -36794,28 +38098,29 @@
<comment xml:lang="tr">X-Motif UIL tablosu</comment>
<comment xml:lang="uk">таблиця X-Motif UIL</comment>
<comment xml:lang="vi">Bảng UIL X-Motif</comment>
- <comment xml:lang="zh_CN">X-Motif UIL 表</comment>
- <comment xml:lang="zh_TW">X-Motif UIL 表格</comment>
+ <comment xml:lang="zh-CN">X-Motif UIL 表</comment>
+ <comment xml:lang="zh-TW">X-Motif UIL 表格</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.uil"/>
</mime-type>
<mime-type type="text/x-uri">
<comment>resource location</comment>
<comment xml:lang="ar">موقع المورد</comment>
- <comment xml:lang="be@latin">pałažeńnie resursu</comment>
+ <comment xml:lang="be-Latn">pałažeńnie resursu</comment>
<comment xml:lang="bg">Местоположение на ресурс</comment>
<comment xml:lang="ca">localització de recurs</comment>
<comment xml:lang="cs">umístění prostředku</comment>
<comment xml:lang="da">resurseplacering</comment>
<comment xml:lang="de">Ressourcenort</comment>
<comment xml:lang="el">Τοποθεσία πόρου</comment>
- <comment xml:lang="en_GB">resource location</comment>
+ <comment xml:lang="en-GB">resource location</comment>
<comment xml:lang="eo">loko de risurco</comment>
<comment xml:lang="es">ubicación del recurso</comment>
<comment xml:lang="eu">baliabidearen kokalekua</comment>
<comment xml:lang="fi">resurssisijainti</comment>
<comment xml:lang="fo">tilfeingisstaður</comment>
<comment xml:lang="fr">localisation de ressource</comment>
+ <comment xml:lang="fur">posizion risorse</comment>
<comment xml:lang="ga">suíomh acmhainne</comment>
<comment xml:lang="gl">localización do recurso</comment>
<comment xml:lang="he">מיקום של משאב</comment>
@@ -36836,7 +38141,7 @@
<comment xml:lang="oc">localizacion de ressorsa</comment>
<comment xml:lang="pl">Położenie zasobu</comment>
<comment xml:lang="pt">localização de recurso</comment>
- <comment xml:lang="pt_BR">Localização de recurso</comment>
+ <comment xml:lang="pt-BR">Localização de recurso</comment>
<comment xml:lang="ro">locație de resursă</comment>
<comment xml:lang="ru">Расположение ресурса</comment>
<comment xml:lang="sk">Umiestnenie zdroja</comment>
@@ -36847,29 +38152,33 @@
<comment xml:lang="tr">kaynak ayırma</comment>
<comment xml:lang="uk">розташування ресурсу</comment>
<comment xml:lang="vi">địa điểm tài nguyên</comment>
- <comment xml:lang="zh_CN">资源位置</comment>
- <comment xml:lang="zh_TW">資源位置</comment>
+ <comment xml:lang="zh-CN">资源位置</comment>
+ <comment xml:lang="zh-TW">資源位置</comment>
<sub-class-of type="text/plain"/>
-
+ <!-- Note: text/uri-list is reserved by the XDND protocol! -->
</mime-type>
<mime-type type="text/x-uuencode">
<comment>uuencoded file</comment>
+ <comment xml:lang="af">uu-geënkodeerde lêer</comment>
+ <comment xml:lang="bg">Файл — кодиран с uuencode</comment>
<comment xml:lang="ca">fitxer uuencoded</comment>
<comment xml:lang="cs">soubor kódovaný pomocí uuencoding</comment>
<comment xml:lang="da">uuencodede-fil</comment>
<comment xml:lang="de">Datei im uuencode-Format</comment>
<comment xml:lang="el">Αρχείο κωδικοποιημένο unix σε unix (uuencoded)</comment>
- <comment xml:lang="en_GB">uuencoded file</comment>
+ <comment xml:lang="en-GB">uuencoded file</comment>
<comment xml:lang="es">archivo codificado con uuencode</comment>
<comment xml:lang="eu">uuencode-aturiko fitxategia</comment>
+ <comment xml:lang="fi">uuencoded tiedosto</comment>
<comment xml:lang="fr">fichier uuencodé</comment>
+ <comment xml:lang="fur">file codificât cun uuencode</comment>
<comment xml:lang="ga">comhad uuencoded</comment>
<comment xml:lang="gl">Ficheiro uuencoded</comment>
<comment xml:lang="he">קובץ בקידוד uu</comment>
<comment xml:lang="hr">uuencoded datoteka</comment>
<comment xml:lang="hu">uuencode-olt fájl</comment>
<comment xml:lang="ia">File in uuencode</comment>
- <comment xml:lang="id">Berkas ter-uuencode</comment>
+ <comment xml:lang="id">berkas ter-uuencode</comment>
<comment xml:lang="it">File uuencoded</comment>
<comment xml:lang="ja">未エンコードファイル</comment>
<comment xml:lang="kk">uuencode кодталған файлы</comment>
@@ -36878,7 +38187,7 @@
<comment xml:lang="oc">fichièr uuencodat</comment>
<comment xml:lang="pl">Plik zakodowany za pomocą uuencode</comment>
<comment xml:lang="pt">ficheiro uuencoded</comment>
- <comment xml:lang="pt_BR">Arquivo codificado UUE</comment>
+ <comment xml:lang="pt-BR">Arquivo codificado UUE</comment>
<comment xml:lang="ru">Файл, кодированный uuencode</comment>
<comment xml:lang="sk">Súbor v kódovaní uuencode</comment>
<comment xml:lang="sl">Datoteka uuencode</comment>
@@ -36886,32 +38195,56 @@
<comment xml:lang="sv">uuencode-fil</comment>
<comment xml:lang="tr">uuencoded dosyası</comment>
<comment xml:lang="uk">файл даних у форматі UUE</comment>
- <comment xml:lang="zh_CN">Uuencode 文件</comment>
- <comment xml:lang="zh_TW">uuencoded 檔</comment>
+ <comment xml:lang="zh-CN">Uuencode 文件</comment>
+ <comment xml:lang="zh-TW">uuencoded 檔</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.uue"/>
<magic priority="50">
- <match value="begin " type="string" offset="0"/>
+ <match type="string" value="begin " offset="0"/>
</magic>
<alias type="zz-application/zz-winassoc-uu"/>
</mime-type>
+ <mime-type type="text/vbscript">
+ <comment>VBScript program</comment>
+ <comment xml:lang="ca">programa VBScript</comment>
+ <comment xml:lang="da">VBScript-program</comment>
+ <comment xml:lang="de">VBScript-Programm</comment>
+ <comment xml:lang="en-GB">VBScript program</comment>
+ <comment xml:lang="es">programa en VBScript</comment>
+ <comment xml:lang="fi">VBScript-ohjelma</comment>
+ <comment xml:lang="fr">programme VBScript</comment>
+ <comment xml:lang="hr">VBScript program</comment>
+ <comment xml:lang="it">Programma VBScript</comment>
+ <comment xml:lang="pl">Pogram VBScript</comment>
+ <comment xml:lang="pt-BR">Programa VBScript</comment>
+ <comment xml:lang="sv">VBScript-program</comment>
+ <comment xml:lang="uk">програма мовою VBScript</comment>
+ <comment xml:lang="zh-CN">VBScript 程序</comment>
+ <comment xml:lang="zh-TW">VBScript 程式</comment>
+ <alias type="text/vbs"/>
+ <sub-class-of type="text/plain"/>
+ <generic-icon name="text-x-script"/>
+ <glob pattern="*.vbs"/>
+ </mime-type>
<mime-type type="text/x-xmi">
<comment>XMI file</comment>
+ <comment xml:lang="af">XMI-lêer</comment>
<comment xml:lang="ar">ملف XMI</comment>
- <comment xml:lang="be@latin">Fajł XMI</comment>
+ <comment xml:lang="be-Latn">Fajł XMI</comment>
<comment xml:lang="bg">Файл — XMI</comment>
<comment xml:lang="ca">fitxer XMI</comment>
<comment xml:lang="cs">soubor XMI</comment>
<comment xml:lang="da">XMI-fil</comment>
<comment xml:lang="de">XMI-Datei</comment>
<comment xml:lang="el">Αρχείο XML</comment>
- <comment xml:lang="en_GB">XMI file</comment>
+ <comment xml:lang="en-GB">XMI file</comment>
<comment xml:lang="eo">XMI-dosiero</comment>
<comment xml:lang="es">archivo XMI</comment>
<comment xml:lang="eu">XMI fitxategia</comment>
<comment xml:lang="fi">XMI-tiedosto</comment>
<comment xml:lang="fo">XMI fíla</comment>
<comment xml:lang="fr">fichier XMI</comment>
+ <comment xml:lang="fur">file XMI</comment>
<comment xml:lang="ga">comhad XMI</comment>
<comment xml:lang="gl">ficheiro XMI</comment>
<comment xml:lang="he">קובץ XMI</comment>
@@ -36931,7 +38264,7 @@
<comment xml:lang="oc">fichièr XMI</comment>
<comment xml:lang="pl">Plik XMI</comment>
<comment xml:lang="pt">ficheiro XMI</comment>
- <comment xml:lang="pt_BR">Arquivo XMI</comment>
+ <comment xml:lang="pt-BR">Arquivo XMI</comment>
<comment xml:lang="ro">Fișier XMI</comment>
<comment xml:lang="ru">Файл XMI</comment>
<comment xml:lang="sk">Súbor XMI</comment>
@@ -36942,8 +38275,8 @@
<comment xml:lang="tr">XMI dosyası</comment>
<comment xml:lang="uk">файл XMI</comment>
<comment xml:lang="vi">Tập tin XMI</comment>
- <comment xml:lang="zh_CN">XMI 文件</comment>
- <comment xml:lang="zh_TW">XMI 檔</comment>
+ <comment xml:lang="zh-CN">XMI 文件</comment>
+ <comment xml:lang="zh-TW">XMI 檔</comment>
<acronym>XMI</acronym>
<expanded-acronym>XML Metadata Interchange</expanded-acronym>
<sub-class-of type="application/xml"/>
@@ -36953,21 +38286,23 @@
</mime-type>
<mime-type type="text/x-xslfo">
<comment>XSL FO file</comment>
+ <comment xml:lang="af">XSL FO-lêer</comment>
<comment xml:lang="ar">ملف XSL FO</comment>
- <comment xml:lang="be@latin">Fajł XSL FO</comment>
+ <comment xml:lang="be-Latn">Fajł XSL FO</comment>
<comment xml:lang="bg">Форматиращ файл — XSL FO</comment>
<comment xml:lang="ca">fitxer FO XSL</comment>
<comment xml:lang="cs">soubor XSL FO</comment>
<comment xml:lang="da">XML FO-fil</comment>
<comment xml:lang="de">XSL-FO-Datei</comment>
<comment xml:lang="el">Αρχείο XSL FO</comment>
- <comment xml:lang="en_GB">XSL FO file</comment>
+ <comment xml:lang="en-GB">XSL FO file</comment>
<comment xml:lang="eo">XSL-FO-dosiero</comment>
<comment xml:lang="es">archivo XSL FO</comment>
<comment xml:lang="eu">XSL FO fitxategia</comment>
<comment xml:lang="fi">XSL FO -tiedosto</comment>
<comment xml:lang="fo">XSL FO fíla</comment>
<comment xml:lang="fr">fichier XSL FO</comment>
+ <comment xml:lang="fur">file XSL FO</comment>
<comment xml:lang="ga">comhad XSL FO</comment>
<comment xml:lang="gl">ficheiro XSL FO</comment>
<comment xml:lang="he">קובץ XSL FO</comment>
@@ -36987,7 +38322,7 @@
<comment xml:lang="oc">fichièr XSL FO</comment>
<comment xml:lang="pl">Plik XSL FO</comment>
<comment xml:lang="pt">ficheiro XSL FO</comment>
- <comment xml:lang="pt_BR">Arquivo XSL FO</comment>
+ <comment xml:lang="pt-BR">Arquivo XSL FO</comment>
<comment xml:lang="ro">Fișier XSL FO</comment>
<comment xml:lang="ru">Файл XSL FO</comment>
<comment xml:lang="sk">Súbor XSL FO</comment>
@@ -36998,8 +38333,8 @@
<comment xml:lang="tr">XSL FO dosyası</comment>
<comment xml:lang="uk">файл XSL FO</comment>
<comment xml:lang="vi">Tập tin FO của XSL (XFO)</comment>
- <comment xml:lang="zh_CN">XSL 格式化对象文件</comment>
- <comment xml:lang="zh_TW">XSL FO 檔</comment>
+ <comment xml:lang="zh-CN">XSL 格式化对象文件</comment>
+ <comment xml:lang="zh-TW">XSL FO 檔</comment>
<acronym>XSL FO</acronym>
<expanded-acronym>XSL Formatting Objects</expanded-acronym>
<sub-class-of type="application/xml"/>
@@ -37009,21 +38344,23 @@
</mime-type>
<mime-type type="text/x-iptables">
<comment>iptables configuration file</comment>
+ <comment xml:lang="af">iptables-opstellingslêer</comment>
<comment xml:lang="ar">ملف تضبيط iptables</comment>
<comment xml:lang="ast">ficheru de configuración d'iptables</comment>
- <comment xml:lang="be@latin">kanfihuracyjny fajł iptables</comment>
+ <comment xml:lang="be-Latn">kanfihuracyjny fajł iptables</comment>
<comment xml:lang="bg">Настройки за iptables</comment>
<comment xml:lang="ca">fitxer de configuració d'iptables</comment>
<comment xml:lang="cs">soubor nastavení iptables</comment>
<comment xml:lang="da">iptableskonfigurationsfil</comment>
<comment xml:lang="de">iptables-Konfigurationsdatei</comment>
<comment xml:lang="el">Αρχείο ρυθμίσεων iptables</comment>
- <comment xml:lang="en_GB">iptables configuration file</comment>
+ <comment xml:lang="en-GB">iptables configuration file</comment>
<comment xml:lang="es">archivo de configuración de iptables</comment>
<comment xml:lang="eu">iptables konfigurazio-fitxategia</comment>
<comment xml:lang="fi">iptables-asetustiedosto</comment>
<comment xml:lang="fo">iptables samansetingarfíla</comment>
<comment xml:lang="fr">fichier de configuration iptables</comment>
+ <comment xml:lang="fur">file di configurazion di iptables</comment>
<comment xml:lang="ga">comhad cumraíochta iptables</comment>
<comment xml:lang="gl">ficheiro de configuración de iptables</comment>
<comment xml:lang="he">קובץ הגדרה של iptables</comment>
@@ -37043,7 +38380,7 @@
<comment xml:lang="oc">fichièr de configuracion iptables</comment>
<comment xml:lang="pl">Plik konfiguracji iptables</comment>
<comment xml:lang="pt">ficheiro de configuração iptables</comment>
- <comment xml:lang="pt_BR">Arquivo de configuração do iptables</comment>
+ <comment xml:lang="pt-BR">Arquivo de configuração do iptables</comment>
<comment xml:lang="ro">fișier configurare iptables</comment>
<comment xml:lang="ru">Файл настроек iptables</comment>
<comment xml:lang="sk">Súbor nastavení iptables</comment>
@@ -37054,26 +38391,26 @@
<comment xml:lang="tr">iptables yapılandırma dosyası</comment>
<comment xml:lang="uk">файл налаштувань iptables</comment>
<comment xml:lang="vi">tập tin cấu hình iptables</comment>
- <comment xml:lang="zh_CN">iptables 防火墙配置文件</comment>
- <comment xml:lang="zh_TW">iptables 組態檔</comment>
+ <comment xml:lang="zh-CN">iptables 防火墙配置文件</comment>
+ <comment xml:lang="zh-TW">iptables 組態檔</comment>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="/etc/sysconfig/iptables" type="string" offset="0:256"/>
- <match value="*filter" type="string" offset="0:256">
- <match value=":INPUT" type="string" offset="0:256">
- <match value=":FORWARD" type="string" offset="0:256">
- <match value=":OUTPUT" type="string" offset="0:256"/>
+ <match type="string" value="/etc/sysconfig/iptables" offset="0:256"/>
+ <match type="string" value="*filter" offset="0:256">
+ <match type="string" value=":INPUT" offset="0:256">
+ <match type="string" value=":FORWARD" offset="0:256">
+ <match type="string" value=":OUTPUT" offset="0:256"/>
</match>
</match>
</match>
- <match value="-A INPUT" type="string" offset="0:256">
- <match value="-A FORWARD" type="string" offset="0:256">
- <match value="-A OUTPUT" type="string" offset="0:256"/>
+ <match type="string" value="-A INPUT" offset="0:256">
+ <match type="string" value="-A FORWARD" offset="0:256">
+ <match type="string" value="-A OUTPUT" offset="0:256"/>
</match>
</match>
- <match value="-P INPUT" type="string" offset="0:256">
- <match value="-P FORWARD" type="string" offset="0:256">
- <match value="-P OUTPUT" type="string" offset="0:256"/>
+ <match type="string" value="-P INPUT" offset="0:256">
+ <match type="string" value="-P FORWARD" offset="0:256">
+ <match type="string" value="-P OUTPUT" offset="0:256"/>
</match>
</match>
</magic>
@@ -37081,49 +38418,57 @@
</mime-type>
<mime-type type="text/x-dbus-service">
<comment>D-Bus service file</comment>
+ <comment xml:lang="af">D-Bus-dienslêer</comment>
+ <comment xml:lang="bg">Услуга — D-Bus</comment>
<comment xml:lang="ca">fitxer de servei de D-Bus</comment>
<comment xml:lang="cs">soubor služby D-Bus</comment>
+ <comment xml:lang="da">D-Bus-tjenestefil</comment>
<comment xml:lang="de">D-Bus-Dienstdatei</comment>
- <comment xml:lang="en_GB">D-Bus service file</comment>
+ <comment xml:lang="en-GB">D-Bus service file</comment>
<comment xml:lang="es">archivo de servicio de D-Bus</comment>
<comment xml:lang="eu">D-Bus zerbitzu fitxategia</comment>
<comment xml:lang="fi">D-Bus-palvelutiedosto</comment>
<comment xml:lang="fr">fichier de service D-Bus</comment>
+ <comment xml:lang="fur">file di servizi D-Bus</comment>
<comment xml:lang="ga">comhad seirbhíse D-Bus</comment>
<comment xml:lang="hr">Datoteka D-Bus usluge</comment>
<comment xml:lang="hu">D-Bus szolgáltatás fájl</comment>
- <comment xml:lang="id">berkas layanan D-Bus</comment>
+ <comment xml:lang="id">Berkas layanan D-Bus</comment>
<comment xml:lang="it">File servizio D-Bus</comment>
<comment xml:lang="kk">D-Bus қызметтік файлы</comment>
<comment xml:lang="ko">D-Bus 서비스 파일</comment>
<comment xml:lang="pl">Plik usługi D-Bus</comment>
- <comment xml:lang="pt_BR">Arquivo de serviço do D-Bus</comment>
+ <comment xml:lang="pt-BR">Arquivo de serviço do D-Bus</comment>
<comment xml:lang="ru">Файл службы D-Bus</comment>
<comment xml:lang="sk">Súbor služby D-Bus</comment>
<comment xml:lang="sr">датотека услуге Д-сабирнице</comment>
<comment xml:lang="sv">D-BUS-tjänstfil</comment>
<comment xml:lang="tr">D-Bus hizmeti dosyası</comment>
<comment xml:lang="uk">файл служби D-Bus</comment>
- <comment xml:lang="zh_CN">D-Bus 服务文件</comment>
- <comment xml:lang="zh_TW">D-Bus 服務檔</comment>
+ <comment xml:lang="zh-CN">D-Bus 服务文件</comment>
+ <comment xml:lang="zh-TW">D-Bus 服務檔</comment>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="\n[D-BUS Service]\n" type="string" offset="0:256"/>
- <match value="[D-BUS Service]\n" type="string" offset="0"/>
+ <match type="string" value="\n[D-BUS Service]\n" offset="0:256"/>
+ <match type="string" value="[D-BUS Service]\n" offset="0"/>
</magic>
<glob pattern="*.service"/>
</mime-type>
<mime-type type="text/x-systemd-unit">
<comment>systemd unit file</comment>
+ <comment xml:lang="af">systemd-eenheidlêer</comment>
<comment xml:lang="ast">ficheru d'unidaes de systemd</comment>
+ <comment xml:lang="bg">Елемент — systemd</comment>
<comment xml:lang="ca">fitxer d'unitat de systemd</comment>
<comment xml:lang="cs">jednotkový soubor systemd</comment>
+ <comment xml:lang="da">systemd unit-fil</comment>
<comment xml:lang="de">systemd-Einheitsdatei</comment>
- <comment xml:lang="en_GB">systemd unit file</comment>
+ <comment xml:lang="en-GB">systemd unit file</comment>
<comment xml:lang="es">archivo de unidad de systemd</comment>
<comment xml:lang="eu">systemd unitate fitxategia</comment>
<comment xml:lang="fi">systemd-yksikkötiedosto</comment>
<comment xml:lang="fr">fichier d'unité systemd</comment>
+ <comment xml:lang="fur">file unitât di systemd</comment>
<comment xml:lang="ga">comhad aonaid systemd</comment>
<comment xml:lang="hr">Datoteka systemd jedinice</comment>
<comment xml:lang="hu">systemd egység fájl</comment>
@@ -37132,44 +38477,44 @@
<comment xml:lang="kk">systemd юнит файлы</comment>
<comment xml:lang="ko">systemd 유닛 파일</comment>
<comment xml:lang="pl">Plik jednostki systemd</comment>
- <comment xml:lang="pt_BR">Arquivo de unit do systemd</comment>
+ <comment xml:lang="pt-BR">Arquivo de unit do systemd</comment>
<comment xml:lang="ru">Модульный файл Systemd</comment>
<comment xml:lang="sk">Súbor jednotky systemd</comment>
<comment xml:lang="sr">датотека јединице системд-а</comment>
<comment xml:lang="sv">systemd-enhetsfil</comment>
<comment xml:lang="tr">systemd birim dosyası</comment>
<comment xml:lang="uk">файл модуля systemd</comment>
- <comment xml:lang="zh_CN">systemd 单元文件</comment>
- <comment xml:lang="zh_TW">systemd 單位檔</comment>
+ <comment xml:lang="zh-CN">systemd 单元文件</comment>
+ <comment xml:lang="zh-TW">systemd 單位檔</comment>
<sub-class-of type="text/plain"/>
<magic priority="50">
-
- <match value="\n[Unit]\n" type="string" offset="0:256"/>
- <match value="\n[Install]\n" type="string" offset="0:256"/>
- <match value="\n[Automount]\n" type="string" offset="0:256"/>
-
- <match value="\n[Mount]\n" type="string" offset="0:256"/>
- <match value="\n[Path]\n" type="string" offset="0:256"/>
- <match value="\n[Scope]\n" type="string" offset="0:256"/>
- <match value="\n[Service]\n" type="string" offset="0:256"/>
- <match value="\n[Slice]\n" type="string" offset="0:256"/>
- <match value="\n[Socket]\n" type="string" offset="0:256"/>
- <match value="\n[Swap]\n" type="string" offset="0:256"/>
-
- <match value="\n[Timer]\n" type="string" offset="0:256"/>
+ <!-- Matches part-way through the file. -->
+ <match type="string" value="\n[Unit]\n" offset="0:256"/>
+ <match type="string" value="\n[Install]\n" offset="0:256"/>
+ <match type="string" value="\n[Automount]\n" offset="0:256"/>
+ <!-- Note no [Device] section exists (https://www.freedesktop.org/software/systemd/man/systemd.device.html) -->
+ <match type="string" value="\n[Mount]\n" offset="0:256"/>
+ <match type="string" value="\n[Path]\n" offset="0:256"/>
+ <match type="string" value="\n[Scope]\n" offset="0:256"/>
+ <match type="string" value="\n[Service]\n" offset="0:256"/>
+ <match type="string" value="\n[Slice]\n" offset="0:256"/>
+ <match type="string" value="\n[Socket]\n" offset="0:256"/>
+ <match type="string" value="\n[Swap]\n" offset="0:256"/>
+ <!-- Note no [Target] section exists (https://www.freedesktop.org/software/systemd/man/systemd.target.html) -->
+ <match type="string" value="\n[Timer]\n" offset="0:256"/>
-
- <match value="[Unit]\n" type="string" offset="0"/>
- <match value="[Install]\n" type="string" offset="0"/>
- <match value="[Automount]\n" type="string" offset="0"/>
- <match value="[Mount]\n" type="string" offset="0"/>
- <match value="[Path]\n" type="string" offset="0"/>
- <match value="[Scope]\n" type="string" offset="0"/>
- <match value="[Service]\n" type="string" offset="0"/>
- <match value="[Slice]\n" type="string" offset="0"/>
- <match value="[Socket]\n" type="string" offset="0"/>
- <match value="[Swap]\n" type="string" offset="0"/>
- <match value="[Timer]\n" type="string" offset="0"/>
+ <!-- Matches at the start of the file. -->
+ <match type="string" value="[Unit]\n" offset="0"/>
+ <match type="string" value="[Install]\n" offset="0"/>
+ <match type="string" value="[Automount]\n" offset="0"/>
+ <match type="string" value="[Mount]\n" offset="0"/>
+ <match type="string" value="[Path]\n" offset="0"/>
+ <match type="string" value="[Scope]\n" offset="0"/>
+ <match type="string" value="[Service]\n" offset="0"/>
+ <match type="string" value="[Slice]\n" offset="0"/>
+ <match type="string" value="[Socket]\n" offset="0"/>
+ <match type="string" value="[Swap]\n" offset="0"/>
+ <match type="string" value="[Timer]\n" offset="0"/>
</magic>
<glob pattern="*.automount"/>
<glob pattern="*.device"/>
@@ -37185,21 +38530,23 @@
</mime-type>
<mime-type type="application/xslt+xml">
<comment>XSLT stylesheet</comment>
+ <comment xml:lang="af">XSLT-stylblad</comment>
<comment xml:lang="ar">نمط XSLT</comment>
- <comment xml:lang="be@latin">Arkuš stylaŭ XSLT</comment>
+ <comment xml:lang="be-Latn">Arkuš stylaŭ XSLT</comment>
<comment xml:lang="bg">Стилове — XSLT</comment>
<comment xml:lang="ca">full d'estil XSLT</comment>
<comment xml:lang="cs">stylopis XSLT</comment>
<comment xml:lang="da">XSLT-stilark</comment>
<comment xml:lang="de">XSLT-Stylesheet</comment>
<comment xml:lang="el">Φύλλο στυλ XSLT</comment>
- <comment xml:lang="en_GB">XSLT stylesheet</comment>
+ <comment xml:lang="en-GB">XSLT stylesheet</comment>
<comment xml:lang="eo">XSLT-stilfolio</comment>
<comment xml:lang="es">hoja de estilos XSLT</comment>
<comment xml:lang="eu">XSLT estilo-orria</comment>
<comment xml:lang="fi">XSLT-tyylitiedosto</comment>
<comment xml:lang="fo">XSLT sniðark</comment>
<comment xml:lang="fr">feuille de style XSLT</comment>
+ <comment xml:lang="fur">sfuei di calcul XSLT</comment>
<comment xml:lang="ga">stílbhileog XSLT</comment>
<comment xml:lang="gl">folla de estilo XSLT</comment>
<comment xml:lang="he">גליון סגנון XSLT</comment>
@@ -37220,7 +38567,7 @@
<comment xml:lang="oc">fuèlh d'estil XSLT</comment>
<comment xml:lang="pl">Arkusz stylów XSLT</comment>
<comment xml:lang="pt">folha de estilos XSLT</comment>
- <comment xml:lang="pt_BR">Folha de estilo XSLT</comment>
+ <comment xml:lang="pt-BR">Folha de estilo XSLT</comment>
<comment xml:lang="ro">Fișă de stil XSLT</comment>
<comment xml:lang="ru">Таблица стилей XSLT</comment>
<comment xml:lang="sk">Štýl XSLT</comment>
@@ -37231,35 +38578,72 @@
<comment xml:lang="tr">XSLT çalışma sayfası</comment>
<comment xml:lang="uk">таблиця стилів XSLT</comment>
<comment xml:lang="vi">Tờ kiểu dáng XSLT</comment>
- <comment xml:lang="zh_CN">XSLT 样式表</comment>
- <comment xml:lang="zh_TW">XSLT 樣式表</comment>
+ <comment xml:lang="zh-CN">XSLT 样式表</comment>
+ <comment xml:lang="zh-TW">XSLT 樣式表</comment>
<acronym>XSLT</acronym>
<expanded-acronym>eXtensible Stylesheet Language Transformation</expanded-acronym>
<generic-icon name="text-x-generic"/>
<magic priority="50">
- <match value="&lt;xsl:stylesheet" type="string" offset="0:256"/>
+ <match type="string" value="&lt;xsl:stylesheet" offset="0:256"/>
</magic>
<glob pattern="*.xsl"/>
<glob pattern="*.xslt"/>
<root-XML namespaceURI="http://www.w3.org/1999/XSL/Transform" localName="stylesheet"/>
<sub-class-of type="application/xml"/>
</mime-type>
+ <mime-type type="text/x-maven+xml">
+ <comment>Maven description file</comment>
+ <comment xml:lang="af">Maven-beskrywingslêer</comment>
+ <comment xml:lang="bg">Модел — Maven</comment>
+ <comment xml:lang="ca">fitxer de descripció Maven</comment>
+ <comment xml:lang="cs">popisný soubor Maven</comment>
+ <comment xml:lang="da">Maven-beskrivelsesfil</comment>
+ <comment xml:lang="de">Maven-Beschreibungsdatei</comment>
+ <comment xml:lang="en-GB">Maven description file</comment>
+ <comment xml:lang="es">archivo de descripción de Maven</comment>
+ <comment xml:lang="eu">Maven azalpen fitxategia</comment>
+ <comment xml:lang="fi">Maven-kuvaustiedosto</comment>
+ <comment xml:lang="fr">fichier de description Maven</comment>
+ <comment xml:lang="fur">file di descrizion Maven</comment>
+ <comment xml:lang="ga">cur síos Maven</comment>
+ <comment xml:lang="hr">Maven datoteka opisa</comment>
+ <comment xml:lang="hu">Maven leírófájl</comment>
+ <comment xml:lang="id">Berkas deskripsi Maven</comment>
+ <comment xml:lang="it">File descrizione Mave</comment>
+ <comment xml:lang="kk">Maven сипаттама файлы</comment>
+ <comment xml:lang="ko">Maven 설명 파일</comment>
+ <comment xml:lang="pl">Plik opisu Maven</comment>
+ <comment xml:lang="pt-BR">Arquivo de descrição Maven</comment>
+ <comment xml:lang="ru">Файл описания Maven</comment>
+ <comment xml:lang="sk">Súbor popisu Maven</comment>
+ <comment xml:lang="sv">Maven-beskrivningsfil</comment>
+ <comment xml:lang="tr">Maven açıklama dosyası</comment>
+ <comment xml:lang="uk">файл опису Maven</comment>
+ <comment xml:lang="zh-CN">Maven 描述文件</comment>
+ <comment xml:lang="zh-TW">Maven 描述檔</comment>
+ <generic-icon name="text-x-generic"/>
+ <glob pattern="pom.xml"/>
+ <glob pattern="settings.xml"/>
+ <sub-class-of type="application/xml"/>
+ </mime-type>
<mime-type type="text/xmcd">
<comment>XMCD CD database</comment>
+ <comment xml:lang="af">XMCD CD-databasis</comment>
<comment xml:lang="ar">قاعدة بيانات XMCD CD</comment>
- <comment xml:lang="be@latin">Baza źviestak ab dyskach XMCD</comment>
+ <comment xml:lang="be-Latn">Baza źviestak ab dyskach XMCD</comment>
<comment xml:lang="bg">База от данни за CD-та — XMCD</comment>
<comment xml:lang="ca">base de dades de CD XMCD</comment>
<comment xml:lang="cs">databáze XMCD CD</comment>
<comment xml:lang="da">XMCD-cd-database</comment>
<comment xml:lang="de">XMCD-CD-Datenbank</comment>
<comment xml:lang="el">Βάση δεδομένων CD XMCD</comment>
- <comment xml:lang="en_GB">XMCD CD database</comment>
+ <comment xml:lang="en-GB">XMCD CD database</comment>
<comment xml:lang="es">base de datos de CD XMCD</comment>
<comment xml:lang="eu">XMCD CD datu-basea</comment>
<comment xml:lang="fi">XMCD CD -tietokanta</comment>
<comment xml:lang="fo">XMCD fløgu dátustovnur</comment>
<comment xml:lang="fr">base de données de CD XMCD</comment>
+ <comment xml:lang="fur">base di dâts XMCD CD</comment>
<comment xml:lang="ga">bunachar sonraí XMCD CD</comment>
<comment xml:lang="gl">base de datos de CD XMCD</comment>
<comment xml:lang="he">מסד נתונים XMCD CD</comment>
@@ -37279,7 +38663,7 @@
<comment xml:lang="oc">banca de donadas de CD XMCD</comment>
<comment xml:lang="pl">Baza danych CD XMCD</comment>
<comment xml:lang="pt">base de dados XMCD CD</comment>
- <comment xml:lang="pt_BR">Banco de dados de CD XMCD</comment>
+ <comment xml:lang="pt-BR">Banco de dados de CD XMCD</comment>
<comment xml:lang="ro">Bază de date XMCD CD</comment>
<comment xml:lang="ru">База данных компакт-дисков XMCD</comment>
<comment xml:lang="sk">Databáza XMCD CD</comment>
@@ -37287,34 +38671,36 @@
<comment xml:lang="sq">Bazë me të dhëna XMCD CD</comment>
<comment xml:lang="sr">ИксМЦД ЦД база података</comment>
<comment xml:lang="sv">XMCD cd-databas</comment>
- <comment xml:lang="tr">XMCD CD veritabanı</comment>
+ <comment xml:lang="tr">XMCD CD veri tabanı</comment>
<comment xml:lang="uk">база даних XMCD CD</comment>
<comment xml:lang="vi">Cơ sở dữ liệu CD XMCD</comment>
- <comment xml:lang="zh_CN">XMCD CD 数据库</comment>
- <comment xml:lang="zh_TW">XMCD CD 資料庫</comment>
+ <comment xml:lang="zh-CN">XMCD CD 数据库</comment>
+ <comment xml:lang="zh-TW">XMCD CD 資料庫</comment>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="# xmcd" type="string" offset="0"/>
+ <match type="string" value="# xmcd" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/xml">
<comment>XML document</comment>
+ <comment xml:lang="af">XML-dokument</comment>
<comment xml:lang="ar">مستند XML</comment>
<comment xml:lang="ast">Documentu XML</comment>
- <comment xml:lang="be@latin">Dakument XML</comment>
+ <comment xml:lang="be-Latn">Dakument XML</comment>
<comment xml:lang="bg">Документ — XML</comment>
<comment xml:lang="ca">document XML</comment>
<comment xml:lang="cs">dokument XML</comment>
<comment xml:lang="da">XML-dokument</comment>
<comment xml:lang="de">XML-Dokument</comment>
<comment xml:lang="el">Έγγραφο XML</comment>
- <comment xml:lang="en_GB">XML document</comment>
+ <comment xml:lang="en-GB">XML document</comment>
<comment xml:lang="eo">XML-dokumento</comment>
<comment xml:lang="es">documento XML</comment>
<comment xml:lang="eu">XML dokumentua</comment>
<comment xml:lang="fi">XML-asiakirja</comment>
<comment xml:lang="fo">XML skjal</comment>
<comment xml:lang="fr">document XML</comment>
+ <comment xml:lang="fur">document XML</comment>
<comment xml:lang="ga">cáipéis XML</comment>
<comment xml:lang="gl">documento XML</comment>
<comment xml:lang="he">מסמך XML</comment>
@@ -37334,7 +38720,7 @@
<comment xml:lang="oc">document XML</comment>
<comment xml:lang="pl">Dokument XML</comment>
<comment xml:lang="pt">documento XML</comment>
- <comment xml:lang="pt_BR">Documento XML</comment>
+ <comment xml:lang="pt-BR">Documento XML</comment>
<comment xml:lang="ro">Document XML</comment>
<comment xml:lang="ru">Документ XML</comment>
<comment xml:lang="sk">Dokument XML</comment>
@@ -37345,15 +38731,14 @@
<comment xml:lang="tr">XML belgesi</comment>
<comment xml:lang="uk">документ XML</comment>
<comment xml:lang="vi">Tài liệu XML</comment>
- <comment xml:lang="zh_CN">XML 文档</comment>
- <comment xml:lang="zh_TW">XML 文件</comment>
+ <comment xml:lang="zh-CN">XML 文档</comment>
+ <comment xml:lang="zh-TW">XML 文件</comment>
<acronym>XML</acronym>
<expanded-acronym>eXtensible Markup Language</expanded-acronym>
<sub-class-of type="text/plain"/>
<generic-icon name="text-html"/>
<magic priority="40">
- <match value="&lt;?xml" type="string" offset="0"/>
- <match value="&lt;!--" type="string" offset="0"/>
+ <match type="string" value="&lt;?xml" offset="0"/>
</magic>
<glob pattern="*.xml"/>
<glob pattern="*.xbl"/>
@@ -37363,21 +38748,23 @@
</mime-type>
<mime-type type="application/xml-external-parsed-entity">
<comment>XML entities document</comment>
+ <comment xml:lang="af">XML-entiteitedokument</comment>
<comment xml:lang="ar">مستند كيانات XML</comment>
<comment xml:lang="ast">Documentu d'entidaes XML</comment>
- <comment xml:lang="be@latin">Dakument elementaŭ XML</comment>
+ <comment xml:lang="be-Latn">Dakument elementaŭ XML</comment>
<comment xml:lang="bg">Документ — заместващи последователности в XML</comment>
<comment xml:lang="ca">document d'entitats XML</comment>
<comment xml:lang="cs">dokument entit XML</comment>
<comment xml:lang="da">XML-enhedsdokument</comment>
<comment xml:lang="de">XML-Dokument-Entitäten</comment>
<comment xml:lang="el">Έγγραφο οντοτήτων XML</comment>
- <comment xml:lang="en_GB">XML entities document</comment>
+ <comment xml:lang="en-GB">XML entities document</comment>
<comment xml:lang="es">documento de entidades XML</comment>
<comment xml:lang="eu">XML entitateen dokumentua</comment>
<comment xml:lang="fi">XML-entiteettiasiakirja</comment>
<comment xml:lang="fo">XML einindisskjal</comment>
<comment xml:lang="fr">document d'entités XML</comment>
+ <comment xml:lang="fur">document entitâts XML</comment>
<comment xml:lang="ga">cáipéis aonán XML</comment>
<comment xml:lang="gl">documento de entidades XML</comment>
<comment xml:lang="he">מסמך ישויות XML</comment>
@@ -37397,7 +38784,7 @@
<comment xml:lang="oc">document d'entitats XML</comment>
<comment xml:lang="pl">Dokument jednostek XML</comment>
<comment xml:lang="pt">documento de entidades XML</comment>
- <comment xml:lang="pt_BR">Documento de entidades XML</comment>
+ <comment xml:lang="pt-BR">Documento de entidades XML</comment>
<comment xml:lang="ro">Document entități XML</comment>
<comment xml:lang="ru">Файл сущностей XML</comment>
<comment xml:lang="sk">Dokument entít XML</comment>
@@ -37408,8 +38795,8 @@
<comment xml:lang="tr">XML varlıklar belgesi</comment>
<comment xml:lang="uk">документ об’єктів XML</comment>
<comment xml:lang="vi">Tài liệu thực thể XML</comment>
- <comment xml:lang="zh_CN">XML 特征文档</comment>
- <comment xml:lang="zh_TW">XML 實體文件</comment>
+ <comment xml:lang="zh-CN">XML 特征文档</comment>
+ <comment xml:lang="zh-TW">XML 實體文件</comment>
<acronym>XML</acronym>
<expanded-acronym>eXtensible Markup Language</expanded-acronym>
<sub-class-of type="application/xml"/>
@@ -37419,22 +38806,24 @@
</mime-type>
<mime-type type="video/dv">
<comment>DV video</comment>
+ <comment xml:lang="af">DV-video</comment>
<comment xml:lang="ar">DV مرئي</comment>
<comment xml:lang="ast">Videu en DV</comment>
- <comment xml:lang="be@latin">Videa DV</comment>
+ <comment xml:lang="be-Latn">Videa DV</comment>
<comment xml:lang="bg">Видео — DV</comment>
<comment xml:lang="ca">vídeo DV</comment>
<comment xml:lang="cs">video DV</comment>
<comment xml:lang="da">DV-video</comment>
<comment xml:lang="de">DV-Video</comment>
<comment xml:lang="el">Βίντεο DV</comment>
- <comment xml:lang="en_GB">DV video</comment>
+ <comment xml:lang="en-GB">DV video</comment>
<comment xml:lang="eo">DV-video</comment>
<comment xml:lang="es">vídeo DV</comment>
<comment xml:lang="eu">DV bideoa</comment>
<comment xml:lang="fi">DV-video</comment>
<comment xml:lang="fo">DV video</comment>
<comment xml:lang="fr">vidéo DV</comment>
+ <comment xml:lang="fur">video DV</comment>
<comment xml:lang="ga">físeán DV</comment>
<comment xml:lang="gl">vídeo DV</comment>
<comment xml:lang="he">וידאו DV</comment>
@@ -37455,7 +38844,7 @@
<comment xml:lang="oc">vidèo DV</comment>
<comment xml:lang="pl">Plik wideo DV</comment>
<comment xml:lang="pt">vídeo DV</comment>
- <comment xml:lang="pt_BR">Vídeo DV</comment>
+ <comment xml:lang="pt-BR">Vídeo DV</comment>
<comment xml:lang="ro">Video DV</comment>
<comment xml:lang="ru">Видео DV</comment>
<comment xml:lang="sk">Video DV</comment>
@@ -37466,21 +38855,22 @@
<comment xml:lang="tr">DV video</comment>
<comment xml:lang="uk">відеокліп DV</comment>
<comment xml:lang="vi">Ảnh động DV</comment>
- <comment xml:lang="zh_CN">DV 视频</comment>
- <comment xml:lang="zh_TW">DV 視訊</comment>
+ <comment xml:lang="zh-CN">DV 视频</comment>
+ <comment xml:lang="zh-TW">DV 視訊</comment>
<acronym>DV</acronym>
<expanded-acronym>Digital Video</expanded-acronym>
<magic priority="50">
- <match value="0x1f070000" type="big32" offset="0" mask="0xffffff00"/>
+ <match type="big32" value="0x1f070000" mask="0xffffff00" offset="0"/>
</magic>
<glob pattern="*.dv"/>
</mime-type>
<mime-type type="video/isivideo">
<comment>ISI video</comment>
+ <comment xml:lang="af">ISI-video</comment>
<comment xml:lang="ar">مرئي ISI</comment>
<comment xml:lang="ast">Videu n'ISI</comment>
<comment xml:lang="az">ISI video faylı</comment>
- <comment xml:lang="be@latin">Videa ISI</comment>
+ <comment xml:lang="be-Latn">Videa ISI</comment>
<comment xml:lang="bg">Видео — ISI</comment>
<comment xml:lang="ca">vídeo ISI</comment>
<comment xml:lang="cs">video ISI</comment>
@@ -37488,13 +38878,14 @@
<comment xml:lang="da">ISI-video</comment>
<comment xml:lang="de">ISI-Video</comment>
<comment xml:lang="el">Βίντεο ISI</comment>
- <comment xml:lang="en_GB">ISI video</comment>
+ <comment xml:lang="en-GB">ISI video</comment>
<comment xml:lang="eo">ISI-video</comment>
<comment xml:lang="es">vídeo ISI</comment>
<comment xml:lang="eu">ISI bideoa</comment>
<comment xml:lang="fi">ISI-video</comment>
<comment xml:lang="fo">ISI video</comment>
<comment xml:lang="fr">vidéo ISI</comment>
+ <comment xml:lang="fur">video ISI</comment>
<comment xml:lang="ga">físeán ISI</comment>
<comment xml:lang="gl">vídeo ISI</comment>
<comment xml:lang="he">וידאו ISI</comment>
@@ -37515,7 +38906,7 @@
<comment xml:lang="oc">vidèo ISI</comment>
<comment xml:lang="pl">Plik wideo ISI</comment>
<comment xml:lang="pt">vídeo ISI</comment>
- <comment xml:lang="pt_BR">Vídeo ISI</comment>
+ <comment xml:lang="pt-BR">Vídeo ISI</comment>
<comment xml:lang="ro">Video ISI</comment>
<comment xml:lang="ru">Видео ISI</comment>
<comment xml:lang="sk">Video ISI</comment>
@@ -37526,11 +38917,12 @@
<comment xml:lang="tr">ISI videosu</comment>
<comment xml:lang="uk">відеокліп ISI</comment>
<comment xml:lang="vi">Ảnh động ISI</comment>
- <comment xml:lang="zh_CN">ISI 视频</comment>
- <comment xml:lang="zh_TW">ISI 視訊</comment>
+ <comment xml:lang="zh-CN">ISI 视频</comment>
+ <comment xml:lang="zh-TW">ISI 視訊</comment>
</mime-type>
<mime-type type="video/mp2t">
<comment>MPEG-2 transport stream</comment>
+ <comment xml:lang="af">MPEG-2-vervoerstroom</comment>
<comment xml:lang="ar">بث نقل MPEG-2</comment>
<comment xml:lang="bg">Поток — транспорт по MPEG-2</comment>
<comment xml:lang="ca">flux de transport MPEG-2</comment>
@@ -37538,12 +38930,13 @@
<comment xml:lang="da">MPEG-2-transportstrøm</comment>
<comment xml:lang="de">MPEG-2-Transportstrom</comment>
<comment xml:lang="el">Ροή μεταφοράς MPEG-2</comment>
- <comment xml:lang="en_GB">MPEG-2 transport stream</comment>
+ <comment xml:lang="en-GB">MPEG-2 transport stream</comment>
<comment xml:lang="es">flujo de transporte MPEG-2</comment>
<comment xml:lang="eu">MPEG-2 korronte garraioa</comment>
<comment xml:lang="fi">MPEG-2 -siirtobittivirta</comment>
<comment xml:lang="fo">MPEG-2 flutningsstreymur</comment>
<comment xml:lang="fr">flux de transport MPEG-2</comment>
+ <comment xml:lang="fur">flus di traspuart MPEG-2</comment>
<comment xml:lang="ga">sruth aistrithe MPEG-2</comment>
<comment xml:lang="gl">fluxo de transporte MPEG-2</comment>
<comment xml:lang="he">העברת זרימה של MPEG-2</comment>
@@ -37562,7 +38955,7 @@
<comment xml:lang="oc">flux de transpòrt MPEG-2</comment>
<comment xml:lang="pl">Strumień przesyłania MPEG-2</comment>
<comment xml:lang="pt">fluxo de transporte MPEG-2</comment>
- <comment xml:lang="pt_BR">Fluxo de transporte de MPEG-2</comment>
+ <comment xml:lang="pt-BR">Fluxo de transporte de MPEG-2</comment>
<comment xml:lang="ro">Flux transport MPEG-2</comment>
<comment xml:lang="ru">Транспортный поток MPEG-2</comment>
<comment xml:lang="sk">MPEG-2 Transport Stream</comment>
@@ -37571,25 +38964,25 @@
<comment xml:lang="sv">MPEG-2 transportström</comment>
<comment xml:lang="tr">MPEG-2 aktarım akışı</comment>
<comment xml:lang="uk">потік передавання даних MPEG-2</comment>
- <comment xml:lang="zh_CN">MPEG-2 传输流</comment>
- <comment xml:lang="zh_TW">MPEG-2 傳輸串流</comment>
+ <comment xml:lang="zh-CN">MPEG-2 传输流</comment>
+ <comment xml:lang="zh-TW">MPEG-2 傳輸串流</comment>
<acronym>MPEG-2 TS</acronym>
<expanded-acronym>Moving Picture Experts Group 2 Transport Stream</expanded-acronym>
<magic priority="50">
- <match value="0x47" type="byte" offset="0">
- <match value="0x47" type="byte" offset="188">
- <match value="0x47" type="byte" offset="376">
- <match value="0x47" type="byte" offset="564">
- <match value="0x47" type="byte" offset="752"/>
+ <match type="byte" value="0x47" offset="0">
+ <match type="byte" value="0x47" offset="188">
+ <match type="byte" value="0x47" offset="376">
+ <match type="byte" value="0x47" offset="564">
+ <match type="byte" value="0x47" offset="752"/>
</match>
</match>
</match>
</match>
- <match value="0x47" type="byte" offset="4">
- <match value="0x47" type="byte" offset="196">
- <match value="0x47" type="byte" offset="388">
- <match value="0x47" type="byte" offset="580">
- <match value="0x47" type="byte" offset="772"/>
+ <match type="byte" value="0x47" offset="4">
+ <match type="byte" value="0x47" offset="196">
+ <match type="byte" value="0x47" offset="388">
+ <match type="byte" value="0x47" offset="580">
+ <match type="byte" value="0x47" offset="772"/>
</match>
</match>
</match>
@@ -37608,22 +39001,24 @@
</mime-type>
<mime-type type="video/mpeg">
<comment>MPEG video</comment>
+ <comment xml:lang="af">MPEG-video</comment>
<comment xml:lang="ar">MPEG مرئي</comment>
<comment xml:lang="ast">Videu en MPEG</comment>
- <comment xml:lang="be@latin">Videa MPEG</comment>
+ <comment xml:lang="be-Latn">Videa MPEG</comment>
<comment xml:lang="bg">Видео — MPEG</comment>
<comment xml:lang="ca">vídeo MPEG</comment>
<comment xml:lang="cs">video MPEG</comment>
<comment xml:lang="da">MPEG-video</comment>
<comment xml:lang="de">MPEG-Video</comment>
<comment xml:lang="el">Βίντεο MPEG</comment>
- <comment xml:lang="en_GB">MPEG video</comment>
+ <comment xml:lang="en-GB">MPEG video</comment>
<comment xml:lang="eo">MPEG-video</comment>
<comment xml:lang="es">vídeo MPEG</comment>
<comment xml:lang="eu">MPEG bideoa</comment>
<comment xml:lang="fi">MPEG-video</comment>
<comment xml:lang="fo">MPEG video</comment>
<comment xml:lang="fr">vidéo MPEG</comment>
+ <comment xml:lang="fur">video MPEG</comment>
<comment xml:lang="ga">físeán MPEG</comment>
<comment xml:lang="gl">vídeo MPEG</comment>
<comment xml:lang="he">וידאו MPEG</comment>
@@ -37645,7 +39040,7 @@
<comment xml:lang="oc">vidèo MPEG</comment>
<comment xml:lang="pl">Plik wideo MPEG</comment>
<comment xml:lang="pt">vídeo MPEG</comment>
- <comment xml:lang="pt_BR">Vídeo MPEG</comment>
+ <comment xml:lang="pt-BR">Vídeo MPEG</comment>
<comment xml:lang="ro">Video MPEG</comment>
<comment xml:lang="ru">Видео MPEG</comment>
<comment xml:lang="sk">Video MPEG</comment>
@@ -37656,8 +39051,8 @@
<comment xml:lang="tr">MPEG videosu</comment>
<comment xml:lang="uk">відеокліп MPEG</comment>
<comment xml:lang="vi">Ảnh động MPEG</comment>
- <comment xml:lang="zh_CN">MPEG 视频</comment>
- <comment xml:lang="zh_TW">MPEG 視訊</comment>
+ <comment xml:lang="zh-CN">MPEG 视频</comment>
+ <comment xml:lang="zh-TW">MPEG 視訊</comment>
<acronym>MPEG</acronym>
<expanded-acronym>Moving Picture Experts Group</expanded-acronym>
<alias type="video/x-mpeg"/>
@@ -37665,9 +39060,9 @@
<alias type="video/x-mpeg-system"/>
<alias type="video/x-mpeg2"/>
<magic priority="50">
- <match value="\x47\x3f\xff\x10" type="string" offset="0"/>
- <match value="0x000001b3" type="big32" offset="0"/>
- <match value="0x000001ba" type="big32" offset="0"/>
+ <match type="string" value="\x47\x3f\xff\x10" offset="0"/>
+ <match type="big32" value="0x000001b3" offset="0"/>
+ <match type="big32" value="0x000001ba" offset="0"/>
</magic>
<glob pattern="*.mpeg"/>
<glob pattern="*.mpg"/>
@@ -37677,50 +39072,11 @@
<glob pattern="[0-9][0-9][0-9].vdr"/>
</mime-type>
<mime-type type="video/vnd.mpegurl">
- <comment>MPEG video (streamed)</comment>
- <comment xml:lang="ast">Videu en MPEG (tresmitíu)</comment>
- <comment xml:lang="bg">Видео — MPEG, поточно</comment>
- <comment xml:lang="ca">vídeo MPEG (flux)</comment>
- <comment xml:lang="cs">video MPEG (proud)</comment>
- <comment xml:lang="da">MPEG-video (streamet)</comment>
- <comment xml:lang="de">MPEG-Video (Datenstrom)</comment>
- <comment xml:lang="el">Βίντεο MPEG (εκπεμπόμενο)</comment>
- <comment xml:lang="en_GB">MPEG video (streamed)</comment>
- <comment xml:lang="es">vídeo MPEG (transmisión)</comment>
- <comment xml:lang="eu">MPEG bideoa (korronte bidez)</comment>
- <comment xml:lang="fi">MPEG-video (virtaus)</comment>
- <comment xml:lang="fr">vidéo MPEG (flux)</comment>
- <comment xml:lang="ga">físeán MPEG (sruthaithe)</comment>
- <comment xml:lang="gl">vídeo MPEG (en stream)</comment>
- <comment xml:lang="he">קובץ MPEG (בהזרמה)</comment>
- <comment xml:lang="hr">MPEG video snimka (strujanje)</comment>
- <comment xml:lang="hu">MPEG videó (szórt)</comment>
- <comment xml:lang="ia">Video MPEG (in fluxo)</comment>
- <comment xml:lang="id">Video MPEG (di-stream-kan)</comment>
- <comment xml:lang="it">Video MPEG (streamed)</comment>
- <comment xml:lang="ja">MPEG ビデオ（ストリーム）</comment>
- <comment xml:lang="ka">MPEG ვიდეო (ნაკადი)</comment>
- <comment xml:lang="kk">MPEG видео (ағымдық)</comment>
- <comment xml:lang="ko">MPEG 동영상(스트리밍)</comment>
- <comment xml:lang="lv">MPEG video (straumēts)</comment>
- <comment xml:lang="nl">MPEG video (streamed)</comment>
- <comment xml:lang="oc">vidèo MPEG (flux)</comment>
- <comment xml:lang="pl">Plik wideo MPEG (strumień)</comment>
- <comment xml:lang="pt">vídeo MPEG (em fluxo)</comment>
- <comment xml:lang="pt_BR">Vídeo MPEG (fluxo)</comment>
- <comment xml:lang="ru">Видео MPEG (потоковое)</comment>
- <comment xml:lang="sk">MPEG video (streamované)</comment>
- <comment xml:lang="sl">MPEG-video (pretočni)</comment>
- <comment xml:lang="sr">МПЕГ видео (проточни)</comment>
- <comment xml:lang="sv">MPEG-video (strömmad)</comment>
- <comment xml:lang="tr">MPEG videosu (akış)</comment>
- <comment xml:lang="uk">відеокліп MPEG (потоковий)</comment>
- <comment xml:lang="zh_CN">MPEG 视频流媒体</comment>
- <comment xml:lang="zh_TW">MPEG 視訊 (串流)</comment>
+ <comment>Video playlist</comment>
<sub-class-of type="text/plain"/>
<alias type="video/x-mpegurl"/>
<magic priority="50">
- <match value="#EXTM4U" type="string" offset="0"/>
+ <match type="string" value="#EXTM4U" offset="0"/>
</magic>
<glob pattern="*.m1u"/>
<glob pattern="*.m4u"/>
@@ -37728,22 +39084,24 @@
</mime-type>
<mime-type type="video/quicktime">
<comment>QuickTime video</comment>
+ <comment xml:lang="af">QuickTime-video</comment>
<comment xml:lang="ar">QuickTime مرئي</comment>
<comment xml:lang="ast">Videu en QuickTime</comment>
- <comment xml:lang="be@latin">Videa QuickTime</comment>
+ <comment xml:lang="be-Latn">Videa QuickTime</comment>
<comment xml:lang="bg">Видео — QuickTime</comment>
<comment xml:lang="ca">vídeo QuickTime</comment>
<comment xml:lang="cs">video QuickTime</comment>
<comment xml:lang="da">QuickTime-video</comment>
<comment xml:lang="de">QuickTime-Video</comment>
<comment xml:lang="el">Βίντεο QuickTime</comment>
- <comment xml:lang="en_GB">QuickTime video</comment>
+ <comment xml:lang="en-GB">QuickTime video</comment>
<comment xml:lang="eo">QuickTime-video</comment>
<comment xml:lang="es">vídeo QuickTime</comment>
<comment xml:lang="eu">QuickTime bideoa</comment>
<comment xml:lang="fi">QuickTime-video</comment>
<comment xml:lang="fo">QuickTime video</comment>
<comment xml:lang="fr">vidéo QuickTime</comment>
+ <comment xml:lang="fur">video QuickTime</comment>
<comment xml:lang="ga">físeán QuickTime</comment>
<comment xml:lang="gl">vídeo QuickTime</comment>
<comment xml:lang="he">וידאו של QuickTime</comment>
@@ -37764,7 +39122,7 @@
<comment xml:lang="oc">vidèo QuickTime</comment>
<comment xml:lang="pl">Plik wideo QuickTime</comment>
<comment xml:lang="pt">vídeo QuickTime</comment>
- <comment xml:lang="pt_BR">Vídeo do QuickTime</comment>
+ <comment xml:lang="pt-BR">Vídeo do QuickTime</comment>
<comment xml:lang="ro">Video QuickTime</comment>
<comment xml:lang="ru">Видео QuickTime</comment>
<comment xml:lang="sk">Video QuickTime</comment>
@@ -37775,13 +39133,13 @@
<comment xml:lang="tr">QuickTime videosu</comment>
<comment xml:lang="uk">відеокліп QuickTime</comment>
<comment xml:lang="vi">Ảnh động QuickTime</comment>
- <comment xml:lang="zh_CN">QuickTime 视频</comment>
- <comment xml:lang="zh_TW">QuickTime 視訊</comment>
+ <comment xml:lang="zh-CN">QuickTime 视频</comment>
+ <comment xml:lang="zh-TW">QuickTime 視訊</comment>
<magic priority="50">
- <match value="mdat" type="string" offset="12"/>
- <match value="mdat" type="string" offset="4"/>
- <match value="moov" type="string" offset="4"/>
- <match value="ftypqt" type="string" offset="4"/>
+ <match type="string" value="mdat" offset="12"/>
+ <match type="string" value="mdat" offset="4"/>
+ <match type="string" value="moov" offset="4"/>
+ <match type="string" value="ftypqt" offset="4"/>
</magic>
<glob pattern="*.qt"/>
<glob pattern="*.mov"/>
@@ -37790,21 +39148,23 @@
</mime-type>
<mime-type type="image/x-quicktime">
<comment>QuickTime image</comment>
+ <comment xml:lang="af">QuickTime-beeld</comment>
<comment xml:lang="ar">صورة QuickTime</comment>
- <comment xml:lang="be@latin">Vyjava QuickTime</comment>
+ <comment xml:lang="be-Latn">Vyjava QuickTime</comment>
<comment xml:lang="bg">Изображение — QuickTime</comment>
<comment xml:lang="ca">imatge QuickTime</comment>
<comment xml:lang="cs">obrázek QuickTime</comment>
<comment xml:lang="da">QuickTime-billede</comment>
<comment xml:lang="de">QuickTime-Bild</comment>
<comment xml:lang="el">Εικόνα QuickTime</comment>
- <comment xml:lang="en_GB">QuickTime image</comment>
+ <comment xml:lang="en-GB">QuickTime image</comment>
<comment xml:lang="eo">QuickTime-bildo</comment>
<comment xml:lang="es">imagen de QuickTime</comment>
<comment xml:lang="eu">QuickTime irudia</comment>
<comment xml:lang="fi">QuickTime-kuva</comment>
<comment xml:lang="fo">QuickTime mynd</comment>
<comment xml:lang="fr">image QuickTime</comment>
+ <comment xml:lang="fur">imagjin QuickTime</comment>
<comment xml:lang="ga">íomhá QuickTime</comment>
<comment xml:lang="gl">imaxe QuickTime</comment>
<comment xml:lang="he">תמונה של QuickTime</comment>
@@ -37824,7 +39184,7 @@
<comment xml:lang="oc">imatge QuickTime</comment>
<comment xml:lang="pl">Obraz QuickTime</comment>
<comment xml:lang="pt">imagem QuickTime</comment>
- <comment xml:lang="pt_BR">Imagem do QuickTime</comment>
+ <comment xml:lang="pt-BR">Imagem do QuickTime</comment>
<comment xml:lang="ro">Imagine QuickTime</comment>
<comment xml:lang="ru">Изображение QuickTime</comment>
<comment xml:lang="sk">Obrázok QuickTime</comment>
@@ -37835,54 +39195,116 @@
<comment xml:lang="tr">QuickTime görüntüsü</comment>
<comment xml:lang="uk">зображення QuickTime</comment>
<comment xml:lang="vi">Ảnh QuickTime</comment>
- <comment xml:lang="zh_CN">QuickTime 图像</comment>
- <comment xml:lang="zh_TW">QuickTime 影像</comment>
+ <comment xml:lang="zh-CN">QuickTime 图像</comment>
+ <comment xml:lang="zh-TW">QuickTime 影像</comment>
<magic priority="50">
- <match value="idat" type="string" offset="4"/>
+ <match type="string" value="idat" offset="4"/>
</magic>
<glob pattern="*.qtif"/>
<glob pattern="*.qif"/>
</mime-type>
<mime-type type="image/ktx">
<comment>Khronos texture image</comment>
+ <comment xml:lang="af">Khronos-tekstuurbeeld</comment>
+ <comment xml:lang="bg">Изображение — текстура за Khronos</comment>
<comment xml:lang="ca">imatge de textura de Khronos</comment>
<comment xml:lang="cs">obrázek s texturou Khronos</comment>
+ <comment xml:lang="da">Khronos-strukturbillede</comment>
<comment xml:lang="de">Khronos-Texturbild</comment>
- <comment xml:lang="en_GB">Khronos texture image</comment>
+ <comment xml:lang="en-GB">Khronos texture image</comment>
<comment xml:lang="es">imagen de textura de Khronos</comment>
+ <comment xml:lang="eu">Khronos testura irudia</comment>
+ <comment xml:lang="fi">Khronos-tekstuurikuva</comment>
<comment xml:lang="fr">image de texture Khronos</comment>
+ <comment xml:lang="fur">imagjin di struture/texture Khronos</comment>
<comment xml:lang="ga">íomhá uigeachta Khronos</comment>
<comment xml:lang="hr">Khronos tekstura slika</comment>
<comment xml:lang="hu">Khronos textúra kép</comment>
- <comment xml:lang="id">citra tekstur Khronos</comment>
+ <comment xml:lang="id">Citra tekstur Khronos</comment>
<comment xml:lang="it">Immagine texture Khronos</comment>
<comment xml:lang="kk">Khronos текстура суреті</comment>
<comment xml:lang="ko">크로노스 텍스처 파일</comment>
<comment xml:lang="pl">Obraz tekstury Khronos</comment>
- <comment xml:lang="pt_BR">Imagem de textura do Khronos</comment>
+ <comment xml:lang="pt-BR">Imagem de textura do Khronos</comment>
<comment xml:lang="ru">Изображение текстуры Khronos</comment>
<comment xml:lang="sk">Obrázok textúry Khronos</comment>
<comment xml:lang="sr">слика Кронос текстуре</comment>
<comment xml:lang="sv">Khronos-texturbild</comment>
<comment xml:lang="tr">Khronos kaplama görüntüsü</comment>
<comment xml:lang="uk">зображення текстури Khronos</comment>
- <comment xml:lang="zh_CN">Khronos 纹理图像</comment>
- <comment xml:lang="zh_TW">Khronos 紋理影像</comment>
+ <comment xml:lang="zh-CN">Khronos 纹理图像</comment>
+ <comment xml:lang="zh-TW">Khronos 紋理影像</comment>
<magic priority="80">
- <match value="0xAB4B5458" type="big32" offset="0">
- <match value="0x203131BB" type="big32" offset="4">
- <match value="0x0D0A1A0A" type="big32" offset="8"/>
+ <match type="big32" value="0xAB4B5458" offset="0">
+ <match type="big32" value="0x203131BB" offset="4">
+ <match type="big32" value="0x0D0A1A0A" offset="8"/>
</match>
</match>
</magic>
<glob pattern="*.ktx"/>
</mime-type>
+ <mime-type type="image/ktx2">
+ <comment>Khronos texture image</comment>
+ <comment xml:lang="af">Khronos-tekstuurbeeld</comment>
+ <comment xml:lang="bg">Изображение — текстура за Khronos</comment>
+ <comment xml:lang="ca">imatge de textura de Khronos</comment>
+ <comment xml:lang="cs">obrázek s texturou Khronos</comment>
+ <comment xml:lang="da">Khronos-strukturbillede</comment>
+ <comment xml:lang="de">Khronos-Texturbild</comment>
+ <comment xml:lang="en-GB">Khronos texture image</comment>
+ <comment xml:lang="es">imagen de textura de Khronos</comment>
+ <comment xml:lang="eu">Khronos testura irudia</comment>
+ <comment xml:lang="fi">Khronos-tekstuurikuva</comment>
+ <comment xml:lang="fr">image de texture Khronos</comment>
+ <comment xml:lang="fur">imagjin di struture/texture Khronos</comment>
+ <comment xml:lang="ga">íomhá uigeachta Khronos</comment>
+ <comment xml:lang="hr">Khronos tekstura slika</comment>
+ <comment xml:lang="hu">Khronos textúra kép</comment>
+ <comment xml:lang="id">Citra tekstur Khronos</comment>
+ <comment xml:lang="it">Immagine texture Khronos</comment>
+ <comment xml:lang="kk">Khronos текстура суреті</comment>
+ <comment xml:lang="ko">크로노스 텍스처 파일</comment>
+ <comment xml:lang="pl">Obraz tekstury Khronos</comment>
+ <comment xml:lang="pt-BR">Imagem de textura do Khronos</comment>
+ <comment xml:lang="ru">Изображение текстуры Khronos</comment>
+ <comment xml:lang="sk">Obrázok textúry Khronos</comment>
+ <comment xml:lang="sr">слика Кронос текстуре</comment>
+ <comment xml:lang="sv">Khronos-texturbild</comment>
+ <comment xml:lang="tr">Khronos kaplama görüntüsü</comment>
+ <comment xml:lang="uk">зображення текстури Khronos</comment>
+ <comment xml:lang="zh-CN">Khronos 纹理图像</comment>
+ <comment xml:lang="zh-TW">Khronos 紋理影像</comment>
+ <magic priority="80">
+ <match type="big32" value="0xAB4B5458" offset="0">
+ <match type="big32" value="0x203230BB" offset="4">
+ <match type="big32" value="0x0D0A1A0A" offset="8"/>
+ </match>
+ </match>
+ </magic>
+ <glob pattern="*.ktx2"/>
+ </mime-type>
+ <mime-type type="image/astc">
+ <comment>ASTC texture</comment>
+ <comment xml:lang="ca">textura ASTC</comment>
+ <comment xml:lang="fi">ASTC tekstuuri</comment>
+ <comment xml:lang="it">Texture ASTC</comment>
+ <comment xml:lang="pl">Tekstura ASTC</comment>
+ <comment xml:lang="pt-BR">Textura ASTC</comment>
+ <comment xml:lang="uk">текстура ASTC</comment>
+ <acronym>ASTC</acronym>
+ <expanded-acronym>Advanced Scalable Texture Compression</expanded-acronym>
+ <glob pattern="*.astc"/>
+ <magic priority="80">
+ <match type="little32" value="0x5CA1AB13" offset="0"/>
+ </magic>
+ </mime-type>
<mime-type type="video/vnd.vivo">
<comment>Vivo video</comment>
+ <comment xml:lang="af">Vivo-video</comment>
<comment xml:lang="ar">Vivo مرئي</comment>
<comment xml:lang="ast">Videu en Vivo</comment>
<comment xml:lang="az">Vivo video faylı</comment>
- <comment xml:lang="be@latin">Videa Vivo</comment>
+ <comment xml:lang="be-Latn">Videa Vivo</comment>
<comment xml:lang="bg">Видео — Vivo</comment>
<comment xml:lang="ca">vídeo Vivo</comment>
<comment xml:lang="cs">video Vivo</comment>
@@ -37890,13 +39312,14 @@
<comment xml:lang="da">Vivo-video</comment>
<comment xml:lang="de">Vivo-Video</comment>
<comment xml:lang="el">Βίντεο Vivo</comment>
- <comment xml:lang="en_GB">Vivo video</comment>
+ <comment xml:lang="en-GB">Vivo video</comment>
<comment xml:lang="eo">Vivo-video</comment>
<comment xml:lang="es">vídeo Vivo</comment>
<comment xml:lang="eu">Vivo bideoa</comment>
<comment xml:lang="fi">Vivo-video</comment>
<comment xml:lang="fo">Vivo video</comment>
<comment xml:lang="fr">vidéo Vivo</comment>
+ <comment xml:lang="fur">video Vivo</comment>
<comment xml:lang="ga">físeán Vivo</comment>
<comment xml:lang="gl">vídeo Vivo</comment>
<comment xml:lang="he">וידאו של Vivo</comment>
@@ -37917,7 +39340,7 @@
<comment xml:lang="oc">vidèo Vivo</comment>
<comment xml:lang="pl">Plik wideo Vivo</comment>
<comment xml:lang="pt">vídeo Vivo</comment>
- <comment xml:lang="pt_BR">Vídeo Vivo</comment>
+ <comment xml:lang="pt-BR">Vídeo Vivo</comment>
<comment xml:lang="ro">Video Vivo</comment>
<comment xml:lang="ru">Видео Vivo</comment>
<comment xml:lang="sk">Video Vivo</comment>
@@ -37928,32 +39351,34 @@
<comment xml:lang="tr">Vivo videosu</comment>
<comment xml:lang="uk">відео Vivo</comment>
<comment xml:lang="vi">Ảnh động Vivo</comment>
- <comment xml:lang="zh_CN">Vivo 视频</comment>
- <comment xml:lang="zh_TW">Vivo 視訊</comment>
+ <comment xml:lang="zh-CN">Vivo 视频</comment>
+ <comment xml:lang="zh-TW">Vivo 視訊</comment>
<alias type="video/vivo"/>
<glob pattern="*.viv"/>
<glob pattern="*.vivo"/>
</mime-type>
<mime-type type="video/wavelet">
<comment>Wavelet video</comment>
+ <comment xml:lang="af">Wavelet-video</comment>
<comment xml:lang="ar">Wavelet مرئي</comment>
<comment xml:lang="ast">Videu en Wavelet</comment>
<comment xml:lang="az">Wavelet video faylı</comment>
- <comment xml:lang="be@latin">Videa Wavelet</comment>
+ <comment xml:lang="be-Latn">Videa Wavelet</comment>
<comment xml:lang="bg">Видео — Wavelet</comment>
<comment xml:lang="ca">vídeo Wavelet</comment>
<comment xml:lang="cs">video Wavelet</comment>
<comment xml:lang="cy">Fideo Wavelet</comment>
- <comment xml:lang="da">Waveletvideo</comment>
+ <comment xml:lang="da">Wavelet-video</comment>
<comment xml:lang="de">Wavelet-Video</comment>
<comment xml:lang="el">Βίντεο Wavelet</comment>
- <comment xml:lang="en_GB">Wavelet video</comment>
+ <comment xml:lang="en-GB">Wavelet video</comment>
<comment xml:lang="eo">Wavelet-video</comment>
<comment xml:lang="es">vídeo Wavelet</comment>
<comment xml:lang="eu">Wavelet bideoa</comment>
<comment xml:lang="fi">Wavelet-video</comment>
<comment xml:lang="fo">Wavelet video</comment>
<comment xml:lang="fr">vidéo Wavelet</comment>
+ <comment xml:lang="fur">video Wavelet</comment>
<comment xml:lang="ga">físeán Wavelet</comment>
<comment xml:lang="gl">vídeo Wavelet</comment>
<comment xml:lang="he">וידאו של Wavelet</comment>
@@ -37974,7 +39399,7 @@
<comment xml:lang="oc">vidèo Wavelet</comment>
<comment xml:lang="pl">Plik wideo Wavelet</comment>
<comment xml:lang="pt">vídeo Wavelet</comment>
- <comment xml:lang="pt_BR">Vídeo Wavelet</comment>
+ <comment xml:lang="pt-BR">Vídeo Wavelet</comment>
<comment xml:lang="ro">Video Wavelet</comment>
<comment xml:lang="ru">Видео Wavelet</comment>
<comment xml:lang="sk">Video Wavelet</comment>
@@ -37985,14 +39410,15 @@
<comment xml:lang="tr">Wavelet videosu</comment>
<comment xml:lang="uk">відеокліп Wavelet</comment>
<comment xml:lang="vi">Ảnh động Wavelet</comment>
- <comment xml:lang="zh_CN">Wavelet 视频</comment>
- <comment xml:lang="zh_TW">Wavelet 視訊</comment>
+ <comment xml:lang="zh-CN">Wavelet 视频</comment>
+ <comment xml:lang="zh-TW">Wavelet 視訊</comment>
</mime-type>
<mime-type type="video/x-anim">
<comment>ANIM animation</comment>
+ <comment xml:lang="af">ANIM-animasie</comment>
<comment xml:lang="ar">تحريكة ANIM</comment>
<comment xml:lang="az">ANIM animasiyası</comment>
- <comment xml:lang="be@latin">Animacyja ANIM</comment>
+ <comment xml:lang="be-Latn">Animacyja ANIM</comment>
<comment xml:lang="bg">Анимация — ANIM</comment>
<comment xml:lang="ca">animació ANIM</comment>
<comment xml:lang="cs">animace ANIM</comment>
@@ -38000,13 +39426,14 @@
<comment xml:lang="da">ANIM-animation</comment>
<comment xml:lang="de">ANIM-Animation</comment>
<comment xml:lang="el">Κινούμενο σχέδιο ANIM</comment>
- <comment xml:lang="en_GB">ANIM animation</comment>
+ <comment xml:lang="en-GB">ANIM animation</comment>
<comment xml:lang="eo">ANIM-animacio</comment>
<comment xml:lang="es">animación ANIM</comment>
<comment xml:lang="eu">ANIM animazioa</comment>
<comment xml:lang="fi">ANIM-animaatio</comment>
<comment xml:lang="fo">ANIM teknmyndagerð</comment>
<comment xml:lang="fr">animation ANIM</comment>
+ <comment xml:lang="fur">animazion ANIM</comment>
<comment xml:lang="ga">beochan ANIM</comment>
<comment xml:lang="gl">animación ANIM</comment>
<comment xml:lang="he">הנפשת ANIM</comment>
@@ -38028,7 +39455,7 @@
<comment xml:lang="oc">animacion ANIM</comment>
<comment xml:lang="pl">Plik animacji ANIM</comment>
<comment xml:lang="pt">animação ANIM</comment>
- <comment xml:lang="pt_BR">Animação ANIM</comment>
+ <comment xml:lang="pt-BR">Animação ANIM</comment>
<comment xml:lang="ro">Animație ANIM</comment>
<comment xml:lang="ru">Анимация ANIM</comment>
<comment xml:lang="sk">Animácia ANIM</comment>
@@ -38039,26 +39466,28 @@
<comment xml:lang="tr">ANIM canlandırması</comment>
<comment xml:lang="uk">анімація ANIM</comment>
<comment xml:lang="vi">Hoạt ảnh ANIM</comment>
- <comment xml:lang="zh_CN">ANIM 动画</comment>
- <comment xml:lang="zh_TW">ANIM 動畫</comment>
+ <comment xml:lang="zh-CN">ANIM 动画</comment>
+ <comment xml:lang="zh-TW">ANIM 動畫</comment>
<glob pattern="*.anim[1-9j]"/>
</mime-type>
<mime-type type="video/x-flic">
<comment>FLIC animation</comment>
+ <comment xml:lang="af">FLIC-animasie</comment>
<comment xml:lang="ar">تحريكة FLIC</comment>
- <comment xml:lang="be@latin">Animacyja FLIC</comment>
+ <comment xml:lang="be-Latn">Animacyja FLIC</comment>
<comment xml:lang="bg">Анимация — FLIC</comment>
<comment xml:lang="ca">animació FLIC</comment>
<comment xml:lang="cs">animace FLIC</comment>
<comment xml:lang="da">FLIC-animation</comment>
<comment xml:lang="de">FLIC-Animation</comment>
<comment xml:lang="el">Κινούμενο σχέδιο FLIC</comment>
- <comment xml:lang="en_GB">FLIC animation</comment>
+ <comment xml:lang="en-GB">FLIC animation</comment>
<comment xml:lang="es">animación FLIC</comment>
<comment xml:lang="eu">FLIC animazioa</comment>
<comment xml:lang="fi">FLIC-animaatio</comment>
<comment xml:lang="fo">FLIC teknimyndagerð</comment>
<comment xml:lang="fr">animation FLIC</comment>
+ <comment xml:lang="fur">animazion FLIC</comment>
<comment xml:lang="ga">beochan FLIC</comment>
<comment xml:lang="gl">animación FLIC</comment>
<comment xml:lang="he">הנפשת FLIC</comment>
@@ -38079,7 +39508,7 @@
<comment xml:lang="oc">animacion FLIC</comment>
<comment xml:lang="pl">Plik animacji FLIC</comment>
<comment xml:lang="pt">animação FLIC</comment>
- <comment xml:lang="pt_BR">Animação FLIC</comment>
+ <comment xml:lang="pt-BR">Animação FLIC</comment>
<comment xml:lang="ro">Animație FLIC</comment>
<comment xml:lang="ru">Анимация FLIC</comment>
<comment xml:lang="sk">Animácia FLIC</comment>
@@ -38090,34 +39519,36 @@
<comment xml:lang="tr">FLIC animasyonu</comment>
<comment xml:lang="uk">анімація FLIC</comment>
<comment xml:lang="vi">Hoạt ảnh FLIC</comment>
- <comment xml:lang="zh_CN">FLIC 动画</comment>
- <comment xml:lang="zh_TW">FLIC 動畫</comment>
+ <comment xml:lang="zh-CN">FLIC 动画</comment>
+ <comment xml:lang="zh-TW">FLIC 動畫</comment>
<alias type="video/fli"/>
<alias type="video/x-fli"/>
<magic priority="50">
- <match value="0xAF11" type="little16" offset="0"/>
- <match value="0xAF12" type="little16" offset="0"/>
+ <match type="little16" value="0xAF11" offset="0"/>
+ <match type="little16" value="0xAF12" offset="0"/>
</magic>
<glob pattern="*.fli"/>
<glob pattern="*.flc"/>
</mime-type>
<mime-type type="application/x-hwp">
<comment>Haansoft Hangul document</comment>
+ <comment xml:lang="af">Haansoft Hangul-dokument</comment>
<comment xml:lang="ar">مستند Haansoft Hangul</comment>
<comment xml:lang="ast">Documentu de Haansoft Hangul</comment>
- <comment xml:lang="be@latin">Dakument Haansoft Hangul</comment>
+ <comment xml:lang="be-Latn">Dakument Haansoft Hangul</comment>
<comment xml:lang="bg">Документ — Haansoft Hangul</comment>
<comment xml:lang="ca">document d'Haansoft Hangul</comment>
<comment xml:lang="cs">dokument Haansoft Hangul</comment>
<comment xml:lang="da">Haansoft Hangul-dokument</comment>
<comment xml:lang="de">Haansoft-Hangul-Dokument</comment>
<comment xml:lang="el">Έγγραφο Haansoft Hangul</comment>
- <comment xml:lang="en_GB">Haansoft Hangul document</comment>
+ <comment xml:lang="en-GB">Haansoft Hangul document</comment>
<comment xml:lang="es">documento de Haansoft Hangul</comment>
<comment xml:lang="eu">Haansoft Hangul dokumentua</comment>
<comment xml:lang="fi">Haansoft Hangul -asiakirja</comment>
<comment xml:lang="fo">Haansoft Hangul skjal</comment>
<comment xml:lang="fr">document Haansoft Hangul</comment>
+ <comment xml:lang="fur">document Haansoft Hangul</comment>
<comment xml:lang="ga">cáipéis Haansoft Hangul</comment>
<comment xml:lang="gl">documento de Haansoft Hangul</comment>
<comment xml:lang="he">מסמך Haansoft Hangul</comment>
@@ -38137,7 +39568,7 @@
<comment xml:lang="oc">document Haansoft Hangul</comment>
<comment xml:lang="pl">Dokument Haansoft Hangul</comment>
<comment xml:lang="pt">documento Haansoft Hangul</comment>
- <comment xml:lang="pt_BR">Documento do Haansoft Hangul</comment>
+ <comment xml:lang="pt-BR">Documento do Haansoft Hangul</comment>
<comment xml:lang="ro">Document Haansoft Hangul</comment>
<comment xml:lang="ru">Документ Haansoft Hangul</comment>
<comment xml:lang="sk">Dokument Haansoft Hangul</comment>
@@ -38148,32 +39579,34 @@
<comment xml:lang="tr">Haansoft Hangul belgesi</comment>
<comment xml:lang="uk">документ Haansoft Hangul</comment>
<comment xml:lang="vi">Tài liệu Hangul Haansoft</comment>
- <comment xml:lang="zh_CN">Haansoft Hangul 文档</comment>
- <comment xml:lang="zh_TW">Haansoft 韓文文件</comment>
+ <comment xml:lang="zh-CN">Haansoft Hangul 文档</comment>
+ <comment xml:lang="zh-TW">Haansoft 韓文文件</comment>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="HWP Document File" type="string" offset="0"/>
+ <match type="string" value="HWP Document File" offset="0"/>
</magic>
<glob pattern="*.hwp"/>
<alias type="application/vnd.haansoft-hwp"/>
</mime-type>
<mime-type type="application/x-hwt">
<comment>Haansoft Hangul document template</comment>
+ <comment xml:lang="af">Haansoft Hangul-dokumentsjabloon</comment>
<comment xml:lang="ar">قالب مستند Haansoft Hangul</comment>
<comment xml:lang="ast">Plantía de documentu de Haansoft Hangul</comment>
- <comment xml:lang="be@latin">Šablon dakumentu Haansoft Hangul</comment>
+ <comment xml:lang="be-Latn">Šablon dakumentu Haansoft Hangul</comment>
<comment xml:lang="bg">Шаблон за документи — Haansoft Hangul</comment>
<comment xml:lang="ca">plantilla de document d'Haansoft Hangul</comment>
<comment xml:lang="cs">šablona dokumentu Haansoft Hangul</comment>
<comment xml:lang="da">Haansoft Hangul-dokumentskabelon</comment>
<comment xml:lang="de">Haansoft-Hangul-Dokumentvorlage</comment>
<comment xml:lang="el">Πρότυπο εγγράφου Haansoft Hangul</comment>
- <comment xml:lang="en_GB">Haansoft Hangul document template</comment>
+ <comment xml:lang="en-GB">Haansoft Hangul document template</comment>
<comment xml:lang="es">plantilla de documento de Haansoft Hangul</comment>
<comment xml:lang="eu">Haansoft Hangul dokumentuaren txantiloia</comment>
<comment xml:lang="fi">Haansoft Hangul -asiakirjamalli</comment>
<comment xml:lang="fo">Haansoft Hangul skjalaformur</comment>
<comment xml:lang="fr">modèle de document Haansoft Hangul</comment>
+ <comment xml:lang="fur">model document Haansoft Hangul</comment>
<comment xml:lang="ga">teimpléad cháipéis Haansoft Hangul</comment>
<comment xml:lang="gl">modelo de documento de Haansoft Hangul</comment>
<comment xml:lang="he">תבנית מסמך של Haansoft Hangul</comment>
@@ -38193,7 +39626,7 @@
<comment xml:lang="oc">modèl de document Haansoft Hangul</comment>
<comment xml:lang="pl">Szablon dokumentu Haansoft Hangul</comment>
<comment xml:lang="pt">modelo de documento Haansoft Hangul</comment>
- <comment xml:lang="pt_BR">Modelo de documento do Haansoft Hangul</comment>
+ <comment xml:lang="pt-BR">Modelo de documento do Haansoft Hangul</comment>
<comment xml:lang="ro">Document șablon Haansoft Hangul</comment>
<comment xml:lang="ru">Шаблон документа Haansoft Hangul</comment>
<comment xml:lang="sk">Šablóna dokumentu Haansoft Hangul</comment>
@@ -38204,29 +39637,31 @@
<comment xml:lang="tr">Haansoft Hangul belge şablonu</comment>
<comment xml:lang="uk">шаблон документа Haansoft Hangul</comment>
<comment xml:lang="vi">Mẫu tài liệu Hangul Haansoft</comment>
- <comment xml:lang="zh_CN">Haansoft Hangul 文档模板</comment>
- <comment xml:lang="zh_TW">Haansoft 韓文文件範本</comment>
+ <comment xml:lang="zh-CN">Haansoft Hangul 文档模板</comment>
+ <comment xml:lang="zh-TW">Haansoft 韓文文件範本</comment>
<generic-icon name="x-office-document"/>
<glob pattern="*.hwt"/>
<alias type="application/vnd.haansoft-hwt"/>
</mime-type>
<mime-type type="video/x-mng">
<comment>MNG animation</comment>
+ <comment xml:lang="af">MNG-animasie</comment>
<comment xml:lang="ar">تحريكة MNG</comment>
- <comment xml:lang="be@latin">Animacyja MNG</comment>
+ <comment xml:lang="be-Latn">Animacyja MNG</comment>
<comment xml:lang="bg">Анимация — MNG</comment>
<comment xml:lang="ca">animació MNG</comment>
<comment xml:lang="cs">animace MNG</comment>
<comment xml:lang="da">MNG-animation</comment>
<comment xml:lang="de">MNG-Animation</comment>
<comment xml:lang="el">Κινούμενο σχέδιο MNG</comment>
- <comment xml:lang="en_GB">MNG animation</comment>
+ <comment xml:lang="en-GB">MNG animation</comment>
<comment xml:lang="eo">MNG-animacio</comment>
<comment xml:lang="es">animación MNG</comment>
<comment xml:lang="eu">MNG animazioa</comment>
<comment xml:lang="fi">MNG-animaatio</comment>
<comment xml:lang="fo">MNG teknimyndagerð</comment>
<comment xml:lang="fr">animation MNG</comment>
+ <comment xml:lang="fur">animazion MNG</comment>
<comment xml:lang="ga">beochan MNG</comment>
<comment xml:lang="gl">animación MNG</comment>
<comment xml:lang="he">הנפשת MNG</comment>
@@ -38247,7 +39682,7 @@
<comment xml:lang="oc">animacion MNG</comment>
<comment xml:lang="pl">Animacja MNG</comment>
<comment xml:lang="pt">animação MNG</comment>
- <comment xml:lang="pt_BR">Animação MNG</comment>
+ <comment xml:lang="pt-BR">Animação MNG</comment>
<comment xml:lang="ro">Animație MNG</comment>
<comment xml:lang="ru">Анимация MNG</comment>
<comment xml:lang="sk">Animácia MNG</comment>
@@ -38258,33 +39693,35 @@
<comment xml:lang="tr">MNG canlandırması</comment>
<comment xml:lang="uk">анімація MNG</comment>
<comment xml:lang="vi">Hoạt ảnh MNG</comment>
- <comment xml:lang="zh_CN">MNG 动画</comment>
- <comment xml:lang="zh_TW">MNG 動畫</comment>
+ <comment xml:lang="zh-CN">MNG 动画</comment>
+ <comment xml:lang="zh-TW">MNG 動畫</comment>
<acronym>MNG</acronym>
<expanded-acronym>Multiple-Image Network Graphics</expanded-acronym>
<magic priority="50">
- <match value="\x8AMNG\x0D\x0A\x1A\x0A" type="string" offset="0"/>
+ <match type="string" value="\x8AMNG\x0D\x0A\x1A\x0A" offset="0"/>
</magic>
<glob pattern="*.mng"/>
</mime-type>
<mime-type type="application/vnd.ms-asf">
<comment>ASF video</comment>
+ <comment xml:lang="af">ASF-video</comment>
<comment xml:lang="ar">ASF مرئي</comment>
<comment xml:lang="ast">Videu n'ASF</comment>
- <comment xml:lang="be@latin">Videa ASF</comment>
+ <comment xml:lang="be-Latn">Videa ASF</comment>
<comment xml:lang="bg">Видео — ASF</comment>
<comment xml:lang="ca">vídeo ASF</comment>
<comment xml:lang="cs">video ASF</comment>
<comment xml:lang="da">ASF-video</comment>
<comment xml:lang="de">ASF-Video</comment>
<comment xml:lang="el">Βίντεο ASF</comment>
- <comment xml:lang="en_GB">ASF video</comment>
+ <comment xml:lang="en-GB">ASF video</comment>
<comment xml:lang="eo">ASF-video</comment>
<comment xml:lang="es">vídeo ASF</comment>
<comment xml:lang="eu">ASF bideoa</comment>
<comment xml:lang="fi">ASF-video</comment>
<comment xml:lang="fo">ASF video</comment>
<comment xml:lang="fr">vidéo ASF</comment>
+ <comment xml:lang="fur">video ASF</comment>
<comment xml:lang="ga">físeán ASF</comment>
<comment xml:lang="gl">vídeo ASF</comment>
<comment xml:lang="he">וידאו ASF</comment>
@@ -38305,7 +39742,7 @@
<comment xml:lang="oc">vidèo ASF</comment>
<comment xml:lang="pl">Plik wideo ASF</comment>
<comment xml:lang="pt">vídeo ASF</comment>
- <comment xml:lang="pt_BR">Vídeo ASF</comment>
+ <comment xml:lang="pt-BR">Vídeo ASF</comment>
<comment xml:lang="ro">Video ASF</comment>
<comment xml:lang="ru">Видео ASF</comment>
<comment xml:lang="sk">Video ASF</comment>
@@ -38316,8 +39753,8 @@
<comment xml:lang="tr">ASF videosu</comment>
<comment xml:lang="uk">відеокліп ASF</comment>
<comment xml:lang="vi">Ảnh động ASF</comment>
- <comment xml:lang="zh_CN">ASF 视频</comment>
- <comment xml:lang="zh_TW">ASF 視訊</comment>
+ <comment xml:lang="zh-CN">ASF 视频</comment>
+ <comment xml:lang="zh-TW">ASF 視訊</comment>
<acronym>ASF</acronym>
<expanded-acronym>Advanced Streaming Format</expanded-acronym>
<alias type="video/x-ms-wm"/>
@@ -38325,26 +39762,28 @@
<alias type="video/x-ms-asf-plugin"/>
<glob pattern="*.asf"/>
<magic priority="50">
- <match value="0x3026b275" type="big32" offset="0"/>
- <match value="[Reference]" type="string" offset="0"/>
+ <match type="big32" value="0x3026b275" offset="0"/>
+ <match type="string" value="[Reference]" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-netshow-channel">
<comment>Windows Media Station file</comment>
+ <comment xml:lang="af">Windows Media Station-lêer</comment>
<comment xml:lang="ar">ملف محطة Windows Media</comment>
- <comment xml:lang="be@latin">Fajł Windows Media Station</comment>
+ <comment xml:lang="be-Latn">Fajł Windows Media Station</comment>
<comment xml:lang="bg">Файл — Windows Media Station</comment>
<comment xml:lang="ca">fitxer de Windows Media Station</comment>
<comment xml:lang="cs">soubor Windows Media Station</comment>
<comment xml:lang="da">Windows Media Station-fil</comment>
<comment xml:lang="de">Windows-Media-Streamingbeschreibung</comment>
<comment xml:lang="el">Αρχείο Windows Media Station</comment>
- <comment xml:lang="en_GB">Windows Media Station file</comment>
+ <comment xml:lang="en-GB">Windows Media Station file</comment>
<comment xml:lang="es">archivo de emisora de Windows Media</comment>
<comment xml:lang="eu">Windows Media Station fitxategia</comment>
<comment xml:lang="fi">Windows Media Station-tiedosto</comment>
<comment xml:lang="fo">Windows Media Station fíla</comment>
<comment xml:lang="fr">fichier Windows Media Station</comment>
+ <comment xml:lang="fur">file Windows Media Station</comment>
<comment xml:lang="ga">comhad Windows Media Station</comment>
<comment xml:lang="gl">ficheiro de emisora de Windows Media</comment>
<comment xml:lang="he">קובץ תחנה של Windows Media</comment>
@@ -38364,7 +39803,7 @@
<comment xml:lang="oc">fichièr Windows Media Station</comment>
<comment xml:lang="pl">Plik Windows Media Station</comment>
<comment xml:lang="pt">ficheiro Windows Media Station</comment>
- <comment xml:lang="pt_BR">Arquivo de estação do Windows Media</comment>
+ <comment xml:lang="pt-BR">Arquivo de estação do Windows Media</comment>
<comment xml:lang="ro">Fișier Windows Media Station</comment>
<comment xml:lang="ru">Файл Windows Media Station</comment>
<comment xml:lang="sk">Súbor Windows Media Station</comment>
@@ -38375,32 +39814,34 @@
<comment xml:lang="tr">Windows Media Station dosyası</comment>
<comment xml:lang="uk">файл Windows Media Station</comment>
<comment xml:lang="vi">Tập tin Windows Media Station</comment>
- <comment xml:lang="zh_CN">Windows 媒体工作站文件</comment>
- <comment xml:lang="zh_TW">Windows Media Station 檔</comment>
+ <comment xml:lang="zh-CN">Windows 媒体工作站文件</comment>
+ <comment xml:lang="zh-TW">Windows Media Station 檔</comment>
<sub-class-of type="application/vnd.ms-asf"/>
<generic-icon name="video-x-generic"/>
<glob pattern="*.nsc"/>
<magic priority="50">
- <match value="[Address]" type="string" offset="0"/>
+ <match type="string" value="[Address]" offset="0"/>
</magic>
</mime-type>
<mime-type type="video/x-ms-wmv">
<comment>Windows Media video</comment>
+ <comment xml:lang="af">Windows Media-video</comment>
<comment xml:lang="ar">Windows Media مرئي</comment>
<comment xml:lang="ast">Videu de Windows Media</comment>
- <comment xml:lang="be@latin">Videa Windows Media</comment>
+ <comment xml:lang="be-Latn">Videa Windows Media</comment>
<comment xml:lang="bg">Видео — Windows Media</comment>
<comment xml:lang="ca">vídeo de Windows Media</comment>
<comment xml:lang="cs">video Windows Media</comment>
<comment xml:lang="da">Windows Medie-video</comment>
<comment xml:lang="de">Windows-Media-Video</comment>
<comment xml:lang="el">Βίντεο Windows Media</comment>
- <comment xml:lang="en_GB">Windows Media video</comment>
+ <comment xml:lang="en-GB">Windows Media video</comment>
<comment xml:lang="es">vídeo de Windows Media</comment>
<comment xml:lang="eu">Windows Media bideoa</comment>
<comment xml:lang="fi">Windows Media -video</comment>
<comment xml:lang="fo">Windows Media video</comment>
<comment xml:lang="fr">vidéo Windows Media</comment>
+ <comment xml:lang="fur">video Windows Media</comment>
<comment xml:lang="ga">físeán Windows Media</comment>
<comment xml:lang="gl">vídeo de Windows Media</comment>
<comment xml:lang="he">וידאו של Windows Media</comment>
@@ -38420,7 +39861,7 @@
<comment xml:lang="oc">vidèo Windows Media</comment>
<comment xml:lang="pl">Plik wideo Windows Media</comment>
<comment xml:lang="pt">vídeo Windows Media</comment>
- <comment xml:lang="pt_BR">Vídeo do Windows Media</comment>
+ <comment xml:lang="pt-BR">Vídeo do Windows Media</comment>
<comment xml:lang="ro">Video Windows Media</comment>
<comment xml:lang="ru">Видео Windows Media</comment>
<comment xml:lang="sk">Video Windows Media</comment>
@@ -38431,17 +39872,18 @@
<comment xml:lang="tr">Windows Media videosu</comment>
<comment xml:lang="uk">відеокліп Windows Media</comment>
<comment xml:lang="vi">Ảnh động Windows Media</comment>
- <comment xml:lang="zh_CN">Windows Media 视频</comment>
- <comment xml:lang="zh_TW">Windows Media 視訊</comment>
+ <comment xml:lang="zh-CN">Windows Media 视频</comment>
+ <comment xml:lang="zh-TW">Windows Media 視訊</comment>
<sub-class-of type="application/vnd.ms-asf"/>
<glob pattern="*.wmv"/>
</mime-type>
<mime-type type="video/x-msvideo">
<comment>AVI video</comment>
+ <comment xml:lang="af">AVI-video</comment>
<comment xml:lang="ar">AVI مرئي</comment>
<comment xml:lang="ast">Videu n'AVI</comment>
<comment xml:lang="az">AVI video faylı</comment>
- <comment xml:lang="be@latin">Videa AVI</comment>
+ <comment xml:lang="be-Latn">Videa AVI</comment>
<comment xml:lang="bg">Видео — AVI</comment>
<comment xml:lang="ca">vídeo AVI</comment>
<comment xml:lang="cs">video AVI</comment>
@@ -38449,13 +39891,14 @@
<comment xml:lang="da">AVI-video</comment>
<comment xml:lang="de">AVI-Video</comment>
<comment xml:lang="el">Βίντεο AVI</comment>
- <comment xml:lang="en_GB">AVI video</comment>
+ <comment xml:lang="en-GB">AVI video</comment>
<comment xml:lang="eo">AVI-video</comment>
<comment xml:lang="es">vídeo AVI</comment>
<comment xml:lang="eu">AVI bideoa</comment>
<comment xml:lang="fi">AVI-video</comment>
<comment xml:lang="fo">AVI video</comment>
<comment xml:lang="fr">vidéo AVI</comment>
+ <comment xml:lang="fur">video AVI</comment>
<comment xml:lang="ga">físeán AVI</comment>
<comment xml:lang="gl">vídeo AVI</comment>
<comment xml:lang="he">וידאו AVI</comment>
@@ -38477,7 +39920,7 @@
<comment xml:lang="oc">vidèo AVI</comment>
<comment xml:lang="pl">Plik wideo AVI</comment>
<comment xml:lang="pt">vídeo AVI</comment>
- <comment xml:lang="pt_BR">Vídeo AVI</comment>
+ <comment xml:lang="pt-BR">Vídeo AVI</comment>
<comment xml:lang="ro">Video AVI</comment>
<comment xml:lang="ru">Видео AVI</comment>
<comment xml:lang="sk">Video AVI</comment>
@@ -38488,8 +39931,8 @@
<comment xml:lang="tr">AVI videosu</comment>
<comment xml:lang="uk">відеокліп AVI</comment>
<comment xml:lang="vi">Ảnh động AVI</comment>
- <comment xml:lang="zh_CN">AVI 视频</comment>
- <comment xml:lang="zh_TW">AVI 視訊</comment>
+ <comment xml:lang="zh-CN">AVI 视频</comment>
+ <comment xml:lang="zh-TW">AVI 視訊</comment>
<acronym>AVI</acronym>
<expanded-acronym>Audio Video Interleave</expanded-acronym>
<alias type="video/x-avi"/>
@@ -38498,11 +39941,11 @@
<alias type="video/msvideo"/>
<alias type="video/vnd.divx"/>
<magic priority="50">
- <match value="RIFF" type="string" offset="0">
- <match value="AVI " type="string" offset="8"/>
+ <match type="string" value="RIFF" offset="0">
+ <match type="string" value="AVI " offset="8"/>
</match>
- <match value="AVF0" type="string" offset="0">
- <match value="AVI " type="string" offset="8"/>
+ <match type="string" value="AVF0" offset="0">
+ <match type="string" value="AVI " offset="8"/>
</match>
</magic>
<glob pattern="*.avi"/>
@@ -38511,22 +39954,24 @@
</mime-type>
<mime-type type="video/x-nsv">
<comment>NullSoft video</comment>
+ <comment xml:lang="af">NullSoft-video</comment>
<comment xml:lang="ar">NullSoft مرئي</comment>
<comment xml:lang="ast">Videu de NullSoft</comment>
- <comment xml:lang="be@latin">Videa NullSoft</comment>
+ <comment xml:lang="be-Latn">Videa NullSoft</comment>
<comment xml:lang="bg">Видео — NullSoft</comment>
<comment xml:lang="ca">vídeo NullSoft</comment>
<comment xml:lang="cs">video NullSoft</comment>
<comment xml:lang="da">NullSoft-video</comment>
<comment xml:lang="de">NullSoft-Video</comment>
<comment xml:lang="el">Βίντεο Nullsoft</comment>
- <comment xml:lang="en_GB">NullSoft video</comment>
+ <comment xml:lang="en-GB">NullSoft video</comment>
<comment xml:lang="eo">NullSoft-video</comment>
<comment xml:lang="es">vídeo NullSoft</comment>
<comment xml:lang="eu">NullSoft bideoa</comment>
<comment xml:lang="fi">NullSoft-video</comment>
<comment xml:lang="fo">NullSoft video</comment>
<comment xml:lang="fr">vidéo NullSoft</comment>
+ <comment xml:lang="fur">video NullSoft</comment>
<comment xml:lang="ga">físeán NullSoft</comment>
<comment xml:lang="gl">vídeo de NullSoft</comment>
<comment xml:lang="he">וידאו של NullSot</comment>
@@ -38546,7 +39991,7 @@
<comment xml:lang="oc">vidèo NullSoft</comment>
<comment xml:lang="pl">Plik wideo NullSoft</comment>
<comment xml:lang="pt">vídeo NullSoft</comment>
- <comment xml:lang="pt_BR">Vídeo do NullSoft</comment>
+ <comment xml:lang="pt-BR">Vídeo do NullSoft</comment>
<comment xml:lang="ro">Video NullSoft</comment>
<comment xml:lang="ru">Видео Nullsoft</comment>
<comment xml:lang="sk">Video NullSoft</comment>
@@ -38557,29 +40002,30 @@
<comment xml:lang="tr">Nullsoft videosu</comment>
<comment xml:lang="uk">відеокліп NullSoft</comment>
<comment xml:lang="vi">Ảnh động NullSoft</comment>
- <comment xml:lang="zh_CN">NullSoft 视频</comment>
- <comment xml:lang="zh_TW">NullSoft 視訊</comment>
+ <comment xml:lang="zh-CN">NullSoft 视频</comment>
+ <comment xml:lang="zh-TW">NullSoft 視訊</comment>
<magic priority="50">
- <match value="NSVf" type="string" offset="0"/>
+ <match type="string" value="NSVf" offset="0"/>
</magic>
<glob pattern="*.nsv"/>
</mime-type>
<mime-type type="application/sdp">
<comment>SDP multicast stream file</comment>
<comment xml:lang="ar">ملف دفق متعدد البث SDP</comment>
- <comment xml:lang="be@latin">Šmatadrasny płynievy fajł SDP</comment>
- <comment xml:lang="bg">Файл за поток — SDP multicast</comment>
+ <comment xml:lang="be-Latn">Šmatadrasny płynievy fajł SDP</comment>
+ <comment xml:lang="bg">Поток — SDP multicast</comment>
<comment xml:lang="ca">fitxer de flux de multidifusió SDP</comment>
<comment xml:lang="cs">soubor vícesměrového vysílání proudu SDP</comment>
<comment xml:lang="da">SDP multicast-strømfil</comment>
<comment xml:lang="de">SDP-Multicast-Datenstromdatei</comment>
<comment xml:lang="el">Αρχείο ροής πολλαπλής αναμετάδοσης SDP</comment>
- <comment xml:lang="en_GB">SDP multicast stream file</comment>
+ <comment xml:lang="en-GB">SDP multicast stream file</comment>
<comment xml:lang="es">archivo de flujo multicast SDP</comment>
<comment xml:lang="eu">SDP multicast korrontearen fitxategia</comment>
<comment xml:lang="fi">SDP-monilähetysvirran tiedosto</comment>
<comment xml:lang="fo">SDP margvarpað streymafíla</comment>
<comment xml:lang="fr">fichier de flux multidiffusion SDP</comment>
+ <comment xml:lang="fur">file di flus a trasmission multiple SDP</comment>
<comment xml:lang="ga">comhad shruth ilchraolacháin SDP</comment>
<comment xml:lang="gl">ficheiro de fluxo multicast SDP</comment>
<comment xml:lang="he">קובץ שידור בזרימה SDP</comment>
@@ -38599,7 +40045,7 @@
<comment xml:lang="oc">fichièr de flux multidifusion SDP</comment>
<comment xml:lang="pl">Plik strumienia multicast SDP</comment>
<comment xml:lang="pt">ficheiro de fluxo SDP multicast</comment>
- <comment xml:lang="pt_BR">Arquivo de canal multicast SDP</comment>
+ <comment xml:lang="pt-BR">Arquivo de canal multicast SDP</comment>
<comment xml:lang="ro">Fișier flux multicast SDP</comment>
<comment xml:lang="ru">Файл мультикаст-потока SDP</comment>
<comment xml:lang="sk">Súbor viacsmerového vysielania prúdu SDP</comment>
@@ -38610,8 +40056,8 @@
<comment xml:lang="tr">SDP çoklu yayın akışı dosyası</comment>
<comment xml:lang="uk">файл потокової трансляції SDP</comment>
<comment xml:lang="vi">Tập tin luồng truyền một-nhiều SDP</comment>
- <comment xml:lang="zh_CN">SDP 多播流文件</comment>
- <comment xml:lang="zh_TW">SDP multicast 串流檔</comment>
+ <comment xml:lang="zh-CN">SDP 多播流文件</comment>
+ <comment xml:lang="zh-TW">SDP multicast 串流檔</comment>
<acronym>SDP</acronym>
<expanded-acronym>Session Description Protocol</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -38619,18 +40065,19 @@
<alias type="application/vnd.sdp"/>
<generic-icon name="video-x-generic"/>
<magic priority="50">
- <match value="v=" type="string" offset="0">
- <match value="s=" type="string" offset="0:256"/>
+ <match type="string" value="v=" offset="0">
+ <match type="string" value="s=" offset="0:256"/>
</match>
</magic>
<glob pattern="*.sdp"/>
</mime-type>
<mime-type type="video/x-sgi-movie">
<comment>SGI video</comment>
+ <comment xml:lang="af">SGI-video</comment>
<comment xml:lang="ar">SGI مرئي</comment>
<comment xml:lang="ast">Videu en SGI</comment>
<comment xml:lang="az">SGI video faylı</comment>
- <comment xml:lang="be@latin">Videa SGI</comment>
+ <comment xml:lang="be-Latn">Videa SGI</comment>
<comment xml:lang="bg">Видео — SGI</comment>
<comment xml:lang="ca">vídeo SGI</comment>
<comment xml:lang="cs">video SGI</comment>
@@ -38638,13 +40085,14 @@
<comment xml:lang="da">SGI-video</comment>
<comment xml:lang="de">SGI-Video</comment>
<comment xml:lang="el">Βίντεο SGI</comment>
- <comment xml:lang="en_GB">SGI video</comment>
+ <comment xml:lang="en-GB">SGI video</comment>
<comment xml:lang="eo">SGI-video</comment>
<comment xml:lang="es">vídeo SGI</comment>
<comment xml:lang="eu">SGI bideoa</comment>
<comment xml:lang="fi">SGI-video</comment>
<comment xml:lang="fo">SGI video</comment>
<comment xml:lang="fr">vidéo SGI</comment>
+ <comment xml:lang="fur">video SGI</comment>
<comment xml:lang="ga">físeán SGI</comment>
<comment xml:lang="gl">vídeo SGI</comment>
<comment xml:lang="he">וידאו SGI</comment>
@@ -38665,7 +40113,7 @@
<comment xml:lang="oc">vidèo SGI</comment>
<comment xml:lang="pl">Plik wideo SGI</comment>
<comment xml:lang="pt">vídeo SGI</comment>
- <comment xml:lang="pt_BR">Vídeo SGI</comment>
+ <comment xml:lang="pt-BR">Vídeo SGI</comment>
<comment xml:lang="ro">Video SGI</comment>
<comment xml:lang="ru">Видео SGI</comment>
<comment xml:lang="sk">Video SGI</comment>
@@ -38676,29 +40124,31 @@
<comment xml:lang="tr">SGI videosu</comment>
<comment xml:lang="uk">відеокліп SGI</comment>
<comment xml:lang="vi">Ảnh động SGI</comment>
- <comment xml:lang="zh_CN">SGI 视频</comment>
- <comment xml:lang="zh_TW">SGI 視訊</comment>
+ <comment xml:lang="zh-CN">SGI 视频</comment>
+ <comment xml:lang="zh-TW">SGI 視訊</comment>
<magic priority="50">
- <match value="MOVI" type="string" offset="0"/>
+ <match type="string" value="MOVI" offset="0"/>
</magic>
<glob pattern="*.movie"/>
</mime-type>
<mime-type type="application/vnd.emusic-emusic_package">
<comment>eMusic download package</comment>
+ <comment xml:lang="af">eMusic-aflaaipakket</comment>
<comment xml:lang="ar">حزمة تنزيل eMusic</comment>
- <comment xml:lang="be@latin">pakunak zahruzki eMusic</comment>
+ <comment xml:lang="be-Latn">pakunak zahruzki eMusic</comment>
<comment xml:lang="bg">Пакет за сваляне — eMusic</comment>
- <comment xml:lang="ca">paquet de descàrrega eMusic</comment>
+ <comment xml:lang="ca">paquet de baixades d'eMusic</comment>
<comment xml:lang="cs">balíček stahování eMusic</comment>
- <comment xml:lang="da">eMusic-hentpakke</comment>
+ <comment xml:lang="da">eMusic-downloadpakke</comment>
<comment xml:lang="de">eMusic-Download-Paket</comment>
<comment xml:lang="el">Πακέτο λήψης eMusic</comment>
- <comment xml:lang="en_GB">eMusic download package</comment>
+ <comment xml:lang="en-GB">eMusic download package</comment>
<comment xml:lang="es">paquete de descarga eMusic</comment>
<comment xml:lang="eu">eMusic deskargaren paketea</comment>
<comment xml:lang="fi">eMusic-imurointipaketti</comment>
<comment xml:lang="fo">eMusic niðurtøkupakki</comment>
<comment xml:lang="fr">paquet de téléchargement eMusic</comment>
+ <comment xml:lang="fur">pachet di discjariament eMusic</comment>
<comment xml:lang="ga">pacáiste íosluchtú eMusic</comment>
<comment xml:lang="gl">paquete de descarga de eMusic</comment>
<comment xml:lang="he">חבילת הורדה של eMusic</comment>
@@ -38718,7 +40168,7 @@
<comment xml:lang="oc">paquet de telecargament eMusic</comment>
<comment xml:lang="pl">Pobrany pakiet eMusic</comment>
<comment xml:lang="pt">pacote transferido eMusic</comment>
- <comment xml:lang="pt_BR">Pacote de download do eMusic</comment>
+ <comment xml:lang="pt-BR">Pacote de download do eMusic</comment>
<comment xml:lang="ro">pachet descărcare eMusic</comment>
<comment xml:lang="ru">Пакет загрузок eMusic</comment>
<comment xml:lang="sk">Balíček sťahovania eMusic</comment>
@@ -38729,16 +40179,17 @@
<comment xml:lang="tr">eMusic indirme paketi</comment>
<comment xml:lang="uk">пакунок завантаження eMusic</comment>
<comment xml:lang="vi">gói nhạc tải xuống eMusic</comment>
- <comment xml:lang="zh_CN">eMusic 下载包</comment>
- <comment xml:lang="zh_TW">eMusic 下載包</comment>
+ <comment xml:lang="zh-CN">eMusic 下载包</comment>
+ <comment xml:lang="zh-TW">eMusic 下載包</comment>
<generic-icon name="package-x-generic"/>
<magic priority="50">
- <match value="nF7YLao" type="string" offset="0"/>
+ <match type="string" value="nF7YLao" offset="0"/>
</magic>
<glob pattern="*.emp"/>
</mime-type>
<mime-type type="application/vnd.google-earth.kml+xml">
<comment>KML geographic data</comment>
+ <comment xml:lang="af">KML geografiese data</comment>
<comment xml:lang="ar">بيانات جغرافية KML</comment>
<comment xml:lang="bg">Географски данни — KML</comment>
<comment xml:lang="ca">dades geogràfiques KML</comment>
@@ -38746,12 +40197,13 @@
<comment xml:lang="da">Geografiske data i KML-format</comment>
<comment xml:lang="de">KML geographische Daten</comment>
<comment xml:lang="el">Γεωγραφικά δεδομένα KML</comment>
- <comment xml:lang="en_GB">KML geographic data</comment>
+ <comment xml:lang="en-GB">KML geographic data</comment>
<comment xml:lang="es">datos geográficos KML</comment>
<comment xml:lang="eu">KML datu geografikoak</comment>
<comment xml:lang="fi">KML-paikkatieto</comment>
<comment xml:lang="fo">KML landafrøðilig dáta</comment>
<comment xml:lang="fr">données géographiques KML</comment>
+ <comment xml:lang="fur">dâts gjeografics KML</comment>
<comment xml:lang="ga">sonraí geografacha KML</comment>
<comment xml:lang="gl">datos xeográficos KML</comment>
<comment xml:lang="he">מידע גאוגרפי KML</comment>
@@ -38769,7 +40221,7 @@
<comment xml:lang="oc">donadas geograficas KML</comment>
<comment xml:lang="pl">Dane geograficzne KML</comment>
<comment xml:lang="pt">dados geográficos KML</comment>
- <comment xml:lang="pt_BR">Dados geográficos KML</comment>
+ <comment xml:lang="pt-BR">Dados geográficos KML</comment>
<comment xml:lang="ro">Date geografice KML</comment>
<comment xml:lang="ru">Географические данные KML</comment>
<comment xml:lang="sk">Zemepisné údaje KML</comment>
@@ -38778,8 +40230,8 @@
<comment xml:lang="sv">KML geografisk data</comment>
<comment xml:lang="tr">KML coğrafi verisi</comment>
<comment xml:lang="uk">географічні дані KML</comment>
- <comment xml:lang="zh_CN">KML 地理数据</comment>
- <comment xml:lang="zh_TW">KML 地理資料</comment>
+ <comment xml:lang="zh-CN">KML 地理数据</comment>
+ <comment xml:lang="zh-TW">KML 地理資料</comment>
<acronym>KML</acronym>
<expanded-acronym>Keyhole Markup Language</expanded-acronym>
<sub-class-of type="application/xml"/>
@@ -38788,6 +40240,7 @@
</mime-type>
<mime-type type="application/vnd.google-earth.kmz">
<comment>KML geographic compressed data</comment>
+ <comment xml:lang="af">KML saamgepersde geografiese data</comment>
<comment xml:lang="ar">بيانات جغرافية مضغوطة KML</comment>
<comment xml:lang="bg">Географски данни — KML, компресирани</comment>
<comment xml:lang="ca">dades geogràfiques KML amb compressió</comment>
@@ -38795,12 +40248,13 @@
<comment xml:lang="da">KML-geografiske komprimerede data</comment>
<comment xml:lang="de">KML geographische komprimierte Daten</comment>
<comment xml:lang="el">Γεωγραφικά συμπιεσμένα δεδομένα KML</comment>
- <comment xml:lang="en_GB">KML geographic compressed data</comment>
+ <comment xml:lang="en-GB">KML geographic compressed data</comment>
<comment xml:lang="es">datos geográficos comprimidos KML</comment>
<comment xml:lang="eu">KML datu geografiko konprimituak</comment>
<comment xml:lang="fi">Pakattu KML-paikkatieto</comment>
<comment xml:lang="fo">KML landafrøðilig stappað dáta</comment>
<comment xml:lang="fr">données géographiques KML compressées</comment>
+ <comment xml:lang="fur">dâts gjeografics KML comprimûts</comment>
<comment xml:lang="ga">sonraí comhbhrúite geografacha KML</comment>
<comment xml:lang="gl">datos xeográficos KML comprimidos </comment>
<comment xml:lang="he">מידע גאוגרפי דחוס KML</comment>
@@ -38818,7 +40272,7 @@
<comment xml:lang="oc">donadas geograficas KML compressats</comment>
<comment xml:lang="pl">Skompresowane dane geograficzne KML</comment>
<comment xml:lang="pt">dados geográficos comprimidos KML</comment>
- <comment xml:lang="pt_BR">Dados geográficos KML compactados</comment>
+ <comment xml:lang="pt-BR">Dados geográficos KML compactados</comment>
<comment xml:lang="ro">Date geografice comprimate KML</comment>
<comment xml:lang="ru">Сжатые географические данные KML</comment>
<comment xml:lang="sk">Komprimované zemepisné údaje KML</comment>
@@ -38827,8 +40281,8 @@
<comment xml:lang="sv">KML geografiskt komprimerat data</comment>
<comment xml:lang="tr">KML sıkıştırılmış coğrafi verisi</comment>
<comment xml:lang="uk">стиснуті географічні дані KML</comment>
- <comment xml:lang="zh_CN">KML 地理压缩数据</comment>
- <comment xml:lang="zh_TW">KML 地理壓縮資料</comment>
+ <comment xml:lang="zh-CN">KML 地理压缩数据</comment>
+ <comment xml:lang="zh-TW">KML 地理壓縮資料</comment>
<acronym>KML</acronym>
<expanded-acronym>Keyhole Markup Language</expanded-acronym>
<sub-class-of type="application/zip"/>
@@ -38836,13 +40290,18 @@
</mime-type>
<mime-type type="application/geo+json">
<comment>GeoJSON geospatial data</comment>
+ <comment xml:lang="af">GeoJSON georuimtelike data</comment>
+ <comment xml:lang="bg">Географски данни — GeoJSON</comment>
<comment xml:lang="ca">dades geomàtiques GeoJSON</comment>
<comment xml:lang="cs">geoprostorová data GeoJSON</comment>
<comment xml:lang="da">GEoJSON-geospatiale data</comment>
<comment xml:lang="de">GeoJSON raumbezogene Daten</comment>
- <comment xml:lang="en_GB">GeoJSON geospatial data</comment>
+ <comment xml:lang="en-GB">GeoJSON geospatial data</comment>
<comment xml:lang="es">datos geoespaciales en GeoJSON</comment>
+ <comment xml:lang="eu">GeoJSON geomatika datua</comment>
+ <comment xml:lang="fi">GeoJSON-paikkatiedot</comment>
<comment xml:lang="fr">données géospatiales GeoJSON</comment>
+ <comment xml:lang="fur">dâts gjeo-spaziâls GeoJSON</comment>
<comment xml:lang="ga">sonraí geospásúla GeoJSON</comment>
<comment xml:lang="hr">GeoJSON geoprostorni podaci</comment>
<comment xml:lang="hu">GeoJSON téradatok</comment>
@@ -38851,15 +40310,15 @@
<comment xml:lang="kk">GeoJSON геокеңістіктік деректері</comment>
<comment xml:lang="ko">GeoJSON 지리 정보 데이터</comment>
<comment xml:lang="pl">Dane geoprzestrzenne GeoJSON</comment>
- <comment xml:lang="pt_BR">Dados geoespaciais GeoJSON</comment>
+ <comment xml:lang="pt-BR">Dados geoespaciais GeoJSON</comment>
<comment xml:lang="ru">Геопространственные данные GeoJSON</comment>
<comment xml:lang="sk">Geopriestorové údaje GeoJSON</comment>
<comment xml:lang="sr">ГеоЈСОН геопросторни подаци</comment>
<comment xml:lang="sv">Geospatialt GeoJSON-data</comment>
- <comment xml:lang="tr">GeoJSON coğrafi veriler</comment>
+ <comment xml:lang="tr">GeoJSON coğrafi verileri</comment>
<comment xml:lang="uk">геопросторові дані GeoJSON</comment>
- <comment xml:lang="zh_CN">GeoJSON 地理空间数据</comment>
- <comment xml:lang="zh_TW">GeoJSON 地理空間資料</comment>
+ <comment xml:lang="zh-CN">GeoJSON 地理空间数据</comment>
+ <comment xml:lang="zh-TW">GeoJSON 地理空間資料</comment>
<sub-class-of type="application/json"/>
<glob pattern="*.geojson"/>
<glob pattern="*.geo.json"/>
@@ -38867,15 +40326,18 @@
</mime-type>
<mime-type type="application/gpx+xml">
<comment>GPX geographic data</comment>
+ <comment xml:lang="af">GPX geografiese data</comment>
+ <comment xml:lang="bg">Географски данни — GPX</comment>
<comment xml:lang="ca">dades geogràfiques GPX</comment>
<comment xml:lang="cs">geografická data GPX</comment>
<comment xml:lang="da">GPX-geografiske data</comment>
<comment xml:lang="de">GPX geographische Daten</comment>
- <comment xml:lang="en_GB">GPX geographic data</comment>
+ <comment xml:lang="en-GB">GPX geographic data</comment>
<comment xml:lang="es">datos geográficos en GPX</comment>
<comment xml:lang="eu">GPX datu geografikoak</comment>
<comment xml:lang="fi">GPX-paikkatieto</comment>
<comment xml:lang="fr">données géographiques GPX</comment>
+ <comment xml:lang="fur">dâts gjeografics GPX</comment>
<comment xml:lang="ga">sonraí geografacha GPX</comment>
<comment xml:lang="he">נתונים גאוגרפיים GPX</comment>
<comment xml:lang="hr">GPX geografski podaci</comment>
@@ -38886,15 +40348,15 @@
<comment xml:lang="ko">GPX 지리 공간정보 데이터</comment>
<comment xml:lang="oc">Donadas geograficas GPX</comment>
<comment xml:lang="pl">Dane geograficzne GPX</comment>
- <comment xml:lang="pt_BR">Dados geográficos GPX</comment>
+ <comment xml:lang="pt-BR">Dados geográficos GPX</comment>
<comment xml:lang="ru">Географические данные GPX</comment>
<comment xml:lang="sk">Zemepisné údaje GPX</comment>
<comment xml:lang="sr">ГПИкс географски подаци</comment>
<comment xml:lang="sv">GPX geografisk data</comment>
<comment xml:lang="tr">GPX coğrafi verileri</comment>
<comment xml:lang="uk">географічні дані GPX</comment>
- <comment xml:lang="zh_CN">GPX 地理数据</comment>
- <comment xml:lang="zh_TW">GPX 地理資料</comment>
+ <comment xml:lang="zh-CN">GPX 地理数据</comment>
+ <comment xml:lang="zh-TW">GPX 地理資料</comment>
<acronym>GPX</acronym>
<expanded-acronym>GPS Exchange Format</expanded-acronym>
<sub-class-of type="application/xml"/>
@@ -38907,20 +40369,22 @@
</mime-type>
<mime-type type="application/x-ica">
<comment>Citrix ICA settings file</comment>
+ <comment xml:lang="af">Citrix ICA-instellingslêer</comment>
<comment xml:lang="ar">ملف إعدادات Citrix ICA</comment>
- <comment xml:lang="be@latin">Fajł naładaŭ Citrix ICA</comment>
+ <comment xml:lang="be-Latn">Fajł naładaŭ Citrix ICA</comment>
<comment xml:lang="bg">Настройки — Citrix ICA</comment>
<comment xml:lang="ca">fitxer d'ajusts de Citrix ICA</comment>
<comment xml:lang="cs">soubor nastavení Citrix ICA</comment>
<comment xml:lang="da">Citrix ICA-opsætningsfil</comment>
<comment xml:lang="de">Citrix-ICA-Einstellungsdatei</comment>
<comment xml:lang="el">Αρχείο ρυθμίσεων Citrix ICA</comment>
- <comment xml:lang="en_GB">Citrix ICA settings file</comment>
+ <comment xml:lang="en-GB">Citrix ICA settings file</comment>
<comment xml:lang="es">archivo de configuración de Citrix ICA</comment>
<comment xml:lang="eu">Citrix ICA ezarpenen fitxategia</comment>
<comment xml:lang="fi">Citrix ICA -asetustiedosto</comment>
<comment xml:lang="fo">Citrix ICA stillingarfíla</comment>
<comment xml:lang="fr">fichier de paramètres ICA Citrix</comment>
+ <comment xml:lang="fur">file impostazions Citrix ICA</comment>
<comment xml:lang="ga">comhad socruithe Citrix ICA</comment>
<comment xml:lang="gl">ficheiro de configuracións de Citrix ICA</comment>
<comment xml:lang="he">קובץ הגדרות של Citrix ICA</comment>
@@ -38941,7 +40405,7 @@
<comment xml:lang="oc">fichièr de paramètres ICA Citrix</comment>
<comment xml:lang="pl">Plik ustawień Citrix ICA</comment>
<comment xml:lang="pt">ficheiro de definições Citrix ICA</comment>
- <comment xml:lang="pt_BR">Arquivo de configuração do Citrix ICA</comment>
+ <comment xml:lang="pt-BR">Arquivo de configuração do Citrix ICA</comment>
<comment xml:lang="ro">Fișier de configurări Citrix ICA</comment>
<comment xml:lang="ru">Файл настроек Citrix ICA</comment>
<comment xml:lang="sk">Súbor nastavení Citrix ICA</comment>
@@ -38952,8 +40416,8 @@
<comment xml:lang="tr">Citrix ICA ayar dosyası</comment>
<comment xml:lang="uk">файл параметрів ICA Citrix</comment>
<comment xml:lang="vi">Tập tin thiết lập ICA Citrix</comment>
- <comment xml:lang="zh_CN">Citrix ICA 设置文件</comment>
- <comment xml:lang="zh_TW">Citrix ICA 設定值檔案</comment>
+ <comment xml:lang="zh-CN">Citrix ICA 设置文件</comment>
+ <comment xml:lang="zh-TW">Citrix ICA 設定值檔案</comment>
<acronym>ICA</acronym>
<expanded-acronym>Independent Computing Architecture</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -38962,21 +40426,23 @@
</mime-type>
<mime-type type="application/vnd.mozilla.xul+xml">
<comment>XUL interface document</comment>
+ <comment xml:lang="af">XUL-koppelvlakdokument</comment>
<comment xml:lang="ar">مستند واجهة XUL</comment>
<comment xml:lang="ast">Documentu d'interfaz XUL</comment>
- <comment xml:lang="be@latin">Interfejsny dakument XUL</comment>
- <comment xml:lang="bg">Документ — интерфейс за XUL</comment>
+ <comment xml:lang="be-Latn">Interfejsny dakument XUL</comment>
+ <comment xml:lang="bg">Документ — интерфейс, XUL</comment>
<comment xml:lang="ca">document d'interfície XUL</comment>
<comment xml:lang="cs">dokument rozhraní XUL</comment>
<comment xml:lang="da">XUL-grænsefladedokument</comment>
<comment xml:lang="de">XUL-Oberflächendokument</comment>
<comment xml:lang="el">Έγγραφο διεπαφής XUL</comment>
- <comment xml:lang="en_GB">XUL interface document</comment>
+ <comment xml:lang="en-GB">XUL interface document</comment>
<comment xml:lang="es">documento de interfaz XUL</comment>
<comment xml:lang="eu">XUL interfazearen dokumentua</comment>
<comment xml:lang="fi">XUL-käyttöliittymäasiakirja</comment>
<comment xml:lang="fo">XUL markamótsskjal</comment>
<comment xml:lang="fr">document d'interface XUL</comment>
+ <comment xml:lang="fur">document di interface XUL</comment>
<comment xml:lang="ga">cáipéis chomhéadan XUL</comment>
<comment xml:lang="gl">documento de interface XUL</comment>
<comment xml:lang="he">מסמך ממשק XUL</comment>
@@ -38996,7 +40462,7 @@
<comment xml:lang="oc">document d'interfàcia XUL</comment>
<comment xml:lang="pl">Dokument interfejsu XUL</comment>
<comment xml:lang="pt">documento de ambiente XUL</comment>
- <comment xml:lang="pt_BR">Documento de interface XUL</comment>
+ <comment xml:lang="pt-BR">Documento de interface XUL</comment>
<comment xml:lang="ro">Document interfață XUL</comment>
<comment xml:lang="ru">Документ интерфейса XUL</comment>
<comment xml:lang="sk">Dokument rozhrania XUL</comment>
@@ -39007,8 +40473,8 @@
<comment xml:lang="tr">XUL arayüz belgesi</comment>
<comment xml:lang="uk">документ інтерфейсу XUL</comment>
<comment xml:lang="vi">Tài liệu giao diện XUL</comment>
- <comment xml:lang="zh_CN">XUL 界面文档</comment>
- <comment xml:lang="zh_TW">XUL 介面文件</comment>
+ <comment xml:lang="zh-CN">XUL 界面文档</comment>
+ <comment xml:lang="zh-TW">XUL 介面文件</comment>
<acronym>XUL</acronym>
<expanded-acronym>XML User interface markup Language</expanded-acronym>
<sub-class-of type="application/xml"/>
@@ -39018,6 +40484,7 @@
</mime-type>
<mime-type type="application/x-xpinstall">
<comment>XPInstall installer module</comment>
+ <comment xml:lang="af">XPInstall-installasiemodule</comment>
<comment xml:lang="ar">وحدة مثبت XPInstall </comment>
<comment xml:lang="bg">Пакет — инсталация XPInstall</comment>
<comment xml:lang="ca">mòdul de l'instal·lador XPinstall</comment>
@@ -39025,12 +40492,13 @@
<comment xml:lang="da">XPInstall-installationsmodul</comment>
<comment xml:lang="de">XPInstall-Installationsmodul</comment>
<comment xml:lang="el">Άρθρωμα εγκατάστασης XPInstall</comment>
- <comment xml:lang="en_GB">XPInstall installer module</comment>
+ <comment xml:lang="en-GB">XPInstall installer module</comment>
<comment xml:lang="es">módulo del instalador XPInstall</comment>
<comment xml:lang="eu">XPInstall instalatzailearen modulua</comment>
<comment xml:lang="fi">XPInstall-asennuspaketti</comment>
<comment xml:lang="fo">XPInstall innleggjaramótul</comment>
<comment xml:lang="fr">module d'installation XPInstall</comment>
+ <comment xml:lang="fur">modul instaladôr XPInstall</comment>
<comment xml:lang="ga">modúl suiteála XPInstall</comment>
<comment xml:lang="gl">Módulo do instalador XPInstall</comment>
<comment xml:lang="he">מודול התקנה של XPInstall</comment>
@@ -39048,7 +40516,7 @@
<comment xml:lang="oc">modul d'installacion XPInstall</comment>
<comment xml:lang="pl">Moduł instalatora XPInstall</comment>
<comment xml:lang="pt">módulo de instalador XPInstall</comment>
- <comment xml:lang="pt_BR">Módulo de instalador XPInstall</comment>
+ <comment xml:lang="pt-BR">Módulo de instalador XPInstall</comment>
<comment xml:lang="ro">Modul de instalare XPInstall</comment>
<comment xml:lang="ru">Модуль установщика XPInstall</comment>
<comment xml:lang="sk">Modul inštalátora XPInstall</comment>
@@ -39057,13 +40525,14 @@
<comment xml:lang="sv">XPInstall-installeringsmodul</comment>
<comment xml:lang="tr">XPInstall kurulum modülü</comment>
<comment xml:lang="uk">модуль засобу встановлення XPInstall</comment>
- <comment xml:lang="zh_CN">XPInstall 安装工具模块</comment>
- <comment xml:lang="zh_TW">XPInstall 安裝程式模組</comment>
+ <comment xml:lang="zh-CN">XPInstall 安装工具模块</comment>
+ <comment xml:lang="zh-TW">XPInstall 安裝程式模組</comment>
<sub-class-of type="application/zip"/>
<glob pattern="*.xpi"/>
</mime-type>
<mime-type type="application/vnd.openxmlformats-officedocument.wordprocessingml.document">
<comment>Word 2007 document</comment>
+ <comment xml:lang="af">Word 2007-dokument</comment>
<comment xml:lang="ar">مستند Word 2007</comment>
<comment xml:lang="ast">Documentu de Word 2007</comment>
<comment xml:lang="bg">Документ — Word 2007</comment>
@@ -39072,12 +40541,13 @@
<comment xml:lang="da">Word 2007-dokument</comment>
<comment xml:lang="de">Word-2007-Dokument</comment>
<comment xml:lang="el">Έγγραφο Word 2007</comment>
- <comment xml:lang="en_GB">Word 2007 document</comment>
+ <comment xml:lang="en-GB">Word 2007 document</comment>
<comment xml:lang="es">documento de Word 2007</comment>
<comment xml:lang="eu">Word 2007 dokumentua</comment>
<comment xml:lang="fi">Word 2007 -asiakirja</comment>
<comment xml:lang="fo">Word 2007 skjal</comment>
<comment xml:lang="fr">document Word 2007</comment>
+ <comment xml:lang="fur">document Word 2007</comment>
<comment xml:lang="ga">cáipéis Word 2007</comment>
<comment xml:lang="gl">documento de Word 2007</comment>
<comment xml:lang="he">מסמך Word 2007</comment>
@@ -39095,7 +40565,7 @@
<comment xml:lang="oc">document Word 2007</comment>
<comment xml:lang="pl">Dokument Word 2007</comment>
<comment xml:lang="pt">documento Word 2007</comment>
- <comment xml:lang="pt_BR">Documento do Word 2007</comment>
+ <comment xml:lang="pt-BR">Documento do Word 2007</comment>
<comment xml:lang="ro">Document Word 2007</comment>
<comment xml:lang="ru">Документ Word 2007</comment>
<comment xml:lang="sk">Dokument Word 2007</comment>
@@ -39105,14 +40575,15 @@
<comment xml:lang="tr">Word 2007 belgesi</comment>
<comment xml:lang="uk">документ Word 2007</comment>
<comment xml:lang="vi">Tài liệu Word 2007</comment>
- <comment xml:lang="zh_CN">Word 2007 文档</comment>
- <comment xml:lang="zh_TW">Word 2007 文件</comment>
+ <comment xml:lang="zh-CN">Word 2007 文档</comment>
+ <comment xml:lang="zh-TW">Word 2007 文件</comment>
<glob pattern="*.docx"/>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
</mime-type>
<mime-type type="application/vnd.openxmlformats-officedocument.wordprocessingml.template">
<comment>Word 2007 document template</comment>
+ <comment xml:lang="af">Word 2007-dokumentsjabloon</comment>
<comment xml:lang="ast">Plantía de documentu de Word 2007</comment>
<comment xml:lang="bg">Шаблон за документи — Word 2007</comment>
<comment xml:lang="ca">plantilla de document de Word 2007</comment>
@@ -39120,11 +40591,12 @@
<comment xml:lang="da">Word 2007-dokumentskabelon</comment>
<comment xml:lang="de">Word-2007-Dokumentvorlage</comment>
<comment xml:lang="el">Πρότυπο έγγραφο Word 2007</comment>
- <comment xml:lang="en_GB">Word 2007 document template</comment>
+ <comment xml:lang="en-GB">Word 2007 document template</comment>
<comment xml:lang="es">plantilla de documento de Word 2007</comment>
<comment xml:lang="eu">Word 2007 dokumentuaren txantiloia</comment>
<comment xml:lang="fi">Word 2007 -asiakirjamalli</comment>
<comment xml:lang="fr">modèle de document Word 2007</comment>
+ <comment xml:lang="fur">model document Word 2007</comment>
<comment xml:lang="ga">teimpléad cháipéis Word 2007</comment>
<comment xml:lang="gl">Plantilla de documento de Word 2007</comment>
<comment xml:lang="he">תבנית מסמך של Word 2007</comment>
@@ -39142,7 +40614,7 @@
<comment xml:lang="oc">modèl de document Word 2007</comment>
<comment xml:lang="pl">Szablon dokumentu Word 2007</comment>
<comment xml:lang="pt">modelo de documento Word 2007</comment>
- <comment xml:lang="pt_BR">Modelo de documento do Word 2007</comment>
+ <comment xml:lang="pt-BR">Modelo de documento do Word 2007</comment>
<comment xml:lang="ru">Шаблон документа Word 2007</comment>
<comment xml:lang="sk">Šablóna dokumentu Word 2007</comment>
<comment xml:lang="sl">Predloga dokumenta Word 2007</comment>
@@ -39150,14 +40622,15 @@
<comment xml:lang="sv">Word 2007-dokumentmall</comment>
<comment xml:lang="tr">Word 2007 belge şablonu</comment>
<comment xml:lang="uk">шаблон документа Word 2007</comment>
- <comment xml:lang="zh_CN">Word 2007 文档模板</comment>
- <comment xml:lang="zh_TW">Word 2007 文件範本</comment>
+ <comment xml:lang="zh-CN">Word 2007 文档模板</comment>
+ <comment xml:lang="zh-TW">Word 2007 文件範本</comment>
<glob pattern="*.dotx"/>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
</mime-type>
<mime-type type="application/vnd.openxmlformats-officedocument.presentationml.presentation">
<comment>PowerPoint 2007 presentation</comment>
+ <comment xml:lang="af">PowerPoint 2007-voorlegging</comment>
<comment xml:lang="ar">عرض تقديمي PowerPoint 2007</comment>
<comment xml:lang="bg">Презентация — PowerPoint 2007</comment>
<comment xml:lang="ca">presentació de PowerPoint 2007</comment>
@@ -39165,12 +40638,13 @@
<comment xml:lang="da">PowerPoint 2007-præsentation</comment>
<comment xml:lang="de">PowerPoint-2007-Präsentation</comment>
<comment xml:lang="el">Παρουσίαση PowerPoint 2007</comment>
- <comment xml:lang="en_GB">PowerPoint 2007 presentation</comment>
+ <comment xml:lang="en-GB">PowerPoint 2007 presentation</comment>
<comment xml:lang="es">presentación de PowerPoint 2007</comment>
<comment xml:lang="eu">PowerPoint 2007 aurkezpena</comment>
<comment xml:lang="fi">PowerPoint 2007 -esitys</comment>
<comment xml:lang="fo">PowerPoint 2007 framløga</comment>
<comment xml:lang="fr">présentation PowerPoint 2007</comment>
+ <comment xml:lang="fur">presentazion PowerPoint 2007</comment>
<comment xml:lang="ga">láithreoireacht PowerPoint 2007</comment>
<comment xml:lang="gl">presentación de PowerPoint 2007</comment>
<comment xml:lang="he">מצגת של PowerPoint 2007</comment>
@@ -39188,7 +40662,7 @@
<comment xml:lang="oc">presentacion PowerPoint 2007</comment>
<comment xml:lang="pl">Prezentacja PowerPoint 2007</comment>
<comment xml:lang="pt">apresentação PowerPoint 2007</comment>
- <comment xml:lang="pt_BR">Apresentação do PowerPoint 2007</comment>
+ <comment xml:lang="pt-BR">Apresentação do PowerPoint 2007</comment>
<comment xml:lang="ro">Prezentare PowerPoint 2007</comment>
<comment xml:lang="ru">Презентация PowerPoint 2007</comment>
<comment xml:lang="sk">Prezentácia PowerPoint 2007</comment>
@@ -39198,25 +40672,27 @@
<comment xml:lang="tr">PowerPoint 2007 sunumu</comment>
<comment xml:lang="uk">презентація PowerPoint 2007</comment>
<comment xml:lang="vi">Trình diễn PowerPoint 2007</comment>
- <comment xml:lang="zh_CN">PowerPoint 2007 演示文稿</comment>
- <comment xml:lang="zh_TW">PowerPoint 2007 簡報</comment>
+ <comment xml:lang="zh-CN">PowerPoint 2007 演示文稿</comment>
+ <comment xml:lang="zh-TW">PowerPoint 2007 簡報</comment>
<glob pattern="*.pptx"/>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-presentation"/>
</mime-type>
<mime-type type="application/vnd.openxmlformats-officedocument.presentationml.slide">
<comment>PowerPoint 2007 slide</comment>
+ <comment xml:lang="af">PowerPoint 2007-skyfie</comment>
<comment xml:lang="bg">Кадър — PoerPoint 2007</comment>
<comment xml:lang="ca">dispositiva de PowerPoint 2007</comment>
<comment xml:lang="cs">snímek PowerPoint 2007</comment>
<comment xml:lang="da">PowerPoint 2007-slide</comment>
<comment xml:lang="de">PowerPoint 2007-Folie</comment>
<comment xml:lang="el">Διαφάνεια PowerPoint 2007</comment>
- <comment xml:lang="en_GB">PowerPoint 2007 slide</comment>
+ <comment xml:lang="en-GB">PowerPoint 2007 slide</comment>
<comment xml:lang="es">diapositiva de PowerPoint 2007</comment>
<comment xml:lang="eu">PowerPoint 2007 diapositiba</comment>
<comment xml:lang="fi">PowerPoint 2007 -dia</comment>
<comment xml:lang="fr">diapositive PowerPoint 2007</comment>
+ <comment xml:lang="fur">diapositive PowerPoint 2007</comment>
<comment xml:lang="ga">sleamhnán PowerPoint 2007</comment>
<comment xml:lang="gl">Diaporama de PowerPoint 2007</comment>
<comment xml:lang="he">שקופית של PowerPoint 2007</comment>
@@ -39234,7 +40710,7 @@
<comment xml:lang="oc">diapositive PowerPoint 2007</comment>
<comment xml:lang="pl">Slajd PowerPoint 2007</comment>
<comment xml:lang="pt">diapositivo PowerPoint 2007</comment>
- <comment xml:lang="pt_BR">Slide do PowerPoint 2007</comment>
+ <comment xml:lang="pt-BR">Slide do PowerPoint 2007</comment>
<comment xml:lang="ru">Слайд PowerPoint 2007</comment>
<comment xml:lang="sk">Snímka PowerPoint 2007</comment>
<comment xml:lang="sl">Prosojnica PowerPoint 2007</comment>
@@ -39242,14 +40718,15 @@
<comment xml:lang="sv">PowerPoint 2007-bildspel</comment>
<comment xml:lang="tr">PowerPoint 2007 slaytı</comment>
<comment xml:lang="uk">слайд PowerPoint 2007</comment>
- <comment xml:lang="zh_CN">PowerPoint 2007 幻灯片</comment>
- <comment xml:lang="zh_TW">PowerPoint 2007 投影片</comment>
+ <comment xml:lang="zh-CN">PowerPoint 2007 幻灯片</comment>
+ <comment xml:lang="zh-TW">PowerPoint 2007 投影片</comment>
<glob pattern="*.sldx"/>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-presentation"/>
</mime-type>
<mime-type type="application/vnd.openxmlformats-officedocument.presentationml.slideshow">
<comment>PowerPoint 2007 show</comment>
+ <comment xml:lang="af">PowerPoint 2007-vertoning</comment>
<comment xml:lang="ar">عرض PowerPoint 2007</comment>
<comment xml:lang="bg">Презентация-шоу — PowerPoint 2007</comment>
<comment xml:lang="ca">exposició de PowerPoint 2007</comment>
@@ -39257,12 +40734,13 @@
<comment xml:lang="da">PowerPoint 2007-dias</comment>
<comment xml:lang="de">PowerPoint-2007-Präsentation</comment>
<comment xml:lang="el">Παρουσίαση PowerPoint 2007</comment>
- <comment xml:lang="en_GB">PowerPoint 2007 show</comment>
+ <comment xml:lang="en-GB">PowerPoint 2007 show</comment>
<comment xml:lang="es">presentación autoejecutable de PowerPoint 2007</comment>
<comment xml:lang="eu">PowerPoint 2007 ikuskizuna</comment>
<comment xml:lang="fi">PowerPoint 2007 -diaesitys</comment>
<comment xml:lang="fo">PowerPoint 2007 framsýning</comment>
<comment xml:lang="fr">diaporama PowerPoint 2007</comment>
+ <comment xml:lang="fur">esecuzion presentazion PowerPoint 2007</comment>
<comment xml:lang="ga">taispeántas PowerPoint 2007</comment>
<comment xml:lang="gl">Exposición de PowerPoint 2007</comment>
<comment xml:lang="he">תצוגה של PowerPoint 2007</comment>
@@ -39280,7 +40758,7 @@
<comment xml:lang="oc">diaporama PowerPoint 2007</comment>
<comment xml:lang="pl">Pokaz PowerPoint 2007</comment>
<comment xml:lang="pt">espetáculo PowerPoint 2007</comment>
- <comment xml:lang="pt_BR">Apresentação do PowerPoint 2007</comment>
+ <comment xml:lang="pt-BR">Apresentação do PowerPoint 2007</comment>
<comment xml:lang="ro">Prezentare PowerPoint 2007</comment>
<comment xml:lang="ru">Презентация PowerPoint 2007</comment>
<comment xml:lang="sk">Ukážka PowerPoint 2007</comment>
@@ -39289,25 +40767,27 @@
<comment xml:lang="sv">PowerPoint 2007-visning</comment>
<comment xml:lang="tr">PowerPoint 2007 gösterisi</comment>
<comment xml:lang="uk">показ слайдів PowerPoint 2007</comment>
- <comment xml:lang="zh_CN">PowerPoint 2007 放映</comment>
- <comment xml:lang="zh_TW">PowerPoint 2007 展示</comment>
+ <comment xml:lang="zh-CN">PowerPoint 2007 放映</comment>
+ <comment xml:lang="zh-TW">PowerPoint 2007 展示</comment>
<glob pattern="*.ppsx"/>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-presentation"/>
</mime-type>
<mime-type type="application/vnd.openxmlformats-officedocument.presentationml.template">
<comment>PowerPoint 2007 presentation template</comment>
+ <comment xml:lang="af">PowerPoint 2007-voorleggingsjabloon</comment>
<comment xml:lang="bg">Шаблон за презентации — PowerPoint 2007</comment>
<comment xml:lang="ca">plantilla de presentació de PowerPoint 2007</comment>
<comment xml:lang="cs">šablona prezentace PowerPoint 2007</comment>
<comment xml:lang="da">PowerPoint 2007-præsentationsskabelon</comment>
<comment xml:lang="de">PowerPoint 2007-Präsentationsvorlage</comment>
<comment xml:lang="el">Πρότυπο παρουσίασης PowerPoint 2007</comment>
- <comment xml:lang="en_GB">PowerPoint 2007 presentation template</comment>
+ <comment xml:lang="en-GB">PowerPoint 2007 presentation template</comment>
<comment xml:lang="es">plantilla de presentación de PowerPoint 2007</comment>
<comment xml:lang="eu">PowerPoint 2007 aurkezpen txantiloia</comment>
<comment xml:lang="fi">PowerPoint 2007 -esitysmalli</comment>
<comment xml:lang="fr">modèle de présentation PowerPoint 2007</comment>
+ <comment xml:lang="fur">model presentazion PowerPoint 2007</comment>
<comment xml:lang="ga">teimpléad láithreoireachta PowerPoint 2007</comment>
<comment xml:lang="gl">modelo de presentación de PowerPoint 2007</comment>
<comment xml:lang="he">תבנית למצגת של PowerPoint 2007</comment>
@@ -39325,7 +40805,7 @@
<comment xml:lang="oc">modèl de presentacion PowerPoint 2007</comment>
<comment xml:lang="pl">Szablon prezentacji PowerPoint 2007</comment>
<comment xml:lang="pt">modelo de apresentação PowerPoint 2007</comment>
- <comment xml:lang="pt_BR">Modelo de apresentação do PowerPoint 2007</comment>
+ <comment xml:lang="pt-BR">Modelo de apresentação do PowerPoint 2007</comment>
<comment xml:lang="ru">Шаблон презентации PowerPoint 2007</comment>
<comment xml:lang="sk">Šablóna prezentácie PowerPoint 2007</comment>
<comment xml:lang="sl">Predloga predstavitve PowerPoint 2007</comment>
@@ -39333,14 +40813,15 @@
<comment xml:lang="sv">PowerPoint 2007-presentationsmall</comment>
<comment xml:lang="tr">PowerPoint 2007 sunum şablonu</comment>
<comment xml:lang="uk">шаблон презентації PowerPoint 2007</comment>
- <comment xml:lang="zh_CN">PowerPoint 2007 演示文稿模板</comment>
- <comment xml:lang="zh_TW">PowerPoint 2007 簡報範本</comment>
+ <comment xml:lang="zh-CN">PowerPoint 2007 演示文稿模板</comment>
+ <comment xml:lang="zh-TW">PowerPoint 2007 簡報範本</comment>
<glob pattern="*.potx"/>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-presentation"/>
</mime-type>
<mime-type type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
<comment>Excel 2007 spreadsheet</comment>
+ <comment xml:lang="af">Excel 2007-sigblad</comment>
<comment xml:lang="ar">جدول Excel 2007</comment>
<comment xml:lang="bg">Таблица — Excel 2007</comment>
<comment xml:lang="ca">full de càlcul d'Excel 2007</comment>
@@ -39348,12 +40829,13 @@
<comment xml:lang="da">Excel 2007-regneark</comment>
<comment xml:lang="de">Excel-2007-Tabelle</comment>
<comment xml:lang="el">Λογιστικό φύλλο Excel 2007</comment>
- <comment xml:lang="en_GB">Excel 2007 spreadsheet</comment>
+ <comment xml:lang="en-GB">Excel 2007 spreadsheet</comment>
<comment xml:lang="es">hoja de cálculo de Excel 2007</comment>
<comment xml:lang="eu">Excel 2007 kalkulu-orria</comment>
<comment xml:lang="fi">Excel 2007 -taulukko</comment>
<comment xml:lang="fo">Excel 2007 rokniark</comment>
<comment xml:lang="fr">feuille de calcul Excel 2007</comment>
+ <comment xml:lang="fur">sfuei di calcul Excel 2007</comment>
<comment xml:lang="ga">scarbhileog Excel 2007</comment>
<comment xml:lang="gl">folla de cálculo de Excel 2007</comment>
<comment xml:lang="he">גליון נתונים של Excel 2007</comment>
@@ -39372,35 +40854,37 @@
<comment xml:lang="oc">fuèlh de calcul Excel 2007</comment>
<comment xml:lang="pl">Arkusz Excel 2007</comment>
<comment xml:lang="pt">folha de cálculo Excel 2007</comment>
- <comment xml:lang="pt_BR">Planilha do Excel 2007</comment>
+ <comment xml:lang="pt-BR">Planilha do Excel 2007</comment>
<comment xml:lang="ro">Foaie de calcul Excel 2007</comment>
<comment xml:lang="ru">Электронная таблица Excel 2007</comment>
<comment xml:lang="sk">Zošit Excel 2007</comment>
<comment xml:lang="sl">Razpredelnica Microsoft Excel 2007</comment>
<comment xml:lang="sr">табела Ексела 2007</comment>
<comment xml:lang="sv">Excel 2007-kalkylblad</comment>
- <comment xml:lang="tr">Excel 2007 çalışma sayfası</comment>
+ <comment xml:lang="tr">Excel 2007 hesap çizelgesi sayfası</comment>
<comment xml:lang="uk">ел. таблиця Excel 2007</comment>
<comment xml:lang="vi">Bảng tính Excel 2007</comment>
- <comment xml:lang="zh_CN">Excel 2007 电子表格</comment>
- <comment xml:lang="zh_TW">Excel 2007 試算表</comment>
+ <comment xml:lang="zh-CN">Excel 2007 电子表格</comment>
+ <comment xml:lang="zh-TW">Excel 2007 試算表</comment>
<glob pattern="*.xlsx"/>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-spreadsheet"/>
</mime-type>
<mime-type type="application/vnd.openxmlformats-officedocument.spreadsheetml.template">
<comment>Excel 2007 spreadsheet template</comment>
+ <comment xml:lang="af">Excel 2007-sigbladsjabloon</comment>
<comment xml:lang="bg">Шаблон за таблици — Excel 2007</comment>
<comment xml:lang="ca">plantilla de full de càlcul d'Excel 2007</comment>
<comment xml:lang="cs">šablona sešitu Excel 2007</comment>
<comment xml:lang="da">Excel 2007-regnearksskabelon</comment>
<comment xml:lang="de">Excel 2007-Tabellenvorlage</comment>
<comment xml:lang="el">Πρότυπο λογιστικού φύλλου Excel 2007</comment>
- <comment xml:lang="en_GB">Excel 2007 spreadsheet template</comment>
+ <comment xml:lang="en-GB">Excel 2007 spreadsheet template</comment>
<comment xml:lang="es">plantilla de hoja de cálculo de Excel 2007</comment>
<comment xml:lang="eu">Excel 2007 kalkulu-orri txantiloia</comment>
<comment xml:lang="fi">Excel 2007 -taulukkomalli</comment>
<comment xml:lang="fr">modèle de feuille de calcul Excel 2007</comment>
+ <comment xml:lang="fur">model sfuei di calcul Excel 2007</comment>
<comment xml:lang="ga">teimpléad scarbhileoige Excel 2007</comment>
<comment xml:lang="gl">modelo de folla de cálculo Excel 2007</comment>
<comment xml:lang="he">תבנית של גיליון נתונים של Excel 2007</comment>
@@ -39418,38 +40902,40 @@
<comment xml:lang="oc">modèl de fuèlh de calcul Excel 2007</comment>
<comment xml:lang="pl">Szablon arkusza Excel 2007</comment>
<comment xml:lang="pt">modelo de folha de cálculo Excel 2007</comment>
- <comment xml:lang="pt_BR">Modelo de planilha do Excel 2007</comment>
+ <comment xml:lang="pt-BR">Modelo de planilha do Excel 2007</comment>
<comment xml:lang="ru">Шаблон электронной таблицы Excel 2007</comment>
<comment xml:lang="sk">Šablóna zošitu Excel 2007</comment>
<comment xml:lang="sl">Predloga razpredelnice Excel 2007</comment>
<comment xml:lang="sr">шаблон табеле Ексела 2007</comment>
<comment xml:lang="sv">Excel 2007-kalkylarksmall</comment>
- <comment xml:lang="tr">Excel 2007 çalışma sayfası şablonu</comment>
+ <comment xml:lang="tr">Excel 2007 hesap çizelgesi şablonu</comment>
<comment xml:lang="uk">шаблон електронної таблиці Excel 2007</comment>
- <comment xml:lang="zh_CN">Excel 2007 电子表格模板</comment>
- <comment xml:lang="zh_TW">Excel 2007 試算表範本</comment>
+ <comment xml:lang="zh-CN">Excel 2007 电子表格模板</comment>
+ <comment xml:lang="zh-TW">Excel 2007 試算表範本</comment>
<glob pattern="*.xltx"/>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-spreadsheet"/>
</mime-type>
<mime-type type="application/x-t602">
<comment>T602 document</comment>
+ <comment xml:lang="af">T602-dokument</comment>
<comment xml:lang="ar">مستند T602</comment>
<comment xml:lang="ast">Documentu T602</comment>
- <comment xml:lang="be@latin">Dakument T602</comment>
+ <comment xml:lang="be-Latn">Dakument T602</comment>
<comment xml:lang="bg">Документ — T602</comment>
<comment xml:lang="ca">document T602</comment>
<comment xml:lang="cs">dokument T602</comment>
<comment xml:lang="da">T602-dokument</comment>
<comment xml:lang="de">T602-Dokument</comment>
<comment xml:lang="el">Έγγραφο T602</comment>
- <comment xml:lang="en_GB">T602 document</comment>
+ <comment xml:lang="en-GB">T602 document</comment>
<comment xml:lang="eo">T602-dokumento</comment>
<comment xml:lang="es">documento T602</comment>
<comment xml:lang="eu">T602 dokumentua</comment>
<comment xml:lang="fi">T602-asiakirja</comment>
<comment xml:lang="fo">T602 skjal</comment>
<comment xml:lang="fr">document T602</comment>
+ <comment xml:lang="fur">document T602</comment>
<comment xml:lang="ga">cáipéis T602</comment>
<comment xml:lang="gl">documento T602</comment>
<comment xml:lang="he">מסמך T602</comment>
@@ -39469,7 +40955,7 @@
<comment xml:lang="oc">document T602</comment>
<comment xml:lang="pl">Dokument T602</comment>
<comment xml:lang="pt">documento T602</comment>
- <comment xml:lang="pt_BR">Documento T602</comment>
+ <comment xml:lang="pt-BR">Documento T602</comment>
<comment xml:lang="ro">Document T602</comment>
<comment xml:lang="ru">Документ T602</comment>
<comment xml:lang="sk">Dokument T602</comment>
@@ -39480,75 +40966,54 @@
<comment xml:lang="tr">T602 belgesi</comment>
<comment xml:lang="uk">документ T602</comment>
<comment xml:lang="vi">Tài liệu T602</comment>
- <comment xml:lang="zh_CN">T602 文档</comment>
- <comment xml:lang="zh_TW">T602 文件</comment>
+ <comment xml:lang="zh-CN">T602 文档</comment>
+ <comment xml:lang="zh-TW">T602 文件</comment>
<generic-icon name="x-office-document"/>
<magic priority="50">
- <match value="@CT 0" type="string" offset="0"/>
- <match value="@CT 1" type="string" offset="0"/>
- <match value="@CT 2" type="string" offset="0"/>
+ <match offset="0" type="string" value="@CT 0"/>
+ <match offset="0" type="string" value="@CT 1"/>
+ <match offset="0" type="string" value="@CT 2"/>
</magic>
<glob pattern="*.602"/>
</mime-type>
<mime-type type="application/x-cisco-vpn-settings">
- <comment>Cisco VPN Settings</comment>
- <comment xml:lang="ar">إعدادات Cisco VPN</comment>
- <comment xml:lang="be@latin">Nałady Cisco VPN</comment>
+ <comment>Cisco VPN settings</comment>
<comment xml:lang="bg">Настройки — ВЧМ на Cisco</comment>
<comment xml:lang="ca">ajusts VPN de Cisco</comment>
- <comment xml:lang="cs">nastavení Cisco VPN</comment>
- <comment xml:lang="da">Cisco VPN-opsætning</comment>
+ <comment xml:lang="da">Cisco VPN-indstillinger</comment>
<comment xml:lang="de">Cisco-VPN-Einstellungen</comment>
- <comment xml:lang="el">Ρυθμίσεις Cisco VPN</comment>
- <comment xml:lang="en_GB">Cisco VPN Settings</comment>
- <comment xml:lang="es">configuración de VPN de Cisco</comment>
+ <comment xml:lang="en-GB">Cisco VPN settings</comment>
+ <comment xml:lang="es">configuración de Cisco VPN</comment>
<comment xml:lang="eu">Cisco VPN ezarpenak</comment>
- <comment xml:lang="fi">Cisco VPN -asetukset</comment>
- <comment xml:lang="fo">Cisco VPN stillingar</comment>
+ <comment xml:lang="fi">Ciscon VPN-asetukset</comment>
<comment xml:lang="fr">paramètres VPN Cisco</comment>
- <comment xml:lang="ga">socruithe VPN Cisco</comment>
- <comment xml:lang="gl">configuracións de VPN de Cisco</comment>
- <comment xml:lang="he">הגדרות של Cisco VPN</comment>
<comment xml:lang="hr">Cisco VPN postavke</comment>
<comment xml:lang="hu">Cisco VPN beállítások</comment>
- <comment xml:lang="ia">Configuration VPN Cisco</comment>
- <comment xml:lang="id">Penataan Cisco VPN</comment>
+ <comment xml:lang="id">Pengaturan VPN Cisco</comment>
<comment xml:lang="it">Impostazioni VPN Cisco</comment>
- <comment xml:lang="ja">Cisco VPN 設定</comment>
- <comment xml:lang="ka">Cisco VPN-ის პარამეტრები</comment>
<comment xml:lang="kk">Cisco VPN баптаулары</comment>
- <comment xml:lang="ko">Cisco VPN 설정</comment>
- <comment xml:lang="lt">Cisco VPN parametrai</comment>
- <comment xml:lang="lv">Cisco VPN iestatījumi</comment>
- <comment xml:lang="nb">Cisco VPN-innstillinger</comment>
- <comment xml:lang="nl">Cisco VPN-instellingen</comment>
- <comment xml:lang="nn">Cisco VPN-innstillingar</comment>
- <comment xml:lang="oc">paramètres VPN Cisco</comment>
+ <comment xml:lang="ko">시스코 VPN 설정</comment>
<comment xml:lang="pl">Ustawienia VPN Cisco</comment>
- <comment xml:lang="pt">definições de Cisco VPN</comment>
- <comment xml:lang="pt_BR">Configurações de VPN da Cisco</comment>
- <comment xml:lang="ro">Configurări VPN Cisco</comment>
+ <comment xml:lang="pt-BR">Configurações de VPN da Cisco</comment>
<comment xml:lang="ru">Файл настроек Cisco VPN</comment>
<comment xml:lang="sk">Nastavenia Cisco VPN</comment>
- <comment xml:lang="sl">Datoteka nastavitev Cisco VPN</comment>
- <comment xml:lang="sq">Rregullime VPN Cisco</comment>
- <comment xml:lang="sr">подешавања Циско ВПН-а</comment>
+ <comment xml:lang="sl">Nastavitve Cisco VPN</comment>
<comment xml:lang="sv">Cisco VPN-inställningar</comment>
- <comment xml:lang="tr">Cisco VPN Ayarları</comment>
+ <comment xml:lang="tr">Cisco VPN ayarları</comment>
<comment xml:lang="uk">параметри VPN Cisco</comment>
- <comment xml:lang="vi">Thiết lập VPN Cisco</comment>
- <comment xml:lang="zh_CN">Cisco VPN 设置</comment>
- <comment xml:lang="zh_TW">Cisco VPN 設定值</comment>
+ <comment xml:lang="zh-CN">Cisco VPN 设置</comment>
+ <comment xml:lang="zh-TW">Cisco VPN 設定</comment>
<generic-icon name="text-x-generic"/>
<magic priority="50">
- <match value="[main]" type="string" offset="0">
- <match value="AuthType=" type="string" offset="0:256"/>
+ <match type="string" value="[main]" offset="0">
+ <match type="string" value="AuthType=" offset="0:256"/>
</match>
</magic>
<glob pattern="*.pcf"/>
</mime-type>
<mime-type type="application/vnd.iccprofile">
<comment>ICC profile</comment>
+ <comment xml:lang="af">ICC-profiel</comment>
<comment xml:lang="ar">تشكيلة OCL</comment>
<comment xml:lang="ast">Perfil ICC</comment>
<comment xml:lang="bg">Цветови профил — OCL</comment>
@@ -39557,13 +41022,14 @@
<comment xml:lang="da">ICC-profil</comment>
<comment xml:lang="de">ICC-Profil</comment>
<comment xml:lang="el">Προφίλ ICC</comment>
- <comment xml:lang="en_GB">ICC profile</comment>
+ <comment xml:lang="en-GB">ICC profile</comment>
<comment xml:lang="eo">ICC-profilo</comment>
<comment xml:lang="es">perfil ICC</comment>
<comment xml:lang="eu">ICC profila</comment>
<comment xml:lang="fi">ICC-profiili</comment>
<comment xml:lang="fo">ICC umhvarv</comment>
<comment xml:lang="fr">profil ICC</comment>
+ <comment xml:lang="fur">profîl ICC</comment>
<comment xml:lang="ga">próifíl ICC</comment>
<comment xml:lang="gl">perfíl ICC</comment>
<comment xml:lang="he">פרופיל ICC</comment>
@@ -39581,7 +41047,7 @@
<comment xml:lang="oc">perfil ICC</comment>
<comment xml:lang="pl">Profil ICC</comment>
<comment xml:lang="pt">perfil ICC</comment>
- <comment xml:lang="pt_BR">Perfil ICC</comment>
+ <comment xml:lang="pt-BR">Perfil ICC</comment>
<comment xml:lang="ro">Profil ICC</comment>
<comment xml:lang="ru">Профиль ICC</comment>
<comment xml:lang="sk">Profil farieb ICC</comment>
@@ -39590,10 +41056,10 @@
<comment xml:lang="sv">ICC-profil</comment>
<comment xml:lang="tr">ICC profili</comment>
<comment xml:lang="uk">профіль ICC</comment>
- <comment xml:lang="zh_CN">ICC 配置文件</comment>
- <comment xml:lang="zh_TW">ICC 設定檔</comment>
+ <comment xml:lang="zh-CN">ICC 配置文件</comment>
+ <comment xml:lang="zh-TW">ICC 設定組合</comment>
<magic priority="50">
- <match value="acsp" type="string" offset="36"/>
+ <match type="string" value="acsp" offset="36"/>
</magic>
<glob pattern="*.icc"/>
<glob pattern="*.icm"/>
@@ -39601,18 +41067,19 @@
<mime-type type="application/x-it87">
<comment>IT 8.7 color calibration file</comment>
<comment xml:lang="ar">ملف ضبط ألوان IT 8.7</comment>
- <comment xml:lang="bg">Файл за цветово калибриране — IT 8.7</comment>
+ <comment xml:lang="bg">Цветово калибриране — IT 8.7</comment>
<comment xml:lang="ca">fitxer de calibratge de color IT 8.7</comment>
<comment xml:lang="cs">soubor kalibrace barev IT 8.7</comment>
<comment xml:lang="da">IT 8.7 farvekalibreringsfil</comment>
<comment xml:lang="de">IT 8.7-Farbkalibrierungsdatei</comment>
<comment xml:lang="el">Αρχείο βαθμονόμησης χρώματος ΙΤ 8.7</comment>
- <comment xml:lang="en_GB">IT 8.7 color calibration file</comment>
+ <comment xml:lang="en-GB">IT 8.7 color calibration file</comment>
<comment xml:lang="es">archivo de calibración de color IT 8.7</comment>
<comment xml:lang="eu">IT 8.7 kolore-kalibrazioaren fitxategia</comment>
<comment xml:lang="fi">IT 8.7 -värikalibrointitiedosto</comment>
<comment xml:lang="fo">IT 8.7 litstillingarfíla</comment>
<comment xml:lang="fr">fichier de calibration couleur IT 8.7</comment>
+ <comment xml:lang="fur">file calibradure colôr IT 8.7</comment>
<comment xml:lang="ga">comhad calabraithe dathanna IT 8.7</comment>
<comment xml:lang="gl">ficheiro de calibración de cor IT 8.7</comment>
<comment xml:lang="he">קובץ כיול צבע IT 8.7</comment>
@@ -39630,7 +41097,7 @@
<comment xml:lang="oc">fichièr de calibracion color IT 8.7</comment>
<comment xml:lang="pl">Plik kalibracji kolorów IT 8.7</comment>
<comment xml:lang="pt">ficheiro de calibração de cor IT 8.7</comment>
- <comment xml:lang="pt_BR">Arquivo de calibração de cor IT 8.7</comment>
+ <comment xml:lang="pt-BR">Arquivo de calibração de cor IT 8.7</comment>
<comment xml:lang="ro">Fișier de calibrare a culorii IT 8.7</comment>
<comment xml:lang="ru">Файл калибровки цвета IT 8.7</comment>
<comment xml:lang="sk">Súbor kalibrácie farieb IT 8.7</comment>
@@ -39639,10 +41106,10 @@
<comment xml:lang="sv">IT 8.7-färgkalibreringsfil</comment>
<comment xml:lang="tr">IT 8.7 renk kalibrasyon dosyası</comment>
<comment xml:lang="uk">файл калібрування кольорів IT 8.7</comment>
- <comment xml:lang="zh_CN">IT 8.7 色彩校准文件</comment>
- <comment xml:lang="zh_TW">IT 8.7 色彩校正檔</comment>
+ <comment xml:lang="zh-CN">IT 8.7 色彩校准文件</comment>
+ <comment xml:lang="zh-TW">IT 8.7 色彩校正檔</comment>
<magic priority="50">
- <match value="IT8.7" type="string" offset="0"/>
+ <match type="string" value="IT8.7" offset="0"/>
</magic>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
@@ -39650,16 +41117,18 @@
</mime-type>
<mime-type type="application/x-ccmx">
<comment>CCMX color correction file</comment>
+ <comment xml:lang="bg">Цветови поправки — CCMX</comment>
<comment xml:lang="ca">fitxer de correcció de color CCMX</comment>
<comment xml:lang="cs">soubor korekce barev CCMX</comment>
<comment xml:lang="da">CCMX-farvekorrektionsfil</comment>
<comment xml:lang="de">CCMX-Farbkorrekturdatei</comment>
<comment xml:lang="el">Αρχείο διόρθωσης χρωμάτων CCMX</comment>
- <comment xml:lang="en_GB">CCMX colour correction file</comment>
+ <comment xml:lang="en-GB">CCMX colour correction file</comment>
<comment xml:lang="es">archivo de corrección de color CCMX</comment>
<comment xml:lang="eu">CCMX kolore-kalibrazioaren fitxategia</comment>
<comment xml:lang="fi">CCMX-värikorjaustiedosto</comment>
<comment xml:lang="fr">fichier de correction colorimétrique CCMX</comment>
+ <comment xml:lang="fur">file corezion colôr CCMX</comment>
<comment xml:lang="ga">comhad ceartúchán dathanna CCMX</comment>
<comment xml:lang="gl">Ficheiro de corrección de cor CCMX</comment>
<comment xml:lang="he">קובץ תיקון צבע מסוג CCMX</comment>
@@ -39675,7 +41144,7 @@
<comment xml:lang="oc">fichièr de correccion colorimetrica CCMX</comment>
<comment xml:lang="pl">Plik korekcji kolorów CCMX</comment>
<comment xml:lang="pt">ficheiro de correção de cor CCMX</comment>
- <comment xml:lang="pt_BR">Arquivo de correção de cor CCMX</comment>
+ <comment xml:lang="pt-BR">Arquivo de correção de cor CCMX</comment>
<comment xml:lang="ru">Файл цветовой коррекции CCMX</comment>
<comment xml:lang="sk">Súbor korekcie farieb CCMX</comment>
<comment xml:lang="sl">Datoteka barvne poprave CCMX</comment>
@@ -39683,10 +41152,10 @@
<comment xml:lang="sv">CCMX-färgkorrigeringsfil</comment>
<comment xml:lang="tr">CCMX renk düzeltme dosyası</comment>
<comment xml:lang="uk">файл даних виправлення кольорів CCMX</comment>
- <comment xml:lang="zh_CN">CCMX 色彩校准文件</comment>
- <comment xml:lang="zh_TW">CCMX 色彩校正檔</comment>
+ <comment xml:lang="zh-CN">CCMX 色彩校准文件</comment>
+ <comment xml:lang="zh-TW">CCMX 色彩校正檔</comment>
<magic priority="50">
- <match value="CCMX" type="string" offset="0"/>
+ <match type="string" value="CCMX" offset="0"/>
</magic>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
@@ -39694,16 +41163,19 @@
</mime-type>
<mime-type type="application/winhlp">
<comment>WinHelp help file</comment>
+ <comment xml:lang="af">WinHelp-hulplêer</comment>
+ <comment xml:lang="bg">Помощен файл — WinHelp</comment>
<comment xml:lang="ca">fitxer d'ajuda WinHelp</comment>
<comment xml:lang="cs">soubor nápovědy WinHelp</comment>
<comment xml:lang="da">WinHelp-hjælpefil</comment>
<comment xml:lang="de">WinHelp-Hilfedatei</comment>
<comment xml:lang="el">Αρχείο βοήθειας WinHelp</comment>
- <comment xml:lang="en_GB">WinHelp help file</comment>
+ <comment xml:lang="en-GB">WinHelp help file</comment>
<comment xml:lang="es">archivo de ayuda de WinHelp</comment>
<comment xml:lang="eu">WinHelp laguntza fitxategia</comment>
<comment xml:lang="fi">WinHelp-ohjetiedosto</comment>
<comment xml:lang="fr">fichier d'aide WinHelp</comment>
+ <comment xml:lang="fur">file di jutori WinHelp</comment>
<comment xml:lang="ga">comhad cabhrach WinHelp</comment>
<comment xml:lang="gl">Ficheiro de axuda WinHelp</comment>
<comment xml:lang="he">קובץ עזרה מסוג WinHelp</comment>
@@ -39719,7 +41191,7 @@
<comment xml:lang="oc">fichièr d'ajuda WinHelp</comment>
<comment xml:lang="pl">Plik pomocy WinHelp</comment>
<comment xml:lang="pt">ficheiro de ajuda WinHelp</comment>
- <comment xml:lang="pt_BR">Arquivo de ajuda WinHelp</comment>
+ <comment xml:lang="pt-BR">Arquivo de ajuda WinHelp</comment>
<comment xml:lang="ru">Файл справки WinHelp</comment>
<comment xml:lang="sk">Súbor Pomocníka WinHelp</comment>
<comment xml:lang="sl">Datoteka pomoči WinHelp</comment>
@@ -39727,24 +41199,27 @@
<comment xml:lang="sv">WinHelp-hjälpfil</comment>
<comment xml:lang="tr">WinHelp yardım dosyası</comment>
<comment xml:lang="uk">файл довідки WinHelp</comment>
- <comment xml:lang="zh_CN">WinHelp 帮助文件</comment>
- <comment xml:lang="zh_TW">WinHelp 說明檔</comment>
+ <comment xml:lang="zh-CN">WinHelp 帮助文件</comment>
+ <comment xml:lang="zh-TW">WinHelp 說明檔</comment>
<magic priority="50">
- <match value="0x00035f3f" type="little32" offset="0"/>
+ <match type="little32" value="0x00035f3f" offset="0"/>
</magic>
<glob pattern="*.hlp"/>
<alias type="zz-application/zz-winassoc-hlp"/>
</mime-type>
<mime-type type="application/x-bsdiff">
<comment>binary differences between files</comment>
+ <comment xml:lang="bg">двоична разлика между файлове</comment>
<comment xml:lang="ca">diferencies binàries entre fitxers</comment>
<comment xml:lang="cs">binární rozdíl mezi soubory</comment>
<comment xml:lang="da">binære forskelle mellem filer</comment>
<comment xml:lang="de">binäre Unterschiede zwischen Dateien</comment>
- <comment xml:lang="en_GB">binary differences between files</comment>
+ <comment xml:lang="en-GB">binary differences between files</comment>
<comment xml:lang="es">diferencias entre archivos binarios</comment>
<comment xml:lang="eu">fitxategi binarioen arteko ezberdinstasunak</comment>
+ <comment xml:lang="fi">binaariset erot tiedostojen välillä</comment>
<comment xml:lang="fr">différences binaires entre fichiers</comment>
+ <comment xml:lang="fur">diferencis binariis tra file</comment>
<comment xml:lang="ga">difríochtaí dénártha idir comhaid</comment>
<comment xml:lang="he">הבדלים בינריים בין קבצים</comment>
<comment xml:lang="hr">Binarne razlike između datoteka</comment>
@@ -39754,40 +41229,42 @@
<comment xml:lang="kk">файлдар арасындағы бинарлық айырмашылықтар</comment>
<comment xml:lang="ko">바이너리 차이 비교 파일</comment>
<comment xml:lang="pl">Binarna różnica pomiędzy plikami</comment>
- <comment xml:lang="pt_BR">Diferenças binárias entre arquivos</comment>
+ <comment xml:lang="pt-BR">Diferenças binárias entre arquivos</comment>
<comment xml:lang="ru">Двоичные различия между файлами</comment>
<comment xml:lang="sk">Binárne rozdiely medzi súbormi</comment>
<comment xml:lang="sr">бинарне разлике датотека</comment>
<comment xml:lang="sv">binära skillnader mellan filer</comment>
<comment xml:lang="tr">dosyalar arasındaki ikilik farklar</comment>
<comment xml:lang="uk">двійкова різниця між файлами</comment>
- <comment xml:lang="zh_CN">文件的二进制区别</comment>
- <comment xml:lang="zh_TW">檔案間的二進位差異</comment>
+ <comment xml:lang="zh-CN">文件的二进制区别</comment>
+ <comment xml:lang="zh-TW">檔案間的二進位差異</comment>
<magic>
- <match value="BSDIFF40" type="string" offset="0"/>
- <match value="BSDIFN40" type="string" offset="0"/>
+ <match type="string" value="BSDIFF40" offset="0"/>
+ <match type="string" value="BSDIFN40" offset="0"/>
</magic>
<glob pattern="*.bsdiff"/>
</mime-type>
-
+ <!-- Tree content-types -->
<mime-type type="x-content/image-dcf">
-
+ <!-- http://en.wikipedia.org/wiki/Design_rule_for_Camera_File_system -->
<comment>digital photos</comment>
+ <comment xml:lang="af">digitale foto’s</comment>
<comment xml:lang="ar">الصور الرقمية</comment>
- <comment xml:lang="be@latin">ličbavyja zdymki</comment>
+ <comment xml:lang="be-Latn">ličbavyja zdymki</comment>
<comment xml:lang="bg">Цифрови фотографии</comment>
<comment xml:lang="ca">fotos digitals</comment>
<comment xml:lang="cs">digitální fotografie</comment>
<comment xml:lang="da">digitale billeder</comment>
<comment xml:lang="de">Digitale Fotos</comment>
<comment xml:lang="el">Ψηφιακές φωτογραφίες</comment>
- <comment xml:lang="en_GB">digital photos</comment>
+ <comment xml:lang="en-GB">digital photos</comment>
<comment xml:lang="es">fotos digitales</comment>
<comment xml:lang="eu">argazki digitalak</comment>
<comment xml:lang="fi">digivalokuvia</comment>
<comment xml:lang="fo">talgildar myndir</comment>
<comment xml:lang="fr">photos numériques</comment>
+ <comment xml:lang="fur">fotos digjitâls</comment>
<comment xml:lang="ga">grianghraif dhigiteacha</comment>
<comment xml:lang="gl">fotos dixitais</comment>
<comment xml:lang="he">תמונות דיגיטליות</comment>
@@ -39806,7 +41283,7 @@
<comment xml:lang="oc">fòtos numericas</comment>
<comment xml:lang="pl">Zdjęcia cyfrowe</comment>
<comment xml:lang="pt">fotografias digitais</comment>
- <comment xml:lang="pt_BR">Fotos digitais</comment>
+ <comment xml:lang="pt-BR">Fotos digitais</comment>
<comment xml:lang="ro">fotografii digitale</comment>
<comment xml:lang="ru">Цифровые фотографии</comment>
<comment xml:lang="sk">Digitálne fotografie</comment>
@@ -39817,32 +41294,36 @@
<comment xml:lang="tr">sayısal fotoğraflar</comment>
<comment xml:lang="uk">цифрові фотографії</comment>
<comment xml:lang="vi">ảnh chụp số</comment>
- <comment xml:lang="zh_CN">数字化图像</comment>
- <comment xml:lang="zh_TW">數位相片</comment>
+ <comment xml:lang="zh-CN">数字化图像</comment>
+ <comment xml:lang="zh-TW">數位相片</comment>
<treemagic>
- <treematch type="directory" path="dcim" non-empty="true"/>
+ <treematch path="dcim" type="directory" non-empty="true"/>
</treemagic>
</mime-type>
<mime-type type="x-content/video-vcd">
-
+ <!-- TRANSLATORS: This is a brand-name, not a generic term. Please see
+ http://en.wikipedia.org/wiki/Video_CD
+ http://www.herongyang.com/CD-DVD/VCD-Movie-File-Directory-Structure.html -->
<comment>Video CD</comment>
+ <comment xml:lang="af">Video-CD</comment>
<comment xml:lang="ar">Video CD</comment>
<comment xml:lang="ast">CD de videu</comment>
- <comment xml:lang="be@latin">Videa CD</comment>
+ <comment xml:lang="be-Latn">Videa CD</comment>
<comment xml:lang="bg">CD — видео</comment>
<comment xml:lang="ca">Video CD</comment>
<comment xml:lang="cs">Video CD</comment>
<comment xml:lang="da">Video-cd</comment>
<comment xml:lang="de">Video-CD</comment>
<comment xml:lang="el">Video CD</comment>
- <comment xml:lang="en_GB">Video CD</comment>
+ <comment xml:lang="en-GB">Video CD</comment>
<comment xml:lang="eo">Video-KD</comment>
<comment xml:lang="es">Video CD</comment>
<comment xml:lang="eu">Bideo CDa</comment>
<comment xml:lang="fi">Video CD</comment>
<comment xml:lang="fo">Video CD</comment>
<comment xml:lang="fr">CD vidéo</comment>
+ <comment xml:lang="fur">Video CD</comment>
<comment xml:lang="ga">dlúthdhiosca físe</comment>
<comment xml:lang="gl">Video CD</comment>
<comment xml:lang="he">תקליטור וידאו</comment>
@@ -39861,7 +41342,7 @@
<comment xml:lang="oc">CD vidèo</comment>
<comment xml:lang="pl">Video CD</comment>
<comment xml:lang="pt">Video CD</comment>
- <comment xml:lang="pt_BR">CD de vídeo</comment>
+ <comment xml:lang="pt-BR">CD de vídeo</comment>
<comment xml:lang="ro">CD video</comment>
<comment xml:lang="ru">Видео CD</comment>
<comment xml:lang="sk">Video CD</comment>
@@ -39872,32 +41353,36 @@
<comment xml:lang="tr">Video CD</comment>
<comment xml:lang="uk">Video CD</comment>
<comment xml:lang="vi">Đĩa CD ảnh động</comment>
- <comment xml:lang="zh_CN">VCD</comment>
- <comment xml:lang="zh_TW">Video CD</comment>
+ <comment xml:lang="zh-CN">VCD</comment>
+ <comment xml:lang="zh-TW">Video CD</comment>
<treemagic>
- <treematch type="file" path="mpegav/AVSEQ01.DAT"/>
+ <treematch path="mpegav/AVSEQ01.DAT" type="file"/>
</treemagic>
</mime-type>
<mime-type type="x-content/video-svcd">
-
+ <!-- TRANSLATORS: This is a brand-name, not a generic term. Please see
+ http://en.wikipedia.org/wiki/Super_Video_CD
+ http://everything2.com/index.pl?node_id=1009222 -->
<comment>Super Video CD</comment>
+ <comment xml:lang="af">Super Video-CD</comment>
<comment xml:lang="ar">Super Video CD</comment>
<comment xml:lang="ast">CD de Super Video</comment>
- <comment xml:lang="be@latin">Super Video CD</comment>
+ <comment xml:lang="be-Latn">Super Video CD</comment>
<comment xml:lang="bg">CD — супер видео</comment>
<comment xml:lang="ca">Super Video CD</comment>
<comment xml:lang="cs">Super Video CD</comment>
<comment xml:lang="da">Super Video-cd</comment>
<comment xml:lang="de">Super-Video-CD</comment>
<comment xml:lang="el">Super Video CD</comment>
- <comment xml:lang="en_GB">Super Video CD</comment>
+ <comment xml:lang="en-GB">Super Video CD</comment>
<comment xml:lang="eo">Super-Video-KD</comment>
<comment xml:lang="es">Super Video CD</comment>
<comment xml:lang="eu">Super Bideo CDa</comment>
<comment xml:lang="fi">Super Video CD</comment>
<comment xml:lang="fo">Super Video CD</comment>
<comment xml:lang="fr">Super VCD</comment>
+ <comment xml:lang="fur">Super Video CD</comment>
<comment xml:lang="ga">dlúthdhiosca Super Video</comment>
<comment xml:lang="gl">Super vídeo CD</comment>
<comment xml:lang="he">Super Video CD</comment>
@@ -39916,7 +41401,7 @@
<comment xml:lang="oc">Super VCD</comment>
<comment xml:lang="pl">Super Video CD</comment>
<comment xml:lang="pt">Super Video CD</comment>
- <comment xml:lang="pt_BR">CD de Super Vídeo (SVCD)</comment>
+ <comment xml:lang="pt-BR">CD de Super Vídeo (SVCD)</comment>
<comment xml:lang="ro">Super Video CD</comment>
<comment xml:lang="ru">Super Video CD</comment>
<comment xml:lang="sk">Super Video CD</comment>
@@ -39927,32 +41412,34 @@
<comment xml:lang="tr">Super Video CD</comment>
<comment xml:lang="uk">Super Video CD</comment>
<comment xml:lang="vi">Đĩa CD siêu ảnh động</comment>
- <comment xml:lang="zh_CN">SVCD</comment>
- <comment xml:lang="zh_TW">Super Video CD</comment>
+ <comment xml:lang="zh-CN">SVCD</comment>
+ <comment xml:lang="zh-TW">Super Video CD</comment>
<treemagic>
- <treematch type="file" path="MPEG2/AVSEQ01.MPG"/>
+ <treematch path="MPEG2/AVSEQ01.MPG" type="file"/>
</treemagic>
</mime-type>
<mime-type type="x-content/video-dvd">
-
+ <!-- http://en.wikipedia.org/wiki/DVD-Video -->
<comment>video DVD</comment>
+ <comment xml:lang="af">video-DVD</comment>
<comment xml:lang="ar">DVD مرئي</comment>
<comment xml:lang="ast">DVD de videu</comment>
- <comment xml:lang="be@latin">videa DVD</comment>
+ <comment xml:lang="be-Latn">videa DVD</comment>
<comment xml:lang="bg">DVD — видео</comment>
- <comment xml:lang="ca">DVD-Video</comment>
+ <comment xml:lang="ca">DVD de video</comment>
<comment xml:lang="cs">videodisk DVD</comment>
<comment xml:lang="da">video-dvd</comment>
<comment xml:lang="de">Video-DVD</comment>
<comment xml:lang="el">Βίντεο DVD</comment>
- <comment xml:lang="en_GB">video DVD</comment>
+ <comment xml:lang="en-GB">video DVD</comment>
<comment xml:lang="eo">video-DVD</comment>
<comment xml:lang="es">DVD de vídeo</comment>
<comment xml:lang="eu">bideo DVDa</comment>
<comment xml:lang="fi">video-DVD</comment>
<comment xml:lang="fo">video DVD</comment>
<comment xml:lang="fr">DVD vidéo</comment>
+ <comment xml:lang="fur">DVD video</comment>
<comment xml:lang="ga">DVD físe</comment>
<comment xml:lang="gl">DVD de vídeo</comment>
<comment xml:lang="he">DVD וידאו</comment>
@@ -39972,7 +41459,7 @@
<comment xml:lang="oc">DVD vidèo</comment>
<comment xml:lang="pl">DVD-Video</comment>
<comment xml:lang="pt">DVD vídeo</comment>
- <comment xml:lang="pt_BR">DVD de vídeo</comment>
+ <comment xml:lang="pt-BR">DVD de vídeo</comment>
<comment xml:lang="ro">DVD video</comment>
<comment xml:lang="ru">Видео DVD</comment>
<comment xml:lang="sk">DVD-Video</comment>
@@ -39983,34 +41470,36 @@
<comment xml:lang="tr">video DVD</comment>
<comment xml:lang="uk">відео-DVD</comment>
<comment xml:lang="vi">đĩa DVD ảnh động</comment>
- <comment xml:lang="zh_CN">视频 DVD</comment>
- <comment xml:lang="zh_TW">視訊 DVD</comment>
+ <comment xml:lang="zh-CN">视频 DVD</comment>
+ <comment xml:lang="zh-TW">視訊 DVD</comment>
<treemagic>
- <treematch type="file" path="VIDEO_TS/VIDEO_TS.IFO"/>
- <treematch type="file" path="VIDEO_TS/VIDEO_TS.IFO;1"/>
- <treematch type="file" path="VIDEO_TS.IFO"/>
- <treematch type="file" path="VIDEO_TS.IFO;1"/>
+ <treematch path="VIDEO_TS/VIDEO_TS.IFO" type="file"/>
+ <treematch path="VIDEO_TS/VIDEO_TS.IFO;1" type="file"/>
+ <treematch path="VIDEO_TS.IFO" type="file"/>
+ <treematch path="VIDEO_TS.IFO;1" type="file"/>
</treemagic>
</mime-type>
<mime-type type="x-content/audio-cdda">
-
+ <!-- http://en.wikipedia.org/wiki/Red_Book_(audio_CD_standard) -->
<comment>audio CD</comment>
+ <comment xml:lang="af">oudio-CD</comment>
<comment xml:lang="ar">CD سمعي</comment>
- <comment xml:lang="be@latin">aŭdyjo CD</comment>
+ <comment xml:lang="be-Latn">aŭdyjo CD</comment>
<comment xml:lang="bg">CD — аудио</comment>
<comment xml:lang="ca">CD d'àudio</comment>
<comment xml:lang="cs">zvukové CD</comment>
<comment xml:lang="da">lyd-cd</comment>
<comment xml:lang="de">Audio-CD</comment>
<comment xml:lang="el">CD ήχου</comment>
- <comment xml:lang="en_GB">audio CD</comment>
+ <comment xml:lang="en-GB">audio CD</comment>
<comment xml:lang="eo">Son-KD</comment>
- <comment xml:lang="es">CD de sonido</comment>
+ <comment xml:lang="es">CD de audio</comment>
<comment xml:lang="eu">Audio CDa</comment>
<comment xml:lang="fi">ääni-CD</comment>
<comment xml:lang="fo">audio CD</comment>
<comment xml:lang="fr">CD audio</comment>
+ <comment xml:lang="fur">CD audio</comment>
<comment xml:lang="ga">dlúthdhiosca fuaime</comment>
<comment xml:lang="gl">CD de son</comment>
<comment xml:lang="he">תקליטור שמע</comment>
@@ -40029,7 +41518,7 @@
<comment xml:lang="oc">CD àudio</comment>
<comment xml:lang="pl">CD-Audio</comment>
<comment xml:lang="pt">CD áudio</comment>
- <comment xml:lang="pt_BR">CD de áudio</comment>
+ <comment xml:lang="pt-BR">CD de áudio</comment>
<comment xml:lang="ro">CD audio</comment>
<comment xml:lang="ru">Аудио CD</comment>
<comment xml:lang="sk">Zvukové CD</comment>
@@ -40037,30 +41526,32 @@
<comment xml:lang="sq">CD audio</comment>
<comment xml:lang="sr">звучни ЦД</comment>
<comment xml:lang="sv">ljud-cd</comment>
- <comment xml:lang="tr">Müzik CD'si</comment>
+ <comment xml:lang="tr">ses CD'si</comment>
<comment xml:lang="uk">звуковий CD</comment>
<comment xml:lang="vi">đĩa CD âm thanh</comment>
- <comment xml:lang="zh_CN">音频 CD</comment>
- <comment xml:lang="zh_TW">音訊 CD</comment>
+ <comment xml:lang="zh-CN">音频 CD</comment>
+ <comment xml:lang="zh-TW">音訊 CD</comment>
</mime-type>
<mime-type type="x-content/blank-cd">
-
+ <!-- http://en.wikipedia.org/wiki/Compact_Disc -->
<comment>blank CD disc</comment>
+ <comment xml:lang="af">skoon CD-skyf</comment>
<comment xml:lang="ar">قرص CD فارغ</comment>
- <comment xml:lang="be@latin">čysty dysk CD</comment>
+ <comment xml:lang="be-Latn">čysty dysk CD</comment>
<comment xml:lang="bg">CD — празно</comment>
<comment xml:lang="ca">disc CD en blanc</comment>
<comment xml:lang="cs">prázdný disk CD</comment>
<comment xml:lang="da">tom cd-disk</comment>
<comment xml:lang="de">Leere CD</comment>
<comment xml:lang="el">Κενό CD</comment>
- <comment xml:lang="en_GB">blank CD disc</comment>
+ <comment xml:lang="en-GB">blank CD disc</comment>
<comment xml:lang="es">disco CD en blanco</comment>
<comment xml:lang="eu">CD disko hutsa</comment>
<comment xml:lang="fi">tyhjä CD-levy</comment>
<comment xml:lang="fo">blonk fløga</comment>
<comment xml:lang="fr">CD vierge</comment>
+ <comment xml:lang="fur">disc CD vueit</comment>
<comment xml:lang="ga">dlúthdhiosca folamh</comment>
<comment xml:lang="gl">disco de CD en brancho</comment>
<comment xml:lang="he">תקליטור ריק</comment>
@@ -40079,7 +41570,7 @@
<comment xml:lang="oc">CD verge</comment>
<comment xml:lang="pl">Pusta płyta CD</comment>
<comment xml:lang="pt">CD vazio</comment>
- <comment xml:lang="pt_BR">Disco CD vazio</comment>
+ <comment xml:lang="pt-BR">Disco CD vazio</comment>
<comment xml:lang="ro">disc gol CD</comment>
<comment xml:lang="ru">Чистый диск CD</comment>
<comment xml:lang="sk">Prázdny disk CD</comment>
@@ -40090,27 +41581,29 @@
<comment xml:lang="tr">boş CD diski</comment>
<comment xml:lang="uk">порожній компакт-диск</comment>
<comment xml:lang="vi">đĩa CD trống</comment>
- <comment xml:lang="zh_CN">空 CD 光盘</comment>
- <comment xml:lang="zh_TW">空白 CD 光碟</comment>
+ <comment xml:lang="zh-CN">空 CD 光盘</comment>
+ <comment xml:lang="zh-TW">空白 CD 光碟</comment>
</mime-type>
<mime-type type="x-content/blank-dvd">
-
+ <!-- http://en.wikipedia.org/wiki/DVD -->
<comment>blank DVD disc</comment>
+ <comment xml:lang="af">skoon DVD-skyf</comment>
<comment xml:lang="ar">قرص DVD فارغ</comment>
- <comment xml:lang="be@latin">čysty dysk DVD</comment>
+ <comment xml:lang="be-Latn">čysty dysk DVD</comment>
<comment xml:lang="bg">DVD — празно</comment>
<comment xml:lang="ca">disc DVD en blanc</comment>
<comment xml:lang="cs">prázdný disk DVD</comment>
<comment xml:lang="da">tom dvd-disk</comment>
<comment xml:lang="de">Leere DVD</comment>
<comment xml:lang="el">Κενό DVD</comment>
- <comment xml:lang="en_GB">blank DVD disc</comment>
+ <comment xml:lang="en-GB">blank DVD disc</comment>
<comment xml:lang="es">disco DVD en blanco</comment>
<comment xml:lang="eu">DVD disko hutsa</comment>
<comment xml:lang="fi">tyhjä DVD-levy</comment>
<comment xml:lang="fo">blonk margfløga</comment>
<comment xml:lang="fr">DVD vierge</comment>
+ <comment xml:lang="fur">disc DVD vueit</comment>
<comment xml:lang="ga">DVD folamh</comment>
<comment xml:lang="gl">disco de DVD en branco</comment>
<comment xml:lang="he">תקליטור DVD ריק</comment>
@@ -40129,7 +41622,7 @@
<comment xml:lang="oc">DVD verge</comment>
<comment xml:lang="pl">Pusta płyta DVD</comment>
<comment xml:lang="pt">DVD vazio</comment>
- <comment xml:lang="pt_BR">Disco DVD vazio</comment>
+ <comment xml:lang="pt-BR">Disco DVD vazio</comment>
<comment xml:lang="ro">disc gol DVD</comment>
<comment xml:lang="ru">Чистый диск DVD</comment>
<comment xml:lang="sk">Prázdny disk DVD</comment>
@@ -40140,27 +41633,29 @@
<comment xml:lang="tr">boş DVD diski</comment>
<comment xml:lang="uk">порожній диск DVD</comment>
<comment xml:lang="vi">đĩa DVD trống</comment>
- <comment xml:lang="zh_CN">空 DVD 光盘</comment>
- <comment xml:lang="zh_TW">空白 DVD 光碟</comment>
+ <comment xml:lang="zh-CN">空 DVD 光盘</comment>
+ <comment xml:lang="zh-TW">空白 DVD 光碟</comment>
</mime-type>
<mime-type type="x-content/blank-bd">
-
+ <!-- http://en.wikipedia.org/wiki/Blu-ray_Disc -->
<comment>blank Blu-ray disc</comment>
+ <comment xml:lang="af">skoon Blu-ray-skyf</comment>
<comment xml:lang="ar">قرص بلو-راي فارغ</comment>
- <comment xml:lang="be@latin">čysty dysk Blu-ray</comment>
+ <comment xml:lang="be-Latn">čysty dysk Blu-ray</comment>
<comment xml:lang="bg">Blu-ray — празно</comment>
<comment xml:lang="ca">disc Blu-Ray en blanc</comment>
<comment xml:lang="cs">prázdný disk Blu-ray</comment>
<comment xml:lang="da">tom Blu-ray-disk</comment>
<comment xml:lang="de">Leere Blu-ray-Scheibe</comment>
<comment xml:lang="el">Κενό Blu-ray</comment>
- <comment xml:lang="en_GB">blank Blu-ray disc</comment>
+ <comment xml:lang="en-GB">blank Blu-ray disc</comment>
<comment xml:lang="es">disco Blu-ray en blanco</comment>
<comment xml:lang="eu">Blu-ray disko hutsa</comment>
<comment xml:lang="fi">tyhjä Blu-ray-levy</comment>
<comment xml:lang="fo">blankur Blu-ray diskur</comment>
<comment xml:lang="fr">disque Blu-Ray vierge</comment>
+ <comment xml:lang="fur">disc Blu-ray vueit</comment>
<comment xml:lang="ga">diosca folamh Blu-Ray</comment>
<comment xml:lang="gl">disco Blu-ray en branco</comment>
<comment xml:lang="he">תקליטור בלו־ריי ריק</comment>
@@ -40179,7 +41674,7 @@
<comment xml:lang="oc">disc Blu-Ray verge</comment>
<comment xml:lang="pl">Pusta płyta Blu-ray</comment>
<comment xml:lang="pt">Blu-Ray vazio</comment>
- <comment xml:lang="pt_BR">Disco Blu-ray vazio</comment>
+ <comment xml:lang="pt-BR">Disco Blu-ray vazio</comment>
<comment xml:lang="ro">disc gol Blu-ray</comment>
<comment xml:lang="ru">Чистый диск Blu-ray</comment>
<comment xml:lang="sk">Prázdny disk Blu-ray</comment>
@@ -40187,30 +41682,32 @@
<comment xml:lang="sq">Disk bosh Blu-ray</comment>
<comment xml:lang="sr">празан Блу-реј диск</comment>
<comment xml:lang="sv">tom Blu-ray-skiva</comment>
- <comment xml:lang="tr">boş Blue-ray diski</comment>
+ <comment xml:lang="tr">boş Blu-ray diski</comment>
<comment xml:lang="uk">порожній диск Blu-ray</comment>
<comment xml:lang="vi">đĩa Blu-ray trống</comment>
- <comment xml:lang="zh_CN">空蓝光 DVD</comment>
- <comment xml:lang="zh_TW">空白 Blu-ray 光碟</comment>
+ <comment xml:lang="zh-CN">空蓝光 DVD</comment>
+ <comment xml:lang="zh-TW">空白 Blu-ray 光碟</comment>
</mime-type>
<mime-type type="x-content/blank-hddvd">
-
+ <!-- http://en.wikipedia.org/wiki/HD_DVD -->
<comment>blank HD DVD disc</comment>
+ <comment xml:lang="af">skoon HD-DVD-skyf</comment>
<comment xml:lang="ar">قرص HD DVD فارغ</comment>
- <comment xml:lang="be@latin">čysty dysk HD DVD</comment>
+ <comment xml:lang="be-Latn">čysty dysk HD DVD</comment>
<comment xml:lang="bg">HD DVD — празно</comment>
<comment xml:lang="ca">disc HD-DVD en blanc</comment>
<comment xml:lang="cs">prázdný disk HD DVD</comment>
<comment xml:lang="da">tom HD dvd-disk</comment>
<comment xml:lang="de">Leere HD-DVD</comment>
<comment xml:lang="el">Κενό HD DVD</comment>
- <comment xml:lang="en_GB">blank HD DVD disc</comment>
+ <comment xml:lang="en-GB">blank HD DVD disc</comment>
<comment xml:lang="es">disco HD DVD en blanco</comment>
<comment xml:lang="eu">HD DVD disko hutsa</comment>
<comment xml:lang="fi">tyhjä HD DVD -levy</comment>
<comment xml:lang="fo">blankur HD DVD diskur</comment>
<comment xml:lang="fr">disque HD-DVD vierge</comment>
+ <comment xml:lang="fur">disc HD DVD vueit</comment>
<comment xml:lang="ga">HD DVD folamh</comment>
<comment xml:lang="gl">disco de HD DVD en branco</comment>
<comment xml:lang="he">דיסק HD DVD ריק</comment>
@@ -40229,7 +41726,7 @@
<comment xml:lang="oc">disc HD-DVD verge</comment>
<comment xml:lang="pl">Pusta płyta HD DVD</comment>
<comment xml:lang="pt">HD DVD vazio</comment>
- <comment xml:lang="pt_BR">Disco HD DVD vazio</comment>
+ <comment xml:lang="pt-BR">Disco HD DVD vazio</comment>
<comment xml:lang="ro">disc gol HD DVD</comment>
<comment xml:lang="ru">Чистый диск HD DVD</comment>
<comment xml:lang="sk">Prázdny disk HD DVD</comment>
@@ -40240,28 +41737,30 @@
<comment xml:lang="tr">boş HD DVD diski</comment>
<comment xml:lang="uk">порожній диск HD DVD</comment>
<comment xml:lang="vi">đĩa DVD HD trống</comment>
- <comment xml:lang="zh_CN">空 HD DVD 光盘</comment>
- <comment xml:lang="zh_TW">空白 HD DVD 光碟</comment>
+ <comment xml:lang="zh-CN">空 HD DVD 光盘</comment>
+ <comment xml:lang="zh-TW">空白 HD DVD 光碟</comment>
</mime-type>
<mime-type type="x-content/audio-dvd">
-
+ <!-- http://en.wikipedia.org/wiki/DVD-Audio -->
<comment>audio DVD</comment>
+ <comment xml:lang="af">oudio-DVD</comment>
<comment xml:lang="ar">DVD سمعي</comment>
- <comment xml:lang="be@latin">aŭdyjo DVD</comment>
+ <comment xml:lang="be-Latn">aŭdyjo DVD</comment>
<comment xml:lang="bg">DVD — аудио</comment>
<comment xml:lang="ca">DVD d'àudio</comment>
<comment xml:lang="cs">zvukové DVD</comment>
<comment xml:lang="da">lyd-dvd</comment>
<comment xml:lang="de">Audio-DVD</comment>
<comment xml:lang="el">DVD ήχου</comment>
- <comment xml:lang="en_GB">audio DVD</comment>
+ <comment xml:lang="en-GB">audio DVD</comment>
<comment xml:lang="eo">Son-DVD</comment>
- <comment xml:lang="es">DVD de sonido</comment>
+ <comment xml:lang="es">DVD de audio</comment>
<comment xml:lang="eu">audio DVDa</comment>
<comment xml:lang="fi">ääni-DVD</comment>
<comment xml:lang="fo">Ljóð DVD</comment>
<comment xml:lang="fr">DVD audio</comment>
+ <comment xml:lang="fur">DVD audio</comment>
<comment xml:lang="ga">DVD fuaime</comment>
<comment xml:lang="gl">DVD de son</comment>
<comment xml:lang="he">DVD שמע</comment>
@@ -40280,7 +41779,7 @@
<comment xml:lang="oc">DVD àudio</comment>
<comment xml:lang="pl">DVD-Audio</comment>
<comment xml:lang="pt">DVD áudio</comment>
- <comment xml:lang="pt_BR">DVD de áudio</comment>
+ <comment xml:lang="pt-BR">DVD de áudio</comment>
<comment xml:lang="ro">DVD audio</comment>
<comment xml:lang="ru">Аудио DVD</comment>
<comment xml:lang="sk">Zvukové DVD</comment>
@@ -40288,35 +41787,38 @@
<comment xml:lang="sq">DVD audio</comment>
<comment xml:lang="sr">звучни ДВД</comment>
<comment xml:lang="sv">ljud-dvd</comment>
- <comment xml:lang="tr">Müzik DVD'si</comment>
+ <comment xml:lang="tr">ses DVD'si</comment>
<comment xml:lang="uk">звуковий DVD</comment>
<comment xml:lang="vi">đĩa DVD âm thanh</comment>
- <comment xml:lang="zh_CN">音频 DVD</comment>
- <comment xml:lang="zh_TW">音訊 DVD</comment>
+ <comment xml:lang="zh-CN">音频 DVD</comment>
+ <comment xml:lang="zh-TW">音訊 DVD</comment>
<treemagic>
- <treematch type="file" path="AUDIO_TS/AUDIO_TS.IFO"/>
- <treematch type="file" path="AUDIO_TS/AUDIO_TS.IFO;1"/>
+ <treematch path="AUDIO_TS/AUDIO_TS.IFO" type="file"/>
+ <treematch path="AUDIO_TS/AUDIO_TS.IFO;1" type="file"/>
</treemagic>
</mime-type>
<mime-type type="x-content/video-bluray">
-
+ <!-- http://en.wikipedia.org/wiki/Blu-ray_Disc
+ http://www.blu-raydisc.com/Section-13470/Section-13890/Index.html -->
<comment>Blu-ray video disc</comment>
+ <comment xml:lang="af">Blu-ray-videoskyf</comment>
<comment xml:lang="ar">قرص بلو-راي مرئي</comment>
<comment xml:lang="ast">Discu Blu-ray de videu</comment>
- <comment xml:lang="be@latin">Videadysk Blu-ray</comment>
+ <comment xml:lang="be-Latn">Videadysk Blu-ray</comment>
<comment xml:lang="bg">Blu-ray — видео</comment>
<comment xml:lang="ca">disc de vídeo Blu-Ray</comment>
<comment xml:lang="cs">videodisk Blu-ray</comment>
- <comment xml:lang="da">Blu-ray video-disk</comment>
+ <comment xml:lang="da">Blu-ray-videodisk</comment>
<comment xml:lang="de">Blu-ray-Videoscheibe</comment>
<comment xml:lang="el">Δίσκος βίντεο Blu-ray</comment>
- <comment xml:lang="en_GB">Blu-ray video disc</comment>
+ <comment xml:lang="en-GB">Blu-ray video disc</comment>
<comment xml:lang="es">disco de vídeo Blu-ray</comment>
<comment xml:lang="eu">Blu-ray bideo-diskoa</comment>
<comment xml:lang="fi">Blu-ray-videolevy</comment>
<comment xml:lang="fo">Blu-ray diskur</comment>
<comment xml:lang="fr">disque vidéo Blu-Ray</comment>
+ <comment xml:lang="fur">disc video Blu-ray</comment>
<comment xml:lang="ga">diosca físe Blu-Ray</comment>
<comment xml:lang="gl">disco de vídeo Blu-ray</comment>
<comment xml:lang="he">תקליטור וידאו מסוג בלו־ריי</comment>
@@ -40336,7 +41838,7 @@
<comment xml:lang="oc">disc vidèo Blu-Ray</comment>
<comment xml:lang="pl">Płyta wideo Blu-ray</comment>
<comment xml:lang="pt">Blu-ray de vídeo</comment>
- <comment xml:lang="pt_BR">Disco de vídeo Blu-ray</comment>
+ <comment xml:lang="pt-BR">Disco de vídeo Blu-ray</comment>
<comment xml:lang="ro">Disc video Blu-ray</comment>
<comment xml:lang="ru">Видеодиск Blu-ray</comment>
<comment xml:lang="sk">Videodisk Blu-ray</comment>
@@ -40347,32 +41849,35 @@
<comment xml:lang="tr">Blu-ray video diski</comment>
<comment xml:lang="uk">відеодиск Blu-ray</comment>
<comment xml:lang="vi">Đĩa ảnh động Blu-ray</comment>
- <comment xml:lang="zh_CN">蓝光视频光盘</comment>
- <comment xml:lang="zh_TW">Blu-ray 視訊光碟</comment>
+ <comment xml:lang="zh-CN">蓝光视频光盘</comment>
+ <comment xml:lang="zh-TW">Blu-ray 視訊光碟</comment>
<treemagic>
- <treematch type="directory" path="BDAV" non-empty="true"/>
- <treematch type="directory" path="BDMV" non-empty="true"/>
+ <treematch path="BDAV" type="directory" non-empty="true"/>
+ <treematch path="BDMV" type="directory" non-empty="true"/>
</treemagic>
</mime-type>
<mime-type type="x-content/video-hddvd">
-
+ <!-- http://en.wikipedia.org/wiki/HD_DVD
+ http://www.dvdafteredit.com/wiki/The_HVDVD_TS_Folder -->
<comment>HD DVD video disc</comment>
+ <comment xml:lang="af">HD-DVD-videoskyf</comment>
<comment xml:lang="ar">قرص HD DVD مرئي</comment>
<comment xml:lang="ast">Discu HD DVD de videu</comment>
- <comment xml:lang="be@latin">Videadysk HD DVD</comment>
+ <comment xml:lang="be-Latn">Videadysk HD DVD</comment>
<comment xml:lang="bg">HD DVD — видео</comment>
<comment xml:lang="ca">disc de vídeo HD-DVD</comment>
<comment xml:lang="cs">Videodisk HD DVD</comment>
<comment xml:lang="da">HD DVD-videodisk</comment>
<comment xml:lang="de">HD-DVD-Videoscheibe</comment>
<comment xml:lang="el">Δίσκος βίντεο HD DVD</comment>
- <comment xml:lang="en_GB">HD DVD video disc</comment>
+ <comment xml:lang="en-GB">HD DVD video disc</comment>
<comment xml:lang="es">disco de vídeo HD DVD</comment>
<comment xml:lang="eu">HD DVD bideo-diskoa</comment>
<comment xml:lang="fi">HD DVD -videolevy</comment>
<comment xml:lang="fo">HD DVD video diskur</comment>
<comment xml:lang="fr">disque vidéo HD DVD</comment>
+ <comment xml:lang="fur">disc video HD DVD</comment>
<comment xml:lang="ga">diosca físe HD DVD</comment>
<comment xml:lang="gl">disco de vídeo HD DVD</comment>
<comment xml:lang="he">תקליטור וידאו HD DVD</comment>
@@ -40391,7 +41896,7 @@
<comment xml:lang="oc">disc vidèo HD DVD</comment>
<comment xml:lang="pl">Płyta wideo HD DVD</comment>
<comment xml:lang="pt">HD DVD de vídeo</comment>
- <comment xml:lang="pt_BR">Disco de vídeo HD DVD</comment>
+ <comment xml:lang="pt-BR">Disco de vídeo HD DVD</comment>
<comment xml:lang="ro">Disc video HD DVD</comment>
<comment xml:lang="ru">Видеодиск HD DVD</comment>
<comment xml:lang="sk">Videodisk HD DVD</comment>
@@ -40402,36 +41907,38 @@
<comment xml:lang="tr">HD DVD vidyo diski</comment>
<comment xml:lang="uk">відеодиск HD DVD</comment>
<comment xml:lang="vi">Đĩa ảnh động DVD HD</comment>
- <comment xml:lang="zh_CN">HD DVD 视频光盘</comment>
- <comment xml:lang="zh_TW">HD DVD 視訊光碟</comment>
+ <comment xml:lang="zh-CN">HD DVD 视频光盘</comment>
+ <comment xml:lang="zh-TW">HD DVD 視訊光碟</comment>
<treemagic>
- <treematch type="file" path="HVDVD_TS/HV000I01.IFO"/>
- <treematch type="file" path="HVDVD_TS/HV001I01.IFO"/>
- <treematch type="file" path="HVDVD_TS/HVA00001.VTI"/>
+ <treematch path="HVDVD_TS/HV000I01.IFO" type="file"/>
+ <treematch path="HVDVD_TS/HV001I01.IFO" type="file"/>
+ <treematch path="HVDVD_TS/HVA00001.VTI" type="file"/>
</treemagic>
</mime-type>
<mime-type type="x-content/ebook-reader">
-
+ <!-- see fd.o hal spec -->
<comment>e-book reader</comment>
+ <comment xml:lang="af">e-boekleser</comment>
<comment xml:lang="bg">Четец на е-книги</comment>
<comment xml:lang="ca">lector de llibres electrònics</comment>
<comment xml:lang="cs">čtečka elektronických knih</comment>
<comment xml:lang="da">e-bogslæser</comment>
<comment xml:lang="de">E-Book-Leser</comment>
<comment xml:lang="el">Αναγνώστης ηλεκτρονικών βιβλίων</comment>
- <comment xml:lang="en_GB">e-book reader</comment>
+ <comment xml:lang="en-GB">e-book reader</comment>
<comment xml:lang="es">lector de libros electrónicos</comment>
<comment xml:lang="eu">e-book irakurlea</comment>
<comment xml:lang="fi">e-kirjan lukulaite</comment>
<comment xml:lang="fr">lecteur de livre numérique</comment>
+ <comment xml:lang="fur">letôr e-book</comment>
<comment xml:lang="ga">léitheoir r-leabhair</comment>
<comment xml:lang="gl">lector de libros electrónicos</comment>
<comment xml:lang="he">קורא ספרים אלקטרוניים</comment>
<comment xml:lang="hr">Čitač e-knjiga</comment>
<comment xml:lang="hu">e-könyvolvasó</comment>
<comment xml:lang="ia">Lector de libro electronic</comment>
- <comment xml:lang="id">Pembaca e-book</comment>
+ <comment xml:lang="id">pembaca e-book</comment>
<comment xml:lang="it">Lettore e-book</comment>
<comment xml:lang="ja">電子書籍リーダー</comment>
<comment xml:lang="kk">электронды кітаптарды оқу құрылғысы</comment>
@@ -40441,7 +41948,7 @@
<comment xml:lang="oc">lector de libre numeric</comment>
<comment xml:lang="pl">Czytnik e-booków</comment>
<comment xml:lang="pt">leitor de ebooks</comment>
- <comment xml:lang="pt_BR">Leitor de e-book</comment>
+ <comment xml:lang="pt-BR">Leitor de e-book</comment>
<comment xml:lang="ru">Устройство для чтения электронных книг</comment>
<comment xml:lang="sk">Čítačka e-kníh</comment>
<comment xml:lang="sl">Bralnik elektronskih knjig</comment>
@@ -40449,31 +41956,35 @@
<comment xml:lang="sv">e-bokläsare</comment>
<comment xml:lang="tr">e-kitap okuyucu</comment>
<comment xml:lang="uk">пристрій для читання електронних книг</comment>
- <comment xml:lang="zh_CN">电子书阅读器</comment>
- <comment xml:lang="zh_TW">e-book 閱讀器</comment>
+ <comment xml:lang="zh-CN">电子书阅读器</comment>
+ <comment xml:lang="zh-TW">e-book 閱讀器</comment>
<treemagic>
- <treematch type="directory" path=".kobo" non-empty="true"/>
+ <treematch path=".kobo" type="directory" non-empty="true"/>
<treematch path="system/com.amazon.ebook.booklet.reader" non-empty="false"/>
</treemagic>
</mime-type>
<mime-type type="x-content/image-picturecd">
-
+ <!-- TRANSLATORS: This is a brand-name, not a generic term. Please see
+ http://en.wikipedia.org/wiki/Picture_CD
+ http://www.re.org/kristin/picturecd.html -->
<comment>Picture CD</comment>
+ <comment xml:lang="af">Picture CD</comment>
<comment xml:lang="ar">Picture CD</comment>
- <comment xml:lang="be@latin">Picture CD</comment>
- <comment xml:lang="bg">CD — изображения</comment>
- <comment xml:lang="ca">Picture CD</comment>
+ <comment xml:lang="be-Latn">Picture CD</comment>
+ <comment xml:lang="bg">Picture CD — изображения</comment>
+ <comment xml:lang="ca">CD d'imatges</comment>
<comment xml:lang="cs">Picture CD</comment>
<comment xml:lang="da">Billedcd</comment>
<comment xml:lang="de">Picture CD</comment>
<comment xml:lang="el">CD εικόνων</comment>
- <comment xml:lang="en_GB">Picture CD</comment>
+ <comment xml:lang="en-GB">Picture CD</comment>
<comment xml:lang="es">Picture CD</comment>
<comment xml:lang="eu">Picture CD</comment>
<comment xml:lang="fi">Picture CD</comment>
<comment xml:lang="fo">Picture CD</comment>
<comment xml:lang="fr">CD Picture</comment>
+ <comment xml:lang="fur">Picture CD</comment>
<comment xml:lang="ga">dlúthdhiosca grianghraf</comment>
<comment xml:lang="gl">Picture CD</comment>
<comment xml:lang="he">תקליטור תמונות</comment>
@@ -40492,7 +42003,7 @@
<comment xml:lang="oc">CD Picture</comment>
<comment xml:lang="pl">Picture CD</comment>
<comment xml:lang="pt">Picture CD</comment>
- <comment xml:lang="pt_BR">CD de Fotos</comment>
+ <comment xml:lang="pt-BR">CD de Fotos</comment>
<comment xml:lang="ro">CD cu fotografii</comment>
<comment xml:lang="ru">Picture CD</comment>
<comment xml:lang="sk">Picture CD</comment>
@@ -40503,30 +42014,32 @@
<comment xml:lang="tr">Resim CD'si</comment>
<comment xml:lang="uk">CD з зображеннями</comment>
<comment xml:lang="vi">Đĩa CD ảnh</comment>
- <comment xml:lang="zh_CN">柯达 Picture CD</comment>
- <comment xml:lang="zh_TW">圖片 CD</comment>
+ <comment xml:lang="zh-CN">柯达 Picture CD</comment>
+ <comment xml:lang="zh-TW">圖片 CD</comment>
<treemagic>
- <treematch type="directory" path="PICTURES" non-empty="true" match-case="true"/>
+ <treematch path="PICTURES" type="directory" non-empty="true" match-case="true"/>
</treemagic>
</mime-type>
<mime-type type="x-content/audio-player">
-
+ <!-- see fd.o hal spec -->
<comment>portable audio player</comment>
+ <comment xml:lang="af">draagbare oudiospeler</comment>
<comment xml:lang="ar">مشغل الملفات المسموعة المحمولة</comment>
- <comment xml:lang="be@latin">pieranosny aŭdyjoplayer</comment>
+ <comment xml:lang="be-Latn">pieranosny aŭdyjoplayer</comment>
<comment xml:lang="bg">Преносим аудио плеър</comment>
<comment xml:lang="ca">reproductor d'àudio portàtil</comment>
<comment xml:lang="cs">přenosný zvukový přehrávač</comment>
<comment xml:lang="da">bærbar lydafspiller</comment>
<comment xml:lang="de">Portables Audio-Wiedergabegerät</comment>
<comment xml:lang="el">Φορητός αναπαραγωγέας μουσικής</comment>
- <comment xml:lang="en_GB">portable audio player</comment>
- <comment xml:lang="es">dispositivo de sonido portátil</comment>
+ <comment xml:lang="en-GB">portable audio player</comment>
+ <comment xml:lang="es">reproductor de audio portátil</comment>
<comment xml:lang="eu">audio erreproduzigailu eramangarria</comment>
<comment xml:lang="fi">siirrettävä äänisoitin</comment>
<comment xml:lang="fo">leysur ljóðavspælari</comment>
<comment xml:lang="fr">lecteur audio portable</comment>
+ <comment xml:lang="fur">riprodutôr audio portatil</comment>
<comment xml:lang="ga">seinnteoir iniompartha fuaime</comment>
<comment xml:lang="gl">dispositivo de son portábel</comment>
<comment xml:lang="he">נגן מוזיקה נייד</comment>
@@ -40545,7 +42058,7 @@
<comment xml:lang="oc">lector àudio portable</comment>
<comment xml:lang="pl">Przenośny odtwarzacz dźwięku</comment>
<comment xml:lang="pt">reprodutor áudio portátil</comment>
- <comment xml:lang="pt_BR">Reprodutor de áudio portátil</comment>
+ <comment xml:lang="pt-BR">Reprodutor de áudio portátil</comment>
<comment xml:lang="ro">player audio portabil</comment>
<comment xml:lang="ru">Портативный аудиопроигрыватель</comment>
<comment xml:lang="sk">Prenosný hudobný prehrávač</comment>
@@ -40556,27 +42069,62 @@
<comment xml:lang="tr">taşınabilir ses oynatıcısı</comment>
<comment xml:lang="uk">портативний аудіопрогравач</comment>
<comment xml:lang="vi">bộ phát nhạc di động</comment>
- <comment xml:lang="zh_CN">便携式音频播放器</comment>
- <comment xml:lang="zh_TW">可攜式音訊播放程式</comment>
+ <comment xml:lang="zh-CN">便携式音频播放器</comment>
+ <comment xml:lang="zh-TW">可攜式音訊播放程式</comment>
+ </mime-type>
+
+ <mime-type type="x-content/ostree-repository">
+ <!-- https://github.com/ostreedev/ostree/blob/master/man/ostree-create-usb.xml -->
+ <comment>OSTree software updates</comment>
+ <comment xml:lang="bg">Обновление — OSTree</comment>
+ <comment xml:lang="ca">actualitzacions de programari OSTree</comment>
+ <comment xml:lang="da">OSTree-softwareopdateringer</comment>
+ <comment xml:lang="de">OSTree-Softwareaktualisierungen</comment>
+ <comment xml:lang="en-GB">OSTree software updates</comment>
+ <comment xml:lang="es">actualizaciones de programas de OSTree</comment>
+ <comment xml:lang="eu">OSTree software eguneraketak</comment>
+ <comment xml:lang="fi">OSTree-ohjelmistopäivitykset</comment>
+ <comment xml:lang="fr">mises à jour logicielles OSTree</comment>
+ <comment xml:lang="hr">OSTree nadopune softvera</comment>
+ <comment xml:lang="hu">OSTree szoftverfrissítések</comment>
+ <comment xml:lang="id">Pemutakhiran perangkat lunak OSTree</comment>
+ <comment xml:lang="it">Aggiornamenti software OSTree</comment>
+ <comment xml:lang="kk">OSTree бағдарламалық қамтама жаңартулары</comment>
+ <comment xml:lang="ko">OSTree 소프트웨어 업데이트</comment>
+ <comment xml:lang="pl">Aktualizacje oprogramowania OSTree</comment>
+ <comment xml:lang="pt-BR">Atualizações de software OSTree</comment>
+ <comment xml:lang="sv">OSTree programvaruuppdateringar</comment>
+ <comment xml:lang="tr">OSTree yazılım güncellemeleri</comment>
+ <comment xml:lang="uk">оновлення програмного забезпечення OSTree</comment>
+ <comment xml:lang="zh-CN">OSTree 软件更新</comment>
+ <comment xml:lang="zh-TW">OSTree 軟體更新</comment>
+ <treemagic>
+ <treematch path=".ostree" type="directory" non-empty="true" match-case="true"/>
+ <treematch path="ostree/repo" type="directory" non-empty="true" match-case="true"/>
+ <treematch path="var/lib/flatpak/repo" type="directory" non-empty="true" match-case="true"/>
+ </treemagic>
</mime-type>
<mime-type type="x-content/software">
-
+ <!-- http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
+ http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3 -->
<comment>software</comment>
+ <comment xml:lang="af">sagteware</comment>
<comment xml:lang="ar">برنامج</comment>
- <comment xml:lang="be@latin">prahrama</comment>
+ <comment xml:lang="be-Latn">prahrama</comment>
<comment xml:lang="bg">Софтуер</comment>
<comment xml:lang="ca">programari</comment>
<comment xml:lang="cs">software</comment>
<comment xml:lang="da">software</comment>
<comment xml:lang="de">Software</comment>
<comment xml:lang="el">Λογισμικό</comment>
- <comment xml:lang="en_GB">software</comment>
+ <comment xml:lang="en-GB">software</comment>
<comment xml:lang="es">software</comment>
<comment xml:lang="eu">softwarea</comment>
<comment xml:lang="fi">ohjelmisto</comment>
<comment xml:lang="fo">ritbúnaður</comment>
<comment xml:lang="fr">logiciel</comment>
+ <comment xml:lang="fur">software</comment>
<comment xml:lang="ga">bogearraí</comment>
<comment xml:lang="gl">software</comment>
<comment xml:lang="he">תכנה</comment>
@@ -40596,7 +42144,7 @@
<comment xml:lang="oc">logicial</comment>
<comment xml:lang="pl">Oprogramowanie</comment>
<comment xml:lang="pt">programa</comment>
- <comment xml:lang="pt_BR">Aplicativo</comment>
+ <comment xml:lang="pt-BR">Aplicativo</comment>
<comment xml:lang="ro">software</comment>
<comment xml:lang="ru">Программное обеспечение</comment>
<comment xml:lang="sk">Softvér</comment>
@@ -40607,26 +42155,29 @@
<comment xml:lang="tr">yazılım</comment>
<comment xml:lang="uk">програмне забезпечення</comment>
<comment xml:lang="vi">phần mềm</comment>
- <comment xml:lang="zh_CN">软件</comment>
- <comment xml:lang="zh_TW">軟體</comment>
+ <comment xml:lang="zh-CN">软件</comment>
+ <comment xml:lang="zh-TW">軟體</comment>
</mime-type>
<mime-type type="x-content/unix-software">
-
+ <!-- http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
+ http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3 -->
<comment>UNIX software</comment>
+ <comment xml:lang="af">UNIX-sagteware</comment>
<comment xml:lang="ar">برنامج يونكس</comment>
- <comment xml:lang="bg">Софтуер за UNIX</comment>
+ <comment xml:lang="bg">Софтуер — UNIX</comment>
<comment xml:lang="ca">programari d'UNIX</comment>
<comment xml:lang="cs">software systému UNIX</comment>
<comment xml:lang="da">UNIX-programmer</comment>
<comment xml:lang="de">UNIX-Software</comment>
<comment xml:lang="el">Λογισμικό UNIX</comment>
- <comment xml:lang="en_GB">UNIX software</comment>
+ <comment xml:lang="en-GB">UNIX software</comment>
<comment xml:lang="es">software de UNIX</comment>
<comment xml:lang="eu">UNIXeko softwarea</comment>
<comment xml:lang="fi">UNIX-ohjelmisto</comment>
<comment xml:lang="fo">UNIX ritbúnaður</comment>
<comment xml:lang="fr">logiciel UNIX</comment>
+ <comment xml:lang="fur">software UNIX</comment>
<comment xml:lang="ga">bogearraí UNIX</comment>
<comment xml:lang="gl">Software de UNIX</comment>
<comment xml:lang="he">תכנה ל־UNIX</comment>
@@ -40644,7 +42195,7 @@
<comment xml:lang="oc">logicial UNIX</comment>
<comment xml:lang="pl">Oprogramowanie systemu UNIX</comment>
<comment xml:lang="pt">programa UNIX</comment>
- <comment xml:lang="pt_BR">Aplicativo UNIX</comment>
+ <comment xml:lang="pt-BR">Aplicativo UNIX</comment>
<comment xml:lang="ro">Software UNIX</comment>
<comment xml:lang="ru">Программа UNIX</comment>
<comment xml:lang="sk">Softvér UNIX</comment>
@@ -40653,19 +42204,21 @@
<comment xml:lang="sv">UNIX-programvara</comment>
<comment xml:lang="tr">UNIX yazılımı</comment>
<comment xml:lang="uk">програмне забезпечення UNIX</comment>
- <comment xml:lang="zh_CN">UNIX 软件</comment>
- <comment xml:lang="zh_TW">UNIX 軟體</comment>
+ <comment xml:lang="zh-CN">UNIX 软件</comment>
+ <comment xml:lang="zh-TW">UNIX 軟體</comment>
<sub-class-of type="x-content/software"/>
<treemagic>
- <treematch type="file" path=".autorun" match-case="true"/>
- <treematch type="file" path="autorun" match-case="true"/>
- <treematch type="file" path="autorun.sh" match-case="true"/>
+ <treematch path=".autorun" type="file" match-case="true"/>
+ <treematch path="autorun" type="file" match-case="true"/>
+ <treematch path="autorun.sh" type="file" match-case="true"/>
</treemagic>
</mime-type>
<mime-type type="x-content/win32-software">
-
+ <!-- http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
+ http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3 -->
<comment>Windows software</comment>
+ <comment xml:lang="af">Windows-sagteware</comment>
<comment xml:lang="ar">برنامج ويندوز</comment>
<comment xml:lang="bg">Софтуер — Windows</comment>
<comment xml:lang="ca">programari de Windows</comment>
@@ -40673,12 +42226,13 @@
<comment xml:lang="da">Windowsprogram</comment>
<comment xml:lang="de">Windows-Software</comment>
<comment xml:lang="el">Λογισμικό Windows</comment>
- <comment xml:lang="en_GB">Windows software</comment>
+ <comment xml:lang="en-GB">Windows software</comment>
<comment xml:lang="es">software de Windows</comment>
<comment xml:lang="eu">Windows-eko softwarea</comment>
<comment xml:lang="fi">Windows-ohjelmisto</comment>
<comment xml:lang="fo">Windows ritbúnaður</comment>
<comment xml:lang="fr">logiciel Windows</comment>
+ <comment xml:lang="fur">software Windows</comment>
<comment xml:lang="ga">bogearraí Windows</comment>
<comment xml:lang="gl">Software de Windows</comment>
<comment xml:lang="he">תכנה ל־Windows</comment>
@@ -40696,7 +42250,7 @@
<comment xml:lang="oc">logicial Windows</comment>
<comment xml:lang="pl">Oprogramowanie systemu Windows</comment>
<comment xml:lang="pt">programa Windows</comment>
- <comment xml:lang="pt_BR">Programa do Windows</comment>
+ <comment xml:lang="pt-BR">Programa do Windows</comment>
<comment xml:lang="ro">Software Windows</comment>
<comment xml:lang="ru">Программа Windows</comment>
<comment xml:lang="sk">Softvér Windows</comment>
@@ -40705,28 +42259,31 @@
<comment xml:lang="sv">Windows-program</comment>
<comment xml:lang="tr">Windows yazılımı</comment>
<comment xml:lang="uk">програмне забезпечення Windows</comment>
- <comment xml:lang="zh_CN">Windows 软件</comment>
- <comment xml:lang="zh_TW">Windows 軟體</comment>
+ <comment xml:lang="zh-CN">Windows 软件</comment>
+ <comment xml:lang="zh-TW">Windows 軟體</comment>
<sub-class-of type="x-content/software"/>
<treemagic>
- <treematch type="file" path="autorun.exe" executable="true"/>
- <treematch type="file" path="autorun.inf"/>
+ <treematch path="autorun.exe" type="file" executable="true"/>
+ <treematch path="autorun.inf" type="file"/>
</treemagic>
</mime-type>
<mime-type type="application/trig">
<comment>TriG RDF document</comment>
+ <comment xml:lang="af">TriG RDF-dokument</comment>
<comment xml:lang="ast">Documentu RDF TriG</comment>
+ <comment xml:lang="bg">Документ — TriG RDF</comment>
<comment xml:lang="ca">document TriG RDF</comment>
<comment xml:lang="cs">dokument Trig RDF</comment>
<comment xml:lang="da">TriG RDF-dokument</comment>
<comment xml:lang="de">TriG-RDF-Dokument</comment>
<comment xml:lang="el">Έγγραφο TriG RDF</comment>
- <comment xml:lang="en_GB">TriG RDF document</comment>
+ <comment xml:lang="en-GB">TriG RDF document</comment>
<comment xml:lang="es">documento RDF de TriG</comment>
<comment xml:lang="eu">TriG RDF dokumentua</comment>
<comment xml:lang="fi">TriG RDF -asiakirja</comment>
<comment xml:lang="fr">document RDF TriG</comment>
+ <comment xml:lang="fur">document TriG RDF</comment>
<comment xml:lang="ga">cáipéis RDF TriG</comment>
<comment xml:lang="gl">Documento RDF TriG</comment>
<comment xml:lang="he">מסמך RDF של TriG</comment>
@@ -40740,7 +42297,7 @@
<comment xml:lang="oc">document RDF TriG</comment>
<comment xml:lang="pl">Dokument RDF TriG</comment>
<comment xml:lang="pt">documento TriG RDF</comment>
- <comment xml:lang="pt_BR">Documento RDF do TriG</comment>
+ <comment xml:lang="pt-BR">Documento RDF do TriG</comment>
<comment xml:lang="ru">Документ TriG RDF</comment>
<comment xml:lang="sk">RDF dokument TriG</comment>
<comment xml:lang="sl">Dokument TriG RDF</comment>
@@ -40748,8 +42305,8 @@
<comment xml:lang="sv">TriG RDF-dokument</comment>
<comment xml:lang="tr">TriG RDF belgesi</comment>
<comment xml:lang="uk">документ RDF TriG</comment>
- <comment xml:lang="zh_CN">TriG RDF 文档</comment>
- <comment xml:lang="zh_TW">TriG RDF 文件</comment>
+ <comment xml:lang="zh-CN">TriG RDF 文档</comment>
+ <comment xml:lang="zh-TW">TriG RDF 文件</comment>
<acronym>TriG</acronym>
<expanded-acronym>TriG RDF Graph Triple Language</expanded-acronym>
<sub-class-of type="text/plain"/>
@@ -40757,18 +42314,21 @@
<alias type="application/x-trig"/>
</mime-type>
- <mime-type type="application/x-iwork-keynote-sffkey">
+ <mime-type type="application/vnd.apple.keynote">
<comment>Apple Keynote 5 presentation</comment>
- <comment xml:lang="ca">presentació Keynote 5 d'Apple</comment>
+ <comment xml:lang="af">Apple Keynote 5-voorlegging</comment>
+ <comment xml:lang="bg">Презентация — Apple Keynote 5</comment>
+ <comment xml:lang="ca">presentació d'Apple Keynote 5</comment>
<comment xml:lang="cs">prezentace Apple Keynote 5</comment>
<comment xml:lang="da">Apple Keynote 5-præsentation</comment>
<comment xml:lang="de">Apple-Keynote-5-Präsentation</comment>
<comment xml:lang="el">Παρουσίαση Apple Keynote 5</comment>
- <comment xml:lang="en_GB">Apple Keynote 5 presentation</comment>
+ <comment xml:lang="en-GB">Apple Keynote 5 presentation</comment>
<comment xml:lang="es">presentación de Apple Keynote 5</comment>
<comment xml:lang="eu">Apple Keynote 5 aurkezpena</comment>
<comment xml:lang="fi">Apple Keynote 5 -esitys</comment>
<comment xml:lang="fr">présentation Apple Keynote 5</comment>
+ <comment xml:lang="fur">presentazion Apple Keynote 5</comment>
<comment xml:lang="ga">láithreoireacht Apple Keynote 5</comment>
<comment xml:lang="gl">Presentación de Apple Keynote 5</comment>
<comment xml:lang="he">מצגת Apple Keynote 5</comment>
@@ -40782,7 +42342,7 @@
<comment xml:lang="oc">presentacion Apple Keynote 5</comment>
<comment xml:lang="pl">Prezentacja Apple Keynote 5</comment>
<comment xml:lang="pt">apresentação Apple Keynote 5</comment>
- <comment xml:lang="pt_BR">Apresentação do Apple Keynote 5</comment>
+ <comment xml:lang="pt-BR">Apresentação do Apple Keynote 5</comment>
<comment xml:lang="ru">Презентация Apple Keynote 5</comment>
<comment xml:lang="sk">Prezentácia Apple Keynote 5</comment>
<comment xml:lang="sl">Predstavitev Apple Keynote 5</comment>
@@ -40790,54 +42350,45 @@
<comment xml:lang="sv">Apple Keynote 5-presentation</comment>
<comment xml:lang="tr">Apple Keynote 5 sunumu</comment>
<comment xml:lang="uk">презентація Apple Keynote 5</comment>
- <comment xml:lang="zh_CN">Apple Keynote 5 演示文稿</comment>
- <comment xml:lang="zh_TW">Apple Keynote 5 簡報</comment>
+ <comment xml:lang="zh-CN">Apple Keynote 5 演示文稿</comment>
+ <comment xml:lang="zh-TW">Apple Keynote 5 簡報</comment>
<sub-class-of type="application/zip"/>
<generic-icon name="x-office-presentation"/>
<magic priority="70">
- <match value="PK\003\004" type="string" offset="0">
- <match value="index.apxl" type="string" offset="30"/>
+ <match type="string" value="PK\003\004" offset="0">
+ <match type="string" value="index.apxl" offset="30"/>
</match>
</magic>
- <glob pattern="*.key"/>
- <alias type="application/vnd.apple.keynote"/>
+ <glob pattern="*.key" weight="80"/>
+ <alias type="application/x-iwork-keynote-sffkey"/>
</mime-type>
<mime-type type="application/x-pagemaker">
- <comment>Adobe PageMaker</comment>
- <comment xml:lang="ca">Adobe PageMaker</comment>
- <comment xml:lang="cs">Adobe PageMaker</comment>
- <comment xml:lang="da">Adobe PageMaker</comment>
- <comment xml:lang="de">Adobe PageMaker</comment>
- <comment xml:lang="el">Adobe PageMaker</comment>
- <comment xml:lang="en_GB">Adobe PageMaker</comment>
- <comment xml:lang="es">Adobe PageMaker</comment>
- <comment xml:lang="eu">Adobe PageMaker</comment>
- <comment xml:lang="fi">Adobe PageMaker</comment>
- <comment xml:lang="fr">Adobe PageMaker</comment>
- <comment xml:lang="ga">Adobe PageMaker</comment>
- <comment xml:lang="gl">Adobe PageMaker</comment>
- <comment xml:lang="he">Adobe PageMaker</comment>
- <comment xml:lang="hr">Adobe PageMaker</comment>
- <comment xml:lang="hu">Adobe PageMaker</comment>
- <comment xml:lang="ia">Adobe PageMaker</comment>
- <comment xml:lang="id">Adobe PageMaker</comment>
- <comment xml:lang="it">Adobe PageMaker</comment>
- <comment xml:lang="kk">Adobe PageMaker</comment>
- <comment xml:lang="ko">Adobe 페이지메이커</comment>
- <comment xml:lang="oc">Adobe PageMaker</comment>
- <comment xml:lang="pl">Adobe PageMaker</comment>
- <comment xml:lang="pt">Adobe PageMaker</comment>
- <comment xml:lang="pt_BR">Adobe PageMaker</comment>
- <comment xml:lang="ru">Adobe PageMaker</comment>
- <comment xml:lang="sk">Adobe PageMaker</comment>
- <comment xml:lang="sl">Dokument Adobe PageMaker</comment>
- <comment xml:lang="sr">Адобе Пејџ Мејкер</comment>
- <comment xml:lang="sv">Adobe PageMaker</comment>
- <comment xml:lang="tr">Adobe PageMaker</comment>
- <comment xml:lang="uk">Adobe PageMaker</comment>
- <comment xml:lang="zh_CN">Adobe PageMaker</comment>
- <comment xml:lang="zh_TW">Adobe PageMaker</comment>
+ <comment>Adobe PageMaker document</comment>
+ <comment xml:lang="bg">Документ — Adobe PageMaker</comment>
+ <comment xml:lang="ca">document d'Adobe PageMaker</comment>
+ <comment xml:lang="da">Adobe PageMaker-dokument</comment>
+ <comment xml:lang="de">Adobe-PageMaker-Dokument</comment>
+ <comment xml:lang="en-GB">Adobe PageMaker document</comment>
+ <comment xml:lang="es">documento de Adobe PageMaker</comment>
+ <comment xml:lang="eu">Adobe PageMaker dokumentua</comment>
+ <comment xml:lang="fi">Adobe PageMaker -asiakirja</comment>
+ <comment xml:lang="fr">document Adobe PageMaker</comment>
+ <comment xml:lang="hr">Adobe PageMaker dokument</comment>
+ <comment xml:lang="hu">Adobe PageMaker dokumentum</comment>
+ <comment xml:lang="id">Dokume Adobe PageMaker</comment>
+ <comment xml:lang="it">Documento Adobe PageMaker</comment>
+ <comment xml:lang="kk">Adobe PageMaker құжаты</comment>
+ <comment xml:lang="ko">어도비 페이지메이커 문서</comment>
+ <comment xml:lang="pl">Dokument Adobe PageMaker</comment>
+ <comment xml:lang="pt-BR">Documento do Adobe PageMaker</comment>
+ <comment xml:lang="ru">Документ Adobe PageMaker</comment>
+ <comment xml:lang="sk">Dokument Adobe PageMaker</comment>
+ <comment xml:lang="sv">Adobe PageMaker-dokument</comment>
+ <comment xml:lang="tr">Adobe PageMaker belgesi</comment>
+ <comment xml:lang="uk">документ Adobe PageMaker</comment>
+ <comment xml:lang="zh-CN">Adobe PageMaker 文档</comment>
+ <comment xml:lang="zh-TW">Adobe PageMaker 文件</comment>
<sub-class-of type="application/x-ole-storage"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.p65"/>
@@ -40847,56 +42398,55 @@
</mime-type>
<mime-type type="application/x-doom-wad">
- <comment>Doom WAD</comment>
- <comment xml:lang="ca">WAD de Doom</comment>
- <comment xml:lang="cs">datový balík WAD hry Doom</comment>
- <comment xml:lang="da">Doom WAD</comment>
- <comment xml:lang="de">Doom WAD</comment>
- <comment xml:lang="en_GB">Doom WAD</comment>
- <comment xml:lang="es">WAD de Doom</comment>
- <comment xml:lang="eu">Doom WAD</comment>
- <comment xml:lang="fr">WAD Doom</comment>
- <comment xml:lang="ga">WAD Doom</comment>
- <comment xml:lang="hr">Doom WAD</comment>
- <comment xml:lang="hu">Doom WAD</comment>
- <comment xml:lang="ia">WAD pro Doom</comment>
- <comment xml:lang="id">WAD Doom</comment>
- <comment xml:lang="it">WAD Doom</comment>
- <comment xml:lang="kk">Doom WAD</comment>
- <comment xml:lang="ko">둠 WAD</comment>
+ <comment>Doom WAD file</comment>
+ <comment xml:lang="bg">Ниво — Doom</comment>
+ <comment xml:lang="ca">fitxer WAD de Doom</comment>
+ <comment xml:lang="da">Doom WAD-fil</comment>
+ <comment xml:lang="de">Doom-WAD-Datei</comment>
+ <comment xml:lang="en-GB">Doom WAD file</comment>
+ <comment xml:lang="es">archivo WAD de Doom</comment>
+ <comment xml:lang="eu">Doom WAD fitxategia</comment>
+ <comment xml:lang="fi">Doom WAD -tiedosto</comment>
+ <comment xml:lang="fr">fichier Doom WAD</comment>
+ <comment xml:lang="hr">Doom WAD datoteka</comment>
+ <comment xml:lang="hu">Doom WAD fájl</comment>
+ <comment xml:lang="id">Berkas WAD Doom</comment>
+ <comment xml:lang="it">File WAD Doom</comment>
+ <comment xml:lang="kk">Doom WAD файлы</comment>
+ <comment xml:lang="ko">둠 WAD 파일</comment>
<comment xml:lang="pl">Plik WAD gry Doom</comment>
- <comment xml:lang="pt">Doom WAD</comment>
- <comment xml:lang="pt_BR">Doom WAD</comment>
- <comment xml:lang="ru">WAD Doom</comment>
- <comment xml:lang="sk">Doom WAD</comment>
- <comment xml:lang="sr">Дум ВАД</comment>
- <comment xml:lang="sv">Doom-WAD</comment>
- <comment xml:lang="tr">Doom WAD</comment>
- <comment xml:lang="uk">WAD Doom</comment>
- <comment xml:lang="zh_CN">Doom WAD</comment>
- <comment xml:lang="zh_TW">Doom WAD</comment>
+ <comment xml:lang="pt-BR">Arquivo Doom WAD</comment>
+ <comment xml:lang="ru">Файл Doom WAD</comment>
+ <comment xml:lang="sv">Doom WAD-fil</comment>
+ <comment xml:lang="tr">Doom WAD dosyası</comment>
+ <comment xml:lang="uk">файл WAD Doom</comment>
+ <comment xml:lang="zh-CN">Doom WAD 文件</comment>
+ <comment xml:lang="zh-TW">Doom WAD 檔</comment>
<acronym>WAD</acronym>
<expanded-acronym>Where's All the Data</expanded-acronym>
<generic-icon name="package-x-generic"/>
<magic priority="50">
- <match value="IWAD" type="string" offset="0"/>
- <match value="PWAD" type="string" offset="0"/>
+ <match type="string" value="IWAD" offset="0"/>
+ <match type="string" value="PWAD" offset="0"/>
</magic>
- <glob weight="80" pattern="*.wad"/>
+ <glob pattern="*.wad" weight="80"/>
</mime-type>
<mime-type type="application/x-amiga-disk-format">
<comment>Amiga disk image</comment>
+ <comment xml:lang="af">Amiga-skyfbeeldlêer</comment>
+ <comment xml:lang="bg">Диск — Amiga</comment>
<comment xml:lang="ca">imatge de disc d'Amiga</comment>
<comment xml:lang="cs">obraz disku pro Amigu</comment>
<comment xml:lang="da">Amiga-diskaftryk</comment>
<comment xml:lang="de">Amiga-Datenträgerabbild</comment>
<comment xml:lang="el">Εικόνα δίσκου Amiga</comment>
- <comment xml:lang="en_GB">Amiga disk image</comment>
+ <comment xml:lang="en-GB">Amiga disk image</comment>
<comment xml:lang="es">imagen de disco de Amiga</comment>
<comment xml:lang="eu">Amiga disko irudia</comment>
<comment xml:lang="fi">Amiga-levytiedosto</comment>
<comment xml:lang="fr">image disque Amiga</comment>
+ <comment xml:lang="fur">imagjin disc Amiga</comment>
<comment xml:lang="ga">íomhá diosca Amiga</comment>
<comment xml:lang="he">דמות כונן Amiga</comment>
<comment xml:lang="hr">Amiga slika diska</comment>
@@ -40909,54 +42459,57 @@
<comment xml:lang="oc">imatge disc Amiga</comment>
<comment xml:lang="pl">Obraz dysku Amiga</comment>
<comment xml:lang="pt">imagem de disco Amiga</comment>
- <comment xml:lang="pt_BR">Imagem de disco Amiga</comment>
+ <comment xml:lang="pt-BR">Imagem de disco Amiga</comment>
<comment xml:lang="ru">Образ диска Amiga</comment>
<comment xml:lang="sk">Obraz disku Amiga</comment>
<comment xml:lang="sr">слика диска Амиге</comment>
<comment xml:lang="sv">Amiga-diskavbild</comment>
- <comment xml:lang="tr">Amiga disk kalıbı</comment>
+ <comment xml:lang="tr">Amiga disk görüntüsü</comment>
<comment xml:lang="uk">образ диска Amiga</comment>
- <comment xml:lang="zh_CN">Amiga 磁盘映像</comment>
- <comment xml:lang="zh_TW">Amiga 磁碟映像檔</comment>
+ <comment xml:lang="zh-CN">Amiga 磁盘映像</comment>
+ <comment xml:lang="zh-TW">Amiga 磁碟映像檔</comment>
<magic priority="50">
- <match value="DOS\x00" type="string" offset="0"/>
+ <match type="string" value="DOS\x00" offset="0"/>
</magic>
<glob pattern="*.adf"/>
</mime-type>
<mime-type type="application/vnd.flatpak">
<comment>Flatpak application bundle</comment>
+ <comment xml:lang="af">Flatpak-toepassingsbundel</comment>
+ <comment xml:lang="bg">Програмен пакет — Flatpak</comment>
<comment xml:lang="ca">paquet d'aplicació Flatpak</comment>
<comment xml:lang="cs">balíček Flatpak s aplikací</comment>
<comment xml:lang="da">Flatpak-programsamling</comment>
<comment xml:lang="de">Flatpak-Anwendungspaket</comment>
- <comment xml:lang="en_GB">Flatpak application bundle</comment>
+ <comment xml:lang="en-GB">Flatpak application bundle</comment>
<comment xml:lang="es">paquete de aplicación Flatpak</comment>
<comment xml:lang="eu">Flatpak aplikazio bilduma</comment>
<comment xml:lang="fi">Flatpak-sovelluspaketti</comment>
<comment xml:lang="fr">lot applicatif Flatpak</comment>
+ <comment xml:lang="fur">côl di aplicazions Flatpak</comment>
<comment xml:lang="ga">burla feidhmchláir Flatpak</comment>
<comment xml:lang="he">חבילת יישומי Flatpak</comment>
<comment xml:lang="hr">Flatpak paket aplikacije</comment>
<comment xml:lang="hu">Flatpak alkalmazáscsomag</comment>
- <comment xml:lang="id">bundel aplikasi Flatpak</comment>
+ <comment xml:lang="id">Bundel aplikasi Flatpak</comment>
<comment xml:lang="it">Bundle applicazione Flatpak</comment>
<comment xml:lang="kk">Flatpak қолданбалар дестесі</comment>
<comment xml:lang="ko">Flatpak 프로그램 번들</comment>
<comment xml:lang="pl">Pakiet programu Flatpak</comment>
- <comment xml:lang="pt_BR">Pacote de aplicativo Flatpak</comment>
+ <comment xml:lang="pt-BR">Pacote de aplicativo Flatpak</comment>
<comment xml:lang="ru">Пакет приложения Flatpak</comment>
<comment xml:lang="sk">Balík aplikácií Flatpak</comment>
<comment xml:lang="sr">скуп програма Флатпака</comment>
<comment xml:lang="sv">Flatpak-programbunt</comment>
<comment xml:lang="tr">Flatpak uygulama paketi</comment>
<comment xml:lang="uk">пакунок із програмами Flatpak</comment>
- <comment xml:lang="zh_CN">Flatpak 应用组合包</comment>
- <comment xml:lang="zh_TW">Flatpak 應用程式套組</comment>
+ <comment xml:lang="zh-CN">Flatpak 应用组合包</comment>
+ <comment xml:lang="zh-TW">Flatpak 應用程式套組</comment>
<generic-icon name="package-x-generic"/>
<magic priority="50">
- <match value="xdg-app\x00\x01\x00\x89\xe5" type="string" offset="0"/>
- <match value="flatpak\x00\x01\x00\x89\xe5" type="string" offset="0"/>
+ <match type="string" value="xdg-app\x00\x01\x00\x89\xe5" offset="0"/>
+ <match type="string" value="flatpak\x00\x01\x00\x89\xe5" offset="0"/>
</magic>
<glob pattern="*.flatpak"/>
<glob pattern="*.xdgapp"/>
@@ -40965,142 +42518,148 @@
<mime-type type="application/vnd.flatpak.repo">
<comment>Flatpak repository description</comment>
+ <comment xml:lang="bg">Описание на хранилище — Flatpak</comment>
<comment xml:lang="ca">descripció de dipòsit de Flatpak</comment>
<comment xml:lang="cs">popis repozitáře Flatpak</comment>
<comment xml:lang="da">Flatpak-arkivbeskrivelse</comment>
<comment xml:lang="de">Flatpak-Repositoriumsbeschreibung</comment>
- <comment xml:lang="en_GB">Flatpak repository description</comment>
+ <comment xml:lang="en-GB">Flatpak repository description</comment>
<comment xml:lang="es">descripción de repositorio de Flatpak</comment>
<comment xml:lang="eu">Flatpak biltegi deskribapena</comment>
<comment xml:lang="fi">Flatpak-ohjelmistolähdekuvaus</comment>
<comment xml:lang="fr">description de dépôt Flatpak</comment>
+ <comment xml:lang="fur">descrizion dipuesit Flatpak</comment>
<comment xml:lang="ga">cur síos ar stórlann Flatpak</comment>
<comment xml:lang="he">תיאור מאגר Flatpak</comment>
<comment xml:lang="hr">Flatpak opis repozitorija</comment>
<comment xml:lang="hu">Flatpak tárolóleírás</comment>
- <comment xml:lang="id">deskripsi repositori Flatpak</comment>
+ <comment xml:lang="id">Deskripsi repositori Flatpak</comment>
<comment xml:lang="it">Descrizione repository Flatpack</comment>
<comment xml:lang="kk">Flatpak репозиторийі сипаттамасы</comment>
<comment xml:lang="ko">Flatpak 저장소 디스크립션</comment>
<comment xml:lang="pl">Opis repozytorium Flatpak</comment>
- <comment xml:lang="pt_BR">Descrição de repositório Flatpak</comment>
+ <comment xml:lang="pt-BR">Descrição de repositório Flatpak</comment>
<comment xml:lang="ru">Описание репозитория Flatpak</comment>
<comment xml:lang="sk">Popis repozitára Flatpak</comment>
<comment xml:lang="sr">опис ризнице Флатпака</comment>
<comment xml:lang="sv">Flatpak-förrådsbeskrivning</comment>
<comment xml:lang="tr">Flatpak depo açıklaması</comment>
<comment xml:lang="uk">опис сховища Flatpak</comment>
- <comment xml:lang="zh_CN">Flatpak 软件库描述</comment>
- <comment xml:lang="zh_TW">Flatpak 軟體庫描述</comment>
+ <comment xml:lang="zh-CN">Flatpak 软件库描述</comment>
+ <comment xml:lang="zh-TW">Flatpak 軟體庫描述</comment>
<generic-icon name="package-x-generic"/>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="[Flatpak Repo]" type="string" offset="0:256"/>
+ <match type="string" value="[Flatpak Repo]" offset="0:256"/>
</magic>
<glob pattern="*.flatpakrepo"/>
</mime-type>
<mime-type type="application/vnd.flatpak.ref">
<comment>Flatpak repository reference</comment>
+ <comment xml:lang="bg">Указател към хранилище — Flatpak</comment>
<comment xml:lang="ca">referència de dipòsit Flatpak</comment>
<comment xml:lang="cs">odkaz na repozitář Flatpak</comment>
+ <comment xml:lang="da">Flatpak-arkivreference</comment>
<comment xml:lang="de">Flatpak-Repositoriumsreferenz</comment>
- <comment xml:lang="en_GB">Flatpak repository reference</comment>
+ <comment xml:lang="en-GB">Flatpak repository reference</comment>
<comment xml:lang="es">referencia a repositorio de Flatpak</comment>
<comment xml:lang="eu">Flatpak biltegi erreferentzia</comment>
<comment xml:lang="fi">Flatpak-ohjelmistolähdeviite</comment>
<comment xml:lang="fr">référence de dépôt Flatpak</comment>
+ <comment xml:lang="fur">riferiment dipuesit Flatpak</comment>
<comment xml:lang="ga">tagairt do stórlann Flatpak</comment>
<comment xml:lang="hr">Flatpak preporučeni repozitorij</comment>
<comment xml:lang="hu">Flatpak tárolóhivatkozás</comment>
- <comment xml:lang="id">acuan repositori Flatpak</comment>
+ <comment xml:lang="id">Acuan repositori Flatpak</comment>
<comment xml:lang="it">Riferimento repository Flatpack</comment>
<comment xml:lang="kk">Flatpak репозиторийіне сілтеме</comment>
<comment xml:lang="ko">Flatpak 저장소 참조</comment>
<comment xml:lang="pl">Odwołanie do repozytorium Flatpak</comment>
- <comment xml:lang="pt_BR">Referência de repositório Flatpak</comment>
+ <comment xml:lang="pt-BR">Referência de repositório Flatpak</comment>
<comment xml:lang="ru">Ссылка на репозиторий Flatpak</comment>
<comment xml:lang="sk">Referencia repozitára Flatpak</comment>
<comment xml:lang="sr">упута ризнице Флатпака</comment>
<comment xml:lang="sv">Flatpak-förrådsreferens</comment>
- <comment xml:lang="tr">Flatpak depo başvurusu</comment>
+ <comment xml:lang="tr">Flatpak depo atfı</comment>
<comment xml:lang="uk">посилання на сховище Flatpak</comment>
- <comment xml:lang="zh_CN">Flatpak 软件库引用</comment>
- <comment xml:lang="zh_TW">Flatpak 軟體庫參照</comment>
+ <comment xml:lang="zh-CN">Flatpak 软件库引用</comment>
+ <comment xml:lang="zh-TW">Flatpak 軟體庫參照</comment>
<generic-icon name="package-x-generic"/>
<sub-class-of type="text/plain"/>
<magic priority="50">
- <match value="[Flatpak Ref]" type="string" offset="0:256"/>
+ <match type="string" value="[Flatpak Ref]" offset="0:256"/>
</magic>
<glob pattern="*.flatpakref"/>
</mime-type>
<mime-type type="application/vnd.squashfs">
- <comment>Squashfs filesystem</comment>
- <comment xml:lang="ca">Sistema de fitxers Squashfs</comment>
- <comment xml:lang="cs">souborový systém Squashfs</comment>
- <comment xml:lang="da">Squashfs-filsystem</comment>
- <comment xml:lang="de">Squashfs-Dateisystem</comment>
- <comment xml:lang="en_GB">Squashfs filesystem</comment>
- <comment xml:lang="es">sistema de archivos Squashfs</comment>
- <comment xml:lang="eu">Squashfs fitxategi sistema</comment>
- <comment xml:lang="fi">Squashfs-tiedostojärjestelmä</comment>
- <comment xml:lang="fr">système de fichiers Squashfs</comment>
- <comment xml:lang="ga">córas comhad Squashfs</comment>
- <comment xml:lang="he">מערכת קבצים Squashfs</comment>
- <comment xml:lang="hr">Squashfs datotečni sustav</comment>
- <comment xml:lang="hu">Squashfs fájlrendszer</comment>
- <comment xml:lang="id">sistem berkas Squashfs</comment>
- <comment xml:lang="it">File system squashfs</comment>
- <comment xml:lang="kk">Squashfs файлдық жүйесі</comment>
- <comment xml:lang="ko">Squashfs 파일 시스템</comment>
- <comment xml:lang="pl">System plików SquashFS</comment>
- <comment xml:lang="pt_BR">Sistema de arquivos Squashfs</comment>
- <comment xml:lang="ru">Файловая система Squashfs</comment>
- <comment xml:lang="sk">Systém súborov Squashfs</comment>
- <comment xml:lang="sr">систем датотека Сквошфс</comment>
- <comment xml:lang="sv">Squashfs-filsystem</comment>
- <comment xml:lang="tr">Squashfs dosya sistemi</comment>
- <comment xml:lang="uk">файлова система squashfs</comment>
- <comment xml:lang="zh_CN">Squashfs 文件系统</comment>
- <comment xml:lang="zh_TW">Squashfs 檔案系統</comment>
- <magic priority="50">
- <match value="sqsh" type="string" offset="0"/>
- <match value="hsqs" type="string" offset="0"/>
+ <comment>Squashfs filesystem image</comment>
+ <comment xml:lang="bg">Диск — Squashfs</comment>
+ <comment xml:lang="ca">imatge de sistema de fitxers Squashfs</comment>
+ <comment xml:lang="da">Squashfs-filsystemaftryk</comment>
+ <comment xml:lang="de">Squashfs-Dateisystemabbild</comment>
+ <comment xml:lang="en-GB">Squashfs filesystem image</comment>
+ <comment xml:lang="es">imagen de sistema de archivos de Squashfs</comment>
+ <comment xml:lang="eu">Squashfs fitxategi sistema irudia</comment>
+ <comment xml:lang="fi">Squashfs-tiedostojärjestelmän levykuva</comment>
+ <comment xml:lang="fr">image de système de fichiers Squashfs</comment>
+ <comment xml:lang="hr">Squashfs slika datotečnog sustava</comment>
+ <comment xml:lang="hu">Squashfs fájlrenszerkép</comment>
+ <comment xml:lang="id">Image sistem berkas Squashfs</comment>
+ <comment xml:lang="it">Immagine file system squashfs</comment>
+ <comment xml:lang="kk">Squashfs файлдық жүйе бейнесі</comment>
+ <comment xml:lang="ko">Squashfs 파일 시스템 이미지</comment>
+ <comment xml:lang="pl">Obraz systemu plików SquashFS</comment>
+ <comment xml:lang="pt-BR">Imagem de sistema de arquivos Squashfs</comment>
+ <comment xml:lang="ru">Образ файловой системы Squashfs</comment>
+ <comment xml:lang="sk">Obraz systému súborov Squashfs</comment>
+ <comment xml:lang="sv">Squashfs filsystemsavbildning</comment>
+ <comment xml:lang="tr">Squashfs dosya sistemi görüntüsü</comment>
+ <comment xml:lang="uk">образ файлової системи squashfs</comment>
+ <comment xml:lang="zh-CN">Squashfs 文件系统映像</comment>
+ <comment xml:lang="zh-TW">Squashfs 檔案系統映像</comment>
+ <magic priority="50">
+ <match type="string" value="sqsh" offset="0"/>
+ <match type="string" value="hsqs" offset="0"/>
</magic>
<glob pattern="*.sqsh"/>
</mime-type>
-
+ <!-- AppImage application bundle (Type 2) -->
<mime-type type="application/vnd.appimage">
<comment>AppImage application bundle</comment>
+ <comment xml:lang="af">AppImage-toepassingsbundel</comment>
+ <comment xml:lang="bg">Програмен пакет — AppImage</comment>
<comment xml:lang="ca">paquet d'aplicació AppImage</comment>
<comment xml:lang="cs">balíček AppImage s aplikací</comment>
- <comment xml:lang="da">Applmage-programsamling</comment>
+ <comment xml:lang="da">AppImage-programsamling</comment>
<comment xml:lang="de">AppImage-Anwendungspaket</comment>
- <comment xml:lang="en_GB">AppImage application bundle</comment>
+ <comment xml:lang="en-GB">AppImage application bundle</comment>
<comment xml:lang="es">paquete de aplicación AppImage</comment>
<comment xml:lang="eu">AppImage aplikazio bilduma</comment>
<comment xml:lang="fi">AppImage-sovelluspaketti</comment>
<comment xml:lang="fr">lot applicatif AppImage</comment>
+ <comment xml:lang="fur">côl di aplicazions AppImage</comment>
<comment xml:lang="ga">burla feidhmchláir AppImage</comment>
<comment xml:lang="he">חבילת יישומי AppImage</comment>
<comment xml:lang="hr">AppImage paket aplikacije</comment>
<comment xml:lang="hu">AppImage alkalmazáscsomag</comment>
- <comment xml:lang="id">bundel aplikasi AppImage</comment>
+ <comment xml:lang="id">Bundel aplikasi AppImage</comment>
<comment xml:lang="it">Bundle applicazione AppImage</comment>
<comment xml:lang="kk">AppImage қолданбалар дестесі</comment>
<comment xml:lang="ko">AppImage 프로그램 번들</comment>
<comment xml:lang="pl">Pakiet programu AppImage</comment>
- <comment xml:lang="pt_BR">Pacote de aplicativo AppImage</comment>
+ <comment xml:lang="pt">pacote de aplicação AppImage</comment>
+ <comment xml:lang="pt-BR">Pacote de aplicativo AppImage</comment>
<comment xml:lang="ru">Пакет приложения AppImage</comment>
<comment xml:lang="sk">Balík aplikácií AppImage</comment>
<comment xml:lang="sr">скуп програма Ап-слике</comment>
<comment xml:lang="sv">AppImage-programbunt</comment>
<comment xml:lang="tr">AppImage uygulama paketi</comment>
<comment xml:lang="uk">пакунок із програмами AppImage</comment>
- <comment xml:lang="zh_CN">AppImage 应用组合包</comment>
- <comment xml:lang="zh_TW">AppImage 應用程式套組</comment>
+ <comment xml:lang="zh-CN">AppImage 应用组合包</comment>
+ <comment xml:lang="zh-TW">AppImage 應用程式套組</comment>
<sub-class-of type="application/x-executable"/>
<sub-class-of type="application/vnd.squashfs"/>
<generic-icon name="application-x-executable"/>
@@ -41118,45 +42677,78 @@
<mime-type type="application/vnd.snap">
<comment>Snap package</comment>
- <comment xml:lang="ca">Paquet Snap</comment>
+ <comment xml:lang="af">Snap-pakket</comment>
+ <comment xml:lang="bg">Пакет — Snap</comment>
+ <comment xml:lang="ca">paquet snap</comment>
<comment xml:lang="cs">balíček Snap</comment>
<comment xml:lang="da">Snap-pakke</comment>
<comment xml:lang="de">Snap-Paket</comment>
- <comment xml:lang="en_GB">Snap package</comment>
+ <comment xml:lang="en-GB">Snap package</comment>
<comment xml:lang="es">paquete Snap</comment>
<comment xml:lang="eu">Snap paketea</comment>
<comment xml:lang="fi">Snap-paketti</comment>
<comment xml:lang="fr">paquet Snap</comment>
+ <comment xml:lang="fur">pachet Snap</comment>
<comment xml:lang="ga">pacáiste Snap</comment>
<comment xml:lang="he">חבילת Snap</comment>
<comment xml:lang="hr">Snap paket</comment>
<comment xml:lang="hu">Snap-csomag</comment>
- <comment xml:lang="id">paket Snap</comment>
+ <comment xml:lang="id">Paket Snap</comment>
<comment xml:lang="it">Pacchetto snap</comment>
<comment xml:lang="kk">Snap дестесі</comment>
<comment xml:lang="ko">Snap 패키지</comment>
<comment xml:lang="pl">Pakiet Snap</comment>
- <comment xml:lang="pt_BR">Pacote Snap</comment>
+ <comment xml:lang="pt-BR">Pacote Snap</comment>
<comment xml:lang="ru">Пакет Snap</comment>
<comment xml:lang="sk">Balík Snap</comment>
+ <comment xml:lang="sl">Paket Snap</comment>
<comment xml:lang="sr">Снап пакет</comment>
<comment xml:lang="sv">Snap-paket</comment>
<comment xml:lang="tr">Snap paketi</comment>
<comment xml:lang="uk">пакунок snap</comment>
- <comment xml:lang="zh_CN">Snap 软件包</comment>
- <comment xml:lang="zh_TW">Snap 軟體包</comment>
+ <comment xml:lang="zh-CN">Snap 软件包</comment>
+ <comment xml:lang="zh-TW">Snap 軟體包</comment>
<glob pattern="*.snap"/>
<sub-class-of type="application/vnd.squashfs"/>
</mime-type>
-
+ <!-- 3D models and GCODEs -->
<mime-type type="model/stl">
<comment>STL 3D model</comment>
+ <comment xml:lang="af">STL 3D-model</comment>
+ <comment xml:lang="bg">Модел — STL 3D</comment>
+ <comment xml:lang="ca">model 3D STL</comment>
+ <comment xml:lang="cs">3D model STL</comment>
+ <comment xml:lang="da">STL 3D-model</comment>
+ <comment xml:lang="de">STL 3D-Modell</comment>
+ <comment xml:lang="en-GB">STL 3D model</comment>
+ <comment xml:lang="es">modelo 3D de STL</comment>
+ <comment xml:lang="eu">STL 3D modeloa</comment>
+ <comment xml:lang="fi">STL 3D malli</comment>
+ <comment xml:lang="fr">modèle 3D STL</comment>
+ <comment xml:lang="fur">model STL 3D</comment>
+ <comment xml:lang="ga">samhail 3T STL</comment>
+ <comment xml:lang="hr">STL 3D model</comment>
+ <comment xml:lang="hu">STL 3D modell</comment>
+ <comment xml:lang="id">Model 3D STL</comment>
+ <comment xml:lang="it">Modello 3D STL</comment>
+ <comment xml:lang="kk">STL 3D моделі</comment>
+ <comment xml:lang="ko">STL 3D 모델</comment>
+ <comment xml:lang="pl">Model 3D STL</comment>
+ <comment xml:lang="pt-BR">Modelo 3D STL</comment>
+ <comment xml:lang="ru">3D-модель STL</comment>
+ <comment xml:lang="sk">STL 3D model</comment>
+ <comment xml:lang="sl">Model STL 3D</comment>
+ <comment xml:lang="sv">STL-3D-modell</comment>
+ <comment xml:lang="tr">STL 3D modeli</comment>
+ <comment xml:lang="uk">просторова модель STL</comment>
+ <comment xml:lang="zh-CN">STL 3D 模型</comment>
+ <comment xml:lang="zh-TW">STL 3D 模型</comment>
<acronym>STL</acronym>
<expanded-acronym>StereoLithography</expanded-acronym>
<magic priority="50">
- <match value="solid" type="string" offset="0"/>
- <match value="SOLID" type="string" offset="0"/>
+ <match type="string" value="solid" offset="0"/>
+ <match type="string" value="SOLID" offset="0"/>
</magic>
<glob pattern="*.stl"/>
<alias type="model/x.stl-ascii"/>
@@ -41165,31 +42757,35 @@
<mime-type type="text/x.gcode">
<comment>G-code file</comment>
+ <comment xml:lang="bg">Модел — G-code</comment>
<comment xml:lang="ca">fitxer G-code</comment>
<comment xml:lang="cs">soubor G-code</comment>
+ <comment xml:lang="da">G-code-fil</comment>
<comment xml:lang="de">G-Code-Datei</comment>
- <comment xml:lang="en_GB">G-code file</comment>
+ <comment xml:lang="en-GB">G-code file</comment>
<comment xml:lang="es">archivo G-code</comment>
<comment xml:lang="eu">G-code fitxategia</comment>
<comment xml:lang="fi">G-code-tiedosto</comment>
<comment xml:lang="fr">fichier G-code</comment>
+ <comment xml:lang="fur">file G-code</comment>
<comment xml:lang="ga">comhad G-code</comment>
<comment xml:lang="hr">G-kôd datoteka</comment>
<comment xml:lang="hu">G-code fájl</comment>
- <comment xml:lang="id">berkas G-code</comment>
+ <comment xml:lang="id">Berkas G-code</comment>
<comment xml:lang="it">File G-code</comment>
<comment xml:lang="kk">G-code файлы</comment>
- <comment xml:lang="ko">지-코드 파일</comment>
+ <comment xml:lang="ko">G-code 파일</comment>
<comment xml:lang="pl">Plik G-code</comment>
- <comment xml:lang="pt_BR">Arquivo G-code</comment>
+ <comment xml:lang="pt-BR">Arquivo G-code</comment>
<comment xml:lang="ru">Файл G-code</comment>
<comment xml:lang="sk">Súbor G-code</comment>
+ <comment xml:lang="sl">Datoteka G-code</comment>
<comment xml:lang="sr">датотека Г-ко̂да</comment>
<comment xml:lang="sv">G-code-fil</comment>
<comment xml:lang="tr">G-code dosyası</comment>
<comment xml:lang="uk">файл G-code</comment>
- <comment xml:lang="zh_CN">G-code 文件</comment>
- <comment xml:lang="zh_TW">G-code 檔案</comment>
+ <comment xml:lang="zh-CN">G-code 文件</comment>
+ <comment xml:lang="zh-TW">G-code 檔案</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-x-generic"/>
<glob pattern="*.gcode"/>
@@ -41197,37 +42793,260 @@
<mime-type type="application/x-fds-disk">
<comment>Nintendo FDS disk image</comment>
- <comment xml:lang="ca">Imatge de disc Nintendo FDS</comment>
+ <comment xml:lang="af">Nintendo FDS-skyfbeeldlêer</comment>
+ <comment xml:lang="bg">Диск — Nintendo FDS</comment>
+ <comment xml:lang="ca">imatge de disc Nintendo FDS</comment>
<comment xml:lang="cs">obraz disku pro Nintendo FDS</comment>
+ <comment xml:lang="da">Nintendo FDS-diskaftryk</comment>
<comment xml:lang="de">Nintendo-FDS-Datenträgerabbild</comment>
- <comment xml:lang="en_GB">Nintendo FDS disk image</comment>
+ <comment xml:lang="en-GB">Nintendo FDS disk image</comment>
<comment xml:lang="es">imagen de disco FDS de Nintendo</comment>
<comment xml:lang="eu">Nintendo FDS disko irudia</comment>
<comment xml:lang="fi">Nintendo FDS -levykuva</comment>
<comment xml:lang="fr">image disque Nintendo FDS</comment>
+ <comment xml:lang="fur">imagjin disc Nintendo FDS</comment>
<comment xml:lang="ga">íomhá diosca Nintendo FDS</comment>
<comment xml:lang="hr">Nintendo FDS slika diska</comment>
<comment xml:lang="hu">Nintendo FDS lemezkép</comment>
- <comment xml:lang="id">image disk Nintendo FDS</comment>
+ <comment xml:lang="id">Image disk Nintendo FDS</comment>
<comment xml:lang="it">Immagine disco Nintendo FDS</comment>
<comment xml:lang="kk">Nintendo FDS диск бейнесі</comment>
<comment xml:lang="ko">닌텐도 FDS 디스크 이미지</comment>
<comment xml:lang="pl">Obraz dysku Nintendo FDS</comment>
- <comment xml:lang="pt_BR">Imagem de disco Nintendo FDS</comment>
+ <comment xml:lang="pt-BR">Imagem de disco Nintendo FDS</comment>
<comment xml:lang="ru">Образ диска Nintendo FDS</comment>
<comment xml:lang="sk">Obraz disku Nintendo FDS</comment>
<comment xml:lang="sr">Нинтендо ФДС слика диска</comment>
<comment xml:lang="sv">Nintendo FDS-diskavbild</comment>
- <comment xml:lang="tr">Nintendo FDS disk kalıbı</comment>
+ <comment xml:lang="tr">Nintendo FDS disk görüntüsü</comment>
<comment xml:lang="uk">образ диска FDS Nintendo</comment>
- <comment xml:lang="zh_CN">任天堂 FDS 磁盘映像</comment>
- <comment xml:lang="zh_TW">Nintendo FDS 磁碟映像檔</comment>
+ <comment xml:lang="zh-CN">任天堂 FDS 磁盘映像</comment>
+ <comment xml:lang="zh-TW">Nintendo FDS 磁碟映像檔</comment>
<acronym>FDS</acronym>
<expanded-acronym>Famicom Disk System</expanded-acronym>
<glob pattern="*.fds"/>
<magic>
- <match value="*NINTENDO-HVC*" type="string" offset="1"/>
+ <match type="string" value="*NINTENDO-HVC*" offset="1"/>
+ </magic>
+ </mime-type>
+
+ <mime-type type="application/x-qemu-disk">
+ <comment>QEMU QCOW disk image</comment>
+ <comment xml:lang="ca">imatge de disc QEMU QCOW</comment>
+ <comment xml:lang="da">QEMU QCOW-diskaftryk</comment>
+ <comment xml:lang="de">QEMU QCOW-Datenträgerabbild</comment>
+ <comment xml:lang="en-GB">QEMU QCOW disk image</comment>
+ <comment xml:lang="es">imagen de disco QCOW de QEMU</comment>
+ <comment xml:lang="fi">QEMU QCOW -levykuva</comment>
+ <comment xml:lang="fr">image disque QEMU QCOW</comment>
+ <comment xml:lang="hr">QEMU QCOW slika diska</comment>
+ <comment xml:lang="hu">QEMU QCOW lemezkép</comment>
+ <comment xml:lang="id">Image disk QCOW QEMU</comment>
+ <comment xml:lang="it">Immagine disco QEMU QCOW</comment>
+ <comment xml:lang="kk">QEMU QCOW диск бейнесі</comment>
+ <comment xml:lang="ko">QEMU QCOW 디스크 이미지</comment>
+ <comment xml:lang="pl">Obraz dysku QCOW QEMU</comment>
+ <comment xml:lang="pt-BR">Imagem de disco QEMU QCOW</comment>
+ <comment xml:lang="ru">Образ диска QEMU QCOW</comment>
+ <comment xml:lang="sv">QEMU QCOW-diskavbildning</comment>
+ <comment xml:lang="tr">QEMU QCOW disk görüntüsü</comment>
+ <comment xml:lang="uk">образ диска QCOW QEMU</comment>
+ <comment xml:lang="zh-CN">QEMU QCOW 磁盘映像</comment>
+ <comment xml:lang="zh-TW">QEMU QCOW 磁碟映像檔</comment>
+ <acronym>QCOW</acronym>
+ <expanded-acronym>QEMU Copy On Write</expanded-acronym>
+ <glob pattern="*.qcow2"/>
+ <glob pattern="*.qcow"/>
+ <magic>
+ <match type="string" value="QFI" offset="0">
+ <match value="0xfb" type="byte" offset="3"/>
+ </match>
+ </magic>
+ </mime-type>
+
+ <mime-type type="application/x-appleworks-document">
+ <comment>AppleWorks document</comment>
+ <comment xml:lang="ca">document AppleWorks</comment>
+ <comment xml:lang="da">AppleWorks-dokument</comment>
+ <comment xml:lang="de">AppleWorks-Dokument</comment>
+ <comment xml:lang="en-GB">AppleWorks document</comment>
+ <comment xml:lang="es">documento de AppleWorks</comment>
+ <comment xml:lang="fi">AppleWorks-asiakirja</comment>
+ <comment xml:lang="fr">document AppleWorks</comment>
+ <comment xml:lang="hr">AppleWorks dokument</comment>
+ <comment xml:lang="hu">AppleWorks-dokumentum</comment>
+ <comment xml:lang="id">Dokumen AppleWorks</comment>
+ <comment xml:lang="it">Documento AppleWorks</comment>
+ <comment xml:lang="kk">AppleWorks құжаты</comment>
+ <comment xml:lang="ko">AppleWorks 문서</comment>
+ <comment xml:lang="pl">Dokument AppleWorks</comment>
+ <comment xml:lang="pt-BR">Documento AppleWorks</comment>
+ <comment xml:lang="ru">Документ AppleWorks</comment>
+ <comment xml:lang="sl">Dokument AppleWorks</comment>
+ <comment xml:lang="sv">AppleWorks-dokument</comment>
+ <comment xml:lang="tr">AppleWorks belgesi</comment>
+ <comment xml:lang="uk">документ AppleWorks</comment>
+ <comment xml:lang="zh-CN">AppleWorks 文档</comment>
+ <comment xml:lang="zh-TW">AppleWorks 文件</comment>
+ <generic-icon name="x-office-document"/>
+ <glob pattern="*.cwk"/>
+ </mime-type>
+
+ <mime-type type="application/x-bps-patch">
+ <comment>BPS patch</comment>
+ <comment xml:lang="ca">pedaç de BPS</comment>
+ <comment xml:lang="da">BPS-rettelse</comment>
+ <comment xml:lang="de">BPS-Patch</comment>
+ <comment xml:lang="en-GB">BPS patch</comment>
+ <comment xml:lang="es">parche BPS</comment>
+ <comment xml:lang="fi">BPS-korjaus</comment>
+ <comment xml:lang="fr">correctif BPS</comment>
+ <comment xml:lang="hr">BPS zakrpa</comment>
+ <comment xml:lang="hu">BPS javítócsomag</comment>
+ <comment xml:lang="id">Patch BPS</comment>
+ <comment xml:lang="it">Patch BPS</comment>
+ <comment xml:lang="kk">BPS өзгерісі</comment>
+ <comment xml:lang="ko">BPS 패치</comment>
+ <comment xml:lang="pl">Łata BPS</comment>
+ <comment xml:lang="pt-BR">Patch BPS</comment>
+ <comment xml:lang="ru">Патч BPS</comment>
+ <comment xml:lang="sv">BPS patch</comment>
+ <comment xml:lang="tr">BPS yaması</comment>
+ <comment xml:lang="uk">латка BPS</comment>
+ <comment xml:lang="zh-CN">BPS 补丁</comment>
+ <comment xml:lang="zh-TW">BPS 修補檔</comment>
+ <acronym>BPS</acronym>
+ <expanded-acronym>Binary Patching System</expanded-acronym>
+ <glob pattern="*.bps"/>
+ <magic>
+ <match type="string" value="BPS1" offset="0"/>
+ </magic>
+ </mime-type>
+
+ <mime-type type="application/x-ips-patch">
+ <comment>IPS patch</comment>
+ <comment xml:lang="ca">pedaç d'IPS</comment>
+ <comment xml:lang="da">IPS-rettelse</comment>
+ <comment xml:lang="de">IPS-Patch</comment>
+ <comment xml:lang="en-GB">IPS patch</comment>
+ <comment xml:lang="es">parche IPS</comment>
+ <comment xml:lang="fi">IPS-korjaus</comment>
+ <comment xml:lang="fr">correctif IPS</comment>
+ <comment xml:lang="hr">IPS zakrpa</comment>
+ <comment xml:lang="hu">IPS javítócsomag</comment>
+ <comment xml:lang="id">Patch IPS</comment>
+ <comment xml:lang="it">Patch IPS</comment>
+ <comment xml:lang="kk">IPS өзгерісі</comment>
+ <comment xml:lang="ko">IPS 패치</comment>
+ <comment xml:lang="pl">Łata IPS</comment>
+ <comment xml:lang="pt-BR">Patch IPS</comment>
+ <comment xml:lang="ru">Патч IPS</comment>
+ <comment xml:lang="sv">IPS patch</comment>
+ <comment xml:lang="tr">IPS yaması</comment>
+ <comment xml:lang="uk">латка IPS</comment>
+ <comment xml:lang="zh-CN">IPS 补丁</comment>
+ <comment xml:lang="zh-TW">IPS 修補檔</comment>
+ <acronym>IPS</acronym>
+ <expanded-acronym>International Patching System</expanded-acronym>
+ <glob pattern="*.ips"/>
+ <magic>
+ <match type="string" value="PATCH" offset="0"/>
+ </magic>
+ </mime-type>
+
+ <mime-type type="application/x-pyspread-spreadsheet">
+ <comment>Pyspread spreadsheet</comment>
+ <comment xml:lang="ca">full de càlcul de Pyspread</comment>
+ <comment xml:lang="da">Pyspread-regneark</comment>
+ <comment xml:lang="de">Pyspread-Tabelle</comment>
+ <comment xml:lang="en-GB">Pyspread spreadsheet</comment>
+ <comment xml:lang="es">hoja de cálculo de Pyspread</comment>
+ <comment xml:lang="fi">Pyspread-taulukko</comment>
+ <comment xml:lang="fr">feuille de calcul Pyspread</comment>
+ <comment xml:lang="hr">Pyspread proračunska tablica</comment>
+ <comment xml:lang="it">Foglio di calcolo Pyspread</comment>
+ <comment xml:lang="pl">Arkusz pyspread</comment>
+ <comment xml:lang="pt-BR">Planilha do Pyspread</comment>
+ <comment xml:lang="sv">Pyspread-kalkylblad</comment>
+ <comment xml:lang="uk">ел. таблиця Pyspread</comment>
+ <comment xml:lang="zh-CN">Pyspread 电子表格</comment>
+ <comment xml:lang="zh-TW">Pyspread 試算表</comment>
+ <glob pattern="*.pysu"/>
+ <magic>
+ <match type="string" value="[Pyspread save file version]" offset="0"/>
</magic>
+ <generic-icon name="x-office-spreadsheet"/>
+ </mime-type>
+ <mime-type type="application/x-pyspread-bz-spreadsheet">
+ <comment>Pyspread spreadsheet (bzip-compressed)</comment>
+ <comment xml:lang="ca">full de càlcul de Pyspread (amb compressió bzip)</comment>
+ <comment xml:lang="da">Pyspread-regneark (bzip-komprimeret)</comment>
+ <comment xml:lang="de">Pyspread-Tabelle (bzip-komprimiert)</comment>
+ <comment xml:lang="en-GB">Pyspread spreadsheet (bzip-compressed)</comment>
+ <comment xml:lang="es">hoja de cálculo de Pyspread (comprimida con bzip)</comment>
+ <comment xml:lang="fi">Pyspread-taulukko (bzip-pakattu)</comment>
+ <comment xml:lang="fr">feuille de calcul Pyspread (compressée bzip)</comment>
+ <comment xml:lang="hr">Pyspread proračunska tablica (bzip sažeta)</comment>
+ <comment xml:lang="it">Foglio di calcolo Pyspread (compresso con bzip)</comment>
+ <comment xml:lang="pl">Arkusz pyspread (kompresja bzip)</comment>
+ <comment xml:lang="pt-BR">Planilha do Pyspread (compactada com bzip)</comment>
+ <comment xml:lang="sv">Pyspread-kalkylblad (bzip-komprimerat)</comment>
+ <comment xml:lang="uk">ел. таблиця Pyspread (стиснена bzip)</comment>
+ <comment xml:lang="zh-CN">Pyspread 电子表格（bzip 压缩）</comment>
+ <comment xml:lang="zh-TW">Pyspread 試算表 (bzip 壓縮)</comment>
+ <sub-class-of type="application/x-bzip"/>
+ <glob pattern="*.pys"/>
+ <generic-icon name="x-office-spreadsheet"/>
+ </mime-type>
+
+ <mime-type type="text/x-kotlin">
+ <comment>Kotlin source code</comment>
+ <comment xml:lang="ca">codi font en Kotlin</comment>
+ <comment xml:lang="da">Kotlin-kildekode</comment>
+ <comment xml:lang="de">Kotlin-Quelltext</comment>
+ <comment xml:lang="en-GB">Kotlin source code</comment>
+ <comment xml:lang="es">código fuente en Kotlin</comment>
+ <comment xml:lang="fi">Kotlin-lähdekoodi</comment>
+ <comment xml:lang="fr">code source Kotlin</comment>
+ <comment xml:lang="hr">Kotlin izvorni kôd</comment>
+ <comment xml:lang="it">Codice sorgente Kotlin</comment>
+ <comment xml:lang="pl">Kod źródłowy Kotlin</comment>
+ <comment xml:lang="pt-BR">Código-fonte Kotlin</comment>
+ <comment xml:lang="sv">Kotlin-källkod</comment>
+ <comment xml:lang="uk">вихідний код мовою Kotlin</comment>
+ <comment xml:lang="zh-CN">Kotlin 源代码</comment>
+ <comment xml:lang="zh-TW">Kotlin 源碼</comment>
+ <sub-class-of type="text/plain"/>
+ <glob pattern="*.kt"/>
</mime-type>
+ <mime-type type="image/avif">
+ <comment>AV1 Image File Format (AVIF)</comment>
+ <comment xml:lang="ca">format de fitxer d'imatge AV1 (AVIF)</comment>
+ <comment xml:lang="da">AV1-billedfilformat (AVIF)</comment>
+ <comment xml:lang="de">AV1-Bilddateiformat (AVIF)</comment>
+ <comment xml:lang="en-GB">AV1 Image File Format (AVIF)</comment>
+ <comment xml:lang="es">formato de archivo de imagen AV1 (AVIF)</comment>
+ <comment xml:lang="fi">AV1-kuvatiedostomuoto (AVIF)</comment>
+ <comment xml:lang="hr">AV1 format datoteke slike (AVIF)</comment>
+ <comment xml:lang="it">AV1 Image File Format (AVIF)</comment>
+ <comment xml:lang="pl">Format pliku obrazu AV1 (AVIF)</comment>
+ <comment xml:lang="pt-BR">Formato de arquivo de imagem AV1 (AVIF)</comment>
+ <comment xml:lang="sv">AV1-bildfilformat (AVIF)</comment>
+ <comment xml:lang="uk">формат файлів зображень AV1 (AVIF)</comment>
+ <comment xml:lang="zh-CN">AV1 图像文件格式（AVIF）</comment>
+ <comment xml:lang="zh-TW">AV1 影像檔案格式 (AVIF)</comment>
+ <magic priority="50">
+ <match type="string" value="ftypavif" offset="4"/>
+ <match type="string" value="ftypavis" offset="4"/>
+ <match type="string" value="ftypmif1" offset="4">
+ <match type="string" value="avif" offset="16"/>
+ <match type="string" value="avif" offset="20"/>
+ <match type="string" value="avif" offset="24"/>
+ </match>
+ </magic>
+ <glob pattern="*.avif"/>
+ <glob pattern="*.avifs"/>
+ <alias type="image/avif-sequence"/>
+ </mime-type>
</mime-info>
diff --git a/qtbase/src/corelib/mimetypes/qmimedatabase.cpp b/qtbase/src/corelib/mimetypes/qmimedatabase.cpp
index 9de22cef33..34591fc667 100644
--- a/qtbase/src/corelib/mimetypes/qmimedatabase.cpp
+++ b/qtbase/src/corelib/mimetypes/qmimedatabase.cpp
@@ -46,6 +46,9 @@
#include "qmimeprovider_p.h"
#include "qmimetype_p.h"
+#include <private/qduplicatetracker_p.h>
+#include <private/qfilesystementry_p.h>
+
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QSet>
@@ -389,20 +392,23 @@ QMimeType QMimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileNa
// Disambiguate conflicting extensions (if magic matching found something)
if (candidateByData.isValid() && magicAccuracy > 0) {
const QString sniffedMime = candidateByData.name();
- // If the sniffedMime matches a glob match, use it
+ // If the sniffedMime matches a highest-weight glob match, use it
if (candidatesByName.m_matchingMimeTypes.contains(sniffedMime)) {
*accuracyPtr = 100;
return candidateByData;
}
- for (const QString &m : qAsConst(candidatesByName.m_matchingMimeTypes)) {
+ for (const QString &m : qAsConst(candidatesByName.m_allMatchingMimeTypes)) {
if (inherits(m, sniffedMime)) {
// We have magic + pattern pointing to this, so it's a pretty good match
*accuracyPtr = 100;
return mimeTypeForName(m);
}
}
- *accuracyPtr = magicAccuracy;
- return candidateByData;
+ if (candidatesByName.m_allMatchingMimeTypes.isEmpty()) {
+ // No glob, use magic
+ *accuracyPtr = magicAccuracy;
+ return candidateByData;
+ }
}
}
@@ -428,6 +434,7 @@ QList<QMimeType> QMimeDatabasePrivate::allMimeTypes()
bool QMimeDatabasePrivate::inherits(const QString &mime, const QString &parent)
{
const QString resolvedParent = resolveAlias(parent);
+ QDuplicateTracker<QString> seen;
std::stack<QString, QStringList> toCheck;
toCheck.push(mime);
while (!toCheck.empty()) {
@@ -436,8 +443,11 @@ bool QMimeDatabasePrivate::inherits(const QString &mime, const QString &parent)
const QString mimeName = toCheck.top();
toCheck.pop();
const auto parentList = parents(mimeName);
- for (const QString &par : parentList)
- toCheck.push(resolveAlias(par));
+ for (const QString &par : parentList) {
+ const QString resolvedPar = resolveAlias(par);
+ if (!seen.hasSeen(resolvedPar))
+ toCheck.push(resolvedPar);
+ }
}
return false;
}
diff --git a/qtbase/src/corelib/mimetypes/qmimeglobpattern.cpp b/qtbase/src/corelib/mimetypes/qmimeglobpattern.cpp
index b1de8907b2..fa8f4c545d 100644
--- a/qtbase/src/corelib/mimetypes/qmimeglobpattern.cpp
+++ b/qtbase/src/corelib/mimetypes/qmimeglobpattern.cpp
@@ -83,7 +83,10 @@ void QMimeGlobMatchResult::addMatch(const QString &mimeType, int weight, const Q
}
if (!m_matchingMimeTypes.contains(mimeType)) {
m_matchingMimeTypes.append(mimeType);
- m_allMatchingMimeTypes.append(mimeType);
+ if (replace)
+ m_allMatchingMimeTypes.prepend(mimeType); // highest-weight first
+ else
+ m_allMatchingMimeTypes.append(mimeType);
m_knownSuffixLength = knownSuffixLength;
}
}
diff --git a/qtbase/src/corelib/mimetypes/qmimeprovider.cpp b/qtbase/src/corelib/mimetypes/qmimeprovider.cpp
index 258dddf8cb..5125704cf1 100644
--- a/qtbase/src/corelib/mimetypes/qmimeprovider.cpp
+++ b/qtbase/src/corelib/mimetypes/qmimeprovider.cpp
@@ -242,21 +242,28 @@ void QMimeBinaryProvider::addFileNameMatches(const QString &fileName, QMimeGlobM
return;
Q_ASSERT(m_cacheFile);
const QString lowerFileName = fileName.toLower();
+ int numMatches = 0;
// Check literals (e.g. "Makefile")
- matchGlobList(result, m_cacheFile, m_cacheFile->getUint32(PosLiteralListOffset), fileName);
- // Check complex globs (e.g. "callgrind.out[0-9]*")
- matchGlobList(result, m_cacheFile, m_cacheFile->getUint32(PosGlobListOffset), fileName);
+ numMatches = matchGlobList(result, m_cacheFile, m_cacheFile->getUint32(PosLiteralListOffset), fileName);
// Check the very common *.txt cases with the suffix tree
- const int reverseSuffixTreeOffset = m_cacheFile->getUint32(PosReverseSuffixTreeOffset);
- const int numRoots = m_cacheFile->getUint32(reverseSuffixTreeOffset);
- const int firstRootOffset = m_cacheFile->getUint32(reverseSuffixTreeOffset + 4);
- matchSuffixTree(result, m_cacheFile, numRoots, firstRootOffset, lowerFileName, lowerFileName.length() - 1, false);
- if (result.m_matchingMimeTypes.isEmpty())
- matchSuffixTree(result, m_cacheFile, numRoots, firstRootOffset, fileName, fileName.length() - 1, true);
+ if (numMatches == 0) {
+ const int reverseSuffixTreeOffset = m_cacheFile->getUint32(PosReverseSuffixTreeOffset);
+ const int numRoots = m_cacheFile->getUint32(reverseSuffixTreeOffset);
+ const int firstRootOffset = m_cacheFile->getUint32(reverseSuffixTreeOffset + 4);
+ if (matchSuffixTree(result, m_cacheFile, numRoots, firstRootOffset, lowerFileName, lowerFileName.length() - 1, false)) {
+ ++numMatches;
+ } else if (matchSuffixTree(result, m_cacheFile, numRoots, firstRootOffset, fileName, fileName.length() - 1, true)) {
+ ++numMatches;
+ }
+ }
+ // Check complex globs (e.g. "callgrind.out[0-9]*" or "README*")
+ if (numMatches == 0)
+ matchGlobList(result, m_cacheFile, m_cacheFile->getUint32(PosGlobListOffset), fileName);
}
-void QMimeBinaryProvider::matchGlobList(QMimeGlobMatchResult &result, CacheFile *cacheFile, int off, const QString &fileName)
+int QMimeBinaryProvider::matchGlobList(QMimeGlobMatchResult &result, CacheFile *cacheFile, int off, const QString &fileName)
{
+ int numMatches = 0;
const int numGlobs = cacheFile->getUint32(off);
//qDebug() << "Loading" << numGlobs << "globs from" << cacheFile->file.fileName() << "at offset" << cacheFile->globListOffset;
for (int i = 0; i < numGlobs; ++i) {
@@ -272,9 +279,12 @@ void QMimeBinaryProvider::matchGlobList(QMimeGlobMatchResult &result, CacheFile
//qDebug() << pattern << mimeType << weight << caseSensitive;
QMimeGlobPattern glob(pattern, QString() /*unused*/, weight, qtCaseSensitive);
- if (glob.matchFileName(fileName))
+ if (glob.matchFileName(fileName)) {
result.addMatch(QLatin1String(mimeType), weight, pattern);
+ ++numMatches;
+ }
}
+ return numMatches;
}
bool QMimeBinaryProvider::matchSuffixTree(QMimeGlobMatchResult &result, QMimeBinaryProvider::CacheFile *cacheFile, int numEntries, int firstOffset, const QString &fileName, int charPos, bool caseSensitiveCheck)
diff --git a/qtbase/src/corelib/mimetypes/qmimeprovider_p.h b/qtbase/src/corelib/mimetypes/qmimeprovider_p.h
index f9c8ef384c..5b328a7d5e 100644
--- a/qtbase/src/corelib/mimetypes/qmimeprovider_p.h
+++ b/qtbase/src/corelib/mimetypes/qmimeprovider_p.h
@@ -115,7 +115,7 @@ public:
private:
struct CacheFile;
- void matchGlobList(QMimeGlobMatchResult &result, CacheFile *cacheFile, int offset, const QString &fileName);
+ int matchGlobList(QMimeGlobMatchResult &result, CacheFile *cacheFile, int offset, const QString &fileName);
bool matchSuffixTree(QMimeGlobMatchResult &result, CacheFile *cacheFile, int numEntries, int firstOffset, const QString &fileName, int charPos, bool caseSensitiveCheck);
bool matchMagicRule(CacheFile *cacheFile, int numMatchlets, int firstOffset, const QByteArray &data);
QLatin1String iconForMime(CacheFile *cacheFile, int posListOffset, const QByteArray &inputMime);
diff --git a/qtbase/src/corelib/mimetypes/qmimetype.cpp b/qtbase/src/corelib/mimetypes/qmimetype.cpp
index 0c0de63961..d6a351262b 100644
--- a/qtbase/src/corelib/mimetypes/qmimetype.cpp
+++ b/qtbase/src/corelib/mimetypes/qmimetype.cpp
@@ -376,14 +376,17 @@ QStringList QMimeType::parentMimeTypes() const
static void collectParentMimeTypes(const QString &mime, QStringList &allParents)
{
const QStringList parents = QMimeDatabasePrivate::instance()->mimeParents(mime);
+ QStringList newParents;
for (const QString &parent : parents) {
// I would use QSet, but since order matters I better not
- if (!allParents.contains(parent))
+ if (!allParents.contains(parent)) {
allParents.append(parent);
+ newParents.append(parent);
+ }
}
// We want a breadth-first search, so that the least-specific parent (octet-stream) is last
// This means iterating twice, unfortunately.
- for (const QString &parent : parents)
+ for (const QString &parent : newParents)
collectParentMimeTypes(parent, allParents);
}
diff --git a/qtbase/src/corelib/plugin/qlibrary.cpp b/qtbase/src/corelib/plugin/qlibrary.cpp
index 5d2f024267..45b5a3fe27 100644
--- a/qtbase/src/corelib/plugin/qlibrary.cpp
+++ b/qtbase/src/corelib/plugin/qlibrary.cpp
@@ -526,7 +526,7 @@ void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh)
if (pHnd.loadRelaxed())
return;
- loadHintsInt.storeRelaxed(lh);
+ loadHintsInt.fetchAndOrRelaxed(lh);
}
QFunctionPointer QLibraryPrivate::resolve(const char *symbol)
@@ -538,6 +538,13 @@ QFunctionPointer QLibraryPrivate::resolve(const char *symbol)
void QLibraryPrivate::setLoadHints(QLibrary::LoadHints lh)
{
+ // Set the load hints directly for a dummy if this object is not associated
+ // with a file. Such object is not shared between multiple instances.
+ if (fileName.isEmpty()) {
+ loadHintsInt.storeRelaxed(lh);
+ return;
+ }
+
// this locks a global mutex
QMutexLocker lock(&qt_library_mutex);
mergeLoadHints(lh);
@@ -1166,6 +1173,10 @@ QString QLibrary::errorString() const
lazy symbol resolution, and will not export external symbols for resolution
in other dynamically-loaded libraries.
+ \note Hints can only be cleared when this object is not associated with a
+ file. Hints can only be added once the file name is set (\a hints will
+ be or'ed with the old hints).
+
\note Setting this property after the library has been loaded has no effect
and loadHints() will not reflect those changes.
diff --git a/qtbase/src/corelib/plugin/qpluginloader.cpp b/qtbase/src/corelib/plugin/qpluginloader.cpp
index 0a63b93762..02b8c588be 100644
--- a/qtbase/src/corelib/plugin/qpluginloader.cpp
+++ b/qtbase/src/corelib/plugin/qpluginloader.cpp
@@ -105,6 +105,8 @@ QT_BEGIN_NAMESPACE
\sa QLibrary, {Plug & Paint Example}
*/
+static constexpr QLibrary::LoadHints defaultLoadHints = QLibrary::PreventUnloadHint;
+
/*!
\class QStaticPlugin
\inmodule QtCore
@@ -155,7 +157,7 @@ QPluginLoader::QPluginLoader(const QString &fileName, QObject *parent)
: QObject(parent), d(nullptr), did_load(false)
{
setFileName(fileName);
- setLoadHints(QLibrary::PreventUnloadHint);
+ setLoadHints(defaultLoadHints);
}
/*!
@@ -357,7 +359,7 @@ static QString locatePlugin(const QString& fileName)
void QPluginLoader::setFileName(const QString &fileName)
{
#if defined(QT_SHARED)
- QLibrary::LoadHints lh = QLibrary::PreventUnloadHint;
+ QLibrary::LoadHints lh = defaultLoadHints;
if (d) {
lh = d->loadHints();
d->release();
@@ -414,15 +416,21 @@ QString QPluginLoader::errorString() const
void QPluginLoader::setLoadHints(QLibrary::LoadHints loadHints)
{
if (!d) {
- d = QLibraryPrivate::findOrCreate(QString()); // ugly, but we need a d-ptr
+ d = QLibraryPrivate::findOrCreate({}, {}, loadHints); // ugly, but we need a d-ptr
d->errorString.clear();
+ } else {
+ d->setLoadHints(loadHints);
}
- d->setLoadHints(loadHints);
}
QLibrary::LoadHints QPluginLoader::loadHints() const
{
- return d ? d->loadHints() : QLibrary::LoadHints();
+ // Not having a d-pointer means that the user hasn't called
+ // setLoadHints() / setFileName() yet. In setFileName() we will
+ // then force defaultLoadHints on loading, so we must return them
+ // from here as well.
+
+ return d ? d->loadHints() : defaultLoadHints;
}
#endif // QT_CONFIG(library)
diff --git a/qtbase/src/corelib/serialization/qcborvalue.cpp b/qtbase/src/corelib/serialization/qcborvalue.cpp
index 89a928d348..3a8c2cb9ec 100644
--- a/qtbase/src/corelib/serialization/qcborvalue.cpp
+++ b/qtbase/src/corelib/serialization/qcborvalue.cpp
@@ -2123,7 +2123,8 @@ QCborArray QCborValue::toArray(const QCborArray &defaultValue) const
Q_ASSERT(n == -1 || container == nullptr);
if (n < 0)
dd = container;
- return dd ? QCborArray(*dd) : defaultValue;
+ // return QCborArray(*dd); but that's UB if dd is nullptr
+ return dd ? QCborArray(*dd) : QCborArray();
}
/*!
@@ -2165,7 +2166,8 @@ QCborMap QCborValue::toMap(const QCborMap &defaultValue) const
Q_ASSERT(n == -1 || container == nullptr);
if (n < 0)
dd = container;
- return dd ? QCborMap(*dd) : defaultValue;
+ // return QCborMap(*dd); but that's UB if dd is nullptr
+ return dd ? QCborMap(*dd) : QCborMap();
}
/*!
diff --git a/qtbase/src/corelib/serialization/qxmlstream.cpp b/qtbase/src/corelib/serialization/qxmlstream.cpp
index 0ac5548178..0d49cbac19 100644
--- a/qtbase/src/corelib/serialization/qxmlstream.cpp
+++ b/qtbase/src/corelib/serialization/qxmlstream.cpp
@@ -160,7 +160,7 @@ enum { StreamEOF = ~0U };
addData() or by waiting for it to arrive on the device().
\value UnexpectedElementError The parser encountered an element
- that was different to those it expected.
+ or token that was different to those it expected.
*/
@@ -295,13 +295,34 @@ QXmlStreamEntityResolver *QXmlStreamReader::entityResolver() const
QXmlStreamReader is a well-formed XML 1.0 parser that does \e not
include external parsed entities. As long as no error occurs, the
- application code can thus be assured that the data provided by the
- stream reader satisfies the W3C's criteria for well-formed XML. For
- example, you can be certain that all tags are indeed nested and
- closed properly, that references to internal entities have been
- replaced with the correct replacement text, and that attributes have
- been normalized or added according to the internal subset of the
- DTD.
+ application code can thus be assured, that
+ \list
+ \li the data provided by the stream reader satisfies the W3C's
+ criteria for well-formed XML,
+ \li tokens are provided in a valid order.
+ \endlist
+
+ Unless QXmlStreamReader raises an error, it guarantees the following:
+ \list
+ \li All tags are nested and closed properly.
+ \li References to internal entities have been replaced with the
+ correct replacement text.
+ \li Attributes have been normalized or added according to the
+ internal subset of the \l DTD.
+ \li Tokens of type \l StartDocument happen before all others,
+ aside from comments and processing instructions.
+ \li At most one DOCTYPE element (a token of type \l DTD) is present.
+ \li If present, the DOCTYPE appears before all other elements,
+ aside from StartDocument, comments and processing instructions.
+ \endlist
+
+ In particular, once any token of type \l StartElement, \l EndElement,
+ \l Characters, \l EntityReference or \l EndDocument is seen, no
+ tokens of type StartDocument or DTD will be seen. If one is present in
+ the input stream, out of order, an error is raised.
+
+ \note The token types \l Comment and \l ProcessingInstruction may appear
+ anywhere in the stream.
If an error occurs while parsing, atEnd() and hasError() return
true, and error() returns the error that occurred. The functions
@@ -620,6 +641,7 @@ QXmlStreamReader::TokenType QXmlStreamReader::readNext()
d->token = -1;
return readNext();
}
+ d->checkToken();
return d->type;
}
@@ -740,6 +762,14 @@ static const short QXmlStreamReader_tokenTypeString_indices[] = {
};
+static const char QXmlStreamReader_XmlContextString[] =
+ "Prolog\0"
+ "Body\0";
+
+static const short QXmlStreamReader_XmlContextString_indices[] = {
+ 0, 7
+};
+
/*!
\property QXmlStreamReader::namespaceProcessing
The namespace-processing flag of the stream reader
@@ -775,6 +805,16 @@ QString QXmlStreamReader::tokenString() const
QXmlStreamReader_tokenTypeString_indices[d->type]);
}
+/*!
+ \internal
+ \return \param ctxt (Prolog/Body) as a string.
+ */
+QString contextString(QXmlStreamReaderPrivate::XmlContext ctxt)
+{
+ return QLatin1String(QXmlStreamReader_XmlContextString +
+ QXmlStreamReader_XmlContextString_indices[static_cast<int>(ctxt)]);
+}
+
#endif // QT_NO_XMLSTREAMREADER
QXmlStreamPrivateTagStack::QXmlStreamPrivateTagStack()
@@ -866,6 +906,8 @@ void QXmlStreamReaderPrivate::init()
type = QXmlStreamReader::NoToken;
error = QXmlStreamReader::NoError;
+ currentContext = XmlContext::Prolog;
+ foundDTD = false;
}
/*
@@ -1302,15 +1344,18 @@ inline int QXmlStreamReaderPrivate::fastScanContentCharList()
return n;
}
-inline int QXmlStreamReaderPrivate::fastScanName(int *prefix)
+// Fast scan an XML attribute name (e.g. "xml:lang").
+inline QXmlStreamReaderPrivate::FastScanNameResult
+QXmlStreamReaderPrivate::fastScanName(Value *val)
{
int n = 0;
uint c;
while ((c = getChar()) != StreamEOF) {
if (n >= 4096) {
// This is too long to be a sensible name, and
- // can exhaust memory
- return 0;
+ // can exhaust memory, or the range of decltype(*prefix)
+ raiseNamePrefixTooLongError();
+ return {};
}
switch (c) {
case '\n':
@@ -1339,23 +1384,23 @@ inline int QXmlStreamReaderPrivate::fastScanName(int *prefix)
case '+':
case '*':
putChar(c);
- if (prefix && *prefix == n+1) {
- *prefix = 0;
+ if (val && val->prefix == n + 1) {
+ val->prefix = 0;
putChar(':');
--n;
}
- return n;
+ return FastScanNameResult(n);
case ':':
- if (prefix) {
- if (*prefix == 0) {
- *prefix = n+2;
+ if (val) {
+ if (val->prefix == 0) {
+ val->prefix = n + 2;
} else { // only one colon allowed according to the namespace spec.
putChar(c);
- return n;
+ return FastScanNameResult(n);
}
} else {
putChar(c);
- return n;
+ return FastScanNameResult(n);
}
Q_FALLTHROUGH();
default:
@@ -1364,12 +1409,12 @@ inline int QXmlStreamReaderPrivate::fastScanName(int *prefix)
}
}
- if (prefix)
- *prefix = 0;
+ if (val)
+ val->prefix = 0;
int pos = textBuffer.size() - n;
putString(textBuffer, pos);
textBuffer.resize(pos);
- return 0;
+ return FastScanNameResult(0);
}
enum NameChar { NameBeginning, NameNotBeginning, NotName };
@@ -1878,6 +1923,14 @@ void QXmlStreamReaderPrivate::raiseWellFormedError(const QString &message)
raiseError(QXmlStreamReader::NotWellFormedError, message);
}
+void QXmlStreamReaderPrivate::raiseNamePrefixTooLongError()
+{
+ // TODO: add a ImplementationLimitsExceededError and use it instead
+ raiseError(QXmlStreamReader::NotWellFormedError,
+ QXmlStream::tr("Length of XML attribute name exceeds implementation limits (4KiB "
+ "characters)."));
+}
+
void QXmlStreamReaderPrivate::parseError()
{
@@ -4050,6 +4103,92 @@ void QXmlStreamWriter::writeCurrentToken(const QXmlStreamReader &reader)
}
}
+static bool isTokenAllowedInContext(QXmlStreamReader::TokenType type,
+ QXmlStreamReaderPrivate::XmlContext loc)
+{
+ switch (type) {
+ case QXmlStreamReader::StartDocument:
+ case QXmlStreamReader::DTD:
+ return loc == QXmlStreamReaderPrivate::XmlContext::Prolog;
+
+ case QXmlStreamReader::StartElement:
+ case QXmlStreamReader::EndElement:
+ case QXmlStreamReader::Characters:
+ case QXmlStreamReader::EntityReference:
+ case QXmlStreamReader::EndDocument:
+ return loc == QXmlStreamReaderPrivate::XmlContext::Body;
+
+ case QXmlStreamReader::Comment:
+ case QXmlStreamReader::ProcessingInstruction:
+ return true;
+
+ case QXmlStreamReader::NoToken:
+ case QXmlStreamReader::Invalid:
+ return false;
+ default:
+ return false;
+ }
+}
+
+/*!
+ \internal
+ \brief QXmlStreamReader::isValidToken
+ \return \c true if \param type is a valid token type.
+ \return \c false if \param type is an unexpected token,
+ which indicates a non-well-formed or invalid XML stream.
+ */
+bool QXmlStreamReaderPrivate::isValidToken(QXmlStreamReader::TokenType type)
+{
+ // Don't change currentContext, if Invalid or NoToken occur in the prolog
+ if (type == QXmlStreamReader::Invalid || type == QXmlStreamReader::NoToken)
+ return false;
+
+ // If a token type gets rejected in the body, there is no recovery
+ const bool result = isTokenAllowedInContext(type, currentContext);
+ if (result || currentContext == XmlContext::Body)
+ return result;
+
+ // First non-Prolog token observed => switch context to body and check again.
+ currentContext = XmlContext::Body;
+ return isTokenAllowedInContext(type, currentContext);
+}
+
+/*!
+ \internal
+ Checks token type and raises an error, if it is invalid
+ in the current context (prolog/body).
+ */
+void QXmlStreamReaderPrivate::checkToken()
+{
+ Q_Q(QXmlStreamReader);
+
+ // The token type must be consumed, to keep track if the body has been reached.
+ const XmlContext context = currentContext;
+ const bool ok = isValidToken(type);
+
+ // Do nothing if an error has been raised already (going along with an unexpected token)
+ if (error != QXmlStreamReader::Error::NoError)
+ return;
+
+ if (!ok) {
+ raiseError(QXmlStreamReader::UnexpectedElementError,
+ QLatin1String("Unexpected token type %1 in %2.")
+ .arg(q->tokenString(), contextString(context)));
+ return;
+ }
+
+ if (type != QXmlStreamReader::DTD)
+ return;
+
+ // Raise error on multiple DTD tokens
+ if (foundDTD) {
+ raiseError(QXmlStreamReader::UnexpectedElementError,
+ QLatin1String("Found second DTD token in %1.").arg(contextString(context)));
+ } else {
+ foundDTD = true;
+ }
+}
+
/*!
\fn bool QXmlStreamAttributes::hasAttribute(const QString &qualifiedName) const
\since 4.5
diff --git a/qtbase/src/corelib/serialization/qxmlstream.g b/qtbase/src/corelib/serialization/qxmlstream.g
index 4321fed68a..8c6a1a5887 100644
--- a/qtbase/src/corelib/serialization/qxmlstream.g
+++ b/qtbase/src/corelib/serialization/qxmlstream.g
@@ -516,7 +516,16 @@ public:
int fastScanLiteralContent();
int fastScanSpace();
int fastScanContentCharList();
- int fastScanName(int *prefix = nullptr);
+
+ struct FastScanNameResult {
+ FastScanNameResult() : ok(false) {}
+ explicit FastScanNameResult(int len) : addToLen(len), ok(true) { }
+ operator bool() { return ok; }
+ int operator*() { Q_ASSERT(ok); return addToLen; }
+ int addToLen;
+ bool ok;
+ };
+ FastScanNameResult fastScanName(Value *val = nullptr);
inline int fastScanNMTOKEN();
@@ -525,6 +534,7 @@ public:
void raiseError(QXmlStreamReader::Error error, const QString& message = QString());
void raiseWellFormedError(const QString &message);
+ void raiseNamePrefixTooLongError();
QXmlStreamEntityResolver *entityResolver;
@@ -1811,7 +1821,12 @@ space_opt ::= space;
qname ::= LETTER;
/.
case $rule_number: {
- sym(1).len += fastScanName(&sym(1).prefix);
+ Value &val = sym(1);
+ if (auto res = fastScanName(&val))
+ val.len += *res;
+ else
+ return false;
+
if (atEnd) {
resume($rule_number);
return false;
@@ -1822,7 +1837,11 @@ qname ::= LETTER;
name ::= LETTER;
/.
case $rule_number:
- sym(1).len += fastScanName();
+ if (auto res = fastScanName())
+ sym(1).len += *res;
+ else
+ return false;
+
if (atEnd) {
resume($rule_number);
return false;
diff --git a/qtbase/src/corelib/serialization/qxmlstream_p.h b/qtbase/src/corelib/serialization/qxmlstream_p.h
index e5bde7b98e..be7b1fe665 100644
--- a/qtbase/src/corelib/serialization/qxmlstream_p.h
+++ b/qtbase/src/corelib/serialization/qxmlstream_p.h
@@ -804,6 +804,17 @@ public:
#endif
bool atEnd;
+ enum class XmlContext
+ {
+ Prolog,
+ Body,
+ };
+
+ XmlContext currentContext = XmlContext::Prolog;
+ bool foundDTD = false;
+ bool isValidToken(QXmlStreamReader::TokenType type);
+ void checkToken();
+
/*!
\sa setType()
*/
@@ -1005,7 +1016,16 @@ public:
int fastScanLiteralContent();
int fastScanSpace();
int fastScanContentCharList();
- int fastScanName(int *prefix = nullptr);
+
+ struct FastScanNameResult {
+ FastScanNameResult() : ok(false) {}
+ explicit FastScanNameResult(int len) : addToLen(len), ok(true) { }
+ operator bool() { return ok; }
+ int operator*() { Q_ASSERT(ok); return addToLen; }
+ int addToLen;
+ bool ok;
+ };
+ FastScanNameResult fastScanName(Value *val = nullptr);
inline int fastScanNMTOKEN();
@@ -1014,6 +1034,7 @@ public:
void raiseError(QXmlStreamReader::Error error, const QString& message = QString());
void raiseWellFormedError(const QString &message);
+ void raiseNamePrefixTooLongError();
QXmlStreamEntityResolver *entityResolver;
@@ -1939,7 +1960,12 @@ bool QXmlStreamReaderPrivate::parse()
break;
case 262: {
- sym(1).len += fastScanName(&sym(1).prefix);
+ Value &val = sym(1);
+ if (auto res = fastScanName(&val))
+ val.len += *res;
+ else
+ return false;
+
if (atEnd) {
resume(262);
return false;
@@ -1947,7 +1973,11 @@ bool QXmlStreamReaderPrivate::parse()
} break;
case 263:
- sym(1).len += fastScanName();
+ if (auto res = fastScanName())
+ sym(1).len += *res;
+ else
+ return false;
+
if (atEnd) {
resume(263);
return false;
diff --git a/qtbase/src/corelib/text/qlocale_data_p.h b/qtbase/src/corelib/text/qlocale_data_p.h
index c5e6a0d461..c613e4e537 100644
--- a/qtbase/src/corelib/text/qlocale_data_p.h
+++ b/qtbase/src/corelib/text/qlocale_data_p.h
@@ -1340,7 +1340,7 @@ static const QLocaleData locale_data[] = {
{ 25, 6, 126, 46, 44, 59, 37, 48, 45, 43, 101, 12300, 12301, 12302, 12303, 166,5 , 166,5 , 176,5 , 176,5 , 415,8 , 402,13 , 209,6 , 226,13 , 2022,21 , 1980,28 , 2008,14 , 2022,21 , 1980,28 , 2008,14 , 58,2 , 55,2 , 283,3 , 5,17 , 22,23 , {77,79,80}, 137,4 , 3174,13 , 4,4 , 13,6 , 589,4 , 602,9 , 2, 1, 7, 6, 7 }, // Chinese/Traditional Han/Macau
{ 25, 6, 208, 46, 44, 59, 37, 48, 45, 43, 101, 12300, 12301, 12302, 12303, 166,5 , 166,5 , 171,5 , 171,5 , 394,8 , 423,14 , 209,6 , 226,13 , 2022,21 , 1980,28 , 2008,14 , 2022,21 , 1980,28 , 2008,14 , 58,2 , 55,2 , 45,4 , 5,17 , 22,23 , {84,87,68}, 6,1 , 3187,13 , 4,4 , 13,6 , 589,4 , 611,2 , 2, 0, 7, 6, 7 }, // Chinese/Traditional Han/Taiwan
{ 26, 7, 74, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {69,85,82}, 14,1 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 1, 6, 7 }, // Corsican/Latin/France
- { 27, 7, 54, 44, 46, 59, 37, 48, 8722, 43, 101, 8222, 8220, 8218, 8216, 0,6 , 0,6 , 159,7 , 159,7 , 437,13 , 450,19 , 37,5 , 87,12 , 2043,28 , 2071,58 , 2129,14 , 2043,28 , 2071,58 , 2143,14 , 0,2 , 0,2 , 286,7 , 5,17 , 22,23 , {72,82,75}, 141,3 , 3200,60 , 19,5 , 4,0 , 613,8 , 621,8 , 2, 1, 1, 6, 7 }, // Croatian/Latin/Croatia
+ { 27, 7, 54, 44, 46, 59, 37, 48, 8722, 43, 101, 8222, 8220, 8218, 8216, 0,6 , 0,6 , 159,7 , 159,7 , 437,13 , 450,19 , 37,5 , 87,12 , 2043,28 , 2071,58 , 2129,14 , 2043,28 , 2071,58 , 2143,14 , 0,2 , 0,2 , 286,7 , 5,17 , 22,23 , {69,85,82}, 14,1 , 3455,19 , 19,5 , 4,0 , 613,8 , 621,8 , 2, 1, 1, 6, 7 }, // Croatian/Latin/Croatia
{ 27, 7, 27, 44, 46, 59, 37, 48, 8722, 43, 101, 8222, 8220, 8218, 8216, 0,6 , 0,6 , 159,7 , 159,7 , 469,9 , 450,19 , 37,5 , 87,12 , 2043,28 , 2071,58 , 2143,14 , 2043,28 , 2071,58 , 2143,14 , 0,2 , 0,2 , 286,7 , 5,17 , 22,23 , {66,65,77}, 144,2 , 3260,85 , 19,5 , 4,0 , 613,8 , 629,19 , 2, 1, 1, 6, 7 }, // Croatian/Latin/Bosnia And Herzegowina
{ 28, 7, 57, 44, 160, 59, 37, 48, 45, 43, 101, 8222, 8220, 8218, 8216, 0,6 , 0,6 , 181,7 , 181,7 , 156,8 , 478,17 , 55,4 , 59,9 , 2157,21 , 2178,49 , 2227,14 , 2157,21 , 2178,49 , 2227,14 , 60,4 , 57,4 , 293,5 , 5,17 , 22,23 , {67,90,75}, 146,2 , 3345,68 , 19,5 , 4,0 , 648,7 , 655,5 , 2, 0, 1, 6, 7 }, // Czech/Latin/Czech Republic
{ 29, 7, 58, 44, 46, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 188,8 , 188,8 , 495,10 , 505,23 , 239,5 , 244,10 , 2241,28 , 2269,51 , 2320,14 , 2334,35 , 2269,51 , 2320,14 , 0,2 , 0,2 , 0,5 , 5,17 , 22,23 , {68,75,75}, 148,3 , 3413,42 , 19,5 , 4,0 , 660,5 , 665,7 , 2, 0, 1, 6, 7 }, // Danish/Latin/Denmark
diff --git a/qtbase/src/corelib/text/qstringiterator_p.h b/qtbase/src/corelib/text/qstringiterator_p.h
index b31c7673c2..731a241407 100644
--- a/qtbase/src/corelib/text/qstringiterator_p.h
+++ b/qtbase/src/corelib/text/qstringiterator_p.h
@@ -123,16 +123,20 @@ public:
{
Q_ASSERT_X(hasNext(), Q_FUNC_INFO, "iterator hasn't a next item");
- if (Q_UNLIKELY((pos++)->isHighSurrogate()))
+ if (Q_UNLIKELY((pos++)->isHighSurrogate())) {
+ Q_ASSERT(pos < e && pos->isLowSurrogate());
++pos;
+ }
}
inline uint peekNextUnchecked() const
{
Q_ASSERT_X(hasNext(), Q_FUNC_INFO, "iterator hasn't a next item");
- if (Q_UNLIKELY(pos->isHighSurrogate()))
+ if (Q_UNLIKELY(pos->isHighSurrogate())) {
+ Q_ASSERT(pos + 1 < e && pos[1].isLowSurrogate());
return QChar::surrogateToUcs4(pos[0], pos[1]);
+ }
return pos->unicode();
}
@@ -158,8 +162,10 @@ public:
Q_ASSERT_X(hasNext(), Q_FUNC_INFO, "iterator hasn't a next item");
const QChar cur = *pos++;
- if (Q_UNLIKELY(cur.isHighSurrogate()))
+ if (Q_UNLIKELY(cur.isHighSurrogate())) {
+ Q_ASSERT(pos < e && pos->isLowSurrogate());
return QChar::surrogateToUcs4(cur, *pos++);
+ }
return cur.unicode();
}
@@ -199,16 +205,20 @@ public:
{
Q_ASSERT_X(hasPrevious(), Q_FUNC_INFO, "iterator hasn't a previous item");
- if (Q_UNLIKELY((--pos)->isLowSurrogate()))
+ if (Q_UNLIKELY((--pos)->isLowSurrogate())) {
+ Q_ASSERT(pos > i && pos[-1].isHighSurrogate());
--pos;
+ }
}
inline uint peekPreviousUnchecked() const
{
Q_ASSERT_X(hasPrevious(), Q_FUNC_INFO, "iterator hasn't a previous item");
- if (Q_UNLIKELY(pos[-1].isLowSurrogate()))
+ if (Q_UNLIKELY(pos[-1].isLowSurrogate())) {
+ Q_ASSERT(pos > i + 1 && pos[-2].isHighSurrogate());
return QChar::surrogateToUcs4(pos[-2], pos[-1]);
+ }
return pos[-1].unicode();
}
@@ -233,8 +243,10 @@ public:
Q_ASSERT_X(hasPrevious(), Q_FUNC_INFO, "iterator hasn't a previous item");
const QChar cur = *--pos;
- if (Q_UNLIKELY(cur.isLowSurrogate()))
+ if (Q_UNLIKELY(cur.isLowSurrogate())) {
+ Q_ASSERT(pos > i && pos[-1].isHighSurrogate());
return QChar::surrogateToUcs4(*--pos, cur);
+ }
return cur.unicode();
}
diff --git a/qtbase/src/corelib/thread/qfutex_p.h b/qtbase/src/corelib/thread/qfutex_p.h
index f287b752d7..e294537787 100644
--- a/qtbase/src/corelib/thread/qfutex_p.h
+++ b/qtbase/src/corelib/thread/qfutex_p.h
@@ -52,6 +52,7 @@
//
#include <qglobal.h>
+#include <QtCore/qtsan_impl.h>
QT_BEGIN_NAMESPACE
@@ -106,16 +107,13 @@ namespace QtLinuxFutex {
inline int _q_futex(int *addr, int op, int val, quintptr val2 = 0,
int *addr2 = nullptr, int val3 = 0) noexcept
{
- // A futex call ensures total ordering on the futex words
- // (in either success or failure of the call). Instruct TSAN accordingly,
- // as TSAN does not understand the futex(2) syscall.
- _q_tsan_release(addr, addr2);
+ QtTsan::futexRelease(addr, addr2);
// we use __NR_futex because some libcs (like Android's bionic) don't
// provide SYS_futex etc.
int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3);
- _q_tsan_acquire(addr, addr2);
+ QtTsan::futexAcquire(addr, addr2);
return result;
}
diff --git a/qtbase/src/corelib/thread/qmutex.cpp b/qtbase/src/corelib/thread/qmutex.cpp
index 310d1cb14f..7097122d8e 100644
--- a/qtbase/src/corelib/thread/qmutex.cpp
+++ b/qtbase/src/corelib/thread/qmutex.cpp
@@ -152,6 +152,7 @@ public:
/*!
\enum QMutex::RecursionMode
+ \obsolete Use QRecursiveMutex to create a recursive mutex.
\value Recursive In this mode, a thread can lock the same mutex
multiple times and the mutex won't be unlocked
@@ -173,6 +174,7 @@ public:
/*!
Constructs a new mutex. The mutex is created in an unlocked state.
+ \obsolete Use QRecursiveMutex to create a recursive mutex.
If \a mode is QMutex::Recursive, a thread can lock the same mutex
multiple times and the mutex won't be unlocked until a
@@ -197,7 +199,7 @@ QMutex::QMutex(RecursionMode mode)
QMutex::~QMutex()
{
QMutexData *d = d_ptr.loadRelaxed();
- if (isRecursive()) {
+ if (QBasicMutex::isRecursive()) {
delete static_cast<QRecursiveMutexPrivate *>(d);
} else if (d) {
#ifndef QT_LINUX_FUTEX
diff --git a/qtbase/src/corelib/thread/qmutex.h b/qtbase/src/corelib/thread/qmutex.h
index 73c9e00663..1bae573a03 100644
--- a/qtbase/src/corelib/thread/qmutex.h
+++ b/qtbase/src/corelib/thread/qmutex.h
@@ -42,6 +42,7 @@
#include <QtCore/qglobal.h>
#include <QtCore/qatomic.h>
+#include <QtCore/qtsan_impl.h>
#include <new>
#if __has_include(<chrono>)
@@ -77,19 +78,37 @@ public:
// BasicLockable concept
inline void lock() QT_MUTEX_LOCK_NOEXCEPT {
+ QtTsan::mutexPreLock(this, 0u);
+
if (!fastTryLock())
lockInternal();
+
+ QtTsan::mutexPostLock(this, 0u, 0);
}
// BasicLockable concept
inline void unlock() noexcept {
Q_ASSERT(d_ptr.loadRelaxed()); //mutex must be locked
+
+ QtTsan::mutexPreUnlock(this, 0u);
+
if (!fastTryUnlock())
unlockInternal();
+
+ QtTsan::mutexPostUnlock(this, 0u);
}
bool tryLock() noexcept {
- return fastTryLock();
+ unsigned tsanFlags = QtTsan::TryLock;
+ QtTsan::mutexPreLock(this, tsanFlags);
+
+ const bool success = fastTryLock();
+
+ if (!success)
+ tsanFlags |= QtTsan::TryLockFailed;
+ QtTsan::mutexPostLock(this, tsanFlags, 0);
+
+ return success;
}
// Lockable concept
@@ -134,8 +153,16 @@ public:
#else
QMutex() { d_ptr.storeRelaxed(nullptr); }
#endif
+#if QT_DEPRECATED_SINCE(5,15)
enum RecursionMode { NonRecursive, Recursive };
+ QT_DEPRECATED_VERSION_X(5, 15, "Use QRecursiveMutex instead of a recursive QMutex")
explicit QMutex(RecursionMode mode);
+
+ QT_DEPRECATED_VERSION_X(5, 15, "Use QRecursiveMutex instead of a recursive QMutex")
+ bool isRecursive() const noexcept
+ { return QBasicMutex::isRecursive(); }
+#endif
+
~QMutex();
// BasicLockable concept
@@ -166,9 +193,6 @@ public:
}
#endif
- bool isRecursive() const noexcept
- { return QBasicMutex::isRecursive(); }
-
private:
Q_DISABLE_COPY(QMutex)
friend class QMutexLocker;
diff --git a/qtbase/src/corelib/thread/qtsan_impl.h b/qtbase/src/corelib/thread/qtsan_impl.h
new file mode 100644
index 0000000000..580a738b91
--- /dev/null
+++ b/qtbase/src/corelib/thread/qtsan_impl.h
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Intel Corporation.
+** Copyright (C) 2022 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTSAN_IMPL_H
+#define QTSAN_IMPL_H
+
+#include <QtCore/qglobal.h>
+
+#if (__has_feature(thread_sanitizer) || defined(__SANITIZE_THREAD__)) && __has_include(<sanitizer/tsan_interface.h>)
+# define QT_BUILDING_UNDER_TSAN
+# include <sanitizer/tsan_interface.h>
+#endif
+
+QT_BEGIN_NAMESPACE
+
+namespace QtTsan {
+#ifdef QT_BUILDING_UNDER_TSAN
+inline void futexAcquire(void *addr, void *addr2 = nullptr)
+{
+ // A futex call ensures total ordering on the futex words
+ // (in either success or failure of the call). Instruct TSAN accordingly,
+ // as TSAN does not understand the futex(2) syscall (or equivalent).
+ ::__tsan_acquire(addr);
+ if (addr2)
+ ::__tsan_acquire(addr2);
+}
+
+inline void futexRelease(void *addr, void *addr2 = nullptr)
+{
+ if (addr2)
+ ::__tsan_release(addr2);
+ ::__tsan_release(addr);
+}
+
+inline void mutexPreLock(void *addr, unsigned flags)
+{
+ ::__tsan_mutex_pre_lock(addr, flags);
+}
+
+inline void mutexPostLock(void *addr, unsigned flags, int recursion)
+{
+ ::__tsan_mutex_post_lock(addr, flags, recursion);
+}
+
+inline void mutexPreUnlock(void *addr, unsigned flags)
+{
+ ::__tsan_mutex_pre_unlock(addr, flags);
+}
+
+inline void mutexPostUnlock(void *addr, unsigned flags)
+{
+ ::__tsan_mutex_post_unlock(addr, flags);
+}
+
+enum : unsigned {
+ MutexWriteReentrant = ::__tsan_mutex_write_reentrant,
+ TryLock = ::__tsan_mutex_try_lock,
+ TryLockFailed = ::__tsan_mutex_try_lock_failed,
+};
+#else
+inline void futexAcquire(void *, void * = nullptr) {}
+inline void futexRelease(void *, void * = nullptr) {}
+
+enum : unsigned {
+ MutexWriteReentrant,
+ TryLock,
+ TryLockFailed,
+};
+inline void mutexPreLock(void *, unsigned) {}
+inline void mutexPostLock(void *, unsigned, int) {}
+inline void mutexPreUnlock(void *, unsigned) {}
+inline void mutexPostUnlock(void *, unsigned) {}
+#endif // QT_BUILDING_UNDER_TSAN
+} // namespace QtTsan
+
+QT_END_NAMESPACE
+
+#endif // QTSAN_IMPL_H
diff --git a/qtbase/src/corelib/thread/qwaitcondition_unix.cpp b/qtbase/src/corelib/thread/qwaitcondition_unix.cpp
index 88b058f410..0f1da4dc9b 100644
--- a/qtbase/src/corelib/thread/qwaitcondition_unix.cpp
+++ b/qtbase/src/corelib/thread/qwaitcondition_unix.cpp
@@ -213,7 +213,7 @@ bool QWaitCondition::wait(QMutex *mutex, QDeadlineTimer deadline)
{
if (! mutex)
return false;
- if (mutex->isRecursive()) {
+ if (static_cast<QBasicMutex *>(mutex)->isRecursive()) {
qWarning("QWaitCondition: cannot wait on recursive mutexes");
return false;
}
diff --git a/qtbase/src/corelib/tools/qbitarray.h b/qtbase/src/corelib/tools/qbitarray.h
index eaed17413d..7934b55164 100644
--- a/qtbase/src/corelib/tools/qbitarray.h
+++ b/qtbase/src/corelib/tools/qbitarray.h
@@ -84,9 +84,9 @@ public:
bool toggleBit(int i);
bool at(int i) const;
- QBitRef operator[](int i);
+ inline QBitRef operator[](int i);
bool operator[](int i) const;
- QBitRef operator[](uint i);
+ inline QBitRef operator[](uint i);
bool operator[](uint i) const;
QBitArray& operator&=(const QBitArray &);
@@ -156,9 +156,9 @@ public:
QBitRef& operator=(bool val) { a.setBit(i, val); return *this; }
};
-inline QBitRef QBitArray::operator[](int i)
+QBitRef QBitArray::operator[](int i)
{ Q_ASSERT(i >= 0); return QBitRef(*this, i); }
-inline QBitRef QBitArray::operator[](uint i)
+QBitRef QBitArray::operator[](uint i)
{ return QBitRef(*this, i); }
diff --git a/qtbase/src/dbus/qdbusintegrator.cpp b/qtbase/src/dbus/qdbusintegrator.cpp
index a4cbfecc98..9ccbbbb37d 100644
--- a/qtbase/src/dbus/qdbusintegrator.cpp
+++ b/qtbase/src/dbus/qdbusintegrator.cpp
@@ -1135,7 +1135,13 @@ void QDBusConnectionPrivate::closeConnection()
}
}
- qDeleteAll(pendingCalls);
+ for (auto it = pendingCalls.begin(); it != pendingCalls.end(); ++it) {
+ auto call = *it;
+ if (!call->ref.deref()) {
+ delete call;
+ }
+ }
+ pendingCalls.clear();
// Disconnect all signals from signal hooks and from the object tree to
// avoid QObject::destroyed being sent to dbus daemon thread which has
diff --git a/qtbase/src/gui/configure.json b/qtbase/src/gui/configure.json
index 7b80162faa..95e8955b51 100644
--- a/qtbase/src/gui/configure.json
+++ b/qtbase/src/gui/configure.json
@@ -834,7 +834,8 @@
"// embedded devices, are not intended to be used together with X. EGL support",
"// has to be disabled in plugins like xcb in this case since the native display,",
"// window and pixmap types will be different than what an X-based platform",
- "// plugin would expect."
+ "// plugin would expect.",
+ "#define USE_X11"
],
"include": [ "EGL/egl.h", "X11/Xlib.h" ],
"main": [
diff --git a/qtbase/src/gui/image/qbmphandler.cpp b/qtbase/src/gui/image/qbmphandler.cpp
index 96f1e8cb1d..0e73bbbdb0 100644
--- a/qtbase/src/gui/image/qbmphandler.cpp
+++ b/qtbase/src/gui/image/qbmphandler.cpp
@@ -150,16 +150,42 @@ static QDataStream &operator<<(QDataStream &s, const BMP_INFOHDR &bi)
return s;
}
-static int calc_shift(uint mask)
+static uint calc_shift(uint mask)
{
- int result = 0;
- while (mask && !(mask & 1)) {
+ uint result = 0;
+ while ((mask >= 0x100) || (!(mask & 1) && mask)) {
result++;
mask >>= 1;
}
return result;
}
+static uint calc_scale(uint low_mask)
+{
+ uint result = 8;
+ while (low_mask && result) {
+ result--;
+ low_mask >>= 1;
+ }
+ return result;
+}
+
+static inline uint apply_scale(uint value, uint scale)
+{
+ if (!(scale & 0x07)) // return immediately if scale == 8 or 0
+ return value;
+
+ uint filled = 8 - scale;
+ uint result = value << scale;
+
+ do {
+ result |= result >> filled;
+ filled <<= 1;
+ } while (filled < 8);
+
+ return result;
+}
+
static bool read_dib_fileheader(QDataStream &s, BMP_FILEHDR &bf)
{
// read BMP file header
@@ -222,14 +248,14 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, qint64 offset,
uint green_mask = 0;
uint blue_mask = 0;
uint alpha_mask = 0;
- int red_shift = 0;
- int green_shift = 0;
- int blue_shift = 0;
- int alpha_shift = 0;
- int red_scale = 0;
- int green_scale = 0;
- int blue_scale = 0;
- int alpha_scale = 0;
+ uint red_shift = 0;
+ uint green_shift = 0;
+ uint blue_shift = 0;
+ uint alpha_shift = 0;
+ uint red_scale = 0;
+ uint green_scale = 0;
+ uint blue_scale = 0;
+ uint alpha_scale = 0;
if (!d->isSequential())
d->seek(startpos + BMP_FILEHDR_SIZE + bi.biSize); // goto start of colormap or masks
@@ -308,19 +334,19 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, qint64 offset,
red_shift = calc_shift(red_mask);
if (((red_mask >> red_shift) + 1) == 0)
return false;
- red_scale = 256 / ((red_mask >> red_shift) + 1);
+ red_scale = calc_scale(red_mask >> red_shift);
green_shift = calc_shift(green_mask);
if (((green_mask >> green_shift) + 1) == 0)
return false;
- green_scale = 256 / ((green_mask >> green_shift) + 1);
+ green_scale = calc_scale(green_mask >> green_shift);
blue_shift = calc_shift(blue_mask);
if (((blue_mask >> blue_shift) + 1) == 0)
return false;
- blue_scale = 256 / ((blue_mask >> blue_shift) + 1);
+ blue_scale = calc_scale(blue_mask >> blue_shift);
alpha_shift = calc_shift(alpha_mask);
if (((alpha_mask >> alpha_shift) + 1) == 0)
return false;
- alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1);
+ alpha_scale = calc_scale(alpha_mask >> alpha_shift);
} else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {
blue_mask = 0x000000ff;
green_mask = 0x0000ff00;
@@ -328,17 +354,15 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, qint64 offset,
blue_shift = 0;
green_shift = 8;
red_shift = 16;
- blue_scale = green_scale = red_scale = 1;
+ blue_scale = green_scale = red_scale = 0;
} else if (comp == BMP_RGB && nbits == 16) {
blue_mask = 0x001f;
green_mask = 0x03e0;
red_mask = 0x7c00;
blue_shift = 0;
- green_shift = 2;
- red_shift = 7;
- red_scale = 1;
- green_scale = 1;
- blue_scale = 8;
+ green_shift = 5;
+ red_shift = 10;
+ blue_scale = green_scale = red_scale = 3;
}
#if 0
@@ -544,10 +568,10 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, qint64 offset,
c |= *(uchar*)(b+2)<<16;
if (nbits > 24)
c |= *(uchar*)(b+3)<<24;
- *p++ = qRgba(((c & red_mask) >> red_shift) * red_scale,
- ((c & green_mask) >> green_shift) * green_scale,
- ((c & blue_mask) >> blue_shift) * blue_scale,
- transp ? ((c & alpha_mask) >> alpha_shift) * alpha_scale : 0xff);
+ *p++ = qRgba(apply_scale((c & red_mask) >> red_shift, red_scale),
+ apply_scale((c & green_mask) >> green_shift, green_scale),
+ apply_scale((c & blue_mask) >> blue_shift, blue_scale),
+ transp ? apply_scale((c & alpha_mask) >> alpha_shift, alpha_scale) : 0xff);
b += nbits/8;
}
}
diff --git a/qtbase/src/gui/image/qpixmapcache.cpp b/qtbase/src/gui/image/qpixmapcache.cpp
index b6e5e70f55..a4317a4eac 100644
--- a/qtbase/src/gui/image/qpixmapcache.cpp
+++ b/qtbase/src/gui/image/qpixmapcache.cpp
@@ -466,6 +466,7 @@ void QPMCache::clear()
killTimer(theid);
theid = 0;
}
+ cacheKeys.clear();
}
QPixmapCache::KeyData* QPMCache::getKeyData(QPixmapCache::Key *key)
diff --git a/qtbase/src/gui/itemmodels/qstandarditemmodel.cpp b/qtbase/src/gui/itemmodels/qstandarditemmodel.cpp
index fc9424763e..a3e0853fa8 100644
--- a/qtbase/src/gui/itemmodels/qstandarditemmodel.cpp
+++ b/qtbase/src/gui/itemmodels/qstandarditemmodel.cpp
@@ -3113,13 +3113,13 @@ QStringList QStandardItemModel::mimeTypes() const
*/
QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const
{
- QMimeData *data = QAbstractItemModel::mimeData(indexes);
- if(!data)
+ std::unique_ptr<QMimeData> data(QAbstractItemModel::mimeData(indexes));
+ if (!data)
return nullptr;
const QString format = qStandardItemModelDataListMimeType();
if (!mimeTypes().contains(format))
- return data;
+ return data.release();
QByteArray encoded;
QDataStream stream(&encoded, QIODevice::WriteOnly);
@@ -3172,7 +3172,7 @@ QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const
}
data->setData(format, encoded);
- return data;
+ return data.release();
}
diff --git a/qtbase/src/gui/kernel/qhighdpiscaling.cpp b/qtbase/src/gui/kernel/qhighdpiscaling.cpp
index 85ff58c14c..a433e94c22 100644
--- a/qtbase/src/gui/kernel/qhighdpiscaling.cpp
+++ b/qtbase/src/gui/kernel/qhighdpiscaling.cpp
@@ -580,9 +580,8 @@ void QHighDpiScaling::setScreenFactor(QScreen *screen, qreal factor)
else
qNamedScreenScaleFactors()->insert(name, factor);
- // hack to force re-evaluation of screen geometry
if (screen->handle())
- screen->d_func()->setPlatformScreen(screen->handle()); // updates geometries based on scale factor
+ screen->d_func()->updateLogicalDpi();
}
QPoint QHighDpiScaling::mapPositionToNative(const QPoint &pos, const QPlatformScreen *platformScreen)
diff --git a/qtbase/src/gui/kernel/qkeysequence.cpp b/qtbase/src/gui/kernel/qkeysequence.cpp
index 56cd2d02bc..d448429f6c 100644
--- a/qtbase/src/gui/kernel/qkeysequence.cpp
+++ b/qtbase/src/gui/kernel/qkeysequence.cpp
@@ -701,6 +701,10 @@ static const struct {
{ Qt::Key_TouchpadToggle, QT_TRANSLATE_NOOP("QShortcut", "Touchpad Toggle") },
{ Qt::Key_TouchpadOn, QT_TRANSLATE_NOOP("QShortcut", "Touchpad On") },
{ Qt::Key_TouchpadOff, QT_TRANSLATE_NOOP("QShortcut", "Touchpad Off") },
+ { Qt::Key_Shift, QT_TRANSLATE_NOOP("QShortcut", "Shift") },
+ { Qt::Key_Control, QT_TRANSLATE_NOOP("QShortcut", "Control") },
+ { Qt::Key_Alt, QT_TRANSLATE_NOOP("QShortcut", "Alt") },
+ { Qt::Key_Meta, QT_TRANSLATE_NOOP("QShortcut", "Meta") },
};
static Q_CONSTEXPR int numKeyNames = sizeof keyname / sizeof *keyname;
diff --git a/qtbase/src/gui/kernel/qplatformservices.cpp b/qtbase/src/gui/kernel/qplatformservices.cpp
index fdc6a6c4aa..ac47f98c5d 100644
--- a/qtbase/src/gui/kernel/qplatformservices.cpp
+++ b/qtbase/src/gui/kernel/qplatformservices.cpp
@@ -55,6 +55,19 @@ QT_BEGIN_NAMESPACE
\brief The QPlatformServices provides the backend for desktop-related functionality.
*/
+/*!
+ \enum QPlatformServices::Capability
+
+ Capabilities are used to determine a specific platform service's availability.
+
+ \value ColorPickingFromScreen The platform natively supports color picking from screen.
+ This capability indicates that the platform supports "opaque" color picking, where the
+ platform implements a complete user experience for color picking and outputs a color.
+ This is in contrast to the application implementing the color picking user experience
+ (taking care of showing a cross hair, instructing the platform integration to obtain
+ the color at a given pixel, etc.). The related service function is pickColor().
+ */
+
QPlatformServices::QPlatformServices()
{ }
@@ -85,5 +98,16 @@ QByteArray QPlatformServices::desktopEnvironment() const
return QByteArray("UNKNOWN");
}
+QPlatformServiceColorPicker *QPlatformServices::colorPicker(QWindow *parent)
+{
+ Q_UNUSED(parent);
+ return nullptr;
+}
+
+bool QPlatformServices::hasCapability(Capability capability) const
+{
+ Q_UNUSED(capability)
+ return false;
+}
QT_END_NAMESPACE
diff --git a/qtbase/src/gui/kernel/qplatformservices.h b/qtbase/src/gui/kernel/qplatformservices.h
index 5de96cfa7d..a8b2a4ce71 100644
--- a/qtbase/src/gui/kernel/qplatformservices.h
+++ b/qtbase/src/gui/kernel/qplatformservices.h
@@ -50,16 +50,32 @@
//
#include <QtGui/qtguiglobal.h>
+#include <QtCore/qobject.h>
QT_BEGIN_NAMESPACE
class QUrl;
+class QWindow;
+
+class Q_GUI_EXPORT QPlatformServiceColorPicker : public QObject
+{
+ Q_OBJECT
+public:
+ using QObject::QObject;
+ virtual void pickColor() = 0;
+Q_SIGNALS:
+ void colorPicked(const QColor &color);
+};
class Q_GUI_EXPORT QPlatformServices
{
public:
Q_DISABLE_COPY_MOVE(QPlatformServices)
+ enum Capability {
+ ColorPicking,
+ };
+
QPlatformServices();
virtual ~QPlatformServices() { }
@@ -67,6 +83,10 @@ public:
virtual bool openDocument(const QUrl &url);
virtual QByteArray desktopEnvironment() const;
+
+ virtual bool hasCapability(Capability capability) const;
+
+ virtual QPlatformServiceColorPicker *colorPicker(QWindow *parent = nullptr);
};
QT_END_NAMESPACE
diff --git a/qtbase/src/gui/kernel/qplatformtheme.cpp b/qtbase/src/gui/kernel/qplatformtheme.cpp
index 71521c0339..2325873245 100644
--- a/qtbase/src/gui/kernel/qplatformtheme.cpp
+++ b/qtbase/src/gui/kernel/qplatformtheme.cpp
@@ -163,6 +163,8 @@ QT_BEGIN_NAMESPACE
\value ShowShortcutsInContextMenus (bool) Whether to display shortcut key sequences in context menus.
+ \value ButtonPressKeys (QList<Qt::Key>) A list of keys that can be used to press buttons via keyboard input.
+
\sa themeHint(), QStyle::pixelMetric()
*/
@@ -563,6 +565,8 @@ QVariant QPlatformTheme::defaultThemeHint(ThemeHint hint)
}
case MouseQuickSelectionThreshold:
return QVariant(10);
+ case ButtonPressKeys:
+ return QVariant::fromValue(QList<Qt::Key>({ Qt::Key_Space, Qt::Key_Select }));
}
return QVariant();
}
diff --git a/qtbase/src/gui/kernel/qplatformtheme.h b/qtbase/src/gui/kernel/qplatformtheme.h
index 3185fc4541..7e6c9d5740 100644
--- a/qtbase/src/gui/kernel/qplatformtheme.h
+++ b/qtbase/src/gui/kernel/qplatformtheme.h
@@ -120,7 +120,8 @@ public:
TouchDoubleTapDistance,
ShowShortcutsInContextMenus,
IconFallbackSearchPaths,
- MouseQuickSelectionThreshold
+ MouseQuickSelectionThreshold,
+ ButtonPressKeys
};
enum DialogType {
diff --git a/qtbase/src/gui/kernel/qscreen.cpp b/qtbase/src/gui/kernel/qscreen.cpp
index 990272b0c2..d371dd60ab 100644
--- a/qtbase/src/gui/kernel/qscreen.cpp
+++ b/qtbase/src/gui/kernel/qscreen.cpp
@@ -77,6 +77,12 @@ QScreen::QScreen(QPlatformScreen *screen)
d->setPlatformScreen(screen);
}
+void QScreenPrivate::updateLogicalDpi()
+{
+ logicalDpi = QPlatformScreen::overrideDpi(platformScreen->logicalDpi());
+ updateGeometriesWithSignals(); // updates geometries based on scale factor
+}
+
void QScreenPrivate::updateGeometriesWithSignals()
{
const QRect oldGeometry = geometry;
diff --git a/qtbase/src/gui/kernel/qscreen_p.h b/qtbase/src/gui/kernel/qscreen_p.h
index 7da542c25e..e50fc3190b 100644
--- a/qtbase/src/gui/kernel/qscreen_p.h
+++ b/qtbase/src/gui/kernel/qscreen_p.h
@@ -70,6 +70,7 @@ public:
geometry = platformScreen->deviceIndependentGeometry();
availableGeometry = QHighDpi::fromNative(platformScreen->availableGeometry(), QHighDpiScaling::factor(platformScreen), geometry.topLeft());
}
+ void updateLogicalDpi();
void updatePrimaryOrientation();
void updateGeometriesWithSignals();
diff --git a/qtbase/src/gui/kernel/qshapedpixmapdndwindow.cpp b/qtbase/src/gui/kernel/qshapedpixmapdndwindow.cpp
index bb0d8e4ee7..b98fcc61e7 100644
--- a/qtbase/src/gui/kernel/qshapedpixmapdndwindow.cpp
+++ b/qtbase/src/gui/kernel/qshapedpixmapdndwindow.cpp
@@ -56,7 +56,7 @@ QShapedPixmapWindow::QShapedPixmapWindow(QScreen *screen)
QSurfaceFormat format;
format.setAlphaBufferSize(8);
setFormat(format);
- setFlags(Qt::ToolTip | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint
+ setFlags(Qt::FramelessWindowHint | Qt::BypassWindowManagerHint
| Qt::WindowTransparentForInput | Qt::WindowDoesNotAcceptFocus);
}
diff --git a/qtbase/src/gui/kernel/qwindow.cpp b/qtbase/src/gui/kernel/qwindow.cpp
index 639817257e..c2f7dc6776 100644
--- a/qtbase/src/gui/kernel/qwindow.cpp
+++ b/qtbase/src/gui/kernel/qwindow.cpp
@@ -644,7 +644,7 @@ bool QWindow::isVisible() const
into an actual native surface. However, the window remains hidden until setVisible() is called.
Note that it is not usually necessary to call this function directly, as it will be implicitly
- called by show(), setVisible(), and other functions that require access to the platform
+ called by show(), setVisible(), winId(), and other functions that require access to the platform
resources.
Call destroy() to free the platform resources if necessary.
@@ -660,6 +660,9 @@ void QWindow::create()
/*!
Returns the window's platform id.
+ \note This function will cause the platform window to be created if it is not already.
+ Returns 0, if the platform window creation failed.
+
For platforms where this id might be useful, the value returned
will uniquely represent the window inside the corresponding screen.
@@ -672,6 +675,9 @@ WId QWindow::winId() const
if(!d->platformWindow)
const_cast<QWindow *>(this)->create();
+ if (!d->platformWindow)
+ return 0;
+
return d->platformWindow->winId();
}
diff --git a/qtbase/src/gui/opengl/qopengltexture.cpp b/qtbase/src/gui/opengl/qopengltexture.cpp
index 5490ad8025..afd3d8dbe6 100644
--- a/qtbase/src/gui/opengl/qopengltexture.cpp
+++ b/qtbase/src/gui/opengl/qopengltexture.cpp
@@ -3725,6 +3725,12 @@ void QOpenGLTexture::setData(const QImage& image, MipMapGeneration genMipMaps)
return;
}
+ QImage glImage = image.convertToFormat(QImage::Format_RGBA8888);
+ if (glImage.isNull()) {
+ qWarning("QOpenGLTexture::setData() failed to convert image");
+ return;
+ }
+
if (context->isOpenGLES() && context->format().majorVersion() < 3)
setFormat(QOpenGLTexture::RGBAFormat);
else
@@ -3735,7 +3741,6 @@ void QOpenGLTexture::setData(const QImage& image, MipMapGeneration genMipMaps)
allocateStorage(QOpenGLTexture::RGBA, QOpenGLTexture::UInt8);
// Upload pixel data and generate mipmaps
- QImage glImage = image.convertToFormat(QImage::Format_RGBA8888);
QOpenGLPixelTransferOptions uploadOptions;
uploadOptions.setAlignment(1);
setData(0, QOpenGLTexture::RGBA, QOpenGLTexture::UInt8, glImage.constBits(), &uploadOptions);
diff --git a/qtbase/src/gui/painting/qfixed_p.h b/qtbase/src/gui/painting/qfixed_p.h
index 846592881c..57d750a4b3 100644
--- a/qtbase/src/gui/painting/qfixed_p.h
+++ b/qtbase/src/gui/painting/qfixed_p.h
@@ -54,6 +54,7 @@
#include <QtGui/private/qtguiglobal_p.h>
#include "QtCore/qdebug.h"
#include "QtCore/qpoint.h"
+#include <QtCore/private/qnumeric_p.h>
#include "QtCore/qsize.h"
QT_BEGIN_NAMESPACE
@@ -182,6 +183,14 @@ Q_DECL_CONSTEXPR inline bool operator<(int i, const QFixed &f) { return i * 64 <
Q_DECL_CONSTEXPR inline bool operator>(const QFixed &f, int i) { return f.value() > i * 64; }
Q_DECL_CONSTEXPR inline bool operator>(int i, const QFixed &f) { return i * 64 > f.value(); }
+inline bool qAddOverflow(QFixed v1, QFixed v2, QFixed *r)
+{
+ int val;
+ bool result = add_overflow(v1.value(), v2.value(), &val);
+ r->setValue(val);
+ return result;
+}
+
#ifndef QT_NO_DEBUG_STREAM
inline QDebug &operator<<(QDebug &dbg, const QFixed &f)
{ return dbg << f.toReal(); }
diff --git a/qtbase/src/gui/painting/qpaintengine_raster.cpp b/qtbase/src/gui/painting/qpaintengine_raster.cpp
index 38bad9a6b0..a04160791b 100644
--- a/qtbase/src/gui/painting/qpaintengine_raster.cpp
+++ b/qtbase/src/gui/painting/qpaintengine_raster.cpp
@@ -3462,16 +3462,18 @@ void QRasterPaintEngine::drawBitmap(const QPointF &pos, const QImage &image, QSp
// Boundaries
int w = image.width();
int h = image.height();
- int ymax = qMin(qRound(pos.y() + h), d->rasterBuffer->height());
- int ymin = qMax(qRound(pos.y()), 0);
- int xmax = qMin(qRound(pos.x() + w), d->rasterBuffer->width());
- int xmin = qMax(qRound(pos.x()), 0);
+ int px = qRound(pos.x());
+ int py = qRound(pos.y());
+ int ymax = qMin(py + h, d->rasterBuffer->height());
+ int ymin = qMax(py, 0);
+ int xmax = qMin(px + w, d->rasterBuffer->width());
+ int xmin = qMax(px, 0);
- int x_offset = xmin - qRound(pos.x());
+ int x_offset = xmin - px;
QImage::Format format = image.format();
for (int y = ymin; y < ymax; ++y) {
- const uchar *src = image.scanLine(y - qRound(pos.y()));
+ const uchar *src = image.scanLine(y - py);
if (format == QImage::Format_MonoLSB) {
for (int x = 0; x < xmax - xmin; ++x) {
int src_x = x + x_offset;
@@ -3860,7 +3862,7 @@ void QClipData::initialize()
return;
if (!m_clipLines)
- m_clipLines = (ClipLine *)calloc(sizeof(ClipLine), clipSpanHeight);
+ m_clipLines = (ClipLine *)calloc(clipSpanHeight, sizeof(ClipLine));
Q_CHECK_PTR(m_clipLines);
QT_TRY {
diff --git a/qtbase/src/gui/painting/qpainterpath.cpp b/qtbase/src/gui/painting/qpainterpath.cpp
index f9544a3241..d80fafeaf1 100644
--- a/qtbase/src/gui/painting/qpainterpath.cpp
+++ b/qtbase/src/gui/painting/qpainterpath.cpp
@@ -1253,7 +1253,7 @@ void QPainterPath::addText(const QPointF &point, const QFont &f, const QString &
if (si.analysis.flags < QScriptAnalysis::TabOrObject) {
QGlyphLayout glyphs = eng->shapedGlyphs(&si);
- QFontEngine *fe = f.d->engineForScript(si.analysis.script);
+ QFontEngine *fe = eng->fontEngine(si);
Q_ASSERT(fe);
fe->addOutlineToPath(x, y, glyphs, this,
si.analysis.bidiLevel % 2
diff --git a/qtbase/src/gui/painting/qpdf.cpp b/qtbase/src/gui/painting/qpdf.cpp
index 3066744f1b..2c8d3c3b53 100644
--- a/qtbase/src/gui/painting/qpdf.cpp
+++ b/qtbase/src/gui/painting/qpdf.cpp
@@ -2760,6 +2760,8 @@ int QPdfEnginePrivate::addBrushPattern(const QTransform &m, bool *specifyColor,
return gradientBrush(brush, matrix, gStateObject);
}
+ matrix = brush.transform() * matrix;
+
if ((!brush.isOpaque() && brush.style() < Qt::LinearGradientPattern) || opacity != 1.0)
*gStateObject = addConstantAlphaObject(qRound(brush.color().alpha() * opacity),
qRound(pen.color().alpha() * opacity));
diff --git a/qtbase/src/gui/rhi/qshader_p_p.h b/qtbase/src/gui/rhi/qshader_p_p.h
index ec9d25971f..4a5a7a6d51 100644
--- a/qtbase/src/gui/rhi/qshader_p_p.h
+++ b/qtbase/src/gui/rhi/qshader_p_p.h
@@ -68,13 +68,13 @@ struct Q_GUI_EXPORT QShaderPrivate
{
}
- QShaderPrivate(const QShaderPrivate *other)
+ QShaderPrivate(const QShaderPrivate &other)
: ref(1),
- qsbVersion(other->qsbVersion),
- stage(other->stage),
- desc(other->desc),
- shaders(other->shaders),
- bindings(other->bindings)
+ qsbVersion(other.qsbVersion),
+ stage(other.stage),
+ desc(other.desc),
+ shaders(other.shaders),
+ bindings(other.bindings)
{
}
diff --git a/qtbase/src/gui/rhi/qshaderdescription_p_p.h b/qtbase/src/gui/rhi/qshaderdescription_p_p.h
index ec2b0b6b4c..3da33a8a2b 100644
--- a/qtbase/src/gui/rhi/qshaderdescription_p_p.h
+++ b/qtbase/src/gui/rhi/qshaderdescription_p_p.h
@@ -63,16 +63,16 @@ struct Q_GUI_EXPORT QShaderDescriptionPrivate
localSize[0] = localSize[1] = localSize[2] = 0;
}
- QShaderDescriptionPrivate(const QShaderDescriptionPrivate *other)
+ QShaderDescriptionPrivate(const QShaderDescriptionPrivate &other)
: ref(1),
- inVars(other->inVars),
- outVars(other->outVars),
- uniformBlocks(other->uniformBlocks),
- pushConstantBlocks(other->pushConstantBlocks),
- storageBlocks(other->storageBlocks),
- combinedImageSamplers(other->combinedImageSamplers),
- storageImages(other->storageImages),
- localSize(other->localSize)
+ inVars(other.inVars),
+ outVars(other.outVars),
+ uniformBlocks(other.uniformBlocks),
+ pushConstantBlocks(other.pushConstantBlocks),
+ storageBlocks(other.storageBlocks),
+ combinedImageSamplers(other.combinedImageSamplers),
+ storageImages(other.storageImages),
+ localSize(other.localSize)
{
}
diff --git a/qtbase/src/gui/text/qfontdatabase.cpp b/qtbase/src/gui/text/qfontdatabase.cpp
index 2011f935a9..7aa6228948 100644
--- a/qtbase/src/gui/text/qfontdatabase.cpp
+++ b/qtbase/src/gui/text/qfontdatabase.cpp
@@ -983,7 +983,7 @@ QFontEngine *loadSingleEngine(int script,
if (style->key.stretch != 0 && request.stretch != 0
&& (request.styleName.isEmpty() || request.styleName != style->styleName)) {
def.stretch = (request.stretch * 100 + style->key.stretch / 2) / style->key.stretch;
- } else {
+ } else if (request.stretch == QFont::AnyStretch) {
def.stretch = 100;
}
diff --git a/qtbase/src/gui/text/qtextengine.cpp b/qtbase/src/gui/text/qtextengine.cpp
index 6336fadf74..a6c66e5d2d 100644
--- a/qtbase/src/gui/text/qtextengine.cpp
+++ b/qtbase/src/gui/text/qtextengine.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
diff --git a/qtbase/src/gui/text/qtextlayout.cpp b/qtbase/src/gui/text/qtextlayout.cpp
index 30f07ba69b..f60597a076 100644
--- a/qtbase/src/gui/text/qtextlayout.cpp
+++ b/qtbase/src/gui/text/qtextlayout.cpp
@@ -1336,13 +1336,16 @@ void QTextLayout::drawCursor(QPainter *p, const QPointF &pos, int cursorPosition
bool rightToLeft = d->isRightToLeft();
if (itm >= 0) {
const QScriptItem &si = d->layoutData->items.at(itm);
- if (si.ascent >= 0)
- base = si.ascent;
- if (si.descent >= 0)
- descent = si.descent;
+ // objects need some special treatment as they can have special alignment or be floating
+ if (si.analysis.flags != QScriptAnalysis::Object) {
+ if (si.ascent > 0)
+ base = si.ascent;
+ if (si.descent > 0)
+ descent = si.descent;
+ }
rightToLeft = si.analysis.bidiLevel % 2;
}
- qreal y = position.y() + (sl.y + sl.base() + sl.descent - base - descent).toReal();
+ qreal y = position.y() + (sl.y + sl.base() - base).toReal();
bool toggleAntialiasing = !(p->renderHints() & QPainter::Antialiasing)
&& (p->transform().type() > QTransform::TxTranslate);
if (toggleAntialiasing)
@@ -2163,11 +2166,14 @@ found:
eng->maxWidth = qMax(eng->maxWidth, line.textWidth);
} else {
eng->minWidth = qMax(eng->minWidth, lbh.minw);
- eng->maxWidth += line.textWidth;
+ if (qAddOverflow(eng->maxWidth, line.textWidth, &eng->maxWidth))
+ eng->maxWidth = QFIXED_MAX;
}
- if (line.textWidth > 0 && item < eng->layoutData->items.size())
- eng->maxWidth += lbh.spaceData.textWidth;
+ if (line.textWidth > 0 && item < eng->layoutData->items.size()) {
+ if (qAddOverflow(eng->maxWidth, lbh.spaceData.textWidth, &eng->maxWidth))
+ eng->maxWidth = QFIXED_MAX;
+ }
line.textWidth += trailingSpace;
if (lbh.spaceData.length) {
diff --git a/qtbase/src/gui/util/qktxhandler.cpp b/qtbase/src/gui/util/qktxhandler.cpp
index 7eda4c46fb..2853e46c3d 100644
--- a/qtbase/src/gui/util/qktxhandler.cpp
+++ b/qtbase/src/gui/util/qktxhandler.cpp
@@ -73,7 +73,7 @@ struct KTXHeader {
quint32 bytesOfKeyValueData;
};
-static const quint32 headerSize = sizeof(KTXHeader);
+static constexpr quint32 qktxh_headerSize = sizeof(KTXHeader);
// Currently unused, declared for future reference
struct KTXKeyValuePairItem {
@@ -103,11 +103,36 @@ struct KTXMipmapLevel {
*/
};
-bool QKtxHandler::canRead(const QByteArray &suffix, const QByteArray &block)
+static bool qAddOverflow(quint32 v1, quint32 v2, quint32 *r) {
+ // unsigned additions are well-defined
+ *r = v1 + v2;
+ return v1 > quint32(v1 + v2);
+}
+
+// Returns the nearest multiple of 4 greater than or equal to 'value'
+static bool nearestMultipleOf4(quint32 value, quint32 *result)
+{
+ constexpr quint32 rounding = 4;
+ *result = 0;
+ if (qAddOverflow(value, rounding - 1, result))
+ return true;
+ *result &= ~(rounding - 1);
+ return false;
+}
+
+// Returns a slice with prechecked bounds
+static QByteArray safeSlice(const QByteArray& array, quint32 start, quint32 length)
{
- Q_UNUSED(suffix)
+ quint32 end = 0;
+ if (qAddOverflow(start, length, &end) || end > quint32(array.length()))
+ return {};
+ return QByteArray(array.data() + start, length);
+}
- return (qstrncmp(block.constData(), ktxIdentifier, KTX_IDENTIFIER_LENGTH) == 0);
+bool QKtxHandler::canRead(const QByteArray &suffix, const QByteArray &block)
+{
+ Q_UNUSED(suffix);
+ return block.startsWith(QByteArray::fromRawData(ktxIdentifier, KTX_IDENTIFIER_LENGTH));
}
QTextureFileData QKtxHandler::read()
@@ -115,42 +140,97 @@ QTextureFileData QKtxHandler::read()
if (!device())
return QTextureFileData();
- QByteArray buf = device()->readAll();
- const quint32 dataSize = quint32(buf.size());
- if (dataSize < headerSize || !canRead(QByteArray(), buf)) {
- qCDebug(lcQtGuiTextureIO, "Invalid KTX file %s", logName().constData());
+ const QByteArray buf = device()->readAll();
+ if (size_t(buf.size()) > std::numeric_limits<quint32>::max()) {
+ qWarning(lcQtGuiTextureIO, "Too big KTX file %s", logName().constData());
+ return QTextureFileData();
+ }
+
+ if (!canRead(QByteArray(), buf)) {
+ qWarning(lcQtGuiTextureIO, "Invalid KTX file %s", logName().constData());
+ return QTextureFileData();
+ }
+
+ if (buf.size() < qsizetype(qktxh_headerSize)) {
+ qWarning(lcQtGuiTextureIO, "Invalid KTX header size in %s", logName().constData());
return QTextureFileData();
}
- const KTXHeader *header = reinterpret_cast<const KTXHeader *>(buf.constData());
- if (!checkHeader(*header)) {
- qCDebug(lcQtGuiTextureIO, "Unsupported KTX file format in %s", logName().constData());
+ KTXHeader header;
+ memcpy(&header, buf.data(), qktxh_headerSize);
+ if (!checkHeader(header)) {
+ qWarning(lcQtGuiTextureIO, "Unsupported KTX file format in %s", logName().constData());
return QTextureFileData();
}
QTextureFileData texData;
texData.setData(buf);
- texData.setSize(QSize(decode(header->pixelWidth), decode(header->pixelHeight)));
- texData.setGLFormat(decode(header->glFormat));
- texData.setGLInternalFormat(decode(header->glInternalFormat));
- texData.setGLBaseInternalFormat(decode(header->glBaseInternalFormat));
-
- texData.setNumLevels(decode(header->numberOfMipmapLevels));
- quint32 offset = headerSize + decode(header->bytesOfKeyValueData);
- const int maxLevels = qMin(texData.numLevels(), 32); // Cap iterations in case of corrupt file.
- for (int i = 0; i < maxLevels; i++) {
- if (offset + sizeof(KTXMipmapLevel) > dataSize) // Corrupt file; avoid oob read
- break;
- const KTXMipmapLevel *level = reinterpret_cast<const KTXMipmapLevel *>(buf.constData() + offset);
- quint32 levelLen = decode(level->imageSize);
- texData.setDataOffset(offset + sizeof(KTXMipmapLevel::imageSize), i);
- texData.setDataLength(levelLen, i);
- offset += sizeof(KTXMipmapLevel::imageSize) + levelLen + (3 - ((levelLen + 3) % 4));
+ texData.setSize(QSize(decode(header.pixelWidth), decode(header.pixelHeight)));
+ texData.setGLFormat(decode(header.glFormat));
+ texData.setGLInternalFormat(decode(header.glInternalFormat));
+ texData.setGLBaseInternalFormat(decode(header.glBaseInternalFormat));
+
+ texData.setNumLevels(decode(header.numberOfMipmapLevels));
+
+ const quint32 bytesOfKeyValueData = decode(header.bytesOfKeyValueData);
+ quint32 headerKeyValueSize;
+ if (qAddOverflow(qktxh_headerSize, bytesOfKeyValueData, &headerKeyValueSize)) {
+ qWarning(lcQtGuiTextureIO, "Overflow in size of key value data in header of KTX file %s",
+ logName().constData());
+ return QTextureFileData();
+ }
+
+ if (headerKeyValueSize >= quint32(buf.size())) {
+ qWarning(lcQtGuiTextureIO, "OOB request in KTX file %s", logName().constData());
+ return QTextureFileData();
+ }
+
+ // Technically, any number of levels is allowed but if the value is bigger than
+ // what is possible in KTX V2 (and what makes sense) we return an error.
+ // maxLevels = log2(max(width, height, depth))
+ const int maxLevels = (sizeof(quint32) * 8)
+ - qCountLeadingZeroBits(std::max(
+ { header.pixelWidth, header.pixelHeight, header.pixelDepth }));
+
+ if (texData.numLevels() > maxLevels) {
+ qWarning(lcQtGuiTextureIO, "Too many levels in KTX file %s", logName().constData());
+ return QTextureFileData();
+ }
+
+ quint32 offset = headerKeyValueSize;
+ for (int level = 0; level < texData.numLevels(); level++) {
+ const auto imageSizeSlice = safeSlice(buf, offset, sizeof(quint32));
+ if (imageSizeSlice.isEmpty()) {
+ qWarning(lcQtGuiTextureIO, "OOB request in KTX file %s", logName().constData());
+ return QTextureFileData();
+ }
+
+ const quint32 imageSize = decode(qFromUnaligned<quint32>(imageSizeSlice.data()));
+ offset += sizeof(quint32); // overflow checked indirectly above
+
+ texData.setDataOffset(offset, level);
+ texData.setDataLength(imageSize, level);
+
+ // Add image data and padding to offset
+ quint32 padded = 0;
+ if (nearestMultipleOf4(imageSize, &padded)) {
+ qWarning(lcQtGuiTextureIO, "Overflow in KTX file %s", logName().constData());
+ return QTextureFileData();
+ }
+
+ quint32 offsetNext;
+ if (qAddOverflow(offset, padded, &offsetNext)) {
+ qWarning(lcQtGuiTextureIO, "OOB request in KTX file %s", logName().constData());
+ return QTextureFileData();
+ }
+
+ offset = offsetNext;
}
if (!texData.isValid()) {
- qCDebug(lcQtGuiTextureIO, "Invalid values in header of KTX file %s", logName().constData());
+ qWarning(lcQtGuiTextureIO, "Invalid values in header of KTX file %s",
+ logName().constData());
return QTextureFileData();
}
@@ -191,7 +271,7 @@ bool QKtxHandler::checkHeader(const KTXHeader &header)
(decode(header.numberOfFaces) == 1));
}
-quint32 QKtxHandler::decode(quint32 val)
+quint32 QKtxHandler::decode(quint32 val) const
{
return inverseEndian ? qbswap<quint32>(val) : val;
}
diff --git a/qtbase/src/gui/util/qktxhandler_p.h b/qtbase/src/gui/util/qktxhandler_p.h
index 19f7b0e79a..8da990aaac 100644
--- a/qtbase/src/gui/util/qktxhandler_p.h
+++ b/qtbase/src/gui/util/qktxhandler_p.h
@@ -68,7 +68,7 @@ public:
private:
bool checkHeader(const KTXHeader &header);
- quint32 decode(quint32 val);
+ quint32 decode(quint32 val) const;
bool inverseEndian = false;
};
diff --git a/qtbase/src/gui/util/qshadergenerator.cpp b/qtbase/src/gui/util/qshadergenerator.cpp
index 1ec25ccd7b..20ed6abc3a 100644
--- a/qtbase/src/gui/util/qshadergenerator.cpp
+++ b/qtbase/src/gui/util/qshadergenerator.cpp
@@ -492,7 +492,7 @@ QByteArray QShaderGenerator::createShaderCode(const QStringList &enabledLayers)
int end = begin + 1;
char endChar = line.at(end);
const int size = line.size();
- while (end < size && (std::isalnum(endChar) || endChar == '_')) {
+ while (end < size && (std::isalnum(uchar(endChar)) || endChar == '_')) {
++end;
endChar = line.at(end);
}
diff --git a/qtbase/src/gui/util/qshaderlanguage.cpp b/qtbase/src/gui/util/qshaderlanguage.cpp
index efd607ba60..9399d6efcc 100644
--- a/qtbase/src/gui/util/qshaderlanguage.cpp
+++ b/qtbase/src/gui/util/qshaderlanguage.cpp
@@ -52,3 +52,5 @@ void qt_register_ShaderLanguage_enums()
}
QT_END_NAMESPACE
+
+#include "moc_qshaderlanguage_p.cpp"
diff --git a/qtbase/src/network/access/http2/hpacktable.cpp b/qtbase/src/network/access/http2/hpacktable.cpp
index fddb5feca5..315f3e2344 100644
--- a/qtbase/src/network/access/http2/hpacktable.cpp
+++ b/qtbase/src/network/access/http2/hpacktable.cpp
@@ -40,6 +40,7 @@
#include "hpacktable_p.h"
#include <QtCore/qdebug.h>
+#include <QtCore/private/qnumeric_p.h>
#include <algorithm>
#include <cstddef>
@@ -62,8 +63,10 @@ HeaderSize entry_size(const QByteArray &name, const QByteArray &value)
// for counting the number of references to the name and value would have
// 32 octets of overhead."
- const unsigned sum = unsigned(name.size() + value.size());
- if (std::numeric_limits<unsigned>::max() - 32 < sum)
+ size_t sum;
+ if (add_overflow(size_t(name.size()), size_t(value.size()), &sum))
+ return HeaderSize();
+ if (sum > (std::numeric_limits<unsigned>::max() - 32))
return HeaderSize();
return HeaderSize(true, quint32(sum + 32));
}
diff --git a/qtbase/src/network/access/qhsts.cpp b/qtbase/src/network/access/qhsts.cpp
index 0cef0ad3dc..be7ef7ff58 100644
--- a/qtbase/src/network/access/qhsts.cpp
+++ b/qtbase/src/network/access/qhsts.cpp
@@ -364,8 +364,8 @@ quoted-pair = "\" CHAR
bool QHstsHeaderParser::parse(const QList<QPair<QByteArray, QByteArray>> &headers)
{
for (const auto &h : headers) {
- // We use '==' since header name was already 'trimmed' for us:
- if (h.first == "Strict-Transport-Security") {
+ // We compare directly because header name was already 'trimmed' for us:
+ if (h.first.compare("Strict-Transport-Security", Qt::CaseInsensitive) == 0) {
header = h.second;
// RFC6797, 8.1:
//
diff --git a/qtbase/src/network/access/qhttp2protocolhandler.cpp b/qtbase/src/network/access/qhttp2protocolhandler.cpp
index 39dd460881..ead88d781a 100644
--- a/qtbase/src/network/access/qhttp2protocolhandler.cpp
+++ b/qtbase/src/network/access/qhttp2protocolhandler.cpp
@@ -46,10 +46,12 @@
#include <private/qnoncontiguousbytedevice_p.h>
#include <QtNetwork/qabstractsocket.h>
+
#include <QtCore/qloggingcategory.h>
#include <QtCore/qendian.h>
#include <QtCore/qdebug.h>
#include <QtCore/qlist.h>
+#include <QtCore/private/qnumeric_p.h>
#include <QtCore/qurl.h>
#include <qhttp2configuration.h>
@@ -124,8 +126,10 @@ std::vector<uchar> assemble_hpack_block(const std::vector<Http2::Frame> &frames)
std::vector<uchar> hpackBlock;
quint32 total = 0;
- for (const auto &frame : frames)
- total += frame.hpackBlockSize();
+ for (const auto &frame : frames) {
+ if (add_overflow(total, frame.hpackBlockSize(), &total))
+ return hpackBlock;
+ }
if (!total)
return hpackBlock;
diff --git a/qtbase/src/network/access/qnetworkreplyfileimpl_p.h b/qtbase/src/network/access/qnetworkreplyfileimpl_p.h
index 48d82abd3f..4bfbc3f7d1 100644
--- a/qtbase/src/network/access/qnetworkreplyfileimpl_p.h
+++ b/qtbase/src/network/access/qnetworkreplyfileimpl_p.h
@@ -37,8 +37,8 @@
**
****************************************************************************/
-#ifndef QNETWORKREPLYFILEIMPL_H
-#define QNETWORKREPLYFILEIMPL_H
+#ifndef QNETWORKREPLYFILEIMPL_P_H
+#define QNETWORKREPLYFILEIMPL_P_H
//
// W A R N I N G
@@ -99,4 +99,4 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QNetworkRequest::KnownHeaders)
-#endif // QNETWORKREPLYFILEIMPL_H
+#endif // QNETWORKREPLYFILEIMPL_P_H
diff --git a/qtbase/src/network/configure.json b/qtbase/src/network/configure.json
index 271ff164ac..ffba2d1eea 100644
--- a/qtbase/src/network/configure.json
+++ b/qtbase/src/network/configure.json
@@ -53,7 +53,7 @@
},
"headers": "proxy.h",
"sources": [
- "-lproxy"
+ { "type": "pkgConfig", "args": "libproxy-1.0" }
]
},
"openssl_headers": {
diff --git a/qtbase/src/network/kernel/qdnslookup_unix.cpp b/qtbase/src/network/kernel/qdnslookup_unix.cpp
index 12b40fc35d..99e999d436 100644
--- a/qtbase/src/network/kernel/qdnslookup_unix.cpp
+++ b/qtbase/src/network/kernel/qdnslookup_unix.cpp
@@ -227,7 +227,6 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
// responseLength in case of error, we still can extract the
// exact error code from the response.
HEADER *header = (HEADER*)response;
- const int answerCount = ntohs(header->ancount);
switch (header->rcode) {
case NOERROR:
break;
@@ -260,18 +259,31 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
return;
}
- // Skip the query host, type (2 bytes) and class (2 bytes).
char host[PACKETSZ], answer[PACKETSZ];
unsigned char *p = response + sizeof(HEADER);
- int status = local_dn_expand(response, response + responseLength, p, host, sizeof(host));
- if (status < 0) {
+ int status;
+
+ if (ntohs(header->qdcount) == 1) {
+ // Skip the query host, type (2 bytes) and class (2 bytes).
+ status = local_dn_expand(response, response + responseLength, p, host, sizeof(host));
+ if (status < 0) {
+ reply->error = QDnsLookup::InvalidReplyError;
+ reply->errorString = tr("Could not expand domain name");
+ return;
+ }
+ if ((p - response) + status + 4 >= responseLength)
+ header->qdcount = 0xffff; // invalid reply below
+ else
+ p += status + 4;
+ }
+ if (ntohs(header->qdcount) > 1) {
reply->error = QDnsLookup::InvalidReplyError;
- reply->errorString = tr("Could not expand domain name");
+ reply->errorString = tr("Invalid reply received");
return;
}
- p += status + 4;
// Extract results.
+ const int answerCount = ntohs(header->ancount);
int answerIndex = 0;
while ((p < response + responseLength) && (answerIndex < answerCount)) {
status = local_dn_expand(response, response + responseLength, p, host, sizeof(host));
@@ -283,6 +295,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
const QString name = QUrl::fromAce(host);
p += status;
+
+ if ((p - response) + 10 > responseLength) {
+ // probably just a truncated reply, return what we have
+ return;
+ }
const quint16 type = (p[0] << 8) | p[1];
p += 2; // RR type
p += 2; // RR class
@@ -290,6 +307,8 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
p += 4;
const quint16 size = (p[0] << 8) | p[1];
p += 2;
+ if ((p - response) + size > responseLength)
+ return; // truncated
if (type == QDnsLookup::A) {
if (size != 4) {
diff --git a/qtbase/src/network/kernel/qhostinfo.cpp b/qtbase/src/network/kernel/qhostinfo.cpp
index 33fb629899..015963686c 100644
--- a/qtbase/src/network/kernel/qhostinfo.cpp
+++ b/qtbase/src/network/kernel/qhostinfo.cpp
@@ -181,7 +181,6 @@ bool QHostInfoResult::event(QEvent *event)
// we didn't have a context object, or it's still alive
if (!withContextObject || receiver)
slotObj->call(const_cast<QObject*>(receiver.data()), args);
- slotObj->destroyIfLastRef();
deleteLater();
return true;
@@ -801,6 +800,8 @@ int QHostInfoPrivate::lookupHostImpl(const QString &name,
if (!QAbstractEventDispatcher::instance(QThread::currentThread())) {
qWarning("QHostInfo::lookupHost() called with no event dispatcher");
+ if (slotObj)
+ slotObj->destroyIfLastRef();
return -1;
}
@@ -847,6 +848,8 @@ int QHostInfoPrivate::lookupHostImpl(const QString &name,
QObject::connect(&runnable->resultEmitter, SIGNAL(resultsReady(QHostInfo)),
receiver, member, Qt::QueuedConnection);
manager->scheduleLookup(runnable);
+ } else if (slotObj) {
+ slotObj->destroyIfLastRef();
}
return id;
}
diff --git a/qtbase/src/network/kernel/qhostinfo_p.h b/qtbase/src/network/kernel/qhostinfo_p.h
index d7875a0673..452c095b6a 100644
--- a/qtbase/src/network/kernel/qhostinfo_p.h
+++ b/qtbase/src/network/kernel/qhostinfo_p.h
@@ -90,6 +90,12 @@ public:
moveToThread(receiver->thread());
}
+ ~QHostInfoResult()
+ {
+ if (slotObj)
+ slotObj->destroyIfLastRef();
+ }
+
void postResultsReady(const QHostInfo &info);
Q_SIGNALS:
@@ -103,6 +109,8 @@ private:
: receiver(other->receiver), slotObj(other->slotObj),
withContextObject(other->withContextObject)
{
+ if (slotObj)
+ slotObj->ref();
// cleanup if the application terminates before results are delivered
connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit,
this, &QObject::deleteLater);
diff --git a/qtbase/src/network/ssl/qsslconfiguration.cpp b/qtbase/src/network/ssl/qsslconfiguration.cpp
index f5ce02807f..84a9187334 100644
--- a/qtbase/src/network/ssl/qsslconfiguration.cpp
+++ b/qtbase/src/network/ssl/qsslconfiguration.cpp
@@ -929,7 +929,11 @@ void QSslConfiguration::setPreSharedKeyIdentityHint(const QByteArray &hint)
Retrieves the current set of Diffie-Hellman parameters.
If no Diffie-Hellman parameters have been set, the QSslConfiguration object
- defaults to using the 1024-bit MODP group from RFC 2409.
+ defaults to using the 2048-bit MODP group from RFC 3526.
+
+ \note The default parameters may change in future Qt versions.
+ Please check the documentation of the \e{exact Qt version} that you
+ are using in order to know what defaults that version uses.
*/
QSslDiffieHellmanParameters QSslConfiguration::diffieHellmanParameters() const
{
@@ -943,7 +947,11 @@ QSslDiffieHellmanParameters QSslConfiguration::diffieHellmanParameters() const
a server to \a dhparams.
If no Diffie-Hellman parameters have been set, the QSslConfiguration object
- defaults to using the 1024-bit MODP group from RFC 2409.
+ defaults to using the 2048-bit MODP group from RFC 3526.
+
+ \note The default parameters may change in future Qt versions.
+ Please check the documentation of the \e{exact Qt version} that you
+ are using in order to know what defaults that version uses.
*/
void QSslConfiguration::setDiffieHellmanParameters(const QSslDiffieHellmanParameters &dhparams)
{
diff --git a/qtbase/src/network/ssl/qsslcontext_openssl.cpp b/qtbase/src/network/ssl/qsslcontext_openssl.cpp
index c30192a4eb..e4bb61ecb5 100644
--- a/qtbase/src/network/ssl/qsslcontext_openssl.cpp
+++ b/qtbase/src/network/ssl/qsslcontext_openssl.cpp
@@ -409,7 +409,7 @@ init_context:
break;
case QSsl::DtlsV1_0OrLater:
minVersion = DTLS1_VERSION;
- maxVersion = DTLS_MAX_VERSION;
+ maxVersion = 0;
break;
case QSsl::DtlsV1_2:
minVersion = DTLS1_2_VERSION;
@@ -417,7 +417,7 @@ init_context:
break;
case QSsl::DtlsV1_2OrLater:
minVersion = DTLS1_2_VERSION;
- maxVersion = DTLS_MAX_VERSION;
+ maxVersion = 0;
break;
case QSsl::TlsV1_3OrLater:
#ifdef TLS1_3_VERSION
diff --git a/qtbase/src/network/ssl/qssldiffiehellmanparameters.cpp b/qtbase/src/network/ssl/qssldiffiehellmanparameters.cpp
index 7807afaa30..7c2505a0be 100644
--- a/qtbase/src/network/ssl/qssldiffiehellmanparameters.cpp
+++ b/qtbase/src/network/ssl/qssldiffiehellmanparameters.cpp
@@ -68,17 +68,18 @@
QT_BEGIN_NAMESPACE
-// The 1024-bit MODP group from RFC 2459 (Second Oakley Group)
+// The 2048-bit MODP group from RFC 3526
Q_AUTOTEST_EXPORT const char *qssl_dhparams_default_base64 =
- "MIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJR"
- "Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL"
- "/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC";
+ "MIIBCAKCAQEA///////////JD9qiIWjCNMTGYouA3BzRKQJOCIpnzHQCC76mOxObIlFKCHmO"
+ "NATd75UZs806QxswKwpt8l8UN0/hNW1tUcJF5IW1dmJefsb0TELppjftawv/XLb0Brft7jhr"
+ "+1qJn6WunyQRfEsf5kkoZlHs5Fs9wgB8uKFjvwWY2kg2HFXTmmkWP6j9JM9fg2VdI9yjrZYc"
+ "YvNWIIVSu57VKQdwlpZtZww1Tkq8mATxdGwIyhghfDKQXkYuNs474553LBgOhgObJ4Oi7Aei"
+ "j7XFXfBvTFLJ3ivL9pVYFxg5lUl86pVq5RXSJhiY+gUQFXKOWoqsqmj//////////wIBAg==";
/*!
Returns the default QSslDiffieHellmanParameters used by QSslSocket.
- This is currently the 1024-bit MODP group from RFC 2459, also
- known as the Second Oakley Group.
+ This is currently the 2048-bit MODP group from RFC 3526.
*/
QSslDiffieHellmanParameters QSslDiffieHellmanParameters::defaultParameters()
{
diff --git a/qtbase/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp b/qtbase/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp
index aaf8741130..93ad7fa728 100644
--- a/qtbase/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp
+++ b/qtbase/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp
@@ -59,57 +59,6 @@
QT_BEGIN_NAMESPACE
-#ifdef OPENSSL_NO_DEPRECATED_3_0
-
-static int q_DH_check(DH *dh, int *status)
-{
- // DH_check was first deprecated in OpenSSL 3.0.0, as low-level
- // API; the EVP_PKEY family of functions was advised as an alternative.
- // As of now EVP_PKEY_params_check ends up calling ... DH_check,
- // which is good enough.
-
- Q_ASSERT(dh);
- Q_ASSERT(status);
-
- EVP_PKEY *key = q_EVP_PKEY_new();
- if (!key) {
- qCWarning(lcSsl, "EVP_PKEY_new failed");
- QSslSocketBackendPrivate::logAndClearErrorQueue();
- return 0;
- }
- const auto keyDeleter = qScopeGuard([key](){
- q_EVP_PKEY_free(key);
- });
- if (!q_EVP_PKEY_set1_DH(key, dh)) {
- qCWarning(lcSsl, "EVP_PKEY_set1_DH failed");
- QSslSocketBackendPrivate::logAndClearErrorQueue();
- return 0;
- }
-
- EVP_PKEY_CTX *keyCtx = q_EVP_PKEY_CTX_new(key, nullptr);
- if (!keyCtx) {
- qCWarning(lcSsl, "EVP_PKEY_CTX_new failed");
- QSslSocketBackendPrivate::logAndClearErrorQueue();
- return 0;
- }
- const auto ctxDeleter = qScopeGuard([keyCtx]{
- q_EVP_PKEY_CTX_free(keyCtx);
- });
-
- const int result = q_EVP_PKEY_param_check(keyCtx);
- QSslSocketBackendPrivate::logAndClearErrorQueue();
- // Note: unlike DH_check, we cannot obtain the 'status',
- // if the 'result' is 0 (actually the result is 1 only
- // if this 'status' was 0). We could probably check the
- // errors from the error queue, but it's not needed anyway
- // - see the 'isSafeDH' below, how it returns immediately
- // on 0.
- Q_UNUSED(status)
-
- return result;
-}
-#endif // OPENSSL_NO_DEPRECATED_3_0
-
static bool isSafeDH(DH *dh)
{
int status = 0;
@@ -206,6 +155,7 @@ void QSslDiffieHellmanParametersPrivate::decodePem(const QByteArray &pem)
if (isSafeDH(dh)) {
char *buf = nullptr;
int len = q_i2d_DHparams(dh, reinterpret_cast<unsigned char **>(&buf));
+ auto freeBuf = qScopeGuard([&] { q_OPENSSL_free(buf); });
if (len > 0)
derData = QByteArray(buf, len);
else
diff --git a/qtbase/src/network/ssl/qsslsocket.cpp b/qtbase/src/network/ssl/qsslsocket.cpp
index 5bb6e7ee4a..2a0b3a4f1d 100644
--- a/qtbase/src/network/ssl/qsslsocket.cpp
+++ b/qtbase/src/network/ssl/qsslsocket.cpp
@@ -2221,6 +2221,10 @@ QSslSocketPrivate::QSslSocketPrivate()
, flushTriggered(false)
{
QSslConfigurationPrivate::deepCopyDefaultConfiguration(&configuration);
+ // If the global configuration doesn't allow root certificates to be loaded
+ // on demand then we have to disable it for this socket as well.
+ if (!configuration.allowRootCertOnDemandLoading)
+ allowRootCertOnDemandLoading = false;
}
/*!
@@ -2470,6 +2474,7 @@ void QSslConfigurationPrivate::deepCopyDefaultConfiguration(QSslConfigurationPri
ptr->sessionProtocol = global->sessionProtocol;
ptr->ciphers = global->ciphers;
ptr->caCertificates = global->caCertificates;
+ ptr->allowRootCertOnDemandLoading = global->allowRootCertOnDemandLoading;
ptr->protocol = global->protocol;
ptr->peerVerifyMode = global->peerVerifyMode;
ptr->peerVerifyDepth = global->peerVerifyDepth;
diff --git a/qtbase/src/network/ssl/qsslsocket_mac.cpp b/qtbase/src/network/ssl/qsslsocket_mac.cpp
index 77e847e972..e38a5e75de 100644
--- a/qtbase/src/network/ssl/qsslsocket_mac.cpp
+++ b/qtbase/src/network/ssl/qsslsocket_mac.cpp
@@ -468,6 +468,7 @@ void QSslSocketBackendPrivate::disconnectFromHost()
if (context) {
if (!shutdown) {
SSLClose(context);
+ context.reset(nullptr);
shutdown = true;
}
}
diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
index 0ace951c77..6a9a3ef3b3 100644
--- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -499,9 +499,7 @@ DEFINEFUNC(DH *, DH_new, DUMMYARG, DUMMYARG, return nullptr, return)
DEFINEFUNC(void, DH_free, DH *dh, dh, return, DUMMYARG)
DEFINEFUNC3(DH *, d2i_DHparams, DH**a, a, const unsigned char **pp, pp, long length, length, return nullptr, return)
DEFINEFUNC2(int, i2d_DHparams, DH *a, a, unsigned char **p, p, return -1, return)
-#ifndef OPENSSL_NO_DEPRECATED_3_0
DEFINEFUNC2(int, DH_check, DH *dh, dh, int *codes, codes, return 0, return)
-#endif // OPENSSL_NO_DEPRECATED_3_0
DEFINEFUNC3(BIGNUM *, BN_bin2bn, const unsigned char *s, s, int len, len, BIGNUM *ret, ret, return nullptr, return)
#ifndef OPENSSL_NO_EC
@@ -1220,9 +1218,7 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(DH_free)
RESOLVEFUNC(d2i_DHparams)
RESOLVEFUNC(i2d_DHparams)
-#ifndef OPENSSL_NO_DEPRECATED_3_0
RESOLVEFUNC(DH_check)
-#endif // OPENSSL_NO_DEPRECATED_3_0
RESOLVEFUNC(BN_bin2bn)
#ifndef OPENSSL_NO_EC
diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h b/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
index 5e9faae291..bf165f67ad 100644
--- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
+++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -598,10 +598,7 @@ DH *q_DH_new();
void q_DH_free(DH *dh);
DH *q_d2i_DHparams(DH **a, const unsigned char **pp, long length);
int q_i2d_DHparams(DH *a, unsigned char **p);
-
-#ifndef OPENSSL_NO_DEPRECATED_3_0
int q_DH_check(DH *dh, int *codes);
-#endif // OPENSSL_NO_DEPRECATED_3_0
BIGNUM *q_BN_bin2bn(const unsigned char *s, int len, BIGNUM *ret);
#define q_SSL_CTX_set_tmp_dh(ctx, dh) q_SSL_CTX_ctrl((ctx), SSL_CTRL_SET_TMP_DH, 0, (char *)dh)
diff --git a/qtbase/src/network/ssl/qsslsocket_schannel.cpp b/qtbase/src/network/ssl/qsslsocket_schannel.cpp
index c956ce3c2b..d1b23af29b 100644
--- a/qtbase/src/network/ssl/qsslsocket_schannel.cpp
+++ b/qtbase/src/network/ssl/qsslsocket_schannel.cpp
@@ -1880,6 +1880,28 @@ bool QSslSocketBackendPrivate::verifyCertContext(CERT_CONTEXT *certContext)
if (configuration.peerVerifyDepth > 0 && DWORD(configuration.peerVerifyDepth) < verifyDepth)
verifyDepth = DWORD(configuration.peerVerifyDepth);
+ const auto &caCertificates = q->sslConfiguration().caCertificates();
+
+ if (!rootCertOnDemandLoadingAllowed()
+ && !(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_PARTIAL_CHAIN)
+ && (q->peerVerifyMode() == QSslSocket::VerifyPeer
+ || (isClient && q->peerVerifyMode() == QSslSocket::AutoVerifyPeer))) {
+ // When verifying a peer Windows "helpfully" builds a chain that
+ // may include roots from the system store. But we don't want that if
+ // the user has set their own CA certificates.
+ // Since Windows claims this is not a partial chain the root is included
+ // and we have to check that it is one of our configured CAs.
+ CERT_CHAIN_ELEMENT *element = chain->rgpElement[chain->cElement - 1];
+ QSslCertificate certificate = getCertificateFromChainElement(element);
+ if (!caCertificates.contains(certificate)) {
+ auto error = QSslError(QSslError::CertificateUntrusted, certificate);
+ sslErrors += error;
+ emit q->peerVerifyError(error);
+ if (q->state() != QAbstractSocket::ConnectedState)
+ return false;
+ }
+ }
+
for (DWORD i = 0; i < verifyDepth; i++) {
CERT_CHAIN_ELEMENT *element = chain->rgpElement[i];
QSslCertificate certificate = getCertificateFromChainElement(element);
diff --git a/qtbase/src/platformsupport/eglconvenience/qt_egl_p.h b/qtbase/src/platformsupport/eglconvenience/qt_egl_p.h
index bf37d07fd8..dbd42fb799 100644
--- a/qtbase/src/platformsupport/eglconvenience/qt_egl_p.h
+++ b/qtbase/src/platformsupport/eglconvenience/qt_egl_p.h
@@ -61,7 +61,11 @@
# if !defined(Q_OS_INTEGRITY)
# define WIN_INTERFACE_CUSTOM // NV
# endif // Q_OS_INTEGRITY
-#endif // QT_EGL_NO_X11
+#else // QT_EGL_NO_X11
+// If one has an eglplatform.h with https://github.com/KhronosGroup/EGL-Registry/pull/130
+// that needs USE_X11 to be defined.
+# define USE_X11
+#endif
#ifdef QT_EGL_WAYLAND
# define WAYLAND // NV
diff --git a/qtbase/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/qtbase/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
index 159b490ce0..00aa80cd58 100644
--- a/qtbase/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+++ b/qtbase/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
@@ -567,6 +567,8 @@ void QFontconfigDatabase::populateFontDatabase()
fonts = FcFontList(nullptr, pattern, os);
FcObjectSetDestroy(os);
FcPatternDestroy(pattern);
+ if (!fonts)
+ return;
}
for (int i = 0; i < fonts->nfont; i++)
diff --git a/qtbase/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/qtbase/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
index 09d2d916fe..0e6fe5eb84 100644
--- a/qtbase/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+++ b/qtbase/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
@@ -1471,36 +1471,70 @@ QT_WARNING_POP
return fontEngine;
}
-static QList<quint32> getTrueTypeFontOffsets(const uchar *fontData)
+static QList<quint32> getTrueTypeFontOffsets(const uchar *fontData, const uchar *fileEndSentinel)
{
QList<quint32> offsets;
- const quint32 headerTag = *reinterpret_cast<const quint32 *>(fontData);
+ if (fileEndSentinel - fontData < 12) {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
+ return offsets;
+ }
+
+ const quint32 headerTag = qFromUnaligned<quint32>(fontData);
if (headerTag != MAKE_TAG('t', 't', 'c', 'f')) {
if (headerTag != MAKE_TAG(0, 1, 0, 0)
&& headerTag != MAKE_TAG('O', 'T', 'T', 'O')
&& headerTag != MAKE_TAG('t', 'r', 'u', 'e')
- && headerTag != MAKE_TAG('t', 'y', 'p', '1'))
+ && headerTag != MAKE_TAG('t', 'y', 'p', '1')) {
return offsets;
+ }
offsets << 0;
return offsets;
}
+
+ const quint32 maximumNumFonts = 0xffff;
const quint32 numFonts = qFromBigEndian<quint32>(fontData + 8);
- for (uint i = 0; i < numFonts; ++i) {
- offsets << qFromBigEndian<quint32>(fontData + 12 + i * 4);
+ if (numFonts > maximumNumFonts) {
+ qCWarning(lcQpaFonts) << "Font collection of" << numFonts << "fonts is too large. Aborting.";
+ return offsets;
}
+
+ if (quintptr(fileEndSentinel - fontData) > 12 + (numFonts - 1) * 4) {
+ for (quint32 i = 0; i < numFonts; ++i)
+ offsets << qFromBigEndian<quint32>(fontData + 12 + i * 4);
+ } else {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
+ }
+
return offsets;
}
-static void getFontTable(const uchar *fileBegin, const uchar *data, quint32 tag, const uchar **table, quint32 *length)
+static void getFontTable(const uchar *fileBegin, const uchar *fileEndSentinel, const uchar *data, quint32 tag, const uchar **table, quint32 *length)
{
- const quint16 numTables = qFromBigEndian<quint16>(data + 4);
- for (uint i = 0; i < numTables; ++i) {
- const quint32 offset = 12 + 16 * i;
- if (*reinterpret_cast<const quint32 *>(data + offset) == tag) {
- *table = fileBegin + qFromBigEndian<quint32>(data + offset + 8);
- *length = qFromBigEndian<quint32>(data + offset + 12);
- return;
+ if (fileEndSentinel - data >= 6) {
+ const quint16 numTables = qFromBigEndian<quint16>(data + 4);
+ if (fileEndSentinel - data >= 28 + 16 * (numTables - 1)) {
+ for (quint32 i = 0; i < numTables; ++i) {
+ const quint32 offset = 12 + 16 * i;
+ if (qFromUnaligned<quint32>(data + offset) == tag) {
+ const quint32 tableOffset = qFromBigEndian<quint32>(data + offset + 8);
+ if (quintptr(fileEndSentinel - fileBegin) <= tableOffset) {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
+ break;
+ }
+ *table = fileBegin + tableOffset;
+ *length = qFromBigEndian<quint32>(data + offset + 12);
+ if (quintptr(fileEndSentinel - *table) < *length) {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
+ break;
+ }
+ return;
+ }
+ }
+ } else {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
}
+ } else {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
}
*table = 0;
*length = 0;
@@ -1513,8 +1547,9 @@ static void getFamiliesAndSignatures(const QByteArray &fontData,
QVector<QFontValues> *values)
{
const uchar *data = reinterpret_cast<const uchar *>(fontData.constData());
+ const uchar *dataEndSentinel = data + fontData.size();
- QList<quint32> offsets = getTrueTypeFontOffsets(data);
+ QList<quint32> offsets = getTrueTypeFontOffsets(data, dataEndSentinel);
if (offsets.isEmpty())
return;
@@ -1522,7 +1557,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData,
const uchar *font = data + offsets.at(i);
const uchar *table;
quint32 length;
- getFontTable(data, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length);
+ getFontTable(data, dataEndSentinel, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length);
if (!table)
continue;
QFontNames names = qt_getCanonicalFontNames(table, length);
@@ -1532,7 +1567,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData,
families->append(std::move(names));
if (values || signatures)
- getFontTable(data, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length);
+ getFontTable(data, dataEndSentinel, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length);
if (values) {
QFontValues fontValues;
diff --git a/qtbase/src/platformsupport/input/xkbcommon/qxkbcommon.cpp b/qtbase/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
index 7bfacf4abe..1c7c15d5d7 100644
--- a/qtbase/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
+++ b/qtbase/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
@@ -95,6 +95,7 @@ static constexpr const auto KeyTbl = qMakeArray(
Xkb2Qt<XKB_KEY_Clear, Qt::Key_Delete>,
Xkb2Qt<XKB_KEY_Pause, Qt::Key_Pause>,
Xkb2Qt<XKB_KEY_Print, Qt::Key_Print>,
+ Xkb2Qt<XKB_KEY_Sys_Req, Qt::Key_SysReq>,
Xkb2Qt<0x1005FF60, Qt::Key_SysReq>, // hardcoded Sun SysReq
Xkb2Qt<0x1007ff00, Qt::Key_SysReq>, // hardcoded X386 SysReq
@@ -273,10 +274,14 @@ static constexpr const auto KeyTbl = qMakeArray(
Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>,
Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,
+/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0
+ The define check is kind of version check here. */
+#ifdef XKB_KEY_dead_lowline
Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>,
Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>,
Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>,
Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
+#endif
// Special keys from X.org - This include multimedia keys,
// wireless/bluetooth/uwb keys, special launcher keys, etc.
@@ -754,6 +759,8 @@ xkb_keysym_t QXkbCommon::lookupLatinKeysym(xkb_state *state, xkb_keycode_t keyco
{
xkb_layout_index_t layout;
xkb_keysym_t sym = XKB_KEY_NoSymbol;
+ if (!state)
+ return sym;
xkb_keymap *keymap = xkb_state_get_keymap(state);
const xkb_layout_index_t layoutCount = xkb_keymap_num_layouts_for_key(keymap, keycode);
const xkb_layout_index_t currentLayout = xkb_state_key_get_layout(state, keycode);
diff --git a/qtbase/src/platformsupport/input/xkbcommon/qxkbcommon_p.h b/qtbase/src/platformsupport/input/xkbcommon/qxkbcommon_p.h
index 8389bd8f5a..55c46de8cd 100644
--- a/qtbase/src/platformsupport/input/xkbcommon/qxkbcommon_p.h
+++ b/qtbase/src/platformsupport/input/xkbcommon/qxkbcommon_p.h
@@ -98,7 +98,46 @@ public:
return sym <= 0xff;
}
static bool isKeypad(xkb_keysym_t sym) {
- return sym >= XKB_KEY_KP_Space && sym <= XKB_KEY_KP_9;
+ switch (sym) {
+ case XKB_KEY_KP_Space:
+ case XKB_KEY_KP_Tab:
+ case XKB_KEY_KP_Enter:
+ case XKB_KEY_KP_F1:
+ case XKB_KEY_KP_F2:
+ case XKB_KEY_KP_F3:
+ case XKB_KEY_KP_F4:
+ case XKB_KEY_KP_Home:
+ case XKB_KEY_KP_Left:
+ case XKB_KEY_KP_Up:
+ case XKB_KEY_KP_Right:
+ case XKB_KEY_KP_Down:
+ case XKB_KEY_KP_Prior:
+ case XKB_KEY_KP_Next:
+ case XKB_KEY_KP_End:
+ case XKB_KEY_KP_Begin:
+ case XKB_KEY_KP_Insert:
+ case XKB_KEY_KP_Delete:
+ case XKB_KEY_KP_Equal:
+ case XKB_KEY_KP_Multiply:
+ case XKB_KEY_KP_Add:
+ case XKB_KEY_KP_Separator:
+ case XKB_KEY_KP_Subtract:
+ case XKB_KEY_KP_Decimal:
+ case XKB_KEY_KP_Divide:
+ case XKB_KEY_KP_0:
+ case XKB_KEY_KP_1:
+ case XKB_KEY_KP_2:
+ case XKB_KEY_KP_3:
+ case XKB_KEY_KP_4:
+ case XKB_KEY_KP_5:
+ case XKB_KEY_KP_6:
+ case XKB_KEY_KP_7:
+ case XKB_KEY_KP_8:
+ case XKB_KEY_KP_9:
+ return true;
+ default:
+ return false;
+ }
}
static void setXkbContext(QPlatformInputContext *inputContext, struct xkb_context *context);
diff --git a/qtbase/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/qtbase/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
index 9153fd20bb..26537ff892 100644
--- a/qtbase/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
+++ b/qtbase/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
@@ -194,6 +194,9 @@ QString AtSpiAdaptor::introspect(const QString &path) const
" <arg direction=\"out\" type=\"(so)\"/>\n"
" <annotation value=\"QSpiObjectReference\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
+ " <method name=\"GetAccessibleId\">\n"
+ " <arg direction=\"out\" type=\"s\"/>\n"
+ " </method>\n"
" </interface>\n"
);
@@ -913,8 +916,17 @@ void AtSpiAdaptor::notify(QAccessibleEvent *event)
}
case QAccessible::NameChanged: {
if (sendObject || sendObject_property_change || sendObject_property_change_accessible_name) {
- QString path = pathForInterface(event->accessibleInterface());
- QVariantList args = packDBusSignalArguments(QLatin1String("accessible-name"), 0, 0, variantForPath(path));
+ QAccessibleInterface *iface = event->accessibleInterface();
+ if (!iface) {
+ qCDebug(lcAccessibilityAtspi,
+ "NameChanged event from invalid accessible.");
+ return;
+ }
+
+ QString path = pathForInterface(iface);
+ QVariantList args = packDBusSignalArguments(
+ QLatin1String("accessible-name"), 0, 0,
+ QVariant::fromValue(QDBusVariant(iface->text(QAccessible::Name))));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("PropertyChange"), args);
}
@@ -922,8 +934,17 @@ void AtSpiAdaptor::notify(QAccessibleEvent *event)
}
case QAccessible::DescriptionChanged: {
if (sendObject || sendObject_property_change || sendObject_property_change_accessible_description) {
- QString path = pathForInterface(event->accessibleInterface());
- QVariantList args = packDBusSignalArguments(QLatin1String("accessible-description"), 0, 0, variantForPath(path));
+ QAccessibleInterface *iface = event->accessibleInterface();
+ if (!iface) {
+ qCDebug(lcAccessibilityAtspi,
+ "DescriptionChanged event from invalid accessible.");
+ return;
+ }
+
+ QString path = pathForInterface(iface);
+ QVariantList args = packDBusSignalArguments(
+ QLatin1String("accessible-description"), 0, 0,
+ QVariant::fromValue(QDBusVariant(iface->text(QAccessible::Description))));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("PropertyChange"), args);
}
@@ -1038,7 +1059,9 @@ void AtSpiAdaptor::notify(QAccessibleEvent *event)
// Combo Box with AT-SPI likes to be special
// It requires a name-change to update caches and then selection-changed
QString path = pathForInterface(iface);
- QVariantList args1 = packDBusSignalArguments(QLatin1String("accessible-name"), 0, 0, variantForPath(path));
+ QVariantList args1 = packDBusSignalArguments(
+ QLatin1String("accessible-name"), 0, 0,
+ QVariant::fromValue(QDBusVariant(iface->text(QAccessible::Name))));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("PropertyChange"), args1);
QVariantList args2 = packDBusSignalArguments(QString(), 0, 0, QVariant::fromValue(QDBusVariant(QVariant(0))));
@@ -1358,6 +1381,26 @@ void AtSpiAdaptor::registerApplication()
delete registry;
}
+namespace {
+QString accessibleIdForAccessible(QAccessibleInterface *accessible)
+{
+ QString result;
+ while (accessible) {
+ if (!result.isEmpty())
+ result.prepend(QLatin1Char('.'));
+ if (auto obj = accessible->object()) {
+ const QString name = obj->objectName();
+ if (!name.isEmpty())
+ result.prepend(name);
+ else
+ result.prepend(QString::fromUtf8(obj->metaObject()->className()));
+ }
+ accessible = accessible->parent();
+ }
+ return result;
+}
+} // namespace
+
// Accessible
bool AtSpiAdaptor::accessibleInterface(QAccessibleInterface *interface, const QString &function, const QDBusMessage &message, const QDBusConnection &connection)
{
@@ -1441,6 +1484,9 @@ bool AtSpiAdaptor::accessibleInterface(QAccessibleInterface *interface, const QS
children << ref;
}
connection.send(message.createReply(QVariant::fromValue(children)));
+ } else if (function == QLatin1String("GetAccessibleId")) {
+ sendReply(connection, message,
+ QVariant::fromValue(QDBusVariant(accessibleIdForAccessible(interface))));
} else {
qCDebug(lcAccessibilityAtspi) << "WARNING: AtSpiAdaptor::accessibleInterface does not implement " << function << message.path();
return false;
@@ -1560,11 +1606,12 @@ bool AtSpiAdaptor::inheritsQAction(QObject *object)
// Component
static QAccessibleInterface * getWindow(QAccessibleInterface * interface)
{
- if (interface->role() == QAccessible::Window)
+ if (interface->role() == QAccessible::Dialog || interface->role() == QAccessible::Window)
return interface;
QAccessibleInterface * parent = interface->parent();
- while (parent && parent->role() != QAccessible::Window)
+ while (parent && parent->role() != QAccessible::Dialog
+ && parent->role() != QAccessible::Window)
parent = parent->parent();
return parent;
@@ -1582,7 +1629,7 @@ static QRect getRelativeRect(QAccessibleInterface *interface)
wr = window->rect();
cr.setX(cr.x() - wr.x());
- cr.setY(cr.x() - wr.y());
+ cr.setY(cr.y() - wr.y());
}
return cr;
}
@@ -1836,7 +1883,7 @@ bool AtSpiAdaptor::textInterface(QAccessibleInterface *interface, const QString
uint coordType = message.arguments().at(2).toUInt();
if (coordType == ATSPI_COORD_TYPE_WINDOW) {
QWindow *win = interface->window();
- point -= QPoint(win->x(), win->y());
+ point += QPoint(win->x(), win->y());
}
int offset = interface->textInterface()->offsetAtPoint(point);
sendReply(connection, message, offset);
diff --git a/qtbase/src/platformsupport/linuxaccessibility/bridge.cpp b/qtbase/src/platformsupport/linuxaccessibility/bridge.cpp
index fdc8cd3198..b17e1749c8 100644
--- a/qtbase/src/platformsupport/linuxaccessibility/bridge.cpp
+++ b/qtbase/src/platformsupport/linuxaccessibility/bridge.cpp
@@ -229,7 +229,11 @@ static RoleMapping map[] = {
//: Role of an accessible object
{ QAccessible::ButtonDropDown, ATSPI_ROLE_PUSH_BUTTON, QT_TRANSLATE_NOOP("QSpiAccessibleBridge", "button with drop down") },
//: Role of an accessible object
+#if ATSPI_ROLE_COUNT > 130
+ { QAccessible::ButtonMenu, ATSPI_ROLE_PUSH_BUTTON_MENU, QT_TRANSLATE_NOOP("QSpiAccessibleBridge", "button menu") },
+#else
{ QAccessible::ButtonMenu, ATSPI_ROLE_PUSH_BUTTON, QT_TRANSLATE_NOOP("QSpiAccessibleBridge", "button menu") },
+#endif
//: Role of an accessible object - a button that expands a grid.
{ QAccessible::ButtonDropGrid, ATSPI_ROLE_PUSH_BUTTON, QT_TRANSLATE_NOOP("QSpiAccessibleBridge", "button with drop down grid") },
//: Role of an accessible object - blank space between other objects.
diff --git a/qtbase/src/platformsupport/linuxaccessibility/dbusconnection.cpp b/qtbase/src/platformsupport/linuxaccessibility/dbusconnection.cpp
index 45ddc8e496..cc734abc63 100644
--- a/qtbase/src/platformsupport/linuxaccessibility/dbusconnection.cpp
+++ b/qtbase/src/platformsupport/linuxaccessibility/dbusconnection.cpp
@@ -69,6 +69,21 @@ QT_BEGIN_NAMESPACE
DBusConnection::DBusConnection(QObject *parent)
: QObject(parent), m_a11yConnection(QString()), m_enabled(false)
{
+ // If the bus is explicitly set via env var it overrides everything else.
+ QByteArray addressEnv = qgetenv("AT_SPI_BUS_ADDRESS");
+ if (!addressEnv.isEmpty()) {
+ // Only connect on next loop run, connections to our enabled signal are
+ // only established after the ctor returns.
+ QMetaObject::invokeMethod(
+ this,
+ [this, addressEnv] {
+ m_enabled = true;
+ connectA11yBus(QString::fromLocal8Bit(addressEnv));
+ },
+ Qt::QueuedConnection);
+ return;
+ }
+
// Start monitoring if "org.a11y.Bus" is registered as DBus service.
QDBusConnection c = QDBusConnection::sessionBus();
if (!c.isConnected()) {
diff --git a/qtbase/src/platformsupport/services/genericunix/qgenericunixservices.cpp b/qtbase/src/platformsupport/services/genericunix/qgenericunixservices.cpp
index f0d1722c95..47ef7d2b5c 100644
--- a/qtbase/src/platformsupport/services/genericunix/qgenericunixservices.cpp
+++ b/qtbase/src/platformsupport/services/genericunix/qgenericunixservices.cpp
@@ -51,6 +51,9 @@
#include <QtCore/QStandardPaths>
#include <QtCore/QUrl>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QWindow>
+
#if QT_CONFIG(dbus)
// These QtCore includes are needed for xdg-desktop-portal support
#include <QtCore/private/qcore_unix_p.h>
@@ -58,6 +61,8 @@
#include <QtCore/QFileInfo>
#include <QtCore/QUrlQuery>
+#include <QtGui/QColor>
+
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusMessage>
#include <QtDBus/QDBusPendingCall>
@@ -205,8 +210,7 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url)
// handle_token (s) - A string that will be used as the last element of the @handle.
// writable (b) - Whether to allow the chosen application to write to the file.
-#ifdef O_PATH
- const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_PATH);
+ const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_RDONLY);
if (fd != -1) {
QDBusMessage message = QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.portal.Desktop"),
QLatin1String("/org/freedesktop/portal/desktop"),
@@ -216,16 +220,13 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url)
QDBusUnixFileDescriptor descriptor;
descriptor.giveFileDescriptor(fd);
- const QVariantMap options = {{QLatin1String("writable"), true}};
+ const QVariantMap options = {};
// FIXME parent_window_id
message << QString() << QVariant::fromValue(descriptor) << options;
return QDBusConnection::sessionBus().call(message);
}
-#else
- Q_UNUSED(url)
-#endif
return QDBusMessage::createError(QDBusError::InternalError, qt_error_string());
}
@@ -298,8 +299,135 @@ static inline QDBusMessage xdgDesktopPortalSendEmail(const QUrl &url)
return QDBusConnection::sessionBus().call(message);
}
+
+namespace {
+struct XDGDesktopColor
+{
+ double r = 0;
+ double g = 0;
+ double b = 0;
+
+ QColor toQColor() const
+ {
+ constexpr auto rgbMax = 255;
+ return { static_cast<int>(r * rgbMax), static_cast<int>(g * rgbMax),
+ static_cast<int>(b * rgbMax) };
+ }
+};
+
+const QDBusArgument &operator>>(const QDBusArgument &argument, XDGDesktopColor &myStruct)
+{
+ argument.beginStructure();
+ argument >> myStruct.r >> myStruct.g >> myStruct.b;
+ argument.endStructure();
+ return argument;
+}
+
+class XdgDesktopPortalColorPicker : public QPlatformServiceColorPicker
+{
+ Q_OBJECT
+public:
+ XdgDesktopPortalColorPicker(const QString &parentWindowId, QWindow *parent)
+ : QPlatformServiceColorPicker(parent), m_parentWindowId(parentWindowId)
+ {
+ }
+
+ void pickColor() override
+ {
+ // DBus signature:
+ // PickColor (IN s parent_window,
+ // IN a{sv} options
+ // OUT o handle)
+ // Options:
+ // handle_token (s) - A string that will be used as the last element of the @handle.
+
+ QDBusMessage message = QDBusMessage::createMethodCall(
+ QStringLiteral("org.freedesktop.portal.Desktop"), QStringLiteral("/org/freedesktop/portal/desktop"),
+ QStringLiteral("org.freedesktop.portal.Screenshot"), QStringLiteral("PickColor"));
+ message << m_parentWindowId << QVariantMap();
+
+ QDBusPendingCall pendingCall = QDBusConnection::sessionBus().asyncCall(message);
+ auto watcher = new QDBusPendingCallWatcher(pendingCall, this);
+ connect(watcher, &QDBusPendingCallWatcher::finished, this,
+ [this](QDBusPendingCallWatcher *watcher) {
+ watcher->deleteLater();
+ QDBusPendingReply<QDBusObjectPath> reply = *watcher;
+ if (reply.isError()) {
+ qWarning("DBus call to pick color failed: %s",
+ qPrintable(reply.error().message()));
+ Q_EMIT colorPicked({});
+ } else {
+ QDBusConnection::sessionBus().connect(
+ QStringLiteral("org.freedesktop.portal.Desktop"), reply.value().path(),
+ QStringLiteral("org.freedesktop.portal.Request"), QStringLiteral("Response"), this,
+ // clang-format off
+ SLOT(gotColorResponse(uint,QVariantMap))
+ // clang-format on
+ );
+ }
+ });
+ }
+
+private Q_SLOTS:
+ void gotColorResponse(uint result, const QVariantMap &map)
+ {
+ if (result != 0)
+ return;
+ XDGDesktopColor color{};
+ map.value(QStringLiteral("color")).value<QDBusArgument>() >> color;
+ Q_EMIT colorPicked(color.toQColor());
+ deleteLater();
+ }
+
+private:
+ const QString m_parentWindowId;
+};
+} // namespace
+
#endif // QT_CONFIG(dbus)
+QGenericUnixServices::QGenericUnixServices()
+{
+#if QT_CONFIG(dbus)
+ if (qEnvironmentVariableIntValue("QT_NO_XDG_DESKTOP_PORTAL") > 0) {
+ return;
+ }
+ QDBusMessage message = QDBusMessage::createMethodCall(
+ QStringLiteral("org.freedesktop.portal.Desktop"), QStringLiteral("/org/freedesktop/portal/desktop"),
+ QStringLiteral("org.freedesktop.DBus.Properties"), QStringLiteral("Get"));
+ message << QStringLiteral("org.freedesktop.portal.Screenshot")
+ << QStringLiteral("version");
+
+ QDBusPendingCall pendingCall = QDBusConnection::sessionBus().asyncCall(message);
+ auto watcher = new QDBusPendingCallWatcher(pendingCall);
+ QObject::connect(watcher, &QDBusPendingCallWatcher::finished, watcher,
+ [this](QDBusPendingCallWatcher *watcher) {
+ watcher->deleteLater();
+ QDBusPendingReply<QVariant> reply = *watcher;
+ if (!reply.isError() && reply.value().toUInt() >= 2)
+ m_hasScreenshotPortalWithColorPicking = true;
+ });
+
+#endif
+}
+
+QPlatformServiceColorPicker *QGenericUnixServices::colorPicker(QWindow *parent)
+{
+#if QT_CONFIG(dbus)
+ // Make double sure that we are in a wayland environment. In particular check
+ // WAYLAND_DISPLAY so also XWayland apps benefit from portal-based color picking.
+ // Outside wayland we'll rather rely on other means than the XDG desktop portal.
+ if (!qEnvironmentVariableIsEmpty("WAYLAND_DISPLAY")
+ || QGuiApplication::platformName().startsWith(QLatin1String("wayland"))) {
+ return new XdgDesktopPortalColorPicker(portalWindowIdentifier(parent), parent);
+ }
+ return nullptr;
+#else
+ Q_UNUSED(parent);
+ return nullptr;
+#endif
+}
+
QByteArray QGenericUnixServices::desktopEnvironment() const
{
static const QByteArray result = detectDesktopEnvironment();
@@ -354,6 +482,8 @@ bool QGenericUnixServices::openDocument(const QUrl &url)
}
#else
+QGenericUnixServices::QGenericUnixServices() = default;
+
QByteArray QGenericUnixServices::desktopEnvironment() const
{
return QByteArrayLiteral("UNKNOWN");
@@ -373,6 +503,30 @@ bool QGenericUnixServices::openDocument(const QUrl &url)
return false;
}
+QPlatformServiceColorPicker *QGenericUnixServices::colorPicker(QWindow *parent)
+{
+ Q_UNUSED(parent);
+ return nullptr;
+}
+
#endif // QT_NO_MULTIPROCESS
+QString QGenericUnixServices::portalWindowIdentifier(QWindow *window)
+{
+ if (QGuiApplication::platformName() == QLatin1String("xcb"))
+ return QStringLiteral("x11:") + QString::number(window->winId(), 16);
+ return QString();
+}
+
+bool QGenericUnixServices::hasCapability(Capability capability) const
+{
+ switch (capability) {
+ case Capability::ColorPicking:
+ return m_hasScreenshotPortalWithColorPicking;
+ }
+ return false;
+}
+
QT_END_NAMESPACE
+
+#include "qgenericunixservices.moc"
diff --git a/qtbase/src/platformsupport/services/genericunix/qgenericunixservices_p.h b/qtbase/src/platformsupport/services/genericunix/qgenericunixservices_p.h
index 8ac3de6f03..30924e64bd 100644
--- a/qtbase/src/platformsupport/services/genericunix/qgenericunixservices_p.h
+++ b/qtbase/src/platformsupport/services/genericunix/qgenericunixservices_p.h
@@ -59,16 +59,21 @@ QT_BEGIN_NAMESPACE
class QGenericUnixServices : public QPlatformServices
{
public:
- QGenericUnixServices() {}
+ QGenericUnixServices();
QByteArray desktopEnvironment() const override;
+ bool hasCapability(Capability capability) const override;
bool openUrl(const QUrl &url) override;
bool openDocument(const QUrl &url) override;
+ QPlatformServiceColorPicker *colorPicker(QWindow *parent = nullptr) override;
+
+ virtual QString portalWindowIdentifier(QWindow *window);
private:
QString m_webBrowser;
QString m_documentLauncher;
+ bool m_hasScreenshotPortalWithColorPicking = false;
};
QT_END_NAMESPACE
diff --git a/qtbase/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection.cpp b/qtbase/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection.cpp
index 09470bccc6..cc7c7d4d8a 100644
--- a/qtbase/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection.cpp
+++ b/qtbase/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection.cpp
@@ -69,6 +69,7 @@ const QString MenuBarPath = QLatin1String("/MenuBar");
*/
QDBusMenuConnection::QDBusMenuConnection(QObject *parent, const QString &serviceName)
: QObject(parent)
+ , m_serviceName(serviceName)
, m_connection(serviceName.isNull() ? QDBusConnection::sessionBus()
: QDBusConnection::connectToBus(QDBusConnection::SessionBus, serviceName))
, m_dbusWatcher(new QDBusServiceWatcher(StatusNotifierWatcherService, m_connection, QDBusServiceWatcher::WatchForRegistration, this))
@@ -83,6 +84,12 @@ QDBusMenuConnection::QDBusMenuConnection(QObject *parent, const QString &service
#endif
}
+QDBusMenuConnection::~QDBusMenuConnection()
+{
+ if (!m_serviceName.isEmpty() && m_connection.isConnected())
+ QDBusConnection::disconnectFromBus(m_serviceName);
+}
+
void QDBusMenuConnection::dbusError(const QDBusError &error)
{
qWarning() << "QDBusTrayIcon encountered a D-Bus error:" << error;
@@ -105,13 +112,7 @@ void QDBusMenuConnection::unregisterTrayIconMenu(QDBusTrayIcon *item)
bool QDBusMenuConnection::registerTrayIcon(QDBusTrayIcon *item)
{
- bool success = connection().registerService(item->instanceId());
- if (!success) {
- qWarning() << "failed to register service" << item->instanceId();
- return false;
- }
-
- success = connection().registerObject(StatusNotifierItemPath, item);
+ bool success = connection().registerObject(StatusNotifierItemPath, item);
if (!success) {
unregisterTrayIcon(item);
qWarning() << "failed to register" << item->instanceId() << StatusNotifierItemPath;
@@ -126,21 +127,18 @@ bool QDBusMenuConnection::registerTrayIcon(QDBusTrayIcon *item)
bool QDBusMenuConnection::registerTrayIconWithWatcher(QDBusTrayIcon *item)
{
+ Q_UNUSED(item);
QDBusMessage registerMethod = QDBusMessage::createMethodCall(
StatusNotifierWatcherService, StatusNotifierWatcherPath, StatusNotifierWatcherService,
QLatin1String("RegisterStatusNotifierItem"));
- registerMethod.setArguments(QVariantList() << item->instanceId());
+ registerMethod.setArguments(QVariantList() << m_connection.baseService());
return m_connection.callWithCallback(registerMethod, this, SIGNAL(trayIconRegistered()), SLOT(dbusError(QDBusError)));
}
-bool QDBusMenuConnection::unregisterTrayIcon(QDBusTrayIcon *item)
+void QDBusMenuConnection::unregisterTrayIcon(QDBusTrayIcon *item)
{
unregisterTrayIconMenu(item);
connection().unregisterObject(StatusNotifierItemPath);
- bool success = connection().unregisterService(item->instanceId());
- if (!success)
- qWarning() << "failed to unregister service" << item->instanceId();
- return success;
}
#endif // QT_NO_SYSTEMTRAYICON
diff --git a/qtbase/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h b/qtbase/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h
index f484795fbb..97bdfabb85 100644
--- a/qtbase/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h
+++ b/qtbase/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h
@@ -70,6 +70,7 @@ class QDBusMenuConnection : public QObject
public:
QDBusMenuConnection(QObject *parent = nullptr, const QString &serviceName = QString());
+ ~QDBusMenuConnection();
QDBusConnection connection() const { return m_connection; }
QDBusServiceWatcher *dbusWatcher() const { return m_dbusWatcher; }
bool isStatusNotifierHostRegistered() const { return m_statusNotifierHostRegistered; }
@@ -78,7 +79,7 @@ public:
void unregisterTrayIconMenu(QDBusTrayIcon *item);
bool registerTrayIcon(QDBusTrayIcon *item);
bool registerTrayIconWithWatcher(QDBusTrayIcon *item);
- bool unregisterTrayIcon(QDBusTrayIcon *item);
+ void unregisterTrayIcon(QDBusTrayIcon *item);
#endif // QT_NO_SYSTEMTRAYICON
Q_SIGNALS:
@@ -90,6 +91,7 @@ private Q_SLOTS:
void dbusError(const QDBusError &error);
private:
+ QString m_serviceName;
QDBusConnection m_connection;
QDBusServiceWatcher *m_dbusWatcher;
bool m_statusNotifierHostRegistered;
diff --git a/qtbase/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/qtbase/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
index cb1b39db64..6e01af052c 100644
--- a/qtbase/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+++ b/qtbase/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
@@ -755,6 +755,9 @@ QVariant QGnomeTheme::themeHint(QPlatformTheme::ThemeHint hint) const
return QVariant(QChar(0x2022));
case QPlatformTheme::UiEffects:
return QVariant(int(HoverEffect));
+ case QPlatformTheme::ButtonPressKeys:
+ return QVariant::fromValue(
+ QList<Qt::Key>({ Qt::Key_Space, Qt::Key_Return, Qt::Key_Enter, Qt::Key_Select }));
default:
break;
}
diff --git a/qtbase/src/platformsupport/windowsuiautomation/qwindowsuiawrapper.cpp b/qtbase/src/platformsupport/windowsuiautomation/qwindowsuiawrapper.cpp
index 8038e1a3c3..79541fe636 100644
--- a/qtbase/src/platformsupport/windowsuiautomation/qwindowsuiawrapper.cpp
+++ b/qtbase/src/platformsupport/windowsuiautomation/qwindowsuiawrapper.cpp
@@ -53,7 +53,6 @@ QWindowsUiaWrapper::QWindowsUiaWrapper()
m_pUiaHostProviderFromHwnd = reinterpret_cast<PtrUiaHostProviderFromHwnd>(uiaLib.resolve("UiaHostProviderFromHwnd"));
m_pUiaRaiseAutomationPropertyChangedEvent = reinterpret_cast<PtrUiaRaiseAutomationPropertyChangedEvent>(uiaLib.resolve("UiaRaiseAutomationPropertyChangedEvent"));
m_pUiaRaiseAutomationEvent = reinterpret_cast<PtrUiaRaiseAutomationEvent>(uiaLib.resolve("UiaRaiseAutomationEvent"));
- m_pUiaRaiseNotificationEvent = reinterpret_cast<PtrUiaRaiseNotificationEvent>(uiaLib.resolve("UiaRaiseNotificationEvent"));
m_pUiaClientsAreListening = reinterpret_cast<PtrUiaClientsAreListening>(uiaLib.resolve("UiaClientsAreListening"));
}
}
@@ -69,7 +68,7 @@ QWindowsUiaWrapper *QWindowsUiaWrapper::instance()
return &wrapper;
}
-// True if most symbols resolved (UiaRaiseNotificationEvent is optional).
+// True if all symbols resolved.
BOOL QWindowsUiaWrapper::ready()
{
return m_pUiaReturnRawElementProvider
@@ -114,12 +113,5 @@ HRESULT QWindowsUiaWrapper::raiseAutomationEvent(IRawElementProviderSimple *pPro
return m_pUiaRaiseAutomationEvent(pProvider, id);
}
-HRESULT QWindowsUiaWrapper::raiseNotificationEvent(IRawElementProviderSimple *provider, NotificationKind notificationKind, NotificationProcessing notificationProcessing, BSTR displayString, BSTR activityId)
-{
- if (!m_pUiaRaiseNotificationEvent)
- return UIA_E_NOTSUPPORTED;
- return m_pUiaRaiseNotificationEvent(provider, notificationKind, notificationProcessing, displayString, activityId);
-}
-
QT_END_NAMESPACE
diff --git a/qtbase/src/platformsupport/windowsuiautomation/qwindowsuiawrapper_p.h b/qtbase/src/platformsupport/windowsuiautomation/qwindowsuiawrapper_p.h
index 9208acbc31..3ebc3008d3 100644
--- a/qtbase/src/platformsupport/windowsuiautomation/qwindowsuiawrapper_p.h
+++ b/qtbase/src/platformsupport/windowsuiautomation/qwindowsuiawrapper_p.h
@@ -80,20 +80,17 @@ public:
HRESULT hostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **ppProvider);
HRESULT raiseAutomationPropertyChangedEvent(IRawElementProviderSimple *pProvider, PROPERTYID id, VARIANT oldValue, VARIANT newValue);
HRESULT raiseAutomationEvent(IRawElementProviderSimple *pProvider, EVENTID id);
- HRESULT raiseNotificationEvent(IRawElementProviderSimple *provider, NotificationKind notificationKind, NotificationProcessing notificationProcessing, BSTR displayString, BSTR activityId);
private:
typedef LRESULT (WINAPI *PtrUiaReturnRawElementProvider)(HWND, WPARAM, LPARAM, IRawElementProviderSimple *);
typedef HRESULT (WINAPI *PtrUiaHostProviderFromHwnd)(HWND, IRawElementProviderSimple **);
typedef HRESULT (WINAPI *PtrUiaRaiseAutomationPropertyChangedEvent)(IRawElementProviderSimple *, PROPERTYID, VARIANT, VARIANT);
typedef HRESULT (WINAPI *PtrUiaRaiseAutomationEvent)(IRawElementProviderSimple *, EVENTID);
- typedef HRESULT (WINAPI *PtrUiaRaiseNotificationEvent)(IRawElementProviderSimple *, NotificationKind, NotificationProcessing, BSTR, BSTR);
typedef BOOL (WINAPI *PtrUiaClientsAreListening)();
PtrUiaReturnRawElementProvider m_pUiaReturnRawElementProvider = nullptr;
PtrUiaHostProviderFromHwnd m_pUiaHostProviderFromHwnd = nullptr;
PtrUiaRaiseAutomationPropertyChangedEvent m_pUiaRaiseAutomationPropertyChangedEvent = nullptr;
PtrUiaRaiseAutomationEvent m_pUiaRaiseAutomationEvent = nullptr;
- PtrUiaRaiseNotificationEvent m_pUiaRaiseNotificationEvent = nullptr;
PtrUiaClientsAreListening m_pUiaClientsAreListening = nullptr;
};
diff --git a/qtbase/src/platformsupport/windowsuiautomation/uiatypes_p.h b/qtbase/src/platformsupport/windowsuiautomation/uiatypes_p.h
index 0d2e1161e4..afbc957094 100644
--- a/qtbase/src/platformsupport/windowsuiautomation/uiatypes_p.h
+++ b/qtbase/src/platformsupport/windowsuiautomation/uiatypes_p.h
@@ -162,22 +162,6 @@ enum ExpandCollapseState {
ExpandCollapseState_LeafNode = 3
};
-enum NotificationKind {
- NotificationKind_ItemAdded = 0,
- NotificationKind_ItemRemoved = 1,
- NotificationKind_ActionCompleted = 2,
- NotificationKind_ActionAborted = 3,
- NotificationKind_Other = 4
-};
-
-enum NotificationProcessing {
- NotificationProcessing_ImportantAll = 0,
- NotificationProcessing_ImportantMostRecent = 1,
- NotificationProcessing_All = 2,
- NotificationProcessing_MostRecent = 3,
- NotificationProcessing_CurrentThenMostRecent = 4
-};
-
struct UiaRect {
double left;
double top;
diff --git a/qtbase/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmseventreader.cpp b/qtbase/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmseventreader.cpp
index 645a0ae2e9..3e0e406f1a 100644
--- a/qtbase/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmseventreader.cpp
+++ b/qtbase/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmseventreader.cpp
@@ -179,7 +179,7 @@ void QEglFSKmsEventReader::create(QEglFSKmsDevice *device)
m_device = device;
- qCDebug(qLcEglfsKmsDebug, "Initalizing event reader for device %p fd %d",
+ qCDebug(qLcEglfsKmsDebug, "Initializing event reader for device %p fd %d",
m_device, m_device->fd());
m_thread = new QEglFSKmsEventReaderThread(m_device->fd());
diff --git a/qtbase/src/plugins/platforms/offscreen/qoffscreenintegration.cpp b/qtbase/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
index 141fb68a23..d4294d425a 100644
--- a/qtbase/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
+++ b/qtbase/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
@@ -122,11 +122,13 @@ QOffscreenIntegration::QOffscreenIntegration()
#endif
m_services.reset(new QPlatformServices);
- QWindowSystemInterface::handleScreenAdded(new QOffscreenScreen);
+ m_screen = new QOffscreenScreen;
+ QWindowSystemInterface::handleScreenAdded(m_screen);
}
QOffscreenIntegration::~QOffscreenIntegration()
{
+ QWindowSystemInterface::handleScreenRemoved(m_screen);
}
void QOffscreenIntegration::initialize()
diff --git a/qtbase/src/plugins/platforms/offscreen/qoffscreenintegration.h b/qtbase/src/plugins/platforms/offscreen/qoffscreenintegration.h
index 0ea90f6c2f..fe00fde07c 100644
--- a/qtbase/src/plugins/platforms/offscreen/qoffscreenintegration.h
+++ b/qtbase/src/plugins/platforms/offscreen/qoffscreenintegration.h
@@ -84,6 +84,7 @@ protected:
#endif
QScopedPointer<QPlatformInputContext> m_inputContext;
QScopedPointer<QPlatformServices> m_services;
+ QPlatformScreen *m_screen;
mutable QScopedPointer<QPlatformNativeInterface> m_nativeInterface;
};
diff --git a/qtbase/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp b/qtbase/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp
index a01104a8e3..6a4a7feb8a 100644
--- a/qtbase/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp
+++ b/qtbase/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp
@@ -172,27 +172,11 @@ void QWindowsUiaMainProvider::notifyValueChange(QAccessibleValueChangeEvent *eve
}
if (event->value().type() == QVariant::String) {
if (QWindowsUiaMainProvider *provider = providerForAccessible(accessible)) {
-
- // Tries to notify the change using UiaRaiseNotificationEvent(), which is only available on
- // Windows 10 version 1709 or newer. Otherwise uses UiaRaiseAutomationPropertyChangedEvent().
-
- BSTR displayString = bStrFromQString(event->value().toString());
- BSTR activityId = bStrFromQString(QString());
-
- HRESULT hr = QWindowsUiaWrapper::instance()->raiseNotificationEvent(provider, NotificationKind_Other,
- NotificationProcessing_ImportantMostRecent,
- displayString, activityId);
-
- ::SysFreeString(displayString);
- ::SysFreeString(activityId);
-
- if (hr == static_cast<HRESULT>(UIA_E_NOTSUPPORTED)) {
- VARIANT oldVal, newVal;
- clearVariant(&oldVal);
- setVariantString(event->value().toString(), &newVal);
- QWindowsUiaWrapper::instance()->raiseAutomationPropertyChangedEvent(provider, UIA_ValueValuePropertyId, oldVal, newVal);
- ::SysFreeString(newVal.bstrVal);
- }
+ // Notifies changes in string values.
+ VARIANT oldVal, newVal;
+ clearVariant(&oldVal);
+ setVariantString(event->value().toString(), &newVal);
+ QWindowsUiaWrapper::instance()->raiseAutomationPropertyChangedEvent(provider, UIA_ValueValuePropertyId, oldVal, newVal);
}
} else if (QAccessibleValueInterface *valueInterface = accessible->valueInterface()) {
if (QWindowsUiaMainProvider *provider = providerForAccessible(accessible)) {
diff --git a/qtbase/src/plugins/platforms/xcb/qxcbconnection.cpp b/qtbase/src/plugins/platforms/xcb/qxcbconnection.cpp
index 013ca7369f..631ade2ec7 100644
--- a/qtbase/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/qtbase/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -706,6 +706,8 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event)
QXcbVirtualDesktop *virtualDesktop = virtualDesktopForRootWindow(propertyNotify->window);
if (virtualDesktop)
virtualDesktop->updateWorkArea();
+ } else if (propertyNotify->atom == atom(QXcbAtom::_NET_SUPPORTED)) {
+ m_wmSupport->updateNetWMAtoms();
} else {
HANDLE_PLATFORM_WINDOW_EVENT(xcb_property_notify_event_t, window, handlePropertyNotifyEvent);
}
diff --git a/qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
index 1ced02f31d..5c8298a49d 100644
--- a/qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+++ b/qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
@@ -1255,16 +1255,14 @@ void QXcbConnection::xi2ReportTabletEvent(const void *event, TabletData *tabletD
if (Q_LIKELY(useValuators)) {
const qreal value = scaleOneValuator(normalizedValue, physicalScreenArea.x(), physicalScreenArea.width());
global.setX(value);
- // mapFromGlobal is ok for nested/embedded windows, but works only with whole-number QPoint;
- // so map it first, then add back the sub-pixel position
- local.setX(window->mapFromGlobal(QPoint(int(value), 0)).x() + (value - int(value)));
+ local.setX(xcbWindow->mapFromGlobal(QPoint(int(value), 0)).x() + (value - int(value)));
}
break;
case QXcbAtom::AbsY:
if (Q_LIKELY(useValuators)) {
qreal value = scaleOneValuator(normalizedValue, physicalScreenArea.y(), physicalScreenArea.height());
global.setY(value);
- local.setY(window->mapFromGlobal(QPoint(0, int(value))).y() + (value - int(value)));
+ local.setY(xcbWindow->mapFromGlobal(QPoint(0, int(value))).y() + (value - int(value)));
}
break;
case QXcbAtom::AbsPressure:
diff --git a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
index 4210bf428e..0670b6ebce 100644
--- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -300,7 +300,7 @@ QXcbCursorCacheKey::QXcbCursorCacheKey(const QCursor &c)
#endif // !QT_NO_CURSOR
QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
- : QXcbObject(conn), m_screen(screen), m_gtkCursorThemeInitialized(false)
+ : QXcbObject(conn), m_screen(screen), m_gtkCursorThemeInitialized(false), m_callbackForPropertyRegistered(false)
{
#if QT_CONFIG(cursor)
// see NUM_BITMAPS in libXcursor/src/xcursorint.h
@@ -343,7 +343,7 @@ QXcbCursor::~QXcbCursor()
{
xcb_connection_t *conn = xcb_connection();
- if (m_gtkCursorThemeInitialized) {
+ if (m_callbackForPropertyRegistered) {
m_screen->xSettings()->removeCallbackForHandle(this);
}
@@ -562,8 +562,10 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
xcb_cursor_t cursor = XCB_NONE;
#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
- if (m_screen->xSettings()->initialized())
+ if (m_screen->xSettings()->initialized()) {
m_screen->xSettings()->registerCallbackForProperty("Gtk/CursorThemeName",cursorThemePropertyChanged,this);
+ m_callbackForPropertyRegistered = true;
+ }
// Try Xcursor first
if (cshape >= 0 && cshape <= Qt::LastCursor) {
diff --git a/qtbase/src/plugins/platforms/xcb/qxcbcursor.h b/qtbase/src/plugins/platforms/xcb/qxcbcursor.h
index 0b238823f0..82fb47e55d 100644
--- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.h
+++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.h
@@ -122,6 +122,7 @@ private:
void *handle);
#endif
bool m_gtkCursorThemeInitialized;
+ bool m_callbackForPropertyRegistered;
};
QT_END_NAMESPACE
diff --git a/qtbase/src/plugins/platforms/xcb/qxcbintegration.cpp b/qtbase/src/plugins/platforms/xcb/qxcbintegration.cpp
index 76869ced60..02d2eebb56 100644
--- a/qtbase/src/plugins/platforms/xcb/qxcbintegration.cpp
+++ b/qtbase/src/plugins/platforms/xcb/qxcbintegration.cpp
@@ -274,8 +274,7 @@ QPlatformWindow *QXcbIntegration::createForeignWindow(QWindow *window, WId nativ
#ifndef QT_NO_OPENGL
QPlatformOpenGLContext *QXcbIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const
{
- QXcbScreen *screen = static_cast<QXcbScreen *>(context->screen()->handle());
- QXcbGlIntegration *glIntegration = screen->connection()->glIntegration();
+ QXcbGlIntegration *glIntegration = defaultConnection()->glIntegration();
if (!glIntegration) {
qWarning("QXcbIntegration: Cannot create platform OpenGL context, neither GLX nor EGL are enabled");
return nullptr;
diff --git a/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp b/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
index 45bac8ee85..e2e345e2a8 100644
--- a/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -539,6 +539,8 @@ void QXcbWindow::destroy()
doFocusOut();
if (connection()->mouseGrabber() == this)
connection()->setMouseGrabber(nullptr);
+ if (connection()->mousePressWindow() == this)
+ connection()->setMousePressWindow(nullptr);
if (m_syncCounter && connection()->hasXSync())
xcb_sync_destroy_counter(xcb_connection(), m_syncCounter);
@@ -1345,9 +1347,10 @@ void QXcbWindow::setWindowIcon(const QIcon &icon)
if (!icon_data.isEmpty()) {
// Ignore icon exceeding maximum xcb request length
- if (size_t(icon_data.size()) > xcb_get_maximum_request_length(xcb_connection())) {
- qWarning("Ignoring window icon: Size %d exceeds maximum xcb request length %u.",
- icon_data.size(), xcb_get_maximum_request_length(xcb_connection()));
+ if (quint64(icon_data.size()) > quint64(xcb_get_maximum_request_length(xcb_connection()))) {
+ qWarning() << "Ignoring window icon" << icon_data.size()
+ << "exceeds maximum xcb request length"
+ << xcb_get_maximum_request_length(xcb_connection());
return;
}
xcb_change_property(xcb_connection(),
diff --git a/qtbase/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp b/qtbase/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
index 2c72538387..8987e3efd0 100644
--- a/qtbase/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
+++ b/qtbase/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
@@ -102,15 +102,12 @@ const QDBusArgument &operator >>(const QDBusArgument &arg, QXdgDesktopPortalFile
class QXdgDesktopPortalFileDialogPrivate
{
public:
- QXdgDesktopPortalFileDialogPrivate(QPlatformFileDialogHelper *nativeFileDialog)
+ QXdgDesktopPortalFileDialogPrivate(QPlatformFileDialogHelper *nativeFileDialog, uint fileChooserPortalVersion)
: nativeFileDialog(nativeFileDialog)
+ , fileChooserPortalVersion(fileChooserPortalVersion)
{ }
- WId winId = 0;
- bool directoryMode = false;
- bool modal = false;
- bool multipleFiles = false;
- bool saveFile = false;
+ QEventLoop loop;
QString acceptLabel;
QString directory;
QString title;
@@ -122,11 +119,16 @@ public:
QString selectedNameFilter;
QStringList selectedFiles;
std::unique_ptr<QPlatformFileDialogHelper> nativeFileDialog;
+ uint fileChooserPortalVersion = 0;
+ bool failedToOpen = false;
+ bool directoryMode = false;
+ bool multipleFiles = false;
+ bool saveFile = false;
};
-QXdgDesktopPortalFileDialog::QXdgDesktopPortalFileDialog(QPlatformFileDialogHelper *nativeFileDialog)
+QXdgDesktopPortalFileDialog::QXdgDesktopPortalFileDialog(QPlatformFileDialogHelper *nativeFileDialog, uint fileChooserPortalVersion)
: QPlatformFileDialogHelper()
- , d_ptr(new QXdgDesktopPortalFileDialogPrivate(nativeFileDialog))
+ , d_ptr(new QXdgDesktopPortalFileDialogPrivate(nativeFileDialog, fileChooserPortalVersion))
{
Q_D(QXdgDesktopPortalFileDialog);
@@ -134,6 +136,9 @@ QXdgDesktopPortalFileDialog::QXdgDesktopPortalFileDialog(QPlatformFileDialogHelp
connect(d->nativeFileDialog.get(), SIGNAL(accept()), this, SIGNAL(accept()));
connect(d->nativeFileDialog.get(), SIGNAL(reject()), this, SIGNAL(reject()));
}
+
+ d->loop.connect(this, SIGNAL(accept()), SLOT(quit()));
+ d->loop.connect(this, SIGNAL(reject()), SLOT(quit()));
}
QXdgDesktopPortalFileDialog::~QXdgDesktopPortalFileDialog()
@@ -177,7 +182,7 @@ void QXdgDesktopPortalFileDialog::initializeDialog()
setDirectory(options()->initialDirectory());
}
-void QXdgDesktopPortalFileDialog::openPortal()
+void QXdgDesktopPortalFileDialog::openPortal(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent)
{
Q_D(QXdgDesktopPortalFileDialog);
@@ -185,13 +190,13 @@ void QXdgDesktopPortalFileDialog::openPortal()
QLatin1String("/org/freedesktop/portal/desktop"),
QLatin1String("org.freedesktop.portal.FileChooser"),
d->saveFile ? QLatin1String("SaveFile") : QLatin1String("OpenFile"));
- QString parentWindowId = QLatin1String("x11:") + QString::number(d->winId, 16);
+ QString parentWindowId = QLatin1String("x11:") + QString::number(parent ? parent->winId() : 0, 16);
QVariantMap options;
if (!d->acceptLabel.isEmpty())
options.insert(QLatin1String("accept_label"), d->acceptLabel);
- options.insert(QLatin1String("modal"), d->modal);
+ options.insert(QLatin1String("modal"), windowModality != Qt::NonModal);
options.insert(QLatin1String("multiple"), d->multipleFiles);
options.insert(QLatin1String("directory"), d->directoryMode);
@@ -233,6 +238,9 @@ void QXdgDesktopPortalFileDialog::openPortal()
filter.name = mimeType.comment();
filter.filterConditions = filterConditions;
+ if (filter.name.isEmpty())
+ filter.name = mimeTypefilter;
+
filterList << filter;
if (!d->selectedMimeTypeFilter.isEmpty() && d->selectedMimeTypeFilter == mimeTypefilter)
@@ -290,10 +298,18 @@ void QXdgDesktopPortalFileDialog::openPortal()
QDBusPendingCall pendingCall = QDBusConnection::sessionBus().asyncCall(message);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingCall);
- connect(watcher, &QDBusPendingCallWatcher::finished, this, [this] (QDBusPendingCallWatcher *watcher) {
+ connect(watcher, &QDBusPendingCallWatcher::finished, this, [=] (QDBusPendingCallWatcher *watcher) {
QDBusPendingReply<QDBusObjectPath> reply = *watcher;
- if (reply.isError()) {
- Q_EMIT reject();
+ // Any error means the dialog is not shown and we need to fallback
+ d->failedToOpen = reply.isError();
+ if (d->failedToOpen) {
+ if (d->nativeFileDialog) {
+ d->nativeFileDialog->show(windowFlags, windowModality, parent);
+ if (d->loop.isRunning())
+ d->nativeFileDialog->exec();
+ } else {
+ Q_EMIT reject();
+ }
} else {
QDBusConnection::sessionBus().connect(nullptr,
reply.value().path(),
@@ -327,7 +343,7 @@ QUrl QXdgDesktopPortalFileDialog::directory() const
{
Q_D(const QXdgDesktopPortalFileDialog);
- if (d->nativeFileDialog && (options()->fileMode() == QFileDialogOptions::Directory || options()->fileMode() == QFileDialogOptions::DirectoryOnly))
+ if (d->nativeFileDialog && useNativeFileDialog())
return d->nativeFileDialog->directory();
return d->directory;
@@ -349,7 +365,7 @@ QList<QUrl> QXdgDesktopPortalFileDialog::selectedFiles() const
{
Q_D(const QXdgDesktopPortalFileDialog);
- if (d->nativeFileDialog && (options()->fileMode() == QFileDialogOptions::Directory || options()->fileMode() == QFileDialogOptions::DirectoryOnly))
+ if (d->nativeFileDialog && useNativeFileDialog())
return d->nativeFileDialog->selectedFiles();
QList<QUrl> files;
@@ -404,16 +420,13 @@ void QXdgDesktopPortalFileDialog::exec()
{
Q_D(QXdgDesktopPortalFileDialog);
- if (d->nativeFileDialog && (options()->fileMode() == QFileDialogOptions::Directory || options()->fileMode() == QFileDialogOptions::DirectoryOnly)) {
+ if (d->nativeFileDialog && useNativeFileDialog()) {
d->nativeFileDialog->exec();
return;
}
// HACK we have to avoid returning until we emit that the dialog was accepted or rejected
- QEventLoop loop;
- loop.connect(this, SIGNAL(accept()), SLOT(quit()));
- loop.connect(this, SIGNAL(reject()), SLOT(quit()));
- loop.exec();
+ d->loop.exec();
}
void QXdgDesktopPortalFileDialog::hide()
@@ -430,13 +443,10 @@ bool QXdgDesktopPortalFileDialog::show(Qt::WindowFlags windowFlags, Qt::WindowMo
initializeDialog();
- d->modal = windowModality != Qt::NonModal;
- d->winId = parent ? parent->winId() : 0;
-
- if (d->nativeFileDialog && (options()->fileMode() == QFileDialogOptions::Directory || options()->fileMode() == QFileDialogOptions::DirectoryOnly))
+ if (d->nativeFileDialog && useNativeFileDialog(OpenFallback))
return d->nativeFileDialog->show(windowFlags, windowModality, parent);
- openPortal();
+ openPortal(windowFlags, windowModality, parent);
return true;
}
@@ -466,6 +476,23 @@ void QXdgDesktopPortalFileDialog::gotResponse(uint response, const QVariantMap &
}
}
+bool QXdgDesktopPortalFileDialog::useNativeFileDialog(QXdgDesktopPortalFileDialog::FallbackType fallbackType) const
+{
+ Q_D(const QXdgDesktopPortalFileDialog);
+
+ if (d->failedToOpen && fallbackType != OpenFallback)
+ return true;
+
+ if (d->fileChooserPortalVersion < 3) {
+ if (options()->fileMode() == QFileDialogOptions::Directory)
+ return true;
+ else if (options()->fileMode() == QFileDialogOptions::DirectoryOnly)
+ return true;
+ }
+
+ return false;
+}
+
QT_END_NAMESPACE
#include "moc_qxdgdesktopportalfiledialog_p.cpp"
diff --git a/qtbase/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog_p.h b/qtbase/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog_p.h
index 4f4de96ecf..65e22a5cf2 100644
--- a/qtbase/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog_p.h
+++ b/qtbase/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog_p.h
@@ -51,6 +51,11 @@ class QXdgDesktopPortalFileDialog : public QPlatformFileDialogHelper
Q_OBJECT
Q_DECLARE_PRIVATE(QXdgDesktopPortalFileDialog)
public:
+ enum FallbackType {
+ GenericFallback,
+ OpenFallback
+ };
+
enum ConditionType : uint {
GlobalPattern = 0,
MimeType = 1
@@ -69,7 +74,7 @@ public:
};
typedef QVector<Filter> FilterList;
- QXdgDesktopPortalFileDialog(QPlatformFileDialogHelper *nativeFileDialog = nullptr);
+ QXdgDesktopPortalFileDialog(QPlatformFileDialogHelper *nativeFileDialog = nullptr, uint fileChooserPortalVersion = 0);
~QXdgDesktopPortalFileDialog();
bool defaultNameFilterDisables() const override;
@@ -92,7 +97,8 @@ private Q_SLOTS:
private:
void initializeDialog();
- void openPortal();
+ void openPortal(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent);
+ bool useNativeFileDialog(FallbackType fallbackType = GenericFallback) const;
QScopedPointer<QXdgDesktopPortalFileDialogPrivate> d_ptr;
};
diff --git a/qtbase/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp b/qtbase/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
index 2fc3167fd5..b809503122 100644
--- a/qtbase/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
+++ b/qtbase/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
@@ -153,11 +153,12 @@ QPlatformDialogHelper* QXdgDesktopPortalTheme::createPlatformDialogHelper(Dialog
{
Q_D(const QXdgDesktopPortalTheme);
- if (type == FileDialog) {
+ if (type == FileDialog && d->fileChooserPortalVersion) {
// Older versions of FileChooser portal don't support opening directories, therefore we fallback
// to native file dialog opened inside the sandbox to open a directory.
- if (d->fileChooserPortalVersion < 3 && d->baseTheme->usePlatformNativeDialog(type))
- return new QXdgDesktopPortalFileDialog(static_cast<QPlatformFileDialogHelper*>(d->baseTheme->createPlatformDialogHelper(type)));
+ if (d->baseTheme->usePlatformNativeDialog(type))
+ return new QXdgDesktopPortalFileDialog(static_cast<QPlatformFileDialogHelper*>(d->baseTheme->createPlatformDialogHelper(type)),
+ d->fileChooserPortalVersion);
return new QXdgDesktopPortalFileDialog;
}
diff --git a/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
index 6c522838df..353ea099d5 100644
--- a/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+++ b/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
@@ -918,9 +918,9 @@ bool QMYSQLResult::prepare(const QString& query)
return false;
}
- if (mysql_stmt_param_count(d->stmt) > 0) {// allocate memory for outvalues
- d->outBinds = new MYSQL_BIND[mysql_stmt_param_count(d->stmt)];
- }
+ const auto paramCount = mysql_stmt_param_count(d->stmt);
+ if (paramCount > 0) // allocate memory for outvalues
+ d->outBinds = new MYSQL_BIND[paramCount]();
setSelect(d->bindInValues());
d->preparedQuery = true;
@@ -1365,20 +1365,20 @@ bool QMYSQLDriver::open(const QString& db,
}
#if MYSQL_VERSION_ID >= 50007
- if (mysql_get_client_version() >= 50503 && mysql_get_server_version(d->mysql) >= 50503) {
- // force the communication to be utf8mb4 (only utf8mb4 supports 4-byte characters)
- mysql_set_character_set(d->mysql, "utf8mb4");
+ // force the communication to be utf8mb4 (only utf8mb4 supports 4-byte characters)
+ if (mysql_set_character_set(d->mysql, "utf8mb4")) {
+ // this failed, try forcing it to utf (BMP only)
+ if (mysql_set_character_set(d->mysql, "utf8"))
+ qWarning() << "MySQL: Unable to set the client character set to utf8.";
#if QT_CONFIG(textcodec)
- d->tc = QTextCodec::codecForName("UTF-8");
+ else
+ d->tc = codec(d->mysql);
#endif
- } else
- {
- // force the communication to be utf8
- mysql_set_character_set(d->mysql, "utf8");
+ }
#if QT_CONFIG(textcodec)
- d->tc = codec(d->mysql);
+ else
+ d->tc = QTextCodec::codecForName("UTF-8");
#endif
- }
#endif // MYSQL_VERSION_ID >= 50007
d->preparedQuerysEnabled = checkPreparedQueries(d->mysql);
diff --git a/qtbase/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/qtbase/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
index c3296c79fd..8bcc819e42 100644
--- a/qtbase/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
+++ b/qtbase/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
@@ -125,7 +125,6 @@ inline static QVarLengthArray<SQLTCHAR> toSQLTCHAR(const QString &input)
{
QVarLengthArray<SQLTCHAR> result;
toSQLTCHARImpl(result, input);
- result.append(0); // make sure it's null terminated, doesn't matter if it already is, it does if it isn't.
return result;
}
@@ -746,10 +745,15 @@ static QSqlField qMakeFieldInfo(const SQLHANDLE hStmt, int i, QString *errorMess
f.setAutoValue(isAutoValue(hStmt, i));
QVarLengthArray<SQLTCHAR> tableName(TABLENAMESIZE);
SQLSMALLINT tableNameLen;
- r = SQLColAttribute(hStmt, i + 1, SQL_DESC_BASE_TABLE_NAME, tableName.data(),
- TABLENAMESIZE, &tableNameLen, 0);
+ r = SQLColAttribute(hStmt,
+ i + 1,
+ SQL_DESC_BASE_TABLE_NAME,
+ tableName.data(),
+ SQLSMALLINT(tableName.size() * sizeof(SQLTCHAR)), // SQLColAttribute needs/returns size in bytes
+ &tableNameLen,
+ 0);
if (r == SQL_SUCCESS)
- f.setTableName(fromSQLTCHAR(tableName, tableNameLen));
+ f.setTableName(fromSQLTCHAR(tableName, tableNameLen / sizeof(SQLTCHAR)));
return f;
}
@@ -2111,7 +2115,8 @@ void QODBCDriverPrivate::checkUnicode()
hDbc,
&hStmt);
- r = SQLExecDirect(hStmt, toSQLTCHAR(QLatin1String("select 'test'")).data(), SQL_NTS);
+ auto encoded = toSQLTCHAR(QLatin1String("select 'test'"));
+ r = SQLExecDirect(hStmt, encoded.data(), SQLINTEGER(encoded.size()));
if(r == SQL_SUCCESS) {
r = SQLFetch(hStmt);
if(r == SQL_SUCCESS) {
diff --git a/qtbase/src/printsupport/dialogs/images/print-24.png b/qtbase/src/printsupport/dialogs/images/printer-24.png
similarity index 100%
rename from src/printsupport/dialogs/images/print-24.png
rename to src/printsupport/dialogs/images/printer-24.png
diff --git a/qtbase/src/printsupport/dialogs/images/print-32.png b/qtbase/src/printsupport/dialogs/images/printer-32.png
similarity index 100%
rename from src/printsupport/dialogs/images/print-32.png
rename to src/printsupport/dialogs/images/printer-32.png
diff --git a/qtbase/src/printsupport/dialogs/images/view-page-sided-24.png b/qtbase/src/printsupport/dialogs/images/view-pages-facing-24.png
similarity index 100%
rename from src/printsupport/dialogs/images/view-page-sided-24.png
rename to src/printsupport/dialogs/images/view-pages-facing-24.png
diff --git a/qtbase/src/printsupport/dialogs/images/view-page-sided-32.png b/qtbase/src/printsupport/dialogs/images/view-pages-facing-32.png
similarity index 100%
rename from src/printsupport/dialogs/images/view-page-sided-32.png
rename to src/printsupport/dialogs/images/view-pages-facing-32.png
diff --git a/qtbase/src/printsupport/dialogs/images/view-page-multi-24.png b/qtbase/src/printsupport/dialogs/images/view-pages-overview-24.png
similarity index 100%
rename from src/printsupport/dialogs/images/view-page-multi-24.png
rename to src/printsupport/dialogs/images/view-pages-overview-24.png
diff --git a/qtbase/src/printsupport/dialogs/images/view-page-multi-32.png b/qtbase/src/printsupport/dialogs/images/view-pages-overview-32.png
similarity index 100%
rename from src/printsupport/dialogs/images/view-page-multi-32.png
rename to src/printsupport/dialogs/images/view-pages-overview-32.png
diff --git a/qtbase/src/printsupport/dialogs/images/view-page-one-24.png b/qtbase/src/printsupport/dialogs/images/view-pages-single-24.png
similarity index 100%
rename from src/printsupport/dialogs/images/view-page-one-24.png
rename to src/printsupport/dialogs/images/view-pages-single-24.png
diff --git a/qtbase/src/printsupport/dialogs/images/view-page-one-32.png b/qtbase/src/printsupport/dialogs/images/view-pages-single-32.png
similarity index 100%
rename from src/printsupport/dialogs/images/view-page-one-32.png
rename to src/printsupport/dialogs/images/view-pages-single-32.png
diff --git a/qtbase/src/printsupport/dialogs/images/fit-page-24.png b/qtbase/src/printsupport/dialogs/images/zoom-fit-page-24.png
similarity index 100%
rename from src/printsupport/dialogs/images/fit-page-24.png
rename to src/printsupport/dialogs/images/zoom-fit-page-24.png
diff --git a/qtbase/src/printsupport/dialogs/images/fit-page-32.png b/qtbase/src/printsupport/dialogs/images/zoom-fit-page-32.png
similarity index 100%
rename from src/printsupport/dialogs/images/fit-page-32.png
rename to src/printsupport/dialogs/images/zoom-fit-page-32.png
diff --git a/qtbase/src/printsupport/dialogs/images/fit-width-24.png b/qtbase/src/printsupport/dialogs/images/zoom-fit-width-24.png
similarity index 100%
rename from src/printsupport/dialogs/images/fit-width-24.png
rename to src/printsupport/dialogs/images/zoom-fit-width-24.png
diff --git a/qtbase/src/printsupport/dialogs/images/fit-width-32.png b/qtbase/src/printsupport/dialogs/images/zoom-fit-width-32.png
similarity index 100%
rename from src/printsupport/dialogs/images/fit-width-32.png
rename to src/printsupport/dialogs/images/zoom-fit-width-32.png
diff --git a/qtbase/src/printsupport/dialogs/qprintdialog.qrc b/qtbase/src/printsupport/dialogs/qprintdialog.qrc
index 5a579baa55..10b8e1d341 100644
--- a/qtbase/src/printsupport/dialogs/qprintdialog.qrc
+++ b/qtbase/src/printsupport/dialogs/qprintdialog.qrc
@@ -1,9 +1,9 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/qt-project.org/dialogs/qprintpreviewdialog">
-<file>images/fit-page-24.png</file>
-<file>images/fit-page-32.png</file>
-<file>images/fit-width-24.png</file>
-<file>images/fit-width-32.png</file>
+<file>images/zoom-fit-page-24.png</file>
+<file>images/zoom-fit-page-32.png</file>
+<file>images/zoom-fit-width-24.png</file>
+<file>images/zoom-fit-width-32.png</file>
<file>images/go-first-24.png</file>
<file>images/go-first-32.png</file>
<file>images/go-last-24.png</file>
@@ -18,14 +18,14 @@
<file>images/layout-portrait-32.png</file>
<file>images/page-setup-24.png</file>
<file>images/page-setup-32.png</file>
-<file>images/print-24.png</file>
-<file>images/print-32.png</file>
-<file>images/view-page-multi-24.png</file>
-<file>images/view-page-multi-32.png</file>
-<file>images/view-page-one-24.png</file>
-<file>images/view-page-one-32.png</file>
-<file>images/view-page-sided-24.png</file>
-<file>images/view-page-sided-32.png</file>
+<file>images/printer-24.png</file>
+<file>images/printer-32.png</file>
+<file>images/view-pages-overview-24.png</file>
+<file>images/view-pages-overview-32.png</file>
+<file>images/view-pages-single-24.png</file>
+<file>images/view-pages-single-32.png</file>
+<file>images/view-pages-facing-24.png</file>
+<file>images/view-pages-facing-32.png</file>
<file>images/zoom-in-24.png</file>
<file>images/zoom-in-32.png</file>
<file>images/zoom-out-24.png</file>
diff --git a/qtbase/src/printsupport/dialogs/qprintpreviewdialog.cpp b/qtbase/src/printsupport/dialogs/qprintpreviewdialog.cpp
index 39575d5f57..23b7e89538 100644
--- a/qtbase/src/printsupport/dialogs/qprintpreviewdialog.cpp
+++ b/qtbase/src/printsupport/dialogs/qprintpreviewdialog.cpp
@@ -352,7 +352,7 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer)
static inline void qt_setupActionIcon(QAction *action, QLatin1String name)
{
QLatin1String imagePrefix(":/qt-project.org/dialogs/qprintpreviewdialog/images/");
- QIcon icon;
+ QIcon icon = QIcon::fromTheme(name);
icon.addFile(imagePrefix + name + QLatin1String("-24.png"), QSize(24, 24));
icon.addFile(imagePrefix + name + QLatin1String("-32.png"), QSize(32, 32));
action->setIcon(icon);
@@ -383,8 +383,8 @@ void QPrintPreviewDialogPrivate::setupActions()
fitPageAction->setObjectName(QLatin1String("fitPageAction"));
fitWidthAction->setCheckable(true);
fitPageAction->setCheckable(true);
- qt_setupActionIcon(fitWidthAction, QLatin1String("fit-width"));
- qt_setupActionIcon(fitPageAction, QLatin1String("fit-page"));
+ qt_setupActionIcon(fitWidthAction, QLatin1String("zoom-fit-width"));
+ qt_setupActionIcon(fitPageAction, QLatin1String("zoom-fit-page"));
QObject::connect(fitGroup, SIGNAL(triggered(QAction*)), q, SLOT(_q_fit(QAction*)));
// Zoom
@@ -410,9 +410,9 @@ void QPrintPreviewDialogPrivate::setupActions()
singleModeAction = modeGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Show single page"));
facingModeAction = modeGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Show facing pages"));
overviewModeAction = modeGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Show overview of all pages"));
- qt_setupActionIcon(singleModeAction, QLatin1String("view-page-one"));
- qt_setupActionIcon(facingModeAction, QLatin1String("view-page-sided"));
- qt_setupActionIcon(overviewModeAction, QLatin1String("view-page-multi"));
+ qt_setupActionIcon(singleModeAction, QLatin1String("view-pages-single"));
+ qt_setupActionIcon(facingModeAction, QLatin1String("view-pages-facing"));
+ qt_setupActionIcon(overviewModeAction, QLatin1String("view-pages-overview"));
singleModeAction->setObjectName(QLatin1String("singleModeAction"));
facingModeAction->setObjectName(QLatin1String("facingModeAction"));
overviewModeAction->setObjectName(QLatin1String("overviewModeAction"));
@@ -426,7 +426,7 @@ void QPrintPreviewDialogPrivate::setupActions()
printerGroup = new QActionGroup(q);
printAction = printerGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Print"));
pageSetupAction = printerGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Page setup"));
- qt_setupActionIcon(printAction, QLatin1String("print"));
+ qt_setupActionIcon(printAction, QLatin1String("printer"));
qt_setupActionIcon(pageSetupAction, QLatin1String("page-setup"));
QObject::connect(printAction, SIGNAL(triggered(bool)), q, SLOT(_q_print()));
QObject::connect(pageSetupAction, SIGNAL(triggered(bool)), q, SLOT(_q_pageSetup()));
diff --git a/qtbase/src/testlib/qabstractitemmodeltester.cpp b/qtbase/src/testlib/qabstractitemmodeltester.cpp
index 1cd18b98bb..41219a7e23 100644
--- a/qtbase/src/testlib/qabstractitemmodeltester.cpp
+++ b/qtbase/src/testlib/qabstractitemmodeltester.cpp
@@ -454,7 +454,7 @@ void QAbstractItemModelTesterPrivate::parent()
// Common error test #2, make sure that a second level index has a parent
// that is the first level index.
- if (model->rowCount(topIndex) > 0) {
+ if (model->rowCount(topIndex) > 0 && model->columnCount(topIndex) > 0) {
QModelIndex childIndex = model->index(0, 0, topIndex);
MODELTESTER_VERIFY(childIndex.isValid());
MODELTESTER_COMPARE(model->parent(childIndex), topIndex);
diff --git a/qtbase/src/testlib/qasciikey.cpp b/qtbase/src/testlib/qasciikey.cpp
index 9a308da2bc..93498b256f 100644
--- a/qtbase/src/testlib/qasciikey.cpp
+++ b/qtbase/src/testlib/qasciikey.cpp
@@ -498,6 +498,11 @@ char QTest::keyToAscii(Qt::Key key)
case Qt::Key_LaunchE : return 0; // = 0x10b0,
case Qt::Key_LaunchF : return 0; // = 0x10b1,
+ // Keypad navigation keys
+ case Qt::Key_Select : return 0; // = 0x01010000
+ case Qt::Key_Yes : return 0; // = 0x01010001
+ case Qt::Key_No : return 0; // = 0x01010002
+
default: QTEST_ASSERT(false); return 0;
}
}
diff --git a/qtbase/src/widgets/accessible/qaccessiblewidgets.cpp b/qtbase/src/widgets/accessible/qaccessiblewidgets.cpp
index 574be1f5ea..b499d5d620 100644
--- a/qtbase/src/widgets/accessible/qaccessiblewidgets.cpp
+++ b/qtbase/src/widgets/accessible/qaccessiblewidgets.cpp
@@ -900,7 +900,7 @@ QString QAccessibleTextWidget::attributes(int offset, int *startOffset, int *end
underlineStyleValue = QStringLiteral("wave"); // this is not correct, but provides good approximation at least
break;
default:
- qWarning() << "Unknown QTextCharFormat::​UnderlineStyle value " << underlineStyle << " could not be translated to IAccessible2 value";
+ qWarning() << "Unknown QTextCharFormat::UnderlineStyle value " << underlineStyle << " could not be translated to IAccessible2 value";
break;
}
if (!underlineStyleValue.isNull()) {
diff --git a/qtbase/src/widgets/dialogs/qcolordialog.cpp b/qtbase/src/widgets/dialogs/qcolordialog.cpp
index 4247731275..30445fa069 100644
--- a/qtbase/src/widgets/dialogs/qcolordialog.cpp
+++ b/qtbase/src/widgets/dialogs/qcolordialog.cpp
@@ -78,7 +78,10 @@
#include "qwindow.h"
#include "private/qdialog_p.h"
+#include "private/qguiapplication_p.h"
+#include <qpa/qplatformservices.h>
+#include <qpa/qplatformintegration.h>
#include <algorithm>
QT_BEGIN_NAMESPACE
@@ -801,6 +804,10 @@ QColorLuminancePicker::~QColorLuminancePicker()
void QColorLuminancePicker::mouseMoveEvent(QMouseEvent *m)
{
+ if (m->buttons() == Qt::NoButton) {
+ m->ignore();
+ return;
+ }
setVal(y2val(m->y()));
}
void QColorLuminancePicker::mousePressEvent(QMouseEvent *m)
@@ -935,6 +942,10 @@ void QColorPicker::setCol(int h, int s)
void QColorPicker::mouseMoveEvent(QMouseEvent *m)
{
QPoint p = m->pos() - contentsRect().topLeft();
+ if (m->buttons() == Qt::NoButton) {
+ m->ignore();
+ return;
+ }
setCol(p);
emit newCol(hue, sat);
}
@@ -1611,6 +1622,20 @@ void QColorDialogPrivate::_q_newStandard(int r, int c)
void QColorDialogPrivate::_q_pickScreenColor()
{
Q_Q(QColorDialog);
+
+ auto *platformServices = QGuiApplicationPrivate::platformIntegration()->services();
+ if (platformServices->hasCapability(QPlatformServices::Capability::ColorPicking)) {
+ if (auto *colorPicker = platformServices->colorPicker(q->windowHandle())) {
+ q->connect(colorPicker, &QPlatformServiceColorPicker::colorPicked, q,
+ [q, colorPicker](const QColor &color) {
+ colorPicker->deleteLater();
+ q->setCurrentColor(color);
+ });
+ colorPicker->pickColor();
+ return;
+ }
+ }
+
if (!colorPickingEventFilter)
colorPickingEventFilter = new QColorPickingEventFilter(this, q);
q->installEventFilter(colorPickingEventFilter);
diff --git a/qtbase/src/widgets/itemviews/qabstractitemdelegate.cpp b/qtbase/src/widgets/itemviews/qabstractitemdelegate.cpp
index e120817edc..8ea36b5427 100644
--- a/qtbase/src/widgets/itemviews/qabstractitemdelegate.cpp
+++ b/qtbase/src/widgets/itemviews/qabstractitemdelegate.cpp
@@ -400,12 +400,7 @@ bool QAbstractItemDelegate::helpEvent(QHelpEvent *event,
const QString tooltip = index.isValid() ?
d->textForRole(Qt::ToolTipRole, index.data(Qt::ToolTipRole), option.locale, precision) :
QString();
- QRect rect;
- if (index.isValid()) {
- const QRect r = view->visualRect(index);
- rect = QRect(view->mapToGlobal(r.topLeft()), r.size());
- }
- QToolTip::showText(he->globalPos(), tooltip, view, rect);
+ QToolTip::showText(he->globalPos(), tooltip, view->viewport(), option.rect);
event->setAccepted(!tooltip.isEmpty());
break;
}
diff --git a/qtbase/src/widgets/itemviews/qlistview.cpp b/qtbase/src/widgets/itemviews/qlistview.cpp
index 5a88f1b1ef..63f760269c 100644
--- a/qtbase/src/widgets/itemviews/qlistview.cpp
+++ b/qtbase/src/widgets/itemviews/qlistview.cpp
@@ -3388,6 +3388,7 @@ void QIconModeViewBase::updateContentsSize()
*/
void QListView::currentChanged(const QModelIndex &current, const QModelIndex &previous)
{
+ QAbstractItemView::currentChanged(current, previous);
#ifndef QT_NO_ACCESSIBILITY
if (QAccessible::isActive()) {
if (current.isValid()) {
@@ -3398,7 +3399,6 @@ void QListView::currentChanged(const QModelIndex &current, const QModelIndex &pr
}
}
#endif
- QAbstractItemView::currentChanged(current, previous);
}
/*!
diff --git a/qtbase/src/widgets/itemviews/qtableview.cpp b/qtbase/src/widgets/itemviews/qtableview.cpp
index d120c41dc9..09d34005a7 100644
--- a/qtbase/src/widgets/itemviews/qtableview.cpp
+++ b/qtbase/src/widgets/itemviews/qtableview.cpp
@@ -1013,6 +1013,7 @@ void QTableViewPrivate::drawCell(QPainter *painter, const QStyleOptionViewItem &
int QTableViewPrivate::widthHintForIndex(const QModelIndex &index, int hint, const QStyleOptionViewItem &option) const
{
Q_Q(const QTableView);
+ const int oldHint = hint;
QWidget *editor = editorForIndex(index).widget.data();
if (editor && persistent.contains(editor)) {
hint = qMax(hint, editor->sizeHint().width());
@@ -1021,6 +1022,17 @@ int QTableViewPrivate::widthHintForIndex(const QModelIndex &index, int hint, con
hint = qBound(min, hint, max);
}
hint = qMax(hint, q->itemDelegate(index)->sizeHint(option, index).width());
+
+ if (hasSpans()) {
+ auto span = spans.spanAt(index.column(), index.row());
+ if (span && span->m_left == index.column() && span->m_top == index.row()) {
+ // spans are screwed up when sections are moved
+ const auto left = logicalColumn(span->m_left);
+ for (int i = 1; i <= span->width(); ++i)
+ hint -= q->columnWidth(visualColumn(left + i));
+ }
+ hint = std::max(hint, oldHint);
+ }
return hint;
}
@@ -1053,6 +1065,11 @@ int QTableViewPrivate::heightHintForIndex(const QModelIndex &index, int hint, QS
option.rect.setHeight(height);
option.rect.setX(q->columnViewportPosition(index.column()));
option.rect.setWidth(q->columnWidth(index.column()));
+ if (hasSpans()) {
+ auto span = spans.spanAt(index.column(), index.row());
+ if (span && span->m_left == index.column() && span->m_top == index.row())
+ option.rect.setWidth(std::max(option.rect.width(), visualSpanRect(*span).width()));
+ }
// 1px less space when grid is shown (see drawCell)
if (showGrid)
option.rect.setWidth(option.rect.width() - 1);
diff --git a/qtbase/src/widgets/kernel/qaction.h b/qtbase/src/widgets/kernel/qaction.h
index 258a1ea0a0..737c1e8285 100644
--- a/qtbase/src/widgets/kernel/qaction.h
+++ b/qtbase/src/widgets/kernel/qaction.h
@@ -81,7 +81,7 @@ class Q_WIDGETS_EXPORT QAction : public QObject
Q_PROPERTY(MenuRole menuRole READ menuRole WRITE setMenuRole NOTIFY changed)
Q_PROPERTY(bool iconVisibleInMenu READ isIconVisibleInMenu WRITE setIconVisibleInMenu NOTIFY changed)
Q_PROPERTY(bool shortcutVisibleInContextMenu READ isShortcutVisibleInContextMenu WRITE setShortcutVisibleInContextMenu NOTIFY changed)
- Q_PROPERTY(Priority priority READ priority WRITE setPriority)
+ Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY changed)
public:
// note this is copied into qplatformmenu.h, which must stay in sync
diff --git a/qtbase/src/widgets/kernel/qwidget.cpp b/qtbase/src/widgets/kernel/qwidget.cpp
index e94520021e..d661114fc7 100644
--- a/qtbase/src/widgets/kernel/qwidget.cpp
+++ b/qtbase/src/widgets/kernel/qwidget.cpp
@@ -1272,7 +1272,6 @@ void QWidgetPrivate::create()
win->setProperty("_q_showWithoutActivating", QVariant(true));
if (q->testAttribute(Qt::WA_MacAlwaysShowToolWindow))
win->setProperty("_q_macAlwaysShowToolWindow", QVariant(true));
- setNetWmWindowTypes(true); // do nothing if none of WA_X11NetWmWindowType* is set
win->setFlags(flags);
fixPosIncludesFrame();
if (q->testAttribute(Qt::WA_Moved)
@@ -1345,6 +1344,7 @@ void QWidgetPrivate::create()
Q_ASSERT(id != WId(0));
setWinId(id);
}
+ setNetWmWindowTypes(true); // do nothing if none of WA_X11NetWmWindowType* is set
// Check children and create windows for them if necessary
q_createNativeChildrenAndSetParent(q);
diff --git a/qtbase/src/widgets/styles/qfusionstyle.cpp b/qtbase/src/widgets/styles/qfusionstyle.cpp
index a225d4b563..35e2769ac4 100644
--- a/qtbase/src/widgets/styles/qfusionstyle.cpp
+++ b/qtbase/src/widgets/styles/qfusionstyle.cpp
@@ -1772,14 +1772,6 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
proxy()->drawControl(CE_PushButtonLabel, &subopt, painter, widget);
}
break;
- case CE_PushButtonLabel:
- if (const QStyleOptionButton *button = qstyleoption_cast<const QStyleOptionButton *>(option)) {
- QStyleOptionButton b(*button);
- // no PM_ButtonShiftHorizontal and PM_ButtonShiftVertical for fusion style
- b.state &= ~(State_On | State_Sunken);
- QCommonStyle::drawControl(element, &b, painter, widget);
- }
- break;
case CE_MenuBarEmptyArea:
painter->save();
{
diff --git a/qtbase/src/widgets/util/qsystemtrayicon.cpp b/qtbase/src/widgets/util/qsystemtrayicon.cpp
index 203fcbc443..e9b2724903 100644
--- a/qtbase/src/widgets/util/qsystemtrayicon.cpp
+++ b/qtbase/src/widgets/util/qsystemtrayicon.cpp
@@ -208,7 +208,7 @@ void QSystemTrayIcon::setContextMenu(QMenu *menu)
if (oldMenu != menu && d->qpa_sys) {
// Show the QMenu-based menu for QPA plugins that do not provide native menus
if (oldMenu && !oldMenu->platformMenu())
- QObject::disconnect(d->qpa_sys, &QPlatformSystemTrayIcon::contextMenuRequested, menu, nullptr);
+ QObject::disconnect(d->qpa_sys, &QPlatformSystemTrayIcon::contextMenuRequested, oldMenu, nullptr);
if (menu && !menu->platformMenu()) {
QObject::connect(d->qpa_sys, &QPlatformSystemTrayIcon::contextMenuRequested,
menu,
diff --git a/qtbase/src/widgets/widgets/qabstractbutton.cpp b/qtbase/src/widgets/widgets/qabstractbutton.cpp
index a128b23950..dc40bf62fb 100644
--- a/qtbase/src/widgets/widgets/qabstractbutton.cpp
+++ b/qtbase/src/widgets/widgets/qabstractbutton.cpp
@@ -56,6 +56,7 @@
#ifndef QT_NO_ACCESSIBILITY
#include "qaccessible.h"
#endif
+#include <qpa/qplatformtheme.h>
#include <algorithm>
@@ -1076,19 +1077,19 @@ void QAbstractButton::keyPressEvent(QKeyEvent *e)
{
Q_D(QAbstractButton);
bool next = true;
- switch (e->key()) {
- case Qt::Key_Enter:
- case Qt::Key_Return:
- e->ignore();
- break;
- case Qt::Key_Select:
- case Qt::Key_Space:
- if (!e->isAutoRepeat()) {
- setDown(true);
- repaint();
- d->emitPressed();
- }
- break;
+
+ const auto key = static_cast<Qt::Key>(e->key());
+ const auto buttonPressKeys = QGuiApplicationPrivate::platformTheme()
+ ->themeHint(QPlatformTheme::ButtonPressKeys)
+ .value<QList<Qt::Key>>();
+ if (buttonPressKeys.contains(key) && !e->isAutoRepeat()) {
+ setDown(true);
+ repaint();
+ d->emitPressed();
+ return;
+ }
+
+ switch (key) {
case Qt::Key_Up:
next = false;
Q_FALLTHROUGH();
@@ -1153,15 +1154,15 @@ void QAbstractButton::keyReleaseEvent(QKeyEvent *e)
if (!e->isAutoRepeat())
d->repeatTimer.stop();
- switch (e->key()) {
- case Qt::Key_Select:
- case Qt::Key_Space:
- if (!e->isAutoRepeat() && d->down)
- d->click();
- break;
- default:
- e->ignore();
+ const auto buttonPressKeys = QGuiApplicationPrivate::platformTheme()
+ ->themeHint(QPlatformTheme::ButtonPressKeys)
+ .value<QList<Qt::Key>>();
+ if (buttonPressKeys.contains(static_cast<Qt::Key>(e->key())) && !e->isAutoRepeat() && d->down) {
+ d->click();
+ return;
}
+
+ e->ignore();
}
/*!\reimp
diff --git a/qtbase/src/widgets/widgets/qcombobox.cpp b/qtbase/src/widgets/widgets/qcombobox.cpp
index 7a496c27e0..0a3d96647b 100644
--- a/qtbase/src/widgets/widgets/qcombobox.cpp
+++ b/qtbase/src/widgets/widgets/qcombobox.cpp
@@ -3352,7 +3352,23 @@ void QComboBox::keyPressEvent(QKeyEvent *e)
Move move = NoMove;
int newIndex = currentIndex();
- switch (e->key()) {
+
+ bool pressLikeButton = !d->lineEdit;
+#ifdef QT_KEYPAD_NAVIGATION
+ pressLikeButton |= QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus();
+#endif
+ auto key = static_cast<Qt::Key>(e->key());
+ if (pressLikeButton) {
+ const auto buttonPressKeys = QGuiApplicationPrivate::platformTheme()
+ ->themeHint(QPlatformTheme::ButtonPressKeys)
+ .value<QList<Qt::Key>>();
+ if (buttonPressKeys.contains(key)) {
+ showPopup();
+ return;
+ }
+ }
+
+ switch (key) {
case Qt::Key_Up:
if (e->modifiers() & Qt::ControlModifier)
break; // pass to line edit for auto completion
@@ -3394,26 +3410,11 @@ void QComboBox::keyPressEvent(QKeyEvent *e)
return;
}
break;
- case Qt::Key_Space:
- if (!d->lineEdit) {
- showPopup();
- return;
- }
- break;
- case Qt::Key_Enter:
- case Qt::Key_Return:
case Qt::Key_Escape:
if (!d->lineEdit)
e->ignore();
break;
#ifdef QT_KEYPAD_NAVIGATION
- case Qt::Key_Select:
- if (QApplicationPrivate::keypadNavigationEnabled()
- && (!hasEditFocus() || !d->lineEdit)) {
- showPopup();
- return;
- }
- break;
case Qt::Key_Left:
case Qt::Key_Right:
if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus())
diff --git a/qtbase/src/widgets/widgets/qdatetimeedit_p.h b/qtbase/src/widgets/widgets/qdatetimeedit_p.h
index d36b6f8f9a..e0df5b5158 100644
--- a/qtbase/src/widgets/widgets/qdatetimeedit_p.h
+++ b/qtbase/src/widgets/widgets/qdatetimeedit_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtWidgets module of the Qt Toolkit.
diff --git a/qtbase/src/widgets/widgets/qdial.cpp b/qtbase/src/widgets/widgets/qdial.cpp
index 8f774a3cc7..ec5cec0d82 100644
--- a/qtbase/src/widgets/widgets/qdial.cpp
+++ b/qtbase/src/widgets/widgets/qdial.cpp
@@ -94,6 +94,8 @@ int QDialPrivate::bound(int val) const
if (wrapping) {
if ((val >= minimum) && (val <= maximum))
return val;
+ if (minimum == maximum)
+ return minimum;
val = minimum + ((val - minimum) % (maximum - minimum));
if (val < minimum)
val += maximum - minimum;
diff --git a/qtbase/src/widgets/widgets/qgroupbox.cpp b/qtbase/src/widgets/widgets/qgroupbox.cpp
index 02a0bed325..3f3eccc370 100644
--- a/qtbase/src/widgets/widgets/qgroupbox.cpp
+++ b/qtbase/src/widgets/widgets/qgroupbox.cpp
@@ -54,6 +54,8 @@
#include "qaccessible.h"
#endif
#include <private/qwidget_p.h>
+#include <private/qguiapplication_p.h>
+#include <qpa/qplatformtheme.h>
#include "qdebug.h"
@@ -360,7 +362,10 @@ bool QGroupBox::event(QEvent *e)
return true;
case QEvent::KeyPress: {
QKeyEvent *k = static_cast<QKeyEvent*>(e);
- if (!k->isAutoRepeat() && (k->key() == Qt::Key_Select || k->key() == Qt::Key_Space)) {
+ const auto buttonPressKeys = QGuiApplicationPrivate::platformTheme()
+ ->themeHint(QPlatformTheme::ButtonPressKeys)
+ .value<QList<Qt::Key>>();
+ if (!k->isAutoRepeat() && buttonPressKeys.contains(static_cast<Qt::Key>(k->key()))) {
d->pressedControl = QStyle::SC_GroupBoxCheckBox;
update(style()->subControlRect(QStyle::CC_GroupBox, &box, QStyle::SC_GroupBoxCheckBox, this));
return true;
@@ -369,7 +374,10 @@ bool QGroupBox::event(QEvent *e)
}
case QEvent::KeyRelease: {
QKeyEvent *k = static_cast<QKeyEvent*>(e);
- if (!k->isAutoRepeat() && (k->key() == Qt::Key_Select || k->key() == Qt::Key_Space)) {
+ const auto buttonPressKeys = QGuiApplicationPrivate::platformTheme()
+ ->themeHint(QPlatformTheme::ButtonPressKeys)
+ .value<QList<Qt::Key>>();
+ if (!k->isAutoRepeat() && buttonPressKeys.contains(static_cast<Qt::Key>(k->key()))) {
bool toggle = (d->pressedControl == QStyle::SC_GroupBoxLabel
|| d->pressedControl == QStyle::SC_GroupBoxCheckBox);
d->pressedControl = QStyle::SC_None;
diff --git a/qtbase/src/widgets/widgets/qlineedit_p.cpp b/qtbase/src/widgets/widgets/qlineedit_p.cpp
index 80c9258da4..3fa0f29d28 100644
--- a/qtbase/src/widgets/widgets/qlineedit_p.cpp
+++ b/qtbase/src/widgets/widgets/qlineedit_p.cpp
@@ -434,7 +434,7 @@ void QLineEditIconButton::animateShow(bool visible)
void QLineEditIconButton::startOpacityAnimation(qreal endValue)
{
- QPropertyAnimation *animation = new QPropertyAnimation(this, QByteArrayLiteral("opacity"));
+ QPropertyAnimation *animation = new QPropertyAnimation(this, QByteArrayLiteral("opacity"), this);
connect(animation, &QPropertyAnimation::finished, this, &QLineEditIconButton::onAnimationFinished);
animation->setDuration(160);
diff --git a/qtbase/src/widgets/widgets/qtabbar.cpp b/qtbase/src/widgets/widgets/qtabbar.cpp
index 9a382e96dd..7f80fcc250 100644
--- a/qtbase/src/widgets/widgets/qtabbar.cpp
+++ b/qtbase/src/widgets/widgets/qtabbar.cpp
@@ -2190,7 +2190,8 @@ void QTabBar::mouseMoveEvent(QMouseEvent *event)
}
}
// Buttons needs to follow the dragged tab
- d->layoutTab(d->pressedIndex);
+ if (d->pressedIndex != -1)
+ d->layoutTab(d->pressedIndex);
update();
}
diff --git a/qtbase/src/widgets/widgets/qtoolbutton.cpp b/qtbase/src/widgets/widgets/qtoolbutton.cpp
index e380cb647b..9953db73af 100644
--- a/qtbase/src/widgets/widgets/qtoolbutton.cpp
+++ b/qtbase/src/widgets/widgets/qtoolbutton.cpp
@@ -982,7 +982,15 @@ QAction *QToolButton::defaultAction() const
return d->defaultAction;
}
-
+/*!
+ \reimp
+ */
+void QToolButton::checkStateSet()
+{
+ Q_D(QToolButton);
+ if (d->defaultAction && d->defaultAction->isCheckable())
+ d->defaultAction->setChecked(isChecked());
+}
/*!
\reimp
diff --git a/qtbase/src/widgets/widgets/qtoolbutton.h b/qtbase/src/widgets/widgets/qtoolbutton.h
index 52bd2d5f7a..82b5d7924f 100644
--- a/qtbase/src/widgets/widgets/qtoolbutton.h
+++ b/qtbase/src/widgets/widgets/qtoolbutton.h
@@ -118,6 +118,7 @@ protected:
void changeEvent(QEvent *) override;
bool hitButton(const QPoint &pos) const override;
+ void checkStateSet() override;
void nextCheckState() override;
void initStyleOption(QStyleOptionToolButton *option) const;
diff --git a/qtbase/src/widgets/widgets/qwidgettextcontrol.cpp b/qtbase/src/widgets/widgets/qwidgettextcontrol.cpp
index ba9b6e0587..9493f090ec 100644
--- a/qtbase/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/qtbase/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -2057,6 +2057,11 @@ void QWidgetTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
|| e->preeditString() != cursor.block().layout()->preeditAreaText()
|| e->replacementLength() > 0;
+ if (!isGettingInput && e->attributes().isEmpty()) {
+ e->ignore();
+ return;
+ }
+
int oldCursorPos = cursor.position();
cursor.beginEditBlock();
diff --git a/qtbase/src/xml/sax/qxml.cpp b/qtbase/src/xml/sax/qxml.cpp
index 7a444713c1..9076dcfd84 100644
--- a/qtbase/src/xml/sax/qxml.cpp
+++ b/qtbase/src/xml/sax/qxml.cpp
@@ -7464,7 +7464,12 @@ bool QXmlSimpleReaderPrivate::parseReference()
case DoneD:
tmp = ref().toUInt(&ok, 10);
if (ok) {
- stringAddC(QChar(tmp));
+ if (tmp > 0xffff) {
+ stringAddC(QChar::highSurrogate(tmp));
+ stringAddC(QChar::lowSurrogate(tmp));
+ } else {
+ stringAddC(QChar(tmp));
+ }
} else {
reportParseError(QLatin1String(XMLERR_ERRORPARSINGREFERENCE));
return false;
@@ -7475,7 +7480,12 @@ bool QXmlSimpleReaderPrivate::parseReference()
case DoneH:
tmp = ref().toUInt(&ok, 16);
if (ok) {
- stringAddC(QChar(tmp));
+ if (tmp > 0xffff) {
+ stringAddC(QChar::highSurrogate(tmp));
+ stringAddC(QChar::lowSurrogate(tmp));
+ } else {
+ stringAddC(QChar(tmp));
+ }
} else {
reportParseError(QLatin1String(XMLERR_ERRORPARSINGREFERENCE));
return false;
diff --git a/qtbase/sync.profile b/qtbase/sync.profile
index 0292bf0dc2..7dd0177b90 100644
--- a/qtbase/sync.profile
+++ b/qtbase/sync.profile
@@ -77,7 +77,7 @@
"qsql.h" => "QtSql/qtsqlglobal.h"
},
"QtDBus" => {
- "qdbusmacros.h" => "QtDbus/qtdbusglobal.h"
+ "qdbusmacros.h" => "QtDBus/qtdbusglobal.h"
},
"QtTest" => {
"qtest_global.h" => "QtTest/qttestglobal.h"
diff --git a/qtbase/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/tst_qconcatenatetablesproxymodel.cpp b/qtbase/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/tst_qconcatenatetablesproxymodel.cpp
index e1ea7a4552..90972caa57 100644
--- a/qtbase/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/tst_qconcatenatetablesproxymodel.cpp
+++ b/qtbase/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/tst_qconcatenatetablesproxymodel.cpp
@@ -117,6 +117,7 @@ private Q_SLOTS:
void shouldPropagateDropAfterLastRow_data();
void shouldPropagateDropAfterLastRow();
void qtbug91788();
+ void qtbug91878();
private:
QStandardItemModel mod;
@@ -843,6 +844,22 @@ void tst_QConcatenateTablesProxyModel::qtbug91788()
QCOMPARE(proxyConcat.columnCount(), 0);
}
+void tst_QConcatenateTablesProxyModel::qtbug91878()
+{
+ QStandardItemModel m;
+ m.setRowCount(4);
+ m.setColumnCount(4);
+
+ QConcatenateTablesProxyModel pm;
+ QSortFilterProxyModel proxyFilter;
+ proxyFilter.setSourceModel(&pm);
+ proxyFilter.setFilterFixedString("something");
+ pm.addSourceModel(&m); // This should not assert
+
+ QCOMPARE(pm.columnCount(), 4);
+ QCOMPARE(pm.rowCount(), 4);
+}
+
QTEST_GUILESS_MAIN(tst_QConcatenateTablesProxyModel)
#include "tst_qconcatenatetablesproxymodel.moc"
diff --git a/qtbase/tests/auto/corelib/mimetypes/qmimedatabase/circular-inheritance.xml b/qtbase/tests/auto/corelib/mimetypes/qmimedatabase/circular-inheritance.xml
new file mode 100644
index 0000000000..466f039803
--- /dev/null
+++ b/qtbase/tests/auto/corelib/mimetypes/qmimedatabase/circular-inheritance.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/ecmascript">
+ <comment>It's more accurate to say that ECMAScript is a subset of JavaScript</comment>
+ <sub-class-of type="text/javascript"/>
+ <glob pattern="*.js"/>
+ </mime-type>
+ <mime-type type="text/javascript">
+ <comment>than to say that JavaScript is a subset of ECMAScript</comment>
+ <sub-class-of type="application/ecmascript"/>
+ <glob pattern="*.js"/>
+ </mime-type>
+</mime-info>
diff --git a/qtbase/tests/auto/corelib/mimetypes/qmimedatabase/testdata.qrc b/qtbase/tests/auto/corelib/mimetypes/qmimedatabase/testdata.qrc
index 1002d0195d..49dbb0a8ba 100644
--- a/qtbase/tests/auto/corelib/mimetypes/qmimedatabase/testdata.qrc
+++ b/qtbase/tests/auto/corelib/mimetypes/qmimedatabase/testdata.qrc
@@ -3,10 +3,12 @@
<file alias="yast2-metapackage-handler-mimetypes.xml">yast2-metapackage-handler-mimetypes.xml</file>
<file alias="qml-again.xml">qml-again.xml</file>
<file alias="text-x-objcsrc.xml">text-x-objcsrc.xml</file>
+ <file alias="text-plain-subclass.xml">text-plain-subclass.xml</file>
<file alias="test.qml">test.qml</file>
<file>invalid-magic1.xml</file>
<file>invalid-magic2.xml</file>
<file>invalid-magic3.xml</file>
+ <file>circular-inheritance.xml</file>
<file>magic-and-hierarchy.xml</file>
<file>magic-and-hierarchy.foo</file>
<file>magic-and-hierarchy2.foo</file>
diff --git a/qtbase/tests/auto/corelib/mimetypes/qmimedatabase/text-plain-subclass.xml b/qtbase/tests/auto/corelib/mimetypes/qmimedatabase/text-plain-subclass.xml
new file mode 100644
index 0000000000..7b5cb7506d
--- /dev/null
+++ b/qtbase/tests/auto/corelib/mimetypes/qmimedatabase/text-plain-subclass.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+ <mime-type type="text/x-microdvd">
+ <comment>MicroDVD subtitles</comment>
+ <sub-class-of type="text/plain"/>
+ <magic priority="50">
+ <match type="string" value="{1}" offset="0"/>
+ <match type="string" value="{0}" offset="0"/>
+ <match type="string" value="}{" offset="0:6"/>
+ </magic>
+ <generic-icon name="text-x-generic"/>
+ <glob pattern="*.sub"/>
+ <glob pattern="*.txt"/>
+ </mime-type>
+</mime-info>
diff --git a/qtbase/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/qtbase/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
index 0ea422ecbc..d2dd8d340b 100644
--- a/qtbase/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
+++ b/qtbase/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
@@ -49,10 +49,12 @@ static const char *const additionalMimeFiles[] = {
"yast2-metapackage-handler-mimetypes.xml",
"qml-again.xml",
"text-x-objcsrc.xml",
+ "text-plain-subclass.xml",
"invalid-magic1.xml",
"invalid-magic2.xml",
"invalid-magic3.xml",
"magic-and-hierarchy.xml",
+ "circular-inheritance.xml",
0
};
@@ -70,15 +72,15 @@ static inline QString testSuiteWarning()
QString result;
QTextStream str(&result);
- str << "\nCannot find the shared-mime-info test suite\nstarting from: "
+ str << "\nCannot find the shared-mime-info test suite\nin the parent of: "
<< QDir::toNativeSeparators(QDir::currentPath()) << "\n"
"cd " << QDir::toNativeSeparators(QStringLiteral("tests/auto/corelib/mimetypes/qmimedatabase")) << "\n"
- "wget http://cgit.freedesktop.org/xdg/shared-mime-info/snapshot/Release-1-10.zip\n"
- "unzip Release-1-10.zip\n";
+ "wget https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/2.1/shared-mime-info-2.1.zip\n"
+ "unzip shared-mime-info-2.1.zip\n";
#ifdef Q_OS_WIN
- str << "mkdir testfiles\nxcopy /s Release-1-10 s-m-i\n";
+ str << "mkdir testfiles\nxcopy /s shared-mime-info-2.1 s-m-i\n";
#else
- str << "ln -s Release-1-10 s-m-i\n";
+ str << "ln -s shared-mime-info-2.1 s-m-i\n";
#endif
return result;
}
@@ -154,7 +156,7 @@ void tst_QMimeDatabase::initTestCase()
QVERIFY2(copyResourceFile(xmlFileName, xmlTargetFileName, &errorMessage), qPrintable(errorMessage));
#endif
- m_testSuite = QFINDTESTDATA("s-m-i/tests");
+ m_testSuite = QFINDTESTDATA("s-m-i/tests/mime-detection");
if (m_testSuite.isEmpty())
qWarning("%s", qPrintable(testSuiteWarning()));
@@ -390,6 +392,13 @@ void tst_QMimeDatabase::inheritance()
const QMimeType mswordTemplate = db.mimeTypeForName(QString::fromLatin1("application/msword-template"));
QVERIFY(mswordTemplate.isValid());
QVERIFY(mswordTemplate.inherits(QLatin1String("application/msword")));
+
+ // Check that buggy type definitions that have circular inheritance don't cause an infinite
+ // loop, especially when resolving a conflict between the file's name and its contents
+ const QMimeType ecmascript = db.mimeTypeForName(QString::fromLatin1("application/ecmascript"));
+ QVERIFY(ecmascript.allAncestors().contains("text/plain"));
+ const QMimeType javascript = db.mimeTypeForFileNameAndData("xml.js", "<?xml?>");
+ QVERIFY(javascript.inherits(QString::fromLatin1("text/javascript")));
}
void tst_QMimeDatabase::aliases()
@@ -611,7 +620,7 @@ void tst_QMimeDatabase::allMimeTypes()
QVERIFY(!lst.isEmpty());
// Hardcoding this is the only way to check both providers find the same number of mimetypes.
- QCOMPARE(lst.count(), 779);
+ QCOMPARE(lst.count(), 811);
foreach (const QMimeType &mime, lst) {
const QString name = mime.name();
@@ -631,10 +640,9 @@ void tst_QMimeDatabase::suffixes_data()
QTest::newRow("mimetype with a single pattern") << "application/pdf" << "*.pdf" << "pdf";
QTest::newRow("mimetype with multiple patterns") << "application/x-kpresenter" << "*.kpr;*.kpt" << "kpr";
- QTest::newRow("jpeg") << "image/jpeg" << "*.jpe;*.jpg;*.jpeg" << "jpeg";
- //if (KMimeType::sharedMimeInfoVersion() > KDE_MAKE_VERSION(0, 60, 0)) {
- QTest::newRow("mimetype with many patterns") << "application/vnd.wordperfect" << "*.wp;*.wp4;*.wp5;*.wp6;*.wpd;*.wpp" << "wp";
- //}
+ // The preferred suffix for image/jpeg is *.jpg, as per https://bugs.kde.org/show_bug.cgi?id=176737
+ QTest::newRow("jpeg") << "image/jpeg" << "*.jpe;*.jpg;*.jpeg" << "jpg";
+ QTest::newRow("mimetype with many patterns") << "application/vnd.wordperfect" << "*.wp;*.wp4;*.wp5;*.wp6;*.wpd;*.wpp" << "wp";
QTest::newRow("oasis text mimetype") << "application/vnd.oasis.opendocument.text" << "*.odt" << "odt";
QTest::newRow("oasis presentation mimetype") << "application/vnd.oasis.opendocument.presentation" << "*.odp" << "odp";
QTest::newRow("mimetype with multiple patterns") << "text/plain" << "*.asc;*.txt;*,v" << "txt";
@@ -1070,6 +1078,8 @@ void tst_QMimeDatabase::installNewLocalMimeType()
QVERIFY(objcsrc.isValid());
QCOMPARE(objcsrc.globPatterns(), QStringList());
}
+ QCOMPARE(db.mimeTypeForFile(QLatin1String("foo.txt"), QMimeDatabase::MatchExtension).name(),
+ QString::fromLatin1("text/plain"));
// Test that a double-definition of a mimetype doesn't lead to sniffing ("conflicting globs").
const QString qmlTestFile = QLatin1String(RESOURCE_PREFIX "test.qml");
diff --git a/qtbase/tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.h b/qtbase/tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.h
index ca2ceed7a9..624316dfdb 100644
--- a/qtbase/tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.h
+++ b/qtbase/tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.h
@@ -35,7 +35,7 @@
class Plugin1 : public QObject, public PluginInterface1
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.autotests.plugininterface1")
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.autotests.plugininterface1" FILE "plugin1.json")
Q_INTERFACES(PluginInterface1)
public:
diff --git a/qtbase/tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.json b/qtbase/tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.json
new file mode 100644
index 0000000000..ce67846d48
--- /dev/null
+++ b/qtbase/tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.json
@@ -0,0 +1,5 @@
+{
+ "Keys": [
+ "plugin1"
+ ]
+}
diff --git a/qtbase/tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp b/qtbase/tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp
index 9fa61804b3..88ada1b806 100644
--- a/qtbase/tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp
+++ b/qtbase/tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp
@@ -31,6 +31,7 @@
#include <QtCore/qfileinfo.h>
#include <QtCore/qplugin.h>
#include <private/qfactoryloader_p.h>
+#include <private/qlibrary_p.h>
#include "plugin1/plugininterface1.h"
#include "plugin2/plugininterface2.h"
@@ -52,6 +53,7 @@ public slots:
private slots:
void usingTwoFactoriesFromSameDir();
+ void multiplePaths();
};
static const char binFolderC[] = "bin";
@@ -92,5 +94,30 @@ void tst_QFactoryLoader::usingTwoFactoriesFromSameDir()
QCOMPARE(plugin2->pluginName(), QLatin1String("Plugin2 ok"));
}
+void tst_QFactoryLoader::multiplePaths()
+{
+#if !QT_CONFIG(library) || !(defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)) || defined(Q_OS_ANDROID)
+ QSKIP("Test not applicable in this configuration.");
+#else
+ const QString binFolder = QFINDTESTDATA(binFolderC);
+
+ QTemporaryDir dir;
+ QVERIFY(dir.isValid());
+
+ QString pluginsPath = QFileInfo(binFolder, binFolderC).absolutePath();
+ QString linkPath = dir.filePath(binFolderC);
+ QVERIFY(QFile::link(pluginsPath, linkPath));
+
+ QCoreApplication::setLibraryPaths({ QFileInfo(binFolder).absolutePath(), dir.path() });
+
+ const QString suffix = QLatin1Char('/') + QLatin1String(binFolderC);
+ QFactoryLoader loader1(PluginInterface1_iid, suffix);
+
+ QLibraryPrivate *library1 = loader1.library("plugin1");
+ QVERIFY(library1);
+ QCOMPARE(library1->loadHints(), QLibrary::PreventUnloadHint);
+#endif
+}
+
QTEST_MAIN(tst_QFactoryLoader)
#include "tst_qfactoryloader.moc"
diff --git a/qtbase/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp b/qtbase/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
index ce8057372c..833f68b1de 100644
--- a/qtbase/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
+++ b/qtbase/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
@@ -193,7 +193,9 @@ void tst_QPluginLoader::errorString()
QVERIFY(!unloaded);
}
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) && !defined(Q_OS_HPUX)
+// A bug in QNX causes the test to crash on exit after attempting to load
+// a shared library with undefined symbols (tracked as QTBUG-114682).
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) && !defined(Q_OS_HPUX) && !defined(Q_OS_QNX)
{
QPluginLoader loader( sys_qualifiedLibraryName("almostplugin")); //a plugin with unresolved symbols
loader.setLoadHints(QLibrary::ResolveAllSymbolsHint);
@@ -243,10 +245,37 @@ void tst_QPluginLoader::loadHints()
QSKIP("This test requires Qt to create shared libraries.");
#endif
QPluginLoader loader;
- QCOMPARE(loader.loadHints(), QLibrary::LoadHints{}); //Do not crash
+ QCOMPARE(loader.loadHints(), QLibrary::PreventUnloadHint); //Do not crash
loader.setLoadHints(QLibrary::ResolveAllSymbolsHint);
+ QCOMPARE(loader.loadHints(), QLibrary::ResolveAllSymbolsHint);
+ // We can clear load hints when file name is not set.
+ loader.setLoadHints(QLibrary::LoadHints{});
+ QCOMPARE(loader.loadHints(), QLibrary::LoadHints{});
+ // Set the hints again
+ loader.setLoadHints(QLibrary::ResolveAllSymbolsHint);
+ QCOMPARE(loader.loadHints(), QLibrary::ResolveAllSymbolsHint);
loader.setFileName( sys_qualifiedLibraryName("theplugin")); //a plugin
QCOMPARE(loader.loadHints(), QLibrary::ResolveAllSymbolsHint);
+
+ QPluginLoader loader4;
+ QCOMPARE(loader4.loadHints(), QLibrary::PreventUnloadHint);
+ loader4.setLoadHints(QLibrary::LoadHints{});
+ QCOMPARE(loader4.loadHints(), QLibrary::LoadHints{});
+ loader4.setFileName(sys_qualifiedLibraryName("theplugin"));
+ // Hints are merged with hints from the previous loader.
+ QCOMPARE(loader4.loadHints(), QLibrary::ResolveAllSymbolsHint);
+ // We cannot clear load hints after associating the loader with a file.
+ loader.setLoadHints(QLibrary::LoadHints{});
+ QCOMPARE(loader.loadHints(), QLibrary::ResolveAllSymbolsHint);
+
+ QPluginLoader loader2;
+ QCOMPARE(loader2.loadHints(), QLibrary::PreventUnloadHint);
+ loader2.setFileName(sys_qualifiedLibraryName("theplugin"));
+ // Hints are merged with hints from previous loaders.
+ QCOMPARE(loader2.loadHints(), QLibrary::PreventUnloadHint | QLibrary::ResolveAllSymbolsHint);
+
+ QPluginLoader loader3(sys_qualifiedLibraryName("theplugin"));
+ QCOMPARE(loader3.loadHints(), QLibrary::PreventUnloadHint | QLibrary::ResolveAllSymbolsHint);
}
void tst_QPluginLoader::deleteinstanceOnUnload()
diff --git a/qtbase/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/qtbase/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
index 533fb1c8aa..63ce77d67f 100644
--- a/qtbase/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
+++ b/qtbase/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
@@ -75,6 +75,7 @@ private slots:
void arrayStringElements();
void arraySelfAssign_data() { basics_data(); }
void arraySelfAssign();
+ void arrayNested();
void mapDefaultInitialization();
void mapEmptyInitializerList();
@@ -93,6 +94,7 @@ private slots:
void mapSelfAssign();
void mapComplexKeys_data() { basics_data(); }
void mapComplexKeys();
+ void mapNested();
void sorting();
@@ -1570,6 +1572,91 @@ void tst_QCborValue::mapComplexKeys()
QVERIFY(!m.contains(tagged));
}
+void tst_QCborValue::arrayNested()
+{
+ const QCborArray wrongArray = { false, nullptr, QCborValue() };
+ {
+ QCborArray a1 = { 42, 47 };
+ QCborArray a2 = { QCborValue(a1) };
+ QCOMPARE(a2.size(), 1);
+ const QCborValue &first = qAsConst(a2).first();
+ QVERIFY(first.isArray());
+ QCOMPARE(first.toArray(wrongArray).size(), 2);
+ QCOMPARE(first.toArray(wrongArray).first(), 42);
+ QCOMPARE(first.toArray(wrongArray).last(), 47);
+ }
+ {
+ QCborArray a1 = { 42, 47 };
+ QCborArray a2 = { QCborValue(a1) };
+ QCOMPARE(a2.size(), 1);
+ QCborValueRef first = a2.first();
+ QVERIFY(first.isArray());
+ QCOMPARE(first.toArray(wrongArray).size(), 2);
+ QCOMPARE(first.toArray(wrongArray).first(), 42);
+ QCOMPARE(first.toArray(wrongArray).last(), 47);
+ }
+
+ {
+ QCborArray a1;
+ a1 = { QCborValue(a1) }; // insert it into itself
+ QCOMPARE(a1.size(), 1);
+ const QCborValue &first = qAsConst(a1).first();
+ QVERIFY(first.isArray());
+ QCOMPARE(first, QCborArray());
+ QCOMPARE(first.toArray(wrongArray), QCborArray());
+ }
+ {
+ QCborArray a1;
+ a1 = { QCborValue(a1) }; // insert it into itself
+ QCborValueRef first = a1.first();
+ QVERIFY(first.isArray());
+ QCOMPARE(first, QCborArray());
+ QCOMPARE(first.toArray(wrongArray), QCborArray());
+ }
+ {
+ QCborArray a1;
+ a1.append(a1); // insert into itself
+ QCOMPARE(a1.size(), 1);
+ const QCborValue &first = qAsConst(a1).first();
+ QVERIFY(first.isArray());
+ QCOMPARE(first, QCborArray());
+ QCOMPARE(first.toArray(), QCborArray());
+ }
+ {
+ QCborArray a1;
+ a1.append(a1); // insert into itself
+ QCborValueRef first = a1.first();
+ QVERIFY(first.isArray());
+ QCOMPARE(first, QCborArray());
+ QCOMPARE(first.toArray(), QCborArray());
+ }
+}
+
+void tst_QCborValue::mapNested()
+{
+ const QCborMap wrongMap = { { -1, false }, {-2, nullptr }, { -3, QCborValue() } };
+ {
+ QCborMap m1 = { {1, 42}, {2, 47} };
+ QCborMap m2 = { { QString(), m1 } };
+ QCOMPARE(m2.size(), 1);
+ const QCborValue &first = m2.constBegin().value();
+ QVERIFY(first.isMap());
+ QCOMPARE(first.toMap(wrongMap).size(), 2);
+ QCOMPARE(first.toMap(wrongMap).begin().key(), 1);
+ QCOMPARE(first.toMap(wrongMap).begin().value(), 42);
+ }
+
+ {
+ QCborMap m1;
+ m1 = { { QString(), QCborValue(m1) } }; // insert it into itself
+ QCOMPARE(m1.size(), 1);
+ const QCborValue &first = m1.constBegin().value();
+ QVERIFY(first.isMap());
+ QCOMPARE(first, QCborMap());
+ QCOMPARE(first.toMap(wrongMap), QCborMap());
+ }
+}
+
void tst_QCborValue::sorting()
{
QCborValue vundef, vnull(nullptr);
diff --git a/qtbase/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp b/qtbase/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
index a2349a5846..9150abe65b 100644
--- a/qtbase/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
+++ b/qtbase/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
@@ -42,6 +42,7 @@
#include "qc14n.h"
+Q_DECLARE_METATYPE(QXmlStreamReader::Error)
Q_DECLARE_METATYPE(QXmlStreamReader::ReadElementTextBehaviour)
static const char *const catalogFile = "XML-Test-Suite/xmlconf/finalCatalog.xml";
@@ -587,6 +588,8 @@ private slots:
void readBack() const;
void roundTrip() const;
void roundTrip_data() const;
+ void test_fastScanName_data() const;
+ void test_fastScanName() const;
void entityExpansionLimit() const;
@@ -1843,5 +1846,42 @@ void tst_QXmlStream::roundTrip() const
QCOMPARE(out, in);
}
+void tst_QXmlStream::test_fastScanName_data() const
+{
+ QTest::addColumn<QByteArray>("data");
+ QTest::addColumn<QXmlStreamReader::Error>("errorType");
+
+ // 4096 is the limit in QXmlStreamReaderPrivate::fastScanName()
+
+ QByteArray arr = "<a:" + QByteArray("b").repeated(4096 - 1);
+ QTest::newRow("data1") << arr << QXmlStreamReader::PrematureEndOfDocumentError;
+
+ arr = "<a:" + QByteArray("b").repeated(4096);
+ QTest::newRow("data2") << arr << QXmlStreamReader::NotWellFormedError;
+
+ arr = "<" + QByteArray("a").repeated(4000) + ":" + QByteArray("b").repeated(96);
+ QTest::newRow("data3") << arr << QXmlStreamReader::PrematureEndOfDocumentError;
+
+ arr = "<" + QByteArray("a").repeated(4000) + ":" + QByteArray("b").repeated(96 + 1);
+ QTest::newRow("data4") << arr << QXmlStreamReader::NotWellFormedError;
+
+ arr = "<" + QByteArray("a").repeated(4000 + 1) + ":" + QByteArray("b").repeated(96);
+ QTest::newRow("data5") << arr << QXmlStreamReader::NotWellFormedError;
+}
+
+void tst_QXmlStream::test_fastScanName() const
+{
+ QFETCH(QByteArray, data);
+ QFETCH(QXmlStreamReader::Error, errorType);
+
+ QXmlStreamReader reader(data);
+ QXmlStreamReader::TokenType tokenType;
+ while (!reader.atEnd())
+ tokenType = reader.readNext();
+
+ QCOMPARE(tokenType, QXmlStreamReader::Invalid);
+ QCOMPARE(reader.error(), errorType);
+}
+
#include "tst_qxmlstream.moc"
// vim: et:ts=4:sw=4:sts=4
diff --git a/qtbase/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/qtbase/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
index 874468c954..04ceb4ab65 100644
--- a/qtbase/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
+++ b/qtbase/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
@@ -507,6 +507,10 @@ void tst_QKeySequence::toStringFromKeycode_data()
QTest::newRow("Ctrl+Alt+Num+Del") << QKeySequence(Qt::ControlModifier | Qt::AltModifier | Qt::KeypadModifier | Qt::Key_Delete) << "Ctrl+Alt+Num+Del";
QTest::newRow("Ctrl+Ins") << QKeySequence(Qt::ControlModifier | Qt::Key_Insert) << "Ctrl+Ins";
QTest::newRow("Ctrl+Num+Ins(1)") << QKeySequence(Qt::Key_Insert | Qt::KeypadModifier | Qt::ControlModifier) << "Ctrl+Num+Ins";
+ QTest::newRow("Ctrl") << QKeySequence(Qt::Key_Control) << "Control";
+ QTest::newRow("Alt") << QKeySequence(Qt::Key_Alt) << "Alt";
+ QTest::newRow("Shift") << QKeySequence(Qt::Key_Shift) << "Shift";
+ QTest::newRow("Meta") << QKeySequence(Qt::Key_Meta) << "Meta";
}
void tst_QKeySequence::toStringFromKeycode()
diff --git a/qtbase/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/qtbase/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index d7c3f95f1d..bfc77b0831 100644
--- a/qtbase/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/qtbase/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -84,6 +84,7 @@ private slots:
#endif
void drawPixmapFragments();
void drawPixmapNegativeScale();
+ void drawPixmapRounding();
void drawLine_data();
void drawLine();
@@ -799,6 +800,16 @@ void tst_QPainter::drawPixmapNegativeScale()
QVERIFY(resultImage.pixel(12, 8) == qRgba(0, 0, 0, 255)); // and right strip is now black
}
+void tst_QPainter::drawPixmapRounding()
+{
+ // Just test that we don't assert
+ QBitmap bm(8, 8);
+ QImage out(64, 64, QImage::Format_RGB32);
+ QPainter p(&out);
+ qreal y = 26.499999999999996;
+ p.drawPixmap(QPointF(0, y), bm);
+}
+
void tst_QPainter::drawLine_data()
{
QTest::addColumn<QLine>("line");
diff --git a/qtbase/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/qtbase/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index 15e0ecadaa..b4eca74283 100644
--- a/qtbase/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
+++ b/qtbase/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
@@ -81,6 +81,8 @@ private slots:
void registerOpenTypePreferredNamesSystem();
void registerOpenTypePreferredNamesApplication();
+ void stretchRespected();
+
private:
QString m_ledFont;
QString m_testFont;
@@ -355,6 +357,28 @@ static QString testString()
return QStringLiteral("foo bar");
}
+void tst_QFontDatabase::stretchRespected()
+{
+ int italicId = QFontDatabase::addApplicationFont(m_testFontItalic);
+ QVERIFY(italicId != -1);
+
+ QVERIFY(!QFontDatabase::applicationFontFamilies(italicId).isEmpty());
+
+ QString italicFontName = QFontDatabase::applicationFontFamilies(italicId).first();
+
+ QFont italicFont = QFontDatabase().font(italicFontName,
+ QString::fromLatin1("Italic"), 14);
+ QVERIFY(italicFont.italic());
+
+ QFont italicStretchedFont = italicFont;
+ italicStretchedFont.setStretch( 400 );
+
+ QVERIFY(QFontMetricsF(italicFont).horizontalAdvance(QStringLiteral("foobar")) <
+ QFontMetricsF(italicStretchedFont).horizontalAdvance(QStringLiteral("foobar")));
+
+ QFontDatabase::removeApplicationFont(italicId);
+}
+
void tst_QFontDatabase::condensedFontWidthNoFontMerging()
{
int regularFontId = QFontDatabase::addApplicationFont(m_testFont);
diff --git a/qtbase/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp b/qtbase/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp
index 7ba3715e13..752aa122f6 100644
--- a/qtbase/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp
+++ b/qtbase/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp
@@ -179,6 +179,7 @@ void tst_QAccessibilityLinux::initTestCase()
QVERIFY(!address.isEmpty());
m_window = new AccessibleTestWindow();
+ m_window->setObjectName("mainWindow"_L1);
m_window->show();
QVERIFY(QTest::qWaitForWindowExposed(m_window));
@@ -236,8 +237,11 @@ bool hasState(QDBusInterface *interface, AtspiStateType state)
void tst_QAccessibilityLinux::testLabel()
{
QLabel *l = new QLabel(m_window);
+ l->setObjectName("theObjectName"_L1);
l->setText("Hello A11y");
m_window->addWidget(l);
+ auto a11yEmpty = new QLabel(m_window);
+ m_window->addWidget(l);
// Application
QCOMPARE(getParent(mainWindow), QLatin1String(ATSPI_DBUS_PATH_ROOT));
@@ -249,6 +253,8 @@ void tst_QAccessibilityLinux::testLabel()
QCOMPARE(getChildren(labelInterface).count(), 0);
QCOMPARE(labelInterface->call(QDBus::Block, "GetRoleName").arguments().first().toString(), QLatin1String("label"));
QCOMPARE(labelInterface->call(QDBus::Block, "GetRole").arguments().first().toUInt(), 29u);
+ QCOMPARE(labelInterface->call(QDBus::Block, "GetAccessibleId").arguments().first().toString(),
+ QLatin1String("mainWindow.theObjectName"));
QCOMPARE(getParent(labelInterface), mainWindow->path());
QVERIFY(!hasState(labelInterface, ATSPI_STATE_EDITABLE));
QVERIFY(hasState(labelInterface, ATSPI_STATE_READ_ONLY));
@@ -256,7 +262,12 @@ void tst_QAccessibilityLinux::testLabel()
l->setText("New text");
QCOMPARE(labelInterface->property("Name").toString(), l->text());
+ auto *a11yEmptyInterface = getInterface(children.at(1), "org.a11y.atspi.Accessible");
+ QCOMPARE(a11yEmptyInterface->call(QDBus::Block, "GetAccessibleId").arguments().first().toString(),
+ QLatin1String("mainWindow.QLabel"));
+
m_window->clearChildren();
+ delete a11yEmptyInterface;
delete labelInterface;
}
diff --git a/qtbase/tests/auto/testlib/qabstractitemmodeltester/tst_qabstractitemmodeltester.cpp b/qtbase/tests/auto/testlib/qabstractitemmodeltester/tst_qabstractitemmodeltester.cpp
index 4aa3f8d60b..d2050a61aa 100644
--- a/qtbase/tests/auto/testlib/qabstractitemmodeltester/tst_qabstractitemmodeltester.cpp
+++ b/qtbase/tests/auto/testlib/qabstractitemmodeltester/tst_qabstractitemmodeltester.cpp
@@ -115,6 +115,10 @@ void tst_QAbstractItemModelTester::standardItemModelZeroColumns()
// QTBUG-92886
model.insertRows(0, 5);
model.removeRows(1, 2);
+
+ const QModelIndex parentIndex = model.index(0, 0);
+ model.insertRows(0, 5, parentIndex);
+ model.removeRows(1, 2, parentIndex);
}
void tst_QAbstractItemModelTester::testInsertThroughProxy()
diff --git a/qtbase/tests/auto/tools/moc/allmocs_baseline_in.json b/qtbase/tests/auto/tools/moc/allmocs_baseline_in.json
index 18282505e4..ce518e78fb 100644
--- a/qtbase/tests/auto/tools/moc/allmocs_baseline_in.json
+++ b/qtbase/tests/auto/tools/moc/allmocs_baseline_in.json
@@ -668,40 +668,6 @@
"inputFile": "task192552.h",
"outputRevision": 67
},
- {
- "classes": [
- {
- "className": "InlineSlotsWithThrowDeclaration",
- "object": true,
- "qualifiedClassName": "InlineSlotsWithThrowDeclaration",
- "slots": [
- {
- "access": "public",
- "name": "a",
- "returnType": "void"
- },
- {
- "access": "public",
- "name": "b",
- "returnType": "void"
- },
- {
- "access": "public",
- "name": "c",
- "returnType": "void"
- }
- ],
- "superClasses": [
- {
- "access": "public",
- "name": "QObject"
- }
- ]
- }
- ],
- "inputFile": "task189996.h",
- "outputRevision": 67
- },
{
"classes": [
{
diff --git a/qtbase/tests/auto/tools/moc/moc.pro b/qtbase/tests/auto/tools/moc/moc.pro
index c324b3a8cd..4aceb78dc0 100644
--- a/qtbase/tests/auto/tools/moc/moc.pro
+++ b/qtbase/tests/auto/tools/moc/moc.pro
@@ -15,7 +15,7 @@ cross_compile: DEFINES += MOC_CROSS_COMPILED
HEADERS += using-namespaces.h no-keywords.h task87883.h c-comments.h backslash-newlines.h oldstyle-casts.h \
slots-with-void-template.h qinvokable.h namespaced-flags.h trigraphs.h \
escapes-in-string-literals.h cstyle-enums.h qprivateslots.h gadgetwithnoenums.h \
- dir-in-include-path.h single_function_keyword.h task192552.h task189996.h \
+ dir-in-include-path.h single_function_keyword.h task192552.h \
task234909.h task240368.h pure-virtual-signals.h cxx11-enums.h \
cxx11-final-classes.h \
cxx11-explicit-override-control.h \
diff --git a/qtbase/tests/auto/tools/moc/task189996.h b/qtbase/tests/auto/tools/moc/task189996.h
deleted file mode 100644
index ba9450c271..0000000000
--- a/qtbase/tests/auto/tools/moc/task189996.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-// inline functions can have throw declarations
-
-#ifndef TASK189996_H
-#define TASK189996_H
-
-#include <QObject>
-
-class InlineSlotsWithThrowDeclaration : public QObject
-{
- Q_OBJECT
-
-public slots:
- void a() noexcept { }
- void b() const noexcept { }
- void c() noexcept;
-};
-
-#endif
diff --git a/qtbase/tests/auto/tools/moc/tst_moc.cpp b/qtbase/tests/auto/tools/moc/tst_moc.cpp
index cc465a213a..a9ab6ec4f3 100644
--- a/qtbase/tests/auto/tools/moc/tst_moc.cpp
+++ b/qtbase/tests/auto/tools/moc/tst_moc.cpp
@@ -671,7 +671,6 @@ private slots:
void templateGtGt();
void qprivateslots();
void qprivateproperties();
- void inlineSlotsWithThrowDeclaration();
void warnOnPropertyWithoutREAD();
void constructors();
void typenameWithUnsigned();
@@ -816,7 +815,7 @@ void tst_Moc::oldStyleCasts()
QStringList args;
args << "-c" << "-x" << "c++" << "-Wold-style-cast" << "-I" << "."
- << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-std=c++11" << "-";
+ << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-std=c++1z" << "-";
proc.start("gcc", args);
QVERIFY(proc.waitForStarted());
proc.write(mocOut);
@@ -886,7 +885,7 @@ void tst_Moc::inputFileNameWithDotsButNoExtension()
QStringList args;
args << "-c" << "-x" << "c++" << "-I" << ".."
- << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-std=c++11" << "-";
+ << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-std=c++1z" << "-";
proc.start("gcc", args);
QVERIFY(proc.waitForStarted());
proc.write(mocOut);
@@ -1166,7 +1165,7 @@ void tst_Moc::ignoreOptionClashes()
QStringList gccArgs;
gccArgs << "-c" << "-x" << "c++" << "-I" << ".."
<< "-I" << qtIncludePath << "-I" << includeDir << "-o" << "/dev/null"
- << "-fPIC" << "-std=c++11" << "-";
+ << "-fPIC" << "-std=c++1z" << "-";
proc.start("gcc", gccArgs);
QVERIFY(proc.waitForStarted());
proc.write(mocOut);
@@ -1585,19 +1584,6 @@ void tst_Moc::qprivateproperties()
}
-#include "task189996.h"
-
-void InlineSlotsWithThrowDeclaration::c() noexcept {}
-
-void tst_Moc::inlineSlotsWithThrowDeclaration()
-{
- InlineSlotsWithThrowDeclaration tst;
- const QMetaObject *mobj = tst.metaObject();
- QVERIFY(mobj->indexOfSlot("a()") != -1);
- QVERIFY(mobj->indexOfSlot("b()") != -1);
- QVERIFY(mobj->indexOfSlot("c()") != -1);
-}
-
void tst_Moc::warnOnPropertyWithoutREAD()
{
#ifdef MOC_CROSS_COMPILED
@@ -1859,7 +1845,7 @@ void tst_Moc::notifyError()
QStringList args;
args << "-c" << "-x" << "c++" << "-I" << "."
- << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-std=c++11" << "-";
+ << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-std=c++1z" << "-";
proc.start("gcc", args);
QVERIFY(proc.waitForStarted());
proc.write(mocOut);
diff --git a/qtbase/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/qtbase/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index 761357b252..06bb706074 100644
--- a/qtbase/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/qtbase/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -397,6 +397,7 @@ private slots:
void checkHeaderMinSize();
void resizeToContents();
+ void resizeToContentsSpans();
void tabFocus();
void bigModel();
@@ -3721,6 +3722,70 @@ void tst_QTableView::resizeToContents()
}
+
+class SpanModel : public QAbstractTableModel
+{
+public:
+ SpanModel(bool sectionsMoved)
+ : _sectionsMoved(sectionsMoved)
+ {}
+ int columnCount(const QModelIndex & = {}) const override { return 2; }
+ int rowCount(const QModelIndex & = {}) const override { return 1; }
+ QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override
+ {
+ if (role != Qt::DisplayRole)
+ return QVariant();
+ const int col = _sectionsMoved ? 1 - idx.column() : idx.column();
+ if (col == 0)
+ return "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.";
+ return QVariant();
+ }
+private:
+ bool _sectionsMoved;
+};
+
+
+void tst_QTableView::resizeToContentsSpans()
+{
+ SpanModel model1(false);
+ SpanModel model2(true);
+ QTableView view1, view2, view3;
+ view1.setModel(&model1);
+ view2.setModel(&model2);
+ view2.horizontalHeader()->moveSection(0, 1);
+ view3.setModel(&model1);
+
+ view1.setSpan(0, 0, 1, 2);
+ view2.setSpan(0, 1, 1, 2);
+ view1.show();
+ view2.show();
+ view3.show();
+ QVERIFY(QTest::qWaitForWindowExposed(&view1));
+ QVERIFY(QTest::qWaitForWindowExposed(&view2));
+ QVERIFY(QTest::qWaitForWindowExposed(&view3));
+ view1.setColumnWidth(0, 100);
+ view1.setColumnWidth(1, 100);
+ view2.setColumnWidth(0, 100);
+ view2.setColumnWidth(1, 100);
+ view3.setColumnWidth(0, 200);
+
+ view1.resizeRowToContents(0);
+ view2.resizeRowToContents(0);
+ view3.resizeRowToContents(0);
+ QCOMPARE(view1.rowHeight(0), view3.rowHeight(0));
+ QCOMPARE(view2.rowHeight(0), view3.rowHeight(0));
+
+ view3.resizeColumnToContents(0);
+ view3.resizeRowToContents(0);
+ // height should be only 1 text line for easy testing
+ view1.setRowHeight(0, view3.verticalHeader()->sectionSize(0));
+ view2.setRowHeight(0, view3.verticalHeader()->sectionSize(0));
+ view1.resizeColumnToContents(0);
+ view2.resizeColumnToContents(1);
+ QCOMPARE(view1.columnWidth(0), view3.columnWidth(0) - view1.columnWidth(1));
+ QCOMPARE(view2.columnWidth(0), view3.columnWidth(0) - view2.columnWidth(1));
+}
+
QT_BEGIN_NAMESPACE
extern bool Q_WIDGETS_EXPORT qt_tab_all_widgets(); // qapplication.cpp
QT_END_NAMESPACE
diff --git a/qtbase/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/qtbase/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
index eb108a40de..dca5528c1b 100644
--- a/qtbase/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
+++ b/qtbase/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
@@ -41,6 +41,7 @@
#include <private/qguiapplication_p.h>
#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformtheme.h>
class tst_QAbstractButton : public QObject
{
@@ -76,6 +77,8 @@ private slots:
void keyNavigation();
#endif
+ void buttonPressKeys();
+
protected slots:
void onClicked();
void onToggled( bool on );
@@ -269,7 +272,13 @@ void tst_QAbstractButton::setAutoRepeat()
QCOMPARE(press_count, click_count);
QVERIFY(click_count > 1);
break;
- case 4:
+ case 4: {
+ const auto buttonPressKeys = QGuiApplicationPrivate::platformTheme()
+ ->themeHint(QPlatformTheme::ButtonPressKeys)
+ .value<QList<Qt::Key>>();
+ if (buttonPressKeys.contains(Qt::Key_Enter)) {
+ QSKIP("platform theme has Key_Enter in ButtonPressKeys");
+ }
// check that pressing ENTER has no effect when autorepeat is false
testWidget->setDown( false );
testWidget->setAutoRepeat( false );
@@ -286,7 +295,14 @@ void tst_QAbstractButton::setAutoRepeat()
QVERIFY( click_count == 0 );
break;
- case 5:
+ }
+ case 5: {
+ const auto buttonPressKeys = QGuiApplicationPrivate::platformTheme()
+ ->themeHint(QPlatformTheme::ButtonPressKeys)
+ .value<QList<Qt::Key>>();
+ if (buttonPressKeys.contains(Qt::Key_Enter)) {
+ QSKIP("platform theme has Key_Enter in ButtonPressKeys");
+ }
// check that pressing ENTER has no effect when autorepeat is true
testWidget->setDown( false );
testWidget->setAutoRepeat( true );
@@ -304,6 +320,7 @@ void tst_QAbstractButton::setAutoRepeat()
QVERIFY( click_count == 0 );
break;
+ }
case 6:
// verify autorepeat is off by default.
MyButton tmp( 0);
@@ -651,5 +668,16 @@ void tst_QAbstractButton::keyNavigation()
}
#endif
+void tst_QAbstractButton::buttonPressKeys()
+{
+ const auto buttonPressKeys = QGuiApplicationPrivate::platformTheme()
+ ->themeHint(QPlatformTheme::ButtonPressKeys)
+ .value<QList<Qt::Key>>();
+ for (int i = 0; i < buttonPressKeys.length(); ++i) {
+ QTest::keyClick(testWidget, buttonPressKeys[i]);
+ QCOMPARE(click_count, i + 1);
+ }
+}
+
QTEST_MAIN(tst_QAbstractButton)
#include "tst_qabstractbutton.moc"
diff --git a/qtbase/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/qtbase/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 7af60ed757..46b5af6d63 100644
--- a/qtbase/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/qtbase/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -168,6 +168,7 @@ private slots:
void checkMenuItemPosWhenStyleSheetIsSet();
void checkEmbeddedLineEditWhenStyleSheetIsSet();
void propagateStyleChanges();
+ void buttonPressKeys();
private:
PlatformInputContext m_platformInputContext;
@@ -3642,5 +3643,24 @@ void tst_QComboBox::propagateStyleChanges()
QVERIFY(frameStyle.inquired);
}
+void tst_QComboBox::buttonPressKeys()
+{
+ QComboBox comboBox;
+ comboBox.setEditable(false);
+ comboBox.addItem(QString::number(1));
+ comboBox.addItem(QString::number(2));
+ const auto buttonPressKeys = QGuiApplicationPrivate::platformTheme()
+ ->themeHint(QPlatformTheme::ButtonPressKeys)
+ .value<QList<Qt::Key>>();
+ for (int i = 0; i < buttonPressKeys.length(); ++i) {
+ QTest::keyClick(&comboBox, buttonPressKeys[i]);
+ // On some platforms, a window will not be immediately visible,
+ // but take some event-loop iterations to complete.
+ // Using QTRY_VERIFY to deal with that.
+ QTRY_VERIFY(comboBox.view()->isVisible());
+ comboBox.hidePopup();
+ }
+}
+
QTEST_MAIN(tst_QComboBox)
#include "tst_qcombobox.moc"
diff --git a/qtbase/tests/auto/widgets/widgets/qcommandlinkbutton/qcommandlinkbutton.pro b/qtbase/tests/auto/widgets/widgets/qcommandlinkbutton/qcommandlinkbutton.pro
index be3cfcd104..c228fdfcca 100644
--- a/qtbase/tests/auto/widgets/widgets/qcommandlinkbutton/qcommandlinkbutton.pro
+++ b/qtbase/tests/auto/widgets/widgets/qcommandlinkbutton/qcommandlinkbutton.pro
@@ -1,6 +1,6 @@
CONFIG += testcase
TARGET = tst_qcommandlinkbutton
-QT += widgets testlib
+QT += widgets testlib gui-private
SOURCES += tst_qcommandlinkbutton.cpp
diff --git a/qtbase/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/qtbase/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
index 0044d33c66..4cf06296e4 100644
--- a/qtbase/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
+++ b/qtbase/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
@@ -40,6 +40,9 @@
#include <QGridLayout>
#include <QPainter>
+#include <private/qguiapplication_p.h>
+#include <qpa/qplatformtheme.h>
+
class tst_QCommandLinkButton : public QObject
{
Q_OBJECT
@@ -223,6 +226,13 @@ void tst_QCommandLinkButton::setAutoRepeat()
// check that pressing ENTER has no effect
resetCounters();
testWidget->setDown( false );
+ // Skip after reset if ButtonPressKeys has Key_Enter
+ const auto buttonPressKeys = QGuiApplicationPrivate::platformTheme()
+ ->themeHint(QPlatformTheme::ButtonPressKeys)
+ .value<QList<Qt::Key>>();
+ if (buttonPressKeys.contains(Qt::Key_Enter)) {
+ return;
+ }
testWidget->setAutoRepeat( false );
QTest::keyPress( testWidget, Qt::Key_Enter );
@@ -255,6 +265,14 @@ void tst_QCommandLinkButton::pressed()
QCOMPARE( press_count, (uint)1 );
QCOMPARE( release_count, (uint)1 );
+ // Skip if ButtonPressKeys has Key_Enter
+ const auto buttonPressKeys = QGuiApplicationPrivate::platformTheme()
+ ->themeHint(QPlatformTheme::ButtonPressKeys)
+ .value<QList<Qt::Key>>();
+ if (buttonPressKeys.contains(Qt::Key_Enter)) {
+ return;
+ }
+
QTest::keyPress( testWidget,Qt::Key_Enter );
QCOMPARE( press_count, (uint)1 );
QCOMPARE( release_count, (uint)1 );
diff --git a/qtbase/tests/auto/widgets/widgets/qdial/tst_qdial.cpp b/qtbase/tests/auto/widgets/widgets/qdial/tst_qdial.cpp
index 356f773ae9..a014df3b15 100644
--- a/qtbase/tests/auto/widgets/widgets/qdial/tst_qdial.cpp
+++ b/qtbase/tests/auto/widgets/widgets/qdial/tst_qdial.cpp
@@ -42,6 +42,7 @@ private slots:
void valueChanged();
void sliderMoved();
void wrappingCheck();
+ void minEqualMaxValueOutsideRange();
};
// Testing get/set functions
@@ -194,5 +195,14 @@ void tst_QDial::wrappingCheck()
}
}
+// QTBUG-104641
+void tst_QDial::minEqualMaxValueOutsideRange()
+{
+ QDial dial;
+ dial.setRange(30, 30);
+ dial.setWrapping(true);
+ dial.setValue(45);
+}
+
QTEST_MAIN(tst_QDial)
#include "tst_qdial.moc"
diff --git a/qtbase/tests/auto/widgets/widgets/qgroupbox/qgroupbox.pro b/qtbase/tests/auto/widgets/widgets/qgroupbox/qgroupbox.pro
index 4a5e76ff65..a235fa1fac 100644
--- a/qtbase/tests/auto/widgets/widgets/qgroupbox/qgroupbox.pro
+++ b/qtbase/tests/auto/widgets/widgets/qgroupbox/qgroupbox.pro
@@ -1,6 +1,6 @@
CONFIG += testcase
TARGET = tst_qgroupbox
-QT += widgets testlib
+QT += widgets testlib gui-private
SOURCES += tst_qgroupbox.cpp
diff --git a/qtbase/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp b/qtbase/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
index 4fb5d262ca..d8d7562b73 100644
--- a/qtbase/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
+++ b/qtbase/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
@@ -35,6 +35,9 @@
#include <QRadioButton>
#include <QDialog>
+#include <private/qguiapplication_p.h>
+#include <qpa/qplatformtheme.h>
+
#include "qgroupbox.h"
class tst_QGroupBox : public QObject
@@ -69,6 +72,7 @@ private slots:
void propagateFocus();
void task_QTBUG_19170_ignoreMouseReleaseEvent();
void task_QTBUG_15519_propagateMouseEvents();
+ void buttonPressKeys();
private:
bool checked;
@@ -610,6 +614,20 @@ void tst_QGroupBox::task_QTBUG_15519_propagateMouseEvents()
QCOMPARE(parent.mouseMoved, true);
}
+void tst_QGroupBox::buttonPressKeys()
+{
+ QGroupBox groupBox;
+ groupBox.setCheckable(true);
+ QSignalSpy clickedSpy(&groupBox, &QGroupBox::clicked);
+ const auto buttonPressKeys = QGuiApplicationPrivate::platformTheme()
+ ->themeHint(QPlatformTheme::ButtonPressKeys)
+ .value<QList<Qt::Key>>();
+ for (int i = 0; i < buttonPressKeys.length(); ++i) {
+ QTest::keyClick(&groupBox, buttonPressKeys[i]);
+ QCOMPARE(clickedSpy.length(), i + 1);
+ }
+}
+
void tst_QGroupBox::sendMouseMoveEvent(QWidget *widget, const QPoint &localPos)
{
// Send a MouseMove event without actually moving the pointer
diff --git a/qtbase/tests/auto/widgets/widgets/qpushbutton/qpushbutton.pro b/qtbase/tests/auto/widgets/widgets/qpushbutton/qpushbutton.pro
index 353ad06ca2..e55f6148f2 100644
--- a/qtbase/tests/auto/widgets/widgets/qpushbutton/qpushbutton.pro
+++ b/qtbase/tests/auto/widgets/widgets/qpushbutton/qpushbutton.pro
@@ -1,6 +1,6 @@
CONFIG += testcase
TARGET = tst_qpushbutton
-QT += widgets testlib
+QT += widgets testlib gui-private
SOURCES += tst_qpushbutton.cpp
diff --git a/qtbase/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/qtbase/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
index e818514a79..4043e9326a 100644
--- a/qtbase/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
+++ b/qtbase/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
@@ -41,6 +41,9 @@
#include <QStyleFactory>
#include <QTabWidget>
+#include <private/qguiapplication_p.h>
+#include <qpa/qplatformtheme.h>
+
class tst_QPushButton : public QObject
{
Q_OBJECT
@@ -212,6 +215,13 @@ void tst_QPushButton::autoRepeat()
// check that pressing ENTER has no effect
resetCounters();
testWidget->setDown( false );
+ // Skip after reset if ButtonPressKeys has Key_Enter
+ const auto buttonPressKeys = QGuiApplicationPrivate::platformTheme()
+ ->themeHint(QPlatformTheme::ButtonPressKeys)
+ .value<QList<Qt::Key>>();
+ if (buttonPressKeys.contains(Qt::Key_Enter)) {
+ return;
+ }
testWidget->setAutoRepeat( false );
QTest::keyPress( testWidget, Qt::Key_Enter );
@@ -247,6 +257,14 @@ void tst_QPushButton::pressed()
QCOMPARE( press_count, (uint)1 );
QCOMPARE( release_count, (uint)1 );
+ // Skip if ButtonPressKeys has Key_Enter
+ const auto buttonPressKeys = QGuiApplicationPrivate::platformTheme()
+ ->themeHint(QPlatformTheme::ButtonPressKeys)
+ .value<QList<Qt::Key>>();
+ if (buttonPressKeys.contains(Qt::Key_Enter)) {
+ return;
+ }
+
QTest::keyPress( testWidget,Qt::Key_Enter );
QCOMPARE( press_count, (uint)1 );
QCOMPARE( release_count, (uint)1 );
diff --git a/qtbase/tests/auto/xml/sax/qxmlsimplereader/parser/main.cpp b/qtbase/tests/auto/xml/sax/qxmlsimplereader/parser/main.cpp
index b5d9fea315..c5597c6f8e 100644
--- a/qtbase/tests/auto/xml/sax/qxmlsimplereader/parser/main.cpp
+++ b/qtbase/tests/auto/xml/sax/qxmlsimplereader/parser/main.cpp
@@ -37,7 +37,6 @@
#include "parser.h"
-static QTextStream qout(stdout, QIODevice::WriteOnly);
static QTextStream qerr(stderr, QIODevice::WriteOnly);
static void usage()
@@ -79,19 +78,15 @@ int main(int argc, const char *argv[])
if (out_file_name.isEmpty())
out_file_name = file_name + ".ref";
- QFile _out_file;
- QTextStream _out_stream;
- QTextStream *out_stream;
+ QFile out_file;
if (out_file_name == "-") {
- out_stream = &qout;
+ out_file.open(stdout, QFile::WriteOnly);
} else {
- _out_file.setFileName(out_file_name);
- if (!_out_file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+ out_file.setFileName(out_file_name);
+ if (!out_file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
qerr << "Could not open " << out_file_name << ": " << strerror(errno) << Qt::endl;
return 1;
}
- _out_stream.setDevice(&_out_file);
- out_stream = &_out_stream;
}
Parser parser;
@@ -102,9 +97,7 @@ int main(int argc, const char *argv[])
parser.parseFile(&in_file);
- out_stream->setCodec("utf8");
-
- *out_stream << parser.result();
+ out_file.write(parser.result().toUtf8());
return 0;
}
diff --git a/qtbase/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp b/qtbase/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
index 44f8101955..24aa9376da 100644
--- a/qtbase/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
+++ b/qtbase/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
@@ -142,11 +142,12 @@ bool ContentHandler::startElement(const QString &namespaceURI,
QString ContentHandler::escapeStr(const QString &s)
{
QString result = s;
- result.replace(QRegularExpression("\""), "\\\"");
- result.replace(QRegularExpression("\\"), "\\\\");
- result.replace(QRegularExpression("\n"), "\\n");
- result.replace(QRegularExpression("\r"), "\\r");
- result.replace(QRegularExpression("\t"), "\\t");
+ result.replace(QChar(0), "\\0");
+ result.replace("\\", "\\\\");
+ result.replace("\"", "\\\"");
+ result.replace("\n", "\\n");
+ result.replace("\r", "\\r");
+ result.replace("\t", "\\t");
return result;
}
diff --git a/qtbase/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp b/qtbase/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
index cea4e3c8b8..df158cae0f 100644
--- a/qtbase/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
+++ b/qtbase/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
@@ -311,14 +311,12 @@ void tst_QXmlSimpleReader::testGoodXmlFile()
QVERIFY(file.open(QIODevice::ReadOnly));
Parser parser;
- QEXPECT_FAIL(QFINDTESTDATA("xmldocs/valid/sa/089.xml").toLocal8Bit().constData(), "a form feed character is not accepted in XML", Continue);
QVERIFY(parser.parseFile(&file));
QFile ref_file(file_name + ".ref");
QVERIFY(ref_file.open(QIODevice::ReadOnly | QIODevice::Text));
- QTextStream ref_stream(&ref_file);
- ref_stream.setCodec("UTF-8");
- QString ref_file_contents = ref_stream.readAll();
+ QByteArray data = ref_file.readAll();
+ QString ref_file_contents = QString::fromUtf8(data.constData(), data.size());
QCOMPARE(parser.result(), ref_file_contents);
}
@@ -393,9 +391,7 @@ void tst_QXmlSimpleReader::testBadXmlFile()
QFile ref_file(file_name + ".ref");
QVERIFY(ref_file.open(QIODevice::ReadOnly | QIODevice::Text));
- QTextStream ref_stream(&ref_file);
- ref_stream.setCodec("UTF-8");
- QString ref_file_contents = ref_stream.readAll();
+ QString ref_file_contents = QString::fromUtf8(ref_file.readAll());
QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/145.xml").toLocal8Bit().constData(), "Surrogate code point 0xD800 should be rejected", Continue);
@@ -469,9 +465,7 @@ void tst_QXmlSimpleReader::testIncrementalParsing()
QFile ref_file(file_name + ".ref");
QVERIFY(ref_file.open(QIODevice::ReadOnly | QIODevice::Text));
- QTextStream ref_stream(&ref_file);
- ref_stream.setCodec("UTF-8");
- QString ref_file_contents = ref_stream.readAll();
+ QString ref_file_contents = QString::fromUtf8(ref_file.readAll());
QCOMPARE(parser.result(), ref_file_contents);
}
diff --git a/qtbase/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/142.xml.ref b/qtbase/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/142.xml.ref
index 7ce4da6a06..0684cfa943 100644
Binary files a/qtbase/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/142.xml.ref and b/qtbase/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/142.xml.ref differ
diff --git a/qtbase/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml.ref b/qtbase/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml.ref
index 579aeb52f6..0b806c96a8 100644
Binary files a/qtbase/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml.ref and b/qtbase/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml.ref differ
diff --git a/qtbase/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml.ref b/qtbase/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml.ref
index 7c68c32286..f09bc2bd09 100644
Binary files a/qtbase/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml.ref and b/qtbase/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml.ref differ
diff --git a/qtbase/tests/manual/rhi/cubemap_render/buildshader.bat b/qtbase/tests/manual/rhi/cubemap_render/buildshader.bat
old mode 100755
new mode 100644
Submodule qtconnectivity f1fed9fb..8024ef3d:
diff --git a/qtconnectivity/src/bluetooth/qbluetoothsocket.cpp b/qtconnectivity/src/bluetooth/qbluetoothsocket.cpp
index 9da67272..fcd0fbb2 100644
--- a/qtconnectivity/src/bluetooth/qbluetoothsocket.cpp
+++ b/qtconnectivity/src/bluetooth/qbluetoothsocket.cpp
@@ -797,7 +797,9 @@ void QBluetoothSocket::close()
Returns true on success
*/
-
+// ### Qt 7 consider making this function private. The qbluetoothsocket_bluez backend is the
+// the only backend providing publicly accessible support for this. Other backends implement
+// similarly named, but private, overload
bool QBluetoothSocket::setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType,
SocketState socketState, OpenMode openMode)
{
diff --git a/qtconnectivity/src/bluetooth/qbluetoothuuid.cpp b/qtconnectivity/src/bluetooth/qbluetoothuuid.cpp
index bc00aa95..517465bd 100644
--- a/qtconnectivity/src/bluetooth/qbluetoothuuid.cpp
+++ b/qtconnectivity/src/bluetooth/qbluetoothuuid.cpp
@@ -834,8 +834,6 @@ QString QBluetoothUuid::serviceClassToString(QBluetoothUuid::ServiceClassUuid uu
//: Connection management (Bluetooth)
case QBluetoothUuid::BondManagement: return QBluetoothServiceDiscoveryAgent::tr("Bond Management");
case QBluetoothUuid::ContinuousGlucoseMonitoring: return QBluetoothServiceDiscoveryAgent::tr("Continuous Glucose Monitoring");
- default:
- break;
}
return QString();
@@ -878,8 +876,6 @@ QString QBluetoothUuid::protocolToString(QBluetoothUuid::ProtocolUuid uuid)
case QBluetoothUuid::McapControlChannel: return QBluetoothServiceDiscoveryAgent::tr("Multi-Channel Adaptation Protocol - Control");
case QBluetoothUuid::McapDataChannel: return QBluetoothServiceDiscoveryAgent::tr("Multi-Channel Adaptation Protocol - Data");
case QBluetoothUuid::L2cap: return QBluetoothServiceDiscoveryAgent::tr("Layer 2 Control Protocol");
- default:
- break;
}
return QString();
@@ -1081,13 +1077,13 @@ QString QBluetoothUuid::characteristicToString(CharacteristicType uuid)
case QBluetoothUuid::BodyCompositionFeature: return QBluetoothServiceDiscoveryAgent::tr("Body Composition Feature");
case QBluetoothUuid::BodyCompositionMeasurement: return QBluetoothServiceDiscoveryAgent::tr("Body Composition Measurement");
case QBluetoothUuid::WeightMeasurement: return QBluetoothServiceDiscoveryAgent::tr("Weight Measurement");
+ case QBluetoothUuid::CharacteristicType::WeightScaleFeature:
+ return QBluetoothServiceDiscoveryAgent::tr("Weight Scale Feature");
case QBluetoothUuid::UserControlPoint: return QBluetoothServiceDiscoveryAgent::tr("User Control Point");
case QBluetoothUuid::MagneticFluxDensity2D: return QBluetoothServiceDiscoveryAgent::tr("Magnetic Flux Density 2D");
case QBluetoothUuid::MagneticFluxDensity3D: return QBluetoothServiceDiscoveryAgent::tr("Magnetic Flux Density 3D");
case QBluetoothUuid::Language: return QBluetoothServiceDiscoveryAgent::tr("Language");
case QBluetoothUuid::BarometricPressureTrend: return QBluetoothServiceDiscoveryAgent::tr("Barometric Pressure Trend");
- default:
- break;
}
return QString();
@@ -1104,6 +1100,8 @@ QString QBluetoothUuid::characteristicToString(CharacteristicType uuid)
QString QBluetoothUuid::descriptorToString(QBluetoothUuid::DescriptorType uuid)
{
switch (uuid) {
+ case QBluetoothUuid::UnknownDescriptorType:
+ break; // returns {} below
case QBluetoothUuid::CharacteristicExtendedProperties:
return QBluetoothServiceDiscoveryAgent::tr("Characteristic Extended Properties");
case QBluetoothUuid::CharacteristicUserDescription:
@@ -1128,8 +1126,6 @@ QString QBluetoothUuid::descriptorToString(QBluetoothUuid::DescriptorType uuid)
return QBluetoothServiceDiscoveryAgent::tr("Environmental Sensing Measurement");
case QBluetoothUuid::EnvironmentalSensingTriggerSetting:
return QBluetoothServiceDiscoveryAgent::tr("Environmental Sensing Trigger Setting");
- default:
- break;
}
return QString();
diff --git a/qtconnectivity/src/tools/sdpscanner/main.cpp b/qtconnectivity/src/tools/sdpscanner/main.cpp
index 690f9aaa..c39ff8f3 100644
--- a/qtconnectivity/src/tools/sdpscanner/main.cpp
+++ b/qtconnectivity/src/tools/sdpscanner/main.cpp
@@ -39,6 +39,7 @@
#include <QtCore/QByteArray>
#include <QtCore/QDebug>
+#include <QtCore/QUrl>
#include <stdio.h>
#include <string>
#include <bluetooth/bluetooth.h>
@@ -213,10 +214,17 @@ static void parseAttributeValues(sdp_data_t *data, int indentation, QByteArray &
case SDP_URL_STR8:
case SDP_URL_STR16:
case SDP_URL_STR32:
+ {
xmlOutput.append("<url value=\"");
- xmlOutput.append(data->val.str, qstrnlen(data->val.str, data->unitSize));
+ const QByteArray urlData =
+ QByteArray::fromRawData(data->val.str, qstrnlen(data->val.str, data->unitSize));
+ const QUrl url = QUrl::fromEncoded(urlData);
+ // Encoded url %-encodes all of the XML special characters except '&',
+ // so we need to do that manually
+ xmlOutput.append(url.toEncoded().replace('&', "&amp;"));
xmlOutput.append("\"/>\n");
break;
+ }
default:
fprintf(stderr, "Unknown dtd type\n");
}
Submodule qtdeclarative 6ab9856e..b9956813:
diff --git a/qtdeclarative/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp b/qtdeclarative/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp
index b5c5f6a2b0..1a3d3cdf97 100644
--- a/qtdeclarative/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp
+++ b/qtdeclarative/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp
@@ -112,10 +112,7 @@ void* OSAllocator::reserveUncommitted(size_t bytes, Usage usage, bool writable,
if (result == MAP_FAILED)
CRASH();
- while (madvise(result, bytes, MADV_DONTNEED)) {
- if (errno != EAGAIN)
- CRASH();
- }
+ while (madvise(result, bytes, MADV_DONTNEED) == -1 && errno == EAGAIN) { }
if (fd != -1)
close(fd);
@@ -248,8 +245,10 @@ void OSAllocator::decommit(void* address, size_t bytes)
mmap(address, bytes, PROT_NONE, MAP_FIXED | MAP_LAZY | MAP_PRIVATE | MAP_ANON, -1, 0);
#elif OS(LINUX)
while (madvise(address, bytes, MADV_DONTNEED)) {
- if (errno != EAGAIN)
- CRASH();
+ if (errno != EAGAIN) {
+ memset(address, 0, bytes); // We rely on madvise to zero-out the memory
+ break;
+ }
}
if (mprotect(address, bytes, PROT_NONE))
CRASH();
diff --git a/qtdeclarative/src/qml/animations/qcontinuinganimationgroupjob.cpp b/qtdeclarative/src/qml/animations/qcontinuinganimationgroupjob.cpp
index 88c0e9e60e..61a9dc36f8 100644
--- a/qtdeclarative/src/qml/animations/qcontinuinganimationgroupjob.cpp
+++ b/qtdeclarative/src/qml/animations/qcontinuinganimationgroupjob.cpp
@@ -82,9 +82,9 @@ void QContinuingAnimationGroupJob::updateState(QAbstractAnimationJob::State newS
return;
}
for (QAbstractAnimationJob *animation = firstChild(); animation; animation = animation->nextSibling()) {
- resetUncontrolledAnimationFinishTime(animation);
+ RETURN_IF_DELETED(resetUncontrolledAnimationFinishTime(animation));
animation->setDirection(m_direction);
- animation->start();
+ RETURN_IF_DELETED(animation->start());
}
break;
}
diff --git a/qtdeclarative/src/qml/animations/qparallelanimationgroupjob.cpp b/qtdeclarative/src/qml/animations/qparallelanimationgroupjob.cpp
index 420a934ba2..a828d0e234 100644
--- a/qtdeclarative/src/qml/animations/qparallelanimationgroupjob.cpp
+++ b/qtdeclarative/src/qml/animations/qparallelanimationgroupjob.cpp
@@ -144,10 +144,10 @@ void QParallelAnimationGroupJob::updateState(QAbstractAnimationJob::State newSta
animation->stop();
m_previousLoop = m_direction == Forward ? 0 : m_loopCount - 1;
}
- resetUncontrolledAnimationFinishTime(animation);
+ RETURN_IF_DELETED(resetUncontrolledAnimationFinishTime(animation));
animation->setDirection(m_direction);
if (shouldAnimationStart(animation, oldState == Stopped))
- animation->start();
+ RETURN_IF_DELETED(animation->start());
}
break;
}
diff --git a/qtdeclarative/src/qml/common/qqmljsmemorypool_p.h b/qtdeclarative/src/qml/common/qqmljsmemorypool_p.h
index 0cf7ea84e6..1b81a87a2c 100644
--- a/qtdeclarative/src/qml/common/qqmljsmemorypool_p.h
+++ b/qtdeclarative/src/qml/common/qqmljsmemorypool_p.h
@@ -87,7 +87,7 @@ public:
inline void *allocate(size_t size)
{
size = (size + 7) & ~size_t(7);
- if (Q_LIKELY(_ptr && (_ptr + size < _end))) {
+ if (Q_LIKELY(_ptr && size < size_t(_end - _ptr))) {
void *addr = _ptr;
_ptr += size;
return addr;
diff --git a/qtdeclarative/src/qml/jit/qv4baselinejit.cpp b/qtdeclarative/src/qml/jit/qv4baselinejit.cpp
index 45150cfffd..5ad53faf95 100644
--- a/qtdeclarative/src/qml/jit/qv4baselinejit.cpp
+++ b/qtdeclarative/src/qml/jit/qv4baselinejit.cpp
@@ -540,6 +540,8 @@ void BaselineJIT::generate_ThrowException()
as->passEngineAsArg(0);
BASELINEJIT_GENERATE_RUNTIME_CALL(ThrowException, CallResultDestination::Ignore);
as->gotoCatchException();
+
+ // LOAD_ACC(); <- not needed here since it would be unreachable.
}
void BaselineJIT::generate_GetException() { as->getException(); }
@@ -547,9 +549,11 @@ void BaselineJIT::generate_SetException() { as->setException(); }
void BaselineJIT::generate_CreateCallContext()
{
+ STORE_ACC();
as->prepareCallWithArgCount(1);
as->passCppFrameAsArg(0);
BASELINEJIT_GENERATE_RUNTIME_CALL(PushCallContext, CallResultDestination::Ignore);
+ LOAD_ACC();
}
void BaselineJIT::generate_PushCatchContext(int index, int name) { as->pushCatchContext(index, name); }
diff --git a/qtdeclarative/src/qml/jsruntime/qv4function.cpp b/qtdeclarative/src/qml/jsruntime/qv4function.cpp
index cf8a53cf9f..223e64271e 100644
--- a/qtdeclarative/src/qml/jsruntime/qv4function.cpp
+++ b/qtdeclarative/src/qml/jsruntime/qv4function.cpp
@@ -136,7 +136,7 @@ void Function::updateInternalClass(ExecutionEngine *engine, const QList<QByteArr
if (duplicate == -1) {
parameterNames.append(QString::fromUtf8(param));
} else {
- const QString &dup = parameterNames[duplicate];
+ const QString dup = parameterNames[duplicate];
parameterNames.append(dup);
parameterNames[duplicate] =
QString(0xfffe) + QString::number(duplicate) + dup;
diff --git a/qtdeclarative/src/qml/qml/ftw/qrecyclepool_p.h b/qtdeclarative/src/qml/qml/ftw/qrecyclepool_p.h
index 39f4f88512..c963e1878e 100644
--- a/qtdeclarative/src/qml/qml/ftw/qrecyclepool_p.h
+++ b/qtdeclarative/src/qml/qml/ftw/qrecyclepool_p.h
@@ -130,8 +130,7 @@ template<typename T, int Step>
T *QRecyclePool<T, Step>::New()
{
T *rv = d->allocate();
- new (rv) T;
- return rv;
+ return new (rv) T;
}
template<typename T, int Step>
@@ -139,8 +138,7 @@ template<typename T1>
T *QRecyclePool<T, Step>::New(const T1 &a)
{
T *rv = d->allocate();
- new (rv) T(a);
- return rv;
+ return new (rv) T(a);
}
template<typename T, int Step>
@@ -148,8 +146,7 @@ template<typename T1>
T *QRecyclePool<T, Step>::New(T1 &a)
{
T *rv = d->allocate();
- new (rv) T(a);
- return rv;
+ return new (rv) T(a);
}
template<typename T, int Step>
diff --git a/qtdeclarative/src/qml/qml/qqmldata_p.h b/qtdeclarative/src/qml/qml/qqmldata_p.h
index ee31cb38d9..187339169b 100644
--- a/qtdeclarative/src/qml/qml/qqmldata_p.h
+++ b/qtdeclarative/src/qml/qml/qqmldata_p.h
@@ -176,24 +176,24 @@ public:
};
struct NotifyList {
- quint64 connectionMask;
-
- quint16 maximumTodoIndex;
- quint16 notifiesSize;
-
- QQmlNotifierEndpoint *todo;
- QQmlNotifierEndpoint**notifies;
+ QAtomicInteger<quint64> connectionMask;
+ QQmlNotifierEndpoint *todo = nullptr;
+ QQmlNotifierEndpoint**notifies = nullptr;
+ quint16 maximumTodoIndex = 0;
+ quint16 notifiesSize = 0;
void layout();
private:
void layout(QQmlNotifierEndpoint*);
};
- NotifyList *notifyList;
+ QAtomicPointer<NotifyList> notifyList;
- inline QQmlNotifierEndpoint *notify(int index);
+ inline QQmlNotifierEndpoint *notify(int index) const;
void addNotify(int index, QQmlNotifierEndpoint *);
int endpointCount(int index);
bool signalHasEndpoint(int index) const;
- void disconnectNotifiers();
+
+ enum class DeleteNotifyList { Yes, No };
+ void disconnectNotifiers(DeleteNotifyList doDelete);
// The context that created the C++ object
QQmlContextData *context = nullptr;
@@ -201,12 +201,12 @@ public:
QQmlContextData *outerContext = nullptr;
QQmlContextDataRef ownContext;
- QQmlAbstractBinding *bindings;
- QQmlBoundSignal *signalHandlers;
+ QQmlAbstractBinding *bindings = nullptr;
+ QQmlBoundSignal *signalHandlers = nullptr;
// Linked list for QQmlContext::contextObjects
- QQmlData *nextContextObject;
- QQmlData**prevContextObject;
+ QQmlData *nextContextObject = nullptr;
+ QQmlData**prevContextObject = nullptr;
inline bool hasBindingBit(int) const;
inline void setBindingBit(QObject *obj, int);
@@ -216,10 +216,10 @@ public:
inline void setPendingBindingBit(QObject *obj, int);
inline void clearPendingBindingBit(int);
- quint16 lineNumber;
- quint16 columnNumber;
+ quint16 lineNumber = 0;
+ quint16 columnNumber = 0;
- quint32 jsEngineId; // id of the engine that created the jsWrapper
+ quint32 jsEngineId = 0; // id of the engine that created the jsWrapper
struct DeferredData {
DeferredData();
@@ -240,7 +240,7 @@ public:
QQmlPropertyCache *propertyCache;
- QQmlGuardImpl *guards;
+ QQmlGuardImpl *guards = nullptr;
static QQmlData *get(const QObject *object, bool create = false) {
QObjectPrivate *priv = QObjectPrivate::get(const_cast<QObject *>(object));
@@ -289,7 +289,7 @@ public:
private:
// For attachedProperties
- mutable QQmlDataExtended *extendedData;
+ mutable QQmlDataExtended *extendedData = nullptr;
Q_NEVER_INLINE static QQmlData *createQQmlData(QObjectPrivate *priv);
Q_NEVER_INLINE static QQmlPropertyCache *createPropertyCache(QJSEngine *engine, QObject *object);
@@ -342,23 +342,31 @@ bool QQmlData::wasDeleted(const QObject *object)
return ddata && ddata->isQueuedForDeletion;
}
-QQmlNotifierEndpoint *QQmlData::notify(int index)
+inline bool isIndexInConnectionMask(quint64 connectionMask, int index)
+{
+ return connectionMask & (1ULL << quint64(index % 64));
+}
+
+QQmlNotifierEndpoint *QQmlData::notify(int index) const
{
+ // Can only happen on "home" thread. We apply relaxed semantics when loading the atomics.
+
Q_ASSERT(index <= 0xFFFF);
- if (!notifyList || !(notifyList->connectionMask & (1ULL << quint64(index % 64)))) {
+ NotifyList *list = notifyList.loadRelaxed();
+ if (!list || !isIndexInConnectionMask(list->connectionMask.loadRelaxed(), index))
return nullptr;
- } else if (index < notifyList->notifiesSize) {
- return notifyList->notifies[index];
- } else if (index <= notifyList->maximumTodoIndex) {
- notifyList->layout();
- }
- if (index < notifyList->notifiesSize) {
- return notifyList->notifies[index];
- } else {
- return nullptr;
+ if (index < list->notifiesSize)
+ return list->notifies[index];
+
+ if (index <= list->maximumTodoIndex) {
+ list->layout();
+ if (index < list->notifiesSize)
+ return list->notifies[index];
}
+
+ return nullptr;
}
/*
@@ -367,7 +375,19 @@ QQmlNotifierEndpoint *QQmlData::notify(int index)
*/
inline bool QQmlData::signalHasEndpoint(int index) const
{
- return notifyList && (notifyList->connectionMask & (1ULL << quint64(index % 64)));
+ // This can be called from any thread.
+ // We still use relaxed semantics. If we're on a thread different from the "home" thread
+ // of the QQmlData, two interesting things might happen:
+ //
+ // 1. The list might go away while we hold it. In that case we are dealing with an object whose
+ // QObject dtor is being executed concurrently. This is UB already without the notify lists.
+ // Therefore, we don't need to consider it.
+ // 2. The connectionMask may be amended or zeroed while we are looking at it. In that case
+ // we "misreport" the endpoint. Since ordering of events across threads is inherently
+ // nondeterministic, either result is correct in that case. We can accept it.
+
+ NotifyList *list = notifyList.loadRelaxed();
+ return list && isIndexInConnectionMask(list->connectionMask.loadRelaxed(), index);
}
bool QQmlData::hasBindingBit(int coreIndex) const
diff --git a/qtdeclarative/src/qml/qml/qqmlengine.cpp b/qtdeclarative/src/qml/qml/qqmlengine.cpp
index 852a673ebd..5f3367e4d2 100644
--- a/qtdeclarative/src/qml/qml/qqmlengine.cpp
+++ b/qtdeclarative/src/qml/qml/qqmlengine.cpp
@@ -718,18 +718,15 @@ void QQmlPrivate::qdeclarativeelement_destructor(QObject *o)
// Disconnect the notifiers now - during object destruction this would be too late, since
// the disconnect call wouldn't be able to call disconnectNotify(), as it isn't possible to
// get the metaobject anymore.
- d->disconnectNotifiers();
+ d->disconnectNotifiers(QQmlData::DeleteNotifyList::No);
}
}
QQmlData::QQmlData()
: ownedByQml1(false), ownMemory(true), indestructible(true), explicitIndestructibleSet(false),
hasTaintedV4Object(false), isQueuedForDeletion(false), rootObjectInCreation(false),
- hasInterceptorMetaObject(false), hasVMEMetaObject(false), parentFrozen(false),
- bindingBitsArraySize(InlineBindingArraySize), notifyList(nullptr),
- bindings(nullptr), signalHandlers(nullptr), nextContextObject(nullptr), prevContextObject(nullptr),
- lineNumber(0), columnNumber(0), jsEngineId(0),
- propertyCache(nullptr), guards(nullptr), extendedData(nullptr)
+ hasInterceptorMetaObject(false), hasVMEMetaObject(false), parentFrozen(false), dummy(0),
+ bindingBitsArraySize(InlineBindingArraySize), propertyCache(nullptr)
{
memset(bindingBitsValue, 0, sizeof(bindingBitsValue));
init();
@@ -789,7 +786,10 @@ void QQmlData::signalEmitted(QAbstractDeclarativeData *, QObject *object, int in
// QQmlEngine to emit signals from a different thread. These signals are then automatically
// marshalled back onto the QObject's thread and handled by QML from there. This is tested
// by the qqmlecmascript::threadSignal() autotest.
- if (!ddata->notifyList)
+
+ // Relaxed semantics here. If we're on a different thread we might schedule a useless event,
+ // but that should be rare.
+ if (!ddata->notifyList.loadRelaxed())
return;
auto objectThreadData = QObjectPrivate::get(object)->threadData.loadRelaxed();
@@ -1588,17 +1588,22 @@ void qmlExecuteDeferred(QObject *object)
{
QQmlData *data = QQmlData::get(object);
- if (data && !data->deferredData.isEmpty() && !data->wasDeleted(object)) {
- QQmlEnginePrivate *ep = QQmlEnginePrivate::get(data->context->engine);
+ if (!data
+ || !data->context
+ || !data->context->engine
+ || data->deferredData.isEmpty()
+ || data->wasDeleted(object)) {
+ return;
+ }
- QQmlComponentPrivate::DeferredState state;
- QQmlComponentPrivate::beginDeferred(ep, object, &state);
+ QQmlEnginePrivate *ep = QQmlEnginePrivate::get(data->context->engine);
+ QQmlComponentPrivate::DeferredState state;
+ QQmlComponentPrivate::beginDeferred(ep, object, &state);
- // Release the reference for the deferral action (we still have one from construction)
- data->releaseDeferredData();
+ // Release the reference for the deferral action (we still have one from construction)
+ data->releaseDeferredData();
- QQmlComponentPrivate::completeDeferred(ep, &state);
- }
+ QQmlComponentPrivate::completeDeferred(ep, &state);
}
QQmlContext *qmlContext(const QObject *obj)
@@ -1835,49 +1840,73 @@ void QQmlData::releaseDeferredData()
void QQmlData::addNotify(int index, QQmlNotifierEndpoint *endpoint)
{
- if (!notifyList) {
- notifyList = (NotifyList *)malloc(sizeof(NotifyList));
- notifyList->connectionMask = 0;
- notifyList->maximumTodoIndex = 0;
- notifyList->notifiesSize = 0;
- notifyList->todo = nullptr;
- notifyList->notifies = nullptr;
+ // Can only happen on "home" thread. We apply relaxed semantics when loading the atomics.
+
+ NotifyList *list = notifyList.loadRelaxed();
+
+ if (!list) {
+ list = new NotifyList;
+ // We don't really care when this change takes effect on other threads. The notifyList can
+ // only become non-null once in the life time of a QQmlData. It becomes null again when the
+ // underlying QObject is deleted. At that point any interaction with the QQmlData is UB
+ // anyway. So, for all intents and purposese, the list becomes non-null once and then stays
+ // non-null "forever". We can apply relaxed semantics.
+ notifyList.storeRelaxed(list);
}
Q_ASSERT(!endpoint->isConnected());
index = qMin(index, 0xFFFF - 1);
- notifyList->connectionMask |= (1ULL << quint64(index % 64));
- if (index < notifyList->notifiesSize) {
+ // Likewise, we don't really care _when_ the change in the connectionMask is propagated to other
+ // threads. Cross-thread event ordering is inherently nondeterministic. Therefore, when querying
+ // the conenctionMask in the presence of concurrent modification, any result is correct.
+ list->connectionMask.storeRelaxed(
+ list->connectionMask.loadRelaxed() | (1ULL << quint64(index % 64)));
- endpoint->next = notifyList->notifies[index];
+ if (index < list->notifiesSize) {
+ endpoint->next = list->notifies[index];
if (endpoint->next) endpoint->next->prev = &endpoint->next;
- endpoint->prev = &notifyList->notifies[index];
- notifyList->notifies[index] = endpoint;
-
+ endpoint->prev = &list->notifies[index];
+ list->notifies[index] = endpoint;
} else {
- notifyList->maximumTodoIndex = qMax(int(notifyList->maximumTodoIndex), index);
+ list->maximumTodoIndex = qMax(int(list->maximumTodoIndex), index);
- endpoint->next = notifyList->todo;
+ endpoint->next = list->todo;
if (endpoint->next) endpoint->next->prev = &endpoint->next;
- endpoint->prev = &notifyList->todo;
- notifyList->todo = endpoint;
+ endpoint->prev = &list->todo;
+ list->todo = endpoint;
}
}
-void QQmlData::disconnectNotifiers()
+void QQmlData::disconnectNotifiers(QQmlData::DeleteNotifyList doDelete)
{
- if (notifyList) {
- while (notifyList->todo)
- notifyList->todo->disconnect();
- for (int ii = 0; ii < notifyList->notifiesSize; ++ii) {
- while (QQmlNotifierEndpoint *ep = notifyList->notifies[ii])
+ // Can only happen on "home" thread. We apply relaxed semantics when loading the atomics.
+ if (NotifyList *list = notifyList.loadRelaxed()) {
+ while (QQmlNotifierEndpoint *todo = list->todo)
+ todo->disconnect();
+ for (int ii = 0; ii < list->notifiesSize; ++ii) {
+ while (QQmlNotifierEndpoint *ep = list->notifies[ii])
ep->disconnect();
}
- free(notifyList->notifies);
- free(notifyList);
- notifyList = nullptr;
+ free(list->notifies);
+
+ if (doDelete == DeleteNotifyList::Yes) {
+ // We can only get here from QQmlData::destroyed(), and that can only come from the
+ // the QObject dtor. If you're still sending signals at that point you have UB already
+ // without any threads. Therefore, it's enough to apply relaxed semantics.
+ notifyList.storeRelaxed(nullptr);
+ delete list;
+ } else {
+ // We can use relaxed semantics here. The worst thing that can happen is that some
+ // signal is falsely reported as connected. Signal connectedness across threads
+ // is not quite deterministic anyway.
+ list->connectionMask.storeRelaxed(0);
+ list->maximumTodoIndex = 0;
+ list->notifiesSize = 0;
+ list->notifies = nullptr;
+
+ }
}
}
@@ -1961,7 +1990,7 @@ void QQmlData::destroyed(QObject *object)
guard->objectDestroyed(object);
}
- disconnectNotifiers();
+ disconnectNotifiers(DeleteNotifyList::Yes);
if (extendedData)
delete extendedData;
diff --git a/qtdeclarative/src/qml/qml/qqmlimport.cpp b/qtdeclarative/src/qml/qml/qqmlimport.cpp
index e7263d1850..289f11d006 100644
--- a/qtdeclarative/src/qml/qml/qqmlimport.cpp
+++ b/qtdeclarative/src/qml/qml/qqmlimport.cpp
@@ -2119,9 +2119,12 @@ void QQmlImportDatabase::addImportPath(const QString& path)
cPath.replace(Backslash, Slash);
}
- if (!cPath.isEmpty()
- && !fileImportPath.contains(cPath))
- fileImportPath.prepend(cPath);
+ if (!cPath.isEmpty()) {
+ if (fileImportPath.contains(cPath))
+ fileImportPath.move(fileImportPath.indexOf(cPath), 0);
+ else
+ fileImportPath.prepend(cPath);
+ }
}
/*!
diff --git a/qtdeclarative/src/qml/qml/qqmlvmemetaobject.cpp b/qtdeclarative/src/qml/qml/qqmlvmemetaobject.cpp
index 1e0e4e419f..a0532d1794 100644
--- a/qtdeclarative/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/qtdeclarative/src/qml/qml/qqmlvmemetaobject.cpp
@@ -251,7 +251,7 @@ void QQmlVMEMetaObjectEndpoint::tryConnect()
if (!pd)
return;
- if (pd->notifyIndex() != -1)
+ if (pd->notifyIndex() != -1 && ctxt->engine)
connect(target, pd->notifyIndex(), ctxt->engine);
}
diff --git a/qtdeclarative/src/qmlmodels/qqmldelegatemodel.cpp b/qtdeclarative/src/qmlmodels/qqmldelegatemodel.cpp
index 4fcff70de6..5b7e767ae2 100644
--- a/qtdeclarative/src/qmlmodels/qqmldelegatemodel.cpp
+++ b/qtdeclarative/src/qmlmodels/qqmldelegatemodel.cpp
@@ -389,6 +389,12 @@ void QQmlDelegateModelPrivate::connectToAbstractItemModel()
q, QQmlDelegateModel, SLOT(_q_rowsRemoved(QModelIndex,int,int)));
qmlobject_connect(aim, QAbstractItemModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
q, QQmlDelegateModel, SLOT(_q_rowsAboutToBeRemoved(QModelIndex,int,int)));
+ qmlobject_connect(aim, QAbstractItemModel, SIGNAL(columnsInserted(QModelIndex,int,int)),
+ q, QQmlDelegateModel, SLOT(_q_columnsInserted(QModelIndex,int,int)));
+ qmlobject_connect(aim, QAbstractItemModel, SIGNAL(columnsRemoved(QModelIndex,int,int)),
+ q, QQmlDelegateModel, SLOT(_q_columnsRemoved(QModelIndex,int,int)));
+ qmlobject_connect(aim, QAbstractItemModel, SIGNAL(columnsMoved(QModelIndex,int,int,QModelIndex,int)),
+ q, QQmlDelegateModel, SLOT(_q_columnsMoved(QModelIndex,int,int,QModelIndex,int)));
qmlobject_connect(aim, QAbstractItemModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)),
q, QQmlDelegateModel, SLOT(_q_dataChanged(QModelIndex,QModelIndex,QVector<int>)));
qmlobject_connect(aim, QAbstractItemModel, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
@@ -413,6 +419,12 @@ void QQmlDelegateModelPrivate::disconnectFromAbstractItemModel()
q, SLOT(_q_rowsAboutToBeRemoved(QModelIndex,int,int)));
QObject::disconnect(aim, SIGNAL(rowsRemoved(QModelIndex,int,int)),
q, SLOT(_q_rowsRemoved(QModelIndex,int,int)));
+ QObject::disconnect(aim, SIGNAL(columnsInserted(QModelIndex,int,int)), q,
+ SLOT(_q_columnsInserted(QModelIndex,int,int)));
+ QObject::disconnect(aim, SIGNAL(columnsRemoved(QModelIndex,int,int)), q,
+ SLOT(_q_columnsRemoved(QModelIndex,int,int)));
+ QObject::disconnect(aim, SIGNAL(columnsMoved(QModelIndex,int,int,QModelIndex,int)), q,
+ SLOT(_q_columnsMoved(QModelIndex,int,int,QModelIndex,int)));
QObject::disconnect(aim, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)),
q, SLOT(_q_dataChanged(QModelIndex,QModelIndex,QVector<int>)));
QObject::disconnect(aim, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
@@ -1871,10 +1883,15 @@ void QQmlDelegateModelPrivate::emitChanges()
for (int i = 1; i < m_groupCount; ++i)
QQmlDelegateModelGroupPrivate::get(m_groups[i])->emitModelUpdated(reset);
- auto cacheCopy = m_cache; // deliberate; emitChanges may alter m_cache
- for (QQmlDelegateModelItem *cacheItem : qAsConst(cacheCopy)) {
- if (cacheItem->attached)
- cacheItem->attached->emitChanges();
+ // emitChanges may alter m_cache and delete items
+ QVarLengthArray<QPointer<QQmlDelegateModelAttached>> attachedObjects;
+ attachedObjects.reserve(m_cache.length());
+ for (const QQmlDelegateModelItem *cacheItem : qAsConst(m_cache))
+ attachedObjects.append(cacheItem->attached);
+
+ for (const QPointer<QQmlDelegateModelAttached> &attached : qAsConst(attachedObjects)) {
+ if (attached && attached->m_cacheItem)
+ attached->emitChanges();
}
}
@@ -1974,6 +1991,38 @@ void QQmlDelegateModel::_q_rowsMoved(
}
}
+void QQmlDelegateModel::_q_columnsInserted(const QModelIndex &parent, int begin, int end)
+{
+ Q_D(QQmlDelegateModel);
+ Q_UNUSED(end);
+ if (parent == d->m_adaptorModel.rootIndex && begin == 0) {
+ // mark all items as changed
+ _q_itemsChanged(0, d->m_count, QVector<int>());
+ }
+}
+
+void QQmlDelegateModel::_q_columnsRemoved(const QModelIndex &parent, int begin, int end)
+{
+ Q_D(QQmlDelegateModel);
+ Q_UNUSED(end);
+ if (parent == d->m_adaptorModel.rootIndex && begin == 0) {
+ // mark all items as changed
+ _q_itemsChanged(0, d->m_count, QVector<int>());
+ }
+}
+
+void QQmlDelegateModel::_q_columnsMoved(const QModelIndex &parent, int start, int end,
+ const QModelIndex &destination, int column)
+{
+ Q_D(QQmlDelegateModel);
+ Q_UNUSED(end);
+ if ((parent == d->m_adaptorModel.rootIndex && start == 0)
+ || (destination == d->m_adaptorModel.rootIndex && column == 0)) {
+ // mark all items as changed
+ _q_itemsChanged(0, d->m_count, QVector<int>());
+ }
+}
+
void QQmlDelegateModel::_q_dataChanged(const QModelIndex &begin, const QModelIndex &end, const QVector<int> &roles)
{
Q_D(QQmlDelegateModel);
@@ -2663,20 +2712,24 @@ void QQmlDelegateModelAttached::emitChanges()
m_previousGroups = m_cacheItem->groups;
int indexChanges = 0;
- for (int i = 1; i < m_cacheItem->metaType->groupCount; ++i) {
+ const int groupCount = m_cacheItem->metaType->groupCount;
+ for (int i = 1; i < groupCount; ++i) {
if (m_previousIndex[i] != m_currentIndex[i]) {
m_previousIndex[i] = m_currentIndex[i];
indexChanges |= (1 << i);
}
}
+ // Don't access m_cacheItem anymore once we've started sending signals.
+ // We don't own it and someone might delete it.
+
int notifierId = 0;
const QMetaObject *meta = metaObject();
- for (int i = 1; i < m_cacheItem->metaType->groupCount; ++i, ++notifierId) {
+ for (int i = 1; i < groupCount; ++i, ++notifierId) {
if (groupChanges & (1 << i))
QMetaObject::activate(this, meta, notifierId, nullptr);
}
- for (int i = 1; i < m_cacheItem->metaType->groupCount; ++i, ++notifierId) {
+ for (int i = 1; i < groupCount; ++i, ++notifierId) {
if (indexChanges & (1 << i))
QMetaObject::activate(this, meta, notifierId, nullptr);
}
diff --git a/qtdeclarative/src/qmlmodels/qqmldelegatemodel_p.h b/qtdeclarative/src/qmlmodels/qqmldelegatemodel_p.h
index 8aab4badca..d140bfbaaf 100644
--- a/qtdeclarative/src/qmlmodels/qqmldelegatemodel_p.h
+++ b/qtdeclarative/src/qmlmodels/qqmldelegatemodel_p.h
@@ -152,6 +152,9 @@ private Q_SLOTS:
void _q_itemsMoved(int from, int to, int count);
void _q_modelReset();
void _q_rowsInserted(const QModelIndex &,int,int);
+ void _q_columnsInserted(const QModelIndex &, int, int);
+ void _q_columnsRemoved(const QModelIndex &, int, int);
+ void _q_columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int);
void _q_rowsAboutToBeRemoved(const QModelIndex &parent, int begin, int end);
void _q_rowsRemoved(const QModelIndex &,int,int);
void _q_rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int);
diff --git a/qtdeclarative/src/quick/accessible/qaccessiblequickitem.cpp b/qtdeclarative/src/quick/accessible/qaccessiblequickitem.cpp
index ae1954ae8d..99e6eff7c3 100644
--- a/qtdeclarative/src/quick/accessible/qaccessiblequickitem.cpp
+++ b/qtdeclarative/src/quick/accessible/qaccessiblequickitem.cpp
@@ -46,6 +46,7 @@
#include "QtQuick/private/qquicktextinput_p.h"
#include "QtQuick/private/qquickaccessibleattached_p.h"
#include "QtQuick/qquicktextdocument.h"
+#include "QtQuick/qquickrendercontrol.h"
QT_BEGIN_NAMESPACE
#if QT_CONFIG(accessibility)
@@ -57,7 +58,19 @@ QAccessibleQuickItem::QAccessibleQuickItem(QQuickItem *item)
QWindow *QAccessibleQuickItem::window() const
{
- return item()->window();
+ QQuickWindow *window = item()->window();
+
+ // For QQuickWidget the above window will be the offscreen QQuickWindow,
+ // which is not a part of the accessibility tree. Detect this case and
+ // return the window for the QQuickWidget instead.
+ if (window && !window->handle()) {
+ if (QQuickRenderControl *renderControl = QQuickWindowPrivate::get(window)->renderControl) {
+ if (QWindow *renderWindow = renderControl->renderWindow(nullptr))
+ return renderWindow;
+ }
+ }
+
+ return window;
}
int QAccessibleQuickItem::childCount() const
@@ -113,19 +126,15 @@ QAccessibleInterface *QAccessibleQuickItem::childAt(int x, int y) const
QAccessibleInterface *QAccessibleQuickItem::parent() const
{
QQuickItem *parent = item()->parentItem();
- QQuickWindow *window = item()->window();
- QQuickItem *ci = window ? window->contentItem() : nullptr;
+ QQuickWindow *itemWindow = item()->window();
+ QQuickItem *ci = itemWindow ? itemWindow->contentItem() : nullptr;
while (parent && !QQuickItemPrivate::get(parent)->isAccessible && parent != ci)
parent = parent->parentItem();
if (parent) {
if (parent == ci) {
- // Jump out to the scene widget if the parent is the root item.
- // There are two root items, QQuickWindow::rootItem and
- // QQuickView::declarativeRoot. The former is the true root item,
- // but is not a part of the accessibility tree. Check if we hit
- // it here and return an interface for the scene instead.
- return QAccessible::queryAccessibleInterface(window);
+ // Jump out to the window if the parent is the root item
+ return QAccessible::queryAccessibleInterface(window());
} else {
while (parent && !parent->d_func()->isAccessible)
parent = parent->parentItem();
@@ -193,7 +202,7 @@ QAccessible::State QAccessibleQuickItem::state() const
QRect viewRect_ = viewRect();
QRect itemRect = rect();
- if (viewRect_.isNull() || itemRect.isNull() || !item()->window() || !item()->window()->isVisible() ||!item()->isVisible() || qFuzzyIsNull(item()->opacity()))
+ if (viewRect_.isNull() || itemRect.isNull() || !window() || !window()->isVisible() ||!item()->isVisible() || qFuzzyIsNull(item()->opacity()))
state.invisible = true;
if (!viewRect_.intersects(itemRect))
state.offscreen = true;
@@ -206,6 +215,10 @@ QAccessible::State QAccessibleQuickItem::state() const
if (role() == QAccessible::EditableText)
if (auto ti = qobject_cast<QQuickTextInput *>(item()))
state.passwordEdit = ti->echoMode() != QQuickTextInput::Normal;
+ if (!item()->isEnabled()) {
+ state.focusable = false;
+ state.disabled = true;
+ }
return state;
}
@@ -217,7 +230,7 @@ QAccessible::Role QAccessibleQuickItem::role() const
QAccessible::Role role = QAccessible::NoRole;
if (item())
- role = QQuickItemPrivate::get(item())->accessibleRole();
+ role = QQuickItemPrivate::get(item())->effectiveAccessibleRole();
if (role == QAccessible::NoRole) {
if (qobject_cast<QQuickText*>(const_cast<QQuickItem *>(item())))
role = QAccessible::StaticText;
diff --git a/qtdeclarative/src/quick/accessible/qaccessiblequickview_p.h b/qtdeclarative/src/quick/accessible/qaccessiblequickview_p.h
index 39ffcaf39c..8baa01330c 100644
--- a/qtdeclarative/src/quick/accessible/qaccessiblequickview_p.h
+++ b/qtdeclarative/src/quick/accessible/qaccessiblequickview_p.h
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
#if QT_CONFIG(accessibility)
-class QAccessibleQuickWindow : public QAccessibleObject
+class Q_QUICK_EXPORT QAccessibleQuickWindow : public QAccessibleObject
{
public:
QAccessibleQuickWindow(QQuickWindow *object);
diff --git a/qtdeclarative/src/quick/items/qquickdrag.cpp b/qtdeclarative/src/quick/items/qquickdrag.cpp
index 8321fcfeed..383078b3b9 100644
--- a/qtdeclarative/src/quick/items/qquickdrag.cpp
+++ b/qtdeclarative/src/quick/items/qquickdrag.cpp
@@ -481,7 +481,9 @@ void QQuickDragAttached::setKeys(const QStringList &keys)
\qmlattachedproperty stringlist QtQuick::Drag::mimeData
\since 5.2
- This property holds a map of mimeData that is used during startDrag.
+ This property holds a map from mime type to data that is used during startDrag.
+ The mime data needs to be a \c string, or an \c ArrayBuffer with the data encoded
+ according to the mime type.
*/
QVariantMap QQuickDragAttached::mimeData() const
@@ -766,8 +768,12 @@ Qt::DropAction QQuickDragAttachedPrivate::startDrag(Qt::DropActions supportedAct
QDrag *drag = new QDrag(source ? source : q);
QMimeData *mimeData = new QMimeData();
- for (auto it = externalMimeData.cbegin(), end = externalMimeData.cend(); it != end; ++it)
- mimeData->setData(it.key(), it.value().toString().toUtf8());
+ for (auto it = externalMimeData.cbegin(), end = externalMimeData.cend(); it != end; ++it) {
+ if (static_cast<QMetaType::Type>(it.value().type()) == QMetaType::QByteArray)
+ mimeData->setData(it.key(), it.value().toByteArray());
+ else
+ mimeData->setData(it.key(), it.value().toString().toUtf8());
+ }
drag->setMimeData(mimeData);
if (pixmapLoader.isReady()) {
diff --git a/qtdeclarative/src/quick/items/qquickitem.cpp b/qtdeclarative/src/quick/items/qquickitem.cpp
index 33da9762d3..9e8b289376 100644
--- a/qtdeclarative/src/quick/items/qquickitem.cpp
+++ b/qtdeclarative/src/quick/items/qquickitem.cpp
@@ -59,6 +59,7 @@
#include <QtCore/private/qnumeric_p.h>
#include <QtGui/qpa/qplatformtheme.h>
#include <QtCore/qloggingcategory.h>
+#include <QtCore/private/qduplicatetracker_p.h>
#include <private/qqmlglobal_p.h>
#include <private/qqmlengine_p.h>
@@ -2326,6 +2327,7 @@ QQuickItem::QQuickItem(QQuickItemPrivate &dd, QQuickItem *parent)
QQuickItem::~QQuickItem()
{
Q_D(QQuickItem);
+ d->inDestructor = true;
if (d->windowRefCount > 1)
d->windowRefCount = 1; // Make sure window is set to null in next call to derefWindow().
@@ -2398,7 +2400,7 @@ bool QQuickItemPrivate::canAcceptTabFocus(QQuickItem *item)
return true;
#if QT_CONFIG(accessibility)
- QAccessible::Role role = QQuickItemPrivate::get(item)->accessibleRole();
+ QAccessible::Role role = QQuickItemPrivate::get(item)->effectiveAccessibleRole();
if (role == QAccessible::EditableText || role == QAccessible::Table || role == QAccessible::List) {
return true;
} else if (role == QAccessible::ComboBox || role == QAccessible::SpinBox) {
@@ -2526,6 +2528,7 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo
QQuickItem *current = item;
qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: startItem:" << startItem;
qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: firstFromItem:" << firstFromItem;
+ QDuplicateTracker<QQuickItem *> cycleDetector;
do {
qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: current:" << current;
qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: from:" << from;
@@ -2592,7 +2595,10 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo
// traversed all of the chain (by compare the [current] item with [startItem])
// Since the [startItem] might be promoted to its parent if it is invisible,
// we still have to check [current] item with original start item
- if ((current == startItem || current == originalStartItem) && from == firstFromItem) {
+ // We might also run into a cycle before we reach firstFromItem again
+ // but note that we have to ignore current if we are meant to skip it
+ if (((current == startItem || current == originalStartItem) && from == firstFromItem) ||
+ (!skip && cycleDetector.hasSeen(current))) {
// wrapped around, avoid endless loops
if (item == contentItem) {
qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: looped, return contentItem";
@@ -2689,9 +2695,8 @@ void QQuickItem::setParentItem(QQuickItem *parentItem)
const bool wasVisible = isVisible();
op->removeChild(this);
- if (wasVisible) {
+ if (wasVisible && !op->inDestructor)
emit oldParentItem->visibleChildrenChanged();
- }
} else if (d->window) {
QQuickWindowPrivate::get(d->window)->parentlessItems.remove(this);
}
@@ -2768,8 +2773,9 @@ void QQuickItem::setParentItem(QQuickItem *parentItem)
d->itemChange(ItemParentHasChanged, d->parentItem);
- emit parentChanged(d->parentItem);
- if (isVisible() && d->parentItem)
+ if (!d->inDestructor)
+ emit parentChanged(d->parentItem);
+ if (isVisible() && d->parentItem && !QQuickItemPrivate::get(d->parentItem)->inDestructor)
emit d->parentItem->visibleChildrenChanged();
}
@@ -2965,7 +2971,8 @@ void QQuickItemPrivate::removeChild(QQuickItem *child)
itemChange(QQuickItem::ItemChildRemovedChange, child);
- emit q->childrenChanged();
+ if (!inDestructor)
+ emit q->childrenChanged();
}
void QQuickItemPrivate::refWindow(QQuickWindow *c)
@@ -3194,6 +3201,7 @@ QQuickItemPrivate::QQuickItemPrivate()
, touchEnabled(false)
#endif
, hasCursorHandler(false)
+ , inDestructor(false)
, dirtyAttributes(0)
, nextDirtyItem(nullptr)
, prevDirtyItem(nullptr)
@@ -5120,6 +5128,13 @@ void QQuickItem::componentComplete()
d->addToDirtyList();
QQuickWindowPrivate::get(d->window)->dirtyItem(this);
}
+
+#if QT_CONFIG(accessibility)
+ if (d->isAccessible && d->effectiveVisible) {
+ QAccessibleEvent ev(this, QAccessible::ObjectShow);
+ QAccessible::updateAccessibility(&ev);
+ }
+#endif
}
QQuickStateGroup *QQuickItemPrivate::_states()
@@ -6106,9 +6121,11 @@ bool QQuickItemPrivate::setEffectiveVisibleRecur(bool newEffectiveVisible)
QAccessible::updateAccessibility(&ev);
}
#endif
- emit q->visibleChanged();
- if (childVisibilityChanged)
- emit q->visibleChildrenChanged();
+ if (!inDestructor) {
+ emit q->visibleChanged();
+ if (childVisibilityChanged)
+ emit q->visibleChildrenChanged();
+ }
return true; // effective visibility DID change
}
@@ -6157,6 +6174,15 @@ void QQuickItemPrivate::setEffectiveEnableRecur(QQuickItem *scope, bool newEffec
}
itemChange(QQuickItem::ItemEnabledHasChanged, effectiveEnable);
+#if QT_CONFIG(accessibility)
+ if (isAccessible) {
+ QAccessible::State changedState;
+ changedState.disabled = true;
+ changedState.focusable = true;
+ QAccessibleStateChangeEvent ev(q, changedState);
+ QAccessible::updateAccessibility(&ev);
+ }
+#endif
emit q->enabledChanged();
}
@@ -8974,13 +9000,20 @@ QQuickItemPrivate::ExtraData::ExtraData()
#if QT_CONFIG(accessibility)
-QAccessible::Role QQuickItemPrivate::accessibleRole() const
+QAccessible::Role QQuickItemPrivate::effectiveAccessibleRole() const
{
Q_Q(const QQuickItem);
- QQuickAccessibleAttached *accessibleAttached = qobject_cast<QQuickAccessibleAttached *>(qmlAttachedPropertiesObject<QQuickAccessibleAttached>(q, false));
- if (accessibleAttached)
- return accessibleAttached->role();
+ auto *attached = qmlAttachedPropertiesObject<QQuickAccessibleAttached>(q, false);
+ auto role = QAccessible::NoRole;
+ if (auto *accessibleAttached = qobject_cast<QQuickAccessibleAttached *>(attached))
+ role = accessibleAttached->role();
+ if (role == QAccessible::NoRole)
+ role = accessibleRole();
+ return role;
+}
+QAccessible::Role QQuickItemPrivate::accessibleRole() const
+{
return QAccessible::NoRole;
}
#endif
diff --git a/qtdeclarative/src/quick/items/qquickitem_p.h b/qtdeclarative/src/quick/items/qquickitem_p.h
index 841d91bb40..6f329bd119 100644
--- a/qtdeclarative/src/quick/items/qquickitem_p.h
+++ b/qtdeclarative/src/quick/items/qquickitem_p.h
@@ -472,6 +472,7 @@ public:
bool replayingPressEvent:1;
bool touchEnabled:1;
bool hasCursorHandler:1;
+ quint32 inDestructor:1; // has entered ~QQuickItem
enum DirtyType {
TransformOrigin = 0x00000001,
@@ -574,7 +575,10 @@ public:
virtual void implicitHeightChanged();
#if QT_CONFIG(accessibility)
+ QAccessible::Role effectiveAccessibleRole() const;
+private:
virtual QAccessible::Role accessibleRole() const;
+public:
#endif
void setImplicitAntialiasing(bool antialiasing);
diff --git a/qtdeclarative/src/quick/items/qquickmousearea_p_p.h b/qtdeclarative/src/quick/items/qquickmousearea_p_p.h
index fba383e268..0d63618622 100644
--- a/qtdeclarative/src/quick/items/qquickmousearea_p_p.h
+++ b/qtdeclarative/src/quick/items/qquickmousearea_p_p.h
@@ -61,7 +61,6 @@ QT_BEGIN_NAMESPACE
class QQuickMouseEvent;
class QQuickMouseArea;
-class QQuickPointerMask;
class QQuickMouseAreaPrivate : public QQuickItemPrivate
{
Q_DECLARE_PUBLIC(QQuickMouseArea)
@@ -100,7 +99,6 @@ public:
#if QT_CONFIG(quick_draganddrop)
QQuickDrag *drag;
#endif
- QPointer<QQuickPointerMask> mask;
QPointF startScene;
QPointF targetStartPos;
QPointF lastPos;
diff --git a/qtdeclarative/src/quick/util/qquickstategroup.cpp b/qtdeclarative/src/quick/util/qquickstategroup.cpp
index 7cb3138618..f732b1eb4a 100644
--- a/qtdeclarative/src/quick/util/qquickstategroup.cpp
+++ b/qtdeclarative/src/quick/util/qquickstategroup.cpp
@@ -381,8 +381,14 @@ bool QQuickStateGroupPrivate::updateAutoState()
const auto potentialWhenBinding = QQmlPropertyPrivate::binding(whenProp);
// if there is a binding, the value in when might not be up-to-date at this point
// so we manually reevaluate the binding
- if (auto abstractBinding = dynamic_cast<QQmlBinding *>(potentialWhenBinding))
- whenValue = abstractBinding->evaluate().toBool();
+ if (auto abstractBinding = dynamic_cast<QQmlBinding *>(potentialWhenBinding)) {
+ QVariant evalResult = abstractBinding->evaluate();
+ if (evalResult.userType() == qMetaTypeId<QJSValue>())
+ whenValue = evalResult.value<QJSValue>().toBool();
+ else
+ whenValue = evalResult.toBool();
+ }
+
if (whenValue) {
if (stateChangeDebug())
qWarning() << "Setting auto state due to expression";
diff --git a/qtdeclarative/src/quickwidgets/qaccessiblequickwidget.cpp b/qtdeclarative/src/quickwidgets/qaccessiblequickwidget.cpp
new file mode 100644
index 0000000000..8a1c901880
--- /dev/null
+++ b/qtdeclarative/src/quickwidgets/qaccessiblequickwidget.cpp
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQuick module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qaccessiblequickwidget_p.h"
+
+#include "qquickwidget_p.h"
+
+QT_BEGIN_NAMESPACE
+
+#if QT_CONFIG(accessibility)
+
+QAccessibleQuickWidget::QAccessibleQuickWidget(QQuickWidget* widget)
+: QAccessibleWidget(widget)
+, m_accessibleWindow(QQuickWidgetPrivate::get(widget)->offscreenWindow)
+{
+ // NOTE: m_accessibleWindow is a QAccessibleQuickWindow, and not a
+ // QAccessibleQuickWidgetOffscreenWindow (defined below). This means
+ // it will return the Quick item child interfaces, which is what's needed here
+ // (unlike QAccessibleQuickWidgetOffscreenWindow, which will report 0 children).
+}
+
+QAccessibleInterface *QAccessibleQuickWidget::child(int index) const
+{
+ return m_accessibleWindow.child(index);
+}
+
+int QAccessibleQuickWidget::childCount() const
+{
+ return m_accessibleWindow.childCount();
+}
+
+int QAccessibleQuickWidget::indexOfChild(const QAccessibleInterface *iface) const
+{
+ return m_accessibleWindow.indexOfChild(iface);
+}
+
+QAccessibleInterface *QAccessibleQuickWidget::childAt(int x, int y) const
+{
+ return m_accessibleWindow.childAt(x, y);
+}
+
+QAccessibleQuickWidgetOffscreenWindow::QAccessibleQuickWidgetOffscreenWindow(QQuickWindow *window)
+:QAccessibleQuickWindow(window)
+{
+
+}
+
+QAccessibleInterface *QAccessibleQuickWidgetOffscreenWindow::child(int index) const
+{
+ Q_UNUSED(index);
+ return nullptr;
+}
+
+int QAccessibleQuickWidgetOffscreenWindow::childCount() const
+{
+ return 0;
+}
+
+int QAccessibleQuickWidgetOffscreenWindow::indexOfChild(const QAccessibleInterface *iface) const
+{
+ Q_UNUSED(iface);
+ return -1;
+}
+
+QAccessibleInterface *QAccessibleQuickWidgetOffscreenWindow::QAccessibleQuickWidgetOffscreenWindow::childAt(int x, int y) const
+{
+ Q_UNUSED(x);
+ Q_UNUSED(y);
+ return nullptr;
+}
+
+#endif // accessibility
+
+QT_END_NAMESPACE
diff --git a/qtdeclarative/src/quickwidgets/qaccessiblequickwidget_p.h b/qtdeclarative/src/quickwidgets/qaccessiblequickwidget_p.h
new file mode 100644
index 0000000000..7c2ab930e0
--- /dev/null
+++ b/qtdeclarative/src/quickwidgets/qaccessiblequickwidget_p.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQuick module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QACCESSIBLEQUICKWIDGET_H
+#define QACCESSIBLEQUICKWIDGET_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qquickwidget.h"
+#include <QtWidgets/qaccessiblewidget.h>
+
+#include <private/qaccessiblequickview_p.h>
+
+QT_BEGIN_NAMESPACE
+
+#if QT_CONFIG(accessibility)
+
+// These classes implement the QQuickWiget accessibility switcharoo,
+// where the child items of the QQuickWidgetOffscreenWindow are reported
+// as child accessible interfaces of the QAccessibleQuickWidget.
+class QAccessibleQuickWidget: public QAccessibleWidget
+{
+public:
+ QAccessibleQuickWidget(QQuickWidget* widget);
+
+ QAccessibleInterface *child(int index) const override;
+ int childCount() const override;
+ int indexOfChild(const QAccessibleInterface *iface) const override;
+ QAccessibleInterface *childAt(int x, int y) const override;
+
+private:
+ QAccessibleQuickWindow m_accessibleWindow;
+ Q_DISABLE_COPY(QAccessibleQuickWidget)
+};
+
+class QAccessibleQuickWidgetOffscreenWindow: public QAccessibleQuickWindow
+{
+public:
+ QAccessibleQuickWidgetOffscreenWindow(QQuickWindow *window);
+ QAccessibleInterface *child(int index) const override;
+ int childCount() const override;
+ int indexOfChild(const QAccessibleInterface *iface) const override;
+ QAccessibleInterface *childAt(int x, int y) const override;
+};
+
+#endif // accessibility
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/qtdeclarative/src/quickwidgets/qaccessiblequickwidgetfactory.cpp b/qtdeclarative/src/quickwidgets/qaccessiblequickwidgetfactory.cpp
new file mode 100644
index 0000000000..7ba88a1769
--- /dev/null
+++ b/qtdeclarative/src/quickwidgets/qaccessiblequickwidgetfactory.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQuick module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qaccessiblequickwidgetfactory_p.h"
+#include "qaccessiblequickwidget_p.h"
+
+QT_BEGIN_NAMESPACE
+
+#if QT_CONFIG(accessibility)
+
+QAccessibleInterface *qAccessibleQuickWidgetFactory(const QString &classname, QObject *object)
+{
+ if (classname == QLatin1String("QQuickWidget")) {
+ return new QAccessibleQuickWidget(qobject_cast<QQuickWidget *>(object));
+ } else if (classname == QLatin1String("QQuickWidgetOffscreenWindow")) {
+ return new QAccessibleQuickWidgetOffscreenWindow(qobject_cast<QQuickWindow *>(object));
+ }
+ return 0;
+}
+
+#endif // accessibility
+
+QT_END_NAMESPACE
+
diff --git a/qtdeclarative/src/quickwidgets/qaccessiblequickwidgetfactory_p.h b/qtdeclarative/src/quickwidgets/qaccessiblequickwidgetfactory_p.h
new file mode 100644
index 0000000000..8c63b09f81
--- /dev/null
+++ b/qtdeclarative/src/quickwidgets/qaccessiblequickwidgetfactory_p.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQuick module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/qaccessible.h>
+
+#ifndef QACCESSIBLEQUICKWIDGETFACTORY_H
+#define QACCESSIBLEQUICKWIDGETFACTORY_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+QT_BEGIN_NAMESPACE
+
+#if QT_CONFIG(accessibility)
+
+QAccessibleInterface *qAccessibleQuickWidgetFactory(const QString &classname, QObject *object);
+
+#endif
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/qtdeclarative/src/quickwidgets/qquickwidget.cpp b/qtdeclarative/src/quickwidgets/qquickwidget.cpp
index cf021d9a7c..b0117683f7 100644
--- a/qtdeclarative/src/quickwidgets/qquickwidget.cpp
+++ b/qtdeclarative/src/quickwidgets/qquickwidget.cpp
@@ -39,6 +39,7 @@
#include "qquickwidget.h"
#include "qquickwidget_p.h"
+#include "qaccessiblequickwidgetfactory_p.h"
#include "private/qquickwindow_p.h"
#include "private/qquickitem_p.h"
@@ -75,9 +76,16 @@
QT_BEGIN_NAMESPACE
+QQuickWidgetOffscreenWindow::QQuickWidgetOffscreenWindow(QQuickWindowPrivate &dd, QQuickRenderControl *control)
+:QQuickWindow(dd, control)
+{
+ setTitle(QString::fromLatin1("Offscreen"));
+ setObjectName(QString::fromLatin1("QQuickOffScreenWindow"));
+}
+
// override setVisble to prevent accidental offscreen window being created
// by base class.
-class QQuickOffcreenWindowPrivate: public QQuickWindowPrivate {
+class QQuickWidgetOffscreenWindowPrivate: public QQuickWindowPrivate {
public:
void setVisible(bool visible) override {
Q_Q(QWindow);
@@ -105,9 +113,8 @@ void QQuickWidgetPrivate::init(QQmlEngine* e)
Q_Q(QQuickWidget);
renderControl = new QQuickWidgetRenderControl(q);
- offscreenWindow = new QQuickWindow(*new QQuickOffcreenWindowPrivate(),renderControl);
- offscreenWindow->setTitle(QString::fromLatin1("Offscreen"));
- offscreenWindow->setObjectName(QString::fromLatin1("QQuickOffScreenWindow"));
+ offscreenWindow = new QQuickWidgetOffscreenWindow(*new QQuickWidgetOffscreenWindowPrivate(), renderControl);
+ offscreenWindow->setScreen(q->screen());
// Do not call create() on offscreenWindow.
// Check if the Software Adaptation is being used
@@ -138,6 +145,10 @@ void QQuickWidgetPrivate::init(QQmlEngine* e)
QWidget::connect(offscreenWindow, &QQuickWindow::focusObjectChanged, q, &QQuickWidget::propagateFocusObjectChanged);
QObject::connect(renderControl, SIGNAL(renderRequested()), q, SLOT(triggerUpdate()));
QObject::connect(renderControl, SIGNAL(sceneChanged()), q, SLOT(triggerUpdate()));
+
+#if QT_CONFIG(accessibility)
+ QAccessible::installFactory(&qAccessibleQuickWidgetFactory);
+#endif
}
void QQuickWidgetPrivate::ensureEngine() const
@@ -901,9 +912,7 @@ void QQuickWidgetPrivate::createContext()
context = new QOpenGLContext;
context->setFormat(offscreenWindow->requestedFormat());
- const QWindow *win = q->window()->windowHandle();
- if (win && win->screen())
- context->setScreen(win->screen());
+ context->setScreen(q->screen());
QOpenGLContext *shareContext = qt_gl_global_share_context();
if (!shareContext)
shareContext = QWidgetPrivate::get(q->window())->shareContext();
@@ -1527,19 +1536,16 @@ bool QQuickWidget::event(QEvent *e)
d->handleWindowChange();
break;
- case QEvent::ScreenChangeInternal:
- if (QWindow *window = this->window()->windowHandle()) {
- QScreen *newScreen = window->screen();
-
- if (d->offscreenWindow)
- d->offscreenWindow->setScreen(newScreen);
- if (d->offscreenSurface)
- d->offscreenSurface->setScreen(newScreen);
+ case QEvent::ScreenChangeInternal: {
+ QScreen *newScreen = screen();
+ if (d->offscreenWindow)
+ d->offscreenWindow->setScreen(newScreen);
+ if (d->offscreenSurface)
+ d->offscreenSurface->setScreen(newScreen);
#if QT_CONFIG(opengl)
- if (d->context)
- d->context->setScreen(newScreen);
+ if (d->context)
+ d->context->setScreen(newScreen);
#endif
- }
if (d->useSoftwareRenderer
#if QT_CONFIG(opengl)
@@ -1552,7 +1558,7 @@ bool QQuickWidget::event(QEvent *e)
d->render(true);
}
break;
-
+ }
case QEvent::Show:
case QEvent::Move:
d->updatePosition();
diff --git a/qtdeclarative/src/quickwidgets/qquickwidget_p.h b/qtdeclarative/src/quickwidgets/qquickwidget_p.h
index 881f7f9220..1a946bcc71 100644
--- a/qtdeclarative/src/quickwidgets/qquickwidget_p.h
+++ b/qtdeclarative/src/quickwidgets/qquickwidget_p.h
@@ -148,6 +148,14 @@ public:
bool forceFullUpdate;
};
+class QQuickWidgetOffscreenWindow: public QQuickWindow
+{
+ Q_OBJECT
+
+public:
+ QQuickWidgetOffscreenWindow(QQuickWindowPrivate &dd, QQuickRenderControl *control);
+};
+
QT_END_NAMESPACE
#endif // QQuickWidget_P_H
diff --git a/qtdeclarative/src/quickwidgets/quickwidgets.pro b/qtdeclarative/src/quickwidgets/quickwidgets.pro
index 2438e577ae..85d156b8a3 100644
--- a/qtdeclarative/src/quickwidgets/quickwidgets.pro
+++ b/qtdeclarative/src/quickwidgets/quickwidgets.pro
@@ -7,9 +7,13 @@ DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES QT_NO_FO
HEADERS += \
qquickwidget.h \
qquickwidget_p.h \
- qtquickwidgetsglobal.h
+ qtquickwidgetsglobal.h \
+ qaccessiblequickwidget_p.h \
+ qaccessiblequickwidgetfactory_p.h
SOURCES += \
- qquickwidget.cpp
+ qquickwidget.cpp \
+ qaccessiblequickwidget.cpp \
+ qaccessiblequickwidgetfactory.cpp
load(qt_module)
diff --git a/qtdeclarative/tests/auto/qml/qqmldelegatemodel/data/deleteRace.qml b/qtdeclarative/tests/auto/qml/qqmldelegatemodel/data/deleteRace.qml
new file mode 100644
index 0000000000..23874970e7
--- /dev/null
+++ b/qtdeclarative/tests/auto/qml/qqmldelegatemodel/data/deleteRace.qml
@@ -0,0 +1,50 @@
+import QtQuick 2.15
+import QtQml.Models 2.15
+
+Item {
+ DelegateModel {
+ id: delegateModel
+ model: ListModel {
+ id: sourceModel
+
+ ListElement { title: "foo" }
+ ListElement { title: "bar" }
+
+ function clear() {
+ if (count > 0)
+ remove(0, count);
+ }
+ }
+
+ groups: [
+ DelegateModelGroup { name: "selectedItems" }
+ ]
+
+ delegate: Text {
+ height: DelegateModel.inSelectedItems ? implicitHeight * 2 : implicitHeight
+ Component.onCompleted: {
+ if (index === 0)
+ DelegateModel.inSelectedItems = true;
+ }
+ }
+
+ Component.onCompleted: {
+ items.create(0)
+ items.create(1)
+ }
+ }
+
+ ListView {
+ anchors.fill: parent
+ model: delegateModel
+ }
+
+ Timer {
+ running: true
+ interval: 10
+ onTriggered: sourceModel.clear()
+ }
+
+ property int count: delegateModel.items.count
+}
+
diff --git a/qtdeclarative/tests/auto/qml/qqmldelegatemodel/data/redrawUponColumnChange.qml b/qtdeclarative/tests/auto/qml/qqmldelegatemodel/data/redrawUponColumnChange.qml
new file mode 100644
index 0000000000..206133bb39
--- /dev/null
+++ b/qtdeclarative/tests/auto/qml/qqmldelegatemodel/data/redrawUponColumnChange.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.8
+
+ListView {
+ id: root
+ width: 200
+ height: 200
+
+ delegate: Text {
+ text: display
+ }
+}
diff --git a/qtdeclarative/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp b/qtdeclarative/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
index 35f1e2c94d..f473cff75f 100644
--- a/qtdeclarative/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
+++ b/qtdeclarative/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
@@ -27,6 +27,8 @@
****************************************************************************/
#include <QtTest/qtest.h>
+#include <QtCore/QConcatenateTablesProxyModel>
+#include <QtGui/QStandardItemModel>
#include <QtQml/qqmlcomponent.h>
#include <QtQmlModels/private/qqmldelegatemodel_p.h>
#include <QtQuick/qquickview.h>
@@ -47,6 +49,8 @@ private slots:
void filterOnGroup_removeWhenCompleted();
void qtbug_86017();
void contextAccessedByHandler();
+ void redrawUponColumnChange();
+ void deleteRace();
};
class AbstractItemModel : public QAbstractItemModel
@@ -186,6 +190,41 @@ void tst_QQmlDelegateModel::contextAccessedByHandler()
QVERIFY(root->property("works").toBool());
}
+void tst_QQmlDelegateModel::redrawUponColumnChange()
+{
+ QStandardItemModel m1;
+ m1.appendRow({
+ new QStandardItem("Banana"),
+ new QStandardItem("Coconut"),
+ });
+
+ QQuickView view(testFileUrl("redrawUponColumnChange.qml"));
+ QCOMPARE(view.status(), QQuickView::Ready);
+ view.show();
+ QQuickItem *root = view.rootObject();
+ root->setProperty("model", QVariant::fromValue<QObject *>(&m1));
+
+ QObject *item = root->property("currentItem").value<QObject *>();
+ QVERIFY(item);
+ QCOMPARE(item->property("text").toString(), "Banana");
+
+ QVERIFY(root);
+ m1.removeColumn(0);
+
+ QCOMPARE(item->property("text").toString(), "Coconut");
+}
+
+void tst_QQmlDelegateModel::deleteRace()
+{
+ QQmlEngine engine;
+ QQmlComponent c(&engine, testFileUrl("deleteRace.qml"));
+ QVERIFY2(c.isReady(), qPrintable(c.errorString()));
+ QScopedPointer<QObject> o(c.create());
+ QVERIFY(!o.isNull());
+ QTRY_COMPARE(o->property("count").toInt(), 2);
+ QTRY_COMPARE(o->property("count").toInt(), 0);
+}
+
QTEST_MAIN(tst_QQmlDelegateModel)
#include "tst_qqmldelegatemodel.moc"
diff --git a/qtdeclarative/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp b/qtdeclarative/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
index 9c865b3f73..1f788f7a7f 100644
--- a/qtdeclarative/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
+++ b/qtdeclarative/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
@@ -154,6 +154,11 @@ void tst_QQmlImport::importPathOrder()
engine.addImportPath(QT_QMLTEST_DATADIR);
expectedImportPaths.prepend(QT_QMLTEST_DATADIR);
QCOMPARE(expectedImportPaths, engine.importPathList());
+
+ // Add qml2Imports again to make it the first of the list
+ engine.addImportPath(qml2Imports);
+ expectedImportPaths.move(expectedImportPaths.indexOf(qml2Imports), 0);
+ QCOMPARE(expectedImportPaths, engine.importPathList());
}
Q_DECLARE_METATYPE(QQmlImports::ImportVersion)
diff --git a/qtdeclarative/tests/auto/quick/qquickgridview/data/qtbug86255.qml b/qtdeclarative/tests/auto/quick/qquickgridview/data/qtbug86255.qml
new file mode 100644
index 0000000000..20688b1967
--- /dev/null
+++ b/qtdeclarative/tests/auto/quick/qquickgridview/data/qtbug86255.qml
@@ -0,0 +1,55 @@
+import QtQuick 2.15
+
+Item {
+ width: 240
+ height: 320
+
+ GridView {
+ id: grid
+ objectName: "view"
+ anchors.fill: parent
+ cellWidth: 64
+ cellHeight: 64
+ model: ListModel {
+ id: listModel
+
+ Component.onCompleted: reload()
+
+ function reload() {
+ clear();
+ for (let i = 0; i < 1000; i++) {
+ let magic = Math.random();
+ append( { magic } );
+ }
+ }
+ }
+ clip: true
+ delegate: Item {
+ id: d
+ property string val: magic
+ Loader {
+ property alias value: d.val
+ asynchronous: true
+ sourceComponent: cmp
+ }
+ }
+ }
+
+ Timer {
+ running: true
+ interval: 1000
+ onTriggered: listModel.reload()
+ }
+ Timer {
+ running: true
+ interval: 500
+ onTriggered: grid.flick(0, -4000)
+ }
+
+ Component {
+ id: cmp
+ Text {
+ text: value
+ }
+ }
+}
diff --git a/qtdeclarative/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/qtdeclarative/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index 94ec4f44d5..7d0d9fa7a7 100644
--- a/qtdeclarative/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/qtdeclarative/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -213,6 +213,7 @@ private slots:
void QTBUG_45640();
void QTBUG_49218();
void QTBUG_48870_fastModelUpdates();
+ void QTBUG_86255();
void keyNavigationEnabled();
void resizeDynamicCellWidthRtL();
@@ -6814,6 +6815,18 @@ void tst_QQuickGridView::resizeDynamicCellWidthRtL()
QTRY_COMPARE(gridview->contentX(), 0.f);
}
+void tst_QQuickGridView::QTBUG_86255()
+{
+ QScopedPointer<QQuickView> window(createView());
+ window->setSource(testFileUrl("qtbug86255.qml"));
+ window->show();
+ QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+ QQuickGridView *view = findItem<QQuickGridView>(window->rootObject(), "view");
+ QVERIFY(view != nullptr);
+ QTRY_COMPARE(view->isFlicking(), true);
+ QTRY_COMPARE(view->isFlicking(), false);
+}
+
void tst_QQuickGridView::releaseItems()
{
QScopedPointer<QQuickView> view(createView());
diff --git a/qtdeclarative/tests/auto/quick/qquickitem2/data/activeFocusOnTab_infiniteLoop3.qml b/qtdeclarative/tests/auto/quick/qquickitem2/data/activeFocusOnTab_infiniteLoop3.qml
new file mode 100644
index 0000000000..889e480f3b
--- /dev/null
+++ b/qtdeclarative/tests/auto/quick/qquickitem2/data/activeFocusOnTab_infiniteLoop3.qml
@@ -0,0 +1,13 @@
+import QtQuick 2.6
+
+Item {
+ visible: true
+ Item {
+ visible: false
+ Item {
+ objectName: "hiddenChild"
+ activeFocusOnTab: true
+ focus: true
+ }
+ }
+}
diff --git a/qtdeclarative/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/qtdeclarative/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
index c8f251dbe1..c8ef36ee68 100644
--- a/qtdeclarative/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
+++ b/qtdeclarative/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
@@ -67,6 +67,7 @@ private slots:
void activeFocusOnTab10();
void activeFocusOnTab_infiniteLoop_data();
void activeFocusOnTab_infiniteLoop();
+ void activeFocusOnTab_infiniteLoopControls();
void nextItemInFocusChain();
void nextItemInFocusChain2();
@@ -1057,6 +1058,17 @@ void tst_QQuickItem::activeFocusOnTab_infiniteLoop()
QCOMPARE(item, window->rootObject());
}
+
+void tst_QQuickItem::activeFocusOnTab_infiniteLoopControls()
+{
+ auto source = testFileUrl("activeFocusOnTab_infiniteLoop3.qml");
+ QScopedPointer<QQuickView>window(new QQuickView());
+ window->setSource(source);
+ window->show();
+ QVERIFY(window->errors().isEmpty());
+ QTest::keyClick(window.get(), Qt::Key_Tab); // should not hang
+}
+
void tst_QQuickItem::nextItemInFocusChain()
{
if (!qt_tab_all_widgets())
diff --git a/qtdeclarative/tests/auto/quick/qquickstates/data/jsValueWhen.qml b/qtdeclarative/tests/auto/quick/qquickstates/data/jsValueWhen.qml
new file mode 100644
index 0000000000..6d5eb1600c
--- /dev/null
+++ b/qtdeclarative/tests/auto/quick/qquickstates/data/jsValueWhen.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.15
+
+Item {
+ id: root
+ property var prop: null
+ property bool works: false
+ states: [
+ State {
+ name: "mystate"
+ when: root.prop
+ PropertyChanges {
+ target: root
+ works: "works"
+ }
+ }
+ ]
+ Component.onCompleted: root.prop = new Object
+}
diff --git a/qtdeclarative/tests/auto/quick/qquickstates/tst_qquickstates.cpp b/qtdeclarative/tests/auto/quick/qquickstates/tst_qquickstates.cpp
index aa55b42935..26e86672b0 100644
--- a/qtdeclarative/tests/auto/quick/qquickstates/tst_qquickstates.cpp
+++ b/qtdeclarative/tests/auto/quick/qquickstates/tst_qquickstates.cpp
@@ -188,6 +188,7 @@ private slots:
void revertListMemoryLeak();
void duplicateStateName();
void trivialWhen();
+ void jsValueWhen();
void noStateOsciallation();
void parentChangeCorrectReversal();
void revertNullObjectBinding();
@@ -1734,6 +1735,16 @@ void tst_qquickstates::trivialWhen()
QVERIFY(c.create());
}
+void tst_qquickstates::jsValueWhen()
+{
+ QQmlEngine engine;
+
+ QQmlComponent c(&engine, testFileUrl("jsValueWhen.qml"));
+ QScopedPointer<QObject> root(c.create());
+ QVERIFY(root);
+ QVERIFY(root->property("works").toBool());
+}
+
void tst_qquickstates::noStateOsciallation()
{
QQmlEngine engine;
diff --git a/qtdeclarative/tests/manual/quickcontrols2/swipedelegate/CloseOnCompletedWorks.qml b/qtdeclarative/tests/manual/quickcontrols2/swipedelegate/CloseOnCompletedWorks.qml
new file mode 100644
index 0000000000..38dfde41c3
--- /dev/null
+++ b/qtdeclarative/tests/manual/quickcontrols2/swipedelegate/CloseOnCompletedWorks.qml
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2
+import QtQuick.Controls 2
+ApplicationWindow {
+ visible: true
+ width: 640
+ height: 480
+
+ ListView {
+ anchors.fill: parent
+ model: 2
+
+ delegate: SwipeDelegate {
+ text: "Swipe me left (should not crash)"
+
+ swipe.right: Label {
+ text: "Release (should not crash)"
+ }
+
+ swipe.onCompleted: {
+ swipe.close()
+ }
+ }
+ }
+}
diff --git a/qtdeclarative/tools/qml/main.cpp b/qtdeclarative/tools/qml/main.cpp
index beeec88f07..2cb7653d65 100644
--- a/qtdeclarative/tools/qml/main.cpp
+++ b/qtdeclarative/tools/qml/main.cpp
@@ -446,8 +446,8 @@ int main(int argc, char *argv[])
QCommandLineParser parser;
parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
parser.setOptionsAfterPositionalArgumentsMode(QCommandLineParser::ParseAsPositionalArguments);
- const QCommandLineOption helpOption = parser.addHelpOption();
- const QCommandLineOption versionOption = parser.addVersionOption();
+ parser.addHelpOption();
+ parser.addVersionOption();
#ifdef QT_GUI_LIB
QCommandLineOption apptypeOption(QStringList() << QStringLiteral("a") << QStringLiteral("apptype"),
QCoreApplication::translate("main", "Select which application class to use. Default is gui."),
@@ -522,14 +522,7 @@ int main(int argc, char *argv[])
parser.addPositionalArgument("args",
QCoreApplication::translate("main", "Arguments after '--' are ignored, but passed through to the application.arguments variable in QML."), "[-- args...]");
- if (!parser.parse(QCoreApplication::arguments())) {
- qWarning() << parser.errorText();
- exit(1);
- }
- if (parser.isSet(versionOption))
- parser.showVersion();
- if (parser.isSet(helpOption))
- parser.showHelp();
+ parser.process(*app);
if (parser.isSet(listConfOption))
listConfFiles();
if (applicationType == QmlApplicationTypeUnknown) {
Submodule qtdoc bebd3261...210e3d43:
Submodule qtimageformats 3c2ad3ee..63ec444c:
diff --git a/qtimageformats/src/3rdparty/libtiff/ChangeLog b/qtimageformats/src/3rdparty/libtiff/ChangeLog
index c2e5405..87b5f12 100644
--- a/qtimageformats/src/3rdparty/libtiff/ChangeLog
+++ b/qtimageformats/src/3rdparty/libtiff/ChangeLog
@@ -1,3 +1,1033 @@
+2023-09-05 Even Rouault <even.rouault@spatialys.com>
+
+ libtiff v4.6.0 released
+
+2023-09-05 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_600' into 'master'
+ CMake: fix build with -Dstrip-chopping=off (fixes #600)
+
+ See merge request libtiff/libtiff!527
+
+2023-09-05 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'georgthegreat-master-patch-87447' into 'master'
+ Fix using __attribute__ libtiff with clang-for-windows
+
+ See merge request libtiff/libtiff!525
+
+2023-09-05 Yuriy Chernyshov <georgthegreat@gmail.com>
+
+ Fix using __attribute__ libtiff with clang-for-windows.
+
+2023-09-05 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'manpage_TIFFField_docu_update' into 'master'
+ manpages: TiffField functions documentation updated with return behaviour for...
+
+ See merge request libtiff/libtiff!526
+
+2023-09-05 Even Rouault <even.rouault@spatialys.com>
+
+ CMake: fix build with -Dstrip-chopping=off (fixes #600)
+
+2023-09-03 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'consistently_update_TIFF-version_from_configure-ac' into 'master'
+ Update CMake and autoconf scripts to consistently update LibTIFF version...
+
+ See merge request libtiff/libtiff!456
+
+2023-09-03 Su Laus <sulau@freenet.de>
+
+ Update CMake and autoconf scripts to consistently update LibTIFF version defines and references in various files when version definition in configure.ac has been changed.
+ - Move in tiffvers.h from .\libtiff source directory to .\libtiff build directory.
+ - Remove unused version information from tif_config.h
+ - With every CMake build the version defines (e.g. 4.5.1) within tiffvers.h are consistently updated from configure.ac. The version release-date is taken from file RELEASE-DATE.
+ - The files VERSION and RELEASE-DATE are only updated with a special CMake target build: cmake --build . --target tiff_release.
+
+ - For autotools, version information is updated from configure.ac with ./autogen.sh. LIBTIFF_RELEASE_DATE is taken form file RELEASE-DATE.
+ - ./configure generates tiffvers.h with the cached version information and LIBTIFF_RELEASE_DATE.
+ - "make release" updates tiffvers.h and VERSION file with cached version info and RELEASE-DATE file and tiffves.h with the current date.
+
+2023-08-28 Su_Laus <sulau@freenet.de>
+
+ manpages: TiffField functions documentation updated with return behaviour for not defined tags and determination of write-/read-count size.
+
+2023-08-22 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'change_long_to_int32_t_in_two_test_apps' into 'master'
+ Change "long" to "int32_t" in two test apps, because can be either int32_t or...
+
+ See merge request libtiff/libtiff!524
+
+2023-08-21 Su_Laus <sulau@freenet.de>
+
+ Change "long" to "int32_t" in two test apps, because can be either int32_t or int64_t, depending on compiler and system.
+
+2023-08-16 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'CI_CMake_static_build' into 'master'
+ Add static build for CI/CD to run testcases which need private interface functions.
+
+ See merge request libtiff/libtiff!521
+
+2023-08-16 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_#597_tiffset_different_signedness' into 'master'
+ tiffset fix #597: warning: comparison of integer expressions of different signedness.
+
+ Closes #597
+
+ See merge request libtiff/libtiff!523
+
+2023-08-16 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'tiffcp_remove_i_option' into 'master'
+ tiffcp: remove -i option (ignore errors)
+
+ See merge request libtiff/libtiff!522
+
+2023-08-16 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'move_tools_to_unsupported_a_archive' into 'master'
+ Move most TIFF tools to archive and keep some as unsupported (see #580).
+
+ See merge request libtiff/libtiff!520
+
+2023-08-16 Su Laus <sulau@freenet.de>
+
+ Move most TIFF tools to archive and keep some as unsupported (see #580).
+
+2023-08-12 Su_Laus <sulau@freenet.de>
+
+ Add static build for CI/CD to run testcases which need private interface functions.
+
+ tiffset fix #597: warning: comparison of integer expressions of different signedness.
+
+ Remove -i option (ignore errors) from tiffcp, because almost all fuzzer issues were consequential errors from ignored errors because of the "-i" option.
+
+2023-08-11 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_585_test_write_read_tags_autoconf' into 'master'
+ Add missing test_write_read_tags.c and test_transferfunction_write_read.c in...
+
+ Closes #585
+
+ See merge request libtiff/libtiff!519
+
+2023-07-24 Even Rouault <even.rouault@spatialys.com>
+
+ Fix copy paste error.
+
+2023-07-23 Su_Laus <sulau@freenet.de>
+
+ Add missing test_write_read_tags.c and test_transferfunction_write_read.c in tarball (fixes #585) and correct „long“ issue.
+ Don't use "long" because can be int32_t or int64_t, depending on compiler and system.
+
+2023-07-20 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'clang-format-tools' into 'master'
+ Automatically format with clang-format
+
+ See merge request libtiff/libtiff!518
+
+2023-07-20 Timothy Lyanguzov <timothy.lyanguzov@sap.com>
+
+ Automatically format with clang-format.
+
+2023-07-20 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_589' into 'master'
+ TiffConfig.cmake.in: set TIFF_INCLUDE_DIR, TIFF_INCLUDE_DIRS and...
+
+ Closes #589
+
+ See merge request libtiff/libtiff!514
+
+2023-07-20 Even Rouault <even.rouault@spatialys.com>
+
+ TiffConfig.cmake.in: set TIFF_INCLUDE_DIR, TIFF_INCLUDE_DIRS and...
+
+2023-07-19 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'master-patch-6fc6' into 'master'
+ raw2tiff: fix integer overflow and bypass of the check (fixes #592)
+
+ See merge request libtiff/libtiff!516
+
+2023-07-19 Arie Haenel <arie.haenel@jct.ac.il>
+
+ raw2tiff: fix integer overflow and bypass of the check (fixes #592)
+
+2023-07-19 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'master-patch-05a4' into 'master'
+ tiffcp: fix memory corruption (overflow) on hostile images (fixes #591)
+
+ See merge request libtiff/libtiff!515
+
+2023-07-19 Arie Haenel <arie.haenel@jct.ac.il>
+
+ tiffcp: fix memory corruption (overflow) on hostile images (fixes #591)
+
+2023-07-17 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix-numtrunc' into 'master'
+ fix numtrunc at tiff_dirread.c
+
+ See merge request libtiff/libtiff!512
+
+2023-07-17 headshog <craaaaaachind@gmail.com>
+
+ TIFFReadDirectoryCheckOrder: avoid integer overflow.
+ When it occurs, it should be harmless in practice though
+
+2023-07-17 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'webp_lossless_exact' into 'master'
+ WebP codec: turn exact mode when creating lossless files to avoid altering...
+
+ See merge request libtiff/libtiff!511
+
+2023-07-11 Even Rouault <even.rouault@spatialys.com>
+
+ WebP codec: turn exact mode when creating lossless files to avoid altering R,G,B values in areas where alpha=0
+ Fixes https://github.com/OSGeo/gdal/issues/8038
+
+2023-07-05 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'webp_reg_fix' into 'master'
+ WebP decoder: fix error when reading a 3-band blob in a RGBA image
+
+ See merge request libtiff/libtiff!510
+
+2023-07-05 Even Rouault <even.rouault@spatialys.com>
+
+ WebP decoder: fix error when reading a 3-band blob in a RGBA image.
+ Fixes regression of 350ff161c8a61b6483a1e4689e09cd47dd0dd5f9 (master only)
+
+2023-06-26 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'appveyor_fix' into 'master'
+ .appveyor.yml: workaround build error
+
+ See merge request libtiff/libtiff!509
+
+2023-06-26 Even Rouault <even.rouault@spatialys.com>
+
+ .appveyor.yml: workaround build error.
+
+2023-06-26 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'tif_webp_warning_fixes' into 'master'
+ tif_webp.c: fix signed vs unsigned comparison warnings (fix previous commit)
+
+ See merge request libtiff/libtiff!508
+
+2023-06-26 Even Rouault <even.rouault@spatialys.com>
+
+ tif_webp.c: fix signed vs unsigned comparison warnings (fix previous commit)
+
+2023-06-26 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_TransferFunction_writing' into 'master'
+ Fix TransferFunction writing of only two transfer functions.
+
+ See merge request libtiff/libtiff!502
+
+2023-06-26 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_581_582' into 'master'
+ WebP decoder: validate WebP blob width, height, band count against TIFF parameters
+
+ Closes #582 et #581
+
+ See merge request libtiff/libtiff!507
+
+2023-06-19 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'warning_cmake_config_file' into 'master'
+ v4.5.1 release note: add warning about CMake config file being preview
+
+ See merge request libtiff/libtiff!506
+
+2023-06-17 Even Rouault <even.rouault@spatialys.com>
+
+ WebP decoder: validate WebP blob width, height, band count against TIFF parameters
+ to avoid use of uninitialized variable, or decoding corrupted content
+ without explicit error
+
+ Fixes #581, fixes #582
+
+2023-06-15 Even Rouault <even.rouault@spatialys.com>
+
+ v4.5.1 release note: add warning about CMake config file being preview.
+
+2023-06-14 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'HOWTO-RELEASE-gitlab-release' into 'master'
+ HOWTO-RELEASE: mention creating a gitlab release
+
+ See merge request libtiff/libtiff!505
+
+2023-06-14 Even Rouault <even.rouault@spatialys.com>
+
+ HOWTO-RELEASE: mention creating a gitlab release.
+
+2023-06-10 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'TIFFOpenWExt_O_RDWR' into 'master'
+ TIFFOpenWExt(): mode r+ in the Windows implementation adjusted to that of Linux
+
+ See merge request libtiff/libtiff!504
+
+2023-06-10 Even Rouault <even.rouault@spatialys.com>
+
+ TIFFOpenWExt(): mode r+ in the Windows implementation adjusted to that of Linux
+
+2023-06-10 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_ossfuzz_59751' into 'master'
+ TIFFReadDirectory(): fix crash when reading tag TIFFTAG_EP_BATTERYLEVEL
+
+ See merge request libtiff/libtiff!503
+
+2023-06-10 Even Rouault <even.rouault@spatialys.com>
+
+ TIFFReadDirectory(): fix crash when reading tag TIFFTAG_EP_BATTERYLEVEL.
+ Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=59751
+
+ In 738e0409 (refs #575), we disabled DNG / EP tags, but there was a
+ special proessing for TIFFTAG_EP_BATTERYLEVEL that must be disabled
+ since the tag is no longer defined.
+
+2023-06-09 Su_Laus <sulau@freenet.de>
+
+ Fix TransferFunction writing of only two transfer functions. The TIFFWriteDirectoryTagTransferfunction() function writes in some cases only two transfer functions, although only exactly one or exactly three transfer functions are allowed. This then leads to an error when reading. --> TIFFReadDirectory: Warning, Incorrect count for "TransferFunction"; tag ignored.
+ This MR corrects the behaviour of TIFFWriteDirectoryTagTransferfunction() accordingly. Furthermore, a possible buffer overflow is avoided.
+
+2023-06-09 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_win_build' into 'master'
+ Fix Windows build
+
+ Closes #578
+
+ See merge request libtiff/libtiff!501
+
+2023-06-09 Even Rouault <even.rouault@spatialys.com>
+
+ cmake/PkgConfig.cmake: avoid CMake error when prefix or suffix is empty.
+
+ Add tif_win32_versioninfo.rc and tif_tools_versioninfo.rc to EXTRA_DIST.
+
+2023-06-09 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_coverity_build' into 'master'
+ build/gitlab-ci: fix coverity_build()
+
+ See merge request libtiff/libtiff!499
+
+2023-06-09 Even Rouault <even.rouault@spatialys.com>
+
+ build/gitlab-ci: fix coverity_build()
+
+2023-06-09 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'v4.5.1rc1_preparation' into 'master'
+ Prepare release 4.5.1
+
+ See merge request libtiff/libtiff!498
+
+2023-06-09 Even Rouault <even.rouault@spatialys.com>
+
+ Prepare for v4.5.1 release.
+
+ Merge remote-tracking branch 'sulaus/Rel_4.5.1_preparation'
+
+2023-06-09 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'disable_dng_tags' into 'master'
+ tif_dirinfo.c: disable DNG 1.2->1.6 tags
+
+ Closes #575
+
+ See merge request libtiff/libtiff!497
+
+2023-06-09 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_577' into 'master'
+ CMake related fixes
+
+ Closes #577
+
+ See merge request libtiff/libtiff!496
+
+2023-06-09 Even Rouault <even.rouault@spatialys.com>
+
+ libtiff v4.5.1 released
+
+2023-06-09 Even Rouault <even.rouault@spatialys.com>
+
+ Merge remote-tracking branch 'sulaus/Rel_4.5.1_preparation'
+
+2023-06-09 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'disable_dng_tags' into 'master'
+ tif_dirinfo.c: disable DNG 1.2->1.6 tags
+
+ Closes #575
+
+ See merge request libtiff/libtiff!497
+
+2023-06-09 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_577' into 'master'
+ CMake related fixes
+
+ Closes #577
+
+ See merge request libtiff/libtiff!496
+
+2023-06-07 Even Rouault <even.rouault@spatialys.com>
+
+ tif_dirinfo.c: disable DNG 1.2->1.6 tags.
+ They were added per b90b20d36d7833f54a1f3014c324f6c21b988006 but it has
+ been found in https://gitlab.com/libtiff/libtiff/-/issues/575 that it
+ could cause compatibity issues with libtiff users, so this addition
+ should be defered for a feature release (likely 4.6.0) and not a patch one.
+
+ Fixes #575
+
+2023-06-06 Timothy Lyanguzov <theta682@gmail.com>
+
+ Apply 1 suggestion(s) to 1 file(s)
+
+2023-06-05 Even Rouault <even.rouault@spatialys.com>
+
+ CI: add testing of find_package(Tiff CONFIG)
+
+ CMake: export TiffConfig.cmake and TiffConfigVersion.cmake files.
+
+ libtiff/CMakeLists.txt: fix export of INTERFACE_INCLUDE_DIRECTORIES.
+
+ libtiff/CMakeLists.txt: correctly define TIFF::tiff alias (fixes #577)
+
+2023-06-05 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'TIFFField_downgrade_errors_to_warnings' into 'master'
+ TIFFFieldWithName() and TIFFFieldWithTag() downgrade errors to warnings.
+
+ See merge request libtiff/libtiff!495
+
+2023-05-28 Su_Laus <sulau@freenet.de>
+
+ TIFFFieldWithName() and TIFFFieldWithTag() downgrade errors to warnings. see https://gitlab.com/libtiff/libtiff/-/issues/575#note_1407633888
+
+2023-05-25 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'bebuch-master-patch-58347' into 'master'
+ check if upstream lzma (xz) config was used and bind to it if so
+
+ See merge request libtiff/libtiff!494
+
+2023-05-25 Benjamin Buch <benni.buch@gmail.com>
+
+ check if upstream lzma (xz) config was used and bind to it if so.
+
+2023-05-25 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'upstream-zstd-config' into 'master'
+ check if upstream zstd config was used and bind to it if so
+
+ See merge request libtiff/libtiff!493
+
+2023-05-25 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'cmake_FindDeflate_bugs_see_526' into 'master'
+ CMake: FindDeflate several errors fixed (see #526)
+
+ See merge request libtiff/libtiff!491
+
+2023-05-24 Su_Laus <sulau@freenet.de>
+
+ CMake: FindDeflate several errors (see #526)
+ There are CMake issues if the library is not included in the environment path and only set with CMake -D option.
+ - For FindDeflate.cmake, FindJBIG.cmake, FindLERC.cmake, FindWebP.cmake, FindZSTD.cmake:
+ Set IMPORTED_LOCATION (without debug or release) if neither <library>_LIBRARY_RELEASE nor <library>_LIBRARY_DEBUG were set.
+ - FindDeflate.cmake: Correct code to retrieve library version information from libdeflate.h
+ - FindLERC.cmake version string return added.
+
+2023-05-24 Benjamin Buch <benni.buch@gmail.com>
+
+ prefer shared over static.
+
+ check if upstream zstd config was used and bind to it if so.
+
+2023-05-24 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'master' into 'master'
+ make WebP component name compatible with upstream ConfigWebP.cmake
+
+ See merge request libtiff/libtiff!492
+
+2023-05-24 Benjamin Buch <benni.buch@gmail.com>
+
+ CMake: make WebP component name compatible with upstream ConfigWebP.cmake
+
+2023-05-18 Su_Laus <sulau@freenet.de>
+
+ Prepare release 4.5.1 - Update till 18.05.23 after fix_559_DNG_1.6_passcount_error
+
+ Prepare release 4.5.1.
+
+2023-05-18 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_559_DNG_1.6_passcount_error' into 'master'
+ Fix #559 DNG 1.6 passcount assertion
+
+ Closes #574 et #559
+
+ See merge request libtiff/libtiff!489
+
+2023-05-18 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_557_TagExtender_for_CustomDirectories_not_possible' into 'master'
+ manpage: TIFFSetTagExtender() cannot add tags to custom directories. Closes #557.
+
+ Closes #557
+
+ See merge request libtiff/libtiff!490
+
+2023-05-18 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_559_DNG_1.6_passcount_error' into 'master'
+ Fix #559 DNG 1.6 passcount assertion
+
+ Closes #574 et #559
+
+ See merge request libtiff/libtiff!489
+
+2023-05-18 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_557_TagExtender_for_CustomDirectories_not_possible' into 'master'
+ manpage: TIFFSetTagExtender() cannot add tags to custom directories. Closes #557.
+
+ Closes #557
+
+ See merge request libtiff/libtiff!490
+
+2023-05-17 Su_Laus <sulau@freenet.de>
+
+ Documentation update: TIFFSetTagExtender() cannot add tags to custom directories.
+ Closes #557.
+
+2023-05-16 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_558' into 'master'
+ Hardcode HOST_FILLORDER to FILLORDER_LSB2MSB, and make 'H' flag of TIFFOpen()...
+
+ See merge request libtiff/libtiff!488
+
+2023-05-16 Su_Laus <sulau@freenet.de>
+
+ Fix #559 DNG 1.6 passcount assertion.
+ Amend DNG tags definition introduced with MR 482:
+ - DNG 1.6 tags specified as UTF-8 strings are defined as variable TIFF_BYTE with passcount=TRUE.
+ - For all tags with TIFF_SETGET_C32_UINT8 the readcount and writecount were corrected to -3 (TIFF_VARIABLE2).
+
+ Testprogram to write and read all tags defined within LibTIFF is introduced.
+ It also checks for valid passcount flag setting for the defined tags but some special tags are excluded from that check.
+
+ Closes #559.
+
+2023-05-09 Even Rouault <even.rouault@spatialys.com>
+
+ Hardcode HOST_FILLORDER to FILLORDER_LSB2MSB, and make 'H' flag of TIFFOpen() to warn and an alias of FILLORDER_MSB2LSB
+
+ tif_lerc.c: use WORDS_BIGENDIAN instead of HOST_BIGENDIAN.
+
+2023-05-07 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_484_TIFFDirectory_32_64_bit' into 'master'
+ Fix 484 TIFFDirectory td_fieldsset uses unsigned long which can be 32 or 64 bits.
+
+ Closes #484
+
+ See merge request libtiff/libtiff!471
+
+2023-05-07 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'DNG_1.6_EP_tags' into 'master'
+ Add DNG tags up to version 1.6.0.0 and some TIFF/EP tags and update documentation
+
+ See merge request libtiff/libtiff!482
+
+2023-05-07 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'issue547' into 'master'
+ do not install libtiff-4.pc when tiff-install is reset
+
+ Closes #547
+
+ See merge request libtiff/libtiff!481
+
+2023-05-06 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_548' into 'master'
+ LZWDecode(): avoid crash when trying to read again from a strip whith a...
+
+ Closes #548
+
+ See merge request libtiff/libtiff!484
+
+2023-05-06 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'tiffcrop_fix_553_multi-image-errors' into 'master'
+ tiffcrop: fix 553 by considering error return of writeSelections()
+
+ Closes #553
+
+ See merge request libtiff/libtiff!485
+
+2023-05-06 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'tif_ojpeg_fix-554_FPE' into 'master'
+ tif_ojpeg.c fix 554 by checking for division by zero
+
+ Closes #554
+
+ See merge request libtiff/libtiff!486
+
+2023-05-06 Su Laus <sulau@freenet.de>
+
+ tif_ojpeg.c fix 554 by checking for division by zero.
+
+2023-05-05 Su_Laus <sulau@freenet.de>
+
+ Consider error return of writeSelections(). Fixes #553.
+
+2023-04-29 Even Rouault <even.rouault@spatialys.com>
+
+ LZWDecode(): avoid crash when trying to read again from a strip whith a missing end-of-information marker (fixes #548)
+
+2023-04-25 Su_Laus <sulau@freenet.de>
+
+ Add DNG tags up to version 1.6.0.0 and some TIFF/EP tags and update documentation
+ Amend MR !337 'Add support for DNG tags up to version 1.6.0.0 and some TIFF/EP tags' from Sami Liedes:
+ - Set most tags to OkToChange=1.
+ - Define BATTERYLEVEL tag as ASCII and convert values of rational variant to ASCII.
+ - TIFF documentation updated for tags recognized by LibTiff (DNG 1.6 and others).
+ - TIFF/EP tags added, which are equivalent to EXIF tags. This addresses part of #418 as well.
+ - Definition of tags reformatted (clang-format off) for better readability of tag comments in tiff.h and tif_dirinfo.c
+
+2023-04-23 Roman <kosobrodov@fastmail.fm>
+
+ do not install libtiff-4.pc when tiff-install is reset.
+
+2023-04-21 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'mymaster1' into 'master'
+ fix runtime error: applying zero offset to null pointer
+
+ See merge request libtiff/libtiff!479
+
+2023-04-21 xiaoxiaoafeifei <lliangliang2007@163.com>
+
+ countInkNamesString(): fix `UndefinedBehaviorSanitizer`: applying zero offset to null pointer
+
+2023-03-26 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'tif_ovrcache_TIFFSetSubDirectory' into 'master'
+ tif_ovrcache.c: check TIFFSetSubDirectory() return value (CID 1524573)
+
+ See merge request libtiff/libtiff!478
+
+2023-03-26 Even Rouault <even.rouault@spatialys.com>
+
+ tif_ovrcache.c: check TIFFSetSubDirectory() return value (CID 1524573)
+
+2023-03-26 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'even_faster_setdirectory_with_IFDlist' into 'master'
+ Even faster TIFFSetDirectory() using IFD list.
+
+ See merge request libtiff/libtiff!477
+
+2023-03-26 Su Laus <sulau@freenet.de>
+
+ Even faster TIFFSetDirectory() using IFD list.
+
+2023-03-12 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'faster-setdirectory_newMR' into 'master'
+ Optimize relative seeking with TIFFSetDirectory
+
+ See merge request libtiff/libtiff!474
+
+2023-03-12 Su Laus <sulau@freenet.de>
+
+ Optimize relative seeking with TIFFSetDirectory.
+
+2023-03-11 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'master' into 'master'
+ Fix memory leak in tiffcrop.c
+
+ See merge request libtiff/libtiff!475
+
+2023-03-08 zhailiangliang <zhailiangliang@loongson.cn>
+
+ Fix memory leak in tiffcrop.c.
+
+2023-02-23 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'skip-thumbnail-test' into 'master'
+ test: avoid running tool tests if not built
+
+ Closes #421
+
+ See merge request libtiff/libtiff!334
+
+2023-02-22 Sam James <sam@gentoo.org>
+
+ test (cmake): skip script tests if tools aren't built.
+ In Gentoo, we avoid building the tools for multilib (32-bit, x86) builds on
+ amd64/x86_64 because we only need the library to keep binary applications working.
+
+ This causes a test failure in e.g. tiffcp-thumbnail.sh as the 'thumbnail'
+ binary isn't built. Skip it if unavailable.
+
+ Fixes: https://gitlab.com/libtiff/libtiff/-/issues/421
+
+2023-02-22 Sam James <sam@gentoo.org>
+
+ test (autotools): skip script tests if tools aren't built.
+ In Gentoo, we avoid building the tools for multilib (32-bit, x86) builds on
+ amd64/x86_64 because we only need the library to keep binary applications working.
+
+ This causes a test failure in e.g. tiffcp-thumbnail.sh as the 'thumbnail'
+ binary isn't built. Skip it if unavailable.
+
+ Fixes: https://gitlab.com/libtiff/libtiff/-/issues/421
+
+2023-02-16 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_Unlink_first_directory_0' into 'master'
+ Fix TIFFUnlinkDirectory(0) case and unlink of first directory.
+
+ See merge request libtiff/libtiff!460
+
+2023-02-16 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'tif_luv_check_NaN_fix_#530' into 'master'
+ tif_luv: Check and correct for NaN data in uv_encode().
+
+ Closes #530
+
+ See merge request libtiff/libtiff!473
+
+2023-02-16 Su_Laus <sulau@freenet.de>
+
+ tif_luv: Check and correct for NaN data in uv_encode().
+ Closes #530
+
+ See merge request !473
+
+2023-02-14 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'tiffcrop_dont_reuse_input_buffer_fix_527' into 'master'
+ tiffcrop: Do not reuse input buffer for subsequent images. Fix issue 527
+
+ Closes #527
+
+ See merge request libtiff/libtiff!472
+
+2023-02-14 Su_Laus <sulau@freenet.de>
+
+ tiffcrop: Do not reuse input buffer for subsequent images. Fix issue 527
+ Reuse of read_buff within loadImage() from previous image is quite unsafe, because other functions (like rotateImage() etc.) reallocate that buffer with different size without updating the local prev_readsize value.
+
+ Closes #527
+
+2023-02-08 Su_Laus <sulau@freenet.de>
+
+ Fix 484 TIFFDirectory td_fieldsset uses unsigned long which can be 32 or 64 bits.
+ Closes #484
+
+2023-02-08 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'test_ifd_loop_detection_fix_CoverityScan_ln_55' into 'master'
+ test_ifd_loop_detection: fix Coverity Scan issue CID 1520750: Null pointer...
+
+ See merge request libtiff/libtiff!470
+
+2023-02-08 Su_Laus <sulau@freenet.de>
+
+ test_ifd_loop_detection: fix Coverity Scan issue CID 1520750: Null pointer dereferences (NULL_RETURNS) line 55.
+
+2023-02-06 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'tiffcrop_fix_CoverityScan_line_9676' into 'master'
+ Fix Coverity Scan issue CID 1520761: Integer handling issues...
+
+ See merge request libtiff/libtiff!469
+
+2023-02-06 Su_Laus <sulau@freenet.de>
+
+ Fix Coverity Scan issue CID 1520761: Integer handling issues (OVERFLOW_BEFORE_WIDEN) tiffcrop.c: 9676 in rotateImage()
+
+2023-02-05 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'tiffcrop_R270_fix#492' into 'master'
+ tiffcrop: Amend rotateImage() not to toggle the input (main) image width and...
+
+ Closes #519, #518, #499, #495, #494, #493 et #492
+
+ See merge request libtiff/libtiff!465
+
+2023-02-05 Su_Laus <sulau@freenet.de>
+
+ tiffcrop: Amend rotateImage() not to toggle the input (main) image width and length parameters when only cropped image sections are rotated. Remove buffptr from region structure because never used.
+ Closes #492 #493 #494 #495 #499 #518 #519
+
+2023-02-05 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'tiffcrop_correctly_update_buffersize_after_rotate_fix#520' into 'master'
+ tiffcrop correctly update buffersize after rotateImage() fix#520
+
+ Closes #520
+
+ See merge request libtiff/libtiff!467
+
+2023-02-05 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'tiffcrop_composite_image_assumption_test_fix#496' into 'master'
+ tiffcrop: added check for assumption on composite images (fixes #496)
+
+ Closes #501, #500, #498, #497 et #496
+
+ See merge request libtiff/libtiff!466
+
+2023-02-05 Su Laus <sulau@freenet.de>
+
+ tiffcrop: added check for assumption on composite images (fixes #496)
+ tiffcrop: For composite images with more than one region, the combined_length or combined_width always needs to be equal, respectively. Otherwise, even the first section/region copy action might cause buffer overrun. This is now checked before the first copy action.
+
+ Closes #496, #497, #498, #500, #501.
+
+2023-02-04 Su_Laus <sulau@freenet.de>
+
+ tiffcrop correctly update buffersize after rotateImage() fix#520 -- enlarge buffsize and check integer overflow within rotateImage().
+
+2023-02-04 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'test_subidf_loop' into 'master'
+ test_ifd_loop_detection: Added test to check loops in SubIFDs that are chained.
+
+ See merge request libtiff/libtiff!464
+
+2023-02-04 Su Laus <sulau@freenet.de>
+
+ test_ifd_loop_detection: Added test to check loops in SubIFDs that are chained.
+
+2023-02-04 Su_Laus <sulau@freenet.de>
+
+ Fix TIFFUnlinkDirectory(0) case and unlink of first directory.
+ If directory number 0 is unlinked, then the base offset variables within LibTiff are not updated. As a result, a subsequent TIFFSetDirectory() first goes to the unlinked former directory number 0.
+
+ In addition, the error case for dirn=0 is handled.
+
+ This MR fixes that by updating the base offset variables tif->tif_header.classic.tiff_diroff and tif->tif_header.big.tiff_diroff.
+
+2023-02-03 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'TiffClose_NULL_ptr_dereferencing_fix_515' into 'master'
+ TIFFClose() avoid NULL pointer dereferencing. fix#515
+
+ Closes #515
+
+ See merge request libtiff/libtiff!468
+
+2023-02-03 Su_Laus <sulau@freenet.de>
+
+ TIFFClose() avoid NULL pointer dereferencing. fix#515.
+ Closes #515
+
+ tiffcrop correctly update buffersize after rotateImage() fix#520 rotateImage() set up a new buffer and calculates its size individually. Therefore, seg_buffs[] size needs to be updated accordingly. Before this fix, the seg_buffs buffer size was calculated with a different formula than within rotateImage().
+ Closes #520.
+
+2023-01-25 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'add_windows_DLL_versioninfo' into 'master'
+ Add versioninfo resource files for DLL and tools compiled with Windows MSVC and MINGW.
+
+ See merge request libtiff/libtiff!455
+
+2023-01-25 Su Laus <sulau@freenet.de>
+
+ Add versioninfo resource files for DLL and tools compiled with Windows MSVC and MINGW.
+
+2023-01-22 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'tif_hash_set_order_include' into 'master'
+ tif_hash_set.c: include tif_hash_set.h after tif_config.h to let a chance for...
+
+ See merge request libtiff/libtiff!462
+
+2023-01-22 Even Rouault <even.rouault@spatialys.com>
+
+ tif_hash_set.c: include tif_hash_set.h after tif_config.h to let a chance for GDAL symbol renaming trick
+
+2023-01-22 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_513' into 'master'
+ Fax3: fix failure to decode some fax3 images (fixes #513)
+
+ Closes #513
+
+ See merge request libtiff/libtiff!461
+
+2023-01-21 Even Rouault <even.rouault@spatialys.com>
+
+ Add test for Fax3 decoding issues (refs #513)
+
+2023-01-21 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'tiffcrop_fix_#488' into 'master'
+ tiffcrop: Correct simple copy paste error. Fix #488.
+
+ Closes #488
+
+ See merge request libtiff/libtiff!459
+
+2023-01-21 Su Laus <sulau@freenet.de>
+
+ tiffcrop: Correct simple copy paste error. Fix #488.
+
+2023-01-21 Even Rouault <even.rouault@spatialys.com>
+
+ Fax3: fix failure to decode some fax3 images (fixes #513)
+ Patch by @jsummers26
+
+2023-01-12 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'tiffmedian_fix_#477' into 'master'
+ tiffmedian: avoid zero num_colors, fixes #477
+
+ Closes #477
+
+ See merge request libtiff/libtiff!458
+
+2023-01-12 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fax2ps_fixes_#475' into 'master'
+ fax2ps: fixes #475 buffer overflow in qsort function pcompar.
+
+ Closes #475
+
+ See merge request libtiff/libtiff!457
+
+2023-01-12 Su_Laus <sulau@freenet.de>
+
+ tiffmedian: avoid zero num_colors, fixes #477.
+
+ fax2ps: fixes #475 buffer overflow in qsort function pcompar.
+
+2023-01-09 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'fix_241_tiffset_file_size_limit' into 'master'
+ tiffset: get filesize to allocate only the required memory. Fixes issue #241
+
+ Closes #241
+
+ See merge request libtiff/libtiff!451
+
+2023-01-09 Su Laus <sulau@freenet.de>
+
+ tiffset: get filesize to allocate only the required memory. Fixes issue #241
+
+2023-01-09 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch '_TIFFCleanupIFDOffsetAndNumberMaps' into 'master'
+ Add _TIFFCleanupIFDOffsetAndNumberMaps() and call it from TIFFUnlinkDirectory()
+
+ See merge request libtiff/libtiff!454
+
+2023-01-06 Even Rouault <even.rouault@spatialys.com>
+
+ Remove use of tif_dirnumber.
+
+ TIFFSetSubDirectory(): call _TIFFCleanupIFDOffsetAndNumberMaps()
+
+ struct tiff: remove unused tif_dirlistoff.
+
+ TIFFUnlinkDirectory(): reset tif_dirnumber.
+
+ Add _TIFFCleanupIFDOffsetAndNumberMaps() and call it from TIFFUnlinkDirectory()
+
+2022-12-29 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'cmake_in_files_formatting_sensitive' into 'master'
+ Disable clang-formatting for tif_config.h.cmake.in and tiffconf.h.cmake.in...
+
+ See merge request libtiff/libtiff!452
+
+2022-12-28 Su_Laus <sulau@freenet.de>
+
+ Disable clang-formatting for tif_config.h.cmake.in and tiffconf.h.cmake.in because sensitive for CMake scripts. - explanation added
+
+2022-12-26 Su_Laus <sulau@freenet.de>
+
+ Disable clang-formatting for tif_config.h.cmake.in and tiffconf.h.cmake.in because sensitive for CMake scripts.
+
+2022-12-19 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'manpage_multi-page-TIFF' into 'master'
+ manpage: Add multi page TIFF and SubIFDs description and read / write example.
+
+ See merge request libtiff/libtiff!450
+
+2022-12-19 Su Laus <sulau@freenet.de>
+
+ manpage: Add multi page TIFF and SubIFDs description and read / write example.
+
+2022-12-18 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'TIFFOpen_r+_windows_behaviour' into 'master'
+ Behavior of TIFFOpen() mode "r+" in the Windows implementation adjusted to that of Linux.
+
+ See merge request libtiff/libtiff!449
+
+2022-12-16 Su_Laus <sulau@freenet.de>
+
+ Behavior of TIFFOpen() mode "r+" in the Windows implementation adjusted to that of Linux.
+
+2022-12-15 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'ossfuzz_54343' into 'master'
+ TIFFSetDirectory: avoid harmless unsigned-integer-overflow
+
+ See merge request libtiff/libtiff!447
+
+2022-12-15 Even Rouault <even.rouault@spatialys.com>
+
+ TIFFSetDirectory: avoid harmless unsigned-integer-overflow.
+ Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=54343
+
+2022-12-14 Even Rouault <even.rouault@spatialys.com>
+
+ Merge branch 'ossfuzz_54311' into 'master'
+ TIFFWriteDirectorySec(): avoid harmless unsigned-integer-overflow
+
+ See merge request libtiff/libtiff!446
+
+2022-12-14 Even Rouault <even.rouault@spatialys.com>
+
+ TIFFWriteDirectorySec(): avoid harmless unsigned-integer-overflow.
+ Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=54311
+
2022-12-14 Even Rouault <even.rouault@spatialys.com>
libtiff v4.5.0rc2 preparation
diff --git a/qtimageformats/src/3rdparty/libtiff/RELEASE-DATE b/qtimageformats/src/3rdparty/libtiff/RELEASE-DATE
index 349ad3e..68d9434 100644
--- a/qtimageformats/src/3rdparty/libtiff/RELEASE-DATE
+++ b/qtimageformats/src/3rdparty/libtiff/RELEASE-DATE
@@ -1 +1 @@
-20221213
+20230908
diff --git a/qtimageformats/src/3rdparty/libtiff/VERSION b/qtimageformats/src/3rdparty/libtiff/VERSION
index a84947d..6016e8a 100644
--- a/qtimageformats/src/3rdparty/libtiff/VERSION
+++ b/qtimageformats/src/3rdparty/libtiff/VERSION
@@ -1 +1 @@
-4.5.0
+4.6.0
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_close.c b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_close.c
index 06aa29f..907d7f1 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_close.c
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_close.c
@@ -51,8 +51,7 @@ void TIFFCleanup(TIFF *tif)
(*tif->tif_cleanup)(tif);
TIFFFreeDirectory(tif);
- TIFFHashSetDestroy(tif->tif_map_dir_offset_to_number);
- TIFFHashSetDestroy(tif->tif_map_dir_number_to_offset);
+ _TIFFCleanupIFDOffsetAndNumberMaps(tif);
/*
* Clean up client info links.
@@ -114,6 +113,24 @@ void TIFFCleanup(TIFF *tif)
_TIFFfreeExt(NULL, tif);
}
+/************************************************************************/
+/* _TIFFCleanupIFDOffsetAndNumberMaps() */
+/************************************************************************/
+
+void _TIFFCleanupIFDOffsetAndNumberMaps(TIFF *tif)
+{
+ if (tif->tif_map_dir_offset_to_number)
+ {
+ TIFFHashSetDestroy(tif->tif_map_dir_offset_to_number);
+ tif->tif_map_dir_offset_to_number = NULL;
+ }
+ if (tif->tif_map_dir_number_to_offset)
+ {
+ TIFFHashSetDestroy(tif->tif_map_dir_number_to_offset);
+ tif->tif_map_dir_number_to_offset = NULL;
+ }
+}
+
/************************************************************************/
/* TIFFClose() */
/************************************************************************/
@@ -130,9 +147,12 @@ void TIFFCleanup(TIFF *tif)
void TIFFClose(TIFF *tif)
{
- TIFFCloseProc closeproc = tif->tif_closeproc;
- thandle_t fd = tif->tif_clientdata;
+ if (tif != NULL)
+ {
+ TIFFCloseProc closeproc = tif->tif_closeproc;
+ thandle_t fd = tif->tif_clientdata;
- TIFFCleanup(tif);
- (void)(*closeproc)(fd);
+ TIFFCleanup(tif);
+ (void)(*closeproc)(fd);
+ }
}
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_config.h b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_config.h
index 78f6669..7922155 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_config.h
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_config.h
@@ -4,10 +4,6 @@
#include "tiffconf.h"
-#if defined(Q_OS_WINCE)
-#include <qfunctions_wince.h>
-#endif
-
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
#define _CRT_SECURE_NO_WARNINGS
#endif
@@ -36,9 +32,7 @@
#define HAVE_DECL_OPTARG 0
/* Define to 1 if you have the <fcntl.h> header file. */
-#if !defined(Q_OS_WINCE)
#define HAVE_FCNTL_H 1
-#endif
/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
/* #undef HAVE_FSEEKO */
@@ -46,18 +40,6 @@
/* Define to 1 if you have the `getopt' function. */
/* #undef HAVE_GETOPT */
-/* Define to 1 if you have the <GLUT/glut.h> header file. */
-/* #undef HAVE_GLUT_GLUT_H */
-
-/* Define to 1 if you have the <GL/glut.h> header file. */
-/* #undef HAVE_GL_GLUT_H */
-
-/* Define to 1 if you have the <GL/glu.h> header file. */
-/* #undef HAVE_GL_GLU_H */
-
-/* Define to 1 if you have the <GL/gl.h> header file. */
-/* #undef HAVE_GL_GL_H */
-
/* Define to 1 if you have the <io.h> header file. */
/* #undef HAVE_IO_H */
@@ -67,12 +49,6 @@
/* Define to 1 if you have the `mmap' function. */
/* #undef HAVE_MMAP */
-/* Define to 1 if you have the <OpenGL/glu.h> header file. */
-/* #undef HAVE_OPENGL_GLU_H */
-
-/* Define to 1 if you have the <OpenGL/gl.h> header file. */
-/* #undef HAVE_OPENGL_GL_H */
-
/* Define to 1 if you have the `setmode' function. */
/* #undef HAVE_SETMODE */
@@ -111,18 +87,12 @@
/* Define to the full name of this package. */
/* #undef PACKAGE_NAME */
-/* Define to the full name and version of this package. */
-/* #undef PACKAGE_STRING */
-
/* Define to the one symbol short name of this package. */
/* #undef PACKAGE_TARNAME */
/* Define to the home page for this package. */
/* #undef PACKAGE_URL */
-/* Define to the version of this package. */
-/* #undef PACKAGE_VERSION */
-
/* The size of `size_t', as computed by sizeof. */
#if SIZE_MAX == 0xffffffff
#define SIZEOF_SIZE_T 4
@@ -139,9 +109,6 @@
/* define to use win32 IO system */
/* #undef USE_WIN32_FILEIO */
-/* Version number of package */
-#define VERSION "4.5.0"
-
/* Support webp compression */
/* #undef WEBP_SUPPORT */
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_config.h.cmake.in b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_config.h.cmake.in
index 570e4e1..62a4c73 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_config.h.cmake.in
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_config.h.cmake.in
@@ -1,3 +1,9 @@
+/* clang-format off */
+/* clang-format disabled because CMake scripts are very sensitive to the
+ * formatting of this file. configure_file variables of type "@VAR@" are
+ * modified by clang-format and won't be substituted.
+ */
+
/* libtiff/tif_config.h.cmake.in. Not generated, but originated from autoheader. */
/* This file must be kept up-to-date with needed substitutions from libtiff/tif_config.h.in. */
@@ -34,18 +40,6 @@
/* Define to 1 if you have the `getopt' function. */
#cmakedefine HAVE_GETOPT 1
-/* Define to 1 if you have the <GLUT/glut.h> header file. */
-#cmakedefine HAVE_GLUT_GLUT_H 1
-
-/* Define to 1 if you have the <GL/glut.h> header file. */
-#cmakedefine HAVE_GL_GLUT_H 1
-
-/* Define to 1 if you have the <GL/glu.h> header file. */
-#cmakedefine HAVE_GL_GLU_H 1
-
-/* Define to 1 if you have the <GL/gl.h> header file. */
-#cmakedefine HAVE_GL_GL_H 1
-
/* Define to 1 if you have the <io.h> header file. */
#cmakedefine HAVE_IO_H 1
@@ -55,12 +49,6 @@
/* Define to 1 if you have the `mmap' function. */
#cmakedefine HAVE_MMAP 1
-/* Define to 1 if you have the <OpenGL/glu.h> header file. */
-#cmakedefine HAVE_OPENGL_GLU_H 1
-
-/* Define to 1 if you have the <OpenGL/gl.h> header file. */
-#cmakedefine HAVE_OPENGL_GL_H 1
-
/* Define to 1 if you have the `setmode' function. */
#cmakedefine HAVE_SETMODE 1
@@ -94,23 +82,17 @@
/* Define to the full name of this package. */
#define PACKAGE_NAME "@PACKAGE_NAME@"
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "@PACKAGE_STRING@"
-
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "@PACKAGE_TARNAME@"
/* Define to the home page for this package. */
#define PACKAGE_URL "@PACKAGE_URL@"
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "@PACKAGE_VERSION@"
-
/* Size of size_t */
#define SIZEOF_SIZE_T @SIZEOF_SIZE_T@
/* Default size of the strip in bytes (when strip chopping enabled) */
-#define STRIP_SIZE_DEFAULT @STRIP_SIZE_DEFAULT@
+#cmakedefine STRIP_SIZE_DEFAULT @STRIP_SIZE_DEFAULT@
/** Maximum number of TIFF IFDs that libtiff can iterate through in a file. */
#define TIFF_MAX_DIR_COUNT @TIFF_MAX_DIR_COUNT@
@@ -118,9 +100,6 @@
/* define to use win32 IO system */
#cmakedefine USE_WIN32_FILEIO 1
-/* Version number of package */
-#define VERSION "@PACKAGE_VERSION@"
-
/* Support WEBP compression */
#cmakedefine WEBP_SUPPORT 1
@@ -156,3 +135,5 @@
#else
# error "Unsupported size_t size; please submit a bug report"
#endif
+
+/* clang-format on */
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_config.h.in b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_config.h.in
index 8fb78c3..28da641 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_config.h.in
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_config.h.in
@@ -1,3 +1,9 @@
+/* clang-format off */
+/* clang-format disabled because CMake scripts are very sensitive to the
+ * formatting of this file. configure_file variables of type "@VAR@" are
+ * modified by clang-format and won't be substituted.
+ */
+
/* libtiff/tif_config.h.in. Not generated, but originated from autoheader. */
#include "tiffconf.h"
@@ -34,18 +40,6 @@
/* Define to 1 if you have the `getopt' function. */
#undef HAVE_GETOPT
-/* Define to 1 if you have the <GLUT/glut.h> header file. */
-#undef HAVE_GLUT_GLUT_H
-
-/* Define to 1 if you have the <GL/glut.h> header file. */
-#undef HAVE_GL_GLUT_H
-
-/* Define to 1 if you have the <GL/glu.h> header file. */
-#undef HAVE_GL_GLU_H
-
-/* Define to 1 if you have the <GL/gl.h> header file. */
-#undef HAVE_GL_GL_H
-
/* Define to 1 if you have the <io.h> header file. */
#undef HAVE_IO_H
@@ -55,12 +49,6 @@
/* Define to 1 if you have the `mmap' function. */
#undef HAVE_MMAP
-/* Define to 1 if you have the <OpenGL/glu.h> header file. */
-#undef HAVE_OPENGL_GLU_H
-
-/* Define to 1 if you have the <OpenGL/gl.h> header file. */
-#undef HAVE_OPENGL_GL_H
-
/* Define to 1 if you have the `setmode' function. */
#undef HAVE_SETMODE
@@ -97,18 +85,12 @@
/* Define to the full name of this package. */
#undef PACKAGE_NAME
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
/* The size of `size_t', as computed by sizeof. */
#undef SIZEOF_SIZE_T
@@ -121,9 +103,6 @@
/* define to use win32 IO system */
#undef USE_WIN32_FILEIO
-/* Version number of package */
-#undef VERSION
-
/* Support webp compression */
#undef WEBP_SUPPORT
@@ -172,3 +151,5 @@
#else
# error "Unsupported size_t size; please submit a bug report"
#endif
+
+/* clang-format on */
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dir.c b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dir.c
index 4a36654..8500621 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dir.c
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dir.c
@@ -192,11 +192,11 @@ static int setExtraSamples(TIFF *tif, va_list ap, uint32_t *v)
static uint16_t countInkNamesString(TIFF *tif, uint32_t slen, const char *s)
{
uint16_t i = 0;
- const char *ep = s + slen;
- const char *cp = s;
if (slen > 0)
{
+ const char *ep = s + slen;
+ const char *cp = s;
do
{
for (; cp < ep && *cp != '\0'; cp++)
@@ -1621,7 +1621,7 @@ void TIFFFreeDirectory(TIFF *tif)
TIFFDirectory *td = &tif->tif_dir;
int i;
- _TIFFmemset(td->td_fieldsset, 0, FIELD_SETLONGS);
+ _TIFFmemset(td->td_fieldsset, 0, sizeof(td->td_fieldsset));
CleanupField(td_sminsamplevalue);
CleanupField(td_smaxsamplevalue);
CleanupField(td_colormap[0]);
@@ -1702,6 +1702,12 @@ int TIFFCreateCustomDirectory(TIFF *tif, const TIFFFieldArray *infoarray)
tif->tif_curoff = 0;
tif->tif_row = (uint32_t)-1;
tif->tif_curstrip = (uint32_t)-1;
+ /* invalidate directory index */
+ tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER;
+ /* invalidate IFD loop lists */
+ _TIFFCleanupIFDOffsetAndNumberMaps(tif);
+ /* To be able to return from SubIFD or custom-IFD to main-IFD */
+ tif->tif_setdirectory_force_absolute = TRUE;
return 0;
}
@@ -2022,29 +2028,78 @@ tdir_t TIFFNumberOfDirectories(TIFF *tif)
int TIFFSetDirectory(TIFF *tif, tdir_t dirn)
{
uint64_t nextdiroff;
- tdir_t nextdirnum;
+ tdir_t nextdirnum = 0;
tdir_t n;
- if (!(tif->tif_flags & TIFF_BIGTIFF))
- nextdiroff = tif->tif_header.classic.tiff_diroff;
+ if (tif->tif_setdirectory_force_absolute)
+ {
+ /* tif_setdirectory_force_absolute=1 will force parsing the main IFD
+ * chain from the beginning, thus IFD directory list needs to be cleared
+ * from possible SubIFD offsets.
+ */
+ _TIFFCleanupIFDOffsetAndNumberMaps(tif); /* invalidate IFD loop lists */
+ }
+
+ /* Even faster path, if offset is available within IFD loop hash list. */
+ if (!tif->tif_setdirectory_force_absolute &&
+ _TIFFGetOffsetFromDirNumber(tif, dirn, &nextdiroff))
+ {
+ /* Set parameters for following TIFFReadDirectory() below. */
+ tif->tif_nextdiroff = nextdiroff;
+ tif->tif_curdir = dirn;
+ /* Reset to relative stepping */
+ tif->tif_setdirectory_force_absolute = FALSE;
+ }
else
- nextdiroff = tif->tif_header.big.tiff_diroff;
- nextdirnum = 0;
- for (n = dirn; n > 0 && nextdiroff != 0; n--)
- if (!TIFFAdvanceDirectory(tif, &nextdiroff, NULL, &nextdirnum))
+ {
+
+ /* Fast path when we just advance relative to the current directory:
+ * start at the current dir offset and continue to seek from there.
+ * Check special cases when relative is not allowed:
+ * - jump back from SubIFD or custom directory
+ * - right after TIFFWriteDirectory() jump back to that directory
+ * using TIFFSetDirectory() */
+ const int relative = (dirn >= tif->tif_curdir) &&
+ (tif->tif_diroff != 0) &&
+ !tif->tif_setdirectory_force_absolute;
+
+ if (relative)
+ {
+ nextdiroff = tif->tif_diroff;
+ dirn -= tif->tif_curdir;
+ nextdirnum = tif->tif_curdir;
+ }
+ else if (!(tif->tif_flags & TIFF_BIGTIFF))
+ nextdiroff = tif->tif_header.classic.tiff_diroff;
+ else
+ nextdiroff = tif->tif_header.big.tiff_diroff;
+
+ /* Reset to relative stepping */
+ tif->tif_setdirectory_force_absolute = FALSE;
+
+ for (n = dirn; n > 0 && nextdiroff != 0; n--)
+ if (!TIFFAdvanceDirectory(tif, &nextdiroff, NULL, &nextdirnum))
+ return (0);
+ /* If the n-th directory could not be reached (does not exist),
+ * return here without touching anything further. */
+ if (nextdiroff == 0 || n > 0)
return (0);
- /* If the n-th directory could not be reached (does not exist),
- * return here without touching anything further. */
- if (nextdiroff == 0 || n > 0)
- return (0);
- tif->tif_nextdiroff = nextdiroff;
- /*
- * Set curdir to the actual directory index. The
- * -1 is because TIFFReadDirectory will increment
- * tif_curdir after successfully reading the directory.
- */
- tif->tif_curdir = (dirn - n) - 1;
+ tif->tif_nextdiroff = nextdiroff;
+
+ /* Set curdir to the actual directory index. */
+ if (relative)
+ tif->tif_curdir += dirn - n;
+ else
+ tif->tif_curdir = dirn - n;
+ }
+
+ /* The -1 decrement is because TIFFReadDirectory will increment
+ * tif_curdir after successfully reading the directory. */
+ if (tif->tif_curdir == 0)
+ tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER;
+ else
+ tif->tif_curdir--;
return (TIFFReadDirectory(tif));
}
@@ -2088,8 +2143,8 @@ int TIFFSetSubDirectory(TIFF *tif, uint64_t diroff)
tif->tif_nextdiroff = diroff;
retval = TIFFReadDirectory(tif);
/* If failed, curdir was not incremented in TIFFReadDirectory(), so set it
- * back. */
- if (!retval)
+ * back, but leave it for diroff==0. */
+ if (!retval && diroff != 0)
{
if (tif->tif_curdir == TIFF_NON_EXISTENT_DIR_NUMBER)
tif->tif_curdir = 0;
@@ -2100,10 +2155,12 @@ int TIFFSetSubDirectory(TIFF *tif, uint64_t diroff)
{
/* Reset IFD list to start new one for SubIFD chain and also start
* SubIFD chain with tif_curdir=0. */
- tif->tif_dirnumber = 0;
+ _TIFFCleanupIFDOffsetAndNumberMaps(tif); /* invalidate IFD loop lists */
tif->tif_curdir = 0; /* first directory of new chain */
/* add this offset to new IFD list */
_TIFFCheckDirNumberAndOffset(tif, tif->tif_curdir, diroff);
+ /* To be able to return from SubIFD or custom-IFD to main-IFD */
+ tif->tif_setdirectory_force_absolute = TRUE;
}
return (retval);
}
@@ -2139,6 +2196,13 @@ int TIFFUnlinkDirectory(TIFF *tif, tdir_t dirn)
"Can not unlink directory in read-only file");
return (0);
}
+ if (dirn == 0)
+ {
+ TIFFErrorExtR(tif, module,
+ "For TIFFUnlinkDirectory() first directory starts with "
+ "number 1 and not 0");
+ return (0);
+ }
/*
* Go to the directory before the one we want
* to unlink and nab the offset of the link
@@ -2201,6 +2265,17 @@ int TIFFUnlinkDirectory(TIFF *tif, tdir_t dirn)
return (0);
}
}
+
+ /* For dirn=1 (first directory) also update the libtiff internal
+ * base offset variables. */
+ if (dirn == 1)
+ {
+ if (!(tif->tif_flags & TIFF_BIGTIFF))
+ tif->tif_header.classic.tiff_diroff = (uint32_t)nextdir;
+ else
+ tif->tif_header.big.tiff_diroff = nextdir;
+ }
+
/*
* Leave directory state setup safely. We don't have
* facilities for doing inserting and removing directories,
@@ -2227,5 +2302,7 @@ int TIFFUnlinkDirectory(TIFF *tif, tdir_t dirn)
tif->tif_curoff = 0;
tif->tif_row = (uint32_t)-1;
tif->tif_curstrip = (uint32_t)-1;
+ tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER;
+ _TIFFCleanupIFDOffsetAndNumberMaps(tif); /* invalidate IFD loop lists */
return (1);
}
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dir.h b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dir.h
index fad1eb0..9eaf22f 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dir.h
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dir.h
@@ -70,9 +70,9 @@ typedef struct
*/
typedef struct
{
-#define FIELD_SETLONGS 4
+#define FIELDSET_ITEMS 4
/* bit vector of fields that are set */
- unsigned long td_fieldsset[FIELD_SETLONGS];
+ uint32_t td_fieldsset[FIELDSET_ITEMS];
uint32_t td_imagewidth, td_imagelength, td_imagedepth;
uint32_t td_tilewidth, td_tilelength, td_tiledepth;
@@ -202,9 +202,9 @@ typedef struct
*/
#define FIELD_PSEUDO 0
-#define FIELD_LAST (32 * FIELD_SETLONGS - 1)
+#define FIELD_LAST (32 * FIELDSET_ITEMS - 1)
-#define BITn(n) (((unsigned long)1L) << ((n)&0x1f))
+#define BITn(n) (((uint32_t)1L) << ((n)&0x1f))
#define BITFIELDn(tif, n) ((tif)->tif_dir.td_fieldsset[(n) / 32])
#define TIFFFieldSet(tif, field) (BITFIELDn(tif, field) & BITn(field))
#define TIFFSetFieldBit(tif, field) (BITFIELDn(tif, field) |= BITn(field))
@@ -329,6 +329,10 @@ extern "C"
uint64_t diroff);
extern int _TIFFGetDirNumberFromOffset(TIFF *tif, uint64_t diroff,
tdir_t *dirn);
+ extern int _TIFFGetOffsetFromDirNumber(TIFF *tif, tdir_t dirn,
+ uint64_t *diroff);
+ extern int _TIFFRemoveEntryFromDirectoryListByOffset(TIFF *tif,
+ uint64_t diroff);
#if defined(__cplusplus)
}
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dirinfo.c b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dirinfo.c
index 6a15c76..0e705e8 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dirinfo.c
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dirinfo.c
@@ -63,351 +63,283 @@ static const TIFFFieldArray gpsFieldArray;
*
*/
+/* clang-format off */ /* for better readability of tag comments */
static const TIFFField tiffFields[] = {
- {TIFFTAG_SUBFILETYPE, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_SUBFILETYPE, 1, 0, "SubfileType", NULL},
- {TIFFTAG_OSUBFILETYPE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UNDEFINED,
- TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 1, 0, "OldSubfileType", NULL},
- {TIFFTAG_IMAGEWIDTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_IMAGEDIMENSIONS, 0, 0, "ImageWidth", NULL},
- {TIFFTAG_IMAGELENGTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_IMAGEDIMENSIONS, 1, 0, "ImageLength", NULL},
- {TIFFTAG_BITSPERSAMPLE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_BITSPERSAMPLE, 0, 0, "BitsPerSample", NULL},
- {TIFFTAG_COMPRESSION, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_COMPRESSION, 0, 0, "Compression", NULL},
- {TIFFTAG_PHOTOMETRIC, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_PHOTOMETRIC, 0, 0,
- "PhotometricInterpretation", NULL},
- {TIFFTAG_THRESHHOLDING, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_THRESHHOLDING, 1, 0, "Threshholding", NULL},
- {TIFFTAG_CELLWIDTH, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CellWidth", NULL},
- {TIFFTAG_CELLLENGTH, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CellLength", NULL},
- {TIFFTAG_FILLORDER, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_FILLORDER, 0, 0, "FillOrder", NULL},
- {TIFFTAG_DOCUMENTNAME, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DocumentName", NULL},
- {TIFFTAG_IMAGEDESCRIPTION, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ImageDescription", NULL},
- {TIFFTAG_MAKE, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Make", NULL},
- {TIFFTAG_MODEL, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Model", NULL},
- {TIFFTAG_STRIPOFFSETS, -1, -1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED,
- TIFF_SETGET_UNDEFINED, FIELD_STRIPOFFSETS, 0, 0, "StripOffsets", NULL},
- {TIFFTAG_ORIENTATION, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_ORIENTATION, 0, 0, "Orientation", NULL},
- {TIFFTAG_SAMPLESPERPIXEL, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_SAMPLESPERPIXEL, 0, 0, "SamplesPerPixel",
- NULL},
- {TIFFTAG_ROWSPERSTRIP, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_ROWSPERSTRIP, 0, 0, "RowsPerStrip", NULL},
- {TIFFTAG_STRIPBYTECOUNTS, -1, -1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED,
- TIFF_SETGET_UNDEFINED, FIELD_STRIPBYTECOUNTS, 0, 0, "StripByteCounts",
- NULL},
- {TIFFTAG_MINSAMPLEVALUE, -2, -1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_MINSAMPLEVALUE, 1, 0, "MinSampleValue", NULL},
- {TIFFTAG_MAXSAMPLEVALUE, -2, -1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_MAXSAMPLEVALUE, 1, 0, "MaxSampleValue", NULL},
- {TIFFTAG_XRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_RESOLUTION, 1, 0, "XResolution", NULL},
- {TIFFTAG_YRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_RESOLUTION, 1, 0, "YResolution", NULL},
- {TIFFTAG_PLANARCONFIG, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_PLANARCONFIG, 0, 0, "PlanarConfiguration",
- NULL},
- {TIFFTAG_PAGENAME, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "PageName", NULL},
- {TIFFTAG_XPOSITION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_POSITION, 1, 0, "XPosition", NULL},
- {TIFFTAG_YPOSITION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_POSITION, 1, 0, "YPosition", NULL},
- {TIFFTAG_FREEOFFSETS, -1, -1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED,
- TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 0, 0, "FreeOffsets", NULL},
- {TIFFTAG_FREEBYTECOUNTS, -1, -1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED,
- TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 0, 0, "FreeByteCounts", NULL},
- {TIFFTAG_GRAYRESPONSEUNIT, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UNDEFINED,
- TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 1, 0, "GrayResponseUnit", NULL},
- {TIFFTAG_GRAYRESPONSECURVE, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_UNDEFINED,
- TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 1, 0, "GrayResponseCurve", NULL},
- {TIFFTAG_RESOLUTIONUNIT, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_RESOLUTIONUNIT, 1, 0, "ResolutionUnit", NULL},
- {TIFFTAG_PAGENUMBER, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_UINT16_PAIR,
- TIFF_SETGET_UNDEFINED, FIELD_PAGENUMBER, 1, 0, "PageNumber", NULL},
- {TIFFTAG_COLORRESPONSEUNIT, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UNDEFINED,
- TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 1, 0, "ColorResponseUnit", NULL},
- {TIFFTAG_TRANSFERFUNCTION, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_OTHER,
- TIFF_SETGET_UNDEFINED, FIELD_TRANSFERFUNCTION, 1, 0, "TransferFunction",
- NULL},
- {TIFFTAG_SOFTWARE, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Software", NULL},
- {TIFFTAG_DATETIME, 20, 20, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DateTime", NULL},
- {TIFFTAG_ARTIST, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Artist", NULL},
- {TIFFTAG_HOSTCOMPUTER, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "HostComputer", NULL},
- {TIFFTAG_WHITEPOINT, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "WhitePoint", NULL},
- {TIFFTAG_PRIMARYCHROMATICITIES, 6, 6, TIFF_RATIONAL, 0,
- TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0,
- "PrimaryChromaticities", NULL},
- {TIFFTAG_COLORMAP, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_OTHER,
- TIFF_SETGET_UNDEFINED, FIELD_COLORMAP, 1, 0, "ColorMap", NULL},
- {TIFFTAG_HALFTONEHINTS, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_UINT16_PAIR,
- TIFF_SETGET_UNDEFINED, FIELD_HALFTONEHINTS, 1, 0, "HalftoneHints", NULL},
- {TIFFTAG_TILEWIDTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_TILEDIMENSIONS, 0, 0, "TileWidth", NULL},
- {TIFFTAG_TILELENGTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_TILEDIMENSIONS, 0, 0, "TileLength", NULL},
- {TIFFTAG_TILEOFFSETS, -1, 1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED,
- TIFF_SETGET_UNDEFINED, FIELD_STRIPOFFSETS, 0, 0, "TileOffsets", NULL},
- {TIFFTAG_TILEBYTECOUNTS, -1, 1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED,
- TIFF_SETGET_UNDEFINED, FIELD_STRIPBYTECOUNTS, 0, 0, "TileByteCounts",
- NULL},
- {TIFFTAG_SUBIFD, -1, -1, TIFF_IFD8, 0, TIFF_SETGET_C16_IFD8,
- TIFF_SETGET_UNDEFINED, FIELD_SUBIFD, 1, 1, "SubIFD",
- (TIFFFieldArray *)&tiffFieldArray},
- {TIFFTAG_INKSET, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "InkSet", NULL},
- {TIFFTAG_INKNAMES, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_C16_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_INKNAMES, 1, 1, "InkNames", NULL},
- {TIFFTAG_NUMBEROFINKS, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_NUMBEROFINKS, 1, 0, "NumberOfInks", NULL},
- {TIFFTAG_DOTRANGE, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_UINT16_PAIR,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "DotRange", NULL},
- {TIFFTAG_TARGETPRINTER, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "TargetPrinter", NULL},
- {TIFFTAG_EXTRASAMPLES, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_C16_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_EXTRASAMPLES, 0, 1, "ExtraSamples", NULL},
- {TIFFTAG_SAMPLEFORMAT, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_SAMPLEFORMAT, 0, 0, "SampleFormat", NULL},
- {TIFFTAG_SMINSAMPLEVALUE, -2, -1, TIFF_ANY, 0, TIFF_SETGET_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_SMINSAMPLEVALUE, 1, 0, "SMinSampleValue",
- NULL},
- {TIFFTAG_SMAXSAMPLEVALUE, -2, -1, TIFF_ANY, 0, TIFF_SETGET_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_SMAXSAMPLEVALUE, 1, 0, "SMaxSampleValue",
- NULL},
- {TIFFTAG_CLIPPATH, -3, -3, TIFF_BYTE, 0, TIFF_SETGET_C32_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "ClipPath", NULL},
- {TIFFTAG_XCLIPPATHUNITS, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "XClipPathUnits", NULL},
- {TIFFTAG_YCLIPPATHUNITS, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "YClipPathUnits", NULL},
- {TIFFTAG_YCBCRCOEFFICIENTS, 3, 3, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "YCbCrCoefficients", NULL},
- {TIFFTAG_YCBCRSUBSAMPLING, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_UINT16_PAIR,
- TIFF_SETGET_UNDEFINED, FIELD_YCBCRSUBSAMPLING, 0, 0, "YCbCrSubsampling",
- NULL},
- {TIFFTAG_YCBCRPOSITIONING, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_YCBCRPOSITIONING, 0, 0, "YCbCrPositioning",
- NULL},
- {TIFFTAG_REFERENCEBLACKWHITE, 6, 6, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_REFBLACKWHITE, 1, 0, "ReferenceBlackWhite",
- NULL},
- {TIFFTAG_XMLPACKET, -3, -3, TIFF_BYTE, 0, TIFF_SETGET_C32_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "XMLPacket", NULL},
+ {TIFFTAG_SUBFILETYPE, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_SUBFILETYPE, 1, 0, "SubfileType", NULL},
+ {TIFFTAG_OSUBFILETYPE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 1, 0, "OldSubfileType", NULL},
+ {TIFFTAG_IMAGEWIDTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_IMAGEDIMENSIONS, 0, 0, "ImageWidth", NULL},
+ {TIFFTAG_IMAGELENGTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_IMAGEDIMENSIONS, 1, 0, "ImageLength", NULL},
+ {TIFFTAG_BITSPERSAMPLE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_BITSPERSAMPLE, 0, 0, "BitsPerSample", NULL},
+ {TIFFTAG_COMPRESSION, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_COMPRESSION, 0, 0, "Compression", NULL},
+ {TIFFTAG_PHOTOMETRIC, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_PHOTOMETRIC, 0, 0, "PhotometricInterpretation", NULL},
+ {TIFFTAG_THRESHHOLDING, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_THRESHHOLDING, 1, 0, "Threshholding", NULL},
+ {TIFFTAG_CELLWIDTH, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CellWidth", NULL},
+ {TIFFTAG_CELLLENGTH, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CellLength", NULL},
+ {TIFFTAG_FILLORDER, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_FILLORDER, 0, 0, "FillOrder", NULL},
+ {TIFFTAG_DOCUMENTNAME, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DocumentName", NULL},
+ {TIFFTAG_IMAGEDESCRIPTION, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ImageDescription", NULL},
+ {TIFFTAG_MAKE, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Make", NULL},
+ {TIFFTAG_MODEL, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Model", NULL},
+ {TIFFTAG_STRIPOFFSETS, -1, -1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_STRIPOFFSETS, 0, 0, "StripOffsets", NULL},
+ {TIFFTAG_ORIENTATION, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_ORIENTATION, 0, 0, "Orientation", NULL},
+ {TIFFTAG_SAMPLESPERPIXEL, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_SAMPLESPERPIXEL, 0, 0, "SamplesPerPixel", NULL},
+ {TIFFTAG_ROWSPERSTRIP, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_ROWSPERSTRIP, 0, 0, "RowsPerStrip", NULL},
+ {TIFFTAG_STRIPBYTECOUNTS, -1, -1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_STRIPBYTECOUNTS, 0, 0, "StripByteCounts", NULL},
+ {TIFFTAG_MINSAMPLEVALUE, -2, -1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_MINSAMPLEVALUE, 1, 0, "MinSampleValue", NULL},
+ {TIFFTAG_MAXSAMPLEVALUE, -2, -1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_MAXSAMPLEVALUE, 1, 0, "MaxSampleValue", NULL},
+ {TIFFTAG_XRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_RESOLUTION, 1, 0, "XResolution", NULL},
+ {TIFFTAG_YRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_RESOLUTION, 1, 0, "YResolution", NULL},
+ {TIFFTAG_PLANARCONFIG, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_PLANARCONFIG, 0, 0, "PlanarConfiguration", NULL},
+ {TIFFTAG_PAGENAME, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "PageName", NULL},
+ {TIFFTAG_XPOSITION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_POSITION, 1, 0, "XPosition", NULL},
+ {TIFFTAG_YPOSITION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_POSITION, 1, 0, "YPosition", NULL},
+ {TIFFTAG_FREEOFFSETS, -1, -1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 0, 0, "FreeOffsets", NULL},
+ {TIFFTAG_FREEBYTECOUNTS, -1, -1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 0, 0, "FreeByteCounts", NULL},
+ {TIFFTAG_GRAYRESPONSEUNIT, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 1, 0, "GrayResponseUnit", NULL},
+ {TIFFTAG_GRAYRESPONSECURVE, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 1, 0, "GrayResponseCurve", NULL},
+ {TIFFTAG_RESOLUTIONUNIT, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_RESOLUTIONUNIT, 1, 0, "ResolutionUnit", NULL},
+ {TIFFTAG_PAGENUMBER, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_UINT16_PAIR, TIFF_SETGET_UNDEFINED, FIELD_PAGENUMBER, 1, 0, "PageNumber", NULL},
+ {TIFFTAG_COLORRESPONSEUNIT, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_IGNORE, 1, 0, "ColorResponseUnit", NULL},
+ {TIFFTAG_TRANSFERFUNCTION, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_OTHER, TIFF_SETGET_UNDEFINED, FIELD_TRANSFERFUNCTION, 1, 0, "TransferFunction", NULL},
+ {TIFFTAG_SOFTWARE, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Software", NULL},
+ {TIFFTAG_DATETIME, 20, 20, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DateTime", NULL},
+ {TIFFTAG_ARTIST, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Artist", NULL},
+ {TIFFTAG_HOSTCOMPUTER, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "HostComputer", NULL},
+ {TIFFTAG_WHITEPOINT, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "WhitePoint", NULL},
+ {TIFFTAG_PRIMARYCHROMATICITIES, 6, 6, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "PrimaryChromaticities", NULL},
+ {TIFFTAG_COLORMAP, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_OTHER, TIFF_SETGET_UNDEFINED, FIELD_COLORMAP, 1, 0, "ColorMap", NULL},
+ {TIFFTAG_HALFTONEHINTS, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_UINT16_PAIR, TIFF_SETGET_UNDEFINED, FIELD_HALFTONEHINTS, 1, 0, "HalftoneHints", NULL},
+ {TIFFTAG_TILEWIDTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_TILEDIMENSIONS, 0, 0, "TileWidth", NULL},
+ {TIFFTAG_TILELENGTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_TILEDIMENSIONS, 0, 0, "TileLength", NULL},
+ {TIFFTAG_TILEOFFSETS, -1, 1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_STRIPOFFSETS, 0, 0, "TileOffsets", NULL},
+ {TIFFTAG_TILEBYTECOUNTS, -1, 1, TIFF_LONG8, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_STRIPBYTECOUNTS, 0, 0, "TileByteCounts", NULL},
+ {TIFFTAG_SUBIFD, -1, -1, TIFF_IFD8, 0, TIFF_SETGET_C16_IFD8, TIFF_SETGET_UNDEFINED, FIELD_SUBIFD, 1, 1, "SubIFD", (TIFFFieldArray *)&tiffFieldArray},
+ {TIFFTAG_INKSET, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "InkSet", NULL},
+ {TIFFTAG_INKNAMES, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_C16_ASCII, TIFF_SETGET_UNDEFINED, FIELD_INKNAMES, 1, 1, "InkNames", NULL},
+ {TIFFTAG_NUMBEROFINKS, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_NUMBEROFINKS, 1, 0, "NumberOfInks", NULL},
+ {TIFFTAG_DOTRANGE, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_UINT16_PAIR, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "DotRange", NULL},
+ {TIFFTAG_TARGETPRINTER, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "TargetPrinter", NULL},
+ {TIFFTAG_EXTRASAMPLES, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_C16_UINT16, TIFF_SETGET_UNDEFINED, FIELD_EXTRASAMPLES, 0, 1, "ExtraSamples", NULL},
+ {TIFFTAG_SAMPLEFORMAT, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_SAMPLEFORMAT, 0, 0, "SampleFormat", NULL},
+ {TIFFTAG_SMINSAMPLEVALUE, -2, -1, TIFF_ANY, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_SMINSAMPLEVALUE, 1, 0, "SMinSampleValue", NULL},
+ {TIFFTAG_SMAXSAMPLEVALUE, -2, -1, TIFF_ANY, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_SMAXSAMPLEVALUE, 1, 0, "SMaxSampleValue", NULL},
+ {TIFFTAG_CLIPPATH, -3, -3, TIFF_BYTE, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "ClipPath", NULL},
+ {TIFFTAG_XCLIPPATHUNITS, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "XClipPathUnits", NULL},
+ {TIFFTAG_YCLIPPATHUNITS, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "YClipPathUnits", NULL},
+ {TIFFTAG_YCBCRCOEFFICIENTS, 3, 3, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "YCbCrCoefficients", NULL},
+ {TIFFTAG_YCBCRSUBSAMPLING, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_UINT16_PAIR, TIFF_SETGET_UNDEFINED, FIELD_YCBCRSUBSAMPLING, 0, 0, "YCbCrSubsampling", NULL},
+ {TIFFTAG_YCBCRPOSITIONING, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_YCBCRPOSITIONING, 0, 0, "YCbCrPositioning", NULL},
+ {TIFFTAG_REFERENCEBLACKWHITE, 6, 6, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_REFBLACKWHITE, 1, 0, "ReferenceBlackWhite", NULL},
+ {TIFFTAG_XMLPACKET, -3, -3, TIFF_BYTE, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "XMLPacket", NULL},
/* begin SGI tags */
- {TIFFTAG_MATTEING, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_EXTRASAMPLES, 0, 0, "Matteing", NULL},
- {TIFFTAG_DATATYPE, -2, -1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_SAMPLEFORMAT, 0, 0, "DataType", NULL},
- {TIFFTAG_IMAGEDEPTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_IMAGEDEPTH, 0, 0, "ImageDepth", NULL},
- {TIFFTAG_TILEDEPTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_TILEDEPTH, 0, 0, "TileDepth", NULL},
+ {TIFFTAG_MATTEING, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_EXTRASAMPLES, 0, 0, "Matteing", NULL},
+ {TIFFTAG_DATATYPE, -2, -1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_SAMPLEFORMAT, 0, 0, "DataType", NULL},
+ {TIFFTAG_IMAGEDEPTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_IMAGEDEPTH, 0, 0, "ImageDepth", NULL},
+ {TIFFTAG_TILEDEPTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_TILEDEPTH, 0, 0, "TileDepth", NULL},
/* end SGI tags */
/* begin Pixar tags */
- {TIFFTAG_PIXAR_IMAGEFULLWIDTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ImageFullWidth", NULL},
- {TIFFTAG_PIXAR_IMAGEFULLLENGTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ImageFullLength", NULL},
- {TIFFTAG_PIXAR_TEXTUREFORMAT, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "TextureFormat", NULL},
- {TIFFTAG_PIXAR_WRAPMODES, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "TextureWrapModes", NULL},
- {TIFFTAG_PIXAR_FOVCOT, 1, 1, TIFF_FLOAT, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FieldOfViewCotangent", NULL},
- {TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN, 16, 16, TIFF_FLOAT, 0,
- TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0,
- "MatrixWorldToScreen", NULL},
- {TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA, 16, 16, TIFF_FLOAT, 0,
- TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0,
- "MatrixWorldToCamera", NULL},
- {TIFFTAG_CFAREPEATPATTERNDIM, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_C0_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "CFARepeatPatternDim", NULL},
- {TIFFTAG_CFAPATTERN, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "CFAPattern", NULL},
- {TIFFTAG_COPYRIGHT, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Copyright", NULL},
+ {TIFFTAG_PIXAR_IMAGEFULLWIDTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ImageFullWidth", NULL},
+ {TIFFTAG_PIXAR_IMAGEFULLLENGTH, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ImageFullLength", NULL},
+ {TIFFTAG_PIXAR_TEXTUREFORMAT, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "TextureFormat", NULL},
+ {TIFFTAG_PIXAR_WRAPMODES, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "TextureWrapModes", NULL},
+ {TIFFTAG_PIXAR_FOVCOT, 1, 1, TIFF_FLOAT, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FieldOfViewCotangent", NULL},
+ {TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN, 16, 16, TIFF_FLOAT, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MatrixWorldToScreen", NULL},
+ {TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA, 16, 16, TIFF_FLOAT, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MatrixWorldToCamera", NULL},
+ {TIFFTAG_COPYRIGHT, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Copyright", NULL},
/* end Pixar tags */
- {TIFFTAG_RICHTIFFIPTC, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "RichTIFFIPTC", NULL},
- {TIFFTAG_PHOTOSHOP, -3, -3, TIFF_BYTE, 0, TIFF_SETGET_C32_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "Photoshop", NULL},
- /*--: EXIFIFD and GPSIFD specified as TIFF_LONG by Aware-Systems and not
- * TIFF_IFD8 as in original LibTiff. However, for IFD-like tags, libtiff
- * uses the data type TIFF_IFD8 in tiffFields[]-tag definition combined with
- * a special handling procedure in order to write either a 32-bit value
- * and the TIFF_IFD type-id into ClassicTIFF files or a 64-bit value and the
- * TIFF_IFD8 type-id into BigTIFF files. */
- {TIFFTAG_EXIFIFD, 1, 1, TIFF_IFD8, 0, TIFF_SETGET_IFD8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EXIFIFDOffset",
- (TIFFFieldArray *)&exifFieldArray},
- {TIFFTAG_ICCPROFILE, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "ICC Profile", NULL},
- {TIFFTAG_GPSIFD, 1, 1, TIFF_IFD8, 0, TIFF_SETGET_IFD8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "GPSIFDOffset",
- (TIFFFieldArray *)&gpsFieldArray},
- {TIFFTAG_FAXRECVPARAMS, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UINT32, FIELD_CUSTOM, TRUE, FALSE, "FaxRecvParams", NULL},
- {TIFFTAG_FAXSUBADDRESS, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_ASCII, FIELD_CUSTOM, TRUE, FALSE, "FaxSubAddress", NULL},
- {TIFFTAG_FAXRECVTIME, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UINT32, FIELD_CUSTOM, TRUE, FALSE, "FaxRecvTime", NULL},
- {TIFFTAG_FAXDCS, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_ASCII, FIELD_CUSTOM, TRUE, FALSE, "FaxDcs", NULL},
- {TIFFTAG_STONITS, 1, 1, TIFF_DOUBLE, 0, TIFF_SETGET_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "StoNits", NULL},
- {TIFFTAG_IMAGESOURCEDATA, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1,
- "Adobe Photoshop Document Data Block", NULL},
- {TIFFTAG_INTEROPERABILITYIFD, 1, 1, TIFF_IFD8, 0, TIFF_SETGET_IFD8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "InteroperabilityIFDOffset",
- NULL},
+ {TIFFTAG_RICHTIFFIPTC, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "RichTIFFIPTC", NULL},
+ {TIFFTAG_PHOTOSHOP, -3, -3, TIFF_BYTE, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "Photoshop", NULL},
+ /*--: EXIFIFD and GPSIFD specified as TIFF_LONG by Aware-Systems and not TIFF_IFD8 as in original LibTiff. However, for IFD-like tags,
+ * libtiff uses the data type TIFF_IFD8 in tiffFields[]-tag definition combined with a special handling procedure in order to write either
+ * a 32-bit value and the TIFF_IFD type-id into ClassicTIFF files or a 64-bit value and the TIFF_IFD8 type-id into BigTIFF files. */
+ {TIFFTAG_EXIFIFD, 1, 1, TIFF_IFD8, 0, TIFF_SETGET_IFD8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EXIFIFDOffset", (TIFFFieldArray *)&exifFieldArray},
+ {TIFFTAG_ICCPROFILE, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ICC Profile", NULL},
+ {TIFFTAG_GPSIFD, 1, 1, TIFF_IFD8, 0, TIFF_SETGET_IFD8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "GPSIFDOffset", (TIFFFieldArray *)&gpsFieldArray},
+ {TIFFTAG_FAXRECVPARAMS, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UINT32, FIELD_CUSTOM, TRUE, FALSE, "FaxRecvParams", NULL},
+ {TIFFTAG_FAXSUBADDRESS, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_ASCII, FIELD_CUSTOM, TRUE, FALSE, "FaxSubAddress", NULL},
+ {TIFFTAG_FAXRECVTIME, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UINT32, FIELD_CUSTOM, TRUE, FALSE, "FaxRecvTime", NULL},
+ {TIFFTAG_FAXDCS, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_ASCII, FIELD_CUSTOM, TRUE, FALSE, "FaxDcs", NULL},
+ {TIFFTAG_STONITS, 1, 1, TIFF_DOUBLE, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "StoNits", NULL},
+ {TIFFTAG_IMAGESOURCEDATA, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "Adobe Photoshop Document Data Block", NULL},
+ {TIFFTAG_INTEROPERABILITYIFD, 1, 1, TIFF_IFD8, 0, TIFF_SETGET_IFD8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "InteroperabilityIFDOffset", NULL},
/* begin DNG tags */
- {TIFFTAG_DNGVERSION, 4, 4, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "DNGVersion", NULL},
- {TIFFTAG_DNGBACKWARDVERSION, 4, 4, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "DNGBackwardVersion", NULL},
- {TIFFTAG_UNIQUECAMERAMODEL, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "UniqueCameraModel", NULL},
- {TIFFTAG_LOCALIZEDCAMERAMODEL, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "LocalizedCameraModel", NULL},
- {TIFFTAG_CFAPLANECOLOR, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "CFAPlaneColor", NULL},
- {TIFFTAG_CFALAYOUT, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "CFALayout", NULL},
- {TIFFTAG_LINEARIZATIONTABLE, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_C16_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "LinearizationTable", NULL},
- {TIFFTAG_BLACKLEVELREPEATDIM, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_C0_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BlackLevelRepeatDim", NULL},
- {TIFFTAG_BLACKLEVEL, -1, -1, TIFF_RATIONAL, 0, TIFF_SETGET_C16_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "BlackLevel", NULL},
- {TIFFTAG_BLACKLEVELDELTAH, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "BlackLevelDeltaH", NULL},
- {TIFFTAG_BLACKLEVELDELTAV, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "BlackLevelDeltaV", NULL},
- {TIFFTAG_WHITELEVEL, -1, -1, TIFF_LONG, 0, TIFF_SETGET_C16_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "WhiteLevel", NULL},
- {TIFFTAG_DEFAULTSCALE, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "DefaultScale", NULL},
- {TIFFTAG_BESTQUALITYSCALE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BestQualityScale", NULL},
- {TIFFTAG_DEFAULTCROPORIGIN, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "DefaultCropOrigin", NULL},
- {TIFFTAG_DEFAULTCROPSIZE, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "DefaultCropSize", NULL},
- {TIFFTAG_COLORMATRIX1, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "ColorMatrix1", NULL},
- {TIFFTAG_COLORMATRIX2, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "ColorMatrix2", NULL},
- {TIFFTAG_CAMERACALIBRATION1, -1, -1, TIFF_SRATIONAL, 0,
- TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1,
- "CameraCalibration1", NULL},
- {TIFFTAG_CAMERACALIBRATION2, -1, -1, TIFF_SRATIONAL, 0,
- TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1,
- "CameraCalibration2", NULL},
- {TIFFTAG_REDUCTIONMATRIX1, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "ReductionMatrix1", NULL},
- {TIFFTAG_REDUCTIONMATRIX2, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "ReductionMatrix2", NULL},
- {TIFFTAG_ANALOGBALANCE, -1, -1, TIFF_RATIONAL, 0, TIFF_SETGET_C16_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "AnalogBalance", NULL},
- {TIFFTAG_ASSHOTNEUTRAL, -1, -1, TIFF_RATIONAL, 0, TIFF_SETGET_C16_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "AsShotNeutral", NULL},
- {TIFFTAG_ASSHOTWHITEXY, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "AsShotWhiteXY", NULL},
- {TIFFTAG_BASELINEEXPOSURE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BaselineExposure", NULL},
- {TIFFTAG_BASELINENOISE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BaselineNoise", NULL},
- {TIFFTAG_BASELINESHARPNESS, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BaselineSharpness", NULL},
- {TIFFTAG_BAYERGREENSPLIT, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "BayerGreenSplit", NULL},
- {TIFFTAG_LINEARRESPONSELIMIT, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "LinearResponseLimit", NULL},
- {TIFFTAG_CAMERASERIALNUMBER, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CameraSerialNumber", NULL},
- {TIFFTAG_LENSINFO, 4, 4, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "LensInfo", NULL},
- {TIFFTAG_CHROMABLURRADIUS, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "ChromaBlurRadius", NULL},
- {TIFFTAG_ANTIALIASSTRENGTH, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "AntiAliasStrength", NULL},
- {TIFFTAG_SHADOWSCALE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "ShadowScale", NULL},
- {TIFFTAG_DNGPRIVATEDATA, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "DNGPrivateData", NULL},
- {TIFFTAG_MAKERNOTESAFETY, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "MakerNoteSafety", NULL},
- {TIFFTAG_CALIBRATIONILLUMINANT1, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "CalibrationIlluminant1", NULL},
- {TIFFTAG_CALIBRATIONILLUMINANT2, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "CalibrationIlluminant2", NULL},
- {TIFFTAG_RAWDATAUNIQUEID, 16, 16, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "RawDataUniqueID", NULL},
- {TIFFTAG_ORIGINALRAWFILENAME, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "OriginalRawFileName", NULL},
- {TIFFTAG_ORIGINALRAWFILEDATA, -1, -1, TIFF_UNDEFINED, 0,
- TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1,
- "OriginalRawFileData", NULL},
- {TIFFTAG_ACTIVEAREA, 4, 4, TIFF_LONG, 0, TIFF_SETGET_C0_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "ActiveArea", NULL},
- {TIFFTAG_MASKEDAREAS, -1, -1, TIFF_LONG, 0, TIFF_SETGET_C16_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "MaskedAreas", NULL},
- {TIFFTAG_ASSHOTICCPROFILE, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "AsShotICCProfile", NULL},
- {TIFFTAG_ASSHOTPREPROFILEMATRIX, -1, -1, TIFF_SRATIONAL, 0,
- TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1,
- "AsShotPreProfileMatrix", NULL},
- {TIFFTAG_CURRENTICCPROFILE, -1, -1, TIFF_UNDEFINED, 0,
- TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1,
- "CurrentICCProfile", NULL},
- {TIFFTAG_CURRENTPREPROFILEMATRIX, -1, -1, TIFF_SRATIONAL, 0,
- TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1,
- "CurrentPreProfileMatrix", NULL},
- {TIFFTAG_PERSAMPLE, 0, 0, TIFF_SHORT, 0, TIFF_SETGET_UNDEFINED,
- TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, TRUE, FALSE, "PerSample", NULL},
+ {TIFFTAG_DNGVERSION, 4, 4, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DNGVersion", NULL},
+ {TIFFTAG_DNGBACKWARDVERSION, 4, 4, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DNGBackwardVersion", NULL},
+ {TIFFTAG_UNIQUECAMERAMODEL, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "UniqueCameraModel", NULL},
+ {TIFFTAG_LOCALIZEDCAMERAMODEL, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "LocalizedCameraModel", NULL},
+ {TIFFTAG_CFAPLANECOLOR, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "CFAPlaneColor", NULL},
+ {TIFFTAG_CFALAYOUT, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CFALayout", NULL},
+ {TIFFTAG_LINEARIZATIONTABLE, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_C16_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "LinearizationTable", NULL},
+ {TIFFTAG_BLACKLEVELREPEATDIM, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_C0_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "BlackLevelRepeatDim", NULL},
+ {TIFFTAG_BLACKLEVEL, -1, -1, TIFF_RATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "BlackLevel", NULL},
+ {TIFFTAG_BLACKLEVELDELTAH, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "BlackLevelDeltaH", NULL},
+ {TIFFTAG_BLACKLEVELDELTAV, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "BlackLevelDeltaV", NULL},
+ {TIFFTAG_WHITELEVEL, -1, -1, TIFF_LONG, 0, TIFF_SETGET_C16_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "WhiteLevel", NULL},
+ {TIFFTAG_DEFAULTSCALE, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DefaultScale", NULL},
+ {TIFFTAG_BESTQUALITYSCALE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "BestQualityScale", NULL},
+ {TIFFTAG_DEFAULTCROPORIGIN, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DefaultCropOrigin", NULL},
+ {TIFFTAG_DEFAULTCROPSIZE, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DefaultCropSize", NULL},
+ {TIFFTAG_COLORMATRIX1, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ColorMatrix1", NULL},
+ {TIFFTAG_COLORMATRIX2, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ColorMatrix2", NULL},
+ {TIFFTAG_CAMERACALIBRATION1, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "CameraCalibration1", NULL},
+ {TIFFTAG_CAMERACALIBRATION2, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "CameraCalibration2", NULL},
+ {TIFFTAG_REDUCTIONMATRIX1, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ReductionMatrix1", NULL},
+ {TIFFTAG_REDUCTIONMATRIX2, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ReductionMatrix2", NULL},
+ {TIFFTAG_ANALOGBALANCE, -1, -1, TIFF_RATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "AnalogBalance", NULL},
+ {TIFFTAG_ASSHOTNEUTRAL, -1, -1, TIFF_RATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "AsShotNeutral", NULL},
+ {TIFFTAG_ASSHOTWHITEXY, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "AsShotWhiteXY", NULL},
+ {TIFFTAG_BASELINEEXPOSURE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "BaselineExposure", NULL},
+ {TIFFTAG_BASELINENOISE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "BaselineNoise", NULL},
+ {TIFFTAG_BASELINESHARPNESS, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "BaselineSharpness", NULL},
+ {TIFFTAG_BAYERGREENSPLIT, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "BayerGreenSplit", NULL},
+ {TIFFTAG_LINEARRESPONSELIMIT, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LinearResponseLimit", NULL},
+ {TIFFTAG_CAMERASERIALNUMBER, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CameraSerialNumber", NULL},
+ {TIFFTAG_LENSINFO, 4, 4, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LensInfo", NULL},
+ {TIFFTAG_CHROMABLURRADIUS, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ChromaBlurRadius", NULL},
+ {TIFFTAG_ANTIALIASSTRENGTH, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "AntiAliasStrength", NULL},
+ {TIFFTAG_SHADOWSCALE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ShadowScale", NULL},
+ {TIFFTAG_DNGPRIVATEDATA, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "DNGPrivateData", NULL},
+ {TIFFTAG_MAKERNOTESAFETY, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MakerNoteSafety", NULL},
+ {TIFFTAG_CALIBRATIONILLUMINANT1, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CalibrationIlluminant1", NULL},
+ {TIFFTAG_CALIBRATIONILLUMINANT2, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CalibrationIlluminant2", NULL},
+ {TIFFTAG_RAWDATAUNIQUEID, 16, 16, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "RawDataUniqueID", NULL},
+ {TIFFTAG_ORIGINALRAWFILENAME, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "OriginalRawFileName", NULL},
+ {TIFFTAG_ORIGINALRAWFILEDATA, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "OriginalRawFileData", NULL},
+ {TIFFTAG_ACTIVEAREA, 4, 4, TIFF_LONG, 0, TIFF_SETGET_C0_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ActiveArea", NULL},
+ {TIFFTAG_MASKEDAREAS, -1, -1, TIFF_LONG, 0, TIFF_SETGET_C16_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "MaskedAreas", NULL},
+ {TIFFTAG_ASSHOTICCPROFILE, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "AsShotICCProfile", NULL},
+ {TIFFTAG_ASSHOTPREPROFILEMATRIX, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "AsShotPreProfileMatrix", NULL},
+ {TIFFTAG_CURRENTICCPROFILE, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "CurrentICCProfile", NULL},
+ {TIFFTAG_CURRENTPREPROFILEMATRIX, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "CurrentPreProfileMatrix", NULL},
+ {TIFFTAG_PERSAMPLE, 0, 0, TIFF_SHORT, 0, TIFF_SETGET_UNDEFINED, TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, TRUE, FALSE, "PerSample", NULL},
+#if 0
+ /* TODO: revert above #if 0 for TIFF 4.6.0 */
+
+ /* begin DNG 1.2.0.0 tags */
+ {TIFFTAG_COLORIMETRICREFERENCE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ColorimetricReference", NULL},
+ {TIFFTAG_CAMERACALIBRATIONSIGNATURE, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "CameraCalibrationSignature", NULL},
+ {TIFFTAG_PROFILECALIBRATIONSIGNATURE, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ProfileCalibrationSignature", NULL},
+ {TIFFTAG_EXTRACAMERAPROFILES, -1, -1, TIFF_IFD8, 0, TIFF_SETGET_C16_IFD8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ExtraCameraProfiles", NULL},
+ {TIFFTAG_ASSHOTPROFILENAME, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "AsShotProfileName", NULL},
+ {TIFFTAG_NOISEREDUCTIONAPPLIED, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "NoiseReductionApplied", NULL},
+ {TIFFTAG_PROFILENAME, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ProfileName", NULL},
+ {TIFFTAG_PROFILEHUESATMAPDIMS, 3, 3, TIFF_LONG, 0, TIFF_SETGET_C0_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ProfileHueSatMapDims", NULL},
+ {TIFFTAG_PROFILEHUESATMAPDATA1, -1, -1, TIFF_FLOAT, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ProfileHueSatMapData1", NULL},
+ {TIFFTAG_PROFILEHUESATMAPDATA2, -1, -1, TIFF_FLOAT, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ProfileHueSatMapData2", NULL},
+ {TIFFTAG_PROFILETONECURVE, -1, -1, TIFF_FLOAT, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ProfileToneCurve", NULL},
+ {TIFFTAG_PROFILEEMBEDPOLICY, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ProfileEmbedPolicy", NULL},
+ {TIFFTAG_PROFILECOPYRIGHT, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ProfileCopyright", NULL},
+ {TIFFTAG_FORWARDMATRIX1, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ForwardMatrix1", NULL},
+ {TIFFTAG_FORWARDMATRIX2, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ForwardMatrix2", NULL},
+ {TIFFTAG_PREVIEWAPPLICATIONNAME, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "PreviewApplicationName", NULL},
+ {TIFFTAG_PREVIEWAPPLICATIONVERSION, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "PreviewApplicationVersion", NULL},
+ {TIFFTAG_PREVIEWSETTINGSNAME, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "PreviewSettingsName", NULL},
+ {TIFFTAG_PREVIEWSETTINGSDIGEST, 16, 16, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "PreviewSettingsDigest", NULL},
+ {TIFFTAG_PREVIEWCOLORSPACE, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "PreviewColorSpace", NULL},
+ {TIFFTAG_PREVIEWDATETIME, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "PreviewDateTime", NULL},
+ {TIFFTAG_RAWIMAGEDIGEST, 16, 16, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "RawImageDigest", NULL},
+ {TIFFTAG_ORIGINALRAWFILEDIGEST, 16, 16, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "OriginalRawFileDigest", NULL},
+ {TIFFTAG_SUBTILEBLOCKSIZE, 2, 2, TIFF_LONG, 0, TIFF_SETGET_C0_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubTileBlockSize", NULL},
+ {TIFFTAG_ROWINTERLEAVEFACTOR, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "RowInterleaveFactor", NULL},
+ {TIFFTAG_PROFILELOOKTABLEDIMS, 3, 3, TIFF_LONG, 0, TIFF_SETGET_C0_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ProfileLookTableDims", NULL},
+ {TIFFTAG_PROFILELOOKTABLEDATA, -1, -1, TIFF_FLOAT, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ProfileLookTableData", NULL},
+ /* begin DNG 1.3.0.0 tags */
+ {TIFFTAG_OPCODELIST1, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "OpcodeList1", NULL},
+ {TIFFTAG_OPCODELIST2, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "OpcodeList2", NULL},
+ {TIFFTAG_OPCODELIST3, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "OpcodeList3", NULL},
+ {TIFFTAG_NOISEPROFILE, -1, -1, TIFF_DOUBLE, 0, TIFF_SETGET_C16_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "NoiseProfile", NULL},
+ /* begin DNG 1.4.0.0 tags */
+ {TIFFTAG_DEFAULTUSERCROP, 4, 4, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DefaultUserCrop", NULL},
+ {TIFFTAG_DEFAULTBLACKRENDER, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DefaultBlackRender", NULL},
+ {TIFFTAG_BASELINEEXPOSUREOFFSET, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "BaselineExposureOffset", NULL},
+ {TIFFTAG_PROFILELOOKTABLEENCODING, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ProfileLookTableEncoding", NULL},
+ {TIFFTAG_PROFILEHUESATMAPENCODING, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ProfileHueSatMapEncoding", NULL},
+ {TIFFTAG_ORIGINALDEFAULTFINALSIZE, 2, 2, TIFF_LONG, 0, TIFF_SETGET_C0_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "OriginalDefaultFinalSize", NULL},
+ {TIFFTAG_ORIGINALBESTQUALITYFINALSIZE, 2, 2, TIFF_LONG, 0, TIFF_SETGET_C0_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "OriginalBestQualityFinalSize", NULL},
+ {TIFFTAG_ORIGINALDEFAULTCROPSIZE, 2, 2, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "OriginalDefaultCropSize", NULL}, /* could also be rational */
+ {TIFFTAG_NEWRAWIMAGEDIGEST, 16, 16, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "NewRawImageDigest", NULL},
+ {TIFFTAG_RAWTOPREVIEWGAIN, 1, 1, TIFF_DOUBLE, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "RawToPreviewGain", NULL},
+ /* begin DNG 1.5.0.0 tags */
+ {TIFFTAG_DEPTHFORMAT, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DepthFormat", NULL},
+ {TIFFTAG_DEPTHNEAR, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DepthNear", NULL},
+ {TIFFTAG_DEPTHFAR, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DepthFar", NULL},
+ {TIFFTAG_DEPTHUNITS, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DepthUnits", NULL},
+ {TIFFTAG_DEPTHMEASURETYPE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DepthMeasureType", NULL},
+ {TIFFTAG_ENHANCEPARAMS, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EnhanceParams", NULL},
+ /* begin DNG 1.6.0.0 tags */
+ {TIFFTAG_PROFILEGAINTABLEMAP, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ProfileGainTableMap", NULL},
+ {TIFFTAG_SEMANTICNAME, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SemanticName", NULL},
+ {TIFFTAG_SEMANTICINSTANCEID, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SemanticInstanceID", NULL},
+ {TIFFTAG_MASKSUBAREA, 4, 4, TIFF_LONG, 0, TIFF_SETGET_C0_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MaskSubArea", NULL},
+ {TIFFTAG_RGBTABLES, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "RGBTables", NULL},
+ {TIFFTAG_CALIBRATIONILLUMINANT3, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CalibrationIlluminant3", NULL},
+ {TIFFTAG_COLORMATRIX3, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ColorMatrix3", NULL},
+ {TIFFTAG_CAMERACALIBRATION3, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "CameraCalibration3", NULL},
+ {TIFFTAG_REDUCTIONMATRIX3, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ReductionMatrix3", NULL},
+ {TIFFTAG_PROFILEHUESATMAPDATA3, -1, -1, TIFF_FLOAT, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ProfileHueSatMapData3", NULL},
+ {TIFFTAG_FORWARDMATRIX3, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ForwardMatrix3", NULL},
+ {TIFFTAG_ILLUMINANTDATA1, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "IlluminantData1", NULL},
+ {TIFFTAG_ILLUMINANTDATA2, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "IlluminantData2", NULL},
+ {TIFFTAG_ILLUMINANTDATA3, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "IlluminantData3", NULL},
/* end DNG tags */
+ /* begin TIFF/EP tags */
+ {TIFFTAG_EP_CFAREPEATPATTERNDIM, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_C0_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP CFARepeatPatternDim", NULL},
+ {TIFFTAG_EP_CFAPATTERN, -1, -1, TIFF_BYTE, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "EP CFAPattern", NULL},
+ /* TIFFTAG_EP_BATTERYLEVEL can be RATIONAL or ASCII.
+ * LibTiff defines it as ASCII and converts RATIONAL to an ASCII string. */
+ {TIFFTAG_EP_BATTERYLEVEL, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP BatteryLevel", NULL},
+ {TIFFTAG_EP_INTERLACE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP Interlace", NULL},
+ /* TIFFTAG_EP_IPTC_NAA and TIFFTAG_RICHTIFFIPTC share the same tag number (33723)
+ * LibTIFF type is UNDEFINED or BYTE, but often times incorrectly specified as LONG, because TIFF/EP (ISO/DIS 12234-2) specifies type LONG or ASCII. */
+ {TIFFTAG_EP_TIMEZONEOFFSET, -1, -1, TIFF_SSHORT, 0, TIFF_SETGET_C16_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "EP TimeZoneOffset", NULL},
+ {TIFFTAG_EP_SELFTIMERMODE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP SelfTimerMode", NULL},
+ {TIFFTAG_EP_FLASHENERGY, -1, -1, TIFF_RATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "EP FlashEnergy", NULL},
+ {TIFFTAG_EP_SPATIALFREQUENCYRESPONSE, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "EP SpatialFrequencyResponse", NULL},
+ {TIFFTAG_EP_NOISE, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "EP Noise", NULL},
+ {TIFFTAG_EP_FOCALPLANEXRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP FocalPlaneXResolution", NULL},
+ {TIFFTAG_EP_FOCALPLANEYRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP FocalPlaneYResolution", NULL},
+ {TIFFTAG_EP_FOCALPLANERESOLUTIONUNIT, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP FocalPlaneResolutionUnit", NULL},
+ {TIFFTAG_EP_IMAGENUMBER, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP ImageNumber", NULL}, /* or SHORT */
+ {TIFFTAG_EP_SECURITYCLASSIFICATION, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP SecurityClassification", NULL},
+ {TIFFTAG_EP_IMAGEHISTORY, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP ImageHistory", NULL},
+ {TIFFTAG_EP_EXPOSUREINDEX, -1, -1, TIFF_RATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "EP ExposureIndex", NULL},
+ {TIFFTAG_EP_STANDARDID, 4, 4, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP StandardId", NULL},
+ {TIFFTAG_EP_SENSINGMETHOD, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP SensingMethod", NULL},
+ /* TIFF/EP tags equivalent to EXIF tags, sometimes defined differently. */
+ {TIFFTAG_EP_EXPOSURETIME, -1, -1, TIFF_RATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "EP ExposureTime", NULL}, /*N=1 or 2 */
+ {TIFFTAG_EP_FNUMBER, -1, -1, TIFF_RATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "EP FNumber", NULL},
+ {TIFFTAG_EP_EXPOSUREPROGRAM, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP ExposureProgram", NULL},
+ {TIFFTAG_EP_SPECTRALSENSITIVITY, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP SpectralSensitivity", NULL},
+ {TIFFTAG_EP_ISOSPEEDRATINGS, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP ISOSpeedRatings", NULL},
+ {TIFFTAG_EP_OECF, -3, -3, TIFF_UNDEFINED, 0, TIFF_SETGET_C32_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "EP OptoelectricConversionFactor", NULL},
+ {TIFFTAG_EP_DATETIMEORIGINAL, 20, 20, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP DateTimeOriginal", NULL},
+ {TIFFTAG_EP_COMPRESSEDBITSPERPIXEL, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP CompressedBitsPerPixel", NULL},
+ {TIFFTAG_EP_SHUTTERSPEEDVALUE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP ShutterSpeedValue", NULL},
+ {TIFFTAG_EP_APERTUREVALUE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP ApertureValue", NULL},
+ {TIFFTAG_EP_BRIGHTNESSVALUE, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "EP BrightnessValue", NULL},
+ {TIFFTAG_EP_EXPOSUREBIASVALUE, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "EP ExposureBiasValue", NULL}, /*N=1 or 2 */
+ {TIFFTAG_EP_MAXAPERTUREVALUE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP MaxApertureValue", NULL},
+ {TIFFTAG_EP_SUBJECTDISTANCE, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "EP SubjectDistance", NULL},
+ {TIFFTAG_EP_METERINGMODE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP MeteringMode", NULL},
+ {TIFFTAG_EP_LIGHTSOURCE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP LightSource", NULL},
+ {TIFFTAG_EP_FLASH, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "EP Flash", NULL},
+ {TIFFTAG_EP_FOCALLENGTH, -1, -1, TIFF_RATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "EP FocalLength", NULL},
+ {TIFFTAG_EP_SUBJECTLOCATION, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_C16_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "EP SubjectLocation", NULL},
+ /* end TIFF/EP tags */
+#endif
/* begin TIFF/FX tags */
- {TIFFTAG_INDEXED, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "Indexed", NULL},
- {TIFFTAG_GLOBALPARAMETERSIFD, 1, 1, TIFF_IFD8, 0, TIFF_SETGET_IFD8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "GlobalParametersIFD", NULL},
- {TIFFTAG_PROFILETYPE, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "ProfileType", NULL},
- {TIFFTAG_FAXPROFILE, 1, 1, TIFF_BYTE, 0, TIFF_SETGET_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "FaxProfile", NULL},
- {TIFFTAG_CODINGMETHODS, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "CodingMethods", NULL},
- {TIFFTAG_VERSIONYEAR, 4, 4, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "VersionYear", NULL},
- {TIFFTAG_MODENUMBER, 1, 1, TIFF_BYTE, 0, TIFF_SETGET_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "ModeNumber", NULL},
- {TIFFTAG_DECODE, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "Decode", NULL},
- {TIFFTAG_IMAGEBASECOLOR, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_C16_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "ImageBaseColor", NULL},
- {TIFFTAG_T82OPTIONS, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "T82Options", NULL},
- {TIFFTAG_STRIPROWCOUNTS, -1, -1, TIFF_LONG, 0, TIFF_SETGET_C16_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 1, "StripRowCounts", NULL},
- {TIFFTAG_IMAGELAYER, 2, 2, TIFF_LONG, 0, TIFF_SETGET_C0_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 0, 0, "ImageLayer", NULL},
+ {TIFFTAG_INDEXED, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Indexed", NULL},
+ {TIFFTAG_GLOBALPARAMETERSIFD, 1, 1, TIFF_IFD8, 0, TIFF_SETGET_IFD8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "GlobalParametersIFD", NULL},
+ {TIFFTAG_PROFILETYPE, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ProfileType", NULL},
+ {TIFFTAG_FAXPROFILE, 1, 1, TIFF_BYTE, 0, TIFF_SETGET_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FaxProfile", NULL},
+ {TIFFTAG_CODINGMETHODS, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CodingMethods", NULL},
+ {TIFFTAG_VERSIONYEAR, 4, 4, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "VersionYear", NULL},
+ {TIFFTAG_MODENUMBER, 1, 1, TIFF_BYTE, 0, TIFF_SETGET_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ModeNumber", NULL},
+ {TIFFTAG_DECODE, -1, -1, TIFF_SRATIONAL, 0, TIFF_SETGET_C16_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "Decode", NULL},
+ {TIFFTAG_IMAGEBASECOLOR, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_C16_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ImageBaseColor", NULL},
+ {TIFFTAG_T82OPTIONS, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "T82Options", NULL},
+ {TIFFTAG_STRIPROWCOUNTS, -1, -1, TIFF_LONG, 0, TIFF_SETGET_C16_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "StripRowCounts", NULL},
+ {TIFFTAG_IMAGELAYER, 2, 2, TIFF_LONG, 0, TIFF_SETGET_C0_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ImageLayer", NULL},
/* end TIFF/FX tags */
/* begin pseudo tags */
};
@@ -416,181 +348,91 @@ static const TIFFField tiffFields[] = {
* EXIF tags (Version 2.31, July 2016 plus version 2.32 May 2019)
*/
static const TIFFField exifFields[] = {
- {EXIFTAG_EXPOSURETIME, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureTime", NULL},
- {EXIFTAG_FNUMBER, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FNumber", NULL},
- {EXIFTAG_EXPOSUREPROGRAM, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureProgram", NULL},
- {EXIFTAG_SPECTRALSENSITIVITY, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SpectralSensitivity", NULL},
- {EXIFTAG_ISOSPEEDRATINGS, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_C16_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ISOSpeedRatings", NULL},
- {EXIFTAG_OECF, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "OptoelectricConversionFactor",
- NULL},
- {EXIFTAG_SENSITIVITYTYPE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SensitivityType", NULL},
- {EXIFTAG_STANDARDOUTPUTSENSITIVITY, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "StandardOutputSensitivity",
- NULL},
- {EXIFTAG_RECOMMENDEDEXPOSUREINDEX, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "RecommendedExposureIndex",
- NULL},
- {EXIFTAG_ISOSPEED, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ISOSpeed", NULL},
- {EXIFTAG_ISOSPEEDLATITUDEYYY, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ISOSpeedLatitudeyyy", NULL},
- {EXIFTAG_ISOSPEEDLATITUDEZZZ, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ISOSpeedLatitudezzz", NULL},
- {EXIFTAG_EXIFVERSION, 4, 4, TIFF_UNDEFINED, 0, TIFF_SETGET_C0_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExifVersion", NULL},
- {EXIFTAG_DATETIMEORIGINAL, 20, 20, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DateTimeOriginal", NULL},
- {EXIFTAG_DATETIMEDIGITIZED, 20, 20, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DateTimeDigitized", NULL},
- {EXIFTAG_OFFSETTIME, 7, 7, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "OffsetTime", NULL},
- {EXIFTAG_OFFSETTIMEORIGINAL, 7, 7, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "OffsetTimeOriginal", NULL},
- {EXIFTAG_OFFSETTIMEDIGITIZED, 7, 7, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "OffsetTimeDigitized", NULL},
- {EXIFTAG_COMPONENTSCONFIGURATION, 4, 4, TIFF_UNDEFINED, 0,
- TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0,
- "ComponentsConfiguration", NULL},
- {EXIFTAG_COMPRESSEDBITSPERPIXEL, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CompressedBitsPerPixel", NULL},
- {EXIFTAG_SHUTTERSPEEDVALUE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ShutterSpeedValue", NULL},
- {EXIFTAG_APERTUREVALUE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ApertureValue", NULL},
- {EXIFTAG_BRIGHTNESSVALUE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "BrightnessValue", NULL},
- {EXIFTAG_EXPOSUREBIASVALUE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureBiasValue", NULL},
- {EXIFTAG_MAXAPERTUREVALUE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MaxApertureValue", NULL},
- /*--: EXIFTAG_SUBJECTDISTANCE: LibTiff returns value of "-1" if numerator
- * equals 4294967295 (0xFFFFFFFF) to indicate infinite distance! However,
- * there are two other EXIF tags where numerator indicates a special value
- * and six other cases where the denominator indicates special values, which
- * are not treated within LibTiff!! */
- {EXIFTAG_SUBJECTDISTANCE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubjectDistance", NULL},
- {EXIFTAG_METERINGMODE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MeteringMode", NULL},
- {EXIFTAG_LIGHTSOURCE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LightSource", NULL},
- {EXIFTAG_FLASH, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Flash", NULL},
- {EXIFTAG_FOCALLENGTH, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalLength", NULL},
- {EXIFTAG_SUBJECTAREA, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_C16_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "SubjectArea", NULL},
- {EXIFTAG_MAKERNOTE, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "MakerNote", NULL},
- {EXIFTAG_USERCOMMENT, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "UserComment", NULL},
- {EXIFTAG_SUBSECTIME, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubSecTime", NULL},
- {EXIFTAG_SUBSECTIMEORIGINAL, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubSecTimeOriginal", NULL},
- {EXIFTAG_SUBSECTIMEDIGITIZED, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubSecTimeDigitized", NULL},
- {EXIFTAG_TEMPERATURE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Temperature", NULL},
- {EXIFTAG_HUMIDITY, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Humidity", NULL},
- {EXIFTAG_PRESSURE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Pressure", NULL},
- {EXIFTAG_WATERDEPTH, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "WaterDepth", NULL},
- {EXIFTAG_ACCELERATION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Acceleration", NULL},
- {EXIFTAG_CAMERAELEVATIONANGLE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CameraElevationAngle", NULL},
- {EXIFTAG_FLASHPIXVERSION, 4, 4, TIFF_UNDEFINED, 0, TIFF_SETGET_C0_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FlashpixVersion", NULL},
- {EXIFTAG_COLORSPACE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ColorSpace", NULL},
- {EXIFTAG_PIXELXDIMENSION, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "PixelXDimension", NULL},
- {EXIFTAG_PIXELYDIMENSION, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "PixelYDimension", NULL},
- {EXIFTAG_RELATEDSOUNDFILE, 13, 13, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "RelatedSoundFile", NULL},
- {EXIFTAG_FLASHENERGY, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FlashEnergy", NULL},
- {EXIFTAG_SPATIALFREQUENCYRESPONSE, -1, -1, TIFF_UNDEFINED, 0,
- TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1,
- "SpatialFrequencyResponse", NULL},
- {EXIFTAG_FOCALPLANEXRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalPlaneXResolution", NULL},
- {EXIFTAG_FOCALPLANEYRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalPlaneYResolution", NULL},
- {EXIFTAG_FOCALPLANERESOLUTIONUNIT, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalPlaneResolutionUnit",
- NULL},
- {EXIFTAG_SUBJECTLOCATION, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_C0_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubjectLocation", NULL},
- {EXIFTAG_EXPOSUREINDEX, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureIndex", NULL},
- {EXIFTAG_SENSINGMETHOD, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SensingMethod", NULL},
- {EXIFTAG_FILESOURCE, 1, 1, TIFF_UNDEFINED, 0, TIFF_SETGET_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FileSource", NULL},
- {EXIFTAG_SCENETYPE, 1, 1, TIFF_UNDEFINED, 0, TIFF_SETGET_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SceneType", NULL},
- {EXIFTAG_CFAPATTERN, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "CFAPattern", NULL},
- {EXIFTAG_CUSTOMRENDERED, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CustomRendered", NULL},
- {EXIFTAG_EXPOSUREMODE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureMode", NULL},
- {EXIFTAG_WHITEBALANCE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "WhiteBalance", NULL},
- {EXIFTAG_DIGITALZOOMRATIO, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DigitalZoomRatio", NULL},
- {EXIFTAG_FOCALLENGTHIN35MMFILM, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalLengthIn35mmFilm", NULL},
- {EXIFTAG_SCENECAPTURETYPE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SceneCaptureType", NULL},
- {EXIFTAG_GAINCONTROL, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "GainControl", NULL},
- {EXIFTAG_CONTRAST, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Contrast", NULL},
- {EXIFTAG_SATURATION, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Saturation", NULL},
- {EXIFTAG_SHARPNESS, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Sharpness", NULL},
- {EXIFTAG_DEVICESETTINGDESCRIPTION, -1, -1, TIFF_UNDEFINED, 0,
- TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1,
- "DeviceSettingDescription", NULL},
- {EXIFTAG_SUBJECTDISTANCERANGE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubjectDistanceRange", NULL},
- {EXIFTAG_IMAGEUNIQUEID, 33, 33, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ImageUniqueID", NULL},
- {EXIFTAG_CAMERAOWNERNAME, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CameraOwnerName", NULL},
- {EXIFTAG_BODYSERIALNUMBER, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "BodySerialNumber", NULL},
- {EXIFTAG_LENSSPECIFICATION, 4, 4, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LensSpecification", NULL},
- {EXIFTAG_LENSMAKE, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LensMake", NULL},
- {EXIFTAG_LENSMODEL, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LensModel", NULL},
- {EXIFTAG_LENSSERIALNUMBER, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LensSerialNumber", NULL},
- {EXIFTAG_GAMMA, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Gamma", NULL},
- {EXIFTAG_COMPOSITEIMAGE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CompositeImage", NULL},
- {EXIFTAG_SOURCEIMAGENUMBEROFCOMPOSITEIMAGE, 2, 2, TIFF_SHORT, 0,
- TIFF_SETGET_C0_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0,
- "SourceImageNumberOfCompositeImage", NULL},
- {EXIFTAG_SOURCEEXPOSURETIMESOFCOMPOSITEIMAGE, -1, -1, TIFF_UNDEFINED, 0,
- TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1,
+ {EXIFTAG_EXPOSURETIME, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureTime", NULL},
+ {EXIFTAG_FNUMBER, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FNumber", NULL},
+ {EXIFTAG_EXPOSUREPROGRAM, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureProgram", NULL},
+ {EXIFTAG_SPECTRALSENSITIVITY, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SpectralSensitivity", NULL},
+ /* After EXIF 2.2.1 ISOSpeedRatings is named PhotographicSensitivity. In addition, while "Count=Any", only 1 count should be used. */
+ {EXIFTAG_ISOSPEEDRATINGS, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_C16_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ISOSpeedRatings", NULL},
+ {EXIFTAG_OECF, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "OptoelectricConversionFactor", NULL},
+ {EXIFTAG_SENSITIVITYTYPE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SensitivityType", NULL},
+ {EXIFTAG_STANDARDOUTPUTSENSITIVITY, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "StandardOutputSensitivity", NULL},
+ {EXIFTAG_RECOMMENDEDEXPOSUREINDEX, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "RecommendedExposureIndex", NULL},
+ {EXIFTAG_ISOSPEED, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ISOSpeed", NULL},
+ {EXIFTAG_ISOSPEEDLATITUDEYYY, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ISOSpeedLatitudeyyy", NULL},
+ {EXIFTAG_ISOSPEEDLATITUDEZZZ, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ISOSpeedLatitudezzz", NULL},
+ {EXIFTAG_EXIFVERSION, 4, 4, TIFF_UNDEFINED, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExifVersion", NULL},
+ {EXIFTAG_DATETIMEORIGINAL, 20, 20, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DateTimeOriginal", NULL},
+ {EXIFTAG_DATETIMEDIGITIZED, 20, 20, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DateTimeDigitized", NULL},
+ {EXIFTAG_OFFSETTIME, 7, 7, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "OffsetTime", NULL},
+ {EXIFTAG_OFFSETTIMEORIGINAL, 7, 7, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "OffsetTimeOriginal", NULL},
+ {EXIFTAG_OFFSETTIMEDIGITIZED, 7, 7, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "OffsetTimeDigitized", NULL},
+ {EXIFTAG_COMPONENTSCONFIGURATION, 4, 4, TIFF_UNDEFINED, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ComponentsConfiguration", NULL},
+ {EXIFTAG_COMPRESSEDBITSPERPIXEL, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CompressedBitsPerPixel", NULL},
+ {EXIFTAG_SHUTTERSPEEDVALUE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ShutterSpeedValue", NULL},
+ {EXIFTAG_APERTUREVALUE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ApertureValue", NULL},
+ {EXIFTAG_BRIGHTNESSVALUE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "BrightnessValue", NULL},
+ {EXIFTAG_EXPOSUREBIASVALUE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureBiasValue", NULL},
+ {EXIFTAG_MAXAPERTUREVALUE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MaxApertureValue", NULL},
+ /*--: EXIFTAG_SUBJECTDISTANCE: LibTiff returns value of "-1" if numerator equals 4294967295 (0xFFFFFFFF) to indicate infinite distance!
+ * However, there are two other EXIF tags where numerator indicates a special value and six other cases where the denominator indicates special values,
+ * which are not treated within LibTiff!! */
+ {EXIFTAG_SUBJECTDISTANCE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubjectDistance", NULL},
+ {EXIFTAG_METERINGMODE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MeteringMode", NULL},
+ {EXIFTAG_LIGHTSOURCE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LightSource", NULL},
+ {EXIFTAG_FLASH, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Flash", NULL},
+ {EXIFTAG_FOCALLENGTH, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalLength", NULL},
+ {EXIFTAG_SUBJECTAREA, -1, -1, TIFF_SHORT, 0, TIFF_SETGET_C16_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "SubjectArea", NULL},
+ {EXIFTAG_MAKERNOTE, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "MakerNote", NULL},
+ {EXIFTAG_USERCOMMENT, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "UserComment", NULL},
+ {EXIFTAG_SUBSECTIME, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubSecTime", NULL},
+ {EXIFTAG_SUBSECTIMEORIGINAL, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubSecTimeOriginal", NULL},
+ {EXIFTAG_SUBSECTIMEDIGITIZED, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubSecTimeDigitized", NULL},
+ {EXIFTAG_TEMPERATURE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Temperature", NULL},
+ {EXIFTAG_HUMIDITY, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Humidity", NULL},
+ {EXIFTAG_PRESSURE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Pressure", NULL},
+ {EXIFTAG_WATERDEPTH, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "WaterDepth", NULL},
+ {EXIFTAG_ACCELERATION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Acceleration", NULL},
+ {EXIFTAG_CAMERAELEVATIONANGLE, 1, 1, TIFF_SRATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CameraElevationAngle", NULL},
+ {EXIFTAG_FLASHPIXVERSION, 4, 4, TIFF_UNDEFINED, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FlashpixVersion", NULL},
+ {EXIFTAG_COLORSPACE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ColorSpace", NULL},
+ {EXIFTAG_PIXELXDIMENSION, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "PixelXDimension", NULL},
+ {EXIFTAG_PIXELYDIMENSION, 1, 1, TIFF_LONG, 0, TIFF_SETGET_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "PixelYDimension", NULL},
+ {EXIFTAG_RELATEDSOUNDFILE, 13, 13, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "RelatedSoundFile", NULL},
+ {EXIFTAG_FLASHENERGY, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FlashEnergy", NULL},
+ {EXIFTAG_SPATIALFREQUENCYRESPONSE, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "SpatialFrequencyResponse", NULL},
+ {EXIFTAG_FOCALPLANEXRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalPlaneXResolution", NULL},
+ {EXIFTAG_FOCALPLANEYRESOLUTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalPlaneYResolution", NULL},
+ {EXIFTAG_FOCALPLANERESOLUTIONUNIT, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalPlaneResolutionUnit", NULL},
+ {EXIFTAG_SUBJECTLOCATION, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_C0_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubjectLocation", NULL},
+ {EXIFTAG_EXPOSUREINDEX, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureIndex", NULL},
+ {EXIFTAG_SENSINGMETHOD, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SensingMethod", NULL},
+ {EXIFTAG_FILESOURCE, 1, 1, TIFF_UNDEFINED, 0, TIFF_SETGET_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FileSource", NULL},
+ {EXIFTAG_SCENETYPE, 1, 1, TIFF_UNDEFINED, 0, TIFF_SETGET_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SceneType", NULL},
+ {EXIFTAG_CFAPATTERN, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "CFAPattern", NULL},
+ {EXIFTAG_CUSTOMRENDERED, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CustomRendered", NULL},
+ {EXIFTAG_EXPOSUREMODE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ExposureMode", NULL},
+ {EXIFTAG_WHITEBALANCE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "WhiteBalance", NULL},
+ {EXIFTAG_DIGITALZOOMRATIO, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DigitalZoomRatio", NULL},
+ {EXIFTAG_FOCALLENGTHIN35MMFILM, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "FocalLengthIn35mmFilm", NULL},
+ {EXIFTAG_SCENECAPTURETYPE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SceneCaptureType", NULL},
+ {EXIFTAG_GAINCONTROL, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "GainControl", NULL},
+ {EXIFTAG_CONTRAST, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Contrast", NULL},
+ {EXIFTAG_SATURATION, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Saturation", NULL},
+ {EXIFTAG_SHARPNESS, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Sharpness", NULL},
+ {EXIFTAG_DEVICESETTINGDESCRIPTION, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "DeviceSettingDescription", NULL},
+ {EXIFTAG_SUBJECTDISTANCERANGE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SubjectDistanceRange", NULL},
+ {EXIFTAG_IMAGEUNIQUEID, 33, 33, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ImageUniqueID", NULL},
+ {EXIFTAG_CAMERAOWNERNAME, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CameraOwnerName", NULL},
+ {EXIFTAG_BODYSERIALNUMBER, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "BodySerialNumber", NULL},
+ {EXIFTAG_LENSSPECIFICATION, 4, 4, TIFF_RATIONAL, 0, TIFF_SETGET_C0_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LensSpecification", NULL},
+ {EXIFTAG_LENSMAKE, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LensMake", NULL},
+ {EXIFTAG_LENSMODEL, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LensModel", NULL},
+ {EXIFTAG_LENSSERIALNUMBER, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LensSerialNumber", NULL},
+ {EXIFTAG_GAMMA, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_FLOAT, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Gamma", NULL},
+ {EXIFTAG_COMPOSITEIMAGE, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "CompositeImage", NULL},
+ {EXIFTAG_SOURCEIMAGENUMBEROFCOMPOSITEIMAGE, 2, 2, TIFF_SHORT, 0, TIFF_SETGET_C0_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SourceImageNumberOfCompositeImage", NULL},
+ {EXIFTAG_SOURCEEXPOSURETIMESOFCOMPOSITEIMAGE, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1,
"SourceExposureTimesOfCompositeImage", NULL}};
/*
* EXIF-GPS tags (Version 2.31, July 2016; nothing changed for version 2.32 May
@@ -598,79 +440,44 @@ static const TIFFField exifFields[] = {
*/
static const TIFFField gpsFields[] = {
- /* For the GPS tag definitions in gpsFields[] the standard definition for
- *Rationals is TIFF_SETGET_DOUBLE and TIFF_SETGET_C0_FLOAT.
- *-- ATTENTION: After the upgrade with Rational2Double, the GPSTAG values
- *can now be written and also read in double precision! In order to achieve
- *double precision for GPS tags: Standard definitions for GPSTAG is kept to
- *TIFF_SETGET_DOUBLE and TIFF_SETGET_C0_FLOAT is changed to
- *TIFF_SETGET_C0_DOUBLE.
+ /* For the GPS tag definitions in gpsFields[] the standard definition for Rationals is TIFF_SETGET_DOUBLE and TIFF_SETGET_C0_FLOAT.
+ *-- ATTENTION: After the upgrade with Rational2Double, the GPSTAG values can now be written and also read in double precision!
+ * In order to achieve double precision for GPS tags: Standard definitions for GPSTAG is kept to TIFF_SETGET_DOUBLE
+ * and TIFF_SETGET_C0_FLOAT is changed to TIFF_SETGET_C0_DOUBLE.
*/
- {GPSTAG_VERSIONID, 4, 4, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8,
- TIFF_SETGET_UINT8, FIELD_CUSTOM, 1, 0, "VersionID", NULL},
- {GPSTAG_LATITUDEREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LatitudeRef", NULL},
- {GPSTAG_LATITUDE, 3, 3, TIFF_RATIONAL, 0, TIFF_SETGET_C0_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Latitude", NULL},
- {GPSTAG_LONGITUDEREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LongitudeRef", NULL},
- {GPSTAG_LONGITUDE, 3, 3, TIFF_RATIONAL, 0, TIFF_SETGET_C0_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Longitude", NULL},
- {GPSTAG_ALTITUDEREF, 1, 1, TIFF_BYTE, 0, TIFF_SETGET_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "AltitudeRef", NULL},
- {GPSTAG_ALTITUDE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Altitude", NULL},
- {GPSTAG_TIMESTAMP, 3, 3, TIFF_RATIONAL, 0, TIFF_SETGET_C0_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "TimeStamp", NULL},
- {GPSTAG_SATELLITES, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Satellites", NULL},
- {GPSTAG_STATUS, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Status", NULL},
- {GPSTAG_MEASUREMODE, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MeasureMode", NULL},
- {GPSTAG_DOP, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DOP", NULL},
- {GPSTAG_SPEEDREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SpeedRef", NULL},
- {GPSTAG_SPEED, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Speed", NULL},
- {GPSTAG_TRACKREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "TrackRef", NULL},
- {GPSTAG_TRACK, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Track", NULL},
- {GPSTAG_IMGDIRECTIONREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ImgDirectionRef", NULL},
- {GPSTAG_IMGDIRECTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ImgDirection", NULL},
- {GPSTAG_MAPDATUM, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MapDatum", NULL},
- {GPSTAG_DESTLATITUDEREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestLatitudeRef", NULL},
- {GPSTAG_DESTLATITUDE, 3, 3, TIFF_RATIONAL, 0, TIFF_SETGET_C0_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestLatitude", NULL},
- {GPSTAG_DESTLONGITUDEREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestLongitudeRef", NULL},
- {GPSTAG_DESTLONGITUDE, 3, 3, TIFF_RATIONAL, 0, TIFF_SETGET_C0_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestLongitude", NULL},
- {GPSTAG_DESTBEARINGREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestBearingRef", NULL},
- {GPSTAG_DESTBEARING, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestBearing", NULL},
- {GPSTAG_DESTDISTANCEREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestDistanceRef", NULL},
- {GPSTAG_DESTDISTANCE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestDistance", NULL},
- {GPSTAG_PROCESSINGMETHOD, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ProcessingMethod", NULL},
- {GPSTAG_AREAINFORMATION, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "AreaInformation", NULL},
- {GPSTAG_DATESTAMP, 11, 11, TIFF_ASCII, 0, TIFF_SETGET_ASCII,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DateStamp", NULL},
- {GPSTAG_DIFFERENTIAL, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Differential", NULL},
- {GPSTAG_GPSHPOSITIONINGERROR, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE,
- TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "HorizontalPositioningError",
- NULL}};
+ {GPSTAG_VERSIONID, 4, 4, TIFF_BYTE, 0, TIFF_SETGET_C0_UINT8, TIFF_SETGET_UINT8, FIELD_CUSTOM, 1, 0, "VersionID", NULL},
+ {GPSTAG_LATITUDEREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LatitudeRef", NULL},
+ {GPSTAG_LATITUDE, 3, 3, TIFF_RATIONAL, 0, TIFF_SETGET_C0_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Latitude", NULL},
+ {GPSTAG_LONGITUDEREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "LongitudeRef", NULL},
+ {GPSTAG_LONGITUDE, 3, 3, TIFF_RATIONAL, 0, TIFF_SETGET_C0_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Longitude", NULL},
+ {GPSTAG_ALTITUDEREF, 1, 1, TIFF_BYTE, 0, TIFF_SETGET_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "AltitudeRef", NULL},
+ {GPSTAG_ALTITUDE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Altitude", NULL},
+ {GPSTAG_TIMESTAMP, 3, 3, TIFF_RATIONAL, 0, TIFF_SETGET_C0_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "TimeStamp", NULL},
+ {GPSTAG_SATELLITES, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Satellites", NULL},
+ {GPSTAG_STATUS, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Status", NULL},
+ {GPSTAG_MEASUREMODE, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MeasureMode", NULL},
+ {GPSTAG_DOP, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DOP", NULL},
+ {GPSTAG_SPEEDREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "SpeedRef", NULL},
+ {GPSTAG_SPEED, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Speed", NULL},
+ {GPSTAG_TRACKREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "TrackRef", NULL},
+ {GPSTAG_TRACK, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Track", NULL},
+ {GPSTAG_IMGDIRECTIONREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ImgDirectionRef", NULL},
+ {GPSTAG_IMGDIRECTION, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "ImgDirection", NULL},
+ {GPSTAG_MAPDATUM, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "MapDatum", NULL},
+ {GPSTAG_DESTLATITUDEREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestLatitudeRef", NULL},
+ {GPSTAG_DESTLATITUDE, 3, 3, TIFF_RATIONAL, 0, TIFF_SETGET_C0_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestLatitude", NULL},
+ {GPSTAG_DESTLONGITUDEREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestLongitudeRef", NULL},
+ {GPSTAG_DESTLONGITUDE, 3, 3, TIFF_RATIONAL, 0, TIFF_SETGET_C0_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestLongitude", NULL},
+ {GPSTAG_DESTBEARINGREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestBearingRef", NULL},
+ {GPSTAG_DESTBEARING, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestBearing", NULL},
+ {GPSTAG_DESTDISTANCEREF, 2, 2, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestDistanceRef", NULL},
+ {GPSTAG_DESTDISTANCE, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DestDistance", NULL},
+ {GPSTAG_PROCESSINGMETHOD, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "ProcessingMethod", NULL},
+ {GPSTAG_AREAINFORMATION, -1, -1, TIFF_UNDEFINED, 0, TIFF_SETGET_C16_UINT8, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 1, "AreaInformation", NULL},
+ {GPSTAG_DATESTAMP, 11, 11, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "DateStamp", NULL},
+ {GPSTAG_DIFFERENTIAL, 1, 1, TIFF_SHORT, 0, TIFF_SETGET_UINT16, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "Differential", NULL},
+ {GPSTAG_GPSHPOSITIONINGERROR, 1, 1, TIFF_RATIONAL, 0, TIFF_SETGET_DOUBLE, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, 1, 0, "HorizontalPositioningError", NULL}};
+/* clang-format on */ /* was off for better readability of tag comments */
static const TIFFFieldArray tiffFieldArray = {
tfiatImage, 0, TIFFArrayCount(tiffFields), (TIFFField *)tiffFields};
@@ -1039,8 +846,8 @@ const TIFFField *TIFFFieldWithTag(TIFF *tif, uint32_t tag)
const TIFFField *fip = TIFFFindField(tif, tag, TIFF_ANY);
if (!fip)
{
- TIFFErrorExtR(tif, "TIFFFieldWithTag",
- "Internal error, unknown tag 0x%x", (unsigned int)tag);
+ TIFFWarningExtR(tif, "TIFFFieldWithTag", "Warning, unknown tag 0x%x",
+ (unsigned int)tag);
}
return (fip);
}
@@ -1050,8 +857,8 @@ const TIFFField *TIFFFieldWithName(TIFF *tif, const char *field_name)
const TIFFField *fip = _TIFFFindFieldByName(tif, field_name, TIFF_ANY);
if (!fip)
{
- TIFFErrorExtR(tif, "TIFFFieldWithName",
- "Internal error, unknown tag %s", field_name);
+ TIFFWarningExtR(tif, "TIFFFieldWithName", "Warning, unknown tag %s",
+ field_name);
}
return (fip);
}
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dirread.c b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dirread.c
index 35425b4..2c49dc6 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dirread.c
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dirread.c
@@ -144,7 +144,11 @@ static void TIFFReadDirEntryCheckedFloat(TIFF *tif, TIFFDirEntry *direntry,
float *value);
static enum TIFFReadDirEntryErr
TIFFReadDirEntryCheckedDouble(TIFF *tif, TIFFDirEntry *direntry, double *value);
-
+#if 0
+static enum TIFFReadDirEntryErr
+TIFFReadDirEntryCheckedRationalDirect(TIFF *tif, TIFFDirEntry *direntry,
+ TIFFRational_t *value);
+#endif
static enum TIFFReadDirEntryErr
TIFFReadDirEntryCheckRangeByteSbyte(int8_t value);
static enum TIFFReadDirEntryErr
@@ -3469,6 +3473,49 @@ TIFFReadDirEntryCheckedSrational(TIFF *tif, TIFFDirEntry *direntry,
return (TIFFReadDirEntryErrOk);
}
+#if 0
+static enum TIFFReadDirEntryErr
+TIFFReadDirEntryCheckedRationalDirect(TIFF *tif, TIFFDirEntry *direntry,
+ TIFFRational_t *value)
+{ /*--: SetGetRATIONAL_directly:_CustomTag: Read rational (and signed rationals)
+ directly --*/
+ UInt64Aligned_t m;
+
+ assert(sizeof(double) == 8);
+ assert(sizeof(uint64_t) == 8);
+ assert(sizeof(uint32_t) == 4);
+
+ if (direntry->tdir_count != 1)
+ return (TIFFReadDirEntryErrCount);
+
+ if (direntry->tdir_type != TIFF_RATIONAL &&
+ direntry->tdir_type != TIFF_SRATIONAL)
+ return (TIFFReadDirEntryErrType);
+
+ if (!(tif->tif_flags & TIFF_BIGTIFF))
+ {
+ enum TIFFReadDirEntryErr err;
+ uint32_t offset = direntry->tdir_offset.toff_long;
+ if (tif->tif_flags & TIFF_SWAB)
+ TIFFSwabLong(&offset);
+ err = TIFFReadDirEntryData(tif, offset, 8, m.i);
+ if (err != TIFFReadDirEntryErrOk)
+ return (err);
+ }
+ else
+ {
+ m.l = direntry->tdir_offset.toff_long8;
+ }
+
+ if (tif->tif_flags & TIFF_SWAB)
+ TIFFSwabArrayOfLong(m.i, 2);
+
+ value->uNum = m.i[0];
+ value->uDenom = m.i[1];
+ return (TIFFReadDirEntryErrOk);
+} /*-- TIFFReadDirEntryCheckedRationalDirect() --*/
+#endif
+
static void TIFFReadDirEntryCheckedFloat(TIFF *tif, TIFFDirEntry *direntry,
float *value)
{
@@ -4067,9 +4114,11 @@ int TIFFReadDirectory(TIFF *tif)
if (tif->tif_nextdiroff == 0)
{
- /* In this special case, tif_diroff needs also to be set to 0. */
+ /* In this special case, tif_diroff needs also to be set to 0.
+ * This is behind the last IFD, thus no checking or reading necessary.
+ */
tif->tif_diroff = tif->tif_nextdiroff;
- return 0; /* last offset, thus no checking necessary */
+ return 0;
}
nextdiroff = tif->tif_nextdiroff;
@@ -4523,7 +4572,52 @@ int TIFFReadDirectory(TIFF *tif)
}
}
break;
- /* END REV 4.0 COMPATIBILITY */
+ /* END REV 4.0 COMPATIBILITY */
+#if 0
+ case TIFFTAG_EP_BATTERYLEVEL:
+ /* TIFFTAG_EP_BATTERYLEVEL can be RATIONAL or ASCII.
+ * LibTiff defines it as ASCII and converts RATIONAL to an
+ * ASCII string. */
+ switch (dp->tdir_type)
+ {
+ case TIFF_RATIONAL:
+ {
+ /* Read rational and convert to ASCII*/
+ enum TIFFReadDirEntryErr err;
+ TIFFRational_t rValue;
+ err = TIFFReadDirEntryCheckedRationalDirect(
+ tif, dp, &rValue);
+ if (err != TIFFReadDirEntryErrOk)
+ {
+ fip = TIFFFieldWithTag(tif, dp->tdir_tag);
+ TIFFReadDirEntryOutputErr(
+ tif, err, module,
+ fip ? fip->field_name : "unknown tagname",
+ 1);
+ }
+ else
+ {
+ char szAux[32];
+ snprintf(szAux, sizeof(szAux) - 1, "%d/%d",
+ rValue.uNum, rValue.uDenom);
+ TIFFSetField(tif, dp->tdir_tag, szAux);
+ }
+ }
+ break;
+ case TIFF_ASCII:
+ (void)TIFFFetchNormalTag(tif, dp, TRUE);
+ break;
+ default:
+ fip = TIFFFieldWithTag(tif, dp->tdir_tag);
+ TIFFWarningExtR(tif, module,
+ "Invalid data type for tag %s. "
+ "ASCII or RATIONAL expected",
+ fip ? fip->field_name
+ : "unknown tagname");
+ break;
+ }
+ break;
+#endif
default:
(void)TIFFFetchNormalTag(tif, dp, TRUE);
break;
@@ -4944,7 +5038,7 @@ static void TIFFReadDirectoryCheckOrder(TIFF *tif, TIFFDirEntry *dir,
uint16_t dircount)
{
static const char module[] = "TIFFReadDirectoryCheckOrder";
- uint16_t m;
+ uint32_t m;
uint16_t n;
TIFFDirEntry *o;
m = 0;
@@ -5131,6 +5225,8 @@ int TIFFReadCustomDirectory(TIFF *tif, toff_t diroff,
} /*-- if (!dp->tdir_ignore) */
}
}
+ /* To be able to return from SubIFD or custom-IFD to main-IFD */
+ tif->tif_setdirectory_force_absolute = TRUE;
if (dir)
_TIFFfreeExt(tif, dir);
return 1;
@@ -5448,7 +5544,8 @@ int _TIFFCheckDirNumberAndOffset(TIFF *tif, tdir_t dirn, uint64_t diroff)
}
/* Arbitrary (hopefully big enough) limit */
- if (tif->tif_dirnumber >= TIFF_MAX_DIR_COUNT)
+ if (TIFFHashSetSize(tif->tif_map_dir_offset_to_number) >=
+ TIFF_MAX_DIR_COUNT)
{
TIFFErrorExtR(tif, "_TIFFCheckDirNumberAndOffset",
"Cannot handle more than %u TIFF directories",
@@ -5481,8 +5578,6 @@ int _TIFFCheckDirNumberAndOffset(TIFF *tif, tdir_t dirn, uint64_t diroff)
return 0;
}
- tif->tif_dirnumber++;
-
return 1;
} /* --- _TIFFCheckDirNumberAndOffset() ---*/
@@ -5497,13 +5592,6 @@ int _TIFFGetDirNumberFromOffset(TIFF *tif, uint64_t diroff, tdir_t *dirn)
{
if (diroff == 0) /* no more directories */
return 0;
- if (tif->tif_dirnumber >= TIFF_MAX_DIR_COUNT)
- {
- TIFFErrorExtR(tif, "_TIFFGetDirNumberFromOffset",
- "Cannot handle more than %u TIFF directories",
- TIFF_MAX_DIR_COUNT);
- return 0;
- }
/* Check if offset is already in the list and return matching directory
* number. Otherwise update IFD list using TIFFNumberOfDirectories() and
@@ -5524,6 +5612,7 @@ int _TIFFGetDirNumberFromOffset(TIFF *tif, uint64_t diroff, tdir_t *dirn)
return 1;
}
+ /* This updates the directory list for all main-IFDs in the file. */
TIFFNumberOfDirectories(tif);
foundEntry = (TIFFOffsetAndDirNumber *)TIFFHashSetLookup(
@@ -5537,6 +5626,83 @@ int _TIFFGetDirNumberFromOffset(TIFF *tif, uint64_t diroff, tdir_t *dirn)
return 0;
} /*--- _TIFFGetDirNumberFromOffset() ---*/
+/*
+ * Retrieve the matching IFD directory offset of a given IFD number
+ * from the list of directories already seen.
+ * Returns 1 if the offset was in the list of already seen IFDs and the
+ * directory offset can be returned. The directory list is not updated.
+ * Otherwise returns 0 or if an error occurred.
+ */
+int _TIFFGetOffsetFromDirNumber(TIFF *tif, tdir_t dirn, uint64_t *diroff)
+{
+
+ if (tif->tif_map_dir_number_to_offset == NULL)
+ return 0;
+ TIFFOffsetAndDirNumber entry;
+ entry.offset = 0; /* not used */
+ entry.dirNumber = dirn;
+
+ TIFFOffsetAndDirNumber *foundEntry =
+ (TIFFOffsetAndDirNumber *)TIFFHashSetLookup(
+ tif->tif_map_dir_number_to_offset, &entry);
+ if (foundEntry)
+ {
+ *diroff = foundEntry->offset;
+ return 1;
+ }
+
+ return 0;
+} /*--- _TIFFGetOffsetFromDirNumber() ---*/
+
+/*
+ * Remove an entry from the directory list of already seen directories
+ * by directory offset.
+ * If an entry is to be removed from the list, it is also okay if the entry
+ * is not in the list or the list does not exist.
+ */
+int _TIFFRemoveEntryFromDirectoryListByOffset(TIFF *tif, uint64_t diroff)
+{
+ if (tif->tif_map_dir_offset_to_number == NULL)
+ return 1;
+
+ TIFFOffsetAndDirNumber entryOld;
+ entryOld.offset = diroff;
+ entryOld.dirNumber = 0;
+ /* We must remove first from tif_map_dir_number_to_offset as the
+ * entry is owned (and thus freed) by tif_map_dir_offset_to_number.
+ * However, we need firstly to find the directory number from offset. */
+
+ TIFFOffsetAndDirNumber *foundEntryOldOff =
+ (TIFFOffsetAndDirNumber *)TIFFHashSetLookup(
+ tif->tif_map_dir_offset_to_number, &entryOld);
+ if (foundEntryOldOff)
+ {
+ entryOld.dirNumber = foundEntryOldOff->dirNumber;
+ if (tif->tif_map_dir_number_to_offset != NULL)
+ {
+ TIFFOffsetAndDirNumber *foundEntryOldDir =
+ (TIFFOffsetAndDirNumber *)TIFFHashSetLookup(
+ tif->tif_map_dir_number_to_offset, &entryOld);
+ if (foundEntryOldDir)
+ {
+ TIFFHashSetRemove(tif->tif_map_dir_number_to_offset,
+ foundEntryOldDir);
+ TIFFHashSetRemove(tif->tif_map_dir_offset_to_number,
+ foundEntryOldOff);
+ return 1;
+ }
+ }
+ else
+ {
+ TIFFErrorExtR(tif, "_TIFFRemoveEntryFromDirectoryListByOffset",
+ "Unexpectedly tif_map_dir_number_to_offset is "
+ "missing but tif_map_dir_offset_to_number exists.");
+ return 0;
+ }
+ }
+ return 1;
+} /*--- _TIFFRemoveEntryFromDirectoryListByOffset() ---*/
+
/*
* Check the count field of a directory entry against a known value. The
* caller is expected to skip/ignore the tag if there is a mismatch.
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dirwrite.c b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dirwrite.c
index beebd11..d8844bb 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dirwrite.c
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_dirwrite.c
@@ -320,6 +320,7 @@ int TIFFRewriteDirectory(TIFF *tif)
* Find and zero the pointer to this directory, so that TIFFLinkDirectory
* will cause it to be added after this directories current pre-link.
*/
+ uint64_t torewritediroff = tif->tif_diroff;
if (!(tif->tif_flags & TIFF_BIGTIFF))
{
@@ -387,6 +388,8 @@ int TIFFRewriteDirectory(TIFF *tif)
nextdir = nextnextdir;
}
}
+ /* Remove skipped offset from IFD loop directory list. */
+ _TIFFRemoveEntryFromDirectoryListByOffset(tif, torewritediroff);
}
else
{
@@ -456,6 +459,8 @@ int TIFFRewriteDirectory(TIFF *tif)
nextdir = nextnextdir;
}
}
+ /* Remove skipped offset from IFD loop directory list. */
+ _TIFFRemoveEntryFromDirectoryListByOffset(tif, torewritediroff);
}
/*
@@ -1114,7 +1119,12 @@ static int TIFFWriteDirectorySec(TIFF *tif, int isimage, int imagedone,
if (tif->tif_dataoff & 1)
tif->tif_dataoff++;
if (isimage)
- tif->tif_curdir++;
+ {
+ if (tif->tif_curdir == TIFF_NON_EXISTENT_DIR_NUMBER)
+ tif->tif_curdir = 0;
+ else
+ tif->tif_curdir++;
+ }
}
if (isimage)
{
@@ -2063,34 +2073,41 @@ static int TIFFWriteDirectoryTagTransferfunction(TIFF *tif, uint32_t *ndir,
(*ndir)++;
return (1);
}
+ /* TIFFTAG_TRANSFERFUNCTION expects (1 or 3) pointer to arrays with
+ * (1 << BitsPerSample) * uint16_t values.
+ */
m = (1 << tif->tif_dir.td_bitspersample);
- n = tif->tif_dir.td_samplesperpixel - tif->tif_dir.td_extrasamples;
+ /* clang-format off */
+ n = (tif->tif_dir.td_samplesperpixel - tif->tif_dir.td_extrasamples) > 1 ? 3 : 1;
+ /* clang-format on */
+
+ /* Check for proper number of transferfunctions */
+ for (int i = 0; i < n; i++)
+ {
+ if (tif->tif_dir.td_transferfunction[i] == NULL)
+ {
+ TIFFWarningExtR(
+ tif, module,
+ "Too few TransferFunctions provided. Tag not written to file");
+ return (1); /* Not an error; only tag is not written. */
+ }
+ }
/*
* Check if the table can be written as a single column,
* or if it must be written as 3 columns. Note that we
* write a 3-column tag if there are 2 samples/pixel and
* a single column of data won't suffice--hmm.
*/
- if (n > 3)
- n = 3;
if (n == 3)
{
- if (tif->tif_dir.td_transferfunction[2] == NULL ||
- !_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],
+ if (!_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],
tif->tif_dir.td_transferfunction[2],
- m * sizeof(uint16_t)))
- n = 2;
- }
- if (n == 2)
- {
- if (tif->tif_dir.td_transferfunction[1] == NULL ||
+ m * sizeof(uint16_t)) &&
!_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],
tif->tif_dir.td_transferfunction[1],
m * sizeof(uint16_t)))
n = 1;
}
- if (n == 0)
- n = 1;
o = _TIFFmallocExt(tif, n * m * sizeof(uint16_t));
if (o == NULL)
{
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_fax3.c b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_fax3.c
index 7428544..3874ac9 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_fax3.c
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_fax3.c
@@ -349,22 +349,22 @@ static int Fax3Decode2D(TIFF *tif, uint8_t *buf, tmsize_t occ, uint16_t s)
}
#undef SWAP
-# define FILL(n, cp) { \
- int32_t ifill; \
- for (ifill = 0; ifill < (n); ++ifill) \
- { \
- (cp)[ifill] = 0xff; \
- } \
- (cp) += (n); \
+#define FILL(n, cp) { \
+ int32_t ifill; \
+ for (ifill = 0; ifill < (n); ++ifill) \
+ { \
+ (cp)[ifill] = 0xff; \
+ } \
+ (cp) += (n); \
}
-# define ZERO(n, cp) { \
- int32_t izero; \
- for (izero = 0; izero < (n); ++izero) \
- { \
- (cp)[izero] = 0; \
- } \
- (cp) += (n); \
+#define ZERO(n, cp) { \
+ int32_t izero; \
+ for (izero = 0; izero < (n); ++izero) \
+ { \
+ (cp)[izero] = 0; \
+ } \
+ (cp) += (n); \
}
/*
@@ -541,7 +541,7 @@ static int Fax3SetupState(TIFF *tif)
TIFFroundup and TIFFSafeMultiply return zero on integer overflow
*/
dsp->runs = (uint32_t *)NULL;
- dsp->nruns = TIFFroundup_32(rowpixels, 32);
+ dsp->nruns = TIFFroundup_32(rowpixels + 1, 32);
if (needsRefLine)
{
dsp->nruns = TIFFSafeMultiply(uint32_t, dsp->nruns, 2);
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_hash_set.c b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_hash_set.c
index 49718ce..9792c63 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_hash_set.c
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_hash_set.c
@@ -26,6 +26,8 @@
* DEALINGS IN THE SOFTWARE.
****************************************************************************/
+#include "tif_config.h"
+
#include "tif_hash_set.h"
#include <assert.h>
@@ -161,7 +163,6 @@ TIFFHashSet *TIFFHashSetNew(TIFFHashSetHashFunc fnHashFunc,
return set;
}
-#ifdef notdef
/************************************************************************/
/* TIFFHashSetSize() */
/************************************************************************/
@@ -181,7 +182,6 @@ int TIFFHashSetSize(const TIFFHashSet *set)
assert(set != NULL);
return set->nSize;
}
-#endif
/************************************************************************/
/* TIFFHashSetGetNewListElt() */
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_hash_set.h b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_hash_set.h
index 1a3f8da..f60e2c6 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_hash_set.h
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_hash_set.h
@@ -71,11 +71,11 @@ extern "C"
void TIFFHashSetDestroy(TIFFHashSet *set);
+ int TIFFHashSetSize(const TIFFHashSet *set);
+
#ifdef notused
void TIFFHashSetClear(TIFFHashSet *set);
- int TIFFHashSetSize(const TIFFHashSet *set);
-
/** TIFFHashSetIterEltFunc */
typedef int (*TIFFHashSetIterEltFunc)(void *elt, void *user_data);
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_lerc.c b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_lerc.c
index 99de713..4f357a6 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_lerc.c
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_lerc.c
@@ -517,7 +517,7 @@ static int LERCPreDecode(TIFF *tif, uint16_t s)
{
const unsigned nb_pixels = sp->segment_width * sp->segment_height;
unsigned i;
-#if HOST_BIGENDIAN
+#if WORDS_BIGENDIAN
const unsigned char nan_bytes[] = {0x7f, 0xc0, 0, 0};
#else
const unsigned char nan_bytes[] = {0, 0, 0xc0, 0x7f};
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_luv.c b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_luv.c
index 051721e..021756d 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_luv.c
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_luv.c
@@ -953,6 +953,13 @@ static
{
register int vi, ui;
+ /* check for NaN */
+ if (u != u || v != v)
+ {
+ u = U_NEU;
+ v = V_NEU;
+ }
+
if (v < UV_VSTART)
return oog_encode(u, v);
vi = tiff_itrunc((v - UV_VSTART) * (1. / UV_SQSIZ), em);
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_lzw.c b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_lzw.c
index ba75a07..d631fa1 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_lzw.c
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_lzw.c
@@ -423,6 +423,10 @@ static int LZWDecode(TIFF *tif, uint8_t *op0, tmsize_t occ0, uint16_t s)
if (sp->read_error)
{
+ TIFFErrorExtR(tif, module,
+ "LZWDecode: Scanline %" PRIu32 " cannot be read due to "
+ "previous error",
+ tif->tif_row);
return 0;
}
@@ -742,6 +746,7 @@ after_loop:
return (1);
no_eoi:
+ sp->read_error = 1;
TIFFErrorExtR(tif, module,
"LZWDecode: Strip %" PRIu32 " not terminated with EOI code",
tif->tif_curstrip);
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_ojpeg.c b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_ojpeg.c
index 0c915de..ea57209 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_ojpeg.c
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_ojpeg.c
@@ -1360,6 +1360,9 @@ static int OJPEGWriteHeaderInfo(TIFF *tif)
{
assert(sp->subsampling_convert_ycbcrbuf == 0);
assert(sp->subsampling_convert_ycbcrimage == 0);
+ /* Check for division by zero. */
+ if (sp->subsampling_hor == 0 || sp->subsampling_ver == 0)
+ return (0);
sp->subsampling_convert_ylinelen =
((sp->strile_width + sp->subsampling_hor * 8 - 1) /
(sp->subsampling_hor * 8) * sp->subsampling_hor * 8);
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_open.c b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_open.c
index 8a86a26..23fcf81 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_open.c
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_open.c
@@ -365,8 +365,12 @@ TIFF *TIFFClientOpenExt(const char *name, const char *mode,
(tif->tif_flags & ~TIFF_FILLORDER) | FILLORDER_LSB2MSB;
break;
case 'H':
+ TIFFWarningExtR(tif, name,
+ "H(ost) mode is deprecated. Since "
+ "libtiff 4.5.1, it is an alias of 'B' / "
+ "FILLORDER_MSB2LSB.");
tif->tif_flags =
- (tif->tif_flags & ~TIFF_FILLORDER) | HOST_FILLORDER;
+ (tif->tif_flags & ~TIFF_FILLORDER) | FILLORDER_MSB2LSB;
break;
case 'M':
if (m == O_RDONLY)
@@ -485,7 +489,7 @@ TIFF *TIFFClientOpenExt(const char *name, const char *mode,
goto bad;
tif->tif_diroff = 0;
tif->tif_lastdiroff = 0;
- tif->tif_dirnumber = 0;
+ tif->tif_setdirectory_force_absolute = FALSE;
return (tif);
}
/*
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_webp.c b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_webp.c
index 07db7cc..bf9d77e 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_webp.c
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_webp.c
@@ -47,9 +47,11 @@ typedef struct
{
uint16_t nSamples; /* number of samples per pixel */
- int lossless; /* lossy/lossless compression */
- int quality_level; /* compression level */
- WebPPicture sPicture; /* WebP Picture */
+ int lossless; /* lossy/lossless compression */
+ int lossless_exact; /* lossless exact mode. If TRUE, R,G,B values in areas
+ with alpha = 0 will be preserved */
+ int quality_level; /* compression level */
+ WebPPicture sPicture; /* WebP Picture */
WebPConfig sEncoderConfig; /* WebP encoder config */
uint8_t *pBuffer; /* buffer to hold raw data on encoding */
unsigned int buffer_offset; /* current offset into the buffer */
@@ -149,6 +151,64 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
segment_height = td->td_rowsperstrip;
}
+ int webp_width, webp_height;
+ if (!WebPGetInfo(tif->tif_rawcp,
+ (uint64_t)tif->tif_rawcc > UINT32_MAX
+ ? UINT32_MAX
+ : (uint32_t)tif->tif_rawcc,
+ &webp_width, &webp_height))
+ {
+ TIFFErrorExtR(tif, module, "WebPGetInfo() failed");
+ return 0;
+ }
+ if ((uint32_t)webp_width != segment_width ||
+ (uint32_t)webp_height != segment_height)
+ {
+ TIFFErrorExtR(
+ tif, module, "WebP blob dimension is %dx%d. Expected %ux%u",
+ webp_width, webp_height, segment_width, segment_height);
+ return 0;
+ }
+
+#if WEBP_DECODER_ABI_VERSION >= 0x0002
+ WebPDecoderConfig config;
+ if (!WebPInitDecoderConfig(&config))
+ {
+ TIFFErrorExtR(tif, module, "WebPInitDecoderConfig() failed");
+ return 0;
+ }
+
+ const bool bWebPGetFeaturesOK =
+ WebPGetFeatures(tif->tif_rawcp,
+ (uint64_t)tif->tif_rawcc > UINT32_MAX
+ ? UINT32_MAX
+ : (uint32_t)tif->tif_rawcc,
+ &config.input) == VP8_STATUS_OK;
+
+ WebPFreeDecBuffer(&config.output);
+
+ if (!bWebPGetFeaturesOK)
+ {
+ TIFFErrorExtR(tif, module, "WebPInitDecoderConfig() failed");
+ return 0;
+ }
+
+ const int webp_bands = config.input.has_alpha ? 4 : 3;
+ if (webp_bands != sp->nSamples &&
+ /* We accept the situation where the WebP blob has only 3 bands,
+ * whereas the raster is 4 bands. This can happen when the alpha
+ * channel is fully opaque, and WebP decoding works fine in that
+ * situation.
+ */
+ !(webp_bands == 3 && sp->nSamples == 4))
+ {
+ TIFFErrorExtR(tif, module,
+ "WebP blob band count is %d. Expected %d", webp_bands,
+ sp->nSamples);
+ return 0;
+ }
+#endif
+
buffer_size = segment_width * segment_height * sp->nSamples;
if (occ == (tmsize_t)buffer_size)
{
@@ -461,6 +521,9 @@ static int TWebPSetupEncode(TIFF *tif)
if (sp->lossless)
{
sp->sPicture.use_argb = 1;
+#if WEBP_ENCODER_ABI_VERSION >= 0x0209
+ sp->sEncoderConfig.exact = sp->lossless_exact;
+#endif
}
#endif
@@ -695,6 +758,17 @@ static int TWebPVSetField(TIFF *tif, uint32_t tag, va_list ap)
"Need to upgrade WEBP driver, this version doesn't support "
"lossless compression.");
return 0;
+#endif
+ case TIFFTAG_WEBP_LOSSLESS_EXACT:
+#if WEBP_ENCODER_ABI_VERSION >= 0x0209
+ sp->lossless_exact = va_arg(ap, int);
+ return 1;
+#else
+ TIFFErrorExtR(
+ tif, module,
+ "Need to upgrade WEBP driver, this version doesn't support "
+ "lossless compression.");
+ return 0;
#endif
default:
return (*sp->vsetparent)(tif, tag, ap);
@@ -714,6 +788,9 @@ static int TWebPVGetField(TIFF *tif, uint32_t tag, va_list ap)
case TIFFTAG_WEBP_LOSSLESS:
*va_arg(ap, int *) = sp->lossless;
break;
+ case TIFFTAG_WEBP_LOSSLESS_EXACT:
+ *va_arg(ap, int *) = sp->lossless_exact;
+ break;
default:
return (*sp->vgetparent)(tif, tag, ap);
}
@@ -726,6 +803,9 @@ static const TIFFField TWebPFields[] = {
{TIFFTAG_WEBP_LOSSLESS, 0, 0, TIFF_ANY, 0, TIFF_SETGET_INT,
TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, TRUE, FALSE, "WEBP lossless/lossy",
NULL},
+ {TIFFTAG_WEBP_LOSSLESS_EXACT, 0, 0, TIFF_ANY, 0, TIFF_SETGET_INT,
+ TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, TRUE, FALSE, "WEBP exact lossless",
+ NULL},
};
int TIFFInitWebP(TIFF *tif, int scheme)
@@ -764,6 +844,7 @@ int TIFFInitWebP(TIFF *tif, int scheme)
/* Default values for codec-specific fields */
sp->quality_level = 75; /* default comp. level */
sp->lossless = 0; /* default to false */
+ sp->lossless_exact = 1; /* exact lossless mode (if lossless enabled) */
sp->state = 0;
sp->nSamples = 0;
sp->psDecoder = NULL;
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_win32.c b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_win32.c
index 8b47650..1a6b86d 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tif_win32.c
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tif_win32.c
@@ -274,7 +274,7 @@ TIFF *TIFFOpenExt(const char *name, const char *mode, TIFFOpenOptions *opts)
dwMode = OPEN_EXISTING;
break;
case O_RDWR:
- dwMode = OPEN_ALWAYS;
+ dwMode = OPEN_EXISTING;
break;
case O_RDWR | O_CREAT:
dwMode = OPEN_ALWAYS;
@@ -332,7 +332,7 @@ TIFF *TIFFOpenWExt(const wchar_t *name, const char *mode, TIFFOpenOptions *opts)
dwMode = OPEN_EXISTING;
break;
case O_RDWR:
- dwMode = OPEN_ALWAYS;
+ dwMode = OPEN_EXISTING;
break;
case O_RDWR | O_CREAT:
dwMode = OPEN_ALWAYS;
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tiff.h b/qtimageformats/src/3rdparty/libtiff/libtiff/tiff.h
index 285a968..d8da33d 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tiff.h
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tiff.h
@@ -166,30 +166,30 @@ typedef enum
/*
* TIFF Tag Definitions.
*/
-#define TIFFTAG_SUBFILETYPE 254 /* subfile data descriptor */
-#define FILETYPE_REDUCEDIMAGE 0x1 /* reduced resolution version */
-#define FILETYPE_PAGE 0x2 /* one page of many */
-#define FILETYPE_MASK 0x4 /* transparency mask */
-#define TIFFTAG_OSUBFILETYPE 255 /* +kind of data in subfile */
-#define OFILETYPE_IMAGE 1 /* full resolution image data */
-#define OFILETYPE_REDUCEDIMAGE 2 /* reduced size image data */
-#define OFILETYPE_PAGE 3 /* one page of many */
-#define TIFFTAG_IMAGEWIDTH 256 /* image width in pixels */
-#define TIFFTAG_IMAGELENGTH 257 /* image height in pixels */
-#define TIFFTAG_BITSPERSAMPLE 258 /* bits per channel (sample) */
-#define TIFFTAG_COMPRESSION 259 /* data compression technique */
-#define COMPRESSION_NONE 1 /* dump mode */
-#define COMPRESSION_CCITTRLE 2 /* CCITT modified Huffman RLE */
-#define COMPRESSION_CCITTFAX3 3 /* CCITT Group 3 fax encoding */
-#define COMPRESSION_CCITT_T4 3 /* CCITT T.4 (TIFF 6 name) */
-#define COMPRESSION_CCITTFAX4 4 /* CCITT Group 4 fax encoding */
-#define COMPRESSION_CCITT_T6 4 /* CCITT T.6 (TIFF 6 name) */
-#define COMPRESSION_LZW 5 /* Lempel-Ziv & Welch */
-#define COMPRESSION_OJPEG 6 /* !6.0 JPEG */
-#define COMPRESSION_JPEG 7 /* %JPEG DCT compression */
-#define COMPRESSION_T85 9 /* !TIFF/FX T.85 JBIG compression */
-#define COMPRESSION_T43 \
- 10 /* !TIFF/FX T.43 colour by layered JBIG compression */
+/* clang-format off */ /* for better readability of tag comments */
+#define TIFFTAG_SUBFILETYPE 254 /* subfile data descriptor */
+#define FILETYPE_REDUCEDIMAGE 0x1 /* reduced resolution version */
+#define FILETYPE_PAGE 0x2 /* one page of many */
+#define FILETYPE_MASK 0x4 /* transparency mask */
+#define TIFFTAG_OSUBFILETYPE 255 /* +kind of data in subfile */
+#define OFILETYPE_IMAGE 1 /* full resolution image data */
+#define OFILETYPE_REDUCEDIMAGE 2 /* reduced size image data */
+#define OFILETYPE_PAGE 3 /* one page of many */
+#define TIFFTAG_IMAGEWIDTH 256 /* image width in pixels */
+#define TIFFTAG_IMAGELENGTH 257 /* image height in pixels */
+#define TIFFTAG_BITSPERSAMPLE 258 /* bits per channel (sample) */
+#define TIFFTAG_COMPRESSION 259 /* data compression technique */
+#define COMPRESSION_NONE 1 /* dump mode */
+#define COMPRESSION_CCITTRLE 2 /* CCITT modified Huffman RLE */
+#define COMPRESSION_CCITTFAX3 3 /* CCITT Group 3 fax encoding */
+#define COMPRESSION_CCITT_T4 3 /* CCITT T.4 (TIFF 6 name) */
+#define COMPRESSION_CCITTFAX4 4 /* CCITT Group 4 fax encoding */
+#define COMPRESSION_CCITT_T6 4 /* CCITT T.6 (TIFF 6 name) */
+#define COMPRESSION_LZW 5 /* Lempel-Ziv & Welch */
+#define COMPRESSION_OJPEG 6 /* !6.0 JPEG */
+#define COMPRESSION_JPEG 7 /* %JPEG DCT compression */
+#define COMPRESSION_T85 9 /* !TIFF/FX T.85 JBIG compression */
+#define COMPRESSION_T43 10 /* !TIFF/FX T.43 colour by layered JBIG compression */
#define COMPRESSION_NEXT 32766 /* NeXT 2-bit RLE */
#define COMPRESSION_CCITTRLEW 32771 /* #1 w/ word alignment */
#define COMPRESSION_PACKBITS 32773 /* Macintosh RLE */
@@ -203,113 +203,107 @@ typedef enum
#define COMPRESSION_PIXARFILM 32908 /* Pixar companded 10bit LZW */
#define COMPRESSION_PIXARLOG 32909 /* Pixar companded 11bit ZIP */
#define COMPRESSION_DEFLATE 32946 /* Deflate compression, legacy tag */
-#define COMPRESSION_ADOBE_DEFLATE \
- 8 /* Deflate compression, \
- as recognized by Adobe */
+#define COMPRESSION_ADOBE_DEFLATE 8 /* Deflate compression, as recognized by Adobe */
/* compression code 32947 is reserved for Oceana Matrix <dev@oceana.com> */
#define COMPRESSION_DCS 32947 /* Kodak DCS encoding */
#define COMPRESSION_JBIG 34661 /* ISO JBIG */
#define COMPRESSION_SGILOG 34676 /* SGI Log Luminance RLE */
#define COMPRESSION_SGILOG24 34677 /* SGI Log 24-bit packed */
#define COMPRESSION_JP2000 34712 /* Leadtools JPEG2000 */
-#define COMPRESSION_LERC \
- 34887 /* ESRI Lerc codec: https://github.com/Esri/lerc */
+#define COMPRESSION_LERC 34887 /* ESRI Lerc codec: https://github.com/Esri/lerc */
/* compression codes 34887-34889 are reserved for ESRI */
-#define COMPRESSION_LZMA 34925 /* LZMA2 */
-#define COMPRESSION_ZSTD \
- 50000 /* ZSTD: WARNING not registered in Adobe-maintained registry */
-#define COMPRESSION_WEBP \
- 50001 /* WEBP: WARNING not registered in Adobe-maintained registry */
-#define COMPRESSION_JXL \
- 50002 /* JPEGXL: WARNING not registered in Adobe-maintained registry */
-#define TIFFTAG_PHOTOMETRIC 262 /* photometric interpretation */
-#define PHOTOMETRIC_MINISWHITE 0 /* min value is white */
-#define PHOTOMETRIC_MINISBLACK 1 /* min value is black */
-#define PHOTOMETRIC_RGB 2 /* RGB color model */
-#define PHOTOMETRIC_PALETTE 3 /* color map indexed */
-#define PHOTOMETRIC_MASK 4 /* $holdout mask */
-#define PHOTOMETRIC_SEPARATED 5 /* !color separations */
-#define PHOTOMETRIC_YCBCR 6 /* !CCIR 601 */
-#define PHOTOMETRIC_CIELAB 8 /* !1976 CIE L*a*b* */
-#define PHOTOMETRIC_ICCLAB 9 /* ICC L*a*b* [Adobe TIFF Technote 4] */
-#define PHOTOMETRIC_ITULAB 10 /* ITU L*a*b* */
-#define PHOTOMETRIC_CFA 32803 /* color filter array */
-#define PHOTOMETRIC_LOGL 32844 /* CIE Log2(L) */
-#define PHOTOMETRIC_LOGLUV 32845 /* CIE Log2(L) (u',v') */
-#define TIFFTAG_THRESHHOLDING 263 /* +thresholding used on data */
-#define THRESHHOLD_BILEVEL 1 /* b&w art scan */
-#define THRESHHOLD_HALFTONE 2 /* or dithered scan */
-#define THRESHHOLD_ERRORDIFFUSE 3 /* usually floyd-steinberg */
-#define TIFFTAG_CELLWIDTH 264 /* +dithering matrix width */
-#define TIFFTAG_CELLLENGTH 265 /* +dithering matrix height */
-#define TIFFTAG_FILLORDER 266 /* data order within a byte */
-#define FILLORDER_MSB2LSB 1 /* most significant -> least */
-#define FILLORDER_LSB2MSB 2 /* least significant -> most */
-#define TIFFTAG_DOCUMENTNAME 269 /* name of doc. image is from */
-#define TIFFTAG_IMAGEDESCRIPTION 270 /* info about image */
-#define TIFFTAG_MAKE 271 /* scanner manufacturer name */
-#define TIFFTAG_MODEL 272 /* scanner model name/number */
-#define TIFFTAG_STRIPOFFSETS 273 /* offsets to data strips */
-#define TIFFTAG_ORIENTATION 274 /* +image orientation */
-#define ORIENTATION_TOPLEFT 1 /* row 0 top, col 0 lhs */
-#define ORIENTATION_TOPRIGHT 2 /* row 0 top, col 0 rhs */
-#define ORIENTATION_BOTRIGHT 3 /* row 0 bottom, col 0 rhs */
-#define ORIENTATION_BOTLEFT 4 /* row 0 bottom, col 0 lhs */
-#define ORIENTATION_LEFTTOP 5 /* row 0 lhs, col 0 top */
-#define ORIENTATION_RIGHTTOP 6 /* row 0 rhs, col 0 top */
-#define ORIENTATION_RIGHTBOT 7 /* row 0 rhs, col 0 bottom */
-#define ORIENTATION_LEFTBOT 8 /* row 0 lhs, col 0 bottom */
-#define TIFFTAG_SAMPLESPERPIXEL 277 /* samples per pixel */
-#define TIFFTAG_ROWSPERSTRIP 278 /* rows per strip of data */
-#define TIFFTAG_STRIPBYTECOUNTS 279 /* bytes counts for strips */
-#define TIFFTAG_MINSAMPLEVALUE 280 /* +minimum sample value */
-#define TIFFTAG_MAXSAMPLEVALUE 281 /* +maximum sample value */
-#define TIFFTAG_XRESOLUTION 282 /* pixels/resolution in x */
-#define TIFFTAG_YRESOLUTION 283 /* pixels/resolution in y */
-#define TIFFTAG_PLANARCONFIG 284 /* storage organization */
-#define PLANARCONFIG_CONTIG 1 /* single image plane */
-#define PLANARCONFIG_SEPARATE 2 /* separate planes of data */
-#define TIFFTAG_PAGENAME 285 /* page name image is from */
-#define TIFFTAG_XPOSITION 286 /* x page offset of image lhs */
-#define TIFFTAG_YPOSITION 287 /* y page offset of image lhs */
-#define TIFFTAG_FREEOFFSETS 288 /* +byte offset to free block */
-#define TIFFTAG_FREEBYTECOUNTS 289 /* +sizes of free blocks */
-#define TIFFTAG_GRAYRESPONSEUNIT 290 /* $gray scale curve accuracy */
-#define GRAYRESPONSEUNIT_10S 1 /* tenths of a unit */
-#define GRAYRESPONSEUNIT_100S 2 /* hundredths of a unit */
-#define GRAYRESPONSEUNIT_1000S 3 /* thousandths of a unit */
-#define GRAYRESPONSEUNIT_10000S 4 /* ten-thousandths of a unit */
-#define GRAYRESPONSEUNIT_100000S 5 /* hundred-thousandths */
-#define TIFFTAG_GRAYRESPONSECURVE 291 /* $gray scale response curve */
-#define TIFFTAG_GROUP3OPTIONS 292 /* 32 flag bits */
-#define TIFFTAG_T4OPTIONS 292 /* TIFF 6.0 proper name alias */
-#define GROUP3OPT_2DENCODING 0x1 /* 2-dimensional coding */
-#define GROUP3OPT_UNCOMPRESSED 0x2 /* data not compressed */
-#define GROUP3OPT_FILLBITS 0x4 /* fill to byte boundary */
-#define TIFFTAG_GROUP4OPTIONS 293 /* 32 flag bits */
-#define TIFFTAG_T6OPTIONS 293 /* TIFF 6.0 proper name */
-#define GROUP4OPT_UNCOMPRESSED 0x2 /* data not compressed */
-#define TIFFTAG_RESOLUTIONUNIT 296 /* units of resolutions */
-#define RESUNIT_NONE 1 /* no meaningful units */
-#define RESUNIT_INCH 2 /* english */
-#define RESUNIT_CENTIMETER 3 /* metric */
-#define TIFFTAG_PAGENUMBER 297 /* page numbers of multi-page */
-#define TIFFTAG_COLORRESPONSEUNIT 300 /* $color curve accuracy */
-#define COLORRESPONSEUNIT_10S 1 /* tenths of a unit */
-#define COLORRESPONSEUNIT_100S 2 /* hundredths of a unit */
-#define COLORRESPONSEUNIT_1000S 3 /* thousandths of a unit */
-#define COLORRESPONSEUNIT_10000S 4 /* ten-thousandths of a unit */
-#define COLORRESPONSEUNIT_100000S 5 /* hundred-thousandths */
-#define TIFFTAG_TRANSFERFUNCTION 301 /* !colorimetry info */
-#define TIFFTAG_SOFTWARE 305 /* name & release */
-#define TIFFTAG_DATETIME 306 /* creation date and time */
-#define TIFFTAG_ARTIST 315 /* creator of image */
-#define TIFFTAG_HOSTCOMPUTER 316 /* machine where created */
-#define TIFFTAG_PREDICTOR 317 /* prediction scheme w/ LZW */
-#define PREDICTOR_NONE 1 /* no prediction scheme used */
-#define PREDICTOR_HORIZONTAL 2 /* horizontal differencing */
-#define PREDICTOR_FLOATINGPOINT 3 /* floating point predictor */
-#define TIFFTAG_WHITEPOINT 318 /* image white point */
+#define COMPRESSION_LZMA 34925 /* LZMA2 */
+#define COMPRESSION_ZSTD 50000 /* ZSTD: WARNING not registered in Adobe-maintained registry */
+#define COMPRESSION_WEBP 50001 /* WEBP: WARNING not registered in Adobe-maintained registry */
+#define COMPRESSION_JXL 50002 /* JPEGXL: WARNING not registered in Adobe-maintained registry */
+#define TIFFTAG_PHOTOMETRIC 262 /* photometric interpretation */
+#define PHOTOMETRIC_MINISWHITE 0 /* min value is white */
+#define PHOTOMETRIC_MINISBLACK 1 /* min value is black */
+#define PHOTOMETRIC_RGB 2 /* RGB color model */
+#define PHOTOMETRIC_PALETTE 3 /* color map indexed */
+#define PHOTOMETRIC_MASK 4 /* $holdout mask */
+#define PHOTOMETRIC_SEPARATED 5 /* !color separations */
+#define PHOTOMETRIC_YCBCR 6 /* !CCIR 601 */
+#define PHOTOMETRIC_CIELAB 8 /* !1976 CIE L*a*b* */
+#define PHOTOMETRIC_ICCLAB 9 /* ICC L*a*b* [Adobe TIFF Technote 4] */
+#define PHOTOMETRIC_ITULAB 10 /* ITU L*a*b* */
+#define PHOTOMETRIC_CFA 32803 /* color filter array */
+#define PHOTOMETRIC_LOGL 32844 /* CIE Log2(L) */
+#define PHOTOMETRIC_LOGLUV 32845 /* CIE Log2(L) (u',v') */
+#define TIFFTAG_THRESHHOLDING 263 /* +thresholding used on data */
+#define THRESHHOLD_BILEVEL 1 /* b&w art scan */
+#define THRESHHOLD_HALFTONE 2 /* or dithered scan */
+#define THRESHHOLD_ERRORDIFFUSE 3 /* usually floyd-steinberg */
+#define TIFFTAG_CELLWIDTH 264 /* +dithering matrix width */
+#define TIFFTAG_CELLLENGTH 265 /* +dithering matrix height */
+#define TIFFTAG_FILLORDER 266 /* data order within a byte */
+#define FILLORDER_MSB2LSB 1 /* most significant -> least */
+#define FILLORDER_LSB2MSB 2 /* least significant -> most */
+#define TIFFTAG_DOCUMENTNAME 269 /* name of doc. image is from */
+#define TIFFTAG_IMAGEDESCRIPTION 270 /* info about image */
+#define TIFFTAG_MAKE 271 /* scanner manufacturer name */
+#define TIFFTAG_MODEL 272 /* scanner model name/number */
+#define TIFFTAG_STRIPOFFSETS 273 /* offsets to data strips */
+#define TIFFTAG_ORIENTATION 274 /* +image orientation */
+#define ORIENTATION_TOPLEFT 1 /* row 0 top, col 0 lhs */
+#define ORIENTATION_TOPRIGHT 2 /* row 0 top, col 0 rhs */
+#define ORIENTATION_BOTRIGHT 3 /* row 0 bottom, col 0 rhs */
+#define ORIENTATION_BOTLEFT 4 /* row 0 bottom, col 0 lhs */
+#define ORIENTATION_LEFTTOP 5 /* row 0 lhs, col 0 top */
+#define ORIENTATION_RIGHTTOP 6 /* row 0 rhs, col 0 top */
+#define ORIENTATION_RIGHTBOT 7 /* row 0 rhs, col 0 bottom */
+#define ORIENTATION_LEFTBOT 8 /* row 0 lhs, col 0 bottom */
+#define TIFFTAG_SAMPLESPERPIXEL 277 /* samples per pixel */
+#define TIFFTAG_ROWSPERSTRIP 278 /* rows per strip of data */
+#define TIFFTAG_STRIPBYTECOUNTS 279 /* bytes counts for strips */
+#define TIFFTAG_MINSAMPLEVALUE 280 /* +minimum sample value */
+#define TIFFTAG_MAXSAMPLEVALUE 281 /* +maximum sample value */
+#define TIFFTAG_XRESOLUTION 282 /* pixels/resolution in x */
+#define TIFFTAG_YRESOLUTION 283 /* pixels/resolution in y */
+#define TIFFTAG_PLANARCONFIG 284 /* storage organization */
+#define PLANARCONFIG_CONTIG 1 /* single image plane */
+#define PLANARCONFIG_SEPARATE 2 /* separate planes of data */
+#define TIFFTAG_PAGENAME 285 /* page name image is from */
+#define TIFFTAG_XPOSITION 286 /* x page offset of image lhs */
+#define TIFFTAG_YPOSITION 287 /* y page offset of image lhs */
+#define TIFFTAG_FREEOFFSETS 288 /* +byte offset to free block */
+#define TIFFTAG_FREEBYTECOUNTS 289 /* +sizes of free blocks */
+#define TIFFTAG_GRAYRESPONSEUNIT 290 /* $gray scale curve accuracy */
+#define GRAYRESPONSEUNIT_10S 1 /* tenths of a unit */
+#define GRAYRESPONSEUNIT_100S 2 /* hundredths of a unit */
+#define GRAYRESPONSEUNIT_1000S 3 /* thousandths of a unit */
+#define GRAYRESPONSEUNIT_10000S 4 /* ten-thousandths of a unit */
+#define GRAYRESPONSEUNIT_100000S 5 /* hundred-thousandths */
+#define TIFFTAG_GRAYRESPONSECURVE 291 /* $gray scale response curve */
+#define TIFFTAG_GROUP3OPTIONS 292 /* 32 flag bits */
+#define TIFFTAG_T4OPTIONS 292 /* TIFF 6.0 proper name alias */
+#define GROUP3OPT_2DENCODING 0x1 /* 2-dimensional coding */
+#define GROUP3OPT_UNCOMPRESSED 0x2 /* data not compressed */
+#define GROUP3OPT_FILLBITS 0x4 /* fill to byte boundary */
+#define TIFFTAG_GROUP4OPTIONS 293 /* 32 flag bits */
+#define TIFFTAG_T6OPTIONS 293 /* TIFF 6.0 proper name */
+#define GROUP4OPT_UNCOMPRESSED 0x2 /* data not compressed */
+#define TIFFTAG_RESOLUTIONUNIT 296 /* units of resolutions */
+#define RESUNIT_NONE 1 /* no meaningful units */
+#define RESUNIT_INCH 2 /* english */
+#define RESUNIT_CENTIMETER 3 /* metric */
+#define TIFFTAG_PAGENUMBER 297 /* page numbers of multi-page */
+#define TIFFTAG_COLORRESPONSEUNIT 300 /* $color curve accuracy */
+#define COLORRESPONSEUNIT_10S 1 /* tenths of a unit */
+#define COLORRESPONSEUNIT_100S 2 /* hundredths of a unit */
+#define COLORRESPONSEUNIT_1000S 3 /* thousandths of a unit */
+#define COLORRESPONSEUNIT_10000S 4 /* ten-thousandths of a unit */
+#define COLORRESPONSEUNIT_100000S 5 /* hundred-thousandths */
+#define TIFFTAG_TRANSFERFUNCTION 301 /* !colorimetry info */
+#define TIFFTAG_SOFTWARE 305 /* name & release */
+#define TIFFTAG_DATETIME 306 /* creation date and time */
+#define TIFFTAG_ARTIST 315 /* creator of image */
+#define TIFFTAG_HOSTCOMPUTER 316 /* machine where created */
+#define TIFFTAG_PREDICTOR 317 /* prediction scheme w/ LZW */
+#define PREDICTOR_NONE 1 /* no prediction scheme used */
+#define PREDICTOR_HORIZONTAL 2 /* horizontal differencing */
+#define PREDICTOR_FLOATINGPOINT 3 /* floating point predictor */
+#define TIFFTAG_WHITEPOINT 318 /* image white point */
#define TIFFTAG_PRIMARYCHROMATICITIES 319 /* !primary chromaticities */
#define TIFFTAG_COLORMAP 320 /* RGB map for palette image */
#define TIFFTAG_HALFTONEHINTS 321 /* !highlight+shadow info */
@@ -325,39 +319,31 @@ typedef enum
#define TIFFTAG_CONSECUTIVEBADFAXLINES 328 /* max consecutive bad lines */
#define TIFFTAG_SUBIFD 330 /* subimage descriptors */
#define TIFFTAG_INKSET 332 /* !inks in separated image */
-#define INKSET_CMYK 1 /* !cyan-magenta-yellow-black color */
-#define INKSET_MULTIINK 2 /* !multi-ink or hi-fi color */
-#define TIFFTAG_INKNAMES 333 /* !ascii names of inks */
-#define TIFFTAG_NUMBEROFINKS 334 /* !number of inks */
-#define TIFFTAG_DOTRANGE 336 /* !0% and 100% dot codes */
-#define TIFFTAG_TARGETPRINTER 337 /* !separation target */
-#define TIFFTAG_EXTRASAMPLES 338 /* !info about extra samples */
-#define EXTRASAMPLE_UNSPECIFIED 0 /* !unspecified data */
-#define EXTRASAMPLE_ASSOCALPHA 1 /* !associated alpha data */
-#define EXTRASAMPLE_UNASSALPHA 2 /* !unassociated alpha data */
-#define TIFFTAG_SAMPLEFORMAT 339 /* !data sample format */
-#define SAMPLEFORMAT_UINT 1 /* !unsigned integer data */
-#define SAMPLEFORMAT_INT 2 /* !signed integer data */
-#define SAMPLEFORMAT_IEEEFP 3 /* !IEEE floating point data */
-#define SAMPLEFORMAT_VOID 4 /* !untyped data */
-#define SAMPLEFORMAT_COMPLEXINT 5 /* !complex signed int */
-#define SAMPLEFORMAT_COMPLEXIEEEFP 6 /* !complex ieee floating */
-#define TIFFTAG_SMINSAMPLEVALUE 340 /* !variable MinSampleValue */
-#define TIFFTAG_SMAXSAMPLEVALUE 341 /* !variable MaxSampleValue */
-#define TIFFTAG_CLIPPATH \
- 343 /* %ClipPath \
- [Adobe TIFF technote 2] */
-#define TIFFTAG_XCLIPPATHUNITS \
- 344 /* %XClipPathUnits \
- [Adobe TIFF technote 2] */
-#define TIFFTAG_YCLIPPATHUNITS \
- 345 /* %YClipPathUnits \
- [Adobe TIFF technote 2] */
-#define TIFFTAG_INDEXED \
- 346 /* %Indexed \
- [Adobe TIFF Technote 3] */
-#define TIFFTAG_JPEGTABLES 347 /* %JPEG table stream */
-#define TIFFTAG_OPIPROXY 351 /* %OPI Proxy [Adobe TIFF technote] */
+#define INKSET_CMYK 1 /* !cyan-magenta-yellow-black color */
+#define INKSET_MULTIINK 2 /* !multi-ink or hi-fi color */
+#define TIFFTAG_INKNAMES 333 /* !ascii names of inks */
+#define TIFFTAG_NUMBEROFINKS 334 /* !number of inks */
+#define TIFFTAG_DOTRANGE 336 /* !0% and 100% dot codes */
+#define TIFFTAG_TARGETPRINTER 337 /* !separation target */
+#define TIFFTAG_EXTRASAMPLES 338 /* !info about extra samples */
+#define EXTRASAMPLE_UNSPECIFIED 0 /* !unspecified data */
+#define EXTRASAMPLE_ASSOCALPHA 1 /* !associated alpha data */
+#define EXTRASAMPLE_UNASSALPHA 2 /* !unassociated alpha data */
+#define TIFFTAG_SAMPLEFORMAT 339 /* !data sample format */
+#define SAMPLEFORMAT_UINT 1 /* !unsigned integer data */
+#define SAMPLEFORMAT_INT 2 /* !signed integer data */
+#define SAMPLEFORMAT_IEEEFP 3 /* !IEEE floating point data */
+#define SAMPLEFORMAT_VOID 4 /* !untyped data */
+#define SAMPLEFORMAT_COMPLEXINT 5 /* !complex signed int */
+#define SAMPLEFORMAT_COMPLEXIEEEFP 6 /* !complex ieee floating */
+#define TIFFTAG_SMINSAMPLEVALUE 340 /* !variable MinSampleValue */
+#define TIFFTAG_SMAXSAMPLEVALUE 341 /* !variable MaxSampleValue */
+#define TIFFTAG_CLIPPATH 343 /* %ClipPath [Adobe TIFF technote 2] */
+#define TIFFTAG_XCLIPPATHUNITS 344 /* %XClipPathUnits [Adobe TIFF technote 2] */
+#define TIFFTAG_YCLIPPATHUNITS 345 /* %YClipPathUnits [Adobe TIFF technote 2] */
+#define TIFFTAG_INDEXED 346 /* %Indexed [Adobe TIFF Technote 3] */
+#define TIFFTAG_JPEGTABLES 347 /* %JPEG table stream */
+#define TIFFTAG_OPIPROXY 351 /* %OPI Proxy [Adobe TIFF technote] */
/* Tags 400-435 are from the TIFF/FX spec */
#define TIFFTAG_GLOBALPARAMETERSIFD 400 /* ! */
#define TIFFTAG_PROFILETYPE 401 /* ! */
@@ -404,16 +390,11 @@ typedef enum
#define YCBCRPOSITION_COSITED 2 /* !as in CCIR 601-1 */
#define TIFFTAG_REFERENCEBLACKWHITE 532 /* !colorimetry info */
#define TIFFTAG_STRIPROWCOUNTS 559 /* !TIFF/FX strip row counts */
-#define TIFFTAG_XMLPACKET \
- 700 /* %XML packet \
- [Adobe XMP Specification, \
- January 2004 */
-#define TIFFTAG_OPIIMAGEID \
- 32781 /* %OPI ImageID \
- [Adobe TIFF technote] */
-#define TIFFTAG_TIFFANNOTATIONDATA \
- 32932 /* http://web.archive.org/web/20050309141348/http://www.kofile.com/support%20pro/faqs/annospec.htm \
- */
+#define TIFFTAG_XMLPACKET 700 /* %XML packet [Adobe XMP Specification, January 2004 */
+#define TIFFTAG_OPIIMAGEID 32781 /* %OPI ImageID [Adobe TIFF technote] */
+/* For eiStream Annotation Specification, Version 1.00.06 see
+ * http://web.archive.org/web/20050309141348/http://www.kofile.com/support%20pro/faqs/annospec.htm */
+#define TIFFTAG_TIFFANNOTATIONDATA 32932
/* tags 32952-32956 are private tags registered to Island Graphics */
#define TIFFTAG_REFPTS 32953 /* image reference points */
#define TIFFTAG_REGIONTACKPOINT 32954 /* region-xform tack point */
@@ -444,53 +425,36 @@ typedef enum
#define TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA 33306
/* tag 33405 is a private tag registered to Eastman Kodak */
#define TIFFTAG_WRITERSERIALNUMBER 33405 /* device serial number */
-#define TIFFTAG_CFAREPEATPATTERNDIM 33421 /* dimensions of CFA pattern */
-#define TIFFTAG_CFAPATTERN 33422 /* color filter array pattern */
+#define TIFFTAG_CFAREPEATPATTERNDIM 33421 /* (alias for TIFFTAG_EP_CFAREPEATPATTERNDIM)*/
+#define TIFFTAG_CFAPATTERN 33422 /* (alias for TIFFTAG_EP_CFAPATTERN) */
+#define TIFFTAG_BATTERYLEVEL 33423 /* (alias for TIFFTAG_EP_BATTERYLEVEL) */
/* tag 33432 is listed in the 6.0 spec w/ unknown ownership */
#define TIFFTAG_COPYRIGHT 33432 /* copyright string */
-/* Tags 33445-33452 are used for GEL fileformat, see
- * http://research.stowers-institute.org/mcm/efg/ScientificSoftware/Utility/TiffTags/GEL-FileFormat.pdf
+/* Tags 33445-33452 are used for Molecular Dynamics GEL fileformat,
+ * see http://research.stowers-institute.org/mcm/efg/ScientificSoftware/Utility/TiffTags/GEL-FileFormat.pdf
+ * (2023: the above web site is unavailable but tags are explained briefly at
+ * https://www.awaresystems.be/imaging/tiff/tifftags/docs/gel.html
*/
-#define TIFFTAG_MD_FILETAG \
- 33445 /* http://research.stowers-institute.org/mcm/efg/ScientificSoftware/Utility/TiffTags/GEL-FileFormat.pdf \
- */
-#define TIFFTAG_MD_SCALEPIXEL \
- 33446 /* http://research.stowers-institute.org/mcm/efg/ScientificSoftware/Utility/TiffTags/GEL-FileFormat.pdf \
- */
-#define TIFFTAG_MD_COLORTABLE \
- 33447 /* http://research.stowers-institute.org/mcm/efg/ScientificSoftware/Utility/TiffTags/GEL-FileFormat.pdf \
- */
-#define TIFFTAG_MD_LABNAME \
- 33448 /* http://research.stowers-institute.org/mcm/efg/ScientificSoftware/Utility/TiffTags/GEL-FileFormat.pdf \
- */
-#define TIFFTAG_MD_SAMPLEINFO \
- 33449 /* http://research.stowers-institute.org/mcm/efg/ScientificSoftware/Utility/TiffTags/GEL-FileFormat.pdf \
- */
-#define TIFFTAG_MD_PREPDATE \
- 33450 /* http://research.stowers-institute.org/mcm/efg/ScientificSoftware/Utility/TiffTags/GEL-FileFormat.pdf \
- */
-#define TIFFTAG_MD_PREPTIME \
- 33451 /* http://research.stowers-institute.org/mcm/efg/ScientificSoftware/Utility/TiffTags/GEL-FileFormat.pdf \
- */
-#define TIFFTAG_MD_FILEUNITS \
- 33452 /* http://research.stowers-institute.org/mcm/efg/ScientificSoftware/Utility/TiffTags/GEL-FileFormat.pdf \
- */
+#define TIFFTAG_MD_FILETAG 33445 /* Specifies the pixel data format encoding in the GEL file format. */
+#define TIFFTAG_MD_SCALEPIXEL 33446 /* scale factor */
+#define TIFFTAG_MD_COLORTABLE 33447 /* conversion from 16bit to 8bit */
+#define TIFFTAG_MD_LABNAME 33448 /* name of the lab that scanned this file. */
+#define TIFFTAG_MD_SAMPLEINFO 33449 /* information about the scanned GEL sample */
+#define TIFFTAG_MD_PREPDATE 33450 /* information about the date the sample was prepared YY/MM/DD */
+#define TIFFTAG_MD_PREPTIME 33451 /* information about the time the sample was prepared HH:MM*/
+#define TIFFTAG_MD_FILEUNITS 33452 /* Units for data in this file, as used in the GEL file format. */
/* IPTC TAG from RichTIFF specifications */
#define TIFFTAG_RICHTIFFIPTC 33723
-#define TIFFTAG_INGR_PACKET_DATA_TAG \
- 33918 /* Intergraph Application specific storage. */
-#define TIFFTAG_INGR_FLAG_REGISTERS \
- 33919 /* Intergraph Application specific flags. */
-#define TIFFTAG_IRASB_TRANSORMATION_MATRIX \
- 33920 /* Originally part of Intergraph's GeoTIFF tags, but likely \
- understood by IrasB only. */
-#define TIFFTAG_MODELTIEPOINTTAG 33922 /* GeoTIFF */
+#define TIFFTAG_INGR_PACKET_DATA_TAG 33918 /* Intergraph Application specific storage. */
+#define TIFFTAG_INGR_FLAG_REGISTERS 33919 /* Intergraph Application specific flags. */
+#define TIFFTAG_IRASB_TRANSORMATION_MATRIX 33920 /* Originally part of Intergraph's GeoTIFF tags, but likely understood by IrasB only. */
+#define TIFFTAG_MODELTIEPOINTTAG 33922 /* GeoTIFF */
/* 34016-34029 are reserved for ANSI IT8 TIFF/IT <dkelly@apago.com) */
-#define TIFFTAG_IT8SITE 34016 /* site name */
-#define TIFFTAG_IT8COLORSEQUENCE 34017 /* color seq. [RGB,CMYK,etc] */
-#define TIFFTAG_IT8HEADER 34018 /* DDES Header */
-#define TIFFTAG_IT8RASTERPADDING 34019 /* raster scanline padding */
-#define TIFFTAG_IT8BITSPERRUNLENGTH 34020 /* # of bits in short run */
+#define TIFFTAG_IT8SITE 34016 /* site name */
+#define TIFFTAG_IT8COLORSEQUENCE 34017 /* color seq. [RGB,CMYK,etc] */
+#define TIFFTAG_IT8HEADER 34018 /* DDES Header */
+#define TIFFTAG_IT8RASTERPADDING 34019 /* raster scanline padding */
+#define TIFFTAG_IT8BITSPERRUNLENGTH 34020 /* # of bits in short run */
#define TIFFTAG_IT8BITSPEREXTENDEDRUNLENGTH 34021 /* # of bits in long run */
#define TIFFTAG_IT8COLORTABLE 34022 /* LW colortable */
#define TIFFTAG_IT8IMAGECOLORINDICATOR 34023 /* BP/BL image color switch */
@@ -501,14 +465,11 @@ typedef enum
#define TIFFTAG_IT8TRANSPARENCYINDICATOR 34028 /* HC transparency switch */
#define TIFFTAG_IT8COLORCHARACTERIZATION 34029 /* color character. table */
#define TIFFTAG_IT8HCUSAGE 34030 /* HC usage indicator */
-#define TIFFTAG_IT8TRAPINDICATOR \
- 34031 /* Trapping indicator \
- (untrapped=0, trapped=1) */
-#define TIFFTAG_IT8CMYKEQUIVALENT 34032 /* CMYK color equivalents */
+#define TIFFTAG_IT8TRAPINDICATOR 34031 /* Trapping indicator (untrapped=0, trapped=1) */
+#define TIFFTAG_IT8CMYKEQUIVALENT 34032 /* CMYK color equivalents */
/* tags 34232-34236 are private tags registered to Texas Instruments */
-#define TIFFTAG_FRAMECOUNT 34232 /* Sequence Frame Count */
-#define TIFFTAG_MODELTRANSFORMATIONTAG \
- 34264 /* Used in interchangeable GeoTIFF files */
+#define TIFFTAG_FRAMECOUNT 34232 /* Sequence Frame Count */
+#define TIFFTAG_MODELTRANSFORMATIONTAG 34264 /* Used in interchangeable GeoTIFF files */
/* tag 34377 is private tag registered to Adobe for PhotoShop */
#define TIFFTAG_PHOTOSHOP 34377
/* tags 34665, 34853 and 40965 are documented in EXIF specification */
@@ -518,7 +479,7 @@ typedef enum
#define TIFFTAG_IMAGELAYER 34732 /* !TIFF/FX image layer information */
/* tag 34750 is a private tag registered to Pixel Magic */
#define TIFFTAG_JBIGOPTIONS 34750 /* JBIG options */
-#define TIFFTAG_GPSIFD 34853 /* Pointer to GPS private directory */
+#define TIFFTAG_GPSIFD 34853 /* Pointer to EXIF GPS private directory */
/* tags 34908-34914 are private tags registered to SGI */
#define TIFFTAG_FAXRECVPARAMS 34908 /* encoded Class 2 ses. params */
#define TIFFTAG_FAXSUBADDRESS 34909 /* received SubAddr string */
@@ -527,150 +488,196 @@ typedef enum
/* tags 37439-37443 are registered to SGI <gregl@sgi.com> */
#define TIFFTAG_STONITS 37439 /* Sample value to Nits */
/* tag 34929 is a private tag registered to FedEx */
-#define TIFFTAG_FEDEX_EDR 34929 /* unknown use */
-#define TIFFTAG_IMAGESOURCEDATA \
- 37724 /* http://justsolve.archiveteam.org/wiki/PSD, \
- http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/ */
-#define TIFFTAG_INTEROPERABILITYIFD \
- 40965 /* Pointer to Interoperability private directory */
-#define TIFFTAG_GDAL_METADATA 42112 /* Used by the GDAL library */
-#define TIFFTAG_GDAL_NODATA 42113 /* Used by the GDAL library */
-#define TIFFTAG_OCE_SCANJOB_DESCRIPTION \
- 50215 /* Used in the Oce scanning process */
-#define TIFFTAG_OCE_APPLICATION_SELECTOR \
- 50216 /* Used in the Oce scanning process. */
+#define TIFFTAG_FEDEX_EDR 34929 /* unknown use */
+#define TIFFTAG_IMAGESOURCEDATA 37724 /* http://justsolve.archiveteam.org/wiki/PSD, http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/ */
+#define TIFFTAG_INTEROPERABILITYIFD 40965 /* Pointer to EXIF Interoperability private directory */
+#define TIFFTAG_GDAL_METADATA 42112 /* Used by the GDAL library */
+#define TIFFTAG_GDAL_NODATA 42113 /* Used by the GDAL library */
+#define TIFFTAG_OCE_SCANJOB_DESCRIPTION 50215 /* Used in the Oce scanning process */
+#define TIFFTAG_OCE_APPLICATION_SELECTOR 50216 /* Used in the Oce scanning process. */
#define TIFFTAG_OCE_IDENTIFICATION_NUMBER 50217
#define TIFFTAG_OCE_IMAGELOGIC_CHARACTERISTICS 50218
-
/* tags 50674 to 50677 are reserved for ESRI */
-#define TIFFTAG_LERC_PARAMETERS \
- 50674 /* Stores LERC version and additional compression method */
+#define TIFFTAG_LERC_PARAMETERS 50674 /* Stores LERC version and additional compression method */
+
/* Adobe Digital Negative (DNG) format tags */
-#define TIFFTAG_DNGVERSION 50706 /* &DNG version number */
-#define TIFFTAG_DNGBACKWARDVERSION 50707 /* &DNG compatibility version */
-#define TIFFTAG_UNIQUECAMERAMODEL 50708 /* &name for the camera model */
-#define TIFFTAG_LOCALIZEDCAMERAMODEL \
- 50709 /* &localized camera model \
- name */
-#define TIFFTAG_CFAPLANECOLOR \
- 50710 /* &CFAPattern->LinearRaw space \
- mapping */
-#define TIFFTAG_CFALAYOUT 50711 /* &spatial layout of the CFA */
-#define TIFFTAG_LINEARIZATIONTABLE 50712 /* &lookup table description */
-#define TIFFTAG_BLACKLEVELREPEATDIM \
- 50713 /* &repeat pattern size for \
- the BlackLevel tag */
-#define TIFFTAG_BLACKLEVEL 50714 /* &zero light encoding level */
-#define TIFFTAG_BLACKLEVELDELTAH \
- 50715 /* &zero light encoding level \
- differences (columns) */
-#define TIFFTAG_BLACKLEVELDELTAV \
- 50716 /* &zero light encoding level \
- differences (rows) */
-#define TIFFTAG_WHITELEVEL \
- 50717 /* &fully saturated encoding \
- level */
-#define TIFFTAG_DEFAULTSCALE 50718 /* &default scale factors */
-#define TIFFTAG_DEFAULTCROPORIGIN \
- 50719 /* &origin of the final image \
- area */
-#define TIFFTAG_DEFAULTCROPSIZE \
- 50720 /* &size of the final image \
- area */
-#define TIFFTAG_COLORMATRIX1 \
- 50721 /* &XYZ->reference color space \
- transformation matrix 1 */
-#define TIFFTAG_COLORMATRIX2 \
- 50722 /* &XYZ->reference color space \
- transformation matrix 2 */
-#define TIFFTAG_CAMERACALIBRATION1 50723 /* &calibration matrix 1 */
-#define TIFFTAG_CAMERACALIBRATION2 50724 /* &calibration matrix 2 */
-#define TIFFTAG_REDUCTIONMATRIX1 \
- 50725 /* &dimensionality reduction \
- matrix 1 */
-#define TIFFTAG_REDUCTIONMATRIX2 \
- 50726 /* &dimensionality reduction \
- matrix 2 */
-#define TIFFTAG_ANALOGBALANCE \
- 50727 /* &gain applied the stored raw \
- values*/
-#define TIFFTAG_ASSHOTNEUTRAL \
- 50728 /* &selected white balance in \
- linear reference space */
-#define TIFFTAG_ASSHOTWHITEXY \
- 50729 /* &selected white balance in \
- x-y chromaticity \
- coordinates */
-#define TIFFTAG_BASELINEEXPOSURE \
- 50730 /* &how much to move the zero \
- point */
-#define TIFFTAG_BASELINENOISE 50731 /* &relative noise level */
-#define TIFFTAG_BASELINESHARPNESS \
- 50732 /* &relative amount of \
- sharpening */
-#define TIFFTAG_BAYERGREENSPLIT \
- 50733 /* &how closely the values of \
- the green pixels in the \
- blue/green rows track the \
- values of the green pixels \
- in the red/green rows */
-#define TIFFTAG_LINEARRESPONSELIMIT 50734 /* &non-linear encoding range */
-#define TIFFTAG_CAMERASERIALNUMBER 50735 /* &camera's serial number */
-#define TIFFTAG_LENSINFO 50736 /* info about the lens */
-#define TIFFTAG_CHROMABLURRADIUS 50737 /* &chroma blur radius */
-#define TIFFTAG_ANTIALIASSTRENGTH \
- 50738 /* &relative strength of the \
- camera's anti-alias filter */
-#define TIFFTAG_SHADOWSCALE 50739 /* &used by Adobe Camera Raw */
-#define TIFFTAG_DNGPRIVATEDATA 50740 /* &manufacturer's private data */
-#define TIFFTAG_MAKERNOTESAFETY \
- 50741 /* &whether the EXIF MakerNote \
- tag is safe to preserve \
- along with the rest of the \
- EXIF data */
-#define TIFFTAG_CALIBRATIONILLUMINANT1 50778 /* &illuminant 1 */
-#define TIFFTAG_CALIBRATIONILLUMINANT2 50779 /* &illuminant 2 */
-#define TIFFTAG_BESTQUALITYSCALE 50780 /* &best quality multiplier */
-#define TIFFTAG_RAWDATAUNIQUEID \
- 50781 /* &unique identifier for \
- the raw image data */
-#define TIFFTAG_ORIGINALRAWFILENAME \
- 50827 /* &file name of the original \
- raw file */
-#define TIFFTAG_ORIGINALRAWFILEDATA \
- 50828 /* &contents of the original \
- raw file */
-#define TIFFTAG_ACTIVEAREA \
- 50829 /* &active (non-masked) pixels \
- of the sensor */
-#define TIFFTAG_MASKEDAREAS \
- 50830 /* &list of coordinates \
- of fully masked pixels */
-#define TIFFTAG_ASSHOTICCPROFILE 50831 /* &these two tags used to */
-#define TIFFTAG_ASSHOTPREPROFILEMATRIX \
- 50832 /* map cameras's color space \
- into ICC profile space */
+#define TIFFTAG_DNGVERSION 50706 /* &DNG version number */
+#define TIFFTAG_DNGBACKWARDVERSION 50707 /* &DNG compatibility version */
+#define TIFFTAG_UNIQUECAMERAMODEL 50708 /* &name for the camera model */
+#define TIFFTAG_LOCALIZEDCAMERAMODEL 50709 /* &localized camera model name (UTF-8) */
+#define TIFFTAG_CFAPLANECOLOR 50710 /* &CFAPattern->LinearRaw space mapping */
+#define TIFFTAG_CFALAYOUT 50711 /* &spatial layout of the CFA */
+#define TIFFTAG_LINEARIZATIONTABLE 50712 /* &lookup table description */
+#define TIFFTAG_BLACKLEVELREPEATDIM 50713 /* &repeat pattern size for the BlackLevel tag */
+#define TIFFTAG_BLACKLEVEL 50714 /* &zero light encoding level */
+#define TIFFTAG_BLACKLEVELDELTAH 50715 /* &zero light encoding level differences (columns) */
+#define TIFFTAG_BLACKLEVELDELTAV 50716 /* &zero light encoding level differences (rows) */
+#define TIFFTAG_WHITELEVEL 50717 /* &fully saturated encoding level */
+#define TIFFTAG_DEFAULTSCALE 50718 /* &default scale factors */
+#define TIFFTAG_DEFAULTCROPORIGIN 50719 /* &origin of the final image area */
+#define TIFFTAG_DEFAULTCROPSIZE 50720 /* &size of the final image area */
+#define TIFFTAG_COLORMATRIX1 50721 /* &XYZ->reference color space transformation matrix 1 */
+#define TIFFTAG_COLORMATRIX2 50722 /* &XYZ->reference color space transformation matrix 2 */
+#define TIFFTAG_CAMERACALIBRATION1 50723 /* &calibration matrix 1 */
+#define TIFFTAG_CAMERACALIBRATION2 50724 /* &calibration matrix 2 */
+#define TIFFTAG_REDUCTIONMATRIX1 50725 /* &dimensionality reduction matrix 1 */
+#define TIFFTAG_REDUCTIONMATRIX2 50726 /* &dimensionality reduction matrix 2 */
+#define TIFFTAG_ANALOGBALANCE 50727 /* &gain applied the stored raw values*/
+#define TIFFTAG_ASSHOTNEUTRAL 50728 /* &selected white balance in linear reference space */
+#define TIFFTAG_ASSHOTWHITEXY 50729 /* &selected white balance in x-y chromaticity coordinates */
+#define TIFFTAG_BASELINEEXPOSURE 50730 /* &how much to move the zero point */
+#define TIFFTAG_BASELINENOISE 50731 /* &relative noise level */
+#define TIFFTAG_BASELINESHARPNESS 50732 /* &relative amount of sharpening */
+/* TIFFTAG_BAYERGREENSPLIT: &how closely the values of the green pixels in the blue/green rows
+ * track the values of the green pixels in the red/green rows */
+#define TIFFTAG_BAYERGREENSPLIT 50733
+#define TIFFTAG_LINEARRESPONSELIMIT 50734 /* &non-linear encoding range */
+#define TIFFTAG_CAMERASERIALNUMBER 50735 /* &camera's serial number */
+#define TIFFTAG_LENSINFO 50736 /* info about the lens */
+#define TIFFTAG_CHROMABLURRADIUS 50737 /* &chroma blur radius */
+#define TIFFTAG_ANTIALIASSTRENGTH 50738 /* &relative strength of the camera's anti-alias filter */
+#define TIFFTAG_SHADOWSCALE 50739 /* &used by Adobe Camera Raw */
+#define TIFFTAG_DNGPRIVATEDATA 50740 /* &manufacturer's private data */
+#define TIFFTAG_MAKERNOTESAFETY 50741 /* &whether the EXIF MakerNote tag is safe to preserve along with the rest of the EXIF data */
+#define TIFFTAG_CALIBRATIONILLUMINANT1 50778 /* &illuminant 1 */
+#define TIFFTAG_CALIBRATIONILLUMINANT2 50779 /* &illuminant 2 */
+#define TIFFTAG_BESTQUALITYSCALE 50780 /* &best quality multiplier */
+#define TIFFTAG_RAWDATAUNIQUEID 50781 /* &unique identifier for the raw image data */
+#define TIFFTAG_ORIGINALRAWFILENAME 50827 /* &file name of the original raw file (UTF-8) */
+#define TIFFTAG_ORIGINALRAWFILEDATA 50828 /* &contents of the original raw file */
+#define TIFFTAG_ACTIVEAREA 50829 /* &active (non-masked) pixels of the sensor */
+#define TIFFTAG_MASKEDAREAS 50830 /* &list of coordinates of fully masked pixels */
+#define TIFFTAG_ASSHOTICCPROFILE 50831 /* &these two tags used to */
+#define TIFFTAG_ASSHOTPREPROFILEMATRIX 50832 /* map cameras's color space into ICC profile space */
#define TIFFTAG_CURRENTICCPROFILE 50833 /* & */
#define TIFFTAG_CURRENTPREPROFILEMATRIX 50834 /* & */
-#define TIFFTAG_RPCCOEFFICIENT \
- 50844 /* Define by GDAL for geospatial georeferencing through RPC: \
- http://geotiff.maptools.org/rpc_prop.html */
+/* DNG 1.2.0.0 */
+#define TIFFTAG_COLORIMETRICREFERENCE 50879 /* &colorimetric reference */
+#define TIFFTAG_CAMERACALIBRATIONSIGNATURE 50931 /* &camera calibration signature (UTF-8) */
+#define TIFFTAG_PROFILECALIBRATIONSIGNATURE 50932 /* &profile calibration signature (UTF-8) */
+/* TIFFTAG_EXTRACAMERAPROFILES 50933 &extra camera profiles : is already defined for GeoTIFF DGIWG */
+#define TIFFTAG_ASSHOTPROFILENAME 50934 /* &as shot profile name (UTF-8) */
+#define TIFFTAG_NOISEREDUCTIONAPPLIED 50935 /* &amount of applied noise reduction */
+#define TIFFTAG_PROFILENAME 50936 /* &camera profile name (UTF-8) */
+#define TIFFTAG_PROFILEHUESATMAPDIMS 50937 /* &dimensions of HSV mapping */
+#define TIFFTAG_PROFILEHUESATMAPDATA1 50938 /* &first HSV mapping table */
+#define TIFFTAG_PROFILEHUESATMAPDATA2 50939 /* &second HSV mapping table */
+#define TIFFTAG_PROFILETONECURVE 50940 /* &default tone curve */
+#define TIFFTAG_PROFILEEMBEDPOLICY 50941 /* &profile embedding policy */
+#define TIFFTAG_PROFILECOPYRIGHT 50942 /* &profile copyright information (UTF-8) */
+#define TIFFTAG_FORWARDMATRIX1 50964 /* &matrix for mapping white balanced camera colors to XYZ D50 */
+#define TIFFTAG_FORWARDMATRIX2 50965 /* &matrix for mapping white balanced camera colors to XYZ D50 */
+#define TIFFTAG_PREVIEWAPPLICATIONNAME 50966 /* &name of application that created preview (UTF-8) */
+#define TIFFTAG_PREVIEWAPPLICATIONVERSION 50967 /* &version of application that created preview (UTF-8) */
+#define TIFFTAG_PREVIEWSETTINGSNAME 50968 /* &name of conversion settings (UTF-8) */
+#define TIFFTAG_PREVIEWSETTINGSDIGEST 50969 /* &unique id of conversion settings */
+#define TIFFTAG_PREVIEWCOLORSPACE 50970 /* &preview color space */
+#define TIFFTAG_PREVIEWDATETIME 50971 /* &date/time preview was rendered */
+#define TIFFTAG_RAWIMAGEDIGEST 50972 /* &md5 of raw image data */
+#define TIFFTAG_ORIGINALRAWFILEDIGEST 50973 /* &md5 of the data stored in the OriginalRawFileData tag */
+#define TIFFTAG_SUBTILEBLOCKSIZE 50974 /* &subtile block size */
+#define TIFFTAG_ROWINTERLEAVEFACTOR 50975 /* &number of interleaved fields */
+#define TIFFTAG_PROFILELOOKTABLEDIMS 50981 /* &num of input samples in each dim of default "look" table */
+#define TIFFTAG_PROFILELOOKTABLEDATA 50982 /* &default "look" table for use as starting point */
-#define TIFFTAG_ALIAS_LAYER_METADATA \
- 50784 /* Alias Sketchbook Pro layer usage description. */
+/* DNG 1.3.0.0 */
+#define TIFFTAG_OPCODELIST1 51008 /* &opcodes that should be applied to raw image after reading */
+#define TIFFTAG_OPCODELIST2 51009 /* &opcodes that should be applied after mapping to linear reference */
+#define TIFFTAG_OPCODELIST3 51022 /* &opcodes that should be applied after demosaicing */
+#define TIFFTAG_NOISEPROFILE 51041 /* &noise profile */
-/* GeoTIFF DGIWG */
-#define TIFFTAG_TIFF_RSID \
- 50908 /* https://www.awaresystems.be/imaging/tiff/tifftags/tiff_rsid.html \
- */
-#define TIFFTAG_GEO_METADATA \
- 50909 /* https://www.awaresystems.be/imaging/tiff/tifftags/geo_metadata.html \
- */
+/* DNG 1.4.0.0 */
+#define TIFFTAG_DEFAULTUSERCROP 51125 /* &default user crop rectangle in relative coords */
+#define TIFFTAG_DEFAULTBLACKRENDER 51110 /* &black rendering hint */
+#define TIFFTAG_BASELINEEXPOSUREOFFSET 51109 /* &baseline exposure offset */
+#define TIFFTAG_PROFILELOOKTABLEENCODING 51108 /* &3D LookTable indexing conversion */
+#define TIFFTAG_PROFILEHUESATMAPENCODING 51107 /* &3D HueSatMap indexing conversion */
+#define TIFFTAG_ORIGINALDEFAULTFINALSIZE 51089 /* &default final size of larger original file for this proxy */
+#define TIFFTAG_ORIGINALBESTQUALITYFINALSIZE 51090 /* &best quality final size of larger original file for this proxy */
+#define TIFFTAG_ORIGINALDEFAULTCROPSIZE 51091 /* &the default crop size of larger original file for this proxy */
+#define TIFFTAG_NEWRAWIMAGEDIGEST 51111 /* &modified MD5 digest of the raw image data */
+#define TIFFTAG_RAWTOPREVIEWGAIN 51112 /* &The gain between the main raw FD and the preview IFD containing this tag */
+
+/* DNG 1.5.0.0 */
+#define TIFFTAG_DEPTHFORMAT 51177 /* &encoding of the depth data in the file */
+#define TIFFTAG_DEPTHNEAR 51178 /* &distance from the camera represented by value 0 in the depth map */
+#define TIFFTAG_DEPTHFAR 51179 /* &distance from the camera represented by the maximum value in the depth map */
+#define TIFFTAG_DEPTHUNITS 51180 /* &measurement units for DepthNear and DepthFar */
+#define TIFFTAG_DEPTHMEASURETYPE 51181 /* &measurement geometry for the depth map */
+#define TIFFTAG_ENHANCEPARAMS 51182 /* &a string that documents how the enhanced image data was processed. */
+
+/* DNG 1.6.0.0 */
+#define TIFFTAG_PROFILEGAINTABLEMAP 52525 /* &spatially varying gain tables that can be applied as starting point */
+#define TIFFTAG_SEMANTICNAME 52526 /* &a string that identifies the semantic mask */
+#define TIFFTAG_SEMANTICINSTANCEID 52528 /* &a string that identifies a specific instance in a semantic mask */
+#define TIFFTAG_MASKSUBAREA 52536 /* &the crop rectangle of this IFD's mask, relative to the main image */
+#define TIFFTAG_RGBTABLES 52543 /* &color transforms to apply to masked image regions */
+#define TIFFTAG_CALIBRATIONILLUMINANT3 52529 /* &the illuminant used for the third set of color calibration tags */
+#define TIFFTAG_COLORMATRIX3 52531 /* &matrix to convert XYZ values to reference camera native color space under CalibrationIlluminant3 */
+#define TIFFTAG_CAMERACALIBRATION3 52530 /* &matrix to transform reference camera native space values to individual camera native space values under CalibrationIlluminant3 */
+#define TIFFTAG_REDUCTIONMATRIX3 52538 /* &dimensionality reduction matrix for use in color conversion to XYZ under CalibrationIlluminant3 */
+#define TIFFTAG_PROFILEHUESATMAPDATA3 52537 /* &the data for the third HSV table */
+#define TIFFTAG_FORWARDMATRIX3 52532 /* &matrix to map white balanced camera colors to XYZ D50 */
+#define TIFFTAG_ILLUMINANTDATA1 52533 /* &data for the first calibration illuminant */
+#define TIFFTAG_ILLUMINANTDATA2 52534 /* &data for the second calibration illuminant */
+#define TIFFTAG_ILLUMINANTDATA3 53535 /* &data for the third calibration illuminant */
-#define TIFFTAG_EXTRACAMERAPROFILES \
- 50933 /* http://wwwimages.adobe.com/www.adobe.com/content/dam/Adobe/en/products/photoshop/pdfs/dng_spec_1.4.0.0.pdf \
- */
+/* TIFF/EP */
+#define TIFFTAG_EP_CFAREPEATPATTERNDIM 33421 /* dimensions of CFA pattern */
+#define TIFFTAG_EP_CFAPATTERN 33422 /* color filter array pattern */
+#define TIFFTAG_EP_BATTERYLEVEL 33423 /* battery level (rational or ASCII) */
+#define TIFFTAG_EP_INTERLACE 34857 /* Number of multi-field images */
+/* TIFFTAG_EP_IPTC_NAA and TIFFTAG_RICHTIFFIPTC share the same tag number (33723)
+ * LibTIFF type is UNDEFINED or BYTE, but often times incorrectly specified as LONG,
+ * because TIFF/EP (ISO/DIS 12234-2) specifies type LONG or ASCII. */
+#define TIFFTAG_EP_IPTC_NAA 33723 /* Alias IPTC/NAA Newspaper Association RichTIFF */
+#define TIFFTAG_EP_TIMEZONEOFFSET 34858 /* Time zone offset relative to UTC */
+#define TIFFTAG_EP_SELFTIMERMODE 34859 /* Number of seconds capture was delayed from button press */
+#define TIFFTAG_EP_FLASHENERGY 37387 /* Flash energy, or range if there is uncertainty */
+#define TIFFTAG_EP_SPATIALFREQUENCYRESPONSE 37388 /* Spatial frequency response */
+#define TIFFTAG_EP_NOISE 37389 /* Camera noise measurement values */
+#define TIFFTAG_EP_FOCALPLANEXRESOLUTION 37390 /* Focal plane X resolution */
+#define TIFFTAG_EP_FOCALPLANEYRESOLUTION 37391 /* Focal plane Y resolution */
+#define TIFFTAG_EP_FOCALPLANERESOLUTIONUNIT 37392 /* Focal plane resolution unit */
+#define TIFFTAG_EP_IMAGENUMBER 37393 /* Number of image when several of burst shot stored in same TIFF/EP */
+#define TIFFTAG_EP_SECURITYCLASSIFICATION 37394 /* Security classification */
+#define TIFFTAG_EP_IMAGEHISTORY 37395 /* Record of what has been done to the image */
+#define TIFFTAG_EP_EXPOSUREINDEX 37397 /* Exposure index */
+#define TIFFTAG_EP_STANDARDID 37398 /* TIFF/EP standard version, n.n.n.n */
+#define TIFFTAG_EP_SENSINGMETHOD 37399 /* Type of image sensor */
+/*
+ * TIFF/EP tags equivalent to EXIF tags
+ * Note that TIFF-EP and EXIF use nearly the same metadata tag set, but TIFF-EP stores the tags in IFD 0,
+ * while EXIF store the tags in a separate IFD. Either location is allowed by DNG, but the EXIF location is preferred.
+ */
+#define TIFFTAG_EP_EXPOSURETIME 33434 /* Exposure time */
+#define TIFFTAG_EP_FNUMBER 33437 /* F number */
+#define TIFFTAG_EP_EXPOSUREPROGRAM 34850 /* Exposure program */
+#define TIFFTAG_EP_SPECTRALSENSITIVITY 34852 /* Spectral sensitivity */
+#define TIFFTAG_EP_ISOSPEEDRATINGS 34855 /* ISO speed rating */
+#define TIFFTAG_EP_OECF 34856 /* Optoelectric conversion factor */
+#define TIFFTAG_EP_DATETIMEORIGINAL 36867 /* Date and time of original data generation */
+#define TIFFTAG_EP_COMPRESSEDBITSPERPIXEL 37122 /* Image compression mode */
+#define TIFFTAG_EP_SHUTTERSPEEDVALUE 37377 /* Shutter speed */
+#define TIFFTAG_EP_APERTUREVALUE 37378 /* Aperture */
+#define TIFFTAG_EP_BRIGHTNESSVALUE 37379 /* Brightness */
+#define TIFFTAG_EP_EXPOSUREBIASVALUE 37380 /* Exposure bias */
+#define TIFFTAG_EP_MAXAPERTUREVALUE 37381 /* Maximum lens aperture */
+#define TIFFTAG_EP_SUBJECTDISTANCE 37382 /* Subject distance */
+#define TIFFTAG_EP_METERINGMODE 37383 /* Metering mode */
+#define TIFFTAG_EP_LIGHTSOURCE 37384 /* Light source */
+#define TIFFTAG_EP_FLASH 37385 /* Flash */
+#define TIFFTAG_EP_FOCALLENGTH 37386 /* Lens focal length */
+#define TIFFTAG_EP_SUBJECTLOCATION 37396 /* Subject location (area) */
+
+#define TIFFTAG_RPCCOEFFICIENT 50844 /* Define by GDAL for geospatial georeferencing through RPC: http://geotiff.maptools.org/rpc_prop.html */
+#define TIFFTAG_ALIAS_LAYER_METADATA 50784 /* Alias Sketchbook Pro layer usage description. */
+
+/* GeoTIFF DGIWG */
+#define TIFFTAG_TIFF_RSID 50908 /* https://www.awaresystems.be/imaging/tiff/tifftags/tiff_rsid.html */
+#define TIFFTAG_GEO_METADATA 50909 /* https://www.awaresystems.be/imaging/tiff/tifftags/geo_metadata.html */
+#define TIFFTAG_EXTRACAMERAPROFILES 50933 /* http://wwwimages.adobe.com/www.adobe.com/content/dam/Adobe/en/products/photoshop/pdfs/dng_spec_1.4.0.0.pdf */
/* tag 65535 is an undefined tag used by Eastman Kodak */
#define TIFFTAG_DCSHUESHIFTVALUES 65535 /* hue shift correction data */
@@ -751,220 +758,142 @@ typedef enum
#define LERC_ADD_COMPRESSION_NONE 0
#define LERC_ADD_COMPRESSION_DEFLATE 1
#define LERC_ADD_COMPRESSION_ZSTD 2
-#define TIFFTAG_LERC_MAXZERROR 65567 /* LERC maximum error */
-#define TIFFTAG_WEBP_LEVEL 65568 /* WebP compression level */
-#define TIFFTAG_WEBP_LOSSLESS 65569 /* WebP lossless/lossy */
-#define TIFFTAG_DEFLATE_SUBCODEC \
- 65570 /* ZIP codec: to get/set the sub-codec to use. Will default to \
- libdeflate when available */
+#define TIFFTAG_LERC_MAXZERROR 65567 /* LERC maximum error */
+#define TIFFTAG_WEBP_LEVEL 65568 /* WebP compression level */
+#define TIFFTAG_WEBP_LOSSLESS 65569 /* WebP lossless/lossy */
+#define TIFFTAG_WEBP_LOSSLESS_EXACT 65571 /* WebP lossless exact mode. Set-only mode. Default is 1. Can be set to 0 to increase compression rate, but R,G,B in areas where alpha = 0 will not be preserved */
+#define TIFFTAG_DEFLATE_SUBCODEC 65570 /* ZIP codec: to get/set the sub-codec to use. Will default to libdeflate when available */
#define DEFLATE_SUBCODEC_ZLIB 0
#define DEFLATE_SUBCODEC_LIBDEFLATE 1
/*
* EXIF tags
*/
-#define EXIFTAG_EXPOSURETIME 33434 /* Exposure time */
-#define EXIFTAG_FNUMBER 33437 /* F number */
-#define EXIFTAG_EXPOSUREPROGRAM 34850 /* Exposure program */
-#define EXIFTAG_SPECTRALSENSITIVITY 34852 /* Spectral sensitivity */
-#define EXIFTAG_ISOSPEEDRATINGS 34855 /* ISO speed rating */
-#define EXIFTAG_PHOTOGRAPHICSENSITIVITY \
- 34855 /* Photographic Sensitivity (new name for tag 34855) */
-#define EXIFTAG_OECF 34856 /* Optoelectric conversion factor */
-#define EXIFTAG_EXIFVERSION 36864 /* Exif version */
-#define EXIFTAG_DATETIMEORIGINAL \
- 36867 /* Date and time of original \
- data generation */
-#define EXIFTAG_DATETIMEDIGITIZED \
- 36868 /* Date and time of digital \
- data generation */
-#define EXIFTAG_COMPONENTSCONFIGURATION 37121 /* Meaning of each component */
-#define EXIFTAG_COMPRESSEDBITSPERPIXEL 37122 /* Image compression mode */
-#define EXIFTAG_SHUTTERSPEEDVALUE 37377 /* Shutter speed */
-#define EXIFTAG_APERTUREVALUE 37378 /* Aperture */
-#define EXIFTAG_BRIGHTNESSVALUE 37379 /* Brightness */
-#define EXIFTAG_EXPOSUREBIASVALUE 37380 /* Exposure bias */
-#define EXIFTAG_MAXAPERTUREVALUE 37381 /* Maximum lens aperture */
-#define EXIFTAG_SUBJECTDISTANCE 37382 /* Subject distance */
-#define EXIFTAG_METERINGMODE 37383 /* Metering mode */
-#define EXIFTAG_LIGHTSOURCE 37384 /* Light source */
-#define EXIFTAG_FLASH 37385 /* Flash */
-#define EXIFTAG_FOCALLENGTH 37386 /* Lens focal length */
-#define EXIFTAG_SUBJECTAREA 37396 /* Subject area */
-#define EXIFTAG_MAKERNOTE 37500 /* Manufacturer notes */
-#define EXIFTAG_USERCOMMENT 37510 /* User comments */
-#define EXIFTAG_SUBSECTIME 37520 /* DateTime subseconds */
-#define EXIFTAG_SUBSECTIMEORIGINAL 37521 /* DateTimeOriginal subseconds */
-#define EXIFTAG_SUBSECTIMEDIGITIZED 37522 /* DateTimeDigitized subseconds */
-#define EXIFTAG_FLASHPIXVERSION 40960 /* Supported Flashpix version */
-#define EXIFTAG_COLORSPACE 40961 /* Color space information */
-#define EXIFTAG_PIXELXDIMENSION 40962 /* Valid image width */
-#define EXIFTAG_PIXELYDIMENSION 40963 /* Valid image height */
-#define EXIFTAG_RELATEDSOUNDFILE 40964 /* Related audio file */
-#define EXIFTAG_FLASHENERGY 41483 /* Flash energy */
-#define EXIFTAG_SPATIALFREQUENCYRESPONSE \
- 41484 /* Spatial frequency response \
- */
-#define EXIFTAG_FOCALPLANEXRESOLUTION 41486 /* Focal plane X resolution */
-#define EXIFTAG_FOCALPLANEYRESOLUTION 41487 /* Focal plane Y resolution */
-#define EXIFTAG_FOCALPLANERESOLUTIONUNIT \
- 41488 /* Focal plane resolution unit \
- */
-#define EXIFTAG_SUBJECTLOCATION 41492 /* Subject location */
-#define EXIFTAG_EXPOSUREINDEX 41493 /* Exposure index */
-#define EXIFTAG_SENSINGMETHOD 41495 /* Sensing method */
-#define EXIFTAG_FILESOURCE 41728 /* File source */
-#define EXIFTAG_SCENETYPE 41729 /* Scene type */
-#define EXIFTAG_CFAPATTERN 41730 /* CFA pattern */
-#define EXIFTAG_CUSTOMRENDERED 41985 /* Custom image processing */
-#define EXIFTAG_EXPOSUREMODE 41986 /* Exposure mode */
-#define EXIFTAG_WHITEBALANCE 41987 /* White balance */
-#define EXIFTAG_DIGITALZOOMRATIO 41988 /* Digital zoom ratio */
-#define EXIFTAG_FOCALLENGTHIN35MMFILM 41989 /* Focal length in 35 mm film */
-#define EXIFTAG_SCENECAPTURETYPE 41990 /* Scene capture type */
-#define EXIFTAG_GAINCONTROL 41991 /* Gain control */
-#define EXIFTAG_CONTRAST 41992 /* Contrast */
-#define EXIFTAG_SATURATION 41993 /* Saturation */
-#define EXIFTAG_SHARPNESS 41994 /* Sharpness */
-#define EXIFTAG_DEVICESETTINGDESCRIPTION \
- 41995 /* Device settings description \
- */
-#define EXIFTAG_SUBJECTDISTANCERANGE 41996 /* Subject distance range */
-#define EXIFTAG_IMAGEUNIQUEID 42016 /* Unique image ID */
+#define EXIFTAG_EXPOSURETIME 33434 /* Exposure time */
+#define EXIFTAG_FNUMBER 33437 /* F number */
+#define EXIFTAG_EXPOSUREPROGRAM 34850 /* Exposure program */
+#define EXIFTAG_SPECTRALSENSITIVITY 34852 /* Spectral sensitivity */
+/* After EXIF 2.2.1 ISOSpeedRatings is named PhotographicSensitivity.
+ In addition, while "Count=Any", only 1 count should be used. */
+#define EXIFTAG_ISOSPEEDRATINGS 34855 /* ISO speed rating */
+#define EXIFTAG_PHOTOGRAPHICSENSITIVITY 34855 /* Photographic Sensitivity (new name for tag 34855) */
+#define EXIFTAG_OECF 34856 /* Optoelectric conversion factor */
+#define EXIFTAG_EXIFVERSION 36864 /* Exif version */
+#define EXIFTAG_DATETIMEORIGINAL 36867 /* Date and time of original data generation */
+#define EXIFTAG_DATETIMEDIGITIZED 36868 /* Date and time of digital data generation */
+#define EXIFTAG_COMPONENTSCONFIGURATION 37121 /* Meaning of each component */
+#define EXIFTAG_COMPRESSEDBITSPERPIXEL 37122 /* Image compression mode */
+#define EXIFTAG_SHUTTERSPEEDVALUE 37377 /* Shutter speed */
+#define EXIFTAG_APERTUREVALUE 37378 /* Aperture */
+#define EXIFTAG_BRIGHTNESSVALUE 37379 /* Brightness */
+#define EXIFTAG_EXPOSUREBIASVALUE 37380 /* Exposure bias */
+#define EXIFTAG_MAXAPERTUREVALUE 37381 /* Maximum lens aperture */
+#define EXIFTAG_SUBJECTDISTANCE 37382 /* Subject distance */
+#define EXIFTAG_METERINGMODE 37383 /* Metering mode */
+#define EXIFTAG_LIGHTSOURCE 37384 /* Light source */
+#define EXIFTAG_FLASH 37385 /* Flash */
+#define EXIFTAG_FOCALLENGTH 37386 /* Lens focal length */
+#define EXIFTAG_SUBJECTAREA 37396 /* Subject area */
+#define EXIFTAG_MAKERNOTE 37500 /* Manufacturer notes */
+#define EXIFTAG_USERCOMMENT 37510 /* User comments */
+#define EXIFTAG_SUBSECTIME 37520 /* DateTime subseconds */
+#define EXIFTAG_SUBSECTIMEORIGINAL 37521 /* DateTimeOriginal subseconds */
+#define EXIFTAG_SUBSECTIMEDIGITIZED 37522 /* DateTimeDigitized subseconds */
+#define EXIFTAG_FLASHPIXVERSION 40960 /* Supported Flashpix version */
+#define EXIFTAG_COLORSPACE 40961 /* Color space information */
+#define EXIFTAG_PIXELXDIMENSION 40962 /* Valid image width */
+#define EXIFTAG_PIXELYDIMENSION 40963 /* Valid image height */
+#define EXIFTAG_RELATEDSOUNDFILE 40964 /* Related audio file */
+#define EXIFTAG_FLASHENERGY 41483 /* Flash energy */
+#define EXIFTAG_SPATIALFREQUENCYRESPONSE 41484 /* Spatial frequency response */
+#define EXIFTAG_FOCALPLANEXRESOLUTION 41486 /* Focal plane X resolution */
+#define EXIFTAG_FOCALPLANEYRESOLUTION 41487 /* Focal plane Y resolution */
+#define EXIFTAG_FOCALPLANERESOLUTIONUNIT 41488 /* Focal plane resolution unit */
+#define EXIFTAG_SUBJECTLOCATION 41492 /* Subject location */
+#define EXIFTAG_EXPOSUREINDEX 41493 /* Exposure index */
+#define EXIFTAG_SENSINGMETHOD 41495 /* Sensing method */
+#define EXIFTAG_FILESOURCE 41728 /* File source */
+#define EXIFTAG_SCENETYPE 41729 /* Scene type */
+#define EXIFTAG_CFAPATTERN 41730 /* CFA pattern */
+#define EXIFTAG_CUSTOMRENDERED 41985 /* Custom image processing */
+#define EXIFTAG_EXPOSUREMODE 41986 /* Exposure mode */
+#define EXIFTAG_WHITEBALANCE 41987 /* White balance */
+#define EXIFTAG_DIGITALZOOMRATIO 41988 /* Digital zoom ratio */
+#define EXIFTAG_FOCALLENGTHIN35MMFILM 41989 /* Focal length in 35 mm film */
+#define EXIFTAG_SCENECAPTURETYPE 41990 /* Scene capture type */
+#define EXIFTAG_GAINCONTROL 41991 /* Gain control */
+#define EXIFTAG_CONTRAST 41992 /* Contrast */
+#define EXIFTAG_SATURATION 41993 /* Saturation */
+#define EXIFTAG_SHARPNESS 41994 /* Sharpness */
+#define EXIFTAG_DEVICESETTINGDESCRIPTION 41995 /* Device settings description */
+#define EXIFTAG_SUBJECTDISTANCERANGE 41996 /* Subject distance range */
+#define EXIFTAG_IMAGEUNIQUEID 42016 /* Unique image ID */
/*--: New for EXIF-Version 2.32, May 2019 ... */
-#define EXIFTAG_SENSITIVITYTYPE \
- 34864 /* The SensitivityType tag indicates which one of the parameters of \
- ISO12232 is the PhotographicSensitivity tag. */
-#define EXIFTAG_STANDARDOUTPUTSENSITIVITY \
- 34865 /* This tag indicates the standard output sensitivity value of a \
- camera or input device defined in ISO 12232. */
-#define EXIFTAG_RECOMMENDEDEXPOSUREINDEX \
- 34866 /* recommended exposure index \
- */
-#define EXIFTAG_ISOSPEED 34867 /* ISO speed value */
-#define EXIFTAG_ISOSPEEDLATITUDEYYY 34868 /* ISO speed latitude yyy */
-#define EXIFTAG_ISOSPEEDLATITUDEZZZ 34869 /* ISO speed latitude zzz */
-#define EXIFTAG_OFFSETTIME \
- 36880 /* offset from UTC of the time of DateTime tag. */
-#define EXIFTAG_OFFSETTIMEORIGINAL \
- 36881 /* offset from UTC of the time of DateTimeOriginal tag. */
-#define EXIFTAG_OFFSETTIMEDIGITIZED \
- 36882 /* offset from UTC of the time of DateTimeDigitized tag. */
-#define EXIFTAG_TEMPERATURE \
- 37888 /* Temperature as the ambient situation at the shot in dergee \
- Celsius */
-#define EXIFTAG_HUMIDITY \
- 37889 /* Humidity as the ambient situation at the shot in percent */
-#define EXIFTAG_PRESSURE \
- 37890 /* Pressure as the ambient situation at the shot hecto-Pascal (hPa) \
- */
-#define EXIFTAG_WATERDEPTH \
- 37891 /* WaterDepth as the ambient situation at the shot in meter (m) */
-#define EXIFTAG_ACCELERATION \
- 37892 /* Acceleration (a scalar regardless of direction) as the ambient \
- situation at the shot in units of mGal (10-5 m/s^2) */
-#define EXIFTAG_CAMERAELEVATIONANGLE \
- 37893 /* Elevation/depression. angle of the orientation of the \
- camera(imaging optical axis) as the ambient situation at the shot \
- in degree from -180deg to +180deg. */
-#define EXIFTAG_CAMERAOWNERNAME 42032 /* owner of a camera */
-#define EXIFTAG_BODYSERIALNUMBER \
- 42033 /* serial number of the body of the camera */
-#define EXIFTAG_LENSSPECIFICATION \
- 42034 /* minimum focal length (in mm), maximum focal length (in mm), \
- minimum F number in the minimum focal length, and minimum F \
- number in the maximum focal length, */
-#define EXIFTAG_LENSMAKE 42035 /* the lens manufacturer */
-#define EXIFTAG_LENSMODEL 42036 /* the lens model name and model number */
-#define EXIFTAG_LENSSERIALNUMBER \
- 42037 /* the serial number of the interchangeable lens */
-#define EXIFTAG_GAMMA 42240 /* value of coefficient gamma */
-#define EXIFTAG_COMPOSITEIMAGE 42080 /* composite image */
-#define EXIFTAG_SOURCEIMAGENUMBEROFCOMPOSITEIMAGE \
- 42081 /* source image number of composite image */
-#define EXIFTAG_SOURCEEXPOSURETIMESOFCOMPOSITEIMAGE \
- 42082 /* source exposure times of composite image */
+#define EXIFTAG_SENSITIVITYTYPE 34864 /* The SensitivityType tag indicates which one of the parameters of ISO12232 is the PhotographicSensitivity tag. */
+#define EXIFTAG_STANDARDOUTPUTSENSITIVITY 34865 /* This tag indicates the standard output sensitivity value of a camera or input device defined in ISO 12232. */
+#define EXIFTAG_RECOMMENDEDEXPOSUREINDEX 34866 /* recommended exposure index */
+#define EXIFTAG_ISOSPEED 34867 /* ISO speed value */
+#define EXIFTAG_ISOSPEEDLATITUDEYYY 34868 /* ISO speed latitude yyy */
+#define EXIFTAG_ISOSPEEDLATITUDEZZZ 34869 /* ISO speed latitude zzz */
+#define EXIFTAG_OFFSETTIME 36880 /* offset from UTC of the time of DateTime tag. */
+#define EXIFTAG_OFFSETTIMEORIGINAL 36881 /* offset from UTC of the time of DateTimeOriginal tag. */
+#define EXIFTAG_OFFSETTIMEDIGITIZED 36882 /* offset from UTC of the time of DateTimeDigitized tag. */
+#define EXIFTAG_TEMPERATURE 37888 /* Temperature as the ambient situation at the shot in dergee Celsius */
+#define EXIFTAG_HUMIDITY 37889 /* Humidity as the ambient situation at the shot in percent */
+#define EXIFTAG_PRESSURE 37890 /* Pressure as the ambient situation at the shot hecto-Pascal (hPa) */
+#define EXIFTAG_WATERDEPTH 37891 /* WaterDepth as the ambient situation at the shot in meter (m) */
+#define EXIFTAG_ACCELERATION 37892 /* Acceleration (a scalar regardless of direction) as the ambientsituation at the shot in units of mGal (10-5 m/s^2) */
+/* EXIFTAG_CAMERAELEVATIONANGLE: Elevation/depression. angle of the orientation of the camera(imaging optical axis)
+ * as the ambient situation at the shot in degree from -180deg to +180deg. */
+#define EXIFTAG_CAMERAELEVATIONANGLE 37893
+#define EXIFTAG_CAMERAOWNERNAME 42032 /* owner of a camera */
+#define EXIFTAG_BODYSERIALNUMBER 42033 /* serial number of the body of the camera */
+/* EXIFTAG_LENSSPECIFICATION: minimum focal length (in mm), maximum focal length (in mm),minimum F number in the minimum focal length,
+ * and minimum F number in the maximum focal length, */
+#define EXIFTAG_LENSSPECIFICATION 42034
+#define EXIFTAG_LENSMAKE 42035 /* the lens manufacturer */
+#define EXIFTAG_LENSMODEL 42036 /* the lens model name and model number */
+#define EXIFTAG_LENSSERIALNUMBER 42037 /* the serial number of the interchangeable lens */
+#define EXIFTAG_GAMMA 42240 /* value of coefficient gamma */
+#define EXIFTAG_COMPOSITEIMAGE 42080 /* composite image */
+#define EXIFTAG_SOURCEIMAGENUMBEROFCOMPOSITEIMAGE 42081 /* source image number of composite image */
+#define EXIFTAG_SOURCEEXPOSURETIMESOFCOMPOSITEIMAGE 42082 /* source exposure times of composite image */
/*
* EXIF-GPS tags (Version 2.31, July 2016)
*/
-#define GPSTAG_VERSIONID 0 /* Indicates the version of GPSInfoIFD. */
-#define GPSTAG_LATITUDEREF \
- 1 /* Indicates whether the latitude is north or south latitude. \
- */
-#define GPSTAG_LATITUDE 2 /* Indicates the latitude. */
-#define GPSTAG_LONGITUDEREF \
- 3 /* Indicates whether the longitude is east or west longitude. \
- */
-#define GPSTAG_LONGITUDE 4 /* Indicates the longitude. */
-#define GPSTAG_ALTITUDEREF \
- 5 /* Indicates the altitude used as the reference altitude. */
-#define GPSTAG_ALTITUDE \
- 6 /* Indicates the altitude based on the reference in \
- GPSAltitudeRef. */
-#define GPSTAG_TIMESTAMP \
- 7 /* Indicates the time as UTC (Coordinated Universal Time). */
-#define GPSTAG_SATELLITES \
- 8 /* Indicates the GPS satellites used for measurements. */
-#define GPSTAG_STATUS \
- 9 /* Indicates the status of the GPS receiver when the image is \
- recorded. */
-#define GPSTAG_MEASUREMODE \
- 10 /* Indicates the GPS measurement mode. */
-#define GPSTAG_DOP \
- 11 /* Indicates the GPS DOP (data degree of precision). */
-#define GPSTAG_SPEEDREF \
- 12 /* Indicates the unit used to express the GPS receiver speed of \
- movement. */
-#define GPSTAG_SPEED \
- 13 /* Indicates the speed of GPS receiver movement. */
-#define GPSTAG_TRACKREF \
- 14 /* Indicates the reference for giving the direction of GPS \
- receiver movement. */
-#define GPSTAG_TRACK \
- 15 /* Indicates the direction of GPS receiver movement. */
-#define GPSTAG_IMGDIRECTIONREF \
- 16 /* Indicates the reference for giving the direction of the image \
- when it is captured. */
-#define GPSTAG_IMGDIRECTION \
- 17 /* Indicates the direction of the image when it was captured. \
- */
-#define GPSTAG_MAPDATUM \
- 18 /* Indicates the geodetic survey data used by the GPS receiver. \
- (e.g. WGS-84) */
-#define GPSTAG_DESTLATITUDEREF \
- 19 /* Indicates whether the latitude of the destination point is \
- north or south latitude. */
-#define GPSTAG_DESTLATITUDE \
- 20 /* Indicates the latitude of the destination point. */
-#define GPSTAG_DESTLONGITUDEREF \
- 21 /* Indicates whether the longitude of the destination point is \
- east or west longitude. */
-#define GPSTAG_DESTLONGITUDE \
- 22 /* Indicates the longitude of the destination point. */
-#define GPSTAG_DESTBEARINGREF \
- 23 /* Indicates the reference used for giving the bearing to the \
- destination point. */
-#define GPSTAG_DESTBEARING \
- 24 /* Indicates the bearing to the destination point. */
-#define GPSTAG_DESTDISTANCEREF \
- 25 /* Indicates the unit used to express the distance to the \
- destination point. */
-#define GPSTAG_DESTDISTANCE \
- 26 /* Indicates the distance to the destination point. */
-#define GPSTAG_PROCESSINGMETHOD \
- 27 /* A character string recording the name of the method used for \
- location finding. */
-#define GPSTAG_AREAINFORMATION \
- 28 /* A character string recording the name of the GPS area. */
-#define GPSTAG_DATESTAMP \
- 29 /* A character string recording date and time information \
- relative to UTC (Coordinated Universal Time). */
-#define GPSTAG_DIFFERENTIAL \
- 30 /* Indicates whether differential correction is applied to the \
- GPS receiver. */
-#define GPSTAG_GPSHPOSITIONINGERROR \
- 31 /* Indicates horizontal positioning errors in meters. */
+#define GPSTAG_VERSIONID 0 /* Indicates the version of GPSInfoIFD. */
+#define GPSTAG_LATITUDEREF 1 /* Indicates whether the latitude is north or south latitude. */
+#define GPSTAG_LATITUDE 2 /* Indicates the latitude. */
+#define GPSTAG_LONGITUDEREF 3 /* Indicates whether the longitude is east or west longitude. */
+#define GPSTAG_LONGITUDE 4 /* Indicates the longitude. */
+#define GPSTAG_ALTITUDEREF 5 /* Indicates the altitude used as the reference altitude. */
+#define GPSTAG_ALTITUDE 6 /* Indicates the altitude based on the reference in GPSAltitudeRef. */
+#define GPSTAG_TIMESTAMP 7 /*Indicates the time as UTC (Coordinated Universal Time). */
+#define GPSTAG_SATELLITES 8 /*Indicates the GPS satellites used for measurements. */
+#define GPSTAG_STATUS 9 /* Indicates the status of the GPS receiver when the image is recorded. */
+#define GPSTAG_MEASUREMODE 10 /* Indicates the GPS measurement mode. */
+#define GPSTAG_DOP 11 /* Indicates the GPS DOP (data degree of precision). */
+#define GPSTAG_SPEEDREF 12 /* Indicates the unit used to express the GPS receiver speed of movement. */
+#define GPSTAG_SPEED 13 /* Indicates the speed of GPS receiver movement. */
+#define GPSTAG_TRACKREF 14 /* Indicates the reference for giving the direction of GPS receiver movement. */
+#define GPSTAG_TRACK 15 /* Indicates the direction of GPS receiver movement. */
+#define GPSTAG_IMGDIRECTIONREF 16 /* Indicates the reference for giving the direction of the image when it is captured. */
+#define GPSTAG_IMGDIRECTION 17 /* Indicates the direction of the image when it was captured. */
+#define GPSTAG_MAPDATUM 18 /* Indicates the geodetic survey data used by the GPS receiver. (e.g. WGS-84) */
+#define GPSTAG_DESTLATITUDEREF 19 /* Indicates whether the latitude of the destination point is north or south latitude. */
+#define GPSTAG_DESTLATITUDE 20 /* Indicates the latitude of the destination point. */
+#define GPSTAG_DESTLONGITUDEREF 21 /* Indicates whether the longitude of the destination point is east or west longitude. */
+#define GPSTAG_DESTLONGITUDE 22 /* Indicates the longitude of the destination point. */
+#define GPSTAG_DESTBEARINGREF 23 /* Indicates the reference used for giving the bearing to the destination point. */
+#define GPSTAG_DESTBEARING 24 /* Indicates the bearing to the destination point. */
+#define GPSTAG_DESTDISTANCEREF 25 /* Indicates the unit used to express the distance to the destination point. */
+#define GPSTAG_DESTDISTANCE 26 /* Indicates the distance to the destination point. */
+#define GPSTAG_PROCESSINGMETHOD 27 /* A character string recording the name of the method used for location finding. */
+#define GPSTAG_AREAINFORMATION 28 /* A character string recording the name of the GPS area. */
+#define GPSTAG_DATESTAMP 29 /* A character string recording date and time information relative to UTC (Coordinated Universal Time). */
+#define GPSTAG_DIFFERENTIAL 30 /* Indicates whether differential correction is applied to the GPS receiver. */
+#define GPSTAG_GPSHPOSITIONINGERROR 31 /* Indicates horizontal positioning errors in meters. */
#endif /* _TIFF_ */
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tiffconf.h.cmake.in b/qtimageformats/src/3rdparty/libtiff/libtiff/tiffconf.h.cmake.in
index 5afbf3b..306874f 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tiffconf.h.cmake.in
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tiffconf.h.cmake.in
@@ -4,6 +4,12 @@
from this file in your programs.
*/
+/* clang-format off */
+/* clang-format disabled because CMake scripts are very sensitive to the
+ * formatting of this file. configure_file variables of type "@VAR@" are
+ * modified by clang-format and won't be substituted.
+ */
+
#ifndef _TIFFCONF_
#define _TIFFCONF_
@@ -46,8 +52,17 @@
machine */
#cmakedefine HAVE_IEEEFP 1
-/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
-#define HOST_FILLORDER @HOST_FILLORDER@
+/* The concept of HOST_FILLORDER is broken. Since libtiff 4.5.1
+ * this macro will always be hardcoded to FILLORDER_LSB2MSB on all
+ * architectures, to reflect past long behavior of doing so on x86 architecture.
+ * Note however that the default FillOrder used by libtiff is FILLORDER_MSB2LSB,
+ * as mandated per the TIFF specification.
+ * The influence of HOST_FILLORDER is only when passing the 'H' mode in
+ * TIFFOpen().
+ * You should NOT rely on this macro to decide the CPU endianness!
+ * This macro will be removed in libtiff 4.6
+ */
+#define HOST_FILLORDER FILLORDER_LSB2MSB
/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
(Intel) */
@@ -125,3 +140,5 @@
#define IPTC_SUPPORT
#endif /* _TIFFCONF_ */
+
+/* clang-format on */
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tiffconf.h.in b/qtimageformats/src/3rdparty/libtiff/libtiff/tiffconf.h.in
index 6703eb0..ab01735 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tiffconf.h.in
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tiffconf.h.in
@@ -4,6 +4,12 @@
from this file in your programs.
*/
+/* clang-format off */
+/* clang-format disabled because CMake scripts are very sensitive to the
+ * formatting of this file. configure_file variables of type "@VAR@" are
+ * modified by clang-format and won't be substituted.
+ */
+
#ifndef _TIFFCONF_
#define _TIFFCONF_
@@ -46,8 +52,17 @@
machine */
#undef HAVE_IEEEFP
-/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
-#undef HOST_FILLORDER
+/* The concept of HOST_FILLORDER is broken. Since libtiff 4.5.1
+ * this macro will always be hardcoded to FILLORDER_LSB2MSB on all
+ * architectures, to reflect past long behavior of doing so on x86 architecture.
+ * Note however that the default FillOrder used by libtiff is FILLORDER_MSB2LSB,
+ * as mandated per the TIFF specification.
+ * The influence of HOST_FILLORDER is only when passing the 'H' mode in
+ * TIFFOpen().
+ * You should NOT rely on this macro to decide the CPU endianness!
+ * This macro will be removed in libtiff 4.6
+ */
+#define HOST_FILLORDER FILLORDER_LSB2MSB
/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
(Intel) */
@@ -125,3 +140,5 @@
#define IPTC_SUPPORT
#endif /* _TIFFCONF_ */
+
+/* clang-format on */
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tiffio.h b/qtimageformats/src/3rdparty/libtiff/libtiff/tiffio.h
index 4df5766..2046054 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tiffio.h
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tiffio.h
@@ -263,6 +263,12 @@ typedef struct
TIFFInitMethod init;
} TIFFCodec;
+typedef struct
+{
+ uint32_t uNum;
+ uint32_t uDenom;
+} TIFFRational_t;
+
#include <stdarg.h>
#include <stdio.h>
@@ -271,7 +277,7 @@ typedef struct
#define LOGLUV_PUBLIC 1
#endif
-#if defined(__GNUC__) || defined(__attribute__)
+#if defined(__GNUC__) || defined(__clang__) || defined(__attribute__)
#define TIFF_ATTRIBUTE(x) __attribute__(x)
#else
#define TIFF_ATTRIBUTE(x) /*nothing*/
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tiffiop.h b/qtimageformats/src/3rdparty/libtiff/libtiff/tiffiop.h
index 791881a..fbf7b07 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tiffiop.h
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tiffiop.h
@@ -143,15 +143,14 @@ struct tiff
#define TIFF_CHOPPEDUPARRAYS \
0x4000000U /* set when allocChoppedUpStripArrays() has modified strip \
array */
- uint64_t tif_diroff; /* file offset of current directory */
- uint64_t tif_nextdiroff; /* file offset of following directory */
- uint64_t tif_lastdiroff; /* file offset of last directory written so far */
- uint64_t *tif_dirlistoff; /* list of offsets to already seen directories to
- prevent IFD looping */
+ uint64_t tif_diroff; /* file offset of current directory */
+ uint64_t tif_nextdiroff; /* file offset of following directory */
+ uint64_t tif_lastdiroff; /* file offset of last directory written so far */
TIFFHashSet *tif_map_dir_offset_to_number;
TIFFHashSet *tif_map_dir_number_to_offset;
- tdir_t tif_dirnumber; /* number of already seen directories */
- TIFFDirectory tif_dir; /* internal rep of current directory */
+ int tif_setdirectory_force_absolute; /* switch between relative and absolute
+ stepping in TIFFSetDirectory() */
+ TIFFDirectory tif_dir; /* internal rep of current directory */
TIFFDirectory
tif_customdir; /* custom IFDs are separated from the main ones */
union
@@ -444,6 +443,8 @@ extern "C"
extern float _TIFFClampDoubleToFloat(double);
extern uint32_t _TIFFClampDoubleToUInt32(double);
+ extern void _TIFFCleanupIFDOffsetAndNumberMaps(TIFF *tif);
+
extern tmsize_t _TIFFReadEncodedStripAndAllocBuffer(TIFF *tif,
uint32_t strip,
void **buf,
diff --git a/qtimageformats/src/3rdparty/libtiff/libtiff/tiffvers.h b/qtimageformats/src/3rdparty/libtiff/libtiff/tiffvers.h
index 552e885..892e9a0 100644
--- a/qtimageformats/src/3rdparty/libtiff/libtiff/tiffvers.h
+++ b/qtimageformats/src/3rdparty/libtiff/libtiff/tiffvers.h
@@ -1,9 +1,14 @@
+/* tiffvers.h version information is updated according to version information
+ * in configure.ac */
+
/* clang-format off */
/* clang-format disabled because FindTIFF.cmake is very sensitive to the
* formatting of below line being a single line.
+ * Furthermore, configure_file variables of type "@VAR@" are
+ * modified by clang-format and won't be substituted by CMake.
*/
-#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.5.0\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
+#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.6.0\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
/*
* This define can be used in code that requires
* compilation-related definitions specific to a
@@ -11,12 +16,13 @@
* version checking should be done based on the
* string returned by TIFFGetVersion.
*/
-#define TIFFLIB_VERSION 20221213
+#define TIFFLIB_VERSION 20230908
/* The following defines have been added in 4.5.0 */
#define TIFFLIB_MAJOR_VERSION 4
-#define TIFFLIB_MINOR_VERSION 5
+#define TIFFLIB_MINOR_VERSION 6
#define TIFFLIB_MICRO_VERSION 0
+#define TIFFLIB_VERSION_STR_MAJ_MIN_MIC "4.6.0"
/* Macro added in 4.5.0. Returns TRUE if the current libtiff version is
* greater or equal to major.minor.micro
diff --git a/qtimageformats/src/3rdparty/libtiff/qt_attribution.json b/qtimageformats/src/3rdparty/libtiff/qt_attribution.json
index 7787e89..1da529c 100644
--- a/qtimageformats/src/3rdparty/libtiff/qt_attribution.json
+++ b/qtimageformats/src/3rdparty/libtiff/qt_attribution.json
@@ -6,7 +6,7 @@
"Description": "",
"Homepage": "http://www.simplesystems.org/libtiff/",
- "Version": "4.5.0",
+ "Version": "4.6.0",
"License": "libtiff License",
"LicenseId": "libtiff",
"LicenseFile": "COPYRIGHT",
diff --git a/qtimageformats/src/3rdparty/libwebp/AUTHORS b/qtimageformats/src/3rdparty/libwebp/AUTHORS
index 2f0c537..8359b20 100644
--- a/qtimageformats/src/3rdparty/libwebp/AUTHORS
+++ b/qtimageformats/src/3rdparty/libwebp/AUTHORS
@@ -32,6 +32,7 @@ Contributors:
- Mislav Bradac (mislavm at google dot com)
- Nico Weber (thakis at chromium dot org)
- Noel Chromium (noel at chromium dot org)
+- Nozomi Isozaki (nontan at pixiv dot co dot jp)
- Oliver Wolff (oliver dot wolff at qt dot io)
- Owen Rodley (orodley at google dot com)
- Parag Salasakar (img dot mips1 at gmail dot com)
@@ -47,6 +48,7 @@ Contributors:
- Somnath Banerjee (somnath dot banerjee at gmail dot com)
- Sriraman Tallam (tmsriram at google dot com)
- Tamar Levy (tamar dot levy at intel dot com)
+- Thiago Perrotta (tperrotta at google dot com)
- Timothy Gu (timothygu99 at gmail dot com)
- Urvang Joshi (urvang at google dot com)
- Vikas Arora (vikasa at google dot com)
diff --git a/qtimageformats/src/3rdparty/libwebp/ChangeLog b/qtimageformats/src/3rdparty/libwebp/ChangeLog
index 00ef617..33ec486 100644
--- a/qtimageformats/src/3rdparty/libwebp/ChangeLog
+++ b/qtimageformats/src/3rdparty/libwebp/ChangeLog
@@ -1,3 +1,82 @@
+1ace578c update NEWS
+63234c42 bump version to 1.3.2
+2af26267 Fix OOB write in BuildHuffmanTable.
+fd7bb21c update ChangeLog (tag: v1.3.1-rc2, tag: v1.3.1)
+e1adea50 update NEWS
+43393320 enc/*: normalize WebPEncodingSetError() calls
+287fdefe enc/*: add missing WebPEncodingSetError() calls
+c3bd7cff EncodeAlphaInternal: add missing error check
+d49cfbb3 vp8l_enc,WriteImage: add missing error check
+2e5a9ec3 muxread,MuxImageParse: add missing error checks
+ebb6f949 cmake,emscripten: explicitly set stack size
+59a2b1f9 WebPDecodeYUV: check u/v/stride/uv_stride ptrs
+8e965ccb Call png_get_channels() to see if image has alpha
+7f0a3419 update ChangeLog (tag: v1.3.1-rc1)
+bab7efbe update NEWS
+7138bf8f bump version to 1.3.1
+435b4ded update AUTHORS
+47351229 update .mailmap
+ff6c7f4e CONTRIBUTING.md: add C style / cmake-format notes
+dd530437 add .cmake-format.py
+adbe2cb1 cmake,cosmetics: apply cmake-format
+15b36508 doc/webp-container-spec: rm future codec comment
+c369c4bf doc/webp-lossless-bitstream-spec: improve link text
+1de35f47 doc/webp-container-spec: don't use 'currently'
+bb06a16e doc/webp-container-spec: prefer present tense
+9f38b71e doc/webp-lossless-bitstream-spec: prefer present tense
+7acb6b82 doc/webp-container-spec: avoid i.e. & e.g.
+4967e7cd doc/webp-lossless-bitstream-spec: avoid i.e. & e.g.
+e3366659 Merge "Do not find_package image libraries if not needed." into main
+428588ef clarify single leaf node trees and use of canonical prefix coding
+709ec152 Do not find_package image libraries if not needed.
+8dd80ef8 fuzz_utils.h: lower kFuzzPxLimit w/ASan
+8f187b9f Clean message calls in CMake
+cba30078 WebPConfig.cmake.in: use calculated include path
+6cf9a76a Merge "webp-lossless-bitstream-spec: remove use of 'dynamics'" into main
+740943b2 Merge "Specialize and optimize ITransform_SSE2 using do_two" into main
+2d547e24 Compare kFuzzPxLimit to max_num_operations
+ac42dde1 Specialize and optimize ITransform_SSE2 using do_two
+17e0ef1d webp-lossless-bitstream-spec: remove use of 'dynamics'
+ed274371 neon.h,cosmetics: clear a couple lint warnings
+3fb82947 cpu.h,cosmetics: segment defines
+0c496a4f cpu.h: add WEBP_AARCH64
+8151f388 move VP8GetCPUInfo declaration to cpu.c
+916548c2 Make kFuzzPxLimit sanitizer dependent
+4070b271 advanced_api_fuzzer: reduce scaling limit
+761f49c3 Merge "webp-lossless-bitstream-spec: add missing bits to ABNF" into main
+84d04c48 webp-lossless-bitstream-spec: add missing bits to ABNF
+0696e1a7 advanced_api_fuzzer: reduce scaling limit
+93d88aa2 Merge "deps.cmake: remove unneeded header checks" into main
+118e0035 deps.cmake: remove unneeded header checks
+4c3d7018 webp-lossless-bitstream-spec: condense normal-prefix-code
+a6a09b32 webp-lossless-bitstream-spec: fix 2 code typos
+50ac4f7c Merge "cpu.h: enable NEON w/_M_ARM64EC" into main
+4b7d7b4f Add contribution instructions
+0afbd97b cpu.h: enable NEON w/_M_ARM64EC
+349f4353 Merge changes Ibd89e56b,Ic57e7f84,I89096614 into main
+8f7513b7 upsampling_neon.c: fix WEBP_SWAP_16BIT_CSP check
+cbf624b5 advanced_api_fuzzer: reduce scaling limit
+89edfdd1 Skip slow scaling in libwebp advanced_api_fuzzer
+859f19f7 Reduce libwebp advanced_api_fuzzer threshold
+a4f04835 Merge changes Ic389aaa2,I329ccd79 into main
+1275fac8 Makefile.vc: fix img2webp link w/dynamic cfg
+2fe27bb9 img2webp: normalize help output
+24bed3d9 cwebp: reflow -near_lossless help text
+0825faa4 img2webp: add -sharp_yuv/-near_lossless
+d64e6d7d Merge "PaletteSortModifiedZeng: fix leak on error" into main
+0e12a22d Merge "EncodeAlphaInternal: clear result->bw on error" into main
+0edbb6ea PaletteSortModifiedZeng: fix leak on error
+41ffe04e Merge "Update yapf style from "chromium" to "yapf"" into main
+2d9d9265 Update yapf style from "chromium" to "yapf"
+a486d800 EncodeAlphaInternal: clear result->bw on error
+1347a32d Skip big scaled advanced_api_fuzzer
+52b6f067 Fix scaling limit in advanced_api_fuzzer.c
+73618428 Limit scaling in libwebp advanced_api_fuzzer.c
+b54d21a0 Merge "CMakeLists.txt: allow CMAKE_INSTALL_RPATH to be set empty" into main
+31c28db5 libwebp{,demux,mux}.pc.in: Requires -> Requires.private
+d9a505ff CMakeLists.txt: allow CMAKE_INSTALL_RPATH to be set empty
+bdf33d03 Merge tag 'v1.3.0'
+b5577769 update ChangeLog (tag: v1.3.0-rc1, tag: v1.3.0)
0ba77244 update NEWS
e763eb1e bump version to 1.3.0
2a8686fc update AUTHORS
@@ -103,7 +182,7 @@ c626e7d5 cwebp: fix WebPPictureHasTransparency call
866e349c Merge tag 'v1.2.4'
c170df38 Merge "Create libsharpyuv.a in makefile.unix." into main
9d7ff74a Create libsharpyuv.a in makefile.unix.
-0d1f1254 update ChangeLog (tag: v1.2.4, origin/1.2.4)
+0d1f1254 update ChangeLog (tag: v1.2.4)
fcbc2d78 Merge "doc/*.txt: restrict code to 69 columns" into main
4ad0e189 Merge "webp-container-spec.txt: normalize fourcc spelling" into main
980d2488 update NEWS
diff --git a/qtimageformats/src/3rdparty/libwebp/NEWS b/qtimageformats/src/3rdparty/libwebp/NEWS
index c4f8ef7..47f8451 100644
--- a/qtimageformats/src/3rdparty/libwebp/NEWS
+++ b/qtimageformats/src/3rdparty/libwebp/NEWS
@@ -1,3 +1,22 @@
+- 9/13/2023: version 1.3.2
+ This is a binary compatible release.
+ * security fix for lossless decoder (chromium: #1479274, CVE-2023-4863)
+
+- 6/23/2023: version 1.3.1
+ This is a binary compatible release.
+ * security fixes for lossless encoder (#603, chromium: #1420107, #1455619,
+ CVE-2023-1999)
+ * improve error reporting through WebPPicture error codes
+ * fix upsampling for RGB565 and RGBA4444 in NEON builds
+ * img2webp: add -sharp_yuv & -near_lossless
+ * Windows builds:
+ - fix compatibility with clang-cl (#607)
+ - improve Arm64 performance with cl.exe
+ - add Arm64EC support
+ * fix webp_js with emcc >= 3.1.27 (stack size change, #614)
+ * CMake fixes (#592, #610, #612)
+ * further updates to the container and lossless bitstream docs (#581, #611)
+
- 12/16/2022: version 1.3.0
This is a binary compatible release.
* add libsharpyuv, which exposes -sharp_yuv/config.use_sharp_yuv
diff --git a/qtimageformats/src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch b/qtimageformats/src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch
index 2b46f5b..d721476 100644
--- a/qtimageformats/src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch
+++ b/qtimageformats/src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch
@@ -1,5 +1,5 @@
diff --git a/src/3rdparty/libwebp/src/dsp/cpu.h b/src/3rdparty/libwebp/src/dsp/cpu.h
-index 57a40d8..8cf3e92 100644
+index c86540f..581ecbd 100644
--- a/src/3rdparty/libwebp/src/dsp/cpu.h
+++ b/src/3rdparty/libwebp/src/dsp/cpu.h
@@ -14,6 +14,8 @@
@@ -8,10 +8,10 @@ index 57a40d8..8cf3e92 100644
+#include <qglobal.h>
+
+ #include <stddef.h>
+
#ifdef HAVE_CONFIG_H
- #include "src/webp/config.h"
- #endif
-@@ -43,12 +45,12 @@
+@@ -48,12 +50,12 @@
#if !defined(HAVE_CONFIG_H)
#if defined(_MSC_VER) && _MSC_VER > 1310 && \
@@ -26,13 +26,13 @@ index 57a40d8..8cf3e92 100644
#define WEBP_MSC_SSE41 // Visual C++ SSE4.1 targets
#endif
#endif
-@@ -97,7 +99,8 @@
- // arm_neon.h. Compile errors were seen with Visual Studio 2019 16.4 with
+@@ -106,7 +108,8 @@
// vtbl4_u8(); a fix was made in 16.6.
- #if defined(_MSC_VER) && ((_MSC_VER >= 1700 && defined(_M_ARM)) || \
-- (_MSC_VER >= 1926 && defined(_M_ARM64)))
-+ (_MSC_VER >= 1926 && defined(_M_ARM64))) && \
-+ !defined(__clang__) && (QT_CONFIG_neon == 1)
+ #if defined(_MSC_VER) && \
+ ((_MSC_VER >= 1700 && defined(_M_ARM)) || \
+- (_MSC_VER >= 1926 && (defined(_M_ARM64) || defined(_M_ARM64EC))))
++ (_MSC_VER >= 1926 && (defined(_M_ARM64) || defined(_M_ARM64EC)))) && \
++ !defined(__clang__) && (QT_CONFIG_neon == 1)
#define WEBP_USE_NEON
#define WEBP_USE_INTRINSICS
#endif
diff --git a/qtimageformats/src/3rdparty/libwebp/qt_attribution.json b/qtimageformats/src/3rdparty/libwebp/qt_attribution.json
index 258f7ff..d186c36 100644
--- a/qtimageformats/src/3rdparty/libwebp/qt_attribution.json
+++ b/qtimageformats/src/3rdparty/libwebp/qt_attribution.json
@@ -6,7 +6,7 @@
"Description": "WebP is a new image format that provides lossless and lossy compression for images on the web.",
"Homepage": "https://developers.google.com/speed/webp/",
- "Version": "1.3.0",
+ "Version": "1.3.2",
"License": "BSD 3-clause \"New\" or \"Revised\" License",
"LicenseId": "BSD-3-Clause",
"LicenseFile": "COPYING",
diff --git a/qtimageformats/src/3rdparty/libwebp/sharpyuv/sharpyuv.c b/qtimageformats/src/3rdparty/libwebp/sharpyuv/sharpyuv.c
index 7de34fb..a074564 100644
--- a/qtimageformats/src/3rdparty/libwebp/sharpyuv/sharpyuv.c
+++ b/qtimageformats/src/3rdparty/libwebp/sharpyuv/sharpyuv.c
@@ -440,6 +440,7 @@ static int DoSharpArgbToYuv(const uint8_t* r_ptr, const uint8_t* g_ptr,
// By default SharpYuvConvert calls it with SharpYuvGetCPUInfo. If needed,
// users can declare it as extern and call it with an alternate VP8CPUInfo
// function.
+extern VP8CPUInfo SharpYuvGetCPUInfo;
SHARPYUV_EXTERN void SharpYuvInit(VP8CPUInfo cpu_info_func);
void SharpYuvInit(VP8CPUInfo cpu_info_func) {
static volatile VP8CPUInfo sharpyuv_last_cpuinfo_used =
diff --git a/qtimageformats/src/3rdparty/libwebp/sharpyuv/sharpyuv.h b/qtimageformats/src/3rdparty/libwebp/sharpyuv/sharpyuv.h
index 181b20a..7b9904d 100644
--- a/qtimageformats/src/3rdparty/libwebp/sharpyuv/sharpyuv.h
+++ b/qtimageformats/src/3rdparty/libwebp/sharpyuv/sharpyuv.h
@@ -37,7 +37,7 @@ extern "C" {
// SharpYUV API version following the convention from semver.org
#define SHARPYUV_VERSION_MAJOR 0
#define SHARPYUV_VERSION_MINOR 2
-#define SHARPYUV_VERSION_PATCH 0
+#define SHARPYUV_VERSION_PATCH 1
// Version as a uint32_t. The major number is the high 8 bits.
// The minor number is the middle 8 bits. The patch number is the low 16 bits.
#define SHARPYUV_MAKE_VERSION(MAJOR, MINOR, PATCH) \
diff --git a/qtimageformats/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.c b/qtimageformats/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.c
index 31c272c..0da3efc 100644
--- a/qtimageformats/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.c
+++ b/qtimageformats/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.c
@@ -72,6 +72,7 @@ void (*SharpYuvFilterRow)(const int16_t* A, const int16_t* B, int len,
const uint16_t* best_y, uint16_t* out,
int bit_depth);
+extern VP8CPUInfo SharpYuvGetCPUInfo;
extern void InitSharpYuvSSE2(void);
extern void InitSharpYuvNEON(void);
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dec/tree_dec.c b/qtimageformats/src/3rdparty/libwebp/src/dec/tree_dec.c
index 1c6fdea..2434605 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dec/tree_dec.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dec/tree_dec.c
@@ -12,10 +12,11 @@
// Author: Skal (pascal.massimino@gmail.com)
#include "src/dec/vp8i_dec.h"
+#include "src/dsp/cpu.h"
#include "src/utils/bit_reader_inl_utils.h"
#if !defined(USE_GENERIC_TREE)
-#if !defined(__arm__) && !defined(_M_ARM) && !defined(__aarch64__)
+#if !defined(__arm__) && !defined(_M_ARM) && !WEBP_AARCH64
// using a table is ~1-2% slower on ARM. Prefer the coded-tree approach then.
#define USE_GENERIC_TREE 1 // ALTERNATE_CODE
#else
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dec/vp8_dec.c b/qtimageformats/src/3rdparty/libwebp/src/dec/vp8_dec.c
index 2003935..20b92e8 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dec/vp8_dec.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dec/vp8_dec.c
@@ -494,6 +494,8 @@ static int GetCoeffsAlt(VP8BitReader* const br,
return 16;
}
+extern VP8CPUInfo VP8GetCPUInfo;
+
WEBP_DSP_INIT_FUNC(InitGetCoeffs) {
if (VP8GetCPUInfo != NULL && VP8GetCPUInfo(kSlowSSSE3)) {
GetCoeffs = GetCoeffsAlt;
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dec/vp8i_dec.h b/qtimageformats/src/3rdparty/libwebp/src/dec/vp8i_dec.h
index 83791ec..7929fd7 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dec/vp8i_dec.h
+++ b/qtimageformats/src/3rdparty/libwebp/src/dec/vp8i_dec.h
@@ -32,7 +32,7 @@ extern "C" {
// version numbers
#define DEC_MAJ_VERSION 1
#define DEC_MIN_VERSION 3
-#define DEC_REV_VERSION 0
+#define DEC_REV_VERSION 2
// YUV-cache parameters. Cache is 32-bytes wide (= one cacheline).
// Constraints are: We need to store one 16x16 block of luma samples (y),
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dec/vp8l_dec.c b/qtimageformats/src/3rdparty/libwebp/src/dec/vp8l_dec.c
index c0ea018..7995313 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dec/vp8l_dec.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dec/vp8l_dec.c
@@ -253,11 +253,11 @@ static int ReadHuffmanCodeLengths(
int symbol;
int max_symbol;
int prev_code_len = DEFAULT_CODE_LENGTH;
- HuffmanCode table[1 << LENGTHS_TABLE_BITS];
+ HuffmanTables tables;
- if (!VP8LBuildHuffmanTable(table, LENGTHS_TABLE_BITS,
- code_length_code_lengths,
- NUM_CODE_LENGTH_CODES)) {
+ if (!VP8LHuffmanTablesAllocate(1 << LENGTHS_TABLE_BITS, &tables) ||
+ !VP8LBuildHuffmanTable(&tables, LENGTHS_TABLE_BITS,
+ code_length_code_lengths, NUM_CODE_LENGTH_CODES)) {
goto End;
}
@@ -277,7 +277,7 @@ static int ReadHuffmanCodeLengths(
int code_len;
if (max_symbol-- == 0) break;
VP8LFillBitWindow(br);
- p = &table[VP8LPrefetchBits(br) & LENGTHS_TABLE_MASK];
+ p = &tables.curr_segment->start[VP8LPrefetchBits(br) & LENGTHS_TABLE_MASK];
VP8LSetBitPos(br, br->bit_pos_ + p->bits);
code_len = p->value;
if (code_len < kCodeLengthLiterals) {
@@ -300,6 +300,7 @@ static int ReadHuffmanCodeLengths(
ok = 1;
End:
+ VP8LHuffmanTablesDeallocate(&tables);
if (!ok) dec->status_ = VP8_STATUS_BITSTREAM_ERROR;
return ok;
}
@@ -307,7 +308,8 @@ static int ReadHuffmanCodeLengths(
// 'code_lengths' is pre-allocated temporary buffer, used for creating Huffman
// tree.
static int ReadHuffmanCode(int alphabet_size, VP8LDecoder* const dec,
- int* const code_lengths, HuffmanCode* const table) {
+ int* const code_lengths,
+ HuffmanTables* const table) {
int ok = 0;
int size = 0;
VP8LBitReader* const br = &dec->br_;
@@ -362,8 +364,7 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize,
VP8LMetadata* const hdr = &dec->hdr_;
uint32_t* huffman_image = NULL;
HTreeGroup* htree_groups = NULL;
- HuffmanCode* huffman_tables = NULL;
- HuffmanCode* huffman_table = NULL;
+ HuffmanTables* huffman_tables = &hdr->huffman_tables_;
int num_htree_groups = 1;
int num_htree_groups_max = 1;
int max_alphabet_size = 0;
@@ -372,6 +373,10 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize,
int* mapping = NULL;
int ok = 0;
+ // Check the table has been 0 initialized (through InitMetadata).
+ assert(huffman_tables->root.start == NULL);
+ assert(huffman_tables->curr_segment == NULL);
+
if (allow_recursion && VP8LReadBits(br, 1)) {
// use meta Huffman codes.
const int huffman_precision = VP8LReadBits(br, 3) + 2;
@@ -434,16 +439,15 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize,
code_lengths = (int*)WebPSafeCalloc((uint64_t)max_alphabet_size,
sizeof(*code_lengths));
- huffman_tables = (HuffmanCode*)WebPSafeMalloc(num_htree_groups * table_size,
- sizeof(*huffman_tables));
htree_groups = VP8LHtreeGroupsNew(num_htree_groups);
- if (htree_groups == NULL || code_lengths == NULL || huffman_tables == NULL) {
+ if (htree_groups == NULL || code_lengths == NULL ||
+ !VP8LHuffmanTablesAllocate(num_htree_groups * table_size,
+ huffman_tables)) {
dec->status_ = VP8_STATUS_OUT_OF_MEMORY;
goto Error;
}
- huffman_table = huffman_tables;
for (i = 0; i < num_htree_groups_max; ++i) {
// If the index "i" is unused in the Huffman image, just make sure the
// coefficients are valid but do not store them.
@@ -468,19 +472,20 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize,
int max_bits = 0;
for (j = 0; j < HUFFMAN_CODES_PER_META_CODE; ++j) {
int alphabet_size = kAlphabetSize[j];
- htrees[j] = huffman_table;
if (j == 0 && color_cache_bits > 0) {
alphabet_size += (1 << color_cache_bits);
}
- size = ReadHuffmanCode(alphabet_size, dec, code_lengths, huffman_table);
+ size =
+ ReadHuffmanCode(alphabet_size, dec, code_lengths, huffman_tables);
+ htrees[j] = huffman_tables->curr_segment->curr_table;
if (size == 0) {
goto Error;
}
if (is_trivial_literal && kLiteralMap[j] == 1) {
- is_trivial_literal = (huffman_table->bits == 0);
+ is_trivial_literal = (htrees[j]->bits == 0);
}
- total_size += huffman_table->bits;
- huffman_table += size;
+ total_size += htrees[j]->bits;
+ huffman_tables->curr_segment->curr_table += size;
if (j <= ALPHA) {
int local_max_bits = code_lengths[0];
int k;
@@ -515,14 +520,13 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize,
hdr->huffman_image_ = huffman_image;
hdr->num_htree_groups_ = num_htree_groups;
hdr->htree_groups_ = htree_groups;
- hdr->huffman_tables_ = huffman_tables;
Error:
WebPSafeFree(code_lengths);
WebPSafeFree(mapping);
if (!ok) {
WebPSafeFree(huffman_image);
- WebPSafeFree(huffman_tables);
+ VP8LHuffmanTablesDeallocate(huffman_tables);
VP8LHtreeGroupsFree(htree_groups);
}
return ok;
@@ -1358,7 +1362,7 @@ static void ClearMetadata(VP8LMetadata* const hdr) {
assert(hdr != NULL);
WebPSafeFree(hdr->huffman_image_);
- WebPSafeFree(hdr->huffman_tables_);
+ VP8LHuffmanTablesDeallocate(&hdr->huffman_tables_);
VP8LHtreeGroupsFree(hdr->htree_groups_);
VP8LColorCacheClear(&hdr->color_cache_);
VP8LColorCacheClear(&hdr->saved_color_cache_);
@@ -1673,7 +1677,7 @@ int VP8LDecodeImage(VP8LDecoder* const dec) {
if (dec == NULL) return 0;
- assert(dec->hdr_.huffman_tables_ != NULL);
+ assert(dec->hdr_.huffman_tables_.root.start != NULL);
assert(dec->hdr_.htree_groups_ != NULL);
assert(dec->hdr_.num_htree_groups_ > 0);
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dec/vp8li_dec.h b/qtimageformats/src/3rdparty/libwebp/src/dec/vp8li_dec.h
index 72b2e86..32540a4 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dec/vp8li_dec.h
+++ b/qtimageformats/src/3rdparty/libwebp/src/dec/vp8li_dec.h
@@ -51,7 +51,7 @@ typedef struct {
uint32_t* huffman_image_;
int num_htree_groups_;
HTreeGroup* htree_groups_;
- HuffmanCode* huffman_tables_;
+ HuffmanTables huffman_tables_;
} VP8LMetadata;
typedef struct VP8LDecoder VP8LDecoder;
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dec/webp_dec.c b/qtimageformats/src/3rdparty/libwebp/src/dec/webp_dec.c
index 3f4f7bb..f557868 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dec/webp_dec.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dec/webp_dec.c
@@ -658,19 +658,26 @@ uint8_t* WebPDecodeBGRA(const uint8_t* data, size_t data_size,
uint8_t* WebPDecodeYUV(const uint8_t* data, size_t data_size,
int* width, int* height, uint8_t** u, uint8_t** v,
int* stride, int* uv_stride) {
- WebPDecBuffer output; // only to preserve the side-infos
- uint8_t* const out = Decode(MODE_YUV, data, data_size,
- width, height, &output);
-
- if (out != NULL) {
- const WebPYUVABuffer* const buf = &output.u.YUVA;
- *u = buf->u;
- *v = buf->v;
- *stride = buf->y_stride;
- *uv_stride = buf->u_stride;
- assert(buf->u_stride == buf->v_stride);
- }
- return out;
+ // data, width and height are checked by Decode().
+ if (u == NULL || v == NULL || stride == NULL || uv_stride == NULL) {
+ return NULL;
+ }
+
+ {
+ WebPDecBuffer output; // only to preserve the side-infos
+ uint8_t* const out = Decode(MODE_YUV, data, data_size,
+ width, height, &output);
+
+ if (out != NULL) {
+ const WebPYUVABuffer* const buf = &output.u.YUVA;
+ *u = buf->u;
+ *v = buf->v;
+ *stride = buf->y_stride;
+ *uv_stride = buf->u_stride;
+ assert(buf->u_stride == buf->v_stride);
+ }
+ return out;
+ }
}
static void DefaultFeatures(WebPBitstreamFeatures* const features) {
diff --git a/qtimageformats/src/3rdparty/libwebp/src/demux/demux.c b/qtimageformats/src/3rdparty/libwebp/src/demux/demux.c
index 324e5eb..4b0d3f5 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/demux/demux.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/demux/demux.c
@@ -25,7 +25,7 @@
#define DMUX_MAJ_VERSION 1
#define DMUX_MIN_VERSION 3
-#define DMUX_REV_VERSION 0
+#define DMUX_REV_VERSION 2
typedef struct {
size_t start_; // start location of the data
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/alpha_processing.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/alpha_processing.c
index 1892929..1d152f2 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/alpha_processing.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/alpha_processing.c
@@ -425,6 +425,7 @@ void (*WebPAlphaReplace)(uint32_t* src, int length, uint32_t color);
//------------------------------------------------------------------------------
// Init function
+extern VP8CPUInfo VP8GetCPUInfo;
extern void WebPInitAlphaProcessingMIPSdspR2(void);
extern void WebPInitAlphaProcessingSSE2(void);
extern void WebPInitAlphaProcessingSSE41(void);
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/cost.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/cost.c
index 460ec4f..73d2140 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/cost.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/cost.c
@@ -374,6 +374,7 @@ static void SetResidualCoeffs_C(const int16_t* const coeffs,
VP8GetResidualCostFunc VP8GetResidualCost;
VP8SetResidualCoeffsFunc VP8SetResidualCoeffs;
+extern VP8CPUInfo VP8GetCPUInfo;
extern void VP8EncDspCostInitMIPS32(void);
extern void VP8EncDspCostInitMIPSdspR2(void);
extern void VP8EncDspCostInitSSE2(void);
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/cost_neon.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/cost_neon.c
index 8cc8ce5..6582669 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/cost_neon.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/cost_neon.c
@@ -29,7 +29,7 @@ static void SetResidualCoeffs_NEON(const int16_t* const coeffs,
const uint8x16_t eob = vcombine_u8(vqmovn_u16(eob_0), vqmovn_u16(eob_1));
const uint8x16_t masked = vandq_u8(eob, vld1q_u8(position));
-#ifdef __aarch64__
+#if WEBP_AARCH64
res->last = vmaxvq_u8(masked) - 1;
#else
const uint8x8_t eob_8x8 = vmax_u8(vget_low_u8(masked), vget_high_u8(masked));
@@ -43,7 +43,7 @@ static void SetResidualCoeffs_NEON(const int16_t* const coeffs,
vst1_lane_s32(&res->last, vreinterpret_s32_u32(eob_32x2), 0);
--res->last;
-#endif // __aarch64__
+#endif // WEBP_AARCH64
res->coeffs = coeffs;
}
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/cpu.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/cpu.c
index 62de73f..2234c77 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/cpu.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/cpu.c
@@ -173,6 +173,7 @@ static int x86CPUInfo(CPUFeature feature) {
}
return 0;
}
+WEBP_EXTERN VP8CPUInfo VP8GetCPUInfo;
VP8CPUInfo VP8GetCPUInfo = x86CPUInfo;
#elif defined(WEBP_ANDROID_NEON) // NB: needs to be before generic NEON test.
static int AndroidCPUInfo(CPUFeature feature) {
@@ -184,6 +185,7 @@ static int AndroidCPUInfo(CPUFeature feature) {
}
return 0;
}
+WEBP_EXTERN VP8CPUInfo VP8GetCPUInfo;
VP8CPUInfo VP8GetCPUInfo = AndroidCPUInfo;
#elif defined(EMSCRIPTEN) // also needs to be before generic NEON test
// Use compile flags as an indicator of SIMD support instead of a runtime check.
@@ -208,6 +210,7 @@ static int wasmCPUInfo(CPUFeature feature) {
}
return 0;
}
+WEBP_EXTERN VP8CPUInfo VP8GetCPUInfo;
VP8CPUInfo VP8GetCPUInfo = wasmCPUInfo;
#elif defined(WEBP_HAVE_NEON)
// In most cases this function doesn't check for NEON support (it's assumed by
@@ -236,6 +239,7 @@ static int armCPUInfo(CPUFeature feature) {
return 1;
#endif
}
+WEBP_EXTERN VP8CPUInfo VP8GetCPUInfo;
VP8CPUInfo VP8GetCPUInfo = armCPUInfo;
#elif defined(WEBP_USE_MIPS32) || defined(WEBP_USE_MIPS_DSP_R2) || \
defined(WEBP_USE_MSA)
@@ -247,7 +251,9 @@ static int mipsCPUInfo(CPUFeature feature) {
}
}
+WEBP_EXTERN VP8CPUInfo VP8GetCPUInfo;
VP8CPUInfo VP8GetCPUInfo = mipsCPUInfo;
#else
+WEBP_EXTERN VP8CPUInfo VP8GetCPUInfo;
VP8CPUInfo VP8GetCPUInfo = NULL;
#endif
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/cpu.h b/qtimageformats/src/3rdparty/libwebp/src/dsp/cpu.h
index de32a39..581ecbd 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/cpu.h
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/cpu.h
@@ -14,10 +14,10 @@
#ifndef WEBP_DSP_CPU_H_
#define WEBP_DSP_CPU_H_
-#include <stddef.h>
-
#include <qglobal.h>
+#include <stddef.h>
+
#ifdef HAVE_CONFIG_H
#include "src/webp/config.h"
#endif
@@ -45,6 +45,9 @@
#define __has_builtin(x) 0
#endif
+//------------------------------------------------------------------------------
+// x86 defines.
+
#if !defined(HAVE_CONFIG_H)
#if defined(_MSC_VER) && _MSC_VER > 1310 && \
(defined(_M_X64) || defined(_M_IX86)) && !defined(__clang__)
@@ -82,6 +85,9 @@
#undef WEBP_MSC_SSE41
#undef WEBP_MSC_SSE2
+//------------------------------------------------------------------------------
+// Arm defines.
+
// The intrinsics currently cause compiler errors with arm-nacl-gcc and the
// inline assembly would need to be modified for use with Native Client.
#if ((defined(__ARM_NEON__) || defined(__aarch64__)) && \
@@ -100,17 +106,27 @@
// inclusion of arm64_neon.h; Visual Studio 2019 includes this file in
// arm_neon.h. Compile errors were seen with Visual Studio 2019 16.4 with
// vtbl4_u8(); a fix was made in 16.6.
-#if defined(_MSC_VER) && ((_MSC_VER >= 1700 && defined(_M_ARM)) || \
- (_MSC_VER >= 1926 && defined(_M_ARM64))) && \
- !defined(__clang__) && (QT_CONFIG_neon == 1)
+#if defined(_MSC_VER) && \
+ ((_MSC_VER >= 1700 && defined(_M_ARM)) || \
+ (_MSC_VER >= 1926 && (defined(_M_ARM64) || defined(_M_ARM64EC)))) && \
+ !defined(__clang__) && (QT_CONFIG_neon == 1)
#define WEBP_USE_NEON
#define WEBP_USE_INTRINSICS
#endif
+#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
+#define WEBP_AARCH64 1
+#else
+#define WEBP_AARCH64 0
+#endif
+
#if defined(WEBP_USE_NEON) && !defined(WEBP_HAVE_NEON)
#define WEBP_HAVE_NEON
#endif
+//------------------------------------------------------------------------------
+// MIPS defines.
+
#if defined(__mips__) && !defined(__mips64) && defined(__mips_isa_rev) && \
(__mips_isa_rev >= 1) && (__mips_isa_rev < 6)
#define WEBP_USE_MIPS32
@@ -126,6 +142,8 @@
#define WEBP_USE_MSA
#endif
+//------------------------------------------------------------------------------
+
#ifndef WEBP_DSP_OMIT_C_CODE
#define WEBP_DSP_OMIT_C_CODE 1
#endif
@@ -136,13 +154,14 @@
#define WEBP_NEON_OMIT_C_CODE 0
#endif
-#if !(LOCAL_CLANG_PREREQ(3, 8) || LOCAL_GCC_PREREQ(4, 8) || \
- defined(__aarch64__))
+#if !(LOCAL_CLANG_PREREQ(3, 8) || LOCAL_GCC_PREREQ(4, 8) || WEBP_AARCH64)
#define WEBP_NEON_WORK_AROUND_GCC 1
#else
#define WEBP_NEON_WORK_AROUND_GCC 0
#endif
+//------------------------------------------------------------------------------
+
// This macro prevents thread_sanitizer from reporting known concurrent writes.
#define WEBP_TSAN_IGNORE_FUNCTION
#if defined(__has_feature)
@@ -244,16 +263,7 @@ typedef enum {
kMSA
} CPUFeature;
-#ifdef __cplusplus
-extern "C" {
-#endif
-
// returns true if the CPU supports the feature.
typedef int (*VP8CPUInfo)(CPUFeature feature);
-WEBP_EXTERN VP8CPUInfo VP8GetCPUInfo;
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
#endif // WEBP_DSP_CPU_H_
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/dec.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/dec.c
index 537c701..33d8df8 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/dec.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/dec.c
@@ -734,6 +734,7 @@ VP8SimpleFilterFunc VP8SimpleHFilter16i;
void (*VP8DitherCombine8x8)(const uint8_t* dither, uint8_t* dst,
int dst_stride);
+extern VP8CPUInfo VP8GetCPUInfo;
extern void VP8DspInitSSE2(void);
extern void VP8DspInitSSE41(void);
extern void VP8DspInitNEON(void);
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/dec_neon.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/dec_neon.c
index fa85170..22784cf 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/dec_neon.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/dec_neon.c
@@ -1428,7 +1428,7 @@ static WEBP_INLINE void DC8_NEON(uint8_t* dst, int do_top, int do_left) {
if (do_top) {
const uint8x8_t A = vld1_u8(dst - BPS); // top row
-#if defined(__aarch64__)
+#if WEBP_AARCH64
const uint16_t p2 = vaddlv_u8(A);
sum_top = vdupq_n_u16(p2);
#else
@@ -1511,7 +1511,7 @@ static WEBP_INLINE void DC16_NEON(uint8_t* dst, int do_top, int do_left) {
if (do_top) {
const uint8x16_t A = vld1q_u8(dst - BPS); // top row
-#if defined(__aarch64__)
+#if WEBP_AARCH64
const uint16_t p3 = vaddlvq_u8(A);
sum_top = vdupq_n_u16(p3);
#else
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/enc.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/enc.c
index ea47a3f..2ba97ba 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/enc.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/enc.c
@@ -732,6 +732,7 @@ VP8QuantizeBlockWHT VP8EncQuantizeBlockWHT;
VP8BlockCopy VP8Copy4x4;
VP8BlockCopy VP8Copy16x8;
+extern VP8CPUInfo VP8GetCPUInfo;
extern void VP8EncDspInitSSE2(void);
extern void VP8EncDspInitSSE41(void);
extern void VP8EncDspInitNEON(void);
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/enc_neon.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/enc_neon.c
index 3a04111..7148003 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/enc_neon.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/enc_neon.c
@@ -764,7 +764,7 @@ static WEBP_INLINE void AccumulateSSE16_NEON(const uint8_t* const a,
// Horizontal sum of all four uint32_t values in 'sum'.
static int SumToInt_NEON(uint32x4_t sum) {
-#if defined(__aarch64__)
+#if WEBP_AARCH64
return (int)vaddvq_u32(sum);
#else
const uint64x2_t sum2 = vpaddlq_u32(sum);
@@ -865,7 +865,7 @@ static int QuantizeBlock_NEON(int16_t in[16], int16_t out[16],
uint8x8x4_t shuffles;
// vtbl?_u8 are marked unavailable for iOS arm64 with Xcode < 6.3, use
// non-standard versions there.
-#if defined(__APPLE__) && defined(__aarch64__) && \
+#if defined(__APPLE__) && WEBP_AARCH64 && \
defined(__apple_build_version__) && (__apple_build_version__< 6020037)
uint8x16x2_t all_out;
INIT_VECTOR2(all_out, vreinterpretq_u8_s16(out0), vreinterpretq_u8_s16(out1));
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/enc_sse2.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/enc_sse2.c
index 1d10556..010624a 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/enc_sse2.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/enc_sse2.c
@@ -25,9 +25,160 @@
//------------------------------------------------------------------------------
// Transforms (Paragraph 14.4)
-// Does one or two inverse transforms.
-static void ITransform_SSE2(const uint8_t* ref, const int16_t* in, uint8_t* dst,
- int do_two) {
+// Does one inverse transform.
+static void ITransform_One_SSE2(const uint8_t* ref, const int16_t* in,
+ uint8_t* dst) {
+ // This implementation makes use of 16-bit fixed point versions of two
+ // multiply constants:
+ // K1 = sqrt(2) * cos (pi/8) ~= 85627 / 2^16
+ // K2 = sqrt(2) * sin (pi/8) ~= 35468 / 2^16
+ //
+ // To be able to use signed 16-bit integers, we use the following trick to
+ // have constants within range:
+ // - Associated constants are obtained by subtracting the 16-bit fixed point
+ // version of one:
+ // k = K - (1 << 16) => K = k + (1 << 16)
+ // K1 = 85267 => k1 = 20091
+ // K2 = 35468 => k2 = -30068
+ // - The multiplication of a variable by a constant become the sum of the
+ // variable and the multiplication of that variable by the associated
+ // constant:
+ // (x * K) >> 16 = (x * (k + (1 << 16))) >> 16 = ((x * k ) >> 16) + x
+ const __m128i k1k2 = _mm_set_epi16(-30068, -30068, -30068, -30068,
+ 20091, 20091, 20091, 20091);
+ const __m128i k2k1 = _mm_set_epi16(20091, 20091, 20091, 20091,
+ -30068, -30068, -30068, -30068);
+ const __m128i zero = _mm_setzero_si128();
+ const __m128i zero_four = _mm_set_epi16(0, 0, 0, 0, 4, 4, 4, 4);
+ __m128i T01, T23;
+
+ // Load and concatenate the transform coefficients.
+ const __m128i in01 = _mm_loadu_si128((const __m128i*)&in[0]);
+ const __m128i in23 = _mm_loadu_si128((const __m128i*)&in[8]);
+ // a00 a10 a20 a30 a01 a11 a21 a31
+ // a02 a12 a22 a32 a03 a13 a23 a33
+
+ // Vertical pass and subsequent transpose.
+ {
+ const __m128i in1 = _mm_unpackhi_epi64(in01, in01);
+ const __m128i in3 = _mm_unpackhi_epi64(in23, in23);
+
+ // First pass, c and d calculations are longer because of the "trick"
+ // multiplications.
+ // c = MUL(in1, K2) - MUL(in3, K1) = MUL(in1, k2) - MUL(in3, k1) + in1 - in3
+ // d = MUL(in1, K1) + MUL(in3, K2) = MUL(in1, k1) + MUL(in3, k2) + in1 + in3
+ const __m128i a_d3 = _mm_add_epi16(in01, in23);
+ const __m128i b_c3 = _mm_sub_epi16(in01, in23);
+ const __m128i c1d1 = _mm_mulhi_epi16(in1, k2k1);
+ const __m128i c2d2 = _mm_mulhi_epi16(in3, k1k2);
+ const __m128i c3 = _mm_unpackhi_epi64(b_c3, b_c3);
+ const __m128i c4 = _mm_sub_epi16(c1d1, c2d2);
+ const __m128i c = _mm_add_epi16(c3, c4);
+ const __m128i d4u = _mm_add_epi16(c1d1, c2d2);
+ const __m128i du = _mm_add_epi16(a_d3, d4u);
+ const __m128i d = _mm_unpackhi_epi64(du, du);
+
+ // Second pass.
+ const __m128i comb_ab = _mm_unpacklo_epi64(a_d3, b_c3);
+ const __m128i comb_dc = _mm_unpacklo_epi64(d, c);
+
+ const __m128i tmp01 = _mm_add_epi16(comb_ab, comb_dc);
+ const __m128i tmp32 = _mm_sub_epi16(comb_ab, comb_dc);
+ const __m128i tmp23 = _mm_shuffle_epi32(tmp32, _MM_SHUFFLE(1, 0, 3, 2));
+
+ const __m128i transpose_0 = _mm_unpacklo_epi16(tmp01, tmp23);
+ const __m128i transpose_1 = _mm_unpackhi_epi16(tmp01, tmp23);
+ // a00 a20 a01 a21 a02 a22 a03 a23
+ // a10 a30 a11 a31 a12 a32 a13 a33
+
+ T01 = _mm_unpacklo_epi16(transpose_0, transpose_1);
+ T23 = _mm_unpackhi_epi16(transpose_0, transpose_1);
+ // a00 a10 a20 a30 a01 a11 a21 a31
+ // a02 a12 a22 a32 a03 a13 a23 a33
+ }
+
+ // Horizontal pass and subsequent transpose.
+ {
+ const __m128i T1 = _mm_unpackhi_epi64(T01, T01);
+ const __m128i T3 = _mm_unpackhi_epi64(T23, T23);
+
+ // First pass, c and d calculations are longer because of the "trick"
+ // multiplications.
+ const __m128i dc = _mm_add_epi16(T01, zero_four);
+
+ // c = MUL(T1, K2) - MUL(T3, K1) = MUL(T1, k2) - MUL(T3, k1) + T1 - T3
+ // d = MUL(T1, K1) + MUL(T3, K2) = MUL(T1, k1) + MUL(T3, k2) + T1 + T3
+ const __m128i a_d3 = _mm_add_epi16(dc, T23);
+ const __m128i b_c3 = _mm_sub_epi16(dc, T23);
+ const __m128i c1d1 = _mm_mulhi_epi16(T1, k2k1);
+ const __m128i c2d2 = _mm_mulhi_epi16(T3, k1k2);
+ const __m128i c3 = _mm_unpackhi_epi64(b_c3, b_c3);
+ const __m128i c4 = _mm_sub_epi16(c1d1, c2d2);
+ const __m128i c = _mm_add_epi16(c3, c4);
+ const __m128i d4u = _mm_add_epi16(c1d1, c2d2);
+ const __m128i du = _mm_add_epi16(a_d3, d4u);
+ const __m128i d = _mm_unpackhi_epi64(du, du);
+
+ // Second pass.
+ const __m128i comb_ab = _mm_unpacklo_epi64(a_d3, b_c3);
+ const __m128i comb_dc = _mm_unpacklo_epi64(d, c);
+
+ const __m128i tmp01 = _mm_add_epi16(comb_ab, comb_dc);
+ const __m128i tmp32 = _mm_sub_epi16(comb_ab, comb_dc);
+ const __m128i tmp23 = _mm_shuffle_epi32(tmp32, _MM_SHUFFLE(1, 0, 3, 2));
+
+ const __m128i shifted01 = _mm_srai_epi16(tmp01, 3);
+ const __m128i shifted23 = _mm_srai_epi16(tmp23, 3);
+ // a00 a01 a02 a03 a10 a11 a12 a13
+ // a20 a21 a22 a23 a30 a31 a32 a33
+
+ const __m128i transpose_0 = _mm_unpacklo_epi16(shifted01, shifted23);
+ const __m128i transpose_1 = _mm_unpackhi_epi16(shifted01, shifted23);
+ // a00 a20 a01 a21 a02 a22 a03 a23
+ // a10 a30 a11 a31 a12 a32 a13 a33
+
+ T01 = _mm_unpacklo_epi16(transpose_0, transpose_1);
+ T23 = _mm_unpackhi_epi16(transpose_0, transpose_1);
+ // a00 a10 a20 a30 a01 a11 a21 a31
+ // a02 a12 a22 a32 a03 a13 a23 a33
+ }
+
+ // Add inverse transform to 'ref' and store.
+ {
+ // Load the reference(s).
+ __m128i ref01, ref23, ref0123;
+ int32_t buf[4];
+
+ // Load four bytes/pixels per line.
+ const __m128i ref0 = _mm_cvtsi32_si128(WebPMemToInt32(&ref[0 * BPS]));
+ const __m128i ref1 = _mm_cvtsi32_si128(WebPMemToInt32(&ref[1 * BPS]));
+ const __m128i ref2 = _mm_cvtsi32_si128(WebPMemToInt32(&ref[2 * BPS]));
+ const __m128i ref3 = _mm_cvtsi32_si128(WebPMemToInt32(&ref[3 * BPS]));
+ ref01 = _mm_unpacklo_epi32(ref0, ref1);
+ ref23 = _mm_unpacklo_epi32(ref2, ref3);
+
+ // Convert to 16b.
+ ref01 = _mm_unpacklo_epi8(ref01, zero);
+ ref23 = _mm_unpacklo_epi8(ref23, zero);
+ // Add the inverse transform(s).
+ ref01 = _mm_add_epi16(ref01, T01);
+ ref23 = _mm_add_epi16(ref23, T23);
+ // Unsigned saturate to 8b.
+ ref0123 = _mm_packus_epi16(ref01, ref23);
+
+ _mm_storeu_si128((__m128i *)buf, ref0123);
+
+ // Store four bytes/pixels per line.
+ WebPInt32ToMem(&dst[0 * BPS], buf[0]);
+ WebPInt32ToMem(&dst[1 * BPS], buf[1]);
+ WebPInt32ToMem(&dst[2 * BPS], buf[2]);
+ WebPInt32ToMem(&dst[3 * BPS], buf[3]);
+ }
+}
+
+// Does two inverse transforms.
+static void ITransform_Two_SSE2(const uint8_t* ref, const int16_t* in,
+ uint8_t* dst) {
// This implementation makes use of 16-bit fixed point versions of two
// multiply constants:
// K1 = sqrt(2) * cos (pi/8) ~= 85627 / 2^16
@@ -49,33 +200,21 @@ static void ITransform_SSE2(const uint8_t* ref, const int16_t* in, uint8_t* dst,
__m128i T0, T1, T2, T3;
// Load and concatenate the transform coefficients (we'll do two inverse
- // transforms in parallel). In the case of only one inverse transform, the
- // second half of the vectors will just contain random value we'll never
- // use nor store.
+ // transforms in parallel).
__m128i in0, in1, in2, in3;
{
- in0 = _mm_loadl_epi64((const __m128i*)&in[0]);
- in1 = _mm_loadl_epi64((const __m128i*)&in[4]);
- in2 = _mm_loadl_epi64((const __m128i*)&in[8]);
- in3 = _mm_loadl_epi64((const __m128i*)&in[12]);
- // a00 a10 a20 a30 x x x x
- // a01 a11 a21 a31 x x x x
- // a02 a12 a22 a32 x x x x
- // a03 a13 a23 a33 x x x x
- if (do_two) {
- const __m128i inB0 = _mm_loadl_epi64((const __m128i*)&in[16]);
- const __m128i inB1 = _mm_loadl_epi64((const __m128i*)&in[20]);
- const __m128i inB2 = _mm_loadl_epi64((const __m128i*)&in[24]);
- const __m128i inB3 = _mm_loadl_epi64((const __m128i*)&in[28]);
- in0 = _mm_unpacklo_epi64(in0, inB0);
- in1 = _mm_unpacklo_epi64(in1, inB1);
- in2 = _mm_unpacklo_epi64(in2, inB2);
- in3 = _mm_unpacklo_epi64(in3, inB3);
- // a00 a10 a20 a30 b00 b10 b20 b30
- // a01 a11 a21 a31 b01 b11 b21 b31
- // a02 a12 a22 a32 b02 b12 b22 b32
- // a03 a13 a23 a33 b03 b13 b23 b33
- }
+ const __m128i tmp0 = _mm_loadu_si128((const __m128i*)&in[0]);
+ const __m128i tmp1 = _mm_loadu_si128((const __m128i*)&in[8]);
+ const __m128i tmp2 = _mm_loadu_si128((const __m128i*)&in[16]);
+ const __m128i tmp3 = _mm_loadu_si128((const __m128i*)&in[24]);
+ in0 = _mm_unpacklo_epi64(tmp0, tmp2);
+ in1 = _mm_unpackhi_epi64(tmp0, tmp2);
+ in2 = _mm_unpacklo_epi64(tmp1, tmp3);
+ in3 = _mm_unpackhi_epi64(tmp1, tmp3);
+ // a00 a10 a20 a30 b00 b10 b20 b30
+ // a01 a11 a21 a31 b01 b11 b21 b31
+ // a02 a12 a22 a32 b02 b12 b22 b32
+ // a03 a13 a23 a33 b03 b13 b23 b33
}
// Vertical pass and subsequent transpose.
@@ -148,19 +287,11 @@ static void ITransform_SSE2(const uint8_t* ref, const int16_t* in, uint8_t* dst,
const __m128i zero = _mm_setzero_si128();
// Load the reference(s).
__m128i ref0, ref1, ref2, ref3;
- if (do_two) {
- // Load eight bytes/pixels per line.
- ref0 = _mm_loadl_epi64((const __m128i*)&ref[0 * BPS]);
- ref1 = _mm_loadl_epi64((const __m128i*)&ref[1 * BPS]);
- ref2 = _mm_loadl_epi64((const __m128i*)&ref[2 * BPS]);
- ref3 = _mm_loadl_epi64((const __m128i*)&ref[3 * BPS]);
- } else {
- // Load four bytes/pixels per line.
- ref0 = _mm_cvtsi32_si128(WebPMemToInt32(&ref[0 * BPS]));
- ref1 = _mm_cvtsi32_si128(WebPMemToInt32(&ref[1 * BPS]));
- ref2 = _mm_cvtsi32_si128(WebPMemToInt32(&ref[2 * BPS]));
- ref3 = _mm_cvtsi32_si128(WebPMemToInt32(&ref[3 * BPS]));
- }
+ // Load eight bytes/pixels per line.
+ ref0 = _mm_loadl_epi64((const __m128i*)&ref[0 * BPS]);
+ ref1 = _mm_loadl_epi64((const __m128i*)&ref[1 * BPS]);
+ ref2 = _mm_loadl_epi64((const __m128i*)&ref[2 * BPS]);
+ ref3 = _mm_loadl_epi64((const __m128i*)&ref[3 * BPS]);
// Convert to 16b.
ref0 = _mm_unpacklo_epi8(ref0, zero);
ref1 = _mm_unpacklo_epi8(ref1, zero);
@@ -176,20 +307,21 @@ static void ITransform_SSE2(const uint8_t* ref, const int16_t* in, uint8_t* dst,
ref1 = _mm_packus_epi16(ref1, ref1);
ref2 = _mm_packus_epi16(ref2, ref2);
ref3 = _mm_packus_epi16(ref3, ref3);
- // Store the results.
- if (do_two) {
- // Store eight bytes/pixels per line.
- _mm_storel_epi64((__m128i*)&dst[0 * BPS], ref0);
- _mm_storel_epi64((__m128i*)&dst[1 * BPS], ref1);
- _mm_storel_epi64((__m128i*)&dst[2 * BPS], ref2);
- _mm_storel_epi64((__m128i*)&dst[3 * BPS], ref3);
- } else {
- // Store four bytes/pixels per line.
- WebPInt32ToMem(&dst[0 * BPS], _mm_cvtsi128_si32(ref0));
- WebPInt32ToMem(&dst[1 * BPS], _mm_cvtsi128_si32(ref1));
- WebPInt32ToMem(&dst[2 * BPS], _mm_cvtsi128_si32(ref2));
- WebPInt32ToMem(&dst[3 * BPS], _mm_cvtsi128_si32(ref3));
- }
+ // Store eight bytes/pixels per line.
+ _mm_storel_epi64((__m128i*)&dst[0 * BPS], ref0);
+ _mm_storel_epi64((__m128i*)&dst[1 * BPS], ref1);
+ _mm_storel_epi64((__m128i*)&dst[2 * BPS], ref2);
+ _mm_storel_epi64((__m128i*)&dst[3 * BPS], ref3);
+ }
+}
+
+// Does one or two inverse transforms.
+static void ITransform_SSE2(const uint8_t* ref, const int16_t* in, uint8_t* dst,
+ int do_two) {
+ if (do_two) {
+ ITransform_Two_SSE2(ref, in, dst);
+ } else {
+ ITransform_One_SSE2(ref, in, dst);
}
}
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/filters.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/filters.c
index 4506567..85eee50 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/filters.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/filters.c
@@ -233,6 +233,7 @@ static void GradientUnfilter_C(const uint8_t* prev, const uint8_t* in,
WebPFilterFunc WebPFilters[WEBP_FILTER_LAST];
WebPUnfilterFunc WebPUnfilters[WEBP_FILTER_LAST];
+extern VP8CPUInfo VP8GetCPUInfo;
extern void VP8FiltersInitMIPSdspR2(void);
extern void VP8FiltersInitMSA(void);
extern void VP8FiltersInitNEON(void);
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless.c
index fb86e58..9f81209 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless.c
@@ -588,6 +588,7 @@ VP8LConvertFunc VP8LConvertBGRAToBGR;
VP8LMapARGBFunc VP8LMapColor32b;
VP8LMapAlphaFunc VP8LMapColor8b;
+extern VP8CPUInfo VP8GetCPUInfo;
extern void VP8LDspInitSSE2(void);
extern void VP8LDspInitSSE41(void);
extern void VP8LDspInitNEON(void);
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless_enc.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless_enc.c
index b1f9f26..cde1280 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless_enc.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless_enc.c
@@ -791,6 +791,7 @@ VP8LBundleColorMapFunc VP8LBundleColorMap;
VP8LPredictorAddSubFunc VP8LPredictorsSub[16];
VP8LPredictorAddSubFunc VP8LPredictorsSub_C[16];
+extern VP8CPUInfo VP8GetCPUInfo;
extern void VP8LEncDspInitSSE2(void);
extern void VP8LEncDspInitSSE41(void);
extern void VP8LEncDspInitNEON(void);
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless_enc_neon.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless_enc_neon.c
index 7c7b73f..e32c796 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless_enc_neon.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless_enc_neon.c
@@ -25,7 +25,7 @@
// vtbl?_u8 are marked unavailable for iOS arm64 with Xcode < 6.3, use
// non-standard versions there.
-#if defined(__APPLE__) && defined(__aarch64__) && \
+#if defined(__APPLE__) && WEBP_AARCH64 && \
defined(__apple_build_version__) && (__apple_build_version__< 6020037)
#define USE_VTBLQ
#endif
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless_neon.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless_neon.c
index 89e3e01..ddc9b61 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless_neon.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/lossless_neon.c
@@ -498,7 +498,7 @@ static void PredictorAdd13_NEON(const uint32_t* in, const uint32_t* upper,
// vtbl?_u8 are marked unavailable for iOS arm64 with Xcode < 6.3, use
// non-standard versions there.
-#if defined(__APPLE__) && defined(__aarch64__) && \
+#if defined(__APPLE__) && WEBP_AARCH64 && \
defined(__apple_build_version__) && (__apple_build_version__< 6020037)
#define USE_VTBLQ
#endif
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/neon.h b/qtimageformats/src/3rdparty/libwebp/src/dsp/neon.h
index c591f9b..14acb40 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/neon.h
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/neon.h
@@ -21,7 +21,7 @@
// Right now, some intrinsics functions seem slower, so we disable them
// everywhere except newer clang/gcc or aarch64 where the inline assembly is
// incompatible.
-#if LOCAL_CLANG_PREREQ(3,8) || LOCAL_GCC_PREREQ(4,9) || defined(__aarch64__)
+#if LOCAL_CLANG_PREREQ(3, 8) || LOCAL_GCC_PREREQ(4, 9) || WEBP_AARCH64
#define WEBP_USE_INTRINSICS // use intrinsics when possible
#endif
@@ -46,7 +46,7 @@
// if using intrinsics, this flag avoids some functions that make gcc-4.6.3
// crash ("internal compiler error: in immed_double_const, at emit-rtl.").
// (probably similar to gcc.gnu.org/bugzilla/show_bug.cgi?id=48183)
-#if !(LOCAL_CLANG_PREREQ(3,8) || LOCAL_GCC_PREREQ(4,8) || defined(__aarch64__))
+#if !(LOCAL_CLANG_PREREQ(3, 8) || LOCAL_GCC_PREREQ(4, 8) || WEBP_AARCH64)
#define WORK_AROUND_GCC
#endif
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/quant.h b/qtimageformats/src/3rdparty/libwebp/src/dsp/quant.h
index fc099bf..bf7734c 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/quant.h
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/quant.h
@@ -22,7 +22,7 @@
#define IsFlat IsFlat_NEON
static uint32_t horizontal_add_uint32x4(const uint32x4_t a) {
-#if defined(__aarch64__)
+#if WEBP_AARCH64
return vaddvq_u32(a);
#else
const uint64x2_t b = vpaddlq_u32(a);
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/rescaler.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/rescaler.c
index 14620ce..325d8be 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/rescaler.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/rescaler.c
@@ -197,6 +197,7 @@ WebPRescalerImportRowFunc WebPRescalerImportRowShrink;
WebPRescalerExportRowFunc WebPRescalerExportRowExpand;
WebPRescalerExportRowFunc WebPRescalerExportRowShrink;
+extern VP8CPUInfo VP8GetCPUInfo;
extern void WebPRescalerDspInitSSE2(void);
extern void WebPRescalerDspInitMIPS32(void);
extern void WebPRescalerDspInitMIPSdspR2(void);
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/ssim.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/ssim.c
index f85c2e6..9a1341e 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/ssim.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/ssim.c
@@ -137,6 +137,7 @@ VP8SSIMGetClippedFunc VP8SSIMGetClipped;
VP8AccumulateSSEFunc VP8AccumulateSSE;
#endif
+extern VP8CPUInfo VP8GetCPUInfo;
extern void VP8SSIMDspInitSSE2(void);
WEBP_DSP_INIT_FUNC(VP8SSIMDspInit) {
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/upsampling.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/upsampling.c
index 87f771f..983b9c4 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/upsampling.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/upsampling.c
@@ -215,6 +215,7 @@ static void EmptyYuv444Func(const uint8_t* y,
WebPYUV444Converter WebPYUV444Converters[MODE_LAST];
+extern VP8CPUInfo VP8GetCPUInfo;
extern void WebPInitYUV444ConvertersMIPSdspR2(void);
extern void WebPInitYUV444ConvertersSSE2(void);
extern void WebPInitYUV444ConvertersSSE41(void);
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/upsampling_neon.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/upsampling_neon.c
index 6ba71a7..bbc000c 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/upsampling_neon.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/upsampling_neon.c
@@ -111,7 +111,7 @@ static const int16_t kCoeffs1[4] = { 19077, 26149, 6419, 13320 };
vst4_u8(out, v255_r_g_b); \
} while (0)
-#if !defined(WEBP_SWAP_16BIT_CSP)
+#if (WEBP_SWAP_16BIT_CSP == 0)
#define ZIP_U8(lo, hi) vzip_u8((lo), (hi))
#else
#define ZIP_U8(lo, hi) vzip_u8((hi), (lo))
diff --git a/qtimageformats/src/3rdparty/libwebp/src/dsp/yuv.c b/qtimageformats/src/3rdparty/libwebp/src/dsp/yuv.c
index d16c13d..8a04b85 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/dsp/yuv.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/dsp/yuv.c
@@ -70,6 +70,7 @@ void WebPSamplerProcessPlane(const uint8_t* y, int y_stride,
WebPSamplerRowFunc WebPSamplers[MODE_LAST];
+extern VP8CPUInfo VP8GetCPUInfo;
extern void WebPInitSamplersSSE2(void);
extern void WebPInitSamplersSSE41(void);
extern void WebPInitSamplersMIPS32(void);
diff --git a/qtimageformats/src/3rdparty/libwebp/src/enc/alpha_enc.c b/qtimageformats/src/3rdparty/libwebp/src/enc/alpha_enc.c
index f7c0269..26f0034 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/enc/alpha_enc.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/enc/alpha_enc.c
@@ -13,6 +13,7 @@
#include <assert.h>
#include <stdlib.h>
+#include <string.h>
#include "src/enc/vp8i_enc.h"
#include "src/dsp/dsp.h"
@@ -140,6 +141,11 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height,
!reduce_levels, &tmp_bw, &result->stats);
if (ok) {
output = VP8LBitWriterFinish(&tmp_bw);
+ if (tmp_bw.error_) {
+ VP8LBitWriterWipeOut(&tmp_bw);
+ memset(&result->bw, 0, sizeof(result->bw));
+ return 0;
+ }
output_size = VP8LBitWriterNumBytes(&tmp_bw);
if (output_size > data_size) {
// compressed size is larger than source! Revert to uncompressed mode.
@@ -148,6 +154,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height,
}
} else {
VP8LBitWriterWipeOut(&tmp_bw);
+ memset(&result->bw, 0, sizeof(result->bw));
return 0;
}
}
@@ -162,7 +169,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height,
header = method | (filter << 2);
if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4;
- VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size);
+ if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0;
ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN);
ok = ok && VP8BitWriterAppend(&result->bw, output, output_size);
@@ -312,11 +319,11 @@ static int EncodeAlpha(VP8Encoder* const enc,
assert(filter >= WEBP_FILTER_NONE && filter <= WEBP_FILTER_FAST);
if (quality < 0 || quality > 100) {
- return 0;
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_INVALID_CONFIGURATION);
}
if (method < ALPHA_NO_COMPRESSION || method > ALPHA_LOSSLESS_COMPRESSION) {
- return 0;
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_INVALID_CONFIGURATION);
}
if (method == ALPHA_NO_COMPRESSION) {
@@ -326,7 +333,7 @@ static int EncodeAlpha(VP8Encoder* const enc,
quant_alpha = (uint8_t*)WebPSafeMalloc(1ULL, data_size);
if (quant_alpha == NULL) {
- return 0;
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
// Extract alpha data (width x height) from raw_data (stride x height).
@@ -346,6 +353,9 @@ static int EncodeAlpha(VP8Encoder* const enc,
ok = ApplyFiltersAndEncode(quant_alpha, width, height, data_size, method,
filter, reduce_levels, effort_level, output,
output_size, pic->stats);
+ if (!ok) {
+ WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY); // imprecise
+ }
#if !defined(WEBP_DISABLE_STATS)
if (pic->stats != NULL) { // need stats?
pic->stats->coded_size += (int)(*output_size);
@@ -405,7 +415,7 @@ int VP8EncStartAlpha(VP8Encoder* const enc) {
WebPWorker* const worker = &enc->alpha_worker_;
// Makes sure worker is good to go.
if (!WebPGetWorkerInterface()->Reset(worker)) {
- return 0;
+ return WebPEncodingSetError(enc->pic_, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
WebPGetWorkerInterface()->Launch(worker);
return 1;
diff --git a/qtimageformats/src/3rdparty/libwebp/src/enc/analysis_enc.c b/qtimageformats/src/3rdparty/libwebp/src/enc/analysis_enc.c
index a0001ac..962eaa9 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/enc/analysis_enc.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/enc/analysis_enc.c
@@ -474,6 +474,10 @@ int VP8EncAnalyze(VP8Encoder* const enc) {
} else { // Use only one default segment.
ResetAllMBInfo(enc);
}
+ if (!ok) {
+ return WebPEncodingSetError(enc->pic_,
+ VP8_ENC_ERROR_OUT_OF_MEMORY); // imprecise
+ }
return ok;
}
diff --git a/qtimageformats/src/3rdparty/libwebp/src/enc/backward_references_enc.c b/qtimageformats/src/3rdparty/libwebp/src/enc/backward_references_enc.c
index 49a0fac..dc98bf1 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/enc/backward_references_enc.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/enc/backward_references_enc.c
@@ -283,8 +283,7 @@ int VP8LHashChainFill(VP8LHashChain* const p, int quality,
hash_to_first_index =
(int32_t*)WebPSafeMalloc(HASH_SIZE, sizeof(*hash_to_first_index));
if (hash_to_first_index == NULL) {
- WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
- return 0;
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
percent_range = remaining_percent / 2;
@@ -1050,8 +1049,7 @@ int VP8LGetBackwardReferences(
refs_best = GetBackwardReferencesLowEffort(
width, height, argb, cache_bits_best, hash_chain, refs);
if (refs_best == NULL) {
- WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
- return 0;
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
// Set it in first position.
BackwardRefsSwap(refs_best, &refs[0]);
@@ -1059,8 +1057,7 @@ int VP8LGetBackwardReferences(
if (!GetBackwardReferences(width, height, argb, quality, lz77_types_to_try,
cache_bits_max, do_no_cache, hash_chain, refs,
cache_bits_best)) {
- WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
- return 0;
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
}
diff --git a/qtimageformats/src/3rdparty/libwebp/src/enc/frame_enc.c b/qtimageformats/src/3rdparty/libwebp/src/enc/frame_enc.c
index b93d9e5..9a98dc1 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/enc/frame_enc.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/enc/frame_enc.c
@@ -689,7 +689,7 @@ static int PreLoopInitialize(VP8Encoder* const enc) {
}
if (!ok) {
VP8EncFreeBitWriters(enc); // malloc error occurred
- WebPEncodingSetError(enc->pic_, VP8_ENC_ERROR_OUT_OF_MEMORY);
+ return WebPEncodingSetError(enc->pic_, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
return ok;
}
@@ -719,6 +719,7 @@ static int PostLoopFinalize(VP8EncIterator* const it, int ok) {
} else {
// Something bad happened -> need to do some memory cleanup.
VP8EncFreeBitWriters(enc);
+ return WebPEncodingSetError(enc->pic_, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
return ok;
}
@@ -754,6 +755,11 @@ int VP8EncLoop(VP8Encoder* const enc) {
// *then* decide how to code the skip decision if there's one.
if (!VP8Decimate(&it, &info, rd_opt) || dont_use_skip) {
CodeResiduals(it.bw_, &it, &info);
+ if (it.bw_->error_) {
+ // enc->pic_->error_code is set in PostLoopFinalize().
+ ok = 0;
+ break;
+ }
} else { // reset predictors after a skip
ResetAfterSkip(&it);
}
diff --git a/qtimageformats/src/3rdparty/libwebp/src/enc/picture_csp_enc.c b/qtimageformats/src/3rdparty/libwebp/src/enc/picture_csp_enc.c
index 78c8ca4..a9280e6 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/enc/picture_csp_enc.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/enc/picture_csp_enc.c
@@ -98,6 +98,7 @@ static int kLinearToGammaTab[GAMMA_TAB_SIZE + 1];
static uint16_t kGammaToLinearTab[256];
static volatile int kGammaTablesOk = 0;
static void InitGammaTables(void);
+extern VP8CPUInfo VP8GetCPUInfo;
WEBP_DSP_INIT_FUNC(InitGammaTables) {
if (!kGammaTablesOk) {
@@ -534,7 +535,9 @@ static int ImportYUVAFromRGBA(const uint8_t* r_ptr,
WebPInitConvertARGBToYUV();
InitGammaTables();
- if (tmp_rgb == NULL) return 0; // malloc error
+ if (tmp_rgb == NULL) {
+ return WebPEncodingSetError(picture, VP8_ENC_ERROR_OUT_OF_MEMORY);
+ }
// Downsample Y/U/V planes, two rows at a time
for (y = 0; y < (height >> 1); ++y) {
diff --git a/qtimageformats/src/3rdparty/libwebp/src/enc/picture_rescale_enc.c b/qtimageformats/src/3rdparty/libwebp/src/enc/picture_rescale_enc.c
index 839f91c..ea90d82 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/enc/picture_rescale_enc.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/enc/picture_rescale_enc.c
@@ -137,7 +137,9 @@ int WebPPictureCrop(WebPPicture* pic,
PictureGrabSpecs(pic, &tmp);
tmp.width = width;
tmp.height = height;
- if (!WebPPictureAlloc(&tmp)) return 0;
+ if (!WebPPictureAlloc(&tmp)) {
+ return WebPEncodingSetError(pic, tmp.error_code);
+ }
if (!pic->use_argb) {
const int y_offset = top * pic->y_stride + left;
@@ -212,26 +214,28 @@ int WebPPictureRescale(WebPPicture* picture, int width, int height) {
prev_height = picture->height;
if (!WebPRescalerGetScaledDimensions(
prev_width, prev_height, &width, &height)) {
- return 0;
+ return WebPEncodingSetError(picture, VP8_ENC_ERROR_BAD_DIMENSION);
}
PictureGrabSpecs(picture, &tmp);
tmp.width = width;
tmp.height = height;
- if (!WebPPictureAlloc(&tmp)) return 0;
+ if (!WebPPictureAlloc(&tmp)) {
+ return WebPEncodingSetError(picture, tmp.error_code);
+ }
if (!picture->use_argb) {
work = (rescaler_t*)WebPSafeMalloc(2ULL * width, sizeof(*work));
if (work == NULL) {
WebPPictureFree(&tmp);
- return 0;
+ return WebPEncodingSetError(picture, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
// If present, we need to rescale alpha first (for AlphaMultiplyY).
if (picture->a != NULL) {
WebPInitAlphaProcessing();
if (!RescalePlane(picture->a, prev_width, prev_height, picture->a_stride,
tmp.a, width, height, tmp.a_stride, work, 1)) {
- return 0;
+ return WebPEncodingSetError(picture, VP8_ENC_ERROR_BAD_DIMENSION);
}
}
@@ -246,14 +250,14 @@ int WebPPictureRescale(WebPPicture* picture, int width, int height) {
!RescalePlane(picture->v, HALVE(prev_width), HALVE(prev_height),
picture->uv_stride, tmp.v, HALVE(width), HALVE(height),
tmp.uv_stride, work, 1)) {
- return 0;
+ return WebPEncodingSetError(picture, VP8_ENC_ERROR_BAD_DIMENSION);
}
AlphaMultiplyY(&tmp, 1);
} else {
work = (rescaler_t*)WebPSafeMalloc(2ULL * width * 4, sizeof(*work));
if (work == NULL) {
WebPPictureFree(&tmp);
- return 0;
+ return WebPEncodingSetError(picture, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
// In order to correctly interpolate colors, we need to apply the alpha
// weighting first (black-matting), scale the RGB values, and remove
@@ -263,7 +267,7 @@ int WebPPictureRescale(WebPPicture* picture, int width, int height) {
if (!RescalePlane((const uint8_t*)picture->argb, prev_width, prev_height,
picture->argb_stride * 4, (uint8_t*)tmp.argb, width,
height, tmp.argb_stride * 4, work, 4)) {
- return 0;
+ return WebPEncodingSetError(picture, VP8_ENC_ERROR_BAD_DIMENSION);
}
AlphaMultiplyARGB(&tmp, 1);
}
diff --git a/qtimageformats/src/3rdparty/libwebp/src/enc/syntax_enc.c b/qtimageformats/src/3rdparty/libwebp/src/enc/syntax_enc.c
index e18cf65..9b8f524 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/enc/syntax_enc.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/enc/syntax_enc.c
@@ -258,7 +258,10 @@ static int EmitPartitionsSize(const VP8Encoder* const enc,
buf[3 * p + 1] = (part_size >> 8) & 0xff;
buf[3 * p + 2] = (part_size >> 16) & 0xff;
}
- return p ? pic->writer(buf, 3 * p, pic) : 1;
+ if (p && !pic->writer(buf, 3 * p, pic)) {
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_BAD_WRITE);
+ }
+ return 1;
}
//------------------------------------------------------------------------------
@@ -381,6 +384,7 @@ int VP8EncWrite(VP8Encoder* const enc) {
enc->coded_size_ = (int)(CHUNK_HEADER_SIZE + riff_size);
ok = ok && WebPReportProgress(pic, final_percent, &enc->percent_);
+ if (!ok) WebPEncodingSetError(pic, VP8_ENC_ERROR_BAD_WRITE);
return ok;
}
diff --git a/qtimageformats/src/3rdparty/libwebp/src/enc/vp8i_enc.h b/qtimageformats/src/3rdparty/libwebp/src/enc/vp8i_enc.h
index c9927c4..0864fbf 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/enc/vp8i_enc.h
+++ b/qtimageformats/src/3rdparty/libwebp/src/enc/vp8i_enc.h
@@ -32,7 +32,7 @@ extern "C" {
// version numbers
#define ENC_MAJ_VERSION 1
#define ENC_MIN_VERSION 3
-#define ENC_REV_VERSION 0
+#define ENC_REV_VERSION 2
enum { MAX_LF_LEVELS = 64, // Maximum loop filter level
MAX_VARIABLE_LEVEL = 67, // last (inclusive) level with variable cost
diff --git a/qtimageformats/src/3rdparty/libwebp/src/enc/vp8l_enc.c b/qtimageformats/src/3rdparty/libwebp/src/enc/vp8l_enc.c
index 0b07e52..3a8ec3d 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/enc/vp8l_enc.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/enc/vp8l_enc.c
@@ -196,8 +196,7 @@ static int CoOccurrenceBuild(const WebPPicture* const pic,
uint32_t palette_sorted[MAX_PALETTE_SIZE];
lines = (uint32_t*)WebPSafeMalloc(2 * pic->width, sizeof(*lines));
if (lines == NULL) {
- WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
- return 0;
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
line_top = &lines[0];
line_current = &lines[pic->width];
@@ -255,10 +254,10 @@ static int PaletteSortModifiedZeng(
cooccurrence =
(uint32_t*)WebPSafeCalloc(num_colors * num_colors, sizeof(*cooccurrence));
if (cooccurrence == NULL) {
- WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
- return 0;
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
if (!CoOccurrenceBuild(pic, palette_sorted, num_colors, cooccurrence)) {
+ WebPSafeFree(cooccurrence);
return 0;
}
@@ -1012,8 +1011,7 @@ static int StoreImageToBitMask(
VP8LRefsCursorNext(&c);
}
if (bw->error_) {
- WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
- return 0;
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
return 1;
}
@@ -1297,7 +1295,10 @@ static int EncodeImageInternal(
}
}
tokens = (HuffmanTreeToken*)WebPSafeMalloc(max_tokens, sizeof(*tokens));
- if (tokens == NULL) goto Error;
+ if (tokens == NULL) {
+ WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
+ goto Error;
+ }
for (i = 0; i < 5 * histogram_image_size; ++i) {
HuffmanTreeCode* const codes = &huffman_codes[i];
StoreHuffmanCode(bw, huff_tree, tokens, codes);
@@ -1448,18 +1449,21 @@ static int WriteImage(const WebPPicture* const pic, VP8LBitWriter* const bw,
const size_t vp8l_size = VP8L_SIGNATURE_SIZE + webpll_size;
const size_t pad = vp8l_size & 1;
const size_t riff_size = TAG_SIZE + CHUNK_HEADER_SIZE + vp8l_size + pad;
+ *coded_size = 0;
+
+ if (bw->error_) {
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
+ }
if (!WriteRiffHeader(pic, riff_size, vp8l_size) ||
!pic->writer(webpll_data, webpll_size, pic)) {
- WebPEncodingSetError(pic, VP8_ENC_ERROR_BAD_WRITE);
- return 0;
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_BAD_WRITE);
}
if (pad) {
const uint8_t pad_byte[1] = { 0 };
if (!pic->writer(pad_byte, 1, pic)) {
- WebPEncodingSetError(pic, VP8_ENC_ERROR_BAD_WRITE);
- return 0;
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_BAD_WRITE);
}
}
*coded_size = CHUNK_HEADER_SIZE + riff_size;
@@ -1504,8 +1508,7 @@ static int AllocateTransformBuffer(VP8LEncoder* const enc, int width,
ClearTransformBuffer(enc);
mem = (uint32_t*)WebPSafeMalloc(mem_size, sizeof(*mem));
if (mem == NULL) {
- WebPEncodingSetError(enc->pic_, VP8_ENC_ERROR_OUT_OF_MEMORY);
- return 0;
+ return WebPEncodingSetError(enc->pic_, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
enc->transform_mem_ = mem;
enc->transform_mem_size_ = (size_t)mem_size;
@@ -1613,8 +1616,7 @@ static int ApplyPalette(const uint32_t* src, uint32_t src_stride, uint32_t* dst,
int x, y;
if (tmp_row == NULL) {
- WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
- return 0;
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
if (palette_size < APPLY_PALETTE_GREEDY_MAX) {
@@ -1968,9 +1970,8 @@ int VP8LEncodeStream(const WebPConfig* const config,
int ok_main;
if (enc_main == NULL || !VP8LBitWriterInit(&bw_side, 0)) {
- WebPEncodingSetError(picture, VP8_ENC_ERROR_OUT_OF_MEMORY);
VP8LEncoderDelete(enc_main);
- return 0;
+ return WebPEncodingSetError(picture, VP8_ENC_ERROR_OUT_OF_MEMORY);
}
// Avoid "garbage value" error from Clang's static analysis tool.
@@ -2117,8 +2118,7 @@ int VP8LEncodeImage(const WebPConfig* const config,
if (picture == NULL) return 0;
if (config == NULL || picture->argb == NULL) {
- WebPEncodingSetError(picture, VP8_ENC_ERROR_NULL_PARAMETER);
- return 0;
+ return WebPEncodingSetError(picture, VP8_ENC_ERROR_NULL_PARAMETER);
}
width = picture->width;
diff --git a/qtimageformats/src/3rdparty/libwebp/src/enc/webp_enc.c b/qtimageformats/src/3rdparty/libwebp/src/enc/webp_enc.c
index 9620e05..583fe6a 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/enc/webp_enc.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/enc/webp_enc.c
@@ -307,7 +307,10 @@ int WebPEncodingSetError(const WebPPicture* const pic,
WebPEncodingError error) {
assert((int)error < VP8_ENC_ERROR_LAST);
assert((int)error >= VP8_ENC_OK);
- ((WebPPicture*)pic)->error_code = error;
+ // The oldest error reported takes precedence over the new one.
+ if (pic->error_code == VP8_ENC_OK) {
+ ((WebPPicture*)pic)->error_code = error;
+ }
return 0;
}
@@ -317,8 +320,7 @@ int WebPReportProgress(const WebPPicture* const pic,
*percent_store = percent;
if (pic->progress_hook && !pic->progress_hook(percent, pic)) {
// user abort requested
- WebPEncodingSetError(pic, VP8_ENC_ERROR_USER_ABORT);
- return 0;
+ return WebPEncodingSetError(pic, VP8_ENC_ERROR_USER_ABORT);
}
}
return 1; // ok
@@ -329,7 +331,7 @@ int WebPEncode(const WebPConfig* config, WebPPicture* pic) {
int ok = 0;
if (pic == NULL) return 0;
- WebPEncodingSetError(pic, VP8_ENC_OK); // all ok so far
+ pic->error_code = VP8_ENC_OK; // all ok so far
if (config == NULL) { // bad params
return WebPEncodingSetError(pic, VP8_ENC_ERROR_NULL_PARAMETER);
}
diff --git a/qtimageformats/src/3rdparty/libwebp/src/mux/muxi.h b/qtimageformats/src/3rdparty/libwebp/src/mux/muxi.h
index 7929138..afc5954 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/mux/muxi.h
+++ b/qtimageformats/src/3rdparty/libwebp/src/mux/muxi.h
@@ -29,7 +29,7 @@ extern "C" {
#define MUX_MAJ_VERSION 1
#define MUX_MIN_VERSION 3
-#define MUX_REV_VERSION 0
+#define MUX_REV_VERSION 2
// Chunk object.
typedef struct WebPChunk WebPChunk;
diff --git a/qtimageformats/src/3rdparty/libwebp/src/mux/muxread.c b/qtimageformats/src/3rdparty/libwebp/src/mux/muxread.c
index 8005039..9862ec6 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/mux/muxread.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/mux/muxread.c
@@ -116,9 +116,12 @@ static int MuxImageParse(const WebPChunk* const chunk, int copy_data,
// Each of ANMF chunk contain a header at the beginning. So, its size should
// be at least 'hdr_size'.
if (size < hdr_size) goto Fail;
- ChunkAssignData(&subchunk, &temp, copy_data, chunk->tag_);
+ if (ChunkAssignData(&subchunk, &temp, copy_data,
+ chunk->tag_) != WEBP_MUX_OK) {
+ goto Fail;
+ }
}
- ChunkSetHead(&subchunk, &wpi->header_);
+ if (ChunkSetHead(&subchunk, &wpi->header_) != WEBP_MUX_OK) goto Fail;
wpi->is_partial_ = 1; // Waiting for ALPH and/or VP8/VP8L chunks.
// Rest of the chunks.
diff --git a/qtimageformats/src/3rdparty/libwebp/src/utils/bit_reader_utils.c b/qtimageformats/src/3rdparty/libwebp/src/utils/bit_reader_utils.c
index 857cd60..a26557a 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/utils/bit_reader_utils.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/utils/bit_reader_utils.c
@@ -15,6 +15,7 @@
#include "src/webp/config.h"
#endif
+#include "src/dsp/cpu.h"
#include "src/utils/bit_reader_inl_utils.h"
#include "src/utils/utils.h"
@@ -121,7 +122,7 @@ int32_t VP8GetSignedValue(VP8BitReader* const br, int bits,
#define VP8L_LOG8_WBITS 4 // Number of bytes needed to store VP8L_WBITS bits.
-#if defined(__arm__) || defined(_M_ARM) || defined(__aarch64__) || \
+#if defined(__arm__) || defined(_M_ARM) || WEBP_AARCH64 || \
defined(__i386__) || defined(_M_IX86) || \
defined(__x86_64__) || defined(_M_X64)
#define VP8L_USE_FAST_LOAD
diff --git a/qtimageformats/src/3rdparty/libwebp/src/utils/bit_reader_utils.h b/qtimageformats/src/3rdparty/libwebp/src/utils/bit_reader_utils.h
index e64156e..25ff31e 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/utils/bit_reader_utils.h
+++ b/qtimageformats/src/3rdparty/libwebp/src/utils/bit_reader_utils.h
@@ -19,6 +19,7 @@
#ifdef _MSC_VER
#include <stdlib.h> // _byteswap_ulong
#endif
+#include "src/dsp/cpu.h"
#include "src/webp/types.h"
// Warning! This macro triggers quite some MACRO wizardry around func signature!
@@ -64,7 +65,7 @@ extern "C" {
#define BITS 56
#elif defined(__arm__) || defined(_M_ARM) // ARM
#define BITS 24
-#elif defined(__aarch64__) // ARM 64bit
+#elif WEBP_AARCH64 // ARM 64bit
#define BITS 56
#elif defined(__mips__) // MIPS
#define BITS 24
diff --git a/qtimageformats/src/3rdparty/libwebp/src/utils/huffman_utils.c b/qtimageformats/src/3rdparty/libwebp/src/utils/huffman_utils.c
index 90c2fbf..cf73abd 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/utils/huffman_utils.c
+++ b/qtimageformats/src/3rdparty/libwebp/src/utils/huffman_utils.c
@@ -177,21 +177,24 @@ static int BuildHuffmanTable(HuffmanCode* const root_table, int root_bits,
if (num_open < 0) {
return 0;
}
- if (root_table == NULL) continue;
for (; count[len] > 0; --count[len]) {
HuffmanCode code;
if ((key & mask) != low) {
- table += table_size;
+ if (root_table != NULL) table += table_size;
table_bits = NextTableBitSize(count, len, root_bits);
table_size = 1 << table_bits;
total_size += table_size;
low = key & mask;
- root_table[low].bits = (uint8_t)(table_bits + root_bits);
- root_table[low].value = (uint16_t)((table - root_table) - low);
+ if (root_table != NULL) {
+ root_table[low].bits = (uint8_t)(table_bits + root_bits);
+ root_table[low].value = (uint16_t)((table - root_table) - low);
+ }
+ }
+ if (root_table != NULL) {
+ code.bits = (uint8_t)(len - root_bits);
+ code.value = (uint16_t)sorted[symbol++];
+ ReplicateValue(&table[key >> root_bits], step, table_size, code);
}
- code.bits = (uint8_t)(len - root_bits);
- code.value = (uint16_t)sorted[symbol++];
- ReplicateValue(&table[key >> root_bits], step, table_size, code);
key = GetNextKey(key, len);
}
}
@@ -211,25 +214,83 @@ static int BuildHuffmanTable(HuffmanCode* const root_table, int root_bits,
((1 << MAX_CACHE_BITS) + NUM_LITERAL_CODES + NUM_LENGTH_CODES)
// Cut-off value for switching between heap and stack allocation.
#define SORTED_SIZE_CUTOFF 512
-int VP8LBuildHuffmanTable(HuffmanCode* const root_table, int root_bits,
+int VP8LBuildHuffmanTable(HuffmanTables* const root_table, int root_bits,
const int code_lengths[], int code_lengths_size) {
- int total_size;
+ const int total_size =
+ BuildHuffmanTable(NULL, root_bits, code_lengths, code_lengths_size, NULL);
assert(code_lengths_size <= MAX_CODE_LENGTHS_SIZE);
- if (root_table == NULL) {
- total_size = BuildHuffmanTable(NULL, root_bits,
- code_lengths, code_lengths_size, NULL);
- } else if (code_lengths_size <= SORTED_SIZE_CUTOFF) {
+ if (total_size == 0 || root_table == NULL) return total_size;
+
+ if (root_table->curr_segment->curr_table + total_size >=
+ root_table->curr_segment->start + root_table->curr_segment->size) {
+ // If 'root_table' does not have enough memory, allocate a new segment.
+ // The available part of root_table->curr_segment is left unused because we
+ // need a contiguous buffer.
+ const int segment_size = root_table->curr_segment->size;
+ struct HuffmanTablesSegment* next =
+ (HuffmanTablesSegment*)WebPSafeMalloc(1, sizeof(*next));
+ if (next == NULL) return 0;
+ // Fill the new segment.
+ // We need at least 'total_size' but if that value is small, it is better to
+ // allocate a big chunk to prevent more allocations later. 'segment_size' is
+ // therefore chosen (any other arbitrary value could be chosen).
+ next->size = total_size > segment_size ? total_size : segment_size;
+ next->start =
+ (HuffmanCode*)WebPSafeMalloc(next->size, sizeof(*next->start));
+ if (next->start == NULL) {
+ WebPSafeFree(next);
+ return 0;
+ }
+ next->curr_table = next->start;
+ next->next = NULL;
+ // Point to the new segment.
+ root_table->curr_segment->next = next;
+ root_table->curr_segment = next;
+ }
+ if (code_lengths_size <= SORTED_SIZE_CUTOFF) {
// use local stack-allocated array.
uint16_t sorted[SORTED_SIZE_CUTOFF];
- total_size = BuildHuffmanTable(root_table, root_bits,
- code_lengths, code_lengths_size, sorted);
- } else { // rare case. Use heap allocation.
+ BuildHuffmanTable(root_table->curr_segment->curr_table, root_bits,
+ code_lengths, code_lengths_size, sorted);
+ } else { // rare case. Use heap allocation.
uint16_t* const sorted =
(uint16_t*)WebPSafeMalloc(code_lengths_size, sizeof(*sorted));
if (sorted == NULL) return 0;
- total_size = BuildHuffmanTable(root_table, root_bits,
- code_lengths, code_lengths_size, sorted);
+ BuildHuffmanTable(root_table->curr_segment->curr_table, root_bits,
+ code_lengths, code_lengths_size, sorted);
WebPSafeFree(sorted);
}
return total_size;
}
+
+int VP8LHuffmanTablesAllocate(int size, HuffmanTables* huffman_tables) {
+ // Have 'segment' point to the first segment for now, 'root'.
+ HuffmanTablesSegment* const root = &huffman_tables->root;
+ huffman_tables->curr_segment = root;
+ // Allocate root.
+ root->start = (HuffmanCode*)WebPSafeMalloc(size, sizeof(*root->start));
+ if (root->start == NULL) return 0;
+ root->curr_table = root->start;
+ root->next = NULL;
+ root->size = size;
+ return 1;
+}
+
+void VP8LHuffmanTablesDeallocate(HuffmanTables* const huffman_tables) {
+ HuffmanTablesSegment *current, *next;
+ if (huffman_tables == NULL) return;
+ // Free the root node.
+ current = &huffman_tables->root;
+ next = current->next;
+ WebPSafeFree(current->start);
+ current->start = NULL;
+ current->next = NULL;
+ current = next;
+ // Free the following nodes.
+ while (current != NULL) {
+ next = current->next;
+ WebPSafeFree(current->start);
+ WebPSafeFree(current);
+ current = next;
+ }
+}
diff --git a/qtimageformats/src/3rdparty/libwebp/src/utils/huffman_utils.h b/qtimageformats/src/3rdparty/libwebp/src/utils/huffman_utils.h
index 13b7ad1..98415c5 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/utils/huffman_utils.h
+++ b/qtimageformats/src/3rdparty/libwebp/src/utils/huffman_utils.h
@@ -43,6 +43,29 @@ typedef struct {
// or non-literal symbol otherwise
} HuffmanCode32;
+// Contiguous memory segment of HuffmanCodes.
+typedef struct HuffmanTablesSegment {
+ HuffmanCode* start;
+ // Pointer to where we are writing into the segment. Starts at 'start' and
+ // cannot go beyond 'start' + 'size'.
+ HuffmanCode* curr_table;
+ // Pointer to the next segment in the chain.
+ struct HuffmanTablesSegment* next;
+ int size;
+} HuffmanTablesSegment;
+
+// Chained memory segments of HuffmanCodes.
+typedef struct HuffmanTables {
+ HuffmanTablesSegment root;
+ // Currently processed segment. At first, this is 'root'.
+ HuffmanTablesSegment* curr_segment;
+} HuffmanTables;
+
+// Allocates a HuffmanTables with 'size' contiguous HuffmanCodes. Returns 0 on
+// memory allocation error, 1 otherwise.
+int VP8LHuffmanTablesAllocate(int size, HuffmanTables* huffman_tables);
+void VP8LHuffmanTablesDeallocate(HuffmanTables* const huffman_tables);
+
#define HUFFMAN_PACKED_BITS 6
#define HUFFMAN_PACKED_TABLE_SIZE (1u << HUFFMAN_PACKED_BITS)
@@ -78,9 +101,7 @@ void VP8LHtreeGroupsFree(HTreeGroup* const htree_groups);
// the huffman table.
// Returns built table size or 0 in case of error (invalid tree or
// memory error).
-// If root_table is NULL, it returns 0 if a lookup cannot be built, something
-// > 0 otherwise (but not the table size).
-int VP8LBuildHuffmanTable(HuffmanCode* const root_table, int root_bits,
+int VP8LBuildHuffmanTable(HuffmanTables* const root_table, int root_bits,
const int code_lengths[], int code_lengths_size);
#ifdef __cplusplus
diff --git a/qtimageformats/src/3rdparty/libwebp/src/webp/decode.h b/qtimageformats/src/3rdparty/libwebp/src/webp/decode.h
index d982475..0177b12 100644
--- a/qtimageformats/src/3rdparty/libwebp/src/webp/decode.h
+++ b/qtimageformats/src/3rdparty/libwebp/src/webp/decode.h
@@ -81,10 +81,11 @@ WEBP_EXTERN uint8_t* WebPDecodeBGR(const uint8_t* data, size_t data_size,
// returned is the Y samples buffer. Upon return, *u and *v will point to
// the U and V chroma data. These U and V buffers need NOT be passed to
// WebPFree(), unlike the returned Y luma one. The dimension of the U and V
-// planes are both (*width + 1) / 2 and (*height + 1)/ 2.
+// planes are both (*width + 1) / 2 and (*height + 1) / 2.
// Upon return, the Y buffer has a stride returned as '*stride', while U and V
// have a common stride returned as '*uv_stride'.
-// Return NULL in case of error.
+// 'width' and 'height' may be NULL, the other pointers must not be.
+// Returns NULL in case of error.
// (*) Also named Y'CbCr. See: https://en.wikipedia.org/wiki/YCbCr
WEBP_EXTERN uint8_t* WebPDecodeYUV(const uint8_t* data, size_t data_size,
int* width, int* height,
diff --git a/qtimageformats/src/plugins/imageformats/tiff/qtiffhandler.cpp b/qtimageformats/src/plugins/imageformats/tiff/qtiffhandler.cpp
index f0dfe7f..5cb0522 100644
--- a/qtimageformats/src/plugins/imageformats/tiff/qtiffhandler.cpp
+++ b/qtimageformats/src/plugins/imageformats/tiff/qtiffhandler.cpp
@@ -38,13 +38,14 @@
****************************************************************************/
#include "qtiffhandler_p.h"
-#include <qvariant.h>
#include <qcolorspace.h>
#include <qdebug.h>
#include <qimage.h>
#include <qglobal.h>
#include <qbuffer.h>
#include <qfiledevice.h>
+#include <qvariant.h>
+#include <qvarlengtharray.h>
extern "C" {
#include "tiffio.h"
diff --git a/qtimageformats/src/plugins/imageformats/webp/qwebphandler.cpp b/qtimageformats/src/plugins/imageformats/webp/qwebphandler.cpp
index 82d38cb..d02eb05 100644
--- a/qtimageformats/src/plugins/imageformats/webp/qwebphandler.cpp
+++ b/qtimageformats/src/plugins/imageformats/webp/qwebphandler.cpp
@@ -45,6 +45,7 @@
#include <qdebug.h>
#include <qpainter.h>
#include <qvariant.h>
+#include <QtEndian>
static const int riffHeaderSize = 12; // RIFF_HEADER_SIZE from webp/format_constants.h
@@ -102,21 +103,23 @@ bool QWebpHandler::ensureScanned() const
m_scanState = ScanError;
- if (device()->isSequential()) {
- qWarning() << "Sequential devices are not supported";
+ QWebpHandler *that = const_cast<QWebpHandler *>(this);
+ const int headerBytesNeeded = sizeof(WebPBitstreamFeatures);
+ QByteArray header = device()->peek(headerBytesNeeded);
+ if (header.size() < headerBytesNeeded)
return false;
- }
- qint64 oldPos = device()->pos();
- device()->seek(0);
-
- QWebpHandler *that = const_cast<QWebpHandler *>(this);
- QByteArray header = device()->peek(sizeof(WebPBitstreamFeatures));
+ // We do no random access during decoding, just a readAll() of the whole image file. So if
+ // if it is all available already, we can accept a sequential device. The riff header contains
+ // the file size minus 8 bytes header
+ qint64 byteSize = qFromLittleEndian<quint32>(header.constData() + 4);
+ if (device()->isSequential() && device()->bytesAvailable() < byteSize + 8) {
+ qWarning() << "QWebpHandler: Insufficient data available in sequential device";
+ return false;
+ }
if (WebPGetFeatures((const uint8_t*)header.constData(), header.size(), &(that->m_features)) == VP8_STATUS_OK) {
if (m_features.has_animation) {
// For animation, we have to read and scan whole file to determine loop count and images count
- device()->seek(oldPos);
-
if (that->ensureDemuxer()) {
that->m_loop = WebPDemuxGetI(m_demuxer, WEBP_FF_LOOP_COUNT);
that->m_frameCount = WebPDemuxGetI(m_demuxer, WEBP_FF_FRAME_COUNT);
@@ -126,17 +129,13 @@ bool QWebpHandler::ensureScanned() const
if (that->m_features.has_alpha)
that->m_composited->fill(Qt::transparent);
- // We do not reset device position since we have read in all data
m_scanState = ScanSuccess;
- return true;
}
} else {
m_scanState = ScanSuccess;
}
}
- device()->seek(oldPos);
-
return m_scanState == ScanSuccess;
}
@@ -159,7 +158,7 @@ bool QWebpHandler::ensureDemuxer()
bool QWebpHandler::read(QImage *image)
{
- if (!ensureScanned() || device()->isSequential() || !ensureDemuxer())
+ if (!ensureScanned() || !ensureDemuxer())
return false;
QRect prevFrameRect;
Submodule qtlocation f6953a8d..c576985d:
Submodule src/3rdparty/mapbox-gl-native d3101bbc...4c88f2c0 (commits not present)
diff --git a/qtlocation/src/location/configure.json b/qtlocation/src/location/configure.json
index 6d01a9a3..d1e623a1 100644
--- a/qtlocation/src/location/configure.json
+++ b/qtlocation/src/location/configure.json
@@ -9,7 +9,7 @@
"label": "Qt.labs.location experimental QML plugin",
"purpose": "Provides experimental QtLocation QML types",
"section": "Location",
- "condition": "config.opengl",
+ "condition": "features.opengl",
"output": [ "privateFeature" ]
},
"geoservices_osm": {
diff --git a/qtlocation/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp b/qtlocation/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
index a978573d..11e1466f 100644
--- a/qtlocation/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
+++ b/qtlocation/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
@@ -158,7 +158,7 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind
if (!root)
return;
- if (m_mapObjectsRootNode && m_mapObjectsRootNode->parent())
+ if (m_mapObjectsRootNode && !m_mapObjectsRootNode->parent())
root->appendChildNode(m_mapObjectsRootNode.get());
if (!m_mapObjectsRootNode) {
diff --git a/qtlocation/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp b/qtlocation/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
index 68b2429e..deef29f9 100644
--- a/qtlocation/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
+++ b/qtlocation/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
@@ -66,11 +66,8 @@ QGeoCodingManagerEngineNokia::QGeoCodingManagerEngineNokia(
Q_ASSERT(networkManager);
m_networkManager->setParent(this);
- if (parameters.contains(QStringLiteral("here.token")))
- m_token = parameters.value(QStringLiteral("here.token")).toString();
-
- if (parameters.contains(QStringLiteral("here.app_id")))
- m_applicationId = parameters.value(QStringLiteral("here.app_id")).toString();
+ if (parameters.contains(QStringLiteral("here.apiKey")))
+ m_apiKey = parameters.value(QStringLiteral("here.apiKey")).toString();
if (error)
*error = QGeoServiceProvider::NoError;
@@ -85,12 +82,9 @@ QString QGeoCodingManagerEngineNokia::getAuthenticationString() const
{
QString authenticationString;
- if (!m_token.isEmpty() && !m_applicationId.isEmpty()) {
- authenticationString += "?app_code=";
- authenticationString += m_token;
-
- authenticationString += "&app_id=";
- authenticationString += m_applicationId;
+ if (!m_apiKey.isEmpty()) {
+ authenticationString += "?apiKey=";
+ authenticationString += m_apiKey;
}
return authenticationString;
diff --git a/qtlocation/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h b/qtlocation/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
index 9e1564aa..a7cfd06a 100644
--- a/qtlocation/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
+++ b/qtlocation/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
@@ -82,8 +82,7 @@ private:
QGeoNetworkAccessManager *m_networkManager;
QGeoUriProvider *m_uriProvider;
QGeoUriProvider *m_reverseGeocodingUriProvider;
- QString m_token;
- QString m_applicationId;
+ QString m_apiKey;
};
QT_END_NAMESPACE
diff --git a/qtlocation/src/plugins/geoservices/nokia/qgeoerror_messages.cpp b/qtlocation/src/plugins/geoservices/nokia/qgeoerror_messages.cpp
index 576ecd43..f49e0905 100644
--- a/qtlocation/src/plugins/geoservices/nokia/qgeoerror_messages.cpp
+++ b/qtlocation/src/plugins/geoservices/nokia/qgeoerror_messages.cpp
@@ -39,7 +39,7 @@
QT_BEGIN_NAMESPACE
const char NOKIA_PLUGIN_CONTEXT_NAME[] = "QtLocationQML";
-const char MISSED_CREDENTIALS[] = QT_TRANSLATE_NOOP("QtLocationQML", "Qt Location requires app_id and token parameters.\nPlease register at https://developer.here.com/ to get your personal application credentials.");
+const char MISSED_CREDENTIALS[] = QT_TRANSLATE_NOOP("QtLocationQML", "Qt Location requires apiKey parameter.\nPlease register at https://developer.here.com/ to get your personal application credentials.");
const char SAVING_PLACE_NOT_SUPPORTED[] = QT_TRANSLATE_NOOP("QtLocationQML", "Saving places is not supported.");
const char REMOVING_PLACE_NOT_SUPPORTED[] = QT_TRANSLATE_NOOP("QtLocationQML", "Removing places is not supported.");
const char SAVING_CATEGORY_NOT_SUPPORTED[] = QT_TRANSLATE_NOOP("QtLocationQML", "Saving categories is not supported.");
diff --git a/qtlocation/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/qtlocation/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
index 73b998b1..a938096b 100644
--- a/qtlocation/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+++ b/qtlocation/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
@@ -60,8 +60,7 @@ QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia(
Q_ASSERT(networkManager);
m_networkManager->setParent(this);
- m_appId = parameters.value(QStringLiteral("here.app_id")).toString();
- m_token = parameters.value(QStringLiteral("here.token")).toString();
+ m_apiKey = parameters.value(QStringLiteral("here.apiKey")).toString();
QGeoRouteRequest::FeatureTypes featureTypes;
featureTypes |= QGeoRouteRequest::TollFeature;
@@ -219,18 +218,16 @@ QStringList QGeoRoutingManagerEngineNokia::calculateRouteRequestString(const QGe
return QStringList();
QStringList requests;
- QString baseRequest = QStringLiteral("http://");
+ QString baseRequest = QStringLiteral("https://");
baseRequest += m_uriProvider->getCurrentHost();
baseRequest += QStringLiteral("/routing/7.2/calculateroute.xml");
baseRequest += QStringLiteral("?alternatives=");
baseRequest += QString::number(request.numberAlternativeRoutes());
- if (!m_appId.isEmpty() && !m_token.isEmpty()) {
- baseRequest += QStringLiteral("&app_id=");
- baseRequest += m_appId;
- baseRequest += QStringLiteral("&token=");
- baseRequest += m_token;
+ if (!m_apiKey.isEmpty()) {
+ baseRequest += QStringLiteral("&apiKey=");
+ baseRequest += m_apiKey;
}
const QList<QVariantMap> metadata = request.waypointsMetadata();
@@ -281,7 +278,7 @@ QStringList QGeoRoutingManagerEngineNokia::updateRouteRequestString(const QGeoRo
return QStringList();
QStringList requests;
- QString baseRequest = "http://";
+ QString baseRequest = "https://";
baseRequest += m_uriProvider->getCurrentHost();
baseRequest += "/routing/7.2/getroute.xml";
diff --git a/qtlocation/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h b/qtlocation/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
index 9335bcac..67fb5825 100644
--- a/qtlocation/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
+++ b/qtlocation/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
@@ -77,8 +77,7 @@ private:
QGeoNetworkAccessManager *m_networkManager;
QGeoUriProvider *m_uriProvider;
- QString m_appId;
- QString m_token;
+ QString m_apiKey;
};
QT_END_NAMESPACE
diff --git a/qtlocation/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/qtlocation/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
index e4ef86d6..2c53dd16 100644
--- a/qtlocation/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
+++ b/qtlocation/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
@@ -75,20 +75,15 @@ namespace
void checkUsageTerms(const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString)
{
- QString appId, token;
+ const QString apiKey = parameters.value(QStringLiteral("here.apiKey")).toString();
- appId = parameters.value(QStringLiteral("here.app_id")).toString();
- token = parameters.value(QStringLiteral("here.token")).toString();
-
- if (isValidParameter(appId) && isValidParameter(token))
+ if (isValidParameter(apiKey))
return;
- else if (!isValidParameter(appId))
- qWarning() << "Invalid here.app_id";
else
- qWarning() << "Invalid here.token";
+ qWarning() << "Invalid here.apiKey";
- if (parameters.contains(QStringLiteral("app_id")) || parameters.contains(QStringLiteral("token")))
- qWarning() << QStringLiteral("Please prefix 'app_id' and 'token' with prefix 'here' (e.g.: 'here.app_id')");
+ if (parameters.contains(QStringLiteral("apiKey")))
+ qWarning() << QStringLiteral("Please prefix 'apiKey' with prefix 'here' (e.g.: 'here.apiKey')");
*error = QGeoServiceProvider::MissingRequiredParameterError;
*errorString = QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, MISSED_CREDENTIALS);
diff --git a/qtlocation/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/qtlocation/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
index d07a93ba..4cfd62f8 100644
--- a/qtlocation/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
+++ b/qtlocation/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
@@ -84,8 +84,7 @@ QGeoTileFetcherNokia::QGeoTileFetcherNokia(const QVariantMap &parameters,
m_tileSize = qMax(tileSize.width(), tileSize.height());
m_networkManager->setParent(this);
- m_applicationId = parameters.value(QStringLiteral("here.app_id")).toString();
- m_token = parameters.value(QStringLiteral("here.token")).toString();
+ m_apiKey = parameters.value(QStringLiteral("here.apiKey")).toString();
}
QGeoTileFetcherNokia::~QGeoTileFetcherNokia()
@@ -127,7 +126,7 @@ QString QGeoTileFetcherNokia::getRequestString(const QGeoTileSpec &spec, int ppi
if (!m_engineNokia)
return QString();
- static const QString http("http://");
+ static const QString http("https://");
static const QString path("/maptile/2.1/maptile/newest/");
static const QChar slash('/');
@@ -152,12 +151,9 @@ QString QGeoTileFetcherNokia::getRequestString(const QGeoTileSpec &spec, int ppi
static const QString slashpng("/png8");
requestString += slashpng;
- if (!m_token.isEmpty() && !m_applicationId.isEmpty()) { // TODO: remove the if
- requestString += "?token=";
- requestString += m_token;
-
- requestString += "&app_id=";
- requestString += m_applicationId;
+ if (!m_apiKey.isEmpty()) { // TODO: remove the if
+ requestString += "?apiKey=";
+ requestString += m_apiKey;
}
requestString += "&ppi=" + QString::number(ppi);
@@ -235,14 +231,9 @@ QString QGeoTileFetcherNokia::getLanguageString() const
// No "lg" param means that we want English.
}
-QString QGeoTileFetcherNokia::token() const
-{
- return m_token;
-}
-
-QString QGeoTileFetcherNokia::applicationId() const
+QString QGeoTileFetcherNokia::apiKey() const
{
- return m_applicationId;
+ return m_apiKey;
}
void QGeoTileFetcherNokia::copyrightsFetched()
@@ -271,19 +262,14 @@ void QGeoTileFetcherNokia::versionFetched()
void QGeoTileFetcherNokia::fetchCopyrightsData()
{
- QString copyrightUrl = QStringLiteral("http://");
+ QString copyrightUrl = QStringLiteral("https://");
copyrightUrl += m_baseUriProvider->getCurrentHost();
copyrightUrl += QStringLiteral("/maptile/2.1/copyright/newest?output=json");
- if (!token().isEmpty()) {
- copyrightUrl += QStringLiteral("&token=");
- copyrightUrl += token();
- }
-
- if (!applicationId().isEmpty()) {
- copyrightUrl += QStringLiteral("&app_id=");
- copyrightUrl += applicationId();
+ if (!apiKey().isEmpty()) {
+ copyrightUrl += QStringLiteral("&apiKey=");
+ copyrightUrl += apiKey();
}
QNetworkRequest netRequest((QUrl(copyrightUrl)));
@@ -303,19 +289,14 @@ void QGeoTileFetcherNokia::fetchCopyrightsData()
void QGeoTileFetcherNokia::fetchVersionData()
{
- QString versionUrl = QStringLiteral("http://");
+ QString versionUrl = QStringLiteral("https://");
versionUrl += m_baseUriProvider->getCurrentHost();
versionUrl += QStringLiteral("/maptile/2.1/version");
- if (!token().isEmpty()) {
- versionUrl += QStringLiteral("?token=");
- versionUrl += token();
- }
-
- if (!applicationId().isEmpty()) {
- versionUrl += QStringLiteral("&app_id=");
- versionUrl += applicationId();
+ if (!apiKey().isEmpty()) {
+ versionUrl += QStringLiteral("?apiKey=");
+ versionUrl += apiKey();
}
QNetworkRequest netRequest((QUrl(versionUrl)));
diff --git a/qtlocation/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h b/qtlocation/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h
index 06d1bba9..ee0cb0e9 100644
--- a/qtlocation/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h
+++ b/qtlocation/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h
@@ -62,8 +62,7 @@ public:
QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec);
- QString token() const;
- QString applicationId() const;
+ QString apiKey() const;
public Q_SLOTS:
void copyrightsFetched();
@@ -82,11 +81,10 @@ private:
QGeoNetworkAccessManager *m_networkManager;
int m_tileSize;
int m_ppi;
- QString m_token;
QNetworkReply *m_copyrightsReply;
QNetworkReply *m_versionReply;
- QString m_applicationId;
+ QString m_apiKey;
QGeoUriProvider *m_baseUriProvider;
QGeoUriProvider *m_aerialUriProvider;
};
diff --git a/qtlocation/src/plugins/geoservices/nokia/qgeouriprovider.cpp b/qtlocation/src/plugins/geoservices/nokia/qgeouriprovider.cpp
index 7be90bb2..6a4f6986 100644
--- a/qtlocation/src/plugins/geoservices/nokia/qgeouriprovider.cpp
+++ b/qtlocation/src/plugins/geoservices/nokia/qgeouriprovider.cpp
@@ -61,7 +61,7 @@ QGeoUriProvider::QGeoUriProvider(
QString QGeoUriProvider::getCurrentHost() const
{
if (m_maxSubdomains) {
- QString result(m_firstSubdomain.toLatin1() + QRandomGenerator::global()->bounded(m_maxSubdomains));
+ QString result(static_cast<char>(m_firstSubdomain.toLatin1() + QRandomGenerator::global()->bounded(m_maxSubdomains)));
result += '.' + m_currentHost;
return result;
}
diff --git a/qtlocation/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/qtlocation/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
index c5c05a2e..4c6e9774 100644
--- a/qtlocation/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
+++ b/qtlocation/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
@@ -208,8 +208,7 @@ QPlaceManagerEngineNokiaV2::QPlaceManagerEngineNokiaV2(
m_locales.append(QLocale());
- m_appId = parameters.value(QStringLiteral("here.app_id")).toString();
- m_appCode = parameters.value(QStringLiteral("here.token")).toString();
+ m_apiKey = parameters.value(QStringLiteral("here.apiKey")).toString();
m_theme = parameters.value(IconThemeKey, QString()).toString();
@@ -237,7 +236,7 @@ QPlaceManagerEngineNokiaV2::~QPlaceManagerEngineNokiaV2() {}
QPlaceDetailsReply *QPlaceManagerEngineNokiaV2::getPlaceDetails(const QString &placeId)
{
- QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() +
+ QUrl requestUrl(QString::fromLatin1("https://") + m_uriProvider->getCurrentHost() +
QStringLiteral("/places/v1/places/") + placeId);
QUrlQuery queryItems;
@@ -268,7 +267,7 @@ QPlaceContentReply *QPlaceManagerEngineNokiaV2::getPlaceContent(const QPlaceCont
networkReply = sendRequest(u);
} else {
- QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() +
+ QUrl requestUrl(QString::fromLatin1("https://") + m_uriProvider->getCurrentHost() +
QStringLiteral("/places/v1/places/") + request.placeId() +
QStringLiteral("/media/"));
@@ -410,7 +409,7 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest
networkReply = sendRequest(u);
} else if (!query.searchTerm().isEmpty()) {
// search term query
- QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() +
+ QUrl requestUrl(QString::fromLatin1("https://") + m_uriProvider->getCurrentHost() +
QStringLiteral("/places/v1/discover/search"));
queryItems.addQueryItem(QStringLiteral("q"), query.searchTerm());
@@ -432,7 +431,7 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest
return reply;
} else if (!query.recommendationId().isEmpty()) {
- QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() +
+ QUrl requestUrl(QString::fromLatin1("https://") + m_uriProvider->getCurrentHost() +
QStringLiteral("/places/v1/places/") + query.recommendationId() +
QStringLiteral("/related/recommended"));
@@ -443,7 +442,7 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest
networkReply = sendRequest(requestUrl);
} else {
// category search
- QUrl requestUrl(QStringLiteral("http://") + m_uriProvider->getCurrentHost() +
+ QUrl requestUrl(QStringLiteral("https://") + m_uriProvider->getCurrentHost() +
QStringLiteral("/places/v1/discover/explore"));
QStringList ids;
@@ -498,7 +497,7 @@ QPlaceSearchSuggestionReply *QPlaceManagerEngineNokiaV2::searchSuggestions(const
return reply;
}
- QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() +
+ QUrl requestUrl(QString::fromLatin1("https://") + m_uriProvider->getCurrentHost() +
QStringLiteral("/places/v1/suggest"));
QUrlQuery queryItems;
@@ -633,7 +632,7 @@ QPlaceReply *QPlaceManagerEngineNokiaV2::initializeCategories()
for (auto it = m_tempTree.keyBegin(), end = m_tempTree.keyEnd(); it != end; ++it) {
if (*it == QString())
continue;
- QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() +
+ QUrl requestUrl(QString::fromLatin1("https://") + m_uriProvider->getCurrentHost() +
QStringLiteral("/places/v1/categories/places/") + *it);
QNetworkReply *networkReply = sendRequest(requestUrl);
connect(networkReply, SIGNAL(finished()), this, SLOT(categoryReplyFinished()));
@@ -831,8 +830,7 @@ void QPlaceManagerEngineNokiaV2::categoryReplyError()
QNetworkReply *QPlaceManagerEngineNokiaV2::sendRequest(const QUrl &url)
{
QUrlQuery queryItems(url);
- queryItems.addQueryItem(QStringLiteral("app_id"), m_appId);
- queryItems.addQueryItem(QStringLiteral("app_code"), m_appCode);
+ queryItems.addQueryItem(QStringLiteral("apiKey"), m_apiKey);
QUrl requestUrl = url;
requestUrl.setQuery(queryItems);
diff --git a/qtlocation/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h b/qtlocation/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
index cd632958..6784ce4f 100644
--- a/qtlocation/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
+++ b/qtlocation/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
@@ -122,8 +122,7 @@ private:
QPointer<QPlaceCategoriesReplyHere> m_categoryReply;
QHash<QString, QNetworkReply *> m_categoryRequests;
- QString m_appId;
- QString m_appCode;
+ QString m_apiKey;
QString m_localDataPath;
QString m_theme;
diff --git a/qtlocation/src/plugins/geoservices/nokia/uri_constants.cpp b/qtlocation/src/plugins/geoservices/nokia/uri_constants.cpp
index 8db47beb..030006f5 100644
--- a/qtlocation/src/plugins/geoservices/nokia/uri_constants.cpp
+++ b/qtlocation/src/plugins/geoservices/nokia/uri_constants.cpp
@@ -37,11 +37,11 @@
QT_BEGIN_NAMESPACE
-const QString ROUTING_HOST = QLatin1String("route.api.here.com");
-const QString GEOCODING_HOST = QLatin1String("geocoder.api.here.com");
-const QString REVERSE_GEOCODING_HOST = QLatin1String("reverse.geocoder.api.here.com");
-const QString PLACES_HOST = QLatin1String("places.api.here.com");
-const QString MAP_TILES_HOST = QLatin1String("1-4.base.maps.api.here.com");
-const QString MAP_TILES_HOST_AERIAL = QLatin1String("1-4.aerial.maps.api.here.com");
+const QString ROUTING_HOST = QLatin1String("route.ls.hereapi.com");
+const QString GEOCODING_HOST = QLatin1String("geocoder.ls.hereapi.com");
+const QString REVERSE_GEOCODING_HOST = QLatin1String("reverse.geocoder.ls.hereapi.com");
+const QString PLACES_HOST = QLatin1String("places.ls.hereapi.com");
+const QString MAP_TILES_HOST = QLatin1String("1-4.base.maps.ls.hereapi.com");
+const QString MAP_TILES_HOST_AERIAL = QLatin1String("1-4.aerial.maps.ls.hereapi.com");
QT_END_NAMESPACE
Submodule qtmultimedia 374d71e2..75143525:
diff --git a/qtmultimedia/src/gsttools/qgstvideorenderersink.cpp b/qtmultimedia/src/gsttools/qgstvideorenderersink.cpp
index 4000f2178..a446d93fe 100644
--- a/qtmultimedia/src/gsttools/qgstvideorenderersink.cpp
+++ b/qtmultimedia/src/gsttools/qgstvideorenderersink.cpp
@@ -368,7 +368,8 @@ static GstGLContext *gstGLDisplayContext(QAbstractVideoSurface *surface)
if (!nativeContext)
qWarning() << "Could not find resource for" << contextName;
- GstGLContext *appContext = gst_gl_context_new_wrapped(display, (guintptr)nativeContext, glPlatform, GST_GL_API_ANY);
+ GstGLAPI glApi = QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL ? GST_GL_API_OPENGL : GST_GL_API_GLES2;
+ GstGLContext *appContext = gst_gl_context_new_wrapped(display, (guintptr)nativeContext, glPlatform, glApi);
if (!appContext)
qWarning() << "Could not create wrappped context for platform:" << glPlatform;
diff --git a/qtmultimedia/src/multimediawidgets/multimediawidgets.pro b/qtmultimedia/src/multimediawidgets/multimediawidgets.pro
index 1919e8107..4c30d8fbf 100644
--- a/qtmultimedia/src/multimediawidgets/multimediawidgets.pro
+++ b/qtmultimedia/src/multimediawidgets/multimediawidgets.pro
@@ -2,8 +2,6 @@
TARGET = QtMultimediaWidgets
QT = core gui multimedia widgets-private
QT_PRIVATE += multimedia-private
-qtHaveModule(opengl): \
- QT_PRIVATE += opengl
PRIVATE_HEADERS += \
qvideowidget_p.h \
Submodule qtpim 02efef5e...f9a8f0fc (commits not present)
Submodule qtquick3d fbb81863..a0c37ca7:
diff --git a/qtquick3d/src/plugins/assetimporters/assimp/assimp.pro b/qtquick3d/src/plugins/assetimporters/assimp/assimp.pro
index ca5c499e..174a075b 100644
--- a/qtquick3d/src/plugins/assetimporters/assimp/assimp.pro
+++ b/qtquick3d/src/plugins/assetimporters/assimp/assimp.pro
@@ -10,7 +10,7 @@ QT_FOR_CONFIG += assetimporters-private
include($$OUT_PWD/../qtassetimporters-config.pri)
qtConfig(system-assimp):!if(cross_compile:host_build) {
- QMAKE_USE_PRIVATE += assimp
+ QMAKE_USE_PRIVATE += quick3d-assimp
} else {
include(../../../3rdparty/assimp/assimp.pri)
}
Submodule qtquickcontrols2 480694ae..1fc98160:
diff --git a/qtquickcontrols2/src/imports/platform/widgets/qwidgetplatformmenu.cpp b/qtquickcontrols2/src/imports/platform/widgets/qwidgetplatformmenu.cpp
index e5fe734f7..e36922775 100644
--- a/qtquickcontrols2/src/imports/platform/widgets/qwidgetplatformmenu.cpp
+++ b/qtquickcontrols2/src/imports/platform/widgets/qwidgetplatformmenu.cpp
@@ -38,6 +38,7 @@
#include "qwidgetplatformmenuitem_p.h"
#include <QtGui/qwindow.h>
+#include <QtGui/private/qhighdpiscaling_p.h>
#include <QtWidgets/qmenu.h>
#include <QtWidgets/qaction.h>
@@ -145,7 +146,7 @@ void QWidgetPlatformMenu::showPopup(const QWindow *window, const QRect &targetRe
QPoint targetPos = targetRect.bottomLeft();
if (window)
- targetPos = window->mapToGlobal(targetPos);
+ targetPos = window->mapToGlobal(QHighDpi::fromNativeLocalPosition(targetPos, window));
const QWidgetPlatformMenuItem *widgetItem = qobject_cast<const QWidgetPlatformMenuItem *>(item);
m_menu->popup(targetPos, widgetItem ? widgetItem->action() : nullptr);
diff --git a/qtquickcontrols2/src/quicktemplates2/qquickabstractbutton.cpp b/qtquickcontrols2/src/quicktemplates2/qquickabstractbutton.cpp
index 20cf59c1a..43af47a94 100644
--- a/qtquickcontrols2/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/qtquickcontrols2/src/quicktemplates2/qquickabstractbutton.cpp
@@ -1201,6 +1201,12 @@ QAccessible::Role QQuickAbstractButton::accessibleRole() const
}
return QAccessible::Button;
}
+
+void QQuickAbstractButton::accessiblePressAction()
+{
+ Q_D(QQuickAbstractButton);
+ d->trigger();
+}
#endif
QT_END_NAMESPACE
diff --git a/qtquickcontrols2/src/quicktemplates2/qquickabstractbutton_p.h b/qtquickcontrols2/src/quicktemplates2/qquickabstractbutton_p.h
index 0fa48980e..ab66220d0 100644
--- a/qtquickcontrols2/src/quicktemplates2/qquickabstractbutton_p.h
+++ b/qtquickcontrols2/src/quicktemplates2/qquickabstractbutton_p.h
@@ -209,6 +209,7 @@ protected:
#if QT_CONFIG(accessibility)
void accessibilityActiveChanged(bool active) override;
QAccessible::Role accessibleRole() const override;
+ Q_INVOKABLE void accessiblePressAction();
#endif
private:
diff --git a/qtquickcontrols2/src/quicktemplates2/qquickcontainer.cpp b/qtquickcontrols2/src/quicktemplates2/qquickcontainer.cpp
index f38c2b09c..6eed2a024 100644
--- a/qtquickcontrols2/src/quicktemplates2/qquickcontainer.cpp
+++ b/qtquickcontrols2/src/quicktemplates2/qquickcontainer.cpp
@@ -225,6 +225,7 @@ void QQuickContainerPrivate::cleanup()
QObject::disconnect(contentModel, &QQmlObjectModel::countChanged, q, &QQuickContainer::countChanged);
QObject::disconnect(contentModel, &QQmlObjectModel::childrenChanged, q, &QQuickContainer::contentChildrenChanged);
delete contentModel;
+ contentModel = nullptr;
}
QQuickItem *QQuickContainerPrivate::itemAt(int index) const
@@ -436,7 +437,7 @@ void QQuickContainerPrivate::contentChildren_clear(QQmlListProperty<QQuickItem>
void QQuickContainerPrivate::updateContentWidth()
{
Q_Q(QQuickContainer);
- if (hasContentWidth || qFuzzyCompare(contentWidth, implicitContentWidth))
+ if (hasContentWidth || qFuzzyCompare(contentWidth, implicitContentWidth) || !contentModel)
return;
contentWidth = implicitContentWidth;
@@ -446,7 +447,7 @@ void QQuickContainerPrivate::updateContentWidth()
void QQuickContainerPrivate::updateContentHeight()
{
Q_Q(QQuickContainer);
- if (hasContentHeight || qFuzzyCompare(contentHeight, implicitContentHeight))
+ if (hasContentHeight || qFuzzyCompare(contentHeight, implicitContentHeight) || !contentModel)
return;
contentHeight = implicitContentHeight;
diff --git a/qtquickcontrols2/src/quicktemplates2/qquickcontrol.cpp b/qtquickcontrols2/src/quicktemplates2/qquickcontrol.cpp
index a719efd34..768691dac 100644
--- a/qtquickcontrols2/src/quicktemplates2/qquickcontrol.cpp
+++ b/qtquickcontrols2/src/quicktemplates2/qquickcontrol.cpp
@@ -2334,12 +2334,13 @@ QAccessible::Role QQuickControl::accessibleRole() const
void QQuickControl::accessibilityActiveChanged(bool active)
{
+ Q_D(QQuickControl);
if (!active)
return;
QQuickAccessibleAttached *accessibleAttached = qobject_cast<QQuickAccessibleAttached *>(qmlAttachedPropertiesObject<QQuickAccessibleAttached>(this, true));
Q_ASSERT(accessibleAttached);
- accessibleAttached->setRole(accessibleRole());
+ accessibleAttached->setRole(d->effectiveAccessibleRole());
}
#endif
diff --git a/qtquickcontrols2/src/quicktemplates2/qquickdialogbuttonbox.cpp b/qtquickcontrols2/src/quicktemplates2/qquickdialogbuttonbox.cpp
index e6db14eb5..6197d1547 100644
--- a/qtquickcontrols2/src/quicktemplates2/qquickdialogbuttonbox.cpp
+++ b/qtquickcontrols2/src/quicktemplates2/qquickdialogbuttonbox.cpp
@@ -237,7 +237,7 @@ static QRectF alignedRect(Qt::LayoutDirection direction, Qt::Alignment alignment
void QQuickDialogButtonBoxPrivate::resizeContent()
{
Q_Q(QQuickDialogButtonBox);
- if (!contentItem)
+ if (!contentItem || !contentModel)
return;
QRectF geometry = q->boundingRect().adjusted(q->leftPadding(), q->topPadding(), -q->rightPadding(), -q->bottomPadding());
@@ -322,6 +322,9 @@ void QQuickDialogButtonBoxPrivate::updateLayout()
qreal QQuickDialogButtonBoxPrivate::getContentWidth() const
{
Q_Q(const QQuickDialogButtonBox);
+ if (!contentModel)
+ return 0;
+
const int count = contentModel->count();
const qreal totalSpacing = qMax(0, count - 1) * spacing;
qreal totalWidth = totalSpacing;
@@ -341,6 +344,9 @@ qreal QQuickDialogButtonBoxPrivate::getContentWidth() const
qreal QQuickDialogButtonBoxPrivate::getContentHeight() const
{
Q_Q(const QQuickDialogButtonBox);
+ if (!contentModel)
+ return 0;
+
const int count = contentModel->count();
qreal maxHeight = 0;
for (int i = 0; i < count; ++i) {
diff --git a/qtquickcontrols2/src/quicktemplates2/qquicklabel.cpp b/qtquickcontrols2/src/quicktemplates2/qquicklabel.cpp
index 71b60a2bc..2bc621674 100644
--- a/qtquickcontrols2/src/quicktemplates2/qquicklabel.cpp
+++ b/qtquickcontrols2/src/quicktemplates2/qquicklabel.cpp
@@ -263,7 +263,7 @@ void QQuickLabelPrivate::accessibilityActiveChanged(bool active)
Q_Q(QQuickLabel);
QQuickAccessibleAttached *accessibleAttached = qobject_cast<QQuickAccessibleAttached *>(qmlAttachedPropertiesObject<QQuickAccessibleAttached>(q, true));
Q_ASSERT(accessibleAttached);
- accessibleAttached->setRole(accessibleRole());
+ accessibleAttached->setRole(effectiveAccessibleRole());
maybeSetAccessibleName(text);
}
diff --git a/qtquickcontrols2/src/quicktemplates2/qquickoverlay.cpp b/qtquickcontrols2/src/quicktemplates2/qquickoverlay.cpp
index 91bd59184..0ce518f84 100644
--- a/qtquickcontrols2/src/quicktemplates2/qquickoverlay.cpp
+++ b/qtquickcontrols2/src/quicktemplates2/qquickoverlay.cpp
@@ -399,8 +399,11 @@ void QQuickOverlay::itemChange(ItemChange change, const ItemChangeData &data)
Q_D(QQuickOverlay);
QQuickItem::itemChange(change, data);
- if (change == ItemChildAddedChange || change == ItemChildRemovedChange)
+ if (change == ItemChildAddedChange || change == ItemChildRemovedChange) {
setVisible(!d->allDrawers.isEmpty() || !childItems().isEmpty());
+ if (data.item->parent() == d->mouseGrabberPopup)
+ d->setMouseGrabberPopup(nullptr);
+ }
}
void QQuickOverlay::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
diff --git a/qtquickcontrols2/src/quicktemplates2/qquickpopup.cpp b/qtquickcontrols2/src/quicktemplates2/qquickpopup.cpp
index 7df80a047..bfaa84e30 100644
--- a/qtquickcontrols2/src/quicktemplates2/qquickpopup.cpp
+++ b/qtquickcontrols2/src/quicktemplates2/qquickpopup.cpp
@@ -46,6 +46,7 @@
#include <QtQml/qqmlinfo.h>
#include <QtQuick/qquickitem.h>
+#include <QtQuick/private/qquickaccessibleattached_p.h>
#include <QtQuick/private/qquicktransition_p.h>
#include <QtQuick/private/qquickitem_p.h>
@@ -2720,6 +2721,19 @@ QPalette QQuickPopup::defaultPalette() const
}
#if QT_CONFIG(accessibility)
+QAccessible::Role QQuickPopup::effectiveAccessibleRole() const
+{
+ auto *attached = qmlAttachedPropertiesObject<QQuickAccessibleAttached>(this, false);
+
+ auto role = QAccessible::NoRole;
+ if (auto *accessibleAttached = qobject_cast<QQuickAccessibleAttached *>(attached))
+ role = accessibleAttached->role();
+ if (role == QAccessible::NoRole)
+ role = accessibleRole();
+
+ return role;
+}
+
QAccessible::Role QQuickPopup::accessibleRole() const
{
return QAccessible::Dialog;
diff --git a/qtquickcontrols2/src/quicktemplates2/qquickpopup_p.h b/qtquickcontrols2/src/quicktemplates2/qquickpopup_p.h
index dc3ebf6f8..a3773be3e 100644
--- a/qtquickcontrols2/src/quicktemplates2/qquickpopup_p.h
+++ b/qtquickcontrols2/src/quicktemplates2/qquickpopup_p.h
@@ -454,7 +454,10 @@ protected:
virtual QPalette defaultPalette() const;
#if QT_CONFIG(accessibility)
+ QAccessible::Role effectiveAccessibleRole() const;
+private:
virtual QAccessible::Role accessibleRole() const;
+protected:
virtual void accessibilityActiveChanged(bool active);
#endif
diff --git a/qtquickcontrols2/src/quicktemplates2/qquickpopupitem.cpp b/qtquickcontrols2/src/quicktemplates2/qquickpopupitem.cpp
index 0069b9fc1..143c37fc3 100644
--- a/qtquickcontrols2/src/quicktemplates2/qquickpopupitem.cpp
+++ b/qtquickcontrols2/src/quicktemplates2/qquickpopupitem.cpp
@@ -404,7 +404,7 @@ QPalette QQuickPopupItem::defaultPalette() const
QAccessible::Role QQuickPopupItem::accessibleRole() const
{
Q_D(const QQuickPopupItem);
- return d->popup->accessibleRole();
+ return d->popup->effectiveAccessibleRole();
}
void QQuickPopupItem::accessibilityActiveChanged(bool active)
diff --git a/qtquickcontrols2/src/quicktemplates2/qquicktextarea.cpp b/qtquickcontrols2/src/quicktemplates2/qquicktextarea.cpp
index 64fc631dd..fba3f6b70 100644
--- a/qtquickcontrols2/src/quicktemplates2/qquicktextarea.cpp
+++ b/qtquickcontrols2/src/quicktemplates2/qquicktextarea.cpp
@@ -512,7 +512,7 @@ void QQuickTextAreaPrivate::accessibilityActiveChanged(bool active)
Q_Q(QQuickTextArea);
QQuickAccessibleAttached *accessibleAttached = qobject_cast<QQuickAccessibleAttached *>(qmlAttachedPropertiesObject<QQuickAccessibleAttached>(q, true));
Q_ASSERT(accessibleAttached);
- accessibleAttached->setRole(accessibleRole());
+ accessibleAttached->setRole(effectiveAccessibleRole());
accessibleAttached->set_readOnly(q->isReadOnly());
accessibleAttached->setDescription(placeholder);
}
diff --git a/qtquickcontrols2/src/quicktemplates2/qquicktextfield.cpp b/qtquickcontrols2/src/quicktemplates2/qquicktextfield.cpp
index 8fa04bd3a..e83346cbd 100644
--- a/qtquickcontrols2/src/quicktemplates2/qquicktextfield.cpp
+++ b/qtquickcontrols2/src/quicktemplates2/qquicktextfield.cpp
@@ -359,7 +359,7 @@ void QQuickTextFieldPrivate::accessibilityActiveChanged(bool active)
Q_Q(QQuickTextField);
QQuickAccessibleAttached *accessibleAttached = qobject_cast<QQuickAccessibleAttached *>(qmlAttachedPropertiesObject<QQuickAccessibleAttached>(q, true));
Q_ASSERT(accessibleAttached);
- accessibleAttached->setRole(accessibleRole());
+ accessibleAttached->setRole(effectiveAccessibleRole());
accessibleAttached->set_readOnly(m_readOnly);
accessibleAttached->set_passwordEdit((m_echoMode == QQuickTextField::Password || m_echoMode == QQuickTextField::PasswordEchoOnEdit) ? true : false);
accessibleAttached->setDescription(placeholder);
diff --git a/qtquickcontrols2/tests/auto/qquickpopup/data/releaseAfterExitTransition.qml b/qtquickcontrols2/tests/auto/qquickpopup/data/releaseAfterExitTransition.qml
new file mode 100644
index 000000000..9e4598b9f
--- /dev/null
+++ b/qtquickcontrols2/tests/auto/qquickpopup/data/releaseAfterExitTransition.qml
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+
+ApplicationWindow {
+ id: window
+ width: 400
+ height: 400
+ title: "releaseAfterExitTransition"
+
+ property alias popup: popup
+ property alias modalPopup: modalPopup
+
+ Popup {
+ id: popup
+ y: parent.height - height
+ width: 50
+ height: 50
+ }
+
+ Popup {
+ id: modalPopup
+ modal: true
+ y: parent.height - height
+ width: 50
+ height: 50
+ exit: Transition { PauseAnimation { duration: 100 } }
+ }
+}
diff --git a/qtquickcontrols2/tests/auto/qquickpopup/tst_qquickpopup.cpp b/qtquickcontrols2/tests/auto/qquickpopup/tst_qquickpopup.cpp
index 54952d128..3d50e2dd4 100644
--- a/qtquickcontrols2/tests/auto/qquickpopup/tst_qquickpopup.cpp
+++ b/qtquickcontrols2/tests/auto/qquickpopup/tst_qquickpopup.cpp
@@ -100,6 +100,7 @@ private slots:
void invisibleToolTipOpen();
void centerInOverlayWithinStackViewItem();
void destroyDuringExitTransition();
+ void releaseAfterExitTransition();
};
void tst_QQuickPopup::initTestCase()
@@ -1575,6 +1576,34 @@ void tst_QQuickPopup::destroyDuringExitTransition()
QVERIFY(!button->isDown());
}
+void tst_QQuickPopup::releaseAfterExitTransition()
+{
+ QQuickApplicationHelper helper(this, "releaseAfterExitTransition.qml");
+ QVERIFY2(helper.ready, helper.failureMessage());
+
+ QQuickWindow *window = helper.window;
+ window->show();
+ QVERIFY(QTest::qWaitForWindowActive(window));
+
+ QQuickOverlay *overlay = QQuickOverlay::overlay(window);
+ QQuickPopup *modalPopup = window->property("modalPopup").value<QQuickPopup *>();
+ QQuickPopup *popup = window->property("popup").value<QQuickPopup *>();
+
+ modalPopup->open();
+ QTRY_VERIFY(modalPopup->isOpened());
+
+ QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
+ // wait until the transition is finished and the overlay hides itself
+ QTRY_VERIFY(!overlay->isVisible());
+ QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
+
+ popup->open();
+ QTRY_VERIFY(popup->isOpened());
+ QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
+ QTRY_VERIFY(!popup->isOpened());
+}
+
+
QTEST_QUICKCONTROLS_MAIN(tst_QQuickPopup)
#include "tst_qquickpopup.moc"
Submodule qtscript 5be95f96...572daa83 (commits not present)
Submodule qtspeech 90e32fa6..9b3738fe:
diff --git a/qtspeech/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp b/qtspeech/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp
index 6eb74b8..bcc7dd1 100644
--- a/qtspeech/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp
+++ b/qtspeech/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp
@@ -357,7 +357,9 @@ QVector<QLocale> QTextToSpeechEngineSpeechd::availableLocales() const
QVector<QVoice> QTextToSpeechEngineSpeechd::availableVoices() const
{
- return m_voices.values(m_currentLocale.name()).toVector();
+ QList<QVoice> resultList = m_voices.values(m_currentLocale.name());
+ std::reverse(resultList.begin(), resultList.end());
+ return resultList.toVector();
}
// We have no way of knowing our own client_id since speech-dispatcher seems to be incomplete
Submodule qtsvg d44607f0..080fed64:
diff --git a/qtsvg/src/plugins/imageformats/svg/qsvgiohandler.cpp b/qtsvg/src/plugins/imageformats/svg/qsvgiohandler.cpp
index 561e77e..12e0574 100644
--- a/qtsvg/src/plugins/imageformats/svg/qsvgiohandler.cpp
+++ b/qtsvg/src/plugins/imageformats/svg/qsvgiohandler.cpp
@@ -191,6 +191,8 @@ bool QSvgIOHandler::read(QImage *image)
}
}
if (!finalSize.isEmpty()) {
+ if (qMax(finalSize.width(), finalSize.height()) > 0xffff)
+ return false; // Assume corrupted file
image->fill(d->backColor.rgba());
QPainter p(image);
d->r.render(&p, bounds);
diff --git a/qtsvg/src/svg/qsvgfont_p.h b/qtsvg/src/svg/qsvgfont_p.h
index fd0a3fa..fcffbe8 100644
--- a/qtsvg/src/svg/qsvgfont_p.h
+++ b/qtsvg/src/svg/qsvgfont_p.h
@@ -74,6 +74,7 @@ public:
class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted
{
public:
+ static constexpr qreal DEFAULT_UNITS_PER_EM = 1000;
QSvgFont(qreal horizAdvX);
void setFamilyName(const QString &name);
@@ -86,9 +87,7 @@ public:
void draw(QPainter *p, const QPointF &point, const QString &str, qreal pixelSize, Qt::Alignment alignment) const;
public:
QString m_familyName;
- qreal m_unitsPerEm;
- qreal m_ascent;
- qreal m_descent;
+ qreal m_unitsPerEm = DEFAULT_UNITS_PER_EM;
qreal m_horizAdvX;
QHash<QChar, QSvgGlyph> m_glyphs;
};
diff --git a/qtsvg/src/svg/qsvghandler.cpp b/qtsvg/src/svg/qsvghandler.cpp
index c229c3b..222b6d8 100644
--- a/qtsvg/src/svg/qsvghandler.cpp
+++ b/qtsvg/src/svg/qsvghandler.cpp
@@ -1393,9 +1393,10 @@ static void parseFont(QSvgNode *node,
case FontSizeNone:
break;
case FontSizeValue: {
- QSvgHandler::LengthType dummy; // should always be pixel size
- fontStyle->setSize(qMin(parseLength(attributes.fontSize, dummy, handler),
- qreal(0xffff)));
+ QSvgHandler::LengthType type;
+ qreal fs = parseLength(attributes.fontSize, type, handler);
+ fs = convertToPixels(fs, true, type);
+ fontStyle->setSize(qMin(fs, qreal(0xffff)));
}
break;
default:
@@ -2578,6 +2579,8 @@ static QSvgNode *createCircleNode(QSvgNode *parent,
qreal ncx = toDouble(cx);
qreal ncy = toDouble(cy);
qreal nr = toDouble(r);
+ if (nr < 0.0)
+ return nullptr;
QRectF rect(ncx-nr, ncy-nr, nr*2, nr*2);
QSvgNode *circle = new QSvgCircle(parent, rect);
@@ -2668,7 +2671,7 @@ static bool parseFontFaceNode(QSvgStyleProperty *parent,
qreal unitsPerEm = toDouble(unitsPerEmStr);
if (!unitsPerEm)
- unitsPerEm = 1000;
+ unitsPerEm = QSvgFont::DEFAULT_UNITS_PER_EM;
if (!name.isEmpty())
font->setFamilyName(name);
@@ -3048,15 +3051,16 @@ static QSvgStyleProperty *createRadialGradientNode(QSvgNode *node,
qreal ncx = 0.5;
qreal ncy = 0.5;
- qreal nr = 0.5;
if (!cx.isEmpty())
ncx = toDouble(cx);
if (!cy.isEmpty())
ncy = toDouble(cy);
+
+ qreal nr = 0.0;
if (!r.isEmpty())
nr = toDouble(r);
- if (nr < 0.5)
- nr = 0.5;
+ if (nr <= 0.0)
+ return nullptr;
qreal nfx = ncx;
if (!fx.isEmpty())
@@ -3352,7 +3356,9 @@ static QSvgNode *createTextNode(QSvgNode *parent,
//### editable and rotate not handled
QSvgHandler::LengthType type;
qreal nx = parseLength(x, type, handler);
+ nx = convertToPixels(nx, true, type);
qreal ny = parseLength(y, type, handler);
+ ny = convertToPixels(ny, true, type);
QSvgNode *text = new QSvgText(parent, QPointF(nx, ny));
return text;
diff --git a/qtsvg/src/svg/qsvgstructure.cpp b/qtsvg/src/svg/qsvgstructure.cpp
index b89608b..89c9e4e 100644
--- a/qtsvg/src/svg/qsvgstructure.cpp
+++ b/qtsvg/src/svg/qsvgstructure.cpp
@@ -255,9 +255,13 @@ inline static bool isSupportedSvgFeature(const QString &str)
};
if (str.length() <= MAX_WORD_LENGTH && str.length() >= MIN_WORD_LENGTH) {
+ const char16_t unicode44 = str.at(44).unicode();
+ const char16_t unicode45 = str.at(45).unicode();
+ if (unicode44 >= sizeof(asso_values) || unicode45 >= sizeof(asso_values))
+ return false;
const int key = str.length()
- + asso_values[str.at(45).unicode()]
- + asso_values[str.at(44).unicode()];
+ + asso_values[unicode45]
+ + asso_values[unicode44];
if (key <= MAX_HASH_VALUE && key >= 0)
return str == QLatin1String(wordlist[key]);
}
Submodule qttools e8c3c391..ba4c633c:
diff --git a/qttools/src/assistant/help/help.pro b/qttools/src/assistant/help/help.pro
index 800c4a38d..7556f451b 100644
--- a/qttools/src/assistant/help/help.pro
+++ b/qttools/src/assistant/help/help.pro
@@ -1,7 +1,6 @@
TARGET = QtHelp
QT = core-private gui widgets sql
-QT_PRIVATE = network
DEFINES += QHELP_LIB
diff --git a/qttools/src/assistant/qhelpgenerator/helpgenerator.cpp b/qttools/src/assistant/qhelpgenerator/helpgenerator.cpp
index feab1e2d5..cbfb82507 100644
--- a/qttools/src/assistant/qhelpgenerator/helpgenerator.cpp
+++ b/qttools/src/assistant/qhelpgenerator/helpgenerator.cpp
@@ -445,7 +445,9 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString &
if (filterSetId < 0)
return false;
++filterSetId;
- for (int attId : qAsConst(filterAtts)) {
+ QList<int> attValues = filterAtts.values();
+ std::sort(attValues.begin(), attValues.end());
+ for (int attId : qAsConst(attValues)) {
m_query->prepare(QLatin1String("INSERT INTO FileAttributeSetTable "
"VALUES(?, ?)"));
m_query->bindValue(0, filterSetId);
diff --git a/qttools/src/assistant/qhelpgenerator/qhelpgenerator.pro b/qttools/src/assistant/qhelpgenerator/qhelpgenerator.pro
index bb22000c8..415347a00 100644
--- a/qttools/src/assistant/qhelpgenerator/qhelpgenerator.pro
+++ b/qttools/src/assistant/qhelpgenerator/qhelpgenerator.pro
@@ -1,4 +1,4 @@
-QT += network help-private
+QT += help-private
QTPLUGIN.platforms = qminimal
QTPLUGIN.sqldrivers = qsqlite
diff --git a/qttools/src/linguist/Qt5LinguistToolsMacros.cmake b/qttools/src/linguist/Qt5LinguistToolsMacros.cmake
index 6a45e57be..0ccf59f3c 100644
--- a/qttools/src/linguist/Qt5LinguistToolsMacros.cmake
+++ b/qttools/src/linguist/Qt5LinguistToolsMacros.cmake
@@ -68,6 +68,7 @@ function(QT5_CREATE_TRANSLATION _qm_files)
if(NOT EXISTS "${stamp_file_dir}")
file(MAKE_DIRECTORY "${stamp_file_dir}")
endif()
+ set(stamp_files "")
foreach(_ts_file ${_my_tsfiles})
get_filename_component(_ts_name ${_ts_file} NAME)
if(_my_sources)
@@ -95,7 +96,14 @@ function(QT5_CREATE_TRANSLATION _qm_files)
file(WRITE ${_ts_lst_file} "${_lst_file_srcs}")
endif()
- set(stamp_file "${stamp_file_dir}/${_ts_name}.stamp")
+ file(RELATIVE_PATH _ts_relative_path ${CMAKE_CURRENT_SOURCE_DIR} ${_ts_file})
+ string(REPLACE "../" "__/" _ts_relative_path "${_ts_relative_path}")
+ set(stamp_file "${stamp_file_dir}/${_ts_relative_path}.stamp")
+ list(APPEND stamp_files ${stamp_file})
+ get_filename_component(full_stamp_file_dir "${stamp_file}" DIRECTORY)
+ if(NOT EXISTS "${full_stamp_file_dir}")
+ file(MAKE_DIRECTORY "${full_stamp_file_dir}")
+ endif()
add_custom_command(OUTPUT ${stamp_file}
COMMAND ${Qt5_LUPDATE_EXECUTABLE}
ARGS ${_lupdate_options} "@${_ts_lst_file}" -ts ${_ts_file}
@@ -103,7 +111,7 @@ function(QT5_CREATE_TRANSLATION _qm_files)
DEPENDS ${_dependencies}
VERBATIM)
endforeach()
- qt5_add_translation(${_qm_files} __QT_INTERNAL_DEPEND_ON_TIMESTAMP_FILE ${_my_tsfiles})
+ qt5_add_translation(${_qm_files} ${_my_tsfiles} __QT_INTERNAL_TIMESTAMP_FILES ${stamp_files})
set(${_qm_files} ${${_qm_files}} PARENT_SCOPE)
endfunction()
@@ -120,17 +128,17 @@ endif()
function(QT5_ADD_TRANSLATION _qm_files)
- set(options __QT_INTERNAL_DEPEND_ON_TIMESTAMP_FILE)
+ set(options)
set(oneValueArgs)
- set(multiValueArgs OPTIONS)
+ set(multiValueArgs OPTIONS __QT_INTERNAL_TIMESTAMP_FILES)
cmake_parse_arguments(_LRELEASE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
set(_lrelease_files ${_LRELEASE_UNPARSED_ARGUMENTS})
+ set(idx 0)
foreach(_current_FILE ${_lrelease_files})
get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE)
get_filename_component(qm ${_abs_FILE} NAME)
- set(ts_stamp_file "${CMAKE_CURRENT_BINARY_DIR}/.lupdate/${qm}.stamp")
# everything before the last dot has to be considered the file name (including other dots)
string(REGEX REPLACE "\\.[^.]*$" "" FILE_NAME ${qm})
get_source_file_property(output_location ${_abs_FILE} OUTPUT_LOCATION)
@@ -141,7 +149,9 @@ function(QT5_ADD_TRANSLATION _qm_files)
set(qm "${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}.qm")
endif()
- if(_LRELEASE___QT_INTERNAL_DEPEND_ON_TIMESTAMP_FILE)
+ if(_LRELEASE___QT_INTERNAL_TIMESTAMP_FILES)
+ list(GET _LRELEASE___QT_INTERNAL_TIMESTAMP_FILES ${idx} ts_stamp_file)
+ math(EXPR idx "${idx} + 1")
set(qm_dep "${ts_stamp_file}")
else()
set(qm_dep "${_abs_FILE}")
diff --git a/qttools/src/qdoc/clangcodeparser.cpp b/qttools/src/qdoc/clangcodeparser.cpp
index 539a603da..a41b99cec 100644
--- a/qttools/src/qdoc/clangcodeparser.cpp
+++ b/qttools/src/qdoc/clangcodeparser.cpp
@@ -1395,8 +1395,7 @@ void ClangCodeParser::buildPCH()
args_.push_back("-xc++");
CXTranslationUnit tu;
QString tmpHeader = pchFileDir_->path() + "/" + module;
- QFile tmpHeaderFile(tmpHeader);
- if (tmpHeaderFile.open(QIODevice::Text | QIODevice::WriteOnly)) {
+ { QFile tmpHeaderFile(tmpHeader); if (tmpHeaderFile.open(QIODevice::Text | QIODevice::WriteOnly)) {
QTextStream out(&tmpHeaderFile);
if (header.isEmpty()) {
for (auto it = allHeaders_.constKeyValueBegin();
@@ -1421,8 +1420,7 @@ void ClangCodeParser::buildPCH()
out << line << "\n";
}
}
- tmpHeaderFile.close();
- }
+ } }
if (printParsingErrors_ == 0)
qCWarning(lcQdoc) << "clang not printing errors; include paths were guessed";
CXErrorCode err =
Submodule qtwayland 163ea1a0..9c82b546:
diff --git a/qtwayland/src/client/configure.json b/qtwayland/src/client/configure.json
index 2f424580..29222357 100644
--- a/qtwayland/src/client/configure.json
+++ b/qtwayland/src/client/configure.json
@@ -149,8 +149,7 @@
"#endif"
]
},
- "libs": "-ldrm",
- "use": "egl"
+ "use": "drm egl"
},
"vulkan-server-buffer": {
"label": "Vulkan Buffer Sharing",
@@ -168,7 +167,8 @@
"exportAllocInfo.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR;",
"return 0;"
]
- }
+ },
+ "use": "wayland-client"
},
"egl_1_5-wayland": {
"label": "EGL 1.5 with Wayland Platform",
@@ -183,7 +183,7 @@
"eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_EXT, (struct wl_display *)(nullptr), nullptr);"
]
},
- "use": "egl"
+ "use": "egl wayland-client"
}
},
diff --git a/qtwayland/src/client/global/qwaylandclientextension.cpp b/qtwayland/src/client/global/qwaylandclientextension.cpp
index 966096a8..36609c08 100644
--- a/qtwayland/src/client/global/qwaylandclientextension.cpp
+++ b/qtwayland/src/client/global/qwaylandclientextension.cpp
@@ -74,7 +74,10 @@ void QWaylandClientExtensionPrivate::handleRegistryGlobal(void *data, ::wl_regis
void QWaylandClientExtension::addRegistryListener()
{
Q_D(QWaylandClientExtension);
- d->waylandIntegration->display()->addRegistryListener(&QWaylandClientExtensionPrivate::handleRegistryGlobal, this);
+ if (!d->registered) {
+ d->waylandIntegration->display()->addRegistryListener(&QWaylandClientExtensionPrivate::handleRegistryGlobal, this);
+ d->registered = true;
+ }
}
QWaylandClientExtension::QWaylandClientExtension(const int ver)
@@ -88,6 +91,13 @@ QWaylandClientExtension::QWaylandClientExtension(const int ver)
QMetaObject::invokeMethod(this, "addRegistryListener", Qt::QueuedConnection);
}
+QWaylandClientExtension::~QWaylandClientExtension()
+{
+ Q_D(QWaylandClientExtension);
+ if (d->registered && !QCoreApplication::closingDown())
+ d->waylandIntegration->display()->removeListener(&QWaylandClientExtensionPrivate::handleRegistryGlobal, this);
+}
+
QtWaylandClient::QWaylandIntegration *QWaylandClientExtension::integration() const
{
Q_D(const QWaylandClientExtension);
diff --git a/qtwayland/src/client/global/qwaylandclientextension.h b/qtwayland/src/client/global/qwaylandclientextension.h
index 98272e57..5bd28398 100644
--- a/qtwayland/src/client/global/qwaylandclientextension.h
+++ b/qtwayland/src/client/global/qwaylandclientextension.h
@@ -63,6 +63,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtension : public QObject
Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
public:
QWaylandClientExtension(const int version);
+ ~QWaylandClientExtension();
QtWaylandClient::QWaylandIntegration *integration() const;
int version() const;
diff --git a/qtwayland/src/client/global/qwaylandclientextension_p.h b/qtwayland/src/client/global/qwaylandclientextension_p.h
index 69cc46a0..9091efbe 100644
--- a/qtwayland/src/client/global/qwaylandclientextension_p.h
+++ b/qtwayland/src/client/global/qwaylandclientextension_p.h
@@ -68,6 +68,7 @@ public:
QtWaylandClient::QWaylandIntegration *waylandIntegration = nullptr;
int version = -1;
bool active = false;
+ bool registered = false;
};
class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtensionTemplatePrivate : public QWaylandClientExtensionPrivate
diff --git a/qtwayland/src/client/qwaylandabstractdecoration.cpp b/qtwayland/src/client/qwaylandabstractdecoration.cpp
index b628930d..d15a7f9f 100644
--- a/qtwayland/src/client/qwaylandabstractdecoration.cpp
+++ b/qtwayland/src/client/qwaylandabstractdecoration.cpp
@@ -122,7 +122,7 @@ const QImage &QWaylandAbstractDecoration::contentImage()
if (d->m_isDirty) {
// Update the decoration backingstore
- const int bufferScale = waylandWindow()->scale();
+ const qreal bufferScale = waylandWindow()->scale();
const QSize imageSize = waylandWindow()->surfaceSize() * bufferScale;
d->m_decorationContentImage = QImage(imageSize, QImage::Format_ARGB32_Premultiplied);
// Only scale by buffer scale, not QT_SCALE_FACTOR etc.
diff --git a/qtwayland/src/client/qwaylandclipboard.cpp b/qtwayland/src/client/qwaylandclipboard.cpp
index 81f48e05..14561c77 100644
--- a/qtwayland/src/client/qwaylandclipboard.cpp
+++ b/qtwayland/src/client/qwaylandclipboard.cpp
@@ -54,10 +54,15 @@ namespace QtWaylandClient {
QWaylandClipboard::QWaylandClipboard(QWaylandDisplay *display)
: mDisplay(display)
{
+ m_clientClipboard[QClipboard::Clipboard] = nullptr;
+ m_clientClipboard[QClipboard::Selection] = nullptr;
}
QWaylandClipboard::~QWaylandClipboard()
{
+ if (m_clientClipboard[QClipboard::Clipboard] != m_clientClipboard[QClipboard::Selection])
+ delete m_clientClipboard[QClipboard::Clipboard];
+ delete m_clientClipboard[QClipboard::Selection];
}
QMimeData *QWaylandClipboard::mimeData(QClipboard::Mode mode)
@@ -69,8 +74,8 @@ QMimeData *QWaylandClipboard::mimeData(QClipboard::Mode mode)
switch (mode) {
case QClipboard::Clipboard:
if (auto *dataDevice = seat->dataDevice()) {
- if (auto *source = dataDevice->selectionSource())
- return source->mimeData();
+ if (dataDevice->selectionSource())
+ return m_clientClipboard[QClipboard::Clipboard];
if (auto *offer = dataDevice->selectionOffer())
return offer->mimeData();
}
@@ -78,8 +83,8 @@ QMimeData *QWaylandClipboard::mimeData(QClipboard::Mode mode)
case QClipboard::Selection:
#if QT_CONFIG(wayland_client_primary_selection)
if (auto *selectionDevice = seat->primarySelectionDevice()) {
- if (auto *source = selectionDevice->selectionSource())
- return source->mimeData();
+ if (selectionDevice->selectionSource())
+ return m_clientClipboard[QClipboard::Selection];
if (auto *offer = selectionDevice->selectionOffer())
return offer->mimeData();
}
@@ -104,17 +109,27 @@ void QWaylandClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode)
if (data && data->hasFormat(plain) && !data->hasFormat(utf8))
data->setData(utf8, data->data(plain));
+ if (m_clientClipboard[mode]) {
+ if (m_clientClipboard[QClipboard::Clipboard] != m_clientClipboard[QClipboard::Selection])
+ delete m_clientClipboard[mode];
+ m_clientClipboard[mode] = nullptr;
+ }
+
+ m_clientClipboard[mode] = data;
+
switch (mode) {
case QClipboard::Clipboard:
if (auto *dataDevice = seat->dataDevice()) {
- dataDevice->setSelectionSource(data ? new QWaylandDataSource(mDisplay->dndSelectionHandler(), data) : nullptr);
+ dataDevice->setSelectionSource(data ? new QWaylandDataSource(mDisplay->dndSelectionHandler(),
+ m_clientClipboard[QClipboard::Clipboard]) : nullptr);
emitChanged(mode);
}
break;
case QClipboard::Selection:
#if QT_CONFIG(wayland_client_primary_selection)
if (auto *selectionDevice = seat->primarySelectionDevice()) {
- selectionDevice->setSelectionSource(data ? new QWaylandPrimarySelectionSourceV1(mDisplay->primarySelectionManager(), data) : nullptr);
+ selectionDevice->setSelectionSource(data ? new QWaylandPrimarySelectionSourceV1(mDisplay->primarySelectionManager(),
+ m_clientClipboard[QClipboard::Selection]) : nullptr);
emitChanged(mode);
}
#endif
diff --git a/qtwayland/src/client/qwaylandclipboard_p.h b/qtwayland/src/client/qwaylandclipboard_p.h
index ce14e124..bb52683d 100644
--- a/qtwayland/src/client/qwaylandclipboard_p.h
+++ b/qtwayland/src/client/qwaylandclipboard_p.h
@@ -80,6 +80,7 @@ public:
private:
QWaylandDisplay *mDisplay = nullptr;
QMimeData m_emptyData;
+ QMimeData *m_clientClipboard[2];
};
}
diff --git a/qtwayland/src/client/qwaylandcursor.cpp b/qtwayland/src/client/qwaylandcursor.cpp
index e4eca9d4..ba76ba2d 100644
--- a/qtwayland/src/client/qwaylandcursor.cpp
+++ b/qtwayland/src/client/qwaylandcursor.cpp
@@ -44,6 +44,7 @@
#include "qwaylandshmbackingstore_p.h"
#include <QtGui/QImageReader>
+#include <QBitmap>
#include <QDebug>
#include <wayland-cursor.h>
@@ -250,7 +251,27 @@ QWaylandCursor::QWaylandCursor(QWaylandDisplay *display)
QSharedPointer<QWaylandBuffer> QWaylandCursor::cursorBitmapBuffer(QWaylandDisplay *display, const QCursor *cursor)
{
Q_ASSERT(cursor->shape() == Qt::BitmapCursor);
- const QImage &img = cursor->pixmap().toImage();
+
+ const QBitmap mask = cursor->mask(Qt::ReturnByValue);
+ QImage img;
+ if (cursor->pixmap().isNull())
+ img = cursor->bitmap(Qt::ReturnByValue).toImage();
+ else
+ img = cursor->pixmap().toImage();
+
+ // convert to supported format if necessary
+ if (!display->shm()->formatSupported(img.format())) {
+ if (mask.isNull()) {
+ img.convertTo(QImage::Format_RGB32);
+ } else {
+ // preserve mask
+ img.convertTo(QImage::Format_ARGB32);
+ QPixmap pixmap = QPixmap::fromImage(img);
+ pixmap.setMask(mask);
+ img = pixmap.toImage();
+ }
+ }
+
QSharedPointer<QWaylandShmBuffer> buffer(new QWaylandShmBuffer(display, img.size(), img.format()));
memcpy(buffer->image()->bits(), img.bits(), size_t(img.sizeInBytes()));
return buffer;
diff --git a/qtwayland/src/client/qwaylanddatadevice.cpp b/qtwayland/src/client/qwaylanddatadevice.cpp
index 1e2db786..07b18ab0 100644
--- a/qtwayland/src/client/qwaylanddatadevice.cpp
+++ b/qtwayland/src/client/qwaylanddatadevice.cpp
@@ -72,6 +72,8 @@ QWaylandDataDevice::QWaylandDataDevice(QWaylandDataDeviceManager *manager, QWayl
QWaylandDataDevice::~QWaylandDataDevice()
{
+ if (wl_data_device_get_version(object()) >= WL_DATA_DEVICE_RELEASE_SINCE_VERSION)
+ release();
}
QWaylandDataOffer *QWaylandDataDevice::selectionOffer() const
@@ -110,7 +112,7 @@ QWaylandDataOffer *QWaylandDataDevice::dragOffer() const
return m_dragOffer.data();
}
-bool QWaylandDataDevice::startDrag(QMimeData *mimeData, QWaylandWindow *icon)
+bool QWaylandDataDevice::startDrag(QMimeData *mimeData, Qt::DropActions supportedActions, QWaylandWindow *icon)
{
auto *seat = m_display->currentInputDevice();
auto *origin = seat->pointerFocus();
@@ -122,8 +124,38 @@ bool QWaylandDataDevice::startDrag(QMimeData *mimeData, QWaylandWindow *icon)
return false;
}
+ // dragging data without mimetypes is a legal operation in Qt terms
+ // but Wayland uses a mimetype to determine if a drag is accepted or not
+ // In this rare case, insert a placeholder
+ if (mimeData->formats().isEmpty())
+ mimeData->setData(QString::fromLatin1("application/x-qt-avoid-empty-placeholder"), QByteArray("1"));
+
m_dragSource.reset(new QWaylandDataSource(m_display->dndSelectionHandler(), mimeData));
+
+ if (wl_data_device_get_version(object()) >= 3)
+ m_dragSource->set_actions(dropActionsToWl(supportedActions));
+
connect(m_dragSource.data(), &QWaylandDataSource::cancelled, this, &QWaylandDataDevice::dragSourceCancelled);
+ connect(m_dragSource.data(), &QWaylandDataSource::dndResponseUpdated, this, [this](bool accepted, Qt::DropAction action) {
+ auto drag = static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag());
+ if (!drag->currentDrag()) {
+ return;
+ }
+ // in old versions drop action is not set, so we guess
+ if (wl_data_source_get_version(m_dragSource->object()) < 3) {
+ drag->setResponse(accepted);
+ } else {
+ QPlatformDropQtResponse response(accepted, action);
+ drag->setResponse(response);
+ }
+ });
+ connect(m_dragSource.data(), &QWaylandDataSource::dndDropped, this, [](bool accepted, Qt::DropAction action) {
+ QPlatformDropQtResponse response(accepted, action);
+ static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->setDropResponse(response);
+ });
+ connect(m_dragSource.data(), &QWaylandDataSource::finished, this, []() {
+ static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->finishDrag();
+ });
start_drag(m_dragSource->object(), origin->wlSurface(), icon->wlSurface(), m_display->currentInputDevice()->serial());
return true;
@@ -152,7 +184,7 @@ void QWaylandDataDevice::data_device_drop()
supportedActions = drag->supportedActions();
} else if (m_dragOffer) {
dragData = m_dragOffer->mimeData();
- supportedActions = Qt::CopyAction | Qt::MoveAction | Qt::LinkAction;
+ supportedActions = m_dragOffer->supportedActions();
} else {
return;
}
@@ -162,7 +194,11 @@ void QWaylandDataDevice::data_device_drop()
QGuiApplication::keyboardModifiers());
if (drag) {
- static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->finishDrag(response);
+ auto drag = static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag());
+ drag->setDropResponse(response);
+ drag->finishDrag();
+ } else if (m_dragOffer) {
+ m_dragOffer->finish();
}
}
@@ -186,7 +222,7 @@ void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface,
supportedActions = drag->supportedActions();
} else if (m_dragOffer) {
dragData = m_dragOffer->mimeData();
- supportedActions = Qt::CopyAction | Qt::MoveAction | Qt::LinkAction;
+ supportedActions = m_dragOffer->supportedActions();
}
const QPlatformDragQtResponse &response = QWindowSystemInterface::handleDrag(m_dragWindow, dragData, m_dragPoint, supportedActions,
@@ -197,11 +233,7 @@ void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface,
static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->setResponse(response);
}
- if (response.isAccepted()) {
- wl_data_offer_accept(m_dragOffer->object(), m_enterSerial, m_dragOffer->firstFormat().toUtf8().constData());
- } else {
- wl_data_offer_accept(m_dragOffer->object(), m_enterSerial, nullptr);
- }
+ sendResponse(supportedActions, response);
}
void QWaylandDataDevice::data_device_leave()
@@ -235,10 +267,10 @@ void QWaylandDataDevice::data_device_motion(uint32_t time, wl_fixed_t x, wl_fixe
supportedActions = drag->supportedActions();
} else {
dragData = m_dragOffer->mimeData();
- supportedActions = Qt::CopyAction | Qt::MoveAction | Qt::LinkAction;
+ supportedActions = m_dragOffer->supportedActions();
}
- QPlatformDragQtResponse response = QWindowSystemInterface::handleDrag(m_dragWindow, dragData, m_dragPoint, supportedActions,
+ const QPlatformDragQtResponse response = QWindowSystemInterface::handleDrag(m_dragWindow, dragData, m_dragPoint, supportedActions,
QGuiApplication::mouseButtons(),
QGuiApplication::keyboardModifiers());
@@ -246,11 +278,7 @@ void QWaylandDataDevice::data_device_motion(uint32_t time, wl_fixed_t x, wl_fixe
static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->setResponse(response);
}
- if (response.isAccepted()) {
- wl_data_offer_accept(m_dragOffer->object(), m_enterSerial, m_dragOffer->firstFormat().toUtf8().constData());
- } else {
- wl_data_offer_accept(m_dragOffer->object(), m_enterSerial, nullptr);
- }
+ sendResponse(supportedActions, response);
}
#endif // QT_CONFIG(draganddrop)
@@ -277,14 +305,10 @@ void QWaylandDataDevice::selectionSourceCancelled()
#if QT_CONFIG(draganddrop)
void QWaylandDataDevice::dragSourceCancelled()
{
+ static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->finishDrag();
m_dragSource.reset();
}
-void QWaylandDataDevice::dragSourceTargetChanged(const QString &mimeType)
-{
- static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->updateTarget(mimeType);
-}
-
QPoint QWaylandDataDevice::calculateDragPosition(int x, int y, QWindow *wnd) const
{
QPoint pnt(wl_fixed_to_int(x), wl_fixed_to_int(y));
@@ -297,6 +321,33 @@ QPoint QWaylandDataDevice::calculateDragPosition(int x, int y, QWindow *wnd) con
}
return pnt;
}
+
+void QWaylandDataDevice::sendResponse(Qt::DropActions supportedActions, const QPlatformDragQtResponse &response)
+{
+ if (response.isAccepted()) {
+ if (wl_data_device_get_version(object()) >= 3)
+ m_dragOffer->set_actions(dropActionsToWl(supportedActions), dropActionsToWl(response.acceptedAction()));
+
+ m_dragOffer->accept(m_enterSerial, m_dragOffer->firstFormat());
+ } else {
+ m_dragOffer->accept(m_enterSerial, QString());
+ }
+}
+
+int QWaylandDataDevice::dropActionsToWl(Qt::DropActions actions)
+{
+
+ int wlActions = WL_DATA_DEVICE_MANAGER_DND_ACTION_NONE;
+ if (actions & Qt::CopyAction)
+ wlActions |= WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY;
+ if (actions & (Qt::MoveAction | Qt::TargetMoveAction))
+ wlActions |= WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE;
+
+ // wayland does not support LinkAction at the time of writing
+ return wlActions;
+}
+
+
#endif // QT_CONFIG(draganddrop)
}
diff --git a/qtwayland/src/client/qwaylanddatadevice_p.h b/qtwayland/src/client/qwaylanddatadevice_p.h
index 16c3ad28..801dcc2c 100644
--- a/qtwayland/src/client/qwaylanddatadevice_p.h
+++ b/qtwayland/src/client/qwaylanddatadevice_p.h
@@ -64,6 +64,7 @@ QT_REQUIRE_CONFIG(wayland_datadevice);
QT_BEGIN_NAMESPACE
class QMimeData;
+class QPlatformDragQtResponse;
class QWindow;
namespace QtWaylandClient {
@@ -89,7 +90,7 @@ public:
#if QT_CONFIG(draganddrop)
QWaylandDataOffer *dragOffer() const;
- bool startDrag(QMimeData *mimeData, QWaylandWindow *icon);
+ bool startDrag(QMimeData *mimeData, Qt::DropActions supportedActions, QWaylandWindow *icon);
void cancelDrag();
#endif
@@ -109,13 +110,16 @@ private Q_SLOTS:
#if QT_CONFIG(draganddrop)
void dragSourceCancelled();
- void dragSourceTargetChanged(const QString &mimeType);
#endif
private:
#if QT_CONFIG(draganddrop)
QPoint calculateDragPosition(int x, int y, QWindow *wnd) const;
#endif
+ void sendResponse(Qt::DropActions supportedActions, const QPlatformDragQtResponse &response);
+
+ static int dropActionsToWl(Qt::DropActions dropActions);
+
QWaylandDisplay *m_display = nullptr;
QWaylandInputDevice *m_inputDevice = nullptr;
diff --git a/qtwayland/src/client/qwaylanddatadevicemanager.cpp b/qtwayland/src/client/qwaylanddatadevicemanager.cpp
index 35d67307..6dc4f77f 100644
--- a/qtwayland/src/client/qwaylanddatadevicemanager.cpp
+++ b/qtwayland/src/client/qwaylanddatadevicemanager.cpp
@@ -50,8 +50,8 @@ QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
-QWaylandDataDeviceManager::QWaylandDataDeviceManager(QWaylandDisplay *display, uint32_t id)
- : wl_data_device_manager(display->wl_registry(), id, 1)
+QWaylandDataDeviceManager::QWaylandDataDeviceManager(QWaylandDisplay *display, int version, uint32_t id)
+ : wl_data_device_manager(display->wl_registry(), id, qMin(version, 3))
, m_display(display)
{
// Create transfer devices for all input devices.
diff --git a/qtwayland/src/client/qwaylanddatadevicemanager_p.h b/qtwayland/src/client/qwaylanddatadevicemanager_p.h
index bd05c0fb..510d9be4 100644
--- a/qtwayland/src/client/qwaylanddatadevicemanager_p.h
+++ b/qtwayland/src/client/qwaylanddatadevicemanager_p.h
@@ -68,7 +68,7 @@ class QWaylandInputDevice;
class Q_WAYLAND_CLIENT_EXPORT QWaylandDataDeviceManager : public QtWayland::wl_data_device_manager
{
public:
- QWaylandDataDeviceManager(QWaylandDisplay *display, uint32_t id);
+ QWaylandDataDeviceManager(QWaylandDisplay *display, int version, uint32_t id);
~QWaylandDataDeviceManager() override;
QWaylandDataDevice *getDataDevice(QWaylandInputDevice *inputDevice);
diff --git a/qtwayland/src/client/qwaylanddataoffer.cpp b/qtwayland/src/client/qwaylanddataoffer.cpp
index 2297e8a1..fe0ea8c9 100644
--- a/qtwayland/src/client/qwaylanddataoffer.cpp
+++ b/qtwayland/src/client/qwaylanddataoffer.cpp
@@ -82,6 +82,15 @@ QMimeData *QWaylandDataOffer::mimeData()
return m_mimeData.data();
}
+Qt::DropActions QWaylandDataOffer::supportedActions() const
+{
+ if (wl_data_offer_get_version(const_cast<::wl_data_offer*>(object())) < 3) {
+ return Qt::MoveAction | Qt::CopyAction;
+ }
+
+ return m_supportedActions;
+}
+
void QWaylandDataOffer::startReceiving(const QString &mimeType, int fd)
{
receive(mimeType, fd);
@@ -93,6 +102,22 @@ void QWaylandDataOffer::data_offer_offer(const QString &mime_type)
m_mimeData->appendFormat(mime_type);
}
+void QWaylandDataOffer::data_offer_action(uint32_t dnd_action)
+{
+ Q_UNUSED(dnd_action);
+ // This is the compositor telling the drag target what action it should perform
+ // It does not map nicely into Qt final drop semantics, other than pretending there is only one supported action?
+}
+
+void QWaylandDataOffer::data_offer_source_actions(uint32_t source_actions)
+{
+ m_supportedActions = Qt::DropActions();
+ if (source_actions & WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE)
+ m_supportedActions |= Qt::MoveAction;
+ if (source_actions & WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY)
+ m_supportedActions |= Qt::CopyAction;
+}
+
QWaylandMimeData::QWaylandMimeData(QWaylandAbstractDataOffer *dataOffer)
: m_dataOffer(dataOffer)
{
@@ -163,17 +188,18 @@ QVariant QWaylandMimeData::retrieveData_sys(const QString &mimeType, QVariant::T
int QWaylandMimeData::readData(int fd, QByteArray &data) const
{
- fd_set readset;
- FD_ZERO(&readset);
- FD_SET(fd, &readset);
- struct timeval timeout;
+ struct pollfd readset;
+ readset.fd = fd;
+ readset.events = POLLIN;
+ struct timespec timeout;
timeout.tv_sec = 1;
- timeout.tv_usec = 0;
+ timeout.tv_nsec = 0;
+
Q_FOREVER {
- int ready = select(FD_SETSIZE, &readset, nullptr, nullptr, &timeout);
+ int ready = qt_safe_poll(&readset, 1, &timeout);
if (ready < 0) {
- qWarning() << "QWaylandDataOffer: select() failed";
+ qWarning() << "QWaylandDataOffer: qt_safe_poll() failed";
return -1;
} else if (ready == 0) {
qWarning("QWaylandDataOffer: timeout reading from pipe");
diff --git a/qtwayland/src/client/qwaylanddataoffer_p.h b/qtwayland/src/client/qwaylanddataoffer_p.h
index 9cf1483c..6f667398 100644
--- a/qtwayland/src/client/qwaylanddataoffer_p.h
+++ b/qtwayland/src/client/qwaylanddataoffer_p.h
@@ -82,6 +82,7 @@ public:
explicit QWaylandDataOffer(QWaylandDisplay *display, struct ::wl_data_offer *offer);
~QWaylandDataOffer() override;
QMimeData *mimeData() override;
+ Qt::DropActions supportedActions() const;
QString firstFormat() const;
@@ -89,10 +90,13 @@ public:
protected:
void data_offer_offer(const QString &mime_type) override;
+ void data_offer_source_actions(uint32_t source_actions) override;
+ void data_offer_action(uint32_t dnd_action) override;
private:
QWaylandDisplay *m_display = nullptr;
QScopedPointer<QWaylandMimeData> m_mimeData;
+ Qt::DropActions m_supportedActions;
};
diff --git a/qtwayland/src/client/qwaylanddatasource.cpp b/qtwayland/src/client/qwaylanddatasource.cpp
index c2bc9dc4..321170a6 100644
--- a/qtwayland/src/client/qwaylanddatasource.cpp
+++ b/qtwayland/src/client/qwaylanddatasource.cpp
@@ -72,11 +72,6 @@ QWaylandDataSource::~QWaylandDataSource()
destroy();
}
-QMimeData * QWaylandDataSource::mimeData() const
-{
- return m_mime_data;
-}
-
void QWaylandDataSource::data_source_cancelled()
{
Q_EMIT cancelled();
@@ -110,7 +105,32 @@ void QWaylandDataSource::data_source_send(const QString &mime_type, int32_t fd)
void QWaylandDataSource::data_source_target(const QString &mime_type)
{
- Q_EMIT targetChanged(mime_type);
+ m_accepted = !mime_type.isEmpty();
+ Q_EMIT dndResponseUpdated(m_accepted, m_dropAction);
+}
+
+void QWaylandDataSource::data_source_action(uint32_t action)
+{
+ Qt::DropAction qtAction = Qt::IgnoreAction;
+
+ if (action == WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE)
+ qtAction = Qt::MoveAction;
+ else if (action == WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY)
+ qtAction = Qt::CopyAction;
+
+ m_dropAction = qtAction;
+ Q_EMIT dndResponseUpdated(m_accepted, m_dropAction);
+}
+
+void QWaylandDataSource::data_source_dnd_finished()
+{
+ Q_EMIT finished();
+}
+
+void QWaylandDataSource::data_source_dnd_drop_performed()
+{
+
+ Q_EMIT dndDropped(m_accepted, m_dropAction);
}
}
diff --git a/qtwayland/src/client/qwaylanddatasource_p.h b/qtwayland/src/client/qwaylanddatasource_p.h
index 3003da1b..089c5485 100644
--- a/qtwayland/src/client/qwaylanddatasource_p.h
+++ b/qtwayland/src/client/qwaylanddatasource_p.h
@@ -74,19 +74,25 @@ public:
QWaylandDataSource(QWaylandDataDeviceManager *dataDeviceManager, QMimeData *mimeData);
~QWaylandDataSource() override;
- QMimeData *mimeData() const;
-
Q_SIGNALS:
- void targetChanged(const QString &mime_type);
void cancelled();
+ void finished();
+
+ void dndResponseUpdated(bool accepted, Qt::DropAction action);
+ void dndDropped(bool accepted, Qt::DropAction action);
protected:
void data_source_cancelled() override;
void data_source_send(const QString &mime_type, int32_t fd) override;
void data_source_target(const QString &mime_type) override;
+ void data_source_dnd_drop_performed() override;
+ void data_source_dnd_finished() override;
+ void data_source_action(uint32_t action) override;
private:
QMimeData *m_mime_data = nullptr;
+ bool m_accepted = false;
+ Qt::DropAction m_dropAction = Qt::IgnoreAction;
};
}
diff --git a/qtwayland/src/client/qwaylanddisplay.cpp b/qtwayland/src/client/qwaylanddisplay.cpp
index 8a6d5db1..737b539d 100644
--- a/qtwayland/src/client/qwaylanddisplay.cpp
+++ b/qtwayland/src/client/qwaylanddisplay.cpp
@@ -87,10 +87,203 @@
#include <errno.h>
+#include <tuple> // for std::tie
+
+static void checkWaylandError(struct wl_display *display)
+{
+ int ecode = wl_display_get_error(display);
+ if ((ecode == EPIPE || ecode == ECONNRESET)) {
+ // special case this to provide a nicer error
+ qWarning("The Wayland connection broke. Did the Wayland compositor die?");
+ } else {
+ qWarning("The Wayland connection experienced a fatal error: %s", strerror(ecode));
+ }
+ _exit(1);
+}
+
QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
+class EventThread : public QThread
+{
+ Q_OBJECT
+public:
+ enum OperatingMode {
+ EmitToDispatch, // Emit the signal, allow dispatching in a differnt thread.
+ SelfDispatch, // Dispatch the events inside this thread.
+ };
+
+ EventThread(struct wl_display * wl, struct wl_event_queue * ev_queue,
+ OperatingMode mode)
+ : m_fd(wl_display_get_fd(wl))
+ , m_pipefd{ -1, -1 }
+ , m_wldisplay(wl)
+ , m_wlevqueue(ev_queue)
+ , m_mode(mode)
+ , m_reading(true)
+ , m_quitting(false)
+ {
+ setObjectName(QStringLiteral("WaylandEventThread"));
+ }
+
+ void readAndDispatchEvents()
+ {
+ /*
+ * Dispatch pending events and flush the requests at least once. If the event thread
+ * is not reading, try to call _prepare_read() to allow the event thread to poll().
+ * If that fails, re-try dispatch & flush again until _prepare_read() is successful.
+ *
+ * This allow any call to readAndDispatchEvents() to start event thread's polling,
+ * not only the one issued from event thread's waitForReading(), which means functions
+ * called from dispatch_pending() can safely spin an event loop.
+ */
+ for (;;) {
+ if (dispatchQueuePending() < 0) {
+ checkWaylandError(m_wldisplay);
+ return;
+ }
+
+ wl_display_flush(m_wldisplay);
+
+ // We have to check if event thread is reading every time we dispatch
+ // something, as that may recursively call this function.
+ if (m_reading.loadAcquire())
+ break;
+
+ if (prepareReadQueue() == 0) {
+ QMutexLocker l(&m_mutex);
+ m_reading.storeRelease(true);
+ m_cond.wakeOne();
+ break;
+ }
+ }
+ }
+
+ void stop()
+ {
+ // We have to both write to the pipe and set the flag, as the thread may be
+ // either in the poll() or waiting for _prepare_read().
+ if (m_pipefd[1] != -1 && write(m_pipefd[1], "\0", 1) == -1)
+ qWarning("Failed to write to the pipe: %s.", strerror(errno));
+
+ {
+ QMutexLocker l(&m_mutex);
+ m_quitting = true;
+ m_cond.wakeOne();
+ }
+
+ wait();
+ }
+
+Q_SIGNALS:
+ void needReadAndDispatch();
+
+protected:
+ void run() override
+ {
+ // we use this pipe to make the loop exit otherwise if we simply used a flag on the loop condition, if stop() gets
+ // called while poll() is blocking the thread will never quit since there are no wayland messages coming anymore.
+ struct Pipe
+ {
+ Pipe(int *fds)
+ : fds(fds)
+ {
+ if (qt_safe_pipe(fds) != 0)
+ qWarning("Pipe creation failed. Quitting may hang.");
+ }
+ ~Pipe()
+ {
+ if (fds[0] != -1) {
+ close(fds[0]);
+ close(fds[1]);
+ }
+ }
+
+ int *fds;
+ } pipe(m_pipefd);
+
+ // Make the main thread call wl_prepare_read(), dispatch the pending messages and flush the
+ // outbound ones. Wait until it's done before proceeding, unless we're told to quit.
+ while (waitForReading()) {
+ pollfd fds[2] = { { m_fd, POLLIN, 0 }, { m_pipefd[0], POLLIN, 0 } };
+ poll(fds, 2, -1);
+
+ if (fds[1].revents & POLLIN) {
+ // we don't really care to read the byte that was written here since we're closing down
+ wl_display_cancel_read(m_wldisplay);
+ break;
+ }
+
+ if (fds[0].revents & POLLIN)
+ wl_display_read_events(m_wldisplay);
+ // The polll was succesfull and the event thread did the wl_display_read_events(). On the next iteration of the loop
+ // the event sent to the main thread will cause it to dispatch the messages just read, unless the loop exits in which
+ // case we don't care anymore about them.
+ else
+ wl_display_cancel_read(m_wldisplay);
+ }
+ }
+
+private:
+ bool waitForReading()
+ {
+ Q_ASSERT(QThread::currentThread() == this);
+
+ m_reading.storeRelease(false);
+
+ if (m_mode == SelfDispatch) {
+ readAndDispatchEvents();
+ } else {
+ Q_EMIT needReadAndDispatch();
+
+ QMutexLocker lock(&m_mutex);
+ // m_reading might be set from our emit or some other invocation of
+ // readAndDispatchEvents().
+ while (!m_reading.loadRelaxed() && !m_quitting)
+ m_cond.wait(&m_mutex);
+ }
+
+ return !m_quitting;
+ }
+
+ int dispatchQueuePending()
+ {
+ if (m_wlevqueue)
+ return wl_display_dispatch_queue_pending(m_wldisplay, m_wlevqueue);
+ else
+ return wl_display_dispatch_pending(m_wldisplay);
+ }
+
+ int prepareReadQueue()
+ {
+ if (m_wlevqueue)
+ return wl_display_prepare_read_queue(m_wldisplay, m_wlevqueue);
+ else
+ return wl_display_prepare_read(m_wldisplay);
+ }
+
+ int m_fd;
+ int m_pipefd[2];
+ wl_display *m_wldisplay;
+ wl_event_queue *m_wlevqueue;
+ OperatingMode m_mode;
+
+ /* Concurrency note when operating in EmitToDispatch mode:
+ * m_reading is set to false inside event thread's waitForReading(), and is
+ * set to true inside main thread's readAndDispatchEvents().
+ * The lock is not taken when setting m_reading to false, as the main thread
+ * is not actively waiting for it to turn false. However, the lock is taken
+ * inside readAndDispatchEvents() before setting m_reading to true,
+ * as the event thread is actively waiting for it under the wait condition.
+ */
+
+ QAtomicInteger<bool> m_reading;
+ bool m_quitting;
+ QMutex m_mutex;
+ QWaitCondition m_cond;
+};
+
Q_LOGGING_CATEGORY(lcQpaWayland, "qt.qpa.wayland"); // for general (uncategorized) Wayland platform logging
struct wl_surface *QWaylandDisplay::createSurface(void *handle)
@@ -160,17 +353,16 @@ QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration)
if (!mXkbContext)
qCWarning(lcQpaWayland, "failed to create xkb context");
#endif
-
- forceRoundTrip();
-
- if (!mWaitingScreens.isEmpty()) {
- // Give wl_output.done and zxdg_output_v1.done events a chance to arrive
- forceRoundTrip();
- }
}
QWaylandDisplay::~QWaylandDisplay(void)
{
+ if (m_eventThread)
+ m_eventThread->stop();
+
+ if (m_frameEventQueueThread)
+ m_frameEventQueueThread->stop();
+
if (mSyncCallback)
wl_callback_destroy(mSyncCallback);
@@ -187,10 +379,26 @@ QWaylandDisplay::~QWaylandDisplay(void)
#if QT_CONFIG(cursor)
qDeleteAll(mCursorThemes);
#endif
+
+ if (m_frameEventQueue)
+ wl_event_queue_destroy(m_frameEventQueue);
+
if (mDisplay)
wl_display_disconnect(mDisplay);
}
+// Steps which is called just after constructor. This separates registry_global() out of the constructor
+// so that factory functions in integration can be overridden.
+void QWaylandDisplay::initialize()
+{
+ forceRoundTrip();
+
+ if (!mWaitingScreens.isEmpty()) {
+ // Give wl_output.done and zxdg_output_v1.done events a chance to arrive
+ forceRoundTrip();
+ }
+}
+
void QWaylandDisplay::ensureScreen()
{
if (!mScreens.empty() || mPlaceholderScreen)
@@ -205,98 +413,37 @@ void QWaylandDisplay::ensureScreen()
void QWaylandDisplay::checkError() const
{
- int ecode = wl_display_get_error(mDisplay);
- if ((ecode == EPIPE || ecode == ECONNRESET)) {
- // special case this to provide a nicer error
- qWarning("The Wayland connection broke. Did the Wayland compositor die?");
- } else {
- qWarning("The Wayland connection experienced a fatal error: %s", strerror(ecode));
- }
- _exit(1);
+ checkWaylandError(mDisplay);
}
+// Called in main thread, either from queued signal or directly.
void QWaylandDisplay::flushRequests()
{
- if (wl_display_prepare_read(mDisplay) == 0) {
- wl_display_read_events(mDisplay);
- }
-
- if (wl_display_dispatch_pending(mDisplay) < 0)
- checkError();
-
- {
- QReadLocker locker(&m_frameQueueLock);
- for (const FrameQueue &q : mExternalQueues) {
- QMutexLocker locker(q.mutex);
- while (wl_display_prepare_read_queue(mDisplay, q.queue) != 0)
- wl_display_dispatch_queue_pending(mDisplay, q.queue);
- wl_display_read_events(mDisplay);
- wl_display_dispatch_queue_pending(mDisplay, q.queue);
- }
- }
-
- wl_display_flush(mDisplay);
-}
-
-void QWaylandDisplay::blockingReadEvents()
-{
- if (wl_display_dispatch(mDisplay) < 0)
- checkError();
-}
-
-void QWaylandDisplay::destroyFrameQueue(const QWaylandDisplay::FrameQueue &q)
-{
- QWriteLocker locker(&m_frameQueueLock);
- auto it = std::find_if(mExternalQueues.begin(),
- mExternalQueues.end(),
- [&q] (const QWaylandDisplay::FrameQueue &other){ return other.queue == q.queue; });
- Q_ASSERT(it != mExternalQueues.end());
- mExternalQueues.erase(it);
- if (q.queue != nullptr)
- wl_event_queue_destroy(q.queue);
- delete q.mutex;
+ m_eventThread->readAndDispatchEvents();
}
-QWaylandDisplay::FrameQueue QWaylandDisplay::createFrameQueue()
+// We have to wait until we have an eventDispatcher before creating the eventThread,
+// otherwise forceRoundTrip() may block inside _events_read() because eventThread is
+// polling.
+void QWaylandDisplay::initEventThread()
{
- QWriteLocker locker(&m_frameQueueLock);
- FrameQueue q{createEventQueue()};
- mExternalQueues.append(q);
- return q;
-}
+ m_eventThread.reset(
+ new EventThread(mDisplay, /* default queue */ nullptr, EventThread::EmitToDispatch));
+ connect(m_eventThread.get(), &EventThread::needReadAndDispatch, this,
+ &QWaylandDisplay::flushRequests, Qt::QueuedConnection);
+ m_eventThread->start();
-wl_event_queue *QWaylandDisplay::createEventQueue()
-{
- return wl_display_create_queue(mDisplay);
+ // wl_display_disconnect() free this.
+ m_frameEventQueue = wl_display_create_queue(mDisplay);
+ m_frameEventQueueThread.reset(
+ new EventThread(mDisplay, m_frameEventQueue, EventThread::SelfDispatch));
+ m_frameEventQueueThread->start();
}
-void QWaylandDisplay::dispatchQueueWhile(wl_event_queue *queue, std::function<bool ()> condition, int timeout)
+void QWaylandDisplay::blockingReadEvents()
{
- if (!condition())
- return;
-
- QElapsedTimer timer;
- timer.start();
- struct pollfd pFd = qt_make_pollfd(wl_display_get_fd(mDisplay), POLLIN);
- while (timeout == -1 || timer.elapsed() < timeout) {
- while (wl_display_prepare_read_queue(mDisplay, queue) != 0)
- wl_display_dispatch_queue_pending(mDisplay, queue);
-
- wl_display_flush(mDisplay);
-
- const int remaining = qMax(timeout - timer.elapsed(), 0ll);
- const int pollTimeout = timeout == -1 ? -1 : remaining;
- if (qt_poll_msecs(&pFd, 1, pollTimeout) > 0)
- wl_display_read_events(mDisplay);
- else
- wl_display_cancel_read(mDisplay);
-
- if (wl_display_dispatch_queue_pending(mDisplay, queue) < 0)
- checkError();
-
- if (!condition())
- break;
- }
+ if (wl_display_dispatch(mDisplay) < 0)
+ checkWaylandError(mDisplay);
}
QWaylandScreen *QWaylandDisplay::screenForOutput(struct wl_output *output) const
@@ -347,7 +494,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
if (interface == QStringLiteral("wl_output")) {
mWaitingScreens << new QWaylandScreen(this, version, id);
} else if (interface == QStringLiteral("wl_compositor")) {
- mCompositorVersion = qMin((int)version, 3);
+ mCompositorVersion = qMin((int)version, 4);
mCompositor.init(registry, id, mCompositorVersion);
} else if (interface == QStringLiteral("wl_shm")) {
mShm.reset(new QWaylandShm(this, version, id));
@@ -356,7 +503,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
mInputDevices.append(inputDevice);
#if QT_CONFIG(wayland_datadevice)
} else if (interface == QStringLiteral("wl_data_device_manager")) {
- mDndSelectionHandler.reset(new QWaylandDataDeviceManager(this, id));
+ mDndSelectionHandler.reset(new QWaylandDataDeviceManager(this, version, id));
#endif
} else if (interface == QStringLiteral("qt_surface_extension")) {
mWindowExtension.reset(new QtWayland::qt_surface_extension(registry, id, 1));
@@ -373,6 +520,8 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
#if QT_CONFIG(wayland_client_primary_selection)
} else if (interface == QStringLiteral("zwp_primary_selection_device_manager_v1")) {
mPrimarySelectionManager.reset(new QWaylandPrimarySelectionDeviceManagerV1(this, id, 1));
+ for (QWaylandInputDevice *inputDevice : qAsConst(mInputDevices))
+ inputDevice->setPrimarySelectionDevice(mPrimarySelectionManager->createDevice(inputDevice));
#endif
} else if (interface == QStringLiteral("zwp_text_input_manager_v2") && !mClientSideInputContextRequested) {
mTextInputManager.reset(new QtWayland::zwp_text_input_manager_v2(registry, id, 1));
@@ -431,6 +580,13 @@ void QWaylandDisplay::registry_global_remove(uint32_t id)
inputDevice->setTextInput(nullptr);
mWaylandIntegration->reconfigureInputContext();
}
+#if QT_CONFIG(wayland_client_primary_selection)
+ if (global.interface == QStringLiteral("zwp_primary_selection_device_manager_v1")) {
+ mPrimarySelectionManager.reset();
+ for (QWaylandInputDevice *inputDevice : qAsConst(mInputDevices))
+ inputDevice->setPrimarySelectionDevice(nullptr);
+ }
+#endif
mGlobals.removeAt(i);
break;
}
@@ -456,9 +612,10 @@ void QWaylandDisplay::addRegistryListener(RegistryListener listener, void *data)
void QWaylandDisplay::removeListener(RegistryListener listener, void *data)
{
- std::remove_if(mRegistryListeners.begin(), mRegistryListeners.end(), [=](Listener l){
+ auto iter = std::remove_if(mRegistryListeners.begin(), mRegistryListeners.end(), [=](Listener l){
return (l.listener == listener && l.data == data);
});
+ mRegistryListeners.erase(iter, mRegistryListeners.end());
}
uint32_t QWaylandDisplay::currentTimeMillisec()
@@ -471,50 +628,9 @@ uint32_t QWaylandDisplay::currentTimeMillisec()
return 0;
}
-static void
-sync_callback(void *data, struct wl_callback *callback, uint32_t serial)
-{
- Q_UNUSED(serial)
- bool *done = static_cast<bool *>(data);
-
- *done = true;
-
- // If the wl_callback done event is received after the condition check in the while loop in
- // forceRoundTrip(), but before the call to processEvents, the call to processEvents may block
- // forever if no more events are posted (eventhough the callback is handled in response to the
- // aboutToBlock signal). Hence, we wake up the event dispatcher so forceRoundTrip may return.
- // (QTBUG-64696)
- if (auto *dispatcher = QThread::currentThread()->eventDispatcher())
- dispatcher->wakeUp();
-
- wl_callback_destroy(callback);
-}
-
-static const struct wl_callback_listener sync_listener = {
- sync_callback
-};
-
void QWaylandDisplay::forceRoundTrip()
{
- // wl_display_roundtrip() works on the main queue only,
- // but we use a separate one, so basically reimplement it here
- int ret = 0;
- bool done = false;
- wl_callback *callback = wl_display_sync(mDisplay);
- wl_callback_add_listener(callback, &sync_listener, &done);
- flushRequests();
- if (QThread::currentThread()->eventDispatcher()) {
- while (!done && ret >= 0) {
- QThread::currentThread()->eventDispatcher()->processEvents(QEventLoop::WaitForMoreEvents);
- ret = wl_display_dispatch_pending(mDisplay);
- }
- } else {
- while (!done && ret >= 0)
- ret = wl_display_dispatch(mDisplay);
- }
-
- if (ret == -1 && !done)
- wl_callback_destroy(callback);
+ wl_display_roundtrip(mDisplay);
}
bool QWaylandDisplay::supportsWindowDecoration() const
@@ -578,14 +694,10 @@ void QWaylandDisplay::handleKeyboardFocusChanged(QWaylandInputDevice *inputDevic
if (mLastKeyboardFocus == keyboardFocus)
return;
- if (mWaylandIntegration->mShellIntegration) {
- mWaylandIntegration->mShellIntegration->handleKeyboardFocusChanged(keyboardFocus, mLastKeyboardFocus);
- } else {
- if (keyboardFocus)
- handleWindowActivated(keyboardFocus);
- if (mLastKeyboardFocus)
- handleWindowDeactivated(mLastKeyboardFocus);
- }
+ if (keyboardFocus)
+ handleWindowActivated(keyboardFocus);
+ if (mLastKeyboardFocus)
+ handleWindowDeactivated(mLastKeyboardFocus);
mLastKeyboardFocus = keyboardFocus;
}
@@ -604,6 +716,19 @@ void QWaylandDisplay::handleWaylandSync()
QWindow *activeWindow = mActiveWindows.empty() ? nullptr : mActiveWindows.last()->window();
if (activeWindow != QGuiApplication::focusWindow())
QWindowSystemInterface::handleWindowActivated(activeWindow);
+
+ if (!activeWindow) {
+ if (lastInputDevice()) {
+#if QT_CONFIG(clipboard)
+ if (auto *dataDevice = lastInputDevice()->dataDevice())
+ dataDevice->invalidateSelectionOffer();
+#endif
+#if QT_CONFIG(wayland_client_primary_selection)
+ if (auto *device = lastInputDevice()->primarySelectionDevice())
+ device->invalidateSelectionOffer();
+#endif
+ }
+ }
}
const wl_callback_listener QWaylandDisplay::syncCallbackListener = {
@@ -630,6 +755,13 @@ QWaylandInputDevice *QWaylandDisplay::defaultInputDevice() const
return mInputDevices.isEmpty() ? 0 : mInputDevices.first();
}
+bool QWaylandDisplay::isKeyboardAvailable() const
+{
+ return std::any_of(
+ mInputDevices.constBegin(), mInputDevices.constEnd(),
+ [this](const QWaylandInputDevice *device) { return device->keyboard() != nullptr; });
+}
+
#if QT_CONFIG(cursor)
QWaylandCursor *QWaylandDisplay::waylandCursor()
@@ -656,6 +788,8 @@ QWaylandCursorTheme *QWaylandDisplay::loadCursorTheme(const QString &name, int p
} // namespace QtWaylandClient
+#include "qwaylanddisplay.moc"
+
QT_END_NAMESPACE
#include "moc_qwaylanddisplay_p.cpp"
diff --git a/qtwayland/src/client/qwaylanddisplay_p.h b/qtwayland/src/client/qwaylanddisplay_p.h
index 1bad8b67..cf91b924 100644
--- a/qtwayland/src/client/qwaylanddisplay_p.h
+++ b/qtwayland/src/client/qwaylanddisplay_p.h
@@ -111,6 +111,7 @@ class QWaylandSurface;
class QWaylandShellIntegration;
class QWaylandCursor;
class QWaylandCursorTheme;
+class EventThread;
typedef void (*RegistryListener)(void *data,
struct wl_registry *registry,
@@ -122,15 +123,11 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandDisplay : public QObject, public QtWayland
Q_OBJECT
public:
- struct FrameQueue {
- FrameQueue(wl_event_queue *q = nullptr) : queue(q), mutex(new QMutex) {}
- wl_event_queue *queue;
- QMutex *mutex;
- };
-
QWaylandDisplay(QWaylandIntegration *waylandIntegration);
~QWaylandDisplay(void) override;
+ void initialize();
+
#if QT_CONFIG(xkbcommon)
struct xkb_context *xkbContext() const { return mXkbContext.get(); }
#endif
@@ -214,11 +211,11 @@ public:
void handleKeyboardFocusChanged(QWaylandInputDevice *inputDevice);
void handleWindowDestroyed(QWaylandWindow *window);
- wl_event_queue *createEventQueue();
- FrameQueue createFrameQueue();
- void destroyFrameQueue(const FrameQueue &q);
- void dispatchQueueWhile(wl_event_queue *queue, std::function<bool()> condition, int timeout = -1);
+ wl_event_queue *frameEventQueue() { return m_frameEventQueue; };
+
+ bool isKeyboardAvailable() const;
+ void initEventThread();
public slots:
void blockingReadEvents();
void flushRequests();
@@ -241,6 +238,9 @@ private:
};
struct wl_display *mDisplay = nullptr;
+ QScopedPointer<EventThread> m_eventThread;
+ wl_event_queue *m_frameEventQueue = nullptr;
+ QScopedPointer<EventThread> m_frameEventQueueThread;
QtWayland::wl_compositor mCompositor;
QScopedPointer<QWaylandShm> mShm;
QList<QWaylandScreen *> mWaitingScreens;
@@ -279,11 +279,9 @@ private:
QWaylandInputDevice *mLastInputDevice = nullptr;
QPointer<QWaylandWindow> mLastInputWindow;
QPointer<QWaylandWindow> mLastKeyboardFocus;
- QVector<QWaylandWindow *> mActiveWindows;
- QVector<FrameQueue> mExternalQueues;
+ QList<QWaylandWindow *> mActiveWindows;
struct wl_callback *mSyncCallback = nullptr;
static const wl_callback_listener syncCallbackListener;
- QReadWriteLock m_frameQueueLock;
bool mClientSideInputContextRequested = !QPlatformInputContextFactory::requested().isNull();
diff --git a/qtwayland/src/client/qwaylanddnd.cpp b/qtwayland/src/client/qwaylanddnd.cpp
index 6535aa16..7c53f5fa 100644
--- a/qtwayland/src/client/qwaylanddnd.cpp
+++ b/qtwayland/src/client/qwaylanddnd.cpp
@@ -66,7 +66,7 @@ void QWaylandDrag::startDrag()
{
QBasicDrag::startDrag();
QWaylandWindow *icon = static_cast<QWaylandWindow *>(shapedPixmapWindow()->handle());
- if (m_display->currentInputDevice()->dataDevice()->startDrag(drag()->mimeData(), icon)) {
+ if (m_display->currentInputDevice()->dataDevice()->startDrag(drag()->mimeData(), drag()->supportedActions(), icon)) {
icon->addAttachOffset(-drag()->hotSpot());
} else {
// Cancelling immediately does not work, since the event loop for QDrag::exec is started
@@ -80,6 +80,9 @@ void QWaylandDrag::cancel()
QBasicDrag::cancel();
m_display->currentInputDevice()->dataDevice()->cancelDrag();
+
+ if (drag())
+ drag()->deleteLater();
}
void QWaylandDrag::move(const QPoint &globalPos, Qt::MouseButtons b, Qt::KeyboardModifiers mods)
@@ -103,33 +106,41 @@ void QWaylandDrag::endDrag()
m_display->currentInputDevice()->handleEndDrag();
}
-void QWaylandDrag::updateTarget(const QString &mimeType)
+void QWaylandDrag::setResponse(bool accepted)
{
- setCanDrop(!mimeType.isEmpty());
-
- if (canDrop()) {
- updateCursor(defaultAction(drag()->supportedActions(), m_display->currentInputDevice()->modifiers()));
- } else {
- updateCursor(Qt::IgnoreAction);
- }
+ // This method is used for old DataDevices where the drag action is not communicated
+ Qt::DropAction action = defaultAction(drag()->supportedActions(), m_display->currentInputDevice()->modifiers());
+ setResponse(QPlatformDropQtResponse(accepted, action));
}
-void QWaylandDrag::setResponse(const QPlatformDragQtResponse &response)
+void QWaylandDrag::setResponse(const QPlatformDropQtResponse &response)
{
setCanDrop(response.isAccepted());
if (canDrop()) {
- updateCursor(defaultAction(drag()->supportedActions(), m_display->currentInputDevice()->modifiers()));
+ updateCursor(response.acceptedAction());
} else {
updateCursor(Qt::IgnoreAction);
}
}
-void QWaylandDrag::finishDrag(const QPlatformDropQtResponse &response)
+void QWaylandDrag::setDropResponse(const QPlatformDropQtResponse &response)
{
setExecutedDropAction(response.acceptedAction());
+}
+
+void QWaylandDrag::finishDrag()
+{
QKeyEvent event(QEvent::KeyPress, Qt::Key_Escape, Qt::NoModifier);
eventFilter(shapedPixmapWindow(), &event);
+
+ if (drag())
+ drag()->deleteLater();
+}
+
+bool QWaylandDrag::ownsDragObject() const
+{
+ return true;
}
}
diff --git a/qtwayland/src/client/qwaylanddnd_p.h b/qtwayland/src/client/qwaylanddnd_p.h
index 474fe2ab..46f629ac 100644
--- a/qtwayland/src/client/qwaylanddnd_p.h
+++ b/qtwayland/src/client/qwaylanddnd_p.h
@@ -71,9 +71,10 @@ public:
QWaylandDrag(QWaylandDisplay *display);
~QWaylandDrag() override;
- void updateTarget(const QString &mimeType);
- void setResponse(const QPlatformDragQtResponse &response);
- void finishDrag(const QPlatformDropQtResponse &response);
+ void setResponse(bool accepted);
+ void setResponse(const QPlatformDropQtResponse &response);
+ void setDropResponse(const QPlatformDropQtResponse &response);
+ void finishDrag();
protected:
void startDrag() override;
@@ -82,6 +83,7 @@ protected:
void drop(const QPoint &globalPos, Qt::MouseButtons b, Qt::KeyboardModifiers mods) override;
void endDrag() override;
+ bool ownsDragObject() const override;
private:
QWaylandDisplay *m_display = nullptr;
diff --git a/qtwayland/src/client/qwaylandinputdevice.cpp b/qtwayland/src/client/qwaylandinputdevice.cpp
index b0e9692b..ab978d3f 100644
--- a/qtwayland/src/client/qwaylandinputdevice.cpp
+++ b/qtwayland/src/client/qwaylandinputdevice.cpp
@@ -310,8 +310,7 @@ void QWaylandInputDevice::Pointer::updateCursor()
auto shape = seat()->mCursor.shape;
if (shape == Qt::BlankCursor) {
- if (mCursor.surface)
- mCursor.surface->hide();
+ getOrCreateCursorSurface()->hide();
return;
}
@@ -846,7 +845,7 @@ void QWaylandInputDevice::Pointer::releaseButtons()
mButtons = Qt::NoButton;
if (auto *window = focusWindow()) {
- MotionEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, mParent->modifiers());
+ ReleaseEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, Qt::NoButton, mParent->modifiers());
window->handleMouse(mParent, e);
}
}
@@ -1304,14 +1303,6 @@ void QWaylandInputDevice::Keyboard::handleFocusDestroyed()
void QWaylandInputDevice::Keyboard::handleFocusLost()
{
mFocus = nullptr;
-#if QT_CONFIG(clipboard)
- if (auto *dataDevice = mParent->dataDevice())
- dataDevice->invalidateSelectionOffer();
-#endif
-#if QT_CONFIG(wayland_client_primary_selection)
- if (auto *device = mParent->primarySelectionDevice())
- device->invalidateSelectionOffer();
-#endif
mParent->mQDisplay->handleKeyboardFocusChanged(mParent);
mRepeatTimer.stop();
}
@@ -1400,6 +1391,7 @@ void QWaylandInputDevice::Touch::touch_cancel()
if (touchExt)
touchExt->touchCanceled();
+ mFocus = nullptr;
QWindowSystemInterface::handleTouchCancelEvent(nullptr, mParent->mTouchDevice);
}
diff --git a/qtwayland/src/client/qwaylandintegration.cpp b/qtwayland/src/client/qwaylandintegration.cpp
index d257e2e3..54861600 100644
--- a/qtwayland/src/client/qwaylandintegration.cpp
+++ b/qtwayland/src/client/qwaylandintegration.cpp
@@ -125,6 +125,9 @@ QWaylandIntegration::QWaylandIntegration()
#endif
reconfigureInputContext();
+
+ QWaylandWindow::fixedToplevelPositions =
+ !qEnvironmentVariableIsSet("QT_WAYLAND_DISABLE_FIXED_POSITIONS");
}
QWaylandIntegration::~QWaylandIntegration()
@@ -192,14 +195,18 @@ QAbstractEventDispatcher *QWaylandIntegration::createEventDispatcher() const
void QWaylandIntegration::initialize()
{
+ mDisplay->initEventThread();
+
+ // Call after eventDispatcher is fully connected, for QWaylandDisplay::forceRoundTrip()
+ mDisplay->initialize();
+
+ // But the aboutToBlock() and awake() should be connected after initializePlatform().
+ // Otherwise the connected flushRequests() may consumes up all events before processEvents starts to wait,
+ // so that processEvents(QEventLoop::WaitForMoreEvents) may be blocked in the forceRoundTrip().
QAbstractEventDispatcher *dispatcher = QGuiApplicationPrivate::eventDispatcher;
QObject::connect(dispatcher, SIGNAL(aboutToBlock()), mDisplay.data(), SLOT(flushRequests()));
QObject::connect(dispatcher, SIGNAL(awake()), mDisplay.data(), SLOT(flushRequests()));
- int fd = wl_display_get_fd(mDisplay->wl_display());
- QSocketNotifier *sn = new QSocketNotifier(fd, QSocketNotifier::Read, mDisplay.data());
- QObject::connect(sn, SIGNAL(activated(QSocketDescriptor)), mDisplay.data(), SLOT(flushRequests()));
-
// Qt does not support running with no screens
mDisplay->ensureScreen();
}
@@ -262,6 +269,14 @@ QWaylandDisplay *QWaylandIntegration::display() const
return mDisplay.data();
}
+Qt::KeyboardModifiers QWaylandIntegration::queryKeyboardModifiers() const
+{
+ if (auto *seat = mDisplay->currentInputDevice()) {
+ return seat->modifiers();
+ }
+ return Qt::NoModifier;
+}
+
QList<int> QWaylandIntegration::possibleKeys(const QKeyEvent *event) const
{
if (auto *seat = mDisplay->currentInputDevice())
diff --git a/qtwayland/src/client/qwaylandintegration_p.h b/qtwayland/src/client/qwaylandintegration_p.h
index ff70ae25..73b80658 100644
--- a/qtwayland/src/client/qwaylandintegration_p.h
+++ b/qtwayland/src/client/qwaylandintegration_p.h
@@ -107,6 +107,8 @@ public:
QWaylandDisplay *display() const;
+ Qt::KeyboardModifiers queryKeyboardModifiers() const override;
+
QList<int> possibleKeys(const QKeyEvent *event) const override;
QStringList themeNames() const override;
diff --git a/qtwayland/src/client/qwaylandnativeinterface.cpp b/qtwayland/src/client/qwaylandnativeinterface.cpp
index bf54a1a0..9763c312 100644
--- a/qtwayland/src/client/qwaylandnativeinterface.cpp
+++ b/qtwayland/src/client/qwaylandnativeinterface.cpp
@@ -139,7 +139,7 @@ void *QWaylandNativeInterface::nativeResourceForScreen(const QByteArray &resourc
{
QByteArray lowerCaseResource = resourceString.toLower();
- if (lowerCaseResource == "output")
+ if (lowerCaseResource == "output" && !screen->handle()->isPlaceholder())
return ((QWaylandScreen *) screen->handle())->output();
return nullptr;
diff --git a/qtwayland/src/client/qwaylandprimaryselectionv1.cpp b/qtwayland/src/client/qwaylandprimaryselectionv1.cpp
index 7805dd73..dac532b2 100644
--- a/qtwayland/src/client/qwaylandprimaryselectionv1.cpp
+++ b/qtwayland/src/client/qwaylandprimaryselectionv1.cpp
@@ -54,11 +54,6 @@ QWaylandPrimarySelectionDeviceManagerV1::QWaylandPrimarySelectionDeviceManagerV1
: zwp_primary_selection_device_manager_v1(display->wl_registry(), id, qMin(version, uint(1)))
, m_display(display)
{
- // Create devices for all seats.
- // This only works if we get the global before all devices
- const auto seats = m_display->inputDevices();
- for (auto *seat : seats)
- seat->setPrimarySelectionDevice(createDevice(seat));
}
QWaylandPrimarySelectionDeviceV1 *QWaylandPrimarySelectionDeviceManagerV1::createDevice(QWaylandInputDevice *seat)
diff --git a/qtwayland/src/client/qwaylandscreen.cpp b/qtwayland/src/client/qwaylandscreen.cpp
index 6cb337de..5537dafd 100644
--- a/qtwayland/src/client/qwaylandscreen.cpp
+++ b/qtwayland/src/client/qwaylandscreen.cpp
@@ -60,7 +60,7 @@ QWaylandXdgOutputManagerV1::QWaylandXdgOutputManagerV1(QWaylandDisplay* display,
}
QWaylandScreen::QWaylandScreen(QWaylandDisplay *waylandDisplay, int version, uint32_t id)
- : QtWayland::wl_output(waylandDisplay->wl_registry(), id, qMin(version, 2))
+ : QtWayland::wl_output(waylandDisplay->wl_registry(), id, qMin(version, 3))
, m_outputId(id)
, mWaylandDisplay(waylandDisplay)
, mOutputName(QStringLiteral("Screen%1").arg(id))
@@ -72,7 +72,7 @@ QWaylandScreen::QWaylandScreen(QWaylandDisplay *waylandDisplay, int version, uin
qCWarning(lcQpaWayland) << "wl_output done event not supported by compositor,"
<< "QScreen may not work correctly";
mWaylandDisplay->forceRoundTrip(); // Give the compositor a chance to send geometry etc.
- mOutputDone = true; // Fake the done event
+ mProcessedEvents |= OutputDoneEvent; // Fake the done event
maybeInitialize();
}
}
@@ -81,16 +81,29 @@ QWaylandScreen::~QWaylandScreen()
{
if (zxdg_output_v1::isInitialized())
zxdg_output_v1::destroy();
+ if (wl_output::isInitialized() && wl_output_get_version(wl_output::object()) >= WL_OUTPUT_RELEASE_SINCE_VERSION)
+ wl_output::release();
+}
+
+uint QWaylandScreen::requiredEvents() const
+{
+ uint ret = OutputDoneEvent;
+
+ if (mWaylandDisplay->xdgOutputManager()) {
+ ret |= XdgOutputNameEvent;
+
+ if (mWaylandDisplay->xdgOutputManager()->version() < 3)
+ ret |= XdgOutputDoneEvent;
+ }
+ return ret;
}
void QWaylandScreen::maybeInitialize()
{
Q_ASSERT(!mInitialized);
- if (!mOutputDone)
- return;
-
- if (mWaylandDisplay->xdgOutputManager() && !mXdgOutputDone)
+ const uint requiredEvents = this->requiredEvents();
+ if ((mProcessedEvents & requiredEvents) != requiredEvents)
return;
mInitialized = true;
@@ -276,9 +289,8 @@ void QWaylandScreen::output_scale(int32_t factor)
void QWaylandScreen::output_done()
{
- mOutputDone = true;
- if (zxdg_output_v1::isInitialized() && mWaylandDisplay->xdgOutputManager()->version() >= 3)
- mXdgOutputDone = true;
+ mProcessedEvents |= OutputDoneEvent;
+
if (mInitialized) {
updateOutputProperties();
if (zxdg_output_v1::isInitialized())
@@ -339,7 +351,7 @@ void QWaylandScreen::zxdg_output_v1_done()
if (Q_UNLIKELY(mWaylandDisplay->xdgOutputManager()->version() >= 3))
qWarning(lcQpaWayland) << "zxdg_output_v1.done received on version 3 or newer, this is most likely a bug in the compositor";
- mXdgOutputDone = true;
+ mProcessedEvents |= XdgOutputDoneEvent;
if (mInitialized)
updateXdgOutputProperties();
else
@@ -348,7 +360,11 @@ void QWaylandScreen::zxdg_output_v1_done()
void QWaylandScreen::zxdg_output_v1_name(const QString &name)
{
+ if (Q_UNLIKELY(mInitialized))
+ qWarning(lcQpaWayland) << "zxdg_output_v1.name received after output has been initialized, this is most likely a bug in the compositor";
+
mOutputName = name;
+ mProcessedEvents |= XdgOutputNameEvent;
}
void QWaylandScreen::updateXdgOutputProperties()
diff --git a/qtwayland/src/client/qwaylandscreen_p.h b/qtwayland/src/client/qwaylandscreen_p.h
index df1c94f2..050cfdc0 100644
--- a/qtwayland/src/client/qwaylandscreen_p.h
+++ b/qtwayland/src/client/qwaylandscreen_p.h
@@ -116,6 +116,13 @@ public:
static QWaylandScreen *fromWlOutput(::wl_output *output);
private:
+ enum Event : uint {
+ XdgOutputDoneEvent = 0x1,
+ OutputDoneEvent = 0x2,
+ XdgOutputNameEvent = 0x4,
+ };
+ uint requiredEvents() const;
+
void output_mode(uint32_t flags, int width, int height, int refresh) override;
void output_geometry(int32_t x, int32_t y,
int32_t width, int32_t height,
@@ -148,8 +155,7 @@ private:
QSize mPhysicalSize;
QString mOutputName;
Qt::ScreenOrientation m_orientation = Qt::PrimaryOrientation;
- bool mOutputDone = false;
- bool mXdgOutputDone = false;
+ uint mProcessedEvents = 0;
bool mInitialized = false;
#if QT_CONFIG(cursor)
diff --git a/qtwayland/src/client/qwaylandshmbackingstore.cpp b/qtwayland/src/client/qwaylandshmbackingstore.cpp
index dc7ff670..145f933b 100644
--- a/qtwayland/src/client/qwaylandshmbackingstore.cpp
+++ b/qtwayland/src/client/qwaylandshmbackingstore.cpp
@@ -52,6 +52,7 @@
#include <QtWaylandClient/private/wayland-wayland-client-protocol.h>
+#include <fcntl.h>
#include <unistd.h>
#include <sys/mman.h>
@@ -61,6 +62,9 @@
# ifndef MFD_CLOEXEC
# define MFD_CLOEXEC 0x0001U
# endif
+# ifndef MFD_ALLOW_SEALING
+# define MFD_ALLOW_SEALING 0x0002U
+# endif
#endif
QT_BEGIN_NAMESPACE
@@ -68,14 +72,16 @@ QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
QWaylandShmBuffer::QWaylandShmBuffer(QWaylandDisplay *display,
- const QSize &size, QImage::Format format, int scale)
+ const QSize &size, QImage::Format format, qreal scale)
{
int stride = size.width() * 4;
int alloc = stride * size.height();
int fd = -1;
-#ifdef SYS_memfd_create
- fd = syscall(SYS_memfd_create, "wayland-shm", MFD_CLOEXEC);
+#if defined(SYS_memfd_create) && defined(F_SEAL_SEAL)
+ fd = syscall(SYS_memfd_create, "wayland-shm", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (fd >= 0)
+ fcntl(fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_SEAL);
#endif
QScopedPointer<QFile> filePointer;
@@ -108,7 +114,7 @@ QWaylandShmBuffer::QWaylandShmBuffer(QWaylandDisplay *display,
QWaylandShm* shm = display->shm();
wl_shm_format wl_format = shm->formatFrom(format);
mImage = QImage(data, size.width(), size.height(), stride, format);
- mImage.setDevicePixelRatio(qreal(scale));
+ mImage.setDevicePixelRatio(scale);
mShmPool = wl_shm_create_pool(shm->object(), fd, alloc);
init(wl_shm_pool_create_buffer(mShmPool,0, size.width(), size.height(),
@@ -180,8 +186,6 @@ void QWaylandShmBackingStore::beginPaint(const QRegion &region)
mPainting = true;
ensureSize();
- waylandWindow()->setCanResize(false);
-
if (mBackBuffer->image()->hasAlphaChannel()) {
QPainter p(paintDevice());
p.setCompositionMode(QPainter::CompositionMode_Source);
@@ -196,7 +200,6 @@ void QWaylandShmBackingStore::endPaint()
mPainting = false;
if (mPendingFlush)
flush(window(), mPendingRegion, QPoint());
- waylandWindow()->setCanResize(true);
}
void QWaylandShmBackingStore::ensureSize()
@@ -271,7 +274,7 @@ QWaylandShmBuffer *QWaylandShmBackingStore::getBuffer(const QSize &size)
void QWaylandShmBackingStore::resize(const QSize &size)
{
QMargins margins = windowDecorationMargins();
- int scale = waylandWindow()->scale();
+ qreal scale = waylandWindow()->scale();
QSize sizeWithMargins = (size + QSize(margins.left()+margins.right(),margins.top()+margins.bottom())) * scale;
// We look for a free buffer to draw into. If the buffer is not the last buffer we used,
diff --git a/qtwayland/src/client/qwaylandshmbackingstore_p.h b/qtwayland/src/client/qwaylandshmbackingstore_p.h
index e01632da..f3fae438 100644
--- a/qtwayland/src/client/qwaylandshmbackingstore_p.h
+++ b/qtwayland/src/client/qwaylandshmbackingstore_p.h
@@ -71,7 +71,7 @@ class QWaylandWindow;
class Q_WAYLAND_CLIENT_EXPORT QWaylandShmBuffer : public QWaylandBuffer {
public:
QWaylandShmBuffer(QWaylandDisplay *display,
- const QSize &size, QImage::Format format, int scale = 1);
+ const QSize &size, QImage::Format format, qreal scale = 1);
~QWaylandShmBuffer() override;
QSize size() const override { return mImage.size(); }
int scale() const override { return int(mImage.devicePixelRatio()); }
diff --git a/qtwayland/src/client/qwaylandwindow.cpp b/qtwayland/src/client/qwaylandwindow.cpp
index d57094a7..7a9bccc1 100644
--- a/qtwayland/src/client/qwaylandwindow.cpp
+++ b/qtwayland/src/client/qwaylandwindow.cpp
@@ -76,7 +76,6 @@ QWaylandWindow *QWaylandWindow::mMouseGrab = nullptr;
QWaylandWindow::QWaylandWindow(QWindow *window, QWaylandDisplay *display)
: QPlatformWindow(window)
, mDisplay(display)
- , mFrameQueue(mDisplay->createFrameQueue())
, mResizeAfterSwap(qEnvironmentVariableIsSet("QT_WAYLAND_RESIZE_AFTER_SWAP"))
{
{
@@ -95,9 +94,6 @@ QWaylandWindow::QWaylandWindow(QWindow *window, QWaylandDisplay *display)
QWaylandWindow::~QWaylandWindow()
{
- mDisplay->destroyFrameQueue(mFrameQueue);
- mDisplay->handleWindowDestroyed(this);
-
delete mWindowDecoration;
if (mSurface)
@@ -189,7 +185,7 @@ void QWaylandWindow::initWindow()
// typically be integer 1 (normal-dpi) or 2 (high-dpi). Call set_buffer_scale()
// to inform the compositor that high-resolution buffers will be provided.
if (mDisplay->compositorVersion() >= 3)
- mSurface->set_buffer_scale(scale());
+ mSurface->set_buffer_scale(mScale);
if (QScreen *s = window()->screen())
setOrientationMask(s->orientationUpdateMask());
@@ -204,6 +200,8 @@ void QWaylandWindow::initWindow()
mShellSurface->requestWindowStates(window()->windowStates());
handleContentOrientationChange(window()->contentOrientation());
mFlags = window()->flags();
+
+ mSurface->commit();
}
void QWaylandWindow::initializeWlSurface()
@@ -243,6 +241,7 @@ bool QWaylandWindow::shouldCreateSubSurface() const
void QWaylandWindow::reset()
{
+ closeChildPopups();
delete mShellSurface;
mShellSurface = nullptr;
delete mSubSurfaceWindow;
@@ -255,17 +254,22 @@ void QWaylandWindow::reset()
mSurface.reset();
}
- if (mFrameCallback) {
- wl_callback_destroy(mFrameCallback);
- mFrameCallback = nullptr;
- }
+ {
+ QMutexLocker lock(&mFrameSyncMutex);
+ if (mFrameCallback) {
+ wl_callback_destroy(mFrameCallback);
+ mFrameCallback = nullptr;
+ }
- mFrameCallbackElapsedTimer.invalidate();
- mWaitingForFrameCallback = false;
+ mFrameCallbackElapsedTimer.invalidate();
+ mWaitingForFrameCallback = false;
+ }
mFrameCallbackTimedOut = false;
mMask = QRegion();
mQueuedBuffer = nullptr;
+
+ mDisplay->handleWindowDestroyed(this);
}
QWaylandWindow *QWaylandWindow::fromWlSurface(::wl_surface *surface)
@@ -351,19 +355,25 @@ void QWaylandWindow::setGeometry_helper(const QRect &rect)
}
}
-void QWaylandWindow::setGeometry(const QRect &rect)
+void QWaylandWindow::setGeometry(const QRect &r)
{
+ auto rect = r;
+ if (fixedToplevelPositions && !QPlatformWindow::parent() && window()->type() != Qt::Popup
+ && window()->type() != Qt::ToolTip) {
+ rect.moveTo(screen()->geometry().topLeft());
+ }
setGeometry_helper(rect);
if (window()->isVisible() && rect.isValid()) {
if (mWindowDecoration)
mWindowDecoration->update();
- if (mResizeAfterSwap && windowType() == Egl && mSentInitialResize)
+ if (mResizeAfterSwap && windowType() == Egl && mSentInitialResize) {
+ QMutexLocker lock(&mResizeLock);
mResizeDirty = true;
- else
+ } else {
QWindowSystemInterface::handleGeometryChange(window(), geometry());
-
+ }
mSentInitialResize = true;
}
QRect exposeGeometry(QPoint(), geometry().size());
@@ -374,7 +384,7 @@ void QWaylandWindow::setGeometry(const QRect &rect)
mShellSurface->setWindowGeometry(windowContentGeometry());
if (isOpaque() && mMask.isEmpty())
- setOpaqueArea(rect);
+ setOpaqueArea(QRect(QPoint(0, 0), rect.size()));
}
void QWaylandWindow::resizeFromApplyConfigure(const QSize &sizeWithMargins, const QPoint &offset)
@@ -399,21 +409,6 @@ void QWaylandWindow::sendExposeEvent(const QRect &rect)
mLastExposeGeometry = rect;
}
-
-static QVector<QPointer<QWaylandWindow>> activePopups;
-
-void QWaylandWindow::closePopups(QWaylandWindow *parent)
-{
- while (!activePopups.isEmpty()) {
- auto popup = activePopups.takeLast();
- if (popup.isNull())
- continue;
- if (popup.data() == parent)
- return;
- popup->reset();
- }
-}
-
QPlatformScreen *QWaylandWindow::calculateScreenFromSurfaceEvents() const
{
QReadLocker lock(&mSurfaceLock);
@@ -433,10 +428,7 @@ void QWaylandWindow::setVisible(bool visible)
lastVisible = visible;
if (visible) {
- if (window()->type() == Qt::Popup || window()->type() == Qt::ToolTip)
- activePopups << this;
initWindow();
- mDisplay->flushRequests();
setGeometry(windowGeometry());
// Don't flush the events here, or else the newly visible window may start drawing, but since
@@ -444,7 +436,6 @@ void QWaylandWindow::setVisible(bool visible)
// QWaylandShmBackingStore::beginPaint().
} else {
sendExposeEvent(QRect());
- closePopups(this);
reset();
}
}
@@ -487,8 +478,6 @@ void QWaylandWindow::setMask(const QRegion &mask)
if (isOpaque())
setOpaqueArea(mMask);
}
-
- mSurface->commit();
}
void QWaylandWindow::applyConfigureWhenPossible()
@@ -556,12 +545,12 @@ void QWaylandWindow::sendRecursiveExposeEvent()
void QWaylandWindow::attach(QWaylandBuffer *buffer, int x, int y)
{
- Q_ASSERT(!buffer->committed());
QReadLocker locker(&mSurfaceLock);
if (mSurface == nullptr)
return;
if (buffer) {
+ Q_ASSERT(!buffer->committed());
handleUpdate();
buffer->setBusy();
@@ -583,7 +572,16 @@ void QWaylandWindow::damage(const QRect &rect)
if (mSurface == nullptr)
return;
- mSurface->damage(rect.x(), rect.y(), rect.width(), rect.height());
+ const qreal s = scale();
+ if (mDisplay->compositorVersion() >= 4) {
+ const QRect bufferRect =
+ QRectF(s * rect.x(), s * rect.y(), s * rect.width(), s * rect.height())
+ .toAlignedRect();
+ mSurface->damage_buffer(bufferRect.x(), bufferRect.y(), bufferRect.width(),
+ bufferRect.height());
+ } else {
+ mSurface->damage(rect.x(), rect.y(), rect.width(), rect.height());
+ }
}
void QWaylandWindow::safeCommit(QWaylandBuffer *buffer, const QRegion &damage)
@@ -619,8 +617,19 @@ void QWaylandWindow::commit(QWaylandBuffer *buffer, const QRegion &damage)
return;
attachOffset(buffer);
- for (const QRect &rect: damage)
- mSurface->damage(rect.x(), rect.y(), rect.width(), rect.height());
+ if (mDisplay->compositorVersion() >= 4) {
+ const qreal s = scale();
+ for (const QRect &rect : damage) {
+ const QRect bufferRect =
+ QRectF(s * rect.x(), s * rect.y(), s * rect.width(), s * rect.height())
+ .toAlignedRect();
+ mSurface->damage_buffer(bufferRect.x(), bufferRect.y(), bufferRect.width(),
+ bufferRect.height());
+ }
+ } else {
+ for (const QRect &rect: damage)
+ mSurface->damage(rect.x(), rect.y(), rect.width(), rect.height());
+ }
Q_ASSERT(!buffer->committed());
buffer->setCommitted();
mSurface->commit();
@@ -635,42 +644,53 @@ void QWaylandWindow::commit()
const wl_callback_listener QWaylandWindow::callbackListener = {
[](void *data, wl_callback *callback, uint32_t time) {
- Q_UNUSED(callback);
Q_UNUSED(time);
auto *window = static_cast<QWaylandWindow*>(data);
- window->handleFrameCallback();
+ window->handleFrameCallback(callback);
}
};
-void QWaylandWindow::handleFrameCallback()
+void QWaylandWindow::handleFrameCallback(wl_callback* callback)
{
+ QMutexLocker locker(&mFrameSyncMutex);
+ if (!mFrameCallback) {
+ // This means the callback is already unset by QWaylandWindow::reset.
+ // The wl_callback object will be destroyed there too.
+ return;
+ }
+ Q_ASSERT(callback == mFrameCallback);
+ wl_callback_destroy(callback);
+ mFrameCallback = nullptr;
+
mWaitingForFrameCallback = false;
mFrameCallbackElapsedTimer.invalidate();
// The rest can wait until we can run it on the correct thread
- if (!mWaitingForUpdateDelivery) {
- auto doHandleExpose = [this]() {
- bool wasExposed = isExposed();
- mFrameCallbackTimedOut = false;
- if (!wasExposed && isExposed()) // Did setting mFrameCallbackTimedOut make the window exposed?
- sendExposeEvent(QRect(QPoint(), geometry().size()));
- if (wasExposed && hasPendingUpdateRequest())
- deliverUpdateRequest();
-
- mWaitingForUpdateDelivery = false;
- };
+ auto doHandleExpose = [this]() {
+ mWaitingForUpdateDelivery.storeRelease(false);
+ bool wasExposed = isExposed();
+ mFrameCallbackTimedOut = false;
+ if (!wasExposed && isExposed()) // Did setting mFrameCallbackTimedOut make the window exposed?
+ sendExposeEvent(QRect(QPoint(), geometry().size()));
+ if (wasExposed && hasPendingUpdateRequest())
+ deliverUpdateRequest();
+ };
+ if (mWaitingForUpdateDelivery.testAndSetAcquire(false, true)) {
// Queued connection, to make sure we don't call handleUpdate() from inside waitForFrameSync()
// in the single-threaded case.
- mWaitingForUpdateDelivery = true;
QMetaObject::invokeMethod(this, doHandleExpose, Qt::QueuedConnection);
}
+
+ mFrameSyncWait.notify_all();
}
bool QWaylandWindow::waitForFrameSync(int timeout)
{
- QMutexLocker locker(mFrameQueue.mutex);
- mDisplay->dispatchQueueWhile(mFrameQueue.queue, [&]() { return mWaitingForFrameCallback; }, timeout);
+ QMutexLocker locker(&mFrameSyncMutex);
+
+ QDeadlineTimer deadline(timeout);
+ while (mWaitingForFrameCallback && mFrameSyncWait.wait(&mFrameSyncMutex, deadline)) { }
if (mWaitingForFrameCallback) {
qCDebug(lcWaylandBackingstore) << "Didn't receive frame callback in time, window should now be inexposed";
@@ -772,8 +792,6 @@ void QWaylandWindow::handleContentOrientationChange(Qt::ScreenOrientation orient
Q_UNREACHABLE();
}
mSurface->set_buffer_transform(transform);
- // set_buffer_transform is double buffered, we need to commit.
- mSurface->commit();
}
void QWaylandWindow::setOrientationMask(Qt::ScreenOrientations mask)
@@ -1032,8 +1050,17 @@ void QWaylandWindow::handleScreensChanged()
if (newScreen == mLastReportedScreen)
return;
+ if (!newScreen->isPlaceholder() && !newScreen->QPlatformScreen::screen())
+ mDisplay->forceRoundTrip();
QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->QPlatformScreen::screen());
mLastReportedScreen = newScreen;
+ if (fixedToplevelPositions && !QPlatformWindow::parent() && window()->type() != Qt::Popup
+ && window()->type() != Qt::ToolTip
+ && geometry().topLeft() != newScreen->geometry().topLeft()) {
+ auto geometry = this->geometry();
+ geometry.moveTo(newScreen->geometry().topLeft());
+ setGeometry(geometry);
+ }
int scale = newScreen->isPlaceholder() ? 1 : static_cast<QWaylandScreen *>(newScreen)->scale();
if (scale != mScale) {
@@ -1087,14 +1114,14 @@ bool QWaylandWindow::isActive() const
return mDisplay->isWindowActivated(this);
}
-int QWaylandWindow::scale() const
+qreal QWaylandWindow::scale() const
{
- return mScale;
+ return devicePixelRatio();
}
qreal QWaylandWindow::devicePixelRatio() const
{
- return mScale;
+ return qreal(mScale);
}
bool QWaylandWindow::setMouseGrabEnabled(bool grab)
@@ -1108,10 +1135,18 @@ bool QWaylandWindow::setMouseGrabEnabled(bool grab)
return true;
}
+Qt::WindowStates QWaylandWindow::windowStates() const
+{
+ return mLastReportedWindowStates;
+}
+
void QWaylandWindow::handleWindowStatesChanged(Qt::WindowStates states)
{
createDecoration();
- QWindowSystemInterface::handleWindowStateChanged(window(), states, mLastReportedWindowStates);
+ Qt::WindowStates statesWithoutActive = states & ~Qt::WindowActive;
+ Qt::WindowStates lastStatesWithoutActive = mLastReportedWindowStates & ~Qt::WindowActive;
+ QWindowSystemInterface::handleWindowStateChanged(window(), statesWithoutActive,
+ lastStatesWithoutActive);
mLastReportedWindowStates = states;
}
@@ -1153,19 +1188,24 @@ void QWaylandWindow::timerEvent(QTimerEvent *event)
if (event->timerId() != mFrameCallbackCheckIntervalTimerId)
return;
- bool callbackTimerExpired = mFrameCallbackElapsedTimer.hasExpired(mFrameCallbackTimeout);
- if (!mFrameCallbackElapsedTimer.isValid() || callbackTimerExpired ) {
- killTimer(mFrameCallbackCheckIntervalTimerId);
- mFrameCallbackCheckIntervalTimerId = -1;
- }
- if (mFrameCallbackElapsedTimer.isValid() && callbackTimerExpired) {
- mFrameCallbackElapsedTimer.invalidate();
+ {
+ QMutexLocker lock(&mFrameSyncMutex);
- qCDebug(lcWaylandBackingstore) << "Didn't receive frame callback in time, window should now be inexposed";
- mFrameCallbackTimedOut = true;
- mWaitingForUpdate = false;
- sendExposeEvent(QRect());
+ bool callbackTimerExpired = mFrameCallbackElapsedTimer.hasExpired(mFrameCallbackTimeout);
+ if (!mFrameCallbackElapsedTimer.isValid() || callbackTimerExpired ) {
+ killTimer(mFrameCallbackCheckIntervalTimerId);
+ mFrameCallbackCheckIntervalTimerId = -1;
+ }
+ if (!mFrameCallbackElapsedTimer.isValid() || !callbackTimerExpired) {
+ return;
+ }
+ mFrameCallbackElapsedTimer.invalidate();
}
+
+ qCDebug(lcWaylandBackingstore) << "Didn't receive frame callback in time, window should now be inexposed";
+ mFrameCallbackTimedOut = true;
+ mWaitingForUpdate = false;
+ sendExposeEvent(QRect());
}
void QWaylandWindow::requestUpdate()
@@ -1174,8 +1214,11 @@ void QWaylandWindow::requestUpdate()
Q_ASSERT(hasPendingUpdateRequest()); // should be set by QPA
// If we have a frame callback all is good and will be taken care of there
- if (mWaitingForFrameCallback)
- return;
+ {
+ QMutexLocker locker(&mFrameSyncMutex);
+ if (mWaitingForFrameCallback)
+ return;
+ }
// If we've already called deliverUpdateRequest(), but haven't seen any attach+commit/swap yet
// This is a somewhat redundant behavior and might indicate a bug in the calling code, so log
@@ -1188,7 +1231,12 @@ void QWaylandWindow::requestUpdate()
// so use invokeMethod to delay the delivery a bit.
QMetaObject::invokeMethod(this, [this] {
// Things might have changed in the meantime
- if (hasPendingUpdateRequest() && !mWaitingForFrameCallback)
+ {
+ QMutexLocker locker(&mFrameSyncMutex);
+ if (mWaitingForFrameCallback)
+ return;
+ }
+ if (hasPendingUpdateRequest())
deliverUpdateRequest();
}, Qt::QueuedConnection);
}
@@ -1199,19 +1247,18 @@ void QWaylandWindow::requestUpdate()
void QWaylandWindow::handleUpdate()
{
qCDebug(lcWaylandBackingstore) << "handleUpdate" << QThread::currentThread();
+
// TODO: Should sync subsurfaces avoid requesting frame callbacks?
QReadLocker lock(&mSurfaceLock);
if (!mSurface)
return;
- if (mFrameCallback) {
- wl_callback_destroy(mFrameCallback);
- mFrameCallback = nullptr;
- }
+ QMutexLocker locker(&mFrameSyncMutex);
+ if (mWaitingForFrameCallback)
+ return;
- QMutexLocker locker(mFrameQueue.mutex);
struct ::wl_surface *wrappedSurface = reinterpret_cast<struct ::wl_surface *>(wl_proxy_create_wrapper(mSurface->object()));
- wl_proxy_set_queue(reinterpret_cast<wl_proxy *>(wrappedSurface), mFrameQueue.queue);
+ wl_proxy_set_queue(reinterpret_cast<wl_proxy *>(wrappedSurface), mDisplay->frameEventQueue());
mFrameCallback = wl_surface_frame(wrappedSurface);
wl_proxy_wrapper_destroy(wrappedSurface);
wl_callback_add_listener(mFrameCallback, &QWaylandWindow::callbackListener, this);
@@ -1221,6 +1268,8 @@ void QWaylandWindow::handleUpdate()
// Start a timer for handling the case when the compositor stops sending frame callbacks.
if (mFrameCallbackTimeout > 0) {
QMetaObject::invokeMethod(this, [this] {
+ QMutexLocker locker(&mFrameSyncMutex);
+
if (mWaitingForFrameCallback) {
if (mFrameCallbackCheckIntervalTimerId < 0)
mFrameCallbackCheckIntervalTimerId = startTimer(mFrameCallbackTimeout);
@@ -1281,6 +1330,20 @@ void QWaylandWindow::setOpaqueArea(const QRegion &opaqueArea)
wl_region_destroy(region);
}
+void QWaylandWindow::addChildPopup(QWaylandWindow *surface) {
+ mChildPopups.append(surface);
+}
+
+void QWaylandWindow::removeChildPopup(QWaylandWindow *surface) {
+ mChildPopups.removeAll(surface);
+}
+
+void QWaylandWindow::closeChildPopups() {
+ while (!mChildPopups.isEmpty()) {
+ auto popup = mChildPopups.takeLast();
+ popup->reset();
+ }
+}
}
QT_END_NAMESPACE
diff --git a/qtwayland/src/client/qwaylandwindow_p.h b/qtwayland/src/client/qwaylandwindow_p.h
index 01337cff..741f9e5c 100644
--- a/qtwayland/src/client/qwaylandwindow_p.h
+++ b/qtwayland/src/client/qwaylandwindow_p.h
@@ -98,6 +98,9 @@ public:
QWaylandWindow(QWindow *window, QWaylandDisplay *display);
~QWaylandWindow() override;
+ // Keep Toplevels position on the top left corner of their screen
+ static inline bool fixedToplevelPositions = true;
+
virtual WindowType windowType() const = 0;
virtual void ensureSize();
WId winId() const override;
@@ -148,13 +151,14 @@ public:
void setWindowState(Qt::WindowStates states) override;
void setWindowFlags(Qt::WindowFlags flags) override;
void handleWindowStatesChanged(Qt::WindowStates states);
+ Qt::WindowStates windowStates() const;
void raise() override;
void lower() override;
void setMask(const QRegion &region) override;
- int scale() const;
+ qreal scale() const;
qreal devicePixelRatio() const override;
void requestActivateWindow() override;
@@ -206,6 +210,10 @@ public:
void handleUpdate();
void deliverUpdateRequest() override;
+ void addChildPopup(QWaylandWindow* child);
+ void removeChildPopup(QWaylandWindow* child);
+ void closeChildPopups();
+
public slots:
void applyConfigure();
@@ -215,7 +223,11 @@ signals:
protected:
QWaylandDisplay *mDisplay = nullptr;
+
+ // mSurface can be written by the main thread. Other threads should claim a read lock for access
+ mutable QReadWriteLock mSurfaceLock;
QScopedPointer<QWaylandSurface> mSurface;
+
QWaylandShellSurface *mShellSurface = nullptr;
QWaylandSubSurface *mSubSurfaceWindow = nullptr;
QVector<QWaylandSubSurface *> mChildren;
@@ -225,13 +237,14 @@ protected:
Qt::MouseButtons mMousePressedInContentArea = Qt::NoButton;
WId mWindowId;
- bool mWaitingForFrameCallback = false;
bool mFrameCallbackTimedOut = false; // Whether the frame callback has timed out
- bool mWaitingForUpdateDelivery = false;
int mFrameCallbackCheckIntervalTimerId = -1;
- QElapsedTimer mFrameCallbackElapsedTimer;
- struct ::wl_callback *mFrameCallback = nullptr;
- QWaylandDisplay::FrameQueue mFrameQueue;
+ QAtomicInt mWaitingForUpdateDelivery = false;
+
+ bool mWaitingForFrameCallback = false; // Protected by mFrameSyncMutex
+ QElapsedTimer mFrameCallbackElapsedTimer; // Protected by mFrameSyncMutex
+ struct ::wl_callback *mFrameCallback = nullptr; // Protected by mFrameSyncMutex
+ QMutex mFrameSyncMutex;
QWaitCondition mFrameSyncWait;
// True when we have called deliverRequestUpdate, but the client has not yet attached a new buffer
@@ -261,6 +274,8 @@ protected:
QWaylandBuffer *mQueuedBuffer = nullptr;
QRegion mQueuedBufferDamage;
+ QList<QPointer<QWaylandWindow>> mChildPopups;
+
private:
void setGeometry_helper(const QRect &rect);
void initWindow();
@@ -283,12 +298,10 @@ private:
QRect mLastExposeGeometry;
static const wl_callback_listener callbackListener;
- void handleFrameCallback();
+ void handleFrameCallback(struct ::wl_callback* callback);
static QWaylandWindow *mMouseGrab;
- mutable QReadWriteLock mSurfaceLock;
-
friend class QWaylandSubSurface;
};
diff --git a/qtwayland/src/client/shellintegration/qwaylandshellintegration_p.h b/qtwayland/src/client/shellintegration/qwaylandshellintegration_p.h
index ccad0048..4cc9b3b8 100644
--- a/qtwayland/src/client/shellintegration/qwaylandshellintegration_p.h
+++ b/qtwayland/src/client/shellintegration/qwaylandshellintegration_p.h
@@ -73,11 +73,10 @@ public:
return true;
}
virtual QWaylandShellSurface *createShellSurface(QWaylandWindow *window) = 0;
+ // kept for binary compat with layer-shell-qt
virtual void handleKeyboardFocusChanged(QWaylandWindow *newFocus, QWaylandWindow *oldFocus) {
- if (newFocus)
- m_display->handleWindowActivated(newFocus);
- if (oldFocus)
- m_display->handleWindowDeactivated(oldFocus);
+ Q_UNUSED(newFocus);
+ Q_UNUSED(oldFocus);
}
virtual void *nativeResourceForWindow(const QByteArray &resource, QWindow *window) {
Q_UNUSED(resource);
diff --git a/qtwayland/src/compositor/configure.json b/qtwayland/src/compositor/configure.json
index bcfd5215..da95d07b 100644
--- a/qtwayland/src/compositor/configure.json
+++ b/qtwayland/src/compositor/configure.json
@@ -7,6 +7,31 @@
"testDir": "../../config.tests",
"libraries": {
+ "wayland-client": {
+ "label": "Wayland client library",
+ "headers": "wayland-version.h",
+ "test": {
+ "main": [
+ "#if WAYLAND_VERSION_MAJOR < 1",
+ "# error Wayland 1.8.0 or higher required",
+ "#endif",
+ "#if WAYLAND_VERSION_MAJOR == 1",
+ "# if WAYLAND_VERSION_MINOR < 8",
+ "# error Wayland 1.8.0 or higher required",
+ "# endif",
+ "# if WAYLAND_VERSION_MINOR == 8",
+ "# if WAYLAND_VERSION_MICRO < 0",
+ "# error Wayland 1.8.0 or higher required",
+ "# endif",
+ "# endif",
+ "#endif"
+ ]
+ },
+ "sources": [
+ { "type": "pkgConfig", "args": "wayland-client" },
+ "-lwayland-client"
+ ]
+ },
"wayland-server": {
"label": "wayland-server",
"headers": "wayland-version.h",
@@ -151,8 +176,7 @@
"#endif"
]
},
- "libs": "-ldrm",
- "use": "egl"
+ "use": "drm egl"
},
"dmabuf-client-buffer": {
"label": "Linux Client dma-buf Buffer Sharing",
@@ -176,8 +200,7 @@
"return 0;"
]
},
- "libs": "-ldrm",
- "use": "egl"
+ "use": "drm egl"
},
"vulkan-server-buffer": {
"label": "Vulkan Buffer Sharing",
@@ -195,7 +218,8 @@
"exportAllocInfo.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR;",
"return 0;"
]
- }
+ },
+ "use": "wayland-client"
}
},
diff --git a/qtwayland/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp b/qtwayland/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
index e00c28c3..dbe2845a 100644
--- a/qtwayland/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
+++ b/qtwayland/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
@@ -40,6 +40,7 @@
#include "qwaylandeglwindow.h"
#include <QtWaylandClient/private/qwaylandscreen_p.h>
+#include <QtWaylandClient/private/qwaylandsurface_p.h>
#include "qwaylandglcontext.h"
#include <QtEglSupport/private/qeglconvenience_p.h>
@@ -115,6 +116,7 @@ void QWaylandEglWindow::updateSurface(bool create)
}
mOffset = QPoint();
} else {
+ QReadLocker locker(&mSurfaceLock);
if (m_waylandEglWindow) {
int current_width, current_height;
static bool disableResizeCheck = qgetenv("QT_WAYLAND_DISABLE_RESIZECHECK").toInt();
@@ -122,14 +124,16 @@ void QWaylandEglWindow::updateSurface(bool create)
if (!disableResizeCheck) {
wl_egl_window_get_attached_size(m_waylandEglWindow, &current_width, &current_height);
}
- if (disableResizeCheck || (current_width != sizeWithMargins.width() || current_height != sizeWithMargins.height())) {
+ if (disableResizeCheck || (current_width != sizeWithMargins.width() || current_height != sizeWithMargins.height()) || m_requestedSize != sizeWithMargins) {
wl_egl_window_resize(m_waylandEglWindow, sizeWithMargins.width(), sizeWithMargins.height(), mOffset.x(), mOffset.y());
+ m_requestedSize = sizeWithMargins;
mOffset = QPoint();
m_resize = true;
}
- } else if (create && wlSurface()) {
- m_waylandEglWindow = wl_egl_window_create(wlSurface(), sizeWithMargins.width(), sizeWithMargins.height());
+ } else if (create && mSurface) {
+ m_waylandEglWindow = wl_egl_window_create(mSurface->object(), sizeWithMargins.width(), sizeWithMargins.height());
+ m_requestedSize = sizeWithMargins;
}
if (!m_eglSurface && m_waylandEglWindow && create) {
diff --git a/qtwayland/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/qtwayland/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
index 2fccbcea..ad1e5ee9 100644
--- a/qtwayland/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
+++ b/qtwayland/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
@@ -85,6 +85,7 @@ private:
mutable QOpenGLFramebufferObject *m_contentFBO = nullptr;
QSurfaceFormat m_format;
+ QSize m_requestedSize;
};
}
diff --git a/qtwayland/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/qtwayland/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
index c1f45fa6..bbc63444 100644
--- a/qtwayland/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+++ b/qtwayland/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
@@ -195,7 +195,7 @@ public:
QOpenGLTextureCache *cache = QOpenGLTextureCache::cacheForContext(m_context->context());
QSize surfaceSize = window->surfaceSize();
- int scale = window->scale() ;
+ qreal scale = window->scale() ;
glViewport(0, 0, surfaceSize.width() * scale, surfaceSize.height() * scale);
//Draw Decoration
diff --git a/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopupv5.cpp b/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopupv5.cpp
index 85d25e3c..60bdd491 100644
--- a/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopupv5.cpp
+++ b/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopupv5.cpp
@@ -47,18 +47,21 @@ QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
-QWaylandXdgPopupV5::QWaylandXdgPopupV5(struct ::xdg_popup_v5 *popup, QWaylandWindow *window)
+QWaylandXdgPopupV5::QWaylandXdgPopupV5(struct ::xdg_popup_v5 *popup, QWaylandWindow* parent, QWaylandWindow *window)
: QWaylandShellSurface(window)
, QtWayland::xdg_popup_v5(popup)
+ , m_parent(parent)
, m_window(window)
{
if (window->display()->windowExtension())
m_extendedWindow = new QWaylandExtendedSurface(window);
+ m_parent->addChildPopup(m_window);
}
QWaylandXdgPopupV5::~QWaylandXdgPopupV5()
{
xdg_popup_destroy(object());
+ m_parent->removeChildPopup(m_window);
delete m_extendedWindow;
}
diff --git a/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopupv5_p.h b/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopupv5_p.h
index 7494f6a6..d85f130b 100644
--- a/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopupv5_p.h
+++ b/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopupv5_p.h
@@ -70,7 +70,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgPopupV5 : public QWaylandShellSurface
{
Q_OBJECT
public:
- QWaylandXdgPopupV5(struct ::xdg_popup_v5 *popup, QWaylandWindow *window);
+ QWaylandXdgPopupV5(struct ::xdg_popup_v5 *popup, QWaylandWindow* parent, QWaylandWindow *window);
~QWaylandXdgPopupV5() override;
protected:
@@ -78,6 +78,7 @@ protected:
private:
QWaylandExtendedSurface *m_extendedWindow = nullptr;
+ QWaylandWindow *m_parent = nullptr;
QWaylandWindow *m_window = nullptr;
};
diff --git a/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5.cpp b/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5.cpp
index 7e242c4a..def8452a 100644
--- a/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5.cpp
+++ b/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5.cpp
@@ -84,7 +84,7 @@ QWaylandXdgPopupV5 *QWaylandXdgShellV5::createXdgPopup(QWaylandWindow *window, Q
int x = position.x() + parentWindow->frameMargins().left();
int y = position.y() + parentWindow->frameMargins().top();
- auto popup = new QWaylandXdgPopupV5(get_xdg_popup(window->wlSurface(), parentSurface, seat, m_popupSerial, x, y), window);
+ auto popup = new QWaylandXdgPopupV5(get_xdg_popup(window->wlSurface(), parentSurface, seat, m_popupSerial, x, y), parentWindow, window);
m_popups.append(window);
QObject::connect(popup, &QWaylandXdgPopupV5::destroyed, [this, window](){
m_popups.removeOne(window);
diff --git a/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration.cpp b/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration.cpp
index 4e25949f..cfc60939 100644
--- a/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration.cpp
+++ b/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration.cpp
@@ -85,13 +85,6 @@ QWaylandShellSurface *QWaylandXdgShellV5Integration::createShellSurface(QWayland
return m_xdgShell->createXdgSurface(window);
}
-void QWaylandXdgShellV5Integration::handleKeyboardFocusChanged(QWaylandWindow *newFocus, QWaylandWindow *oldFocus) {
- if (newFocus && qobject_cast<QWaylandXdgPopupV5 *>(newFocus->shellSurface()))
- m_display->handleWindowActivated(newFocus);
- if (oldFocus && qobject_cast<QWaylandXdgPopupV5 *>(oldFocus->shellSurface()))
- m_display->handleWindowDeactivated(oldFocus);
-}
-
}
QT_END_NAMESPACE
diff --git a/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration_p.h b/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration_p.h
index ce6bdb9e..aed88670 100644
--- a/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration_p.h
+++ b/qtwayland/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration_p.h
@@ -67,7 +67,6 @@ public:
QWaylandXdgShellV5Integration() {}
bool initialize(QWaylandDisplay *display) override;
QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override;
- void handleKeyboardFocusChanged(QWaylandWindow *newFocus, QWaylandWindow *oldFocus) override;
private:
QScopedPointer<QWaylandXdgShellV5> m_xdgShell;
diff --git a/qtwayland/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp b/qtwayland/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp
index 8c371661..151c78e3 100644
--- a/qtwayland/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp
+++ b/qtwayland/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp
@@ -174,6 +174,7 @@ QWaylandXdgSurfaceV6::Popup::Popup(QWaylandXdgSurfaceV6 *xdgSurface, QWaylandXdg
, m_xdgSurface(xdgSurface)
, m_parent(parent)
{
+ m_parent->window()->addChildPopup(m_xdgSurface->window());
}
QWaylandXdgSurfaceV6::Popup::~Popup()
@@ -181,6 +182,8 @@ QWaylandXdgSurfaceV6::Popup::~Popup()
if (isInitialized())
destroy();
+ m_parent->window()->removeChildPopup(m_xdgSurface->window());
+
if (m_grabbing) {
auto *shell = m_xdgSurface->m_shell;
Q_ASSERT(shell->m_topmostGrabbingPopup == this);
diff --git a/qtwayland/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6integration.cpp b/qtwayland/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6integration.cpp
index 03164316..e8da8ba1 100644
--- a/qtwayland/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6integration.cpp
+++ b/qtwayland/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6integration.cpp
@@ -68,20 +68,6 @@ QWaylandShellSurface *QWaylandXdgShellV6Integration::createShellSurface(QWayland
return m_xdgShell->getXdgSurface(window);
}
-void QWaylandXdgShellV6Integration::handleKeyboardFocusChanged(QWaylandWindow *newFocus, QWaylandWindow *oldFocus)
-{
- if (newFocus) {
- auto *xdgSurface = qobject_cast<QWaylandXdgSurfaceV6 *>(newFocus->shellSurface());
- if (xdgSurface && !xdgSurface->handlesActiveState())
- m_display->handleWindowActivated(newFocus);
- }
- if (oldFocus && qobject_cast<QWaylandXdgSurfaceV6 *>(oldFocus->shellSurface())) {
- auto *xdgSurface = qobject_cast<QWaylandXdgSurfaceV6 *>(oldFocus->shellSurface());
- if (xdgSurface && !xdgSurface->handlesActiveState())
- m_display->handleWindowDeactivated(oldFocus);
- }
-}
-
}
QT_END_NAMESPACE
diff --git a/qtwayland/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6integration_p.h b/qtwayland/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6integration_p.h
index 261f8cbb..c1bcd5c6 100644
--- a/qtwayland/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6integration_p.h
+++ b/qtwayland/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6integration_p.h
@@ -65,7 +65,6 @@ public:
QWaylandXdgShellV6Integration() {}
bool initialize(QWaylandDisplay *display) override;
QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override;
- void handleKeyboardFocusChanged(QWaylandWindow *newFocus, QWaylandWindow *oldFocus) override;
private:
QScopedPointer<QWaylandXdgShellV6> m_xdgShell;
diff --git a/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
index 94ea573e..9c6cbb81 100644
--- a/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
+++ b/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
@@ -44,6 +44,7 @@
#include <QtWaylandClient/private/qwaylandwindow_p.h>
#include <QtWaylandClient/private/qwaylandinputdevice_p.h>
#include <QtWaylandClient/private/qwaylandscreen_p.h>
+#include <QtWaylandClient/private/qwaylandcursor_p.h>
#include <QtWaylandClient/private/qwaylandabstractdecoration_p.h>
#include <QtGui/private/qwindow_p.h>
@@ -67,11 +68,6 @@ QWaylandXdgSurface::Toplevel::Toplevel(QWaylandXdgSurface *xdgSurface)
QWaylandXdgSurface::Toplevel::~Toplevel()
{
- if (m_applied.states & Qt::WindowActive) {
- QWaylandWindow *window = m_xdgSurface->window();
- window->display()->handleWindowDeactivated(window);
- }
-
// The protocol spec requires that the decoration object is deleted before xdg_toplevel.
delete m_decoration;
m_decoration = nullptr;
@@ -85,16 +81,15 @@ void QWaylandXdgSurface::Toplevel::applyConfigure()
if (!(m_applied.states & (Qt::WindowMaximized|Qt::WindowFullScreen)))
m_normalSize = m_xdgSurface->m_window->windowFrameGeometry().size();
- if ((m_pending.states & Qt::WindowActive) && !(m_applied.states & Qt::WindowActive))
+ if ((m_pending.states & Qt::WindowActive) && !(m_applied.states & Qt::WindowActive)
+ && !m_xdgSurface->m_window->display()->isKeyboardAvailable())
m_xdgSurface->m_window->display()->handleWindowActivated(m_xdgSurface->m_window);
- if (!(m_pending.states & Qt::WindowActive) && (m_applied.states & Qt::WindowActive))
+ if (!(m_pending.states & Qt::WindowActive) && (m_applied.states & Qt::WindowActive)
+ && !m_xdgSurface->m_window->display()->isKeyboardAvailable())
m_xdgSurface->m_window->display()->handleWindowDeactivated(m_xdgSurface->m_window);
- // TODO: none of the other plugins send WindowActive either, but is it on purpose?
- Qt::WindowStates statesWithoutActive = m_pending.states & ~Qt::WindowActive;
-
- m_xdgSurface->m_window->handleWindowStatesChanged(statesWithoutActive);
+ m_xdgSurface->m_window->handleWindowStatesChanged(m_pending.states);
if (m_pending.size.isEmpty()) {
// An empty size in the configure means it's up to the client to choose the size
@@ -105,8 +100,6 @@ void QWaylandXdgSurface::Toplevel::applyConfigure()
m_xdgSurface->m_window->resizeFromApplyConfigure(m_pending.size);
}
- m_xdgSurface->setSizeHints();
-
m_applied = m_pending;
qCDebug(lcQpaWayland) << "Applied pending xdg_toplevel configure event:" << m_applied.size << m_applied.states;
}
@@ -203,12 +196,17 @@ QtWayland::xdg_toplevel::resize_edge QWaylandXdgSurface::Toplevel::convertToResi
| ((edges & Qt::RightEdge) ? resize_edge_right : 0));
}
-QWaylandXdgSurface::Popup::Popup(QWaylandXdgSurface *xdgSurface, QWaylandXdgSurface *parent,
+QWaylandXdgSurface::Popup::Popup(QWaylandXdgSurface *xdgSurface, QWaylandWindow *parent,
QtWayland::xdg_positioner *positioner)
- : xdg_popup(xdgSurface->get_popup(parent->object(), positioner->object()))
- , m_xdgSurface(xdgSurface)
+ : m_xdgSurface(xdgSurface)
+ , m_parentXdgSurface(qobject_cast<QWaylandXdgSurface *>(parent->shellSurface()))
, m_parent(parent)
{
+
+ init(xdgSurface->get_popup(m_parentXdgSurface ? m_parentXdgSurface->object() : nullptr, positioner->object()));
+ if (m_parent) {
+ m_parent->addChildPopup(m_xdgSurface->window());
+ }
}
QWaylandXdgSurface::Popup::~Popup()
@@ -216,10 +214,14 @@ QWaylandXdgSurface::Popup::~Popup()
if (isInitialized())
destroy();
+ if (m_parent) {
+ m_parent->removeChildPopup(m_xdgSurface->window());
+ }
+
if (m_grabbing) {
auto *shell = m_xdgSurface->m_shell;
Q_ASSERT(shell->m_topmostGrabbingPopup == this);
- shell->m_topmostGrabbingPopup = m_parent->m_popup;
+ shell->m_topmostGrabbingPopup = m_parentXdgSurface ? m_parentXdgSurface->m_popup : nullptr;
m_grabbing = false;
// Synthesize Qt enter/leave events for popup
@@ -228,8 +230,10 @@ QWaylandXdgSurface::Popup::~Popup()
leave = m_xdgSurface->window()->window();
QWindowSystemInterface::handleLeaveEvent(leave);
- if (QWindow *enter = QGuiApplication::topLevelAt(QCursor::pos()))
- QWindowSystemInterface::handleEnterEvent(enter, enter->mapFromGlobal(QCursor::pos()), QCursor::pos());
+ if (QWindow *enter = QGuiApplication::topLevelAt(QCursor::pos())) {
+ const auto pos = m_xdgSurface->window()->display()->waylandCursor()->pos();
+ QWindowSystemInterface::handleEnterEvent(enter, enter->handle()->mapFromGlobal(pos), pos);
+ }
}
}
@@ -267,6 +271,7 @@ QWaylandXdgSurface::QWaylandXdgSurface(QWaylandXdgShell *shell, ::xdg_surface *s
m_toplevel->set_parent(parentXdgSurface->m_toplevel->object());
}
}
+ setSizeHints();
}
QWaylandXdgSurface::~QWaylandXdgSurface()
@@ -365,9 +370,6 @@ bool QWaylandXdgSurface::wantsDecorations() const
void QWaylandXdgSurface::propagateSizeHints()
{
setSizeHints();
-
- if (m_toplevel && m_window)
- m_window->commit();
}
void QWaylandXdgSurface::setWindowGeometry(const QRect &rect)
@@ -382,10 +384,10 @@ void QWaylandXdgSurface::setSizeHints()
const int minHeight = qMax(0, m_window->windowMinimumSize().height());
m_toplevel->set_min_size(minWidth, minHeight);
- int maxWidth = qMax(0, m_window->windowMaximumSize().width());
+ int maxWidth = qMax(minWidth, m_window->windowMaximumSize().width());
if (maxWidth == QWINDOWSIZE_MAX)
maxWidth = 0;
- int maxHeight = qMax(0, m_window->windowMaximumSize().height());
+ int maxHeight = qMax(minHeight, m_window->windowMaximumSize().height());
if (maxHeight == QWINDOWSIZE_MAX)
maxHeight = 0;
m_toplevel->set_max_size(maxWidth, maxHeight);
@@ -410,8 +412,6 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
{
Q_ASSERT(!m_toplevel && !m_popup);
- auto parentXdgSurface = static_cast<QWaylandXdgSurface *>(parent->shellSurface());
-
auto positioner = new QtWayland::xdg_positioner(m_shell->create_positioner());
// set_popup expects a position relative to the parent
QPoint transientPos = m_window->geometry().topLeft(); // this is absolute
@@ -425,11 +425,10 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
positioner->set_gravity(QtWayland::xdg_positioner::gravity_bottom_right);
positioner->set_size(m_window->geometry().width(), m_window->geometry().height());
positioner->set_constraint_adjustment(QtWayland::xdg_positioner::constraint_adjustment_slide_x
- | QtWayland::xdg_positioner::constraint_adjustment_slide_y
- | QtWayland::xdg_positioner::constraint_adjustment_flip_x
- | QtWayland::xdg_positioner::constraint_adjustment_flip_y);
- m_popup = new Popup(this, parentXdgSurface, positioner);
+ | QtWayland::xdg_positioner::constraint_adjustment_slide_y);
+ m_popup = new Popup(this, parent, positioner);
positioner->destroy();
+
delete positioner;
}
@@ -466,8 +465,10 @@ void QWaylandXdgSurface::setGrabPopup(QWaylandWindow *parent, QWaylandInputDevic
if (m_popup && m_popup->m_xdgSurface && m_popup->m_xdgSurface->window())
enter = m_popup->m_xdgSurface->window()->window();
- if (enter)
- QWindowSystemInterface::handleEnterEvent(enter, enter->mapFromGlobal(QCursor::pos()), QCursor::pos());
+ if (enter) {
+ const auto pos = m_popup->m_xdgSurface->window()->display()->waylandCursor()->pos();
+ QWindowSystemInterface::handleEnterEvent(enter, enter->handle()->mapFromGlobal(pos), pos);
+ }
}
void QWaylandXdgSurface::xdg_surface_configure(uint32_t serial)
diff --git a/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h b/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
index 96785205..4b518f0a 100644
--- a/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
+++ b/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
@@ -131,14 +131,15 @@ private:
class Popup : public QtWayland::xdg_popup {
public:
- Popup(QWaylandXdgSurface *xdgSurface, QWaylandXdgSurface *parent, QtWayland::xdg_positioner *positioner);
+ Popup(QWaylandXdgSurface *xdgSurface, QWaylandWindow *parent, QtWayland::xdg_positioner *positioner);
~Popup() override;
void grab(QWaylandInputDevice *seat, uint serial);
void xdg_popup_popup_done() override;
QWaylandXdgSurface *m_xdgSurface = nullptr;
- QWaylandXdgSurface *m_parent = nullptr;
+ QWaylandXdgSurface *m_parentXdgSurface = nullptr;
+ QWaylandWindow *m_parent = nullptr;
bool m_grabbing = false;
};
diff --git a/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshellintegration.cpp b/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshellintegration.cpp
index 8769d971..da0dd6a7 100644
--- a/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshellintegration.cpp
+++ b/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshellintegration.cpp
@@ -69,20 +69,6 @@ QWaylandShellSurface *QWaylandXdgShellIntegration::createShellSurface(QWaylandWi
return m_xdgShell->getXdgSurface(window);
}
-void QWaylandXdgShellIntegration::handleKeyboardFocusChanged(QWaylandWindow *newFocus, QWaylandWindow *oldFocus)
-{
- if (newFocus) {
- auto *xdgSurface = qobject_cast<QWaylandXdgSurface *>(newFocus->shellSurface());
- if (xdgSurface && !xdgSurface->handlesActiveState())
- m_display->handleWindowActivated(newFocus);
- }
- if (oldFocus && qobject_cast<QWaylandXdgSurface *>(oldFocus->shellSurface())) {
- auto *xdgSurface = qobject_cast<QWaylandXdgSurface *>(oldFocus->shellSurface());
- if (xdgSurface && !xdgSurface->handlesActiveState())
- m_display->handleWindowDeactivated(oldFocus);
- }
-}
-
}
QT_END_NAMESPACE
diff --git a/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshellintegration_p.h b/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshellintegration_p.h
index b6caa6c9..2f929f98 100644
--- a/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshellintegration_p.h
+++ b/qtwayland/src/plugins/shellintegration/xdg-shell/qwaylandxdgshellintegration_p.h
@@ -65,7 +65,6 @@ public:
QWaylandXdgShellIntegration() {}
bool initialize(QWaylandDisplay *display) override;
QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override;
- void handleKeyboardFocusChanged(QWaylandWindow *newFocus, QWaylandWindow *oldFocus) override;
private:
QScopedPointer<QWaylandXdgShell> m_xdgShell;
diff --git a/qtwayland/src/shared/qwaylandmimehelper.cpp b/qtwayland/src/shared/qwaylandmimehelper.cpp
index c5266ab3..e2fe1928 100644
--- a/qtwayland/src/shared/qwaylandmimehelper.cpp
+++ b/qtwayland/src/shared/qwaylandmimehelper.cpp
@@ -60,7 +60,7 @@ QByteArray QWaylandMimeHelper::getByteArray(QMimeData *mimeData, const QString &
buf.open(QIODevice::ReadWrite);
QByteArray fmt = "BMP";
if (mimeType.startsWith(QLatin1String("image/"))) {
- QByteArray imgFmt = mimeType.mid(6).toUpper().toLatin1();
+ QByteArray imgFmt = mimeType.mid(6).toLower().toLatin1();
if (QImageWriter::supportedImageFormats().contains(imgFmt))
fmt = imgFmt;
}
diff --git a/qtwayland/tests/auto/client/datadevicev1/tst_datadevicev1.cpp b/qtwayland/tests/auto/client/datadevicev1/tst_datadevicev1.cpp
index 1568b3b9..067410d0 100644
--- a/qtwayland/tests/auto/client/datadevicev1/tst_datadevicev1.cpp
+++ b/qtwayland/tests/auto/client/datadevicev1/tst_datadevicev1.cpp
@@ -35,7 +35,7 @@
using namespace MockCompositor;
-constexpr int dataDeviceVersion = 1;
+constexpr int dataDeviceVersion = 3;
class DataDeviceCompositor : public DefaultCompositor {
public:
diff --git a/qtwayland/tests/auto/client/seatv5/tst_seatv5.cpp b/qtwayland/tests/auto/client/seatv5/tst_seatv5.cpp
index 9312c2e5..2ea382f1 100644
--- a/qtwayland/tests/auto/client/seatv5/tst_seatv5.cpp
+++ b/qtwayland/tests/auto/client/seatv5/tst_seatv5.cpp
@@ -73,6 +73,7 @@ private slots:
void multiTouch();
void multiTouchUpAndMotionFrame();
void tapAndMoveInSameFrame();
+ void cancelTouch();
};
void tst_seatv5::bindsToSeat()
@@ -646,5 +647,34 @@ void tst_seatv5::tapAndMoveInSameFrame()
QTRY_COMPARE(window.m_events.last().touchPoints.first().state(), Qt::TouchPointState::TouchPointReleased);
}
+void tst_seatv5::cancelTouch()
+{
+ TouchWindow window;
+ QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
+
+ exec([=] {
+ auto *t = touch();
+ auto *c = client();
+ t->sendDown(xdgToplevel()->surface(), {32, 32}, 1);
+ t->sendFrame(c);
+ t->sendCancel(c);
+ t->sendFrame(c);
+ });
+
+ QTRY_VERIFY(!window.m_events.empty());
+ {
+ auto e = window.m_events.takeFirst();
+ QCOMPARE(e.type, QEvent::TouchBegin);
+ QCOMPARE(e.touchPointStates, Qt::TouchPointPressed);
+ QCOMPARE(e.touchPoints.length(), 1);
+ QCOMPARE(e.touchPoints.first().pos(), QPointF(32-window.frameMargins().left(), 32-window.frameMargins().top()));
+ }
+ {
+ auto e = window.m_events.takeFirst();
+ QCOMPARE(e.type, QEvent::TouchCancel);
+ QCOMPARE(e.touchPoints.length(), 0);
+ }
+}
+
QCOMPOSITOR_TEST_MAIN(tst_seatv5)
#include "tst_seatv5.moc"
diff --git a/qtwayland/tests/auto/client/shared/coreprotocol.cpp b/qtwayland/tests/auto/client/shared/coreprotocol.cpp
index 0d988521..53e12291 100644
--- a/qtwayland/tests/auto/client/shared/coreprotocol.cpp
+++ b/qtwayland/tests/auto/client/shared/coreprotocol.cpp
@@ -185,6 +185,8 @@ void Output::output_bind_resource(QtWaylandServer::wl_output::Resource *resource
if (m_version >= WL_OUTPUT_DONE_SINCE_VERSION)
wl_output::send_done(resource->handle);
+
+ Q_EMIT outputBound(resource);
}
// Seat stuff
@@ -451,6 +453,13 @@ void Touch::sendFrame(wl_client *client)
send_frame(r->handle);
}
+void Touch::sendCancel(wl_client *client)
+{
+ const auto touchResources = resourceMap().values(client);
+ for (auto *r : touchResources)
+ send_cancel(r->handle);
+}
+
uint Keyboard::sendEnter(Surface *surface)
{
auto serial = m_seat->m_compositor->nextSerial();
diff --git a/qtwayland/tests/auto/client/shared/coreprotocol.h b/qtwayland/tests/auto/client/shared/coreprotocol.h
index a1af137a..00c439e1 100644
--- a/qtwayland/tests/auto/client/shared/coreprotocol.h
+++ b/qtwayland/tests/auto/client/shared/coreprotocol.h
@@ -158,7 +158,7 @@ class WlCompositor : public Global, public QtWaylandServer::wl_compositor
{
Q_OBJECT
public:
- explicit WlCompositor(CoreCompositor *compositor, int version = 3)
+ explicit WlCompositor(CoreCompositor *compositor, int version = 4)
: QtWaylandServer::wl_compositor(compositor->m_display, version)
, m_compositor(compositor)
{}
@@ -273,6 +273,9 @@ public:
OutputData m_data;
int m_version = 1; // TODO: remove on libwayland upgrade
+Q_SIGNALS:
+ void outputBound(Resource *resource);
+
protected:
void output_bind_resource(Resource *resource) override;
};
@@ -364,6 +367,7 @@ public:
uint sendUp(wl_client *client, int id);
void sendMotion(wl_client *client, const QPointF &position, int id);
void sendFrame(wl_client *client);
+ void sendCancel(wl_client *client);
Seat *m_seat = nullptr;
};
diff --git a/qtwayland/tests/auto/client/shared_old/mockcompositor.cpp b/qtwayland/tests/auto/client/shared_old/mockcompositor.cpp
index a415cbf5..b1d3d07d 100644
--- a/qtwayland/tests/auto/client/shared_old/mockcompositor.cpp
+++ b/qtwayland/tests/auto/client/shared_old/mockcompositor.cpp
@@ -342,7 +342,7 @@ Compositor::Compositor(MockCompositor *mockCompositor)
exit(EXIT_FAILURE);
}
- wl_global_create(m_display, &wl_compositor_interface, 1, this, bindCompositor);
+ wl_global_create(m_display, &wl_compositor_interface, 4, this, bindCompositor);
m_data_device_manager.reset(new DataDeviceManager(this, m_display));
diff --git a/qtwayland/tests/auto/client/shared_old/mocksurface.cpp b/qtwayland/tests/auto/client/shared_old/mocksurface.cpp
index e9df5f90..c3246e4a 100644
--- a/qtwayland/tests/auto/client/shared_old/mocksurface.cpp
+++ b/qtwayland/tests/auto/client/shared_old/mocksurface.cpp
@@ -125,6 +125,16 @@ void Surface::surface_damage(Resource *resource,
Q_UNUSED(height);
}
+void Surface::surface_damage_buffer(Resource *resource,
+ int32_t x, int32_t y, int32_t width, int32_t height)
+{
+ Q_UNUSED(resource);
+ Q_UNUSED(x);
+ Q_UNUSED(y);
+ Q_UNUSED(width);
+ Q_UNUSED(height);
+}
+
void Surface::surface_frame(Resource *resource,
uint32_t callback)
{
diff --git a/qtwayland/tests/auto/client/shared_old/mocksurface.h b/qtwayland/tests/auto/client/shared_old/mocksurface.h
index 949dc23d..d176837e 100644
--- a/qtwayland/tests/auto/client/shared_old/mocksurface.h
+++ b/qtwayland/tests/auto/client/shared_old/mocksurface.h
@@ -65,6 +65,8 @@ protected:
struct wl_resource *buffer, int x, int y) override;
void surface_damage(Resource *resource,
int32_t x, int32_t y, int32_t width, int32_t height) override;
+ void surface_damage_buffer(Resource *resource,
+ int32_t x, int32_t y, int32_t width, int32_t height) override;
void surface_frame(Resource *resource,
uint32_t callback) override;
void surface_commit(Resource *resource) override;
diff --git a/qtwayland/tests/auto/client/xdgoutput/tst_xdgoutput.cpp b/qtwayland/tests/auto/client/xdgoutput/tst_xdgoutput.cpp
index 80429608..68e8d77a 100644
--- a/qtwayland/tests/auto/client/xdgoutput/tst_xdgoutput.cpp
+++ b/qtwayland/tests/auto/client/xdgoutput/tst_xdgoutput.cpp
@@ -55,6 +55,7 @@ private slots:
void primaryScreen();
void overrideGeometry();
void changeGeometry();
+ void outputCreateEnterRace();
};
void tst_xdgoutput::cleanup()
@@ -134,5 +135,39 @@ void tst_xdgoutput::changeGeometry()
exec([=] { remove(output(1)); });
}
+void tst_xdgoutput::outputCreateEnterRace()
+{
+ m_config.autoConfigure = true;
+ m_config.autoEnter = false;
+ QRasterWindow window;
+ QSignalSpy screenChanged(&window, &QWindow::screenChanged);
+ window.resize(400, 320);
+ window.show();
+ QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
+ exec([=] { xdgToplevel()->surface()->sendEnter(output(0));});
+
+ QTRY_COMPARE(QGuiApplication::screens().size(), 1);
+ QScreen *primaryScreen = QGuiApplication::screens().first();
+ QCOMPARE(window.screen(), primaryScreen);
+
+ auto *out = exec([=] {
+ return add<Output>();
+ });
+
+ // In Compositor Thread
+ connect(out, &Output::outputBound, this, [this](QtWaylandServer::wl_output::Resource *resource){
+ auto surface = xdgToplevel()->surface();
+ surface->sendLeave(output(0));
+ surface->QtWaylandServer::wl_surface::send_enter(surface->resource()->handle, resource->handle);
+ }, Qt::DirectConnection);
+
+ QTRY_COMPARE(QGuiApplication::screens().size(), 2);
+ QTRY_COMPARE(window.screen(), QGuiApplication::screens()[1]);
+
+ exec([=] { remove(out); });
+ m_config.autoConfigure = false;
+ m_config.autoEnter = true;
+}
+
QCOMPOSITOR_TEST_MAIN(tst_xdgoutput)
#include "tst_xdgoutput.moc"
diff --git a/qtwayland/tests/auto/client/xdgshell/tst_xdgshell.cpp b/qtwayland/tests/auto/client/xdgshell/tst_xdgshell.cpp
index 2277bbb8..afbeef53 100644
--- a/qtwayland/tests/auto/client/xdgshell/tst_xdgshell.cpp
+++ b/qtwayland/tests/auto/client/xdgshell/tst_xdgshell.cpp
@@ -31,6 +31,7 @@
#include <QtGui/QOpenGLWindow>
#include <QtGui/qpa/qplatformnativeinterface.h>
#include <QtWaylandClient/private/wayland-wayland-client-protocol.h>
+#include <QtWaylandClient/private/qwaylandwindow_p.h>
using namespace MockCompositor;
@@ -45,6 +46,7 @@ private slots:
void configureStates();
void popup();
void tooltipOnPopup();
+ void tooltipAndSiblingPopup();
void switchPopups();
void hidePopupParent();
void pongs();
@@ -138,6 +140,7 @@ void tst_xdgshell::configureSize()
void tst_xdgshell::configureStates()
{
+ QVERIFY(qputenv("QT_WAYLAND_FRAME_CALLBACK_TIMEOUT", "0"));
QRasterWindow window;
window.resize(64, 48);
window.show();
@@ -154,9 +157,12 @@ void tst_xdgshell::configureStates()
// Toplevel windows don't know their position on xdg-shell
// QCOMPARE(window.frameGeometry().topLeft(), QPoint()); // TODO: this doesn't currently work when window decorations are enabled
-// QEXPECT_FAIL("", "configure has already been acked, we shouldn't have to wait for isActive", Continue);
-// QVERIFY(window.isActive());
- QTRY_VERIFY(window.isActive()); // Just make sure it eventually get's set correctly
+ // window.windowstate() is driven by keyboard focus, however for decorations we want to follow
+ // XDGShell this is internal to QtWayland so it is queried directly
+ auto waylandWindow = static_cast<QtWaylandClient::QWaylandWindow *>(window.handle());
+ Q_ASSERT(waylandWindow);
+ QTRY_VERIFY(waylandWindow->windowStates().testFlag(
+ Qt::WindowActive)); // Just make sure it eventually get's set correctly
const QSize screenSize(640, 480);
const uint maximizedSerial = exec([=] {
@@ -186,6 +192,7 @@ void tst_xdgshell::configureStates()
QCOMPARE(window.windowStates(), Qt::WindowNoState);
QCOMPARE(window.frameGeometry().size(), windowedSize);
// QCOMPARE(window.frameGeometry().topLeft(), QPoint()); // TODO: this doesn't currently work when window decorations are enabled
+ QVERIFY(qunsetenv("QT_WAYLAND_FRAME_CALLBACK_TIMEOUT"));
}
void tst_xdgshell::popup()
@@ -340,6 +347,92 @@ void tst_xdgshell::tooltipOnPopup()
QCOMPOSITOR_TRY_COMPARE(xdgPopup(0), nullptr);
}
+void tst_xdgshell::tooltipAndSiblingPopup()
+{
+ class ToolTip : public QRasterWindow {
+ public:
+ explicit ToolTip(QWindow *parent) {
+ setTransientParent(parent);
+ setFlags(Qt::ToolTip);
+ resize(100, 100);
+ show();
+ }
+ void mousePressEvent(QMouseEvent *event) override {
+ QRasterWindow::mousePressEvent(event);
+ m_popup = new QRasterWindow;
+ m_popup->setTransientParent(transientParent());
+ m_popup->setFlags(Qt::Popup);
+ m_popup->resize(100, 100);
+ m_popup->show();
+ }
+
+ QRasterWindow *m_popup = nullptr;
+ };
+
+ class Window : public QRasterWindow {
+ public:
+ void mousePressEvent(QMouseEvent *event) override {
+ QRasterWindow::mousePressEvent(event);
+ m_tooltip = new ToolTip(this);
+ }
+ ToolTip *m_tooltip = nullptr;
+ };
+
+ Window window;
+ window.resize(200, 200);
+ window.show();
+
+ QCOMPOSITOR_TRY_VERIFY(xdgToplevel());
+ exec([=] { xdgToplevel()->sendCompleteConfigure(); });
+ QCOMPOSITOR_TRY_VERIFY(xdgToplevel()->m_xdgSurface->m_committedConfigureSerial);
+
+ exec([=] {
+ auto *surface = xdgToplevel()->surface();
+ auto *p = pointer();
+ auto *c = client();
+ p->sendEnter(surface, {100, 100});
+ p->sendFrame(c);
+ p->sendButton(client(), BTN_LEFT, Pointer::button_state_pressed);
+ p->sendButton(client(), BTN_LEFT, Pointer::button_state_released);
+ p->sendFrame(c);
+ p->sendLeave(surface);
+ p->sendFrame(c);
+ });
+
+ QCOMPOSITOR_TRY_VERIFY(xdgPopup());
+ exec([=] { xdgPopup()->sendCompleteConfigure(QRect(100, 100, 100, 100)); });
+ QCOMPOSITOR_TRY_VERIFY(xdgPopup()->m_xdgSurface->m_committedConfigureSerial);
+ QCOMPOSITOR_TRY_VERIFY(!xdgPopup()->m_grabbed);
+
+ exec([=] {
+ auto *surface = xdgPopup()->surface();
+ auto *p = pointer();
+ auto *c = client();
+ p->sendEnter(surface, {100, 100});
+ p->sendFrame(c);
+ p->sendButton(client(), BTN_LEFT, Pointer::button_state_pressed);
+ p->sendButton(client(), BTN_LEFT, Pointer::button_state_released);
+ p->sendFrame(c);
+ });
+
+ QCOMPOSITOR_TRY_VERIFY(xdgPopup(1));
+ exec([=] { xdgPopup(1)->sendCompleteConfigure(QRect(100, 100, 100, 100)); });
+ QCOMPOSITOR_TRY_VERIFY(xdgPopup(1)->m_xdgSurface->m_committedConfigureSerial);
+ QCOMPOSITOR_TRY_VERIFY(xdgPopup(1)->m_grabbed);
+
+ // Close the middle tooltip (it should not close the sibling popup)
+ window.m_tooltip->close();
+
+ QCOMPOSITOR_TRY_COMPARE(xdgPopup(1), nullptr);
+ // Verify the remaining xdg surface is a grab popup..
+ QCOMPOSITOR_TRY_VERIFY(xdgPopup(0));
+ QCOMPOSITOR_TRY_VERIFY(xdgPopup(0)->m_grabbed);
+
+ window.m_tooltip->m_popup->close();
+ QCOMPOSITOR_TRY_COMPARE(xdgPopup(1), nullptr);
+ QCOMPOSITOR_TRY_COMPARE(xdgPopup(0), nullptr);
+}
+
// QTBUG-65680
void tst_xdgshell::switchPopups()
{
@@ -505,15 +598,17 @@ void tst_xdgshell::minMaxSize()
window.show();
QCOMPOSITOR_TRY_VERIFY(xdgToplevel());
- exec([=] { xdgToplevel()->sendCompleteConfigure(); });
+ // we don't roundtrip with our configuration the initial commit should be correct
QCOMPOSITOR_TRY_COMPARE(xdgToplevel()->m_committed.minSize, QSize(100, 100));
QCOMPOSITOR_TRY_COMPARE(xdgToplevel()->m_committed.maxSize, QSize(1000, 1000));
window.setMaximumSize(QSize(500, 400));
+ window.update();
QCOMPOSITOR_TRY_COMPARE(xdgToplevel()->m_committed.maxSize, QSize(500, 400));
window.setMinimumSize(QSize(50, 40));
+ window.update();
QCOMPOSITOR_TRY_COMPARE(xdgToplevel()->m_committed.minSize, QSize(50, 40));
}
Submodule qtwebchannel d5eb0142..c78ad286:
diff --git a/qtwebchannel/src/webchannel/qmetaobjectpublisher.cpp b/qtwebchannel/src/webchannel/qmetaobjectpublisher.cpp
index 536eb5c..898d769 100644
--- a/qtwebchannel/src/webchannel/qmetaobjectpublisher.cpp
+++ b/qtwebchannel/src/webchannel/qmetaobjectpublisher.cpp
@@ -186,8 +186,6 @@ Q_DECLARE_TYPEINFO(OverloadResolutionCandidate, Q_MOVABLE_TYPE);
QMetaObjectPublisher::QMetaObjectPublisher(QWebChannel *webChannel)
: QObject(webChannel)
, webChannel(webChannel)
- , signalHandler(this)
- , clientIsIdle(false)
, blockUpdates(false)
, propertyUpdatesInitialized(false)
{
@@ -301,17 +299,17 @@ QJsonObject QMetaObjectPublisher::classInfoForObject(const QObject *object, QWeb
return data;
}
-void QMetaObjectPublisher::setClientIsIdle(bool isIdle)
+void QMetaObjectPublisher::setClientIsIdle(bool isIdle, QWebChannelAbstractTransport *transport)
{
- if (clientIsIdle == isIdle) {
- return;
- }
- clientIsIdle = isIdle;
- if (!isIdle && timer.isActive()) {
- timer.stop();
- } else if (isIdle && !timer.isActive()) {
- timer.start(PROPERTY_UPDATE_INTERVAL, this);
- }
+ transportState[transport].clientIsIdle = isIdle;
+ if (isIdle)
+ sendEnqueuedPropertyUpdates(transport);
+}
+
+bool QMetaObjectPublisher::isClientIdle(QWebChannelAbstractTransport *transport)
+{
+ auto found = transportState.find(transport);
+ return found != transportState.end() && found.value().clientIsIdle;
}
QJsonObject QMetaObjectPublisher::initializeClient(QWebChannelAbstractTransport *transport)
@@ -333,6 +331,7 @@ QJsonObject QMetaObjectPublisher::initializeClient(QWebChannelAbstractTransport
void QMetaObjectPublisher::initializePropertyUpdates(const QObject *const object, const QJsonObject &objectInfo)
{
+ auto *signalHandler = signalHandlerFor(object);
foreach (const QJsonValue &propertyInfoVar, objectInfo[KEY_PROPERTIES].toArray()) {
const QJsonArray &propertyInfo = propertyInfoVar.toArray();
if (propertyInfo.size() < 2) {
@@ -353,19 +352,19 @@ void QMetaObjectPublisher::initializePropertyUpdates(const QObject *const object
// Only connect for a property update once
if (connectedProperties.isEmpty()) {
- signalHandler.connectTo(object, signalIndex);
+ signalHandler->connectTo(object, signalIndex);
}
connectedProperties.insert(propertyIndex);
}
// also always connect to destroyed signal
- signalHandler.connectTo(object, s_destroyedSignalIndex);
+ signalHandler->connectTo(object, s_destroyedSignalIndex);
}
void QMetaObjectPublisher::sendPendingPropertyUpdates()
{
- if (blockUpdates || !clientIsIdle || pendingPropertyUpdates.isEmpty()) {
+ if (blockUpdates) {
return;
}
@@ -415,18 +414,19 @@ void QMetaObjectPublisher::sendPendingPropertyUpdates()
// data does not contain specific updates
if (!data.isEmpty()) {
- setClientIsIdle(false);
-
message[KEY_DATA] = data;
- broadcastMessage(message);
+ enqueueBroadcastMessage(message);
}
// send every property update which is not supposed to be broadcasted
const QHash<QWebChannelAbstractTransport*, QJsonArray>::const_iterator suend = specificUpdates.constEnd();
for (QHash<QWebChannelAbstractTransport*, QJsonArray>::const_iterator it = specificUpdates.constBegin(); it != suend; ++it) {
message[KEY_DATA] = it.value();
- it.key()->sendMessage(message);
+ enqueueMessage(message, it.key());
}
+
+ for (auto state = transportState.begin(); state != transportState.end(); ++state)
+ sendEnqueuedPropertyUpdates(state.key());
}
QVariant QMetaObjectPublisher::invokeMethod(QObject *const object, const QMetaMethod &method,
@@ -572,7 +572,7 @@ void QMetaObjectPublisher::signalEmitted(const QObject *object, const int signal
}
} else {
pendingPropertyUpdates[object][signalIndex] = arguments;
- if (clientIsIdle && !blockUpdates && !timer.isActive()) {
+ if (!blockUpdates && !timer.isActive()) {
timer.start(PROPERTY_UPDATE_INTERVAL, this);
}
}
@@ -590,7 +590,7 @@ void QMetaObjectPublisher::objectDestroyed(const QObject *object)
// only remove from handler when we initialized the property updates
// cf: https://bugreports.qt.io/browse/QTBUG-60250
if (propertyUpdatesInitialized) {
- signalHandler.remove(object);
+ signalHandlerFor(object)->remove(object);
signalToPropertyMap.remove(object);
}
pendingPropertyUpdates.remove(object);
@@ -852,6 +852,52 @@ void QMetaObjectPublisher::broadcastMessage(const QJsonObject &message) const
}
}
+void QMetaObjectPublisher::enqueueBroadcastMessage(const QJsonObject &message)
+{
+ if (webChannel->d_func()->transports.isEmpty()) {
+ qWarning("QWebChannel is not connected to any transports, cannot send message: %s",
+ QJsonDocument(message).toJson().constData());
+ return;
+ }
+
+ for (auto *transport : webChannel->d_func()->transports) {
+ auto &state = transportState[transport];
+ state.queuedMessages.append(message);
+ }
+}
+
+void QMetaObjectPublisher::enqueueMessage(const QJsonObject &message,
+ QWebChannelAbstractTransport *transport)
+{
+ auto &state = transportState[transport];
+ state.queuedMessages.append(message);
+}
+
+void QMetaObjectPublisher::sendEnqueuedPropertyUpdates(QWebChannelAbstractTransport *transport)
+{
+ auto found = transportState.find(transport);
+ if (found != transportState.end() && found.value().clientIsIdle
+ && !found.value().queuedMessages.isEmpty()) {
+
+ // If the client is connected with an in-process transport, it can
+ // happen that a message triggers a subsequent property change. In
+ // that case, we need to ensure that the queued messages have already
+ // been cleared; otherwise the recursive call will send everythig again.
+ // Case in point: The qmlwebchannel tests fail if we don't clear the
+ // queued messages before sending them out.
+ // For that same reason set the client to "busy" (aka non-idle) just
+ // right before sending out the messages; otherwise a potential
+ // "Idle" type message will not correctly restore the Idle state.
+ const auto messages = std::move(found.value().queuedMessages);
+ Q_ASSERT(found.value().queuedMessages.isEmpty());
+ found.value().clientIsIdle = false;
+
+ for (const auto &message : messages) {
+ transport->sendMessage(message);
+ }
+ }
+}
+
void QMetaObjectPublisher::handleMessage(const QJsonObject &message, QWebChannelAbstractTransport *transport)
{
if (!webChannel->d_func()->transports.contains(transport)) {
@@ -866,7 +912,7 @@ void QMetaObjectPublisher::handleMessage(const QJsonObject &message, QWebChannel
const MessageType type = toType(message.value(KEY_TYPE));
if (type == TypeIdle) {
- setClientIsIdle(true);
+ setClientIsIdle(true, transport);
} else if (type == TypeInit) {
if (!message.contains(KEY_ID)) {
qWarning("JSON message object is missing the id property: %s",
@@ -913,9 +959,9 @@ void QMetaObjectPublisher::handleMessage(const QJsonObject &message, QWebChannel
return;
transport->sendMessage(createResponse(message.value(KEY_ID), wrapResult(result, transport)));
} else if (type == TypeConnectToSignal) {
- signalHandler.connectTo(object, message.value(KEY_SIGNAL).toInt(-1));
+ signalHandlerFor(object)->connectTo(object, message.value(KEY_SIGNAL).toInt(-1));
} else if (type == TypeDisconnectFromSignal) {
- signalHandler.disconnectFrom(object, message.value(KEY_SIGNAL).toInt(-1));
+ signalHandlerFor(object)->disconnectFrom(object, message.value(KEY_SIGNAL).toInt(-1));
} else if (type == TypeSetProperty) {
setProperty(object, message.value(KEY_PROPERTY).toInt(-1),
message.value(KEY_VALUE));
@@ -931,6 +977,7 @@ void QMetaObjectPublisher::setBlockUpdates(bool block)
blockUpdates = block;
if (!blockUpdates) {
+ timer.start(PROPERTY_UPDATE_INTERVAL, this);
sendPendingPropertyUpdates();
} else if (timer.isActive()) {
timer.stop();
@@ -948,4 +995,15 @@ void QMetaObjectPublisher::timerEvent(QTimerEvent *event)
}
}
+SignalHandler<QMetaObjectPublisher> *QMetaObjectPublisher::signalHandlerFor(const QObject *object)
+{
+ auto thread = object->thread();
+ auto it = signalHandlers.find(thread);
+ if (it == signalHandlers.end()) {
+ it = signalHandlers.emplace(thread, this).first;
+ it->second.moveToThread(thread);
+ }
+ return &it->second;
+}
+
QT_END_NAMESPACE
diff --git a/qtwebchannel/src/webchannel/qmetaobjectpublisher_p.h b/qtwebchannel/src/webchannel/qmetaobjectpublisher_p.h
index bbd9875..4713ef1 100644
--- a/qtwebchannel/src/webchannel/qmetaobjectpublisher_p.h
+++ b/qtwebchannel/src/webchannel/qmetaobjectpublisher_p.h
@@ -59,6 +59,9 @@
#include <QBasicTimer>
#include <QPointer>
#include <QJsonObject>
+#include <QQueue>
+
+#include <unordered_map>
#include "qwebchannelglobal.h"
@@ -109,17 +112,36 @@ public:
*/
void broadcastMessage(const QJsonObject &message) const;
+ /**
+ * Enqueue the given @p message to all known transports.
+ */
+ void enqueueBroadcastMessage(const QJsonObject &message);
+
+ /**
+ * Enqueue the given @p message to @p transport.
+ */
+ void enqueueMessage(const QJsonObject &message, QWebChannelAbstractTransport *transport);
+
+ /**
+ * If client for given @p transport is idle, send queued messaged to @p transport and then mark
+ * the client as not idle.
+ */
+ void sendEnqueuedPropertyUpdates(QWebChannelAbstractTransport *transport);
+
/**
* Serialize the QMetaObject of @p object and return it in JSON form.
*/
QJsonObject classInfoForObject(const QObject *object, QWebChannelAbstractTransport *transport);
/**
- * Set the client to idle or busy, based on the value of @p isIdle.
- *
- * When the value changed, start/stop the property update timer accordingly.
+ * Set the client to idle or busy for a single @p transport, based on the value of @p isIdle.
+ */
+ void setClientIsIdle(bool isIdle, QWebChannelAbstractTransport *transport);
+
+ /**
+ * Check that client is idle for @p transport.
*/
- void setClientIsIdle(bool isIdle);
+ bool isClientIdle(QWebChannelAbstractTransport *transport);
/**
* Initialize clients by sending them the class information of the registered objects.
@@ -272,10 +294,18 @@ private:
friend class TestWebChannel;
QWebChannel *webChannel;
- SignalHandler<QMetaObjectPublisher> signalHandler;
+ std::unordered_map<const QThread*, SignalHandler<QMetaObjectPublisher>> signalHandlers;
+ SignalHandler<QMetaObjectPublisher> *signalHandlerFor(const QObject *object);
- // true when the client is idle, false otherwise
- bool clientIsIdle;
+ struct TransportState
+ {
+ TransportState() : clientIsIdle(false) { }
+ // true when the client is idle, false otherwise
+ bool clientIsIdle;
+ // messages to send
+ QQueue<QJsonObject> queuedMessages;
+ };
+ QHash<QWebChannelAbstractTransport *, TransportState> transportState;
// true when no property updates should be sent, false otherwise
bool blockUpdates;
diff --git a/qtwebchannel/src/webchannel/signalhandler_p.h b/qtwebchannel/src/webchannel/signalhandler_p.h
index 27afadb..d77373c 100644
--- a/qtwebchannel/src/webchannel/signalhandler_p.h
+++ b/qtwebchannel/src/webchannel/signalhandler_p.h
@@ -56,6 +56,7 @@
#include <QVector>
#include <QMetaMethod>
#include <QDebug>
+#include <QThread>
QT_BEGIN_NAMESPACE
@@ -71,6 +72,7 @@ static const int s_destroyedSignalIndex = QObject::staticMetaObject.indexOfMetho
template<class Receiver>
class SignalHandler : public QObject
{
+ Q_DISABLE_COPY(SignalHandler)
public:
SignalHandler(Receiver *receiver, QObject *parent = 0);
@@ -268,6 +270,7 @@ int SignalHandler<Receiver>::qt_metacall(QMetaObject::Call call, int methodId, v
if (call == QMetaObject::InvokeMetaMethod) {
const QObject *object = sender();
Q_ASSERT(object);
+ Q_ASSERT(QThread::currentThread() == object->thread());
Q_ASSERT(senderSignalIndex() == methodId);
Q_ASSERT(m_connectionsCounter.contains(object));
Q_ASSERT(m_connectionsCounter.value(object).contains(methodId));
diff --git a/qtwebchannel/tests/auto/qml/testwebchannel.cpp b/qtwebchannel/tests/auto/qml/testwebchannel.cpp
index 9891687..3ca81c2 100644
--- a/qtwebchannel/tests/auto/qml/testwebchannel.cpp
+++ b/qtwebchannel/tests/auto/qml/testwebchannel.cpp
@@ -46,7 +46,11 @@ TestWebChannel::~TestWebChannel()
bool TestWebChannel::clientIsIdle() const
{
- return QWebChannel::d_func()->publisher->clientIsIdle;
+ for (auto *transport : QWebChannel::d_func()->transports) {
+ if (QWebChannel::d_func()->publisher->isClientIdle(transport))
+ return true;
+ }
+ return false;
}
QT_END_NAMESPACE
diff --git a/qtwebchannel/tests/auto/webchannel/tst_webchannel.cpp b/qtwebchannel/tests/auto/webchannel/tst_webchannel.cpp
index 181da9e..37f989a 100644
--- a/qtwebchannel/tests/auto/webchannel/tst_webchannel.cpp
+++ b/qtwebchannel/tests/auto/webchannel/tst_webchannel.cpp
@@ -785,7 +785,7 @@ void TestWebChannel::testTransportWrapObjectProperties()
DummyTransport *dummyTransport = new DummyTransport(this);
channel.connectTo(dummyTransport);
channel.d_func()->publisher->initializeClient(dummyTransport);
- channel.d_func()->publisher->setClientIsIdle(true);
+ channel.d_func()->publisher->setClientIsIdle(true, dummyTransport);
QCOMPARE(channel.d_func()->publisher->transportedWrappedObjects.size(), 0);
@@ -943,8 +943,6 @@ void TestWebChannel::testInfiniteRecursion()
void TestWebChannel::testAsyncObject()
{
- QSKIP("This test is broken. See QTBUG-80729");
-
QWebChannel channel;
channel.connectTo(m_dummyTransport);
@@ -990,6 +988,50 @@ void TestWebChannel::testAsyncObject()
thread.wait();
}
+void TestWebChannel::testPropertyMultipleTransports()
+{
+ DummyTransport transport1;
+ DummyTransport transport2;
+
+ QWebChannel channel;
+ QMetaObjectPublisher *publisher = channel.d_func()->publisher;
+
+ TestObject testObj;
+ testObj.setObjectName("testObject");
+ channel.registerObject(testObj.objectName(), &testObj);
+ channel.connectTo(&transport1);
+ channel.connectTo(&transport2);
+
+ testObj.setProp("Hello");
+
+ publisher->initializeClient(&transport1);
+ publisher->initializeClient(&transport2);
+ publisher->setClientIsIdle(true, &transport1);
+ QCOMPARE(publisher->isClientIdle(&transport1), true);
+ QCOMPARE(publisher->isClientIdle(&transport2), false);
+ QVERIFY(transport1.messagesSent().isEmpty());
+ QVERIFY(transport2.messagesSent().isEmpty());
+
+ testObj.setProp("World");
+ QTRY_COMPARE_WITH_TIMEOUT(transport1.messagesSent().size(), 1u, 2000);
+ QCOMPARE(transport2.messagesSent().size(), 0u);
+ publisher->setClientIsIdle(true, &transport2);
+ QTRY_COMPARE_WITH_TIMEOUT(transport2.messagesSent().size(), 1u, 2000);
+ QCOMPARE(publisher->isClientIdle(&transport1), false);
+ QCOMPARE(publisher->isClientIdle(&transport2), false);
+
+ testObj.setProp("!!!");
+ publisher->setClientIsIdle(true, &transport2);
+ QCOMPARE(publisher->isClientIdle(&transport2), true);
+ QCOMPARE(publisher->isClientIdle(&transport1), false);
+ QTRY_COMPARE_WITH_TIMEOUT(transport2.messagesSent().size(), 2u, 2000);
+ QCOMPARE(transport1.messagesSent().size(), 1u);
+ publisher->setClientIsIdle(true, &transport1);
+ QTRY_COMPARE_WITH_TIMEOUT(transport1.messagesSent().size(), 2u, 2000);
+ QCOMPARE(publisher->isClientIdle(&transport1), false);
+ QCOMPARE(publisher->isClientIdle(&transport2), false);
+}
+
class FunctionWrapper : public QObject
{
Q_OBJECT
@@ -1082,7 +1124,7 @@ void TestWebChannel::benchInitializeClients()
publisher->propertyUpdatesInitialized = false;
publisher->signalToPropertyMap.clear();
- publisher->signalHandler.clear();
+ publisher->signalHandlers.clear();
}
}
@@ -1107,7 +1149,7 @@ void TestWebChannel::benchPropertyUpdates()
obj->change();
}
- channel.d_func()->publisher->clientIsIdle = true;
+ channel.d_func()->publisher->setClientIsIdle(true, m_dummyTransport);
channel.d_func()->publisher->sendPendingPropertyUpdates();
}
}
diff --git a/qtwebchannel/tests/auto/webchannel/tst_webchannel.h b/qtwebchannel/tests/auto/webchannel/tst_webchannel.h
index eae21f4..dd4e690 100644
--- a/qtwebchannel/tests/auto/webchannel/tst_webchannel.h
+++ b/qtwebchannel/tests/auto/webchannel/tst_webchannel.h
@@ -348,6 +348,7 @@ private slots:
void testJsonToVariant();
void testInfiniteRecursion();
void testAsyncObject();
+ void testPropertyMultipleTransports();
void testDeletionDuringMethodInvocation_data();
void testDeletionDuringMethodInvocation();
Submodule qtwebengine f328054d...3a11b385 (commits not present)
Submodule qtwebsockets 6edf8323..2c2b7691:
diff --git a/qtwebsockets/src/websockets/qwebsocket_p.cpp b/qtwebsockets/src/websockets/qwebsocket_p.cpp
index cf3087f..0dd0fa6 100644
--- a/qtwebsockets/src/websockets/qwebsocket_p.cpp
+++ b/qtwebsockets/src/websockets/qwebsocket_p.cpp
@@ -1100,6 +1100,8 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
m_handshakeState = AllDoneState;
setErrorString(errorDescription);
Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError);
+ if (m_pSocket->state() != QAbstractSocket::UnconnectedState)
+ m_pSocket->disconnectFromHost();
}
}
diff --git a/qtwebsockets/src/websockets/qwebsocketdataprocessor.cpp b/qtwebsockets/src/websockets/qwebsocketdataprocessor.cpp
index 2affdd5..95f1194 100644
--- a/qtwebsockets/src/websockets/qwebsocketdataprocessor.cpp
+++ b/qtwebsockets/src/websockets/qwebsocketdataprocessor.cpp
@@ -273,6 +273,7 @@ void QWebSocketDataProcessor::clear()
if (!m_pConverterState)
m_pConverterState = new QTextCodec::ConverterState(QTextCodec::ConvertInvalidToNull |
QTextCodec::IgnoreHeader);
+ frame.clear();
}
/*!
Reference in New Issue View Git Blame Copy Permalink