Merge remote-tracking branch 'polish_update/master'

# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po

Fix for #147
This commit is contained in:
OzzieIsaacs
2017-03-12 19:12:17 +01:00
13 changed files with 141 additions and 162 deletions
+19 -23
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2017-03-11 09:09+0100\n"
"POT-Creation-Date: 2017-03-12 19:10+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -104,7 +104,7 @@ msgid "Author: %(name)s"
msgstr ""
#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
#: cps/web.py:2193
#: cps/web.py:2196
msgid "Error opening eBook. File does not exist or file is not accessible:"
msgstr ""
@@ -202,7 +202,7 @@ msgstr ""
msgid "There was an error sending this book: %(res)s"
msgstr ""
#: cps/web.py:1423
#: cps/web.py:1423 cps/web.py:1867
msgid "Please configure your kindle email address first..."
msgstr ""
@@ -304,67 +304,67 @@ msgstr ""
msgid "Mail settings updated"
msgstr ""
#: cps/web.py:1861
#: cps/web.py:1862
#, python-format
msgid "Test E-Mail successfully send to %(kindlemail)s"
msgstr ""
#: cps/web.py:1864
#: cps/web.py:1865
#, python-format
msgid "There was an error sending the Test E-Mail: %(res)s"
msgstr ""
#: cps/web.py:1866
#: cps/web.py:1869
msgid "E-Mail settings updated"
msgstr ""
#: cps/web.py:1867
#: cps/web.py:1870
msgid "Edit mail settings"
msgstr ""
#: cps/web.py:1895
#: cps/web.py:1898
#, python-format
msgid "User '%(nick)s' deleted"
msgstr ""
#: cps/web.py:1976
#: cps/web.py:1979
#, python-format
msgid "User '%(nick)s' updated"
msgstr ""
#: cps/web.py:1979
#: cps/web.py:1982
msgid "An unknown error occured."
msgstr ""
#: cps/web.py:1982
#: cps/web.py:1985
#, python-format
msgid "Edit User %(nick)s"
msgstr ""
#: cps/web.py:2188 cps/web.py:2191 cps/web.py:2301
#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
msgid "edit metadata"
msgstr ""
#: cps/web.py:2212
#: cps/web.py:2215
#, python-format
msgid "File extension \"%s\" is not allowed to be uploaded to this server"
msgstr ""
#: cps/web.py:2218
#: cps/web.py:2221
msgid "File to be uploaded must have an extension"
msgstr ""
#: cps/web.py:2235
#: cps/web.py:2238
#, python-format
msgid "Failed to create path %s (Permission denied)."
msgstr ""
#: cps/web.py:2240
#: cps/web.py:2243
#, python-format
msgid "Failed to store file %s (Permission denied)."
msgstr ""
#: cps/web.py:2245
#: cps/web.py:2248
#, python-format
msgid "Failed to delete file %s (Permission denied)."
msgstr ""
@@ -579,8 +579,8 @@ msgstr ""
msgid "view book after edit"
msgstr ""
#: cps/templates/book_edit.html:107
msgid "Get Metadata"
#: cps/templates/book_edit.html:107 cps/templates/book_edit.html:118
msgid "Get metadata"
msgstr ""
#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:76
@@ -589,10 +589,6 @@ msgstr ""
msgid "Submit"
msgstr ""
#: cps/templates/book_edit.html:118
msgid "Get metadata"
msgstr ""
#: cps/templates/book_edit.html:121
msgid "Keyword"
msgstr ""