Merge remote-tracking branch 'origin/master'

WeblateOrg · Mar 5, 2015 · b57a383 · b57a383
2 parents a294724 + 1d9749e
commit b57a383
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/docs/formats.rst b/docs/formats.rst
@@ -264,6 +264,21 @@ file with English strings.
 
    `JSON in translate-toolkit documentation <http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/json.html>`_
 
+.Net Resource files
+-------------------
+
+.. index:: single: RESX; files
+
+.. versionadded:: 2.3
+
+.Net Resource (.resx) file is a monolingual XML file format used in Microsoft
+.Net Applications.
+
+.. note::
+
+    As of writing this documentation, you need translate-toolkit from Git to
+    support this format.
+
 Others
 ------
 

diff --git a/weblate/trans/formats.py b/weblate/trans/formats.py
@@ -831,6 +831,14 @@ class PhpFormat(FileFormat):
     loader = ('php', 'phpfile')
 
 
+@register_fileformat
+class RESXFormat(FileFormat):
+    name = _('.Net resource file')
+    format_id = 'resx'
+    loader = ('resx', 'RESXFile')
+    monolingual = True
+
+
 @register_fileformat
 class AndroidFormat(FileFormat):
     name = _('Android String Resource')