mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-28 12:30:00 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
This commit is contained in:
Radosław Kierznowski 2017-02-27 23:04:34 +01:00
commit 9dfd30e6f3
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cps/translations/pl/LC_MESSAGES/messages.po
View File

@ -9,7 +9,11 @@ msgstr ""
"Project-Id-Version: Calibre Web - polski (POT: 2017-02-20 19:47)\n" "Project-Id-Version: Calibre Web - polski (POT: 2017-02-20 19:47)\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2017-02-20 19:47+0100\n" "POT-Creation-Date: 2017-02-20 19:47+0100\n"
<<<<<<< HEAD
"PO-Revision-Date: 2017-02-27 22:55+0100\n" "PO-Revision-Date: 2017-02-27 22:55+0100\n"
=======
"PO-Revision-Date: 2017-02-26 18:27+0100\n"
>>>>>>> origin/master
"Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n" "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: pl\n" "Language: pl\n"
@ -472,11 +476,19 @@ msgstr "Zarządzanie"
#: cps/templates/admin.html:80 #: cps/templates/admin.html:80
msgid "Current commit timestamp" msgid "Current commit timestamp"
<<<<<<< HEAD
msgstr "Znacznik czasowy zainstalowanej wersji" msgstr "Znacznik czasowy zainstalowanej wersji"
#: cps/templates/admin.html:81 #: cps/templates/admin.html:81
msgid "Newest commit timestamp" msgid "Newest commit timestamp"
msgstr "Znacznik czasowy nowej wersji" msgstr "Znacznik czasowy nowej wersji"
=======
msgstr "Obecny znacznik czasowy wersji"
#: cps/templates/admin.html:81
msgid "Newest commit timestamp"
msgstr "Nowy znacznik czasowy wersji"
>>>>>>> origin/master
#: cps/templates/admin.html:83 #: cps/templates/admin.html:83
msgid "Restart Calibre-web" msgid "Restart Calibre-web"