Merge pull request #79 from pbienst/2.6.1-fixes

Release 2.6.1.

ChangeLog

@@ -9,7 +9,7 @@ This might also help with other hard crashes.
 If this does not help, or if you see a black screen, try starting Mnemosyne
 with the --qt-opengl=desktop command line argument.)
 
-Mnemosyne 2.6.1
+Mnemosyne 2.6.1: 2018-08-07
 
 - In the grade and easiness statistics, added option to only show active cards,
   as well as options to group multiple subtags.

TODO

@@ -1,9 +1,3 @@
-Mac version
-close bug reports
-branch 2.6.1 fixes
-tag release
-document new features on website, also for last year
-
 Android:
 
 -look into fixes reported by dashboard
@@ -25,6 +19,7 @@ http://stackoverflow.com/questions/11552963/how-to-get-crash-dialog-with-report-
 -option to globally increase / decrease font size with respect to desktop
 -custom fonts?
 
+check into automated import of translations
 
 if pyinstaller has been updated: upgrade PyQt5
 

mnemosyne/android/app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.mnemosyne"
-    android:versionCode="27"
-    android:versionName="2.0.1" >
+    android:versionCode="28"
+    android:versionName="2.1" >
 
     <uses-sdk android:minSdkVersion="9" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

po/mnemosyne.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-08-03 14:08+0200\n"
+"POT-Creation-Date: 2018-08-07 15:09+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -15,41 +15,6 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 
 
-#: ../dist/Mnemosyne/anki/template/hint.py:17
-#: ../mnemosyne/libmnemosyne/renderers/anki/template/hint.py:17
-msgid "Show %s"
-msgstr ""
-
-#: ../dist/Mnemosyne/anki/utils.py:50
-#: ../mnemosyne/libmnemosyne/renderers/anki/utils.py:50
-msgid "%sy"
-msgstr ""
-
-#: ../dist/Mnemosyne/anki/utils.py:51
-#: ../mnemosyne/libmnemosyne/renderers/anki/utils.py:51
-msgid "%smo"
-msgstr ""
-
-#: ../dist/Mnemosyne/anki/utils.py:52
-#: ../mnemosyne/libmnemosyne/renderers/anki/utils.py:52
-msgid "%sd"
-msgstr ""
-
-#: ../dist/Mnemosyne/anki/utils.py:53
-#: ../mnemosyne/libmnemosyne/renderers/anki/utils.py:53
-msgid "%sh"
-msgstr ""
-
-#: ../dist/Mnemosyne/anki/utils.py:54
-#: ../mnemosyne/libmnemosyne/renderers/anki/utils.py:54
-msgid "%sm"
-msgstr ""
-
-#: ../dist/Mnemosyne/anki/utils.py:55
-#: ../mnemosyne/libmnemosyne/renderers/anki/utils.py:55
-msgid "%ss"
-msgstr ""
-
 #: ../mnemosyne/android_python/database_maintenance.py:14
 msgid "About to archive old logs to improve running speed. Depending on the size of your database and the speed of your device, this can take 10 minutes or more. Please leave Mnemosyne running in the foreground."
 msgstr ""
@@ -953,6 +918,34 @@ msgstr ""
 msgid "There are cards with this card type (or a clone of it) in the database."
 msgstr ""
 
+#: ../mnemosyne/libmnemosyne/renderers/anki/template/hint.py:17
+msgid "Show %s"
+msgstr ""
+
+#: ../mnemosyne/libmnemosyne/renderers/anki/utils.py:50
+msgid "%sy"
+msgstr ""
+
+#: ../mnemosyne/libmnemosyne/renderers/anki/utils.py:51
+msgid "%smo"
+msgstr ""
+
+#: ../mnemosyne/libmnemosyne/renderers/anki/utils.py:52
+msgid "%sd"
+msgstr ""
+
+#: ../mnemosyne/libmnemosyne/renderers/anki/utils.py:53
+msgid "%sh"
+msgstr ""
+
+#: ../mnemosyne/libmnemosyne/renderers/anki/utils.py:54
+msgid "%sm"
+msgstr ""
+
+#: ../mnemosyne/libmnemosyne/renderers/anki/utils.py:55
+msgid "%ss"
+msgstr ""
+
 #: ../mnemosyne/libmnemosyne/review_controllers/SM2_controller.py:18
 msgid "You don't remember this card yet."
 msgstr ""