Make licenses more uniform

metadata/com.anysoftkeyboard.languagepack.hungarian.txt

@@ -1,5 +1,5 @@
 Categories:Writing
-License:GPL/MPL
+License:GPL,MPL
 Web Site:
 Source Code:https://github.com/rhornig/anysoftkeyboard-hungarian
 Issue Tracker:https://github.com/rhornig/anysoftkeyboard-hungarian/issues

metadata/com.anysoftkeyboard.languagepack.spain.txt

@@ -1,5 +1,5 @@
 Categories:Writing
-License:GNUFDL/CCBYSA
+License:GNUFDL,CC-BY-SA
 Web Site:https://github.com/anysoftkeyboard
 Source Code:https://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Spain
 Issue Tracker:https://github.com/AnySoftKeyboard/LanguagePack/issues

metadata/com.blogspot.marioboehmer.nfcprofile.txt

@@ -1,6 +1,6 @@
 Disabled:Non-free license
 Categories:Connectivity
-License:CCBYNCSA3
+License:CC-BY-NC-SA-3.0
 Web Site:http://marioboehmer.blogspot.com/2012/03/nfc-profile-version-21.html
 Source Code:https://github.com/MarioBoehmer/NFCProfile
 Issue Tracker:https://github.com/MarioBoehmer/NFCProfile/issues

metadata/com.ds.avare.txt

@@ -1,6 +1,6 @@
 AntiFeatures:NonFreeDep
 Categories:Navigation
-License:NetBSD/Apache2
+License:NetBSD,Apache2
 Web Site:http://apps4av.com/avare-overview
 Source Code:https://github.com/apps4av/avare
 Issue Tracker:https://github.com/apps4av/avare/issues

metadata/com.hermit.btreprap.txt

@@ -1,5 +1,5 @@
 Categories:Connectivity
-License:CCBYSA
+License:CC-BY-SA
 Web Site:
 Source Code:https://github.com/pipakin/Android-Bluetooth-Reprap
 Issue Tracker:https://github.com/pipakin/Android-Bluetooth-Reprap/issues

metadata/com.powerje.nyan.txt

@@ -1,3 +1,4 @@
+AntiFeatures:NonFreeAssets
 Categories:Theming
 License:Apache2
 Web Site:
@@ -10,7 +11,7 @@ Description:
 Endless, flying-pop-tart-cat-alike wallpaper, with options and a standalone,
 musical, launcher version.
 
-The music is licensed under CCBYSANC.
+The music is licensed under CC-BY-SA-NC3.0.
 .
 
 Repo Type:git

metadata/com.seb.SLWP.txt

@@ -1,5 +1,5 @@
 Categories:Theming
-License:GPL/Artistic
+License:GPL,Artistic
 Web Site:https://code.google.com/p/earth-live-wallpaper
 Source Code:https://code.google.com/p/earth-live-wallpaper/source
 Issue Tracker:

metadata/com.seb.SLWPmaps.txt

@@ -1,5 +1,5 @@
 Categories:Theming
-License:GPL/Artistic
+License:GPL,Artistic
 Web Site:https://code.google.com/p/earth-live-wallpaper
 Source Code:https://code.google.com/p/earth-live-wallpaper/source
 Issue Tracker:

metadata/fr.ornidroid.txt

@@ -1,6 +1,6 @@
 Disabled:Non-free license
 Categories:Science & Education
-License:CCBYNC
+License:CC-BY-NC
 Web Site:https://github.com/giletvin/ornidroid/wiki
 Source Code:https://github.com/giletvin/ornidroid
 Issue Tracker:

metadata/net.lardcave.keepassnfc.txt

@@ -1,5 +1,5 @@
 Categories:Connectivity
-License:Unlicense/Apache2
+License:Unlicense,Apache2
 Web Site:http://code.lardcave.net/entries/2013/04/01/215058
 Source Code:https://github.com/nfd/KeePassNFC
 Issue Tracker:https://github.com/nfd/KeePassNFC/issues

metadata/net.minetest.minetest.txt

@@ -1,5 +1,5 @@
 Categories:Games
-License:LGPLv2.1+,CC-BY-SA 3.0
+License:LGPLv2.1+,CC-BY-SA-3.0
 Web Site:http://minetest.net
 Source Code:https://github.com/minetest/minetest
 Issue Tracker:http://www.minetest.net/reporting_issues

metadata/nl.frankkie.bronylivewallpaper.txt

@@ -11,7 +11,7 @@ Description:
 Featuring characters from MLP:FIM (trademarked to Hasbro Inc.).
 
 GIFs are from the [http://desktopponies.bugs3.com Desktop Ponies] project and
-licensed as CCBYSANC.
+licensed as CC-BY-SA-NC.
 
 Status: Beta
 .

metadata/org.freeminer.freeminer.txt

@@ -1,5 +1,5 @@
 Categories:Games,Internet
-License:GPLv3,CC-BY-SA 3.0
+License:GPLv3,CC-BY-SA-3.0
 Web Site:http://freeminer.org
 Source Code:https://github.com/freeminer/freeminer
 Issue Tracker:https://github.com/freeminer/freeminer/issues

metadata/org.jf.Penroser.txt

@@ -1,5 +1,5 @@
 Categories:Theming
-License:BSD/Apache
+License:BSD,Apache2
 Web Site:
 Source Code:https://github.com/JesusFreke/Penroser
 Issue Tracker:https://github.com/JesusFreke/Penroser/issues