Merge branch 'master' into api

weblate/locale/oc/LC_MESSAGES/djangojs.po

@@ -6,15 +6,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: weblate@lists.cihar.com\n"
 "POT-Creation-Date: 2016-03-10 08:51+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2016-03-22 21:50+0000\n"
+"Last-Translator: Arnaud Barbié <arnaud.barbie94@gmail.com>\n"
+"Language-Team: Occitan "
+"<https://hosted.weblate.org/projects/weblate/javascript/oc/>\n"
 "Language: oc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 2.6-dev\n"
 
 #: weblate/static/loader-bootstrap.js:195
 msgid "Copy"
@@ -49,7 +52,7 @@ msgstr ""
 #: weblate/static/loader-bootstrap.js:680
 #, javascript-format
 msgid "Alt+%s"
-msgstr ""
+msgstr "Alt+%s"
 
 #: weblate/static/loader-bootstrap.js:824
 msgid "There are some unsaved changes, are you sure you want to leave?"