Merge pull request #83 from OpenTaal/Dutch

Dutch, first official release, internal version 1.4

.gitignore

@@ -5,4 +5,4 @@
 .DS_Store
 /build
 /captures
-/LanguagePack-release.apk
+*.apk

LICENSE

@@ -8,7 +8,7 @@ to keep a copy of it with every copy you make of this project.
    received the Spelling Seal of Approval from the Dutch Language Union, the 
    formal Dutch language institute. For more information please see: 
    http://taalunieversum.org/keurmerk
-5. Copyrights: © 2006-2016 OpenTaal, © 2001-2005 Simon Brouwer e.a., 
+5. Copyrights: © 2006-2017 OpenTaal, © 2001-2005 Simon Brouwer e.a.,
    © 1996 Nederlandstalige Tex Gebruikersgroep
 6. Licenses: OpenTaal aims to create and publish free Dutch language files. To 
    enable the broadest (re)use the language files are freely available under the 
@@ -47,7 +47,7 @@ to keep a copy of it with every copy you make of this project.
 
 The MIT License (MIT)
 
-Copyright (c) 2016 Stichting OpenTaal
+Copyright (c) 2017 Stichting OpenTaal
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -71,7 +71,7 @@ SOFTWARE.
 
 The BSD License (BSD)
 
-Copyright (c) 2016, Stichting OpenTaal
+Copyright (c) 2017, Stichting OpenTaal
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -78,16 +78,24 @@ Installatie is mogelijk vanuit de appstores F-Droid en Google Play zonder enige
 kosten. Overweeg a.u.b. om een donatie te doen aan Stichting OpenTaal om deze
 ondersteuning voor het Nederlands mogelijk te maken.
 
-<a href="https://f-droid.org/app/YOUR.APP.ID">
-    <img src="https://f-droid.org/badge/get-it-on-nl.png"
+<a href="https://f-droid.org/packages/com.anysoftkeyboard.languagepack.dutch">
+    <!--img src="https://f-droid.org/badge/get-it-on-nl.png"
+         alt="Ontdek het op F-Droid" height="80"-->
+    <img src="https://gitlab.com/fdroid/artwork/raw/master/badge/get-it-on-nl.png"
          alt="Ontdek het op F-Droid" height="80">
 </a>
 
-<a href="https://play.google.com/store/apps/details?id=YOUR.APP.ID">
+<a href="https://play.google.com/store/apps/details?id=com.anysoftkeyboard.languagepack.dutch">
     <img src="https://play.google.com/intl/en_us/badges/images/generic/nl_badge_web_generic.png"
          alt="Ontdek het op Google Play" height="80">
 </a>
 
+
+Gebruik
+-------
+
+Zie voorlopig de Engelse uitleg hieronder bij _Usage_.
+
 [![Flattr AnySoftKeyBoard LanguagePack Nederlands van OpenTaal](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=OpenTaal&url=https://github.com/OpenTaal/LanguagePack&title=LanguagePack&language=nl&tags=github&category=software)
 
 
@@ -104,6 +112,24 @@ pack for AnySoftKeyboard. This support has been created by Stichting OpenTaal
 and can be installed by all without any costs.
 
 
+Stichting OpenTaal
+------------------
+
+See, for now, the text in Dutch above.
+
+
+Quality Mark Spelling
+---------------------
+
+See, for now, the text in Dutch above.
+
+
+Word List
+---------
+
+See, for now, the text in Dutch above.
+
+
 License
 -------
 
@@ -130,16 +156,33 @@ Installation is possible from F-Droid and Google Play app stores without any
 costs. Please, consider making a donation to Stichting OpenTaal for making this
 support for Dutch possible and actively maintained.
 
-<a href="https://f-droid.org/app/YOUR.APP.ID">
-    <img src="https://f-droid.org/badge/get-it-on.png"
-         alt="Get it on F-Droid" height="80">
+<a href="https://f-droid.org/packages/com.anysoftkeyboard.languagepack.dutch">
+    <!--img src="https://f-droid.org/badge/get-it-on.png"
+         alt="Get it on F-Droid" height="80"-->
+    <img src="https://gitlab.com/fdroid/artwork/raw/master/badge/get-it-on.png"
+         alt="Ontdek het op F-Droid" height="80">
 </a>
 
-<a href="https://play.google.com/store/apps/details?id=YOUR.APP.ID">
+<a href="https://play.google.com/store/apps/details?id=com.anysoftkeyboard.languagepack.dutch">
     <img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
          alt="Get it on Google Play" height="80">
 </a>
 
+
+Usage
+-----
+
+Note that the language shown in a subtle way on the space bar is the language
+you are currently using. Any language displayed more prominently at the top of
+the keyboard is simply to change into that language.
+
+It is recommended to configure AnySoftKeyboard in the following
+way. Open the app called AnySoftKeybaord and choose __Go to Settings__ Then go
+to the bottom of the menu and choose "Even more…" under USER INTERFACE. For
+**Common top generic row** choose the row type **Small keys** and for
+**Common bottom generic row** choose **Classic (no mic)**, or when you want to
+use voice input, leave it as **Regular**.
+
 [![Flattr AnySoftKeyBoard LanguagePack Dutch by OpenTaal](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=OpenTaal&url=https://github.com/OpenTaal/LanguagePack&title=LanguagePack&language=en&tags=github&category=software)
 
 

build.gradle

@@ -23,13 +23,13 @@ android {
         applicationId "com.anysoftkeyboard.languagepack.dutch"
         minSdkVersion 7
         targetSdkVersion 25
-        versionCode 2
-        versionName "1.1"
+        versionCode 5
+        versionName "1.4"
     }
 
     signingConfigs {
         release {
-            storeFile file("../../Documents/opentaal.keystore")
+            storeFile file("../../Documents/language_pack.keystore")
             storePassword System.getenv("PACK_KEYSTORE_PASSWORD")
             keyAlias System.getenv("PACK_KEYSTORE_ALIAS")
             keyPassword System.getenv("PACK_KEYSTORE_KEY_PASSWORD")
@@ -47,17 +47,18 @@ android {
     }
 }
 
-task mergeAllWordLists(type: com.anysoftkeyboard.tools.generatewordslist.MergeWordsListTask) {
-    inputWordsListFiles = [
-            new File(project.getProjectDir(), "dictionary/words.xml"),
-    ] as File[]
-    outputWordsListFile new File(project.getProjectDir(), "dictionary/words_merged.xml")
-    maxWordsInList 131072
-}
+//task mergeAllWordLists(type: com.anysoftkeyboard.tools.generatewordslist.MergeWordsListTask) {
+//    inputWordsListFiles = [
+//            new File(project.getProjectDir(), "dictionary/words.xml"),
+//    ] as File[]
+//    outputWordsListFile new File(project.getProjectDir(), "dictionary/words_merged.xml")
+//    maxWordsInList 262144 // 4 * 2^16
+//}
 
 task makeDictionary(type: com.anysoftkeyboard.tools.makedictionary.MakeDictionaryTask) {
-    dependsOn mergeAllWordLists
-    inputWordsListFile new File(project.getProjectDir(), "dictionary/words_merged.xml")
+//    dependsOn mergeAllWordLists
+//    inputWordsListFile new File(project.getProjectDir(), "dictionary/words_merged.xml")
+    inputWordsListFile new File(project.getProjectDir(), "dictionary/words.xml")
 }
 
 afterEvaluate { proj ->