diff --git a/metadata/a2dp.Vol.txt b/metadata/a2dp.Vol.txt
new file mode 100644
index 0000000000..80d461bfa6
--- /dev/null
+++ b/metadata/a2dp.Vol.txt
@@ -0,0 +1,19 @@
+Category:Multimedia
+License:GPLv3
+Web Site:http://code.google.com/p/a2dpvolume/
+Source Code:http://code.google.com/p/a2dpvolume/source/checkout
+Issue Tracker:http://code.google.com/p/a2dpvolume/issues/list
+
+Summary:Automatically adjust media volume
+Description:
+Automatically adjusts the media volume on connect and resets on disconnect. This is done so the stereo streaming audio will work properly. Intended primarily for car Bluetooth systems. Also automatically captures location information so you can find where you left your car. The location can also be automatically captured when exiting Car Mode on your Android device. The location can be read by any app that understands GPS data. Can read out text messages using Text To Speech (TTS) services while you are connected. Each paired Bluetooth device or virtual device (home dock, car dock, power connection, or headset plug) can be configured to your liking.
+
+Android 2.2 and above. (There is a version for below this, but not here)
+.
+
+Repo Type:hg
+Repo:http://code.google.com/p/a2dpvolume/
+
+Build Version:2.8.11,93,8eac7d
+
+Update Check Mode:Market
diff --git a/metadata/apps.babycaretimer.txt b/metadata/apps.babycaretimer.txt
new file mode 100644
index 0000000000..6d3e501c2a
--- /dev/null
+++ b/metadata/apps.babycaretimer.txt
@@ -0,0 +1,22 @@
+Category:Office
+License:GPLv3
+Web Site:http://code.google.com/p/baby-care-timer
+Source Code:http://code.google.com/p/baby-care-timer/source/list
+Issue Tracker:http://code.google.com/p/baby-care-timer/issues/list
+Donate:http://code.google.com/p/baby-care-timer
+
+Summary:Know when to feed the baby
+Description:
+Baby Care Timer is a timer for parents to track feedings, diaper changes and other important items.
+.
+
+Repo Type:git-svn
+Repo:http://baby-care-timer.googlecode.com/svn/trunk/
+
+#non-functional on my phone
+#Build Version:1.5,6,136
+
+Update Check Mode:Market
+Current Version:1.4
+Current Version Code:5
+
diff --git a/metadata/apps.droidnotify.txt b/metadata/apps.droidnotify.txt
index 5278cf9c67..fb3b2742b4 100644
--- a/metadata/apps.droidnotify.txt
+++ b/metadata/apps.droidnotify.txt
@@ -23,6 +23,8 @@ Build Version:3.1,34,!No source code
 Build Version:3.4,37,!No source code - https://code.google.com/p/droid-notify/issues/detail?id=115
 Build Version:3.7,40,!No source code
 Build Version:3.12,45,!No source code
+#need ambilwarna lib
+#Build Version:3.16,49,990
 
 Update Check Mode:Market
 Current Version:3.16
diff --git a/metadata/cc.co.eurdev.urecorder.txt b/metadata/cc.co.eurdev.urecorder.txt
new file mode 100644
index 0000000000..ed8c86d3c6
--- /dev/null
+++ b/metadata/cc.co.eurdev.urecorder.txt
@@ -0,0 +1,19 @@
+Category:Office
+License:GPLv3
+Web Site:https://bitbucket.org/thomasebell/urecord/
+Source Code:https://bitbucket.org/thomasebell/urecord/
+
+Summary:Audio Recorder
+Description:
+Single track recorder with built in audio player. Supports uncompressed ouput and the full range of sample rates, so may be of special use if you have a decent microphone
+.
+
+Repo Type:git
+Repo:https://bitbucket.org/thomasebell/urecord.git
+
+Build Version:1.4,5,acf97f,subdir=Four Track
+
+Update Check Mode:RepoManifest
+Current Version:1.4
+Current Version Code:5
+
diff --git a/metadata/cgeo.geocaching.txt b/metadata/cgeo.geocaching.txt
index d24a92a693..f02386ad85 100644
--- a/metadata/cgeo.geocaching.txt
+++ b/metadata/cgeo.geocaching.txt
@@ -3,7 +3,7 @@ License:Apache2
 Web Site:http://www.cgeo.org
 Source Code:https://github.com/cgeo/c-geo-opensource
 Issue Tracker:https://github.com/cgeo/c-geo-opensource/issues
-Donate:https://www.paypal.com/si/cgi-bin/webscr?cmd=_flow&SESSION=wczJRQ7RLX09OOYlfZtWeC5zejaJpP9xZ5-cby5zCmoKvuI8FXtXadN-WKq&dispatch=5885d80a13c0db1f8e263663d3faee8d7283e7f0184a5674430f290db9e9c846
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=cgeo%40cgeo%2eorg&item_name=Donate%20to%20CGeo%20via%20F-droid
 
 Summary:Geo-caching client
 Description:
@@ -17,5 +17,6 @@ Update Check Mode:Market
 Current Version:2012.08.15
 Current Version Code:20120815
 
-#Needs version naming properly, we can't have all versions being called "developer  build"
-#Build Version:"developer  build",20120628,388a5a3b1c0885a65fb036feb2cbd3d4106e83f0,subdir=main
+#No maps api key
+#use version name from Google Play
+#Build Version:2012.06.28,20120628,388a5a3b1c0885a65fb036feb2cbd3d4106e83f0,subdir=main,forceversion=yes,target=android-15
diff --git a/metadata/ch.blinkenlights.battery.txt b/metadata/ch.blinkenlights.battery.txt
new file mode 100644
index 0000000000..640ea71ccf
--- /dev/null
+++ b/metadata/ch.blinkenlights.battery.txt
@@ -0,0 +1,21 @@
+Category:System
+License:GPLv2
+Web Site:https://github.com/adrian-bl/bl-battstatus-android
+Source Code:https://github.com/adrian-bl/bl-battstatus-android
+Issue Tracker:https://github.com/adrian-bl/bl-battstatus-android/issues
+
+Summary:Battery info in the status bar
+Description:
+Displays the battery percentage in colour and different themes are possible. Voltage and temperature can optionally be displayed in the notification area and tapping that can bring you to your battery statistics.
+.
+
+Repo Type:git
+Repo:https://github.com/adrian-bl/bl-battstatus-android.git
+
+Build Version:1.81,1335983644,2bd476,target=android-4,prebuild=android update project --path .  && make refresh
+
+#puts version in strings.xml
+Update Check Mode:Market
+Current Version:1.8
+Current Version Code:1335983633
+
diff --git a/metadata/cm.aptoide.pt.txt b/metadata/cm.aptoide.pt.txt
index 38cc7e1c67..70fe676d31 100644
--- a/metadata/cm.aptoide.pt.txt
+++ b/metadata/cm.aptoide.pt.txt
@@ -1,4 +1,4 @@
-Disabled:Source incomplete
+Disabled:Admob
 Category:System
 License:GPLv2+
 Web Site:http://www.aptoide.com/
@@ -11,11 +11,14 @@ Aptoide is a simple repository and package installer. F-Droid was originally
 based on Aptoide!
 .
 
-Repo Type:svn
-Repo:http://aptoide.org/repo
+Repo Type:git-svn
+Repo:http://aptoide.org/repo/aptoide-client
 
-Update Check Mode:Market
-Current Version:2.0.1
-Current Version Code:145
+#not in market
+Update Check Mode:None
+Current Version:2.7.1
+Current Version Code:326
 
-#Build Version:2.0,126,45,subdir=aptoide-client/v2.0
+#needs ViewPagerIndicator
+#n.b subdir needs to change with version
+Build Version:2.7.1,326,842,subdir=2.7.1/AptoideConcept
diff --git a/metadata/com.FireFart.Permissions.txt b/metadata/com.FireFart.Permissions2.txt
similarity index 61%
rename from metadata/com.FireFart.Permissions.txt
rename to metadata/com.FireFart.Permissions2.txt
index 05ba68bd5a..9024e0a1d5 100644
--- a/metadata/com.FireFart.Permissions.txt
+++ b/metadata/com.FireFart.Permissions2.txt
@@ -1,7 +1,7 @@
 Category:System
 License:Apache2
-Web Site:http://code.google.com/p/androidpermissions/
-Source Code:http://code.google.com/p/androidpermissions/source/checkout
+Web Site:https://github.com/FireFart/Permissions
+Source Code:https://github.com/FireFart/Permissions
 Issue Tracker:http://code.google.com/p/androidpermissions/issues/list
 
 Summary:Lists application permissions
@@ -12,12 +12,12 @@ entries in the list to see what applications are using that particular
 permission.
 .
 
-Repo Type:svn
-Repo:http://androidpermissions.googlecode.com/svn/trunk
+Repo Type:git
+Repo:https://github.com/FireFart/Permissions.git
 
-Build Version:1.1,2,16
+Build Version:1.2,3,c2b651a63
 
 Update Check Mode:Market
-Current Version:1.1
-Current Version Code:2
+Current Version:1.2
+Current Version Code:3
 
diff --git a/metadata/com.andrewshu.android.reddit.txt b/metadata/com.andrewshu.android.reddit.txt
index d45db260d9..e06135a73f 100644
--- a/metadata/com.andrewshu.android.reddit.txt
+++ b/metadata/com.andrewshu.android.reddit.txt
@@ -7,6 +7,8 @@ Issue Tracker:https://github.com/talklittle/reddit-is-fun/issues
 Summary:Access social news website Reddit.com
 Description:
 An app for the social news website Reddit.
+
+N.B v2.0+ of RiF, found elsewhere, are proprietary
 .
 
 Repo Type:git
@@ -25,7 +27,7 @@ Build Version:1.3.0,83,v1.3.0,target=android-11,prebuild=mkdir lib && mv libs-de
 Build Version:2.1.1,91,!No source in repo
 Build Version:2.2,92,!No source in repo
 
-Update Check Mode:Market
-Current Version:2.3.6
-Current Version Code:106
+Update Check Mode:None
+Current Version:1.3.0
+Current Version Code:83
 
diff --git a/metadata/com.android.inputmethod.pinyin.txt b/metadata/com.android.inputmethod.pinyin.txt
new file mode 100644
index 0000000000..20ade5808c
--- /dev/null
+++ b/metadata/com.android.inputmethod.pinyin.txt
@@ -0,0 +1,16 @@
+Category:System
+License:Apache2
+Web Site:https://github.com/CyanogenMod/
+Source Code:https://github.com/CyanogenMod/android_packages_inputmethods_PinyinIME/tree
+
+Summary:Input method for Pinyin
+Description:
+Pinyin IME from the AOSP. It is not only of use to Chinese writers but to English writers too because it has a T9 style keyboard for writing in English
+.
+
+Repo Type:git
+Repo:https://github.com/CyanogenMod/android_packages_inputmethods_PinyinIME.git
+
+#ndk failure
+#Build Version:1,1,272bd,buildjni=yes,forceversion=yes,forcevercode=yes,target=android-15
+
diff --git a/metadata/com.android.keepass.txt b/metadata/com.android.keepass.txt
index 06bb50832f..135b03cd54 100644
--- a/metadata/com.android.keepass.txt
+++ b/metadata/com.android.keepass.txt
@@ -3,6 +3,7 @@ License:GPLv2
 Web Site:http://www.keepassdroid.com/
 Source Code:http://github.com/bpellin/keepassdroid
 Issue Tracker:http://code.google.com/p/keepassdroid/issues/list
+Donate:http://www.keepassdroid.com/
 
 Summary:KeePass-compatible password safe
 Description:
@@ -25,6 +26,8 @@ Build Version:1.9.8,85,v1.9.8,target=android-8
 
 #Temporarily disabled - need MIPS version of NDK I think
 #Build Version:1.9.9,86,v1.9.9,target=android-8,buildjni=yes
+#Build Version:1.9.14,91,v1.9.14,target=android-8,buildjni=yes
+
 Update Check Mode:Market
 Current Version:1.9.14
 Current Version Code:91
diff --git a/metadata/com.aokp.backup.txt b/metadata/com.aokp.backup.txt
new file mode 100644
index 0000000000..287bc3ead8
--- /dev/null
+++ b/metadata/com.aokp.backup.txt
@@ -0,0 +1,23 @@
+Category:System
+License:Apache2
+Web Site:https://github.com/romanbb/AOKP_Backup
+Source Code:https://github.com/romanbb/AOKP_Backup
+Issue Tracker:
+Donate:http://aokp.co/index.php/news
+
+Summary:Backup your ROM settings
+Description:
+Only for users of AOKP ROM. You must be on at least milestone 5 to use this
+.
+
+Requires Root:Yes
+
+Repo Type:git
+Repo:https://github.com/romanbb/AOKP_Backup.git
+
+Build Version:1.51,22,531698
+
+Update Check Mode:RepoManifest
+Current Version:1.51
+Current Version Code:22
+
diff --git a/metadata/com.axelby.podax.txt b/metadata/com.axelby.podax.txt
index 01cb9e7d64..67b33506b9 100644
--- a/metadata/com.axelby.podax.txt
+++ b/metadata/com.axelby.podax.txt
@@ -29,6 +29,8 @@ Build Version:3.3,16,606af2015873,target=android-14
 Build Version:3.5,18,62c2b93562b6,target=android-14
 Build Version:4.02,21,!e5da76325a5a build failure - submodules refer to deleted github repositories
 Build Version:4.03,22,!151b8d508b3 submodules still invalid - Clone of 'git://github.com/thasmin/ViewPagerIndicator.git' into submodule path 'ViewPagerIndicator' failed
+#doesn't build but maybe you can get it to
+#Build Version:4.3,25,c44247910375d9660ebcdfda91c1c7b25586579b
 
 Update Check Mode:RepoManifest
 Current Version:4.5
diff --git a/metadata/com.banasiak.coinflip.txt b/metadata/com.banasiak.coinflip.txt
new file mode 100644
index 0000000000..26e5531972
--- /dev/null
+++ b/metadata/com.banasiak.coinflip.txt
@@ -0,0 +1,20 @@
+Category:Office
+License:GPLv3
+Web Site:https://github.com/banasiak/CoinFlip
+Source Code:https://github.com/banasiak/CoinFlip
+Issue Tracker:https://github.com/banasiak/CoinFlip/issues
+
+Summary:Simulate a coin flip
+Description:
+No description available
+.
+
+Repo Type:git
+Repo:https://github.com/banasiak/CoinFlip.git
+
+Build Version:5.1,25,f4d644
+
+Update Check Mode:RepoManifest
+Current Version:5.1
+Current Version Code:25
+
diff --git a/metadata/com.blogspot.marioboehmer.nfcprofile.txt b/metadata/com.blogspot.marioboehmer.nfcprofile.txt
new file mode 100644
index 0000000000..a55fcf579a
--- /dev/null
+++ b/metadata/com.blogspot.marioboehmer.nfcprofile.txt
@@ -0,0 +1,20 @@
+Category:System
+License:CCv3.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
+
+Summary:Perform actions using tags
+Description:
+Start alarms, turn on/off radios/ringer and launch apps by tapping your phone against an NFC tag
+.
+
+Repo Type:git
+Repo:https://github.com/MarioBoehmer/NFCProfile.git
+
+Build Version:2.2,5,1292aa
+
+Update Check Mode:RepoManifest
+Current Version:2.2
+Current Version Code:5
+
diff --git a/metadata/com.brocktice.JustSit.txt b/metadata/com.brocktice.JustSit.txt
index bb1d2a01f9..043ff66ec3 100644
--- a/metadata/com.brocktice.JustSit.txt
+++ b/metadata/com.brocktice.JustSit.txt
@@ -1,4 +1,4 @@
-Category:Science
+Category:Science & Education
 License:GPLv3/CCv3.0by
 Web Site:https://code.google.com/p/justsit/
 Source Code:https://code.google.com/p/justsit/source/checkout
diff --git a/metadata/com.bvalosek.cpuspy.txt b/metadata/com.bvalosek.cpuspy.txt
new file mode 100644
index 0000000000..85f0950fef
--- /dev/null
+++ b/metadata/com.bvalosek.cpuspy.txt
@@ -0,0 +1,19 @@
+Category:System
+License:GPLv3
+Web Site:https://github.com/bvalosek/cpuspy
+Source Code:https://github.com/bvalosek/cpuspy
+Issue Tracker:https://github.com/bvalosek/cpuspy/issues
+
+Summary:Display CPU info
+Description:
+Show time spent overall in each cpu state CPU and general kernel info
+.
+
+Repo Type:git
+Repo:https://github.com/bvalosek/cpuspy.git
+
+Build Version:0.4.0,9,908f9
+#now using maven
+
+Update Check Mode:RepoManifest
+
diff --git a/metadata/com.bwx.bequick.txt b/metadata/com.bwx.bequick.txt
index 5384d13f39..c446b3c134 100644
--- a/metadata/com.bwx.bequick.txt
+++ b/metadata/com.bwx.bequick.txt
@@ -19,7 +19,7 @@ Build Version:1.9.9.2,201106160,213,target=android-8
 Build Version:1.9.9.3,201107260,220,target=android-8
 Build Version:1.9.9.7,201202290,!Source has disappeared
 
-Update Check Mode:Market
+Update Check Mode:None
 Current Version:1.9.10
 Current Version Code:201207300
 
diff --git a/metadata/com.byagowi.persiancalendar.txt b/metadata/com.byagowi.persiancalendar.txt
new file mode 100644
index 0000000000..962cf9d51b
--- /dev/null
+++ b/metadata/com.byagowi.persiancalendar.txt
@@ -0,0 +1,20 @@
+Category:Office
+License:GPLv3
+Web Site:http://azadrah.net/2012/03/opensource-jalali-calendar-for-android-released/
+Source Code:https://github.com/ebraminio/DroidPersianCalendar
+Issue Tracker:https://github.com/ebraminio/DroidPersianCalendar/issues
+
+Summary:View the Persian calendar
+Description:
+Persian calendar is not supported in Android so this can be used instead. Includes widgets
+.
+
+Repo Type:git
+Repo:https://github.com/ebraminio/DroidPersianCalendar.git
+
+Build Version:1.98,18,85329
+
+Update Check Mode:RepoManifest
+Current Version:1.98
+Current Version Code:18
+
diff --git a/metadata/com.colinmcdonough.android.torch.txt b/metadata/com.colinmcdonough.android.torch.txt
new file mode 100644
index 0000000000..9e7c4439df
--- /dev/null
+++ b/metadata/com.colinmcdonough.android.torch.txt
@@ -0,0 +1,19 @@
+Category:Office
+License:Apache2
+Web Site:http://code.google.com/p/torch/
+Source Code:http://code.google.com/p/torch/source/checkout
+Issue Tracker:http://code.google.com/p/torch/issues/list
+
+Summary:LED Torch
+Description:
+No description available
+.
+
+Repo Type:git-svn
+Repo:http://torch.googlecode.com/svn/trunk
+
+Build Version:0.1.2,2,14
+
+#there's a branch for ics, wait for that to go to trunk before updating next 
+Update Check Mode:None
+
diff --git a/metadata/com.determinato.feeddroid.txt b/metadata/com.determinato.feeddroid.txt
index f227af2395..e07b2b847d 100644
--- a/metadata/com.determinato.feeddroid.txt
+++ b/metadata/com.determinato.feeddroid.txt
@@ -1,7 +1,8 @@
-Disabled: Need to deal with possible trademark issues due us forking the project.
+#feeddroid project is gone so this fork can use name etc.
+Disabled:app needs some tlc
 Category:Internet
 License:GPLv3
-Web Site:http://code.google.com/p/feeddroid/
+Web Site:http://gitorious.org/feeddroid/feeddroid
 Source Code:http://gitorious.org/feeddroid/feeddroid
 Issue Tracker:
 
@@ -13,8 +14,10 @@ An RSS feed reader and podcatcher with audio and video support.
 Repo Type:git
 Repo:http://git.gitorious.org/feeddroid/feeddroid.git
 
+Build Version:1.1.1,37,db5077bf1ef792d8d5f6154198b7200a50d963df,subdir=FeedDroid
+
+#not in market
 Update Check Mode:None
-#Build Version:1.1.1,37,db5077bf1ef792d8d5f6154198b7200a50d963df,subdir=FeedDroid
 Current Version:1.1.1
 Current Version Code:37
 
diff --git a/metadata/com.drismo.txt b/metadata/com.drismo.txt
new file mode 100644
index 0000000000..a5062580b6
--- /dev/null
+++ b/metadata/com.drismo.txt
@@ -0,0 +1,22 @@
+Category:Science & Education
+License:GPLv3
+Web Site:https://github.com/jmyrland/DriSMo
+Source Code:https://github.com/jmyrland/DriSMo
+Issue Tracker:https://github.com/jmyrland/DriSMo/issues
+
+Summary:Driving feedback
+Description:
+Today’s technology already allow drivers to be guided by a GPS. To take this a step further, this app provides a system to monitor and analyze the driving quality by using the accelerometer (G-sensor) of your smartphone. This will help you determine if the driving is good or bad, helping you improving your own driving skills. Hence the name “Driving Skill Monitor” (DriSMo).
+
+The goal of this application is to emphasize the attention towards good driving quality and make the drivers aware of their own driving quality. By raising the awareness of driving quality, you can increase the quality of driving. Fuel efficiency will also be improved, as a result.
+.
+
+Repo Type:git
+Repo:https://github.com/jmyrland/DriSMo.git
+
+Build Version:1.0.3,17,9fd35,subdir=drismo,target=android-8
+
+Update Check Mode:RepoManifest
+Current Version:1.0.3
+Current Version Code:17
+
diff --git a/metadata/com.droidwave.offlinecalendar.txt b/metadata/com.droidwave.offlinecalendar.txt
index e34e838e74..afb8dd86da 100644
--- a/metadata/com.droidwave.offlinecalendar.txt
+++ b/metadata/com.droidwave.offlinecalendar.txt
@@ -1,4 +1,3 @@
-Disabled:No release available
 Category:Office
 License:MIT
 Web Site:https://bitbucket.org/giszmo/offline-calendar/overview
@@ -13,9 +12,10 @@ A calendar application.
 Repo Type:hg
 Repo:https://bitbucket.org/giszmo/offline-calendar
 
+#it builds, but not sure if this is useable: i don't dig calendars
+#Build Version:1.0,1,03be85,target=android-10
+
 Update Check Mode:Market
-#There don't seem to be any developer releases yet
-#There is now a 1.1 in the android market, but no source for it in the repository
 Current Version:1.1
 Current Version Code:2
 
diff --git a/metadata/com.episode6.android.appalarm.lite.txt b/metadata/com.episode6.android.appalarm.lite.txt
index e50b3c71b8..7be2621ef5 100644
--- a/metadata/com.episode6.android.appalarm.lite.txt
+++ b/metadata/com.episode6.android.appalarm.lite.txt
@@ -13,7 +13,7 @@ Schedule any app for anytime.
 Repo Type:git
 Repo:https://github.com/ghackett/AppAlarm
 
-Build Version:1.2.6,30,af9d89993212c67bfc510ed082381afc7abcd95a
+Build Version:1.2.6,30,af9d89993212c67bfc510ed082381afc7abcd95a,target=android-10
 
 Update Check Mode:Market
 Current Version:1.2.6
diff --git a/metadata/com.everysoft.autoanswer.txt b/metadata/com.everysoft.autoanswer.txt
index c1acab4034..9755061ee3 100644
--- a/metadata/com.everysoft.autoanswer.txt
+++ b/metadata/com.everysoft.autoanswer.txt
@@ -18,3 +18,8 @@ Build Version:1.1,2,5,target=android-8
 Build Version:1.2,3,9,target=android-8
 Build Version:1.4,5,12,target=android-8
 Build Version:1.5,6,17,target=android-8
+
+#not in market
+Update Check Mode:None
+Current Version:1.5
+Current Version:6
diff --git a/metadata/com.example.android.maxpapers.txt b/metadata/com.example.android.maxpapers.txt
index c4ba2d4713..c64360f172 100644
--- a/metadata/com.example.android.maxpapers.txt
+++ b/metadata/com.example.android.maxpapers.txt
@@ -1,4 +1,4 @@
-Category:System
+Category:Wallpaper
 License:EPL
 Web Site:http://code.google.com/p/lcarswallpaper/
 Source Code:http://code.google.com/p/lcarswallpaper/source/checkout
@@ -18,5 +18,9 @@ Build Version:1.0.2,35,35,\
 prebuild=sed -i -r 's/(android:versionName)/android:versionCode="35" \1/' \
  AndroidManifest.xml
 
+Build Version:1.1.1,46,46,\
+prebuild=sed -i -r 's/(android:versionName)/android:versionCode="46" \1/' \
+ AndroidManifest.xml
+
 Update Check Mode:None
 
diff --git a/metadata/com.github.mobile.txt b/metadata/com.github.mobile.txt
index 903b87e949..8a113e7a5e 100644
--- a/metadata/com.github.mobile.txt
+++ b/metadata/com.github.mobile.txt
@@ -5,21 +5,12 @@ Web Site:https://github.com/github/android
 Source Code:https://github.com/github/android
 Issue Tracker:https://github.com/github/android/issues
 
-Summary:GitHub Android App
+Summary:Official Github Android App
 Description:
-Official client for GitHub.
-
-GitHub is the best way to collaborate with others.
-
-Create, manage, and discuss issues and stay up to date with an integrated news feed for all your organizations, friends, and repositories.
-
-View your issues dashboard to stay connected with all the issues you've reported, been assigned, or participating in the discussion on. You can also view and filter a repository's issue list and bookmark it for quick access.
+GitHub is the best way to collaborate with others. Create, manage, and discuss issues and stay up to date with an integrated news feed for all your organizations, friends, and repositories. View your issues dashboard to stay connected with all the issues you've reported, been assigned, or participating in the discussion on. You can also view and filter a repository's issue list and bookmark it for quick access.
 
 Discover, share, and discuss code snippets using the integrated GitHub Gists support.
-
-Download the app for free and signup at http://github.com/signup for a free GitHub account.
-
-The GitHub Android app is open source, visit https://github.com/github/android to see the code, connect with the developers, and discuss future features.
+Signup at http://github.com/signup for a free GitHub account.
 .
 
 Repo Type:git
@@ -27,6 +18,7 @@ Repo:https://github.com/github/android.git
 
 Build Version:1.1,600,1.1,maven=yes,bindir=app/target
 
+#AM.xml in subdir=app
 Update Check Mode:Market
 Current Version:1.2
 Current Version Code:700
diff --git a/metadata/com.github.progval.openquote.txt b/metadata/com.github.progval.openquote.txt
new file mode 100644
index 0000000000..3e52468057
--- /dev/null
+++ b/metadata/com.github.progval.openquote.txt
@@ -0,0 +1,19 @@
+Category:Office
+License:BSD
+Web Site:https://github.com/ProgVal/OpenQuote
+Source Code:https://github.com/ProgVal/OpenQuote
+Issue Tracker:https://github.com/ProgVal/OpenQuote/issues
+
+Summary:Read quotations
+Description:
+Browse quote site, mainly French ones
+.
+
+Repo Type:git
+Repo:https://github.com/ProgVal/OpenQuote.git
+
+#non-functional
+#Build Version:1.0-rc4,4,46bc8a
+
+#Update Check Mode:RepoManifest
+
diff --git a/metadata/com.gluegadget.hndroid.txt b/metadata/com.gluegadget.hndroid.txt
index c44e7a9c4a..abc0761bd8 100644
--- a/metadata/com.gluegadget.hndroid.txt
+++ b/metadata/com.gluegadget.hndroid.txt
@@ -6,12 +6,14 @@ Issue Tracker:
 
 Summary:Hacker News Client
 Description:
-No description available
+Read and comment to stories posted on news.ycombinator.com
 .
 
-Build Version:0.2.1,3,9d49cb7564
+Repo:https://github.com/amir/HNdroid.git
+Repo Type:git
+
+Build Version:0.2.1,3,9d49cb7564,srclibs=ActionBarNW@1a98f283,extlibs=HtmlSpanner/htmlspanner-0.2.jar;htmlcleaner/htmlcleaner-2.2.jar,prebuild=sed -i 's@\(android\.library\.reference\.1=\).*@\1$$ActionBarNW$$@' project.properties,target=android-15
 
 Update Check Mode:Market
 Current Version:0.4
 Current Version Code:5
-
diff --git a/metadata/com.google.android.apps.authenticator2.txt b/metadata/com.google.android.apps.authenticator2.txt
new file mode 100644
index 0000000000..29113f0f50
--- /dev/null
+++ b/metadata/com.google.android.apps.authenticator2.txt
@@ -0,0 +1,24 @@
+Category:System
+License:Apache2
+Web Site:https://code.google.com/p/google-authenticator/
+Source Code:https://code.google.com/p/google-authenticator/source/list?repo=android
+Issue Tracker:https://code.google.com/p/google-authenticator/issues/list
+
+Summary:Two factor authentication
+Description:
+The Google Authenticator project includes implementations of one-time passcode generators for several mobile platforms, as well as a pluggable authentication module (PAM). One-time passcodes are generated using open standards developed by the Initiative for Open Authentication (OATH) (which is unrelated to OAuth).
+
+These implementations support the HMAC-Based One-time Password (HOTP) algorithm specified in RFC 4226 and the Time-based One-time Password (TOTP) algorithm specified in RFC 6238. 
+
+N.B Can be used with non-Google apps that support it , but the most common use will be to login to a Google account in a web browser
+.
+
+Repo Type:git
+Repo:https://code.google.com/p/google-authenticator.android/
+
+Build Version:2.21,21,b762c8e1ad84,target=android-15
+
+Update Check Mode:RepoManifest
+Current Version:2.21
+Current Version Code:21
+
diff --git a/metadata/com.google.android.maps.mytracks.txt b/metadata/com.google.android.maps.mytracks.txt
index 5d310f229d..69a86aa82d 100644
--- a/metadata/com.google.android.maps.mytracks.txt
+++ b/metadata/com.google.android.maps.mytracks.txt
@@ -21,6 +21,6 @@ Update Check Mode:Market
 #Build Version:1.1.3,26,62821d45032d,subdir=MyTracks,target=android-10,encoding=utf-8
 #Still doesn't build...
 #Build Version:1.1.9,22,v1.1.9,subdir=MyTracks,encoding=utf-8,target=android-13
-Current Version:1.1.13
-Current Version Code:36
+Current Version:2.0
+Current Version Code:48
 
diff --git a/metadata/com.google.android.stardroid.txt b/metadata/com.google.android.stardroid.txt
index 4e1d568fa9..da08121aff 100644
--- a/metadata/com.google.android.stardroid.txt
+++ b/metadata/com.google.android.stardroid.txt
@@ -1,4 +1,4 @@
-# libs/libGoogleAnalytics.jar
+Disabled:libs/libGoogleAnalytics.jar
 AntiFeatures:Tracking
 Category:Navigation
 License:Apache2
diff --git a/metadata/com.google.code.geobeagle.txt b/metadata/com.google.code.geobeagle.txt
index af3a165680..62adfe6b23 100644
--- a/metadata/com.google.code.geobeagle.txt
+++ b/metadata/com.google.code.geobeagle.txt
@@ -22,4 +22,4 @@ Current Version:1.4.15
 Current Version Code:206
 
 #Needs dependencies (unspecified, but at least roboguice)
-#Build Version:1.4.15,206,a868e85b7acf,subdir=trunk/GeoBeagle
+#Build Version:1.4.15,206,a868e85b7acf,subdir=trunk/GeoBeagle,extlibs=roboguice/roboguice-1.1.jar
diff --git a/metadata/com.googlecode.droidwall.txt b/metadata/com.googlecode.droidwall.txt
index 678ab7c873..590957f6b0 100644
--- a/metadata/com.googlecode.droidwall.txt
+++ b/metadata/com.googlecode.droidwall.txt
@@ -3,6 +3,7 @@ License:GPLv3
 Web Site:http://code.google.com/p/droidwall/
 Source Code:http://code.google.com/p/droidwall/source/checkout
 Issue Tracker:http://code.google.com/p/droidwall/issues/list
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=rodrigo.rosauro%40gmail%2ecom&item_name=Donate%20to%20Droidwall
 
 Summary:Firewall
 Description:
@@ -23,3 +24,6 @@ Build Version:1.5.3,153,219
 Build Version:1.5.6,156,245,target=android-8
 Build Version:1.5.7,157,246,target=android-8
 
+#in market under different name
+#no point changing as source code has disappeared
+Update Check Mode:None
diff --git a/metadata/com.googlecode.talkmyphone.txt b/metadata/com.googlecode.talkmyphone.txt
index 0dadcd27a6..f1a2d478f2 100644
--- a/metadata/com.googlecode.talkmyphone.txt
+++ b/metadata/com.googlecode.talkmyphone.txt
@@ -9,9 +9,11 @@ Description:
 Allows you to send commands to your device remotely, via the XMPP protocol.
 You can also receive information, such as incoming calls and SMS, and
 battery state.
+
+N.B. This project has been abandoned in favour of GTalkSMS but we don't have that in the repo because the source contains nonfree libraries.
 .
 
-Update Check Mode:Market
+Update Check Mode:None
 Current Version:2.06-beta
 Current Version Code:17
 
diff --git a/metadata/com.gs.mobileprint.txt b/metadata/com.gs.mobileprint.txt
new file mode 100644
index 0000000000..a88c944c10
--- /dev/null
+++ b/metadata/com.gs.mobileprint.txt
@@ -0,0 +1,19 @@
+License:GPLv3
+Web Site:http://sourceforge.net/projects/mobileprint/
+Source Code:https://mobileprint.svn.sourceforge.net/svnroot/mobileprint/
+Issue Tracker:http://sourceforge.net/p/mobileprint/tickets/
+
+Summary:Mobile Printing through a PC server.
+Description:
+Mobile printing app. Currently requires Windows XP or newer on a PC connected to a computer.
+.
+
+Repo Type:svn
+Repo:https://mobileprint.svn.sourceforge.net/svnroot/mobileprint
+
+Build Version:0.5,1,1
+
+#not in market
+Update Check Mode:None
+Current Version:0.5
+Current Version Code:1
diff --git a/metadata/com.hermit.btreprap.txt b/metadata/com.hermit.btreprap.txt
index 2fe26c8d09..708831aeba 100644
--- a/metadata/com.hermit.btreprap.txt
+++ b/metadata/com.hermit.btreprap.txt
@@ -3,7 +3,7 @@ License:CCBYSA
 Web Site:https://github.com/pipakin/Android-Bluetooth-Reprap
 Source Code:https://github.com/pipakin/Android-Bluetooth-Reprap
 Issue Tracker:https://github.com/pipakin/Android-Bluetooth-Reprap/issues
-Donate:https://flattr.com/thing/434849/Android-Bluetooth-Reprap-App
+FlattrID:434849
 
 Summary:Reprap (3D printer) controller
 Description:
diff --git a/metadata/com.hexad.bluezime.txt b/metadata/com.hexad.bluezime.txt
new file mode 100644
index 0000000000..3ce1cb1941
--- /dev/null
+++ b/metadata/com.hexad.bluezime.txt
@@ -0,0 +1,28 @@
+Category:Games
+License:LGPL
+Web Site:https://code.google.com/p/android-bluez-ime/
+Source Code:https://code.google.com/p/android-bluez-ime/source/list
+Issue Tracker:https://code.google.com/p/android-bluez-ime/issues/list
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=paypal%40hexad%2edk&item_name=BluezIME%20Donation&no_shipping=2&no_note=1&tax=0&currency_code=EUR&bn=PP%2dDonationsBF&charset=UTF%2d8
+
+Summary:Play games with bluetooth controllers
+Description:
+This application installs a new IME (soft-keyboard) that can read data from a Bluetooth input device. Among the supported devices are: Zeemote JS1, MSI Chainpus BGP100, Phonejoy and iControlPad (iCP). This is NOT a bluetooth keyboard driver, it ONLY supports the devices listed above.
+
+Analog input is supported but requires that the app you are using BluezIME with also supports it. Some of the major emulators support BluezIME analog input, setup your controller inside the emulator app instead of through the BluezIME interface if possible. If your favorite app does not support BluezIME analog input, please write the publishers and ask for it!
+
+Confirmed to work with almost all devices from HTC, Samsung and Motorola.
+
+Reported NOT working with any LG device with stock ROM:
+http://code.google.com/p/android-bluez-ime/issues/detail?id=84
+.
+
+Repo Type:git-svn
+Repo:http://android-bluez-ime.googlecode.com/svn/trunk/
+
+Build Version:1.16,17,87,subdir=BluezIME
+
+#device Variable
+Update Check Mode:None
+Current Version:1.16
+Current Version Code:17
diff --git a/metadata/com.jakebasile.android.hearingsaver.txt b/metadata/com.jakebasile.android.hearingsaver.txt
new file mode 100644
index 0000000000..f21f425692
--- /dev/null
+++ b/metadata/com.jakebasile.android.hearingsaver.txt
@@ -0,0 +1,22 @@
+Category:System
+License:Apache2
+Web Site:https://github.com/jakebasile/hearing-saver
+Source Code:https://github.com/jakebasile/hearing-saver
+Issue Tracker:https://github.com/jakebasile/hearing-saver/issues
+
+Summary:Set default volume for headsets
+Description:
+Hearing Saver operates in the background to protect your ears from high volumes through bluetooth or analogue headsets. When you first install or update this app, you MUST open it at least once! 
+
+After initial setup, Hearing Saver should work without further input from you. To setup the app, open it. You will be presented with the Setup screen. It contains a number of controls, and they each interact to allow you to customize Hearing Saver's operation. They include defaults for ringer and media, plugging and unplugging or to remember last volume.
+.
+
+Repo Type:git
+Repo:https://github.com/jakebasile/hearing-saver.git
+
+Build Version:3.0,12,48f670
+
+Update Check Mode:RepoManifest
+Current Version:3.0
+Current Version Code:12
+
diff --git a/metadata/com.jecelyin.editor.txt b/metadata/com.jecelyin.editor.txt
new file mode 100644
index 0000000000..3fed392adf
--- /dev/null
+++ b/metadata/com.jecelyin.editor.txt
@@ -0,0 +1,23 @@
+Category:System
+#if the app is going to be at the top of the list then get rid of the ugly title
+Name:920
+License:GPLv3
+Web Site:http://jecelyin.com
+Source Code:http://code.google.com/p/920-text-editor/source/checkout
+Issue Tracker:http://code.google.com/p/920-text-editor/issues/list
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=jecelyin%40gmail%2ecom&item_name=Donate%20to%20920
+
+Summary:Text Editor
+Description:
+View and edit code (even as root). Multi-tab, syntax-highlighting and more
+.
+
+Repo Type:git-svn
+Repo:http://920-text-editor.googlecode.com/svn/trunk/
+
+Build Version:12.4.25,32,17,buildjni=yes
+
+Update Check Mode:Market
+Current Version:12.4.25
+Current Version Code:32
+
diff --git a/metadata/com.jlyr.txt b/metadata/com.jlyr.txt
new file mode 100644
index 0000000000..2a9e4f68f3
--- /dev/null
+++ b/metadata/com.jlyr.txt
@@ -0,0 +1,19 @@
+Category:Multimedia
+License:GPLv3
+Web Site:http://code.google.com/p/jlyr/
+Source Code:http://code.google.com/p/jlyr/source/checkout
+Issue Tracker:http://code.google.com/p/jlyr/issues/list
+
+Summary:Get Lyrics
+Description:
+You can search for lyrics from a list of lyrics websites without leaving the app or go to popular search engines. If you have a Scrobbler installed and a music player that supports it then JLyr can detect what you are listening to and search for the lyrics automatically
+.
+
+Repo Type:git-svn
+Repo:http://jlyr.googlecode.com/svn/trunk/
+
+Build Version:1.0,1,19
+
+#not in the market
+Update Check Mode:None
+
diff --git a/metadata/com.jotabout.screeninfo.Screeninfo.txt b/metadata/com.jotabout.screeninfo.Screeninfo.txt
index 7432e5b16a..8caf9eb2a9 100644
--- a/metadata/com.jotabout.screeninfo.Screeninfo.txt
+++ b/metadata/com.jotabout.screeninfo.Screeninfo.txt
@@ -15,4 +15,6 @@ This information is useful for developers producing layouts for their Android ap
 Repo Type:git
 Repo:git://github.com/mportuesisf/ScreenInfo.git
 
-Build Version:1.0.3,103,88919ec2ce
+Build Version:1.0.3,103,88919ec2ce,target=android-15
+
+Update Check Mode:Market
diff --git a/metadata/com.kkinder.sharelocation.txt b/metadata/com.kkinder.sharelocation.txt
new file mode 100644
index 0000000000..671e5f18c4
--- /dev/null
+++ b/metadata/com.kkinder.sharelocation.txt
@@ -0,0 +1,21 @@
+AntiFeatures:NonFreeDep
+Category:Navigation
+License:MIT
+Web Site:https://bitbucket.org/kkinder/gpsshare
+Source Code:https://bitbucket.org/kkinder/gpsshare/src
+Issue Tracker:https://bitbucket.org/kkinder/gpsshare/issues
+
+Summary:Share your location
+Description:
+Share your location via any of the messaging apps you have installed
+.
+
+Repo Type:hg
+Repo:https://bitbucket.org/kkinder/gpsshare
+
+Build Version:1.4.1,141,936cada
+
+Update Check Mode:Market
+Current Version:1.4.1
+Current Version Code:141
+
diff --git a/metadata/com.kostmo.wallpaper.spiral.txt b/metadata/com.kostmo.wallpaper.spiral.txt
index acaa97892a..14748c609f 100644
--- a/metadata/com.kostmo.wallpaper.spiral.txt
+++ b/metadata/com.kostmo.wallpaper.spiral.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Category:Wallpaper
 License:Apache2
 Web Site:http://code.google.com/p/android-spiral-wallpaper/
 Source Code:http://code.google.com/p/android-spiral-wallpaper/source/checkout
@@ -13,6 +13,7 @@ Repo Type:git-svn
 Repo:http://android-spiral-wallpaper.googlecode.com/svn/trunk/
 
 Build Version:1.4,12,14,subdir=app,prebuild=mv lib libs
+Build Version:1.4.1,13,16,subdir=app
 
 Update Check Mode:Market
 Current Version:1.4.1
diff --git a/metadata/com.marv42.ebt.newnote.txt b/metadata/com.marv42.ebt.newnote.txt
index fd9676d622..9e0b14d4f4 100644
--- a/metadata/com.marv42.ebt.newnote.txt
+++ b/metadata/com.marv42.ebt.newnote.txt
@@ -26,3 +26,5 @@ Repo:http://ebt-new-note.googlecode.com/svn
 # [javac] location: class com.marv42.ebt.newnote.scanning.PictureUploader
 # [javac]                                       Keys.WSV_SHORT_TERM_STORAGE);
 Build Version:0.0.64,1,131,subdir=trunk/EbtNewNote,target=android-15,prebuild=mv lib/ libs/
+
+Update Check Mode:None
diff --git a/metadata/com.mkf.droidsat.txt b/metadata/com.mkf.droidsat.txt
new file mode 100644
index 0000000000..a18650fd19
--- /dev/null
+++ b/metadata/com.mkf.droidsat.txt
@@ -0,0 +1,20 @@
+Category:Science & Education
+License:GPLv3
+Web Site:https://code.google.com/p/droidsat
+Source Code:https://code.google.com/p/droidsat/source/list
+Issue Tracker:https://code.google.com/p/droidsat/issues/list
+
+Summary:Satellite Viewer
+Description:
+This app has a minimal interface and complicated configuration so it is more suited towards advanced users. It uses Horst Meyerdierks' Sputnik 3.1 java codebase to calculate positions of satellites. 
+.
+
+Repo Type:hg
+Repo:https://code.google.com/p/droidsat
+
+Build Version:2.43,18,7cd044,target=android-10
+
+Update Check Mode:Market
+Current Version:2.44
+Current Version Code:19
+
diff --git a/metadata/com.nightshadelabs.anotherbrowser.txt b/metadata/com.nightshadelabs.anotherbrowser.txt
new file mode 100644
index 0000000000..861150a1da
--- /dev/null
+++ b/metadata/com.nightshadelabs.anotherbrowser.txt
@@ -0,0 +1,18 @@
+Category:System
+License:GPLv3
+Web Site:https://github.com/GodsMoon/Flashify
+Source Code:https://github.com/GodsMoon/Flashify
+Issue Tracker:https://github.com/GodsMoon/Flashify/issues
+
+Summary:Open website in a different browser
+Description:
+This app simply adds a link to the browsers' share menus which, when chosen, will open the current url in the browser of your choice.
+.
+
+Repo Type:git
+Repo:https://github.com/GodsMoon/Flashify.git
+
+Build Version:1.1,2,ee2ee
+
+Update Check Mode:RepoManifest
+
diff --git a/metadata/com.nononsenseapps.notepad.txt b/metadata/com.nononsenseapps.notepad.txt
new file mode 100644
index 0000000000..de136b3aff
--- /dev/null
+++ b/metadata/com.nononsenseapps.notepad.txt
@@ -0,0 +1,22 @@
+Category:Office
+License:Apache2
+Web Site:https://github.com/spacecowboy/NotePad
+Source Code:https://github.com/spacecowboy/NotePad
+Issue Tracker:https://github.com/spacecowboy/NotePad/issues
+
+Name:Notes
+Summary:Simple notepad
+Description:
+Notepad and todo list app with a modern look
+.
+
+Repo Type:git
+Repo:https://github.com/spacecowboy/NotePad.git
+
+#impossible to find the right commit
+Build Version:3.5.4,34,80dbfc,target=android-15
+
+Update Check Mode:RepoManifest
+Current Version:3.5.4
+Current Version Code:34
+
diff --git a/metadata/com.palliser.nztides.txt b/metadata/com.palliser.nztides.txt
new file mode 100644
index 0000000000..078cf23642
--- /dev/null
+++ b/metadata/com.palliser.nztides.txt
@@ -0,0 +1,22 @@
+Category:Navigation
+License:GPLv3
+Web Site:http://code.google.com/p/nztides/
+Source Code:http://code.google.com/p/nztides/source/checkout
+Issue Tracker:http://code.google.com/p/nztides/issues/list
+
+Summary:Tide Table for New Zealand
+Description:
+Based on lookup table of official LINZ tide predictions so should be accurate.
+Transcription errors are unlikely but possible. This program shouldn't be used where life or property is at risk. Predictions run till about the end of 2013. 
+.
+
+Repo Type:git
+Repo:https://code.google.com/p/nztides/
+
+#the developer has just made a pro version. hopefully this will still work by the time it's merged
+Build Version:5,5,b5a82b,init=rm -rf ../packages,subdir=nztides_app
+
+Update Check Mode:RepoManifest
+Current Version:5
+Current Version Code:5
+
diff --git a/metadata/com.passwordmaker.txt b/metadata/com.passwordmaker.txt
index 04e50de957..7588db2eee 100644
--- a/metadata/com.passwordmaker.txt
+++ b/metadata/com.passwordmaker.txt
@@ -2,11 +2,10 @@ Category:Internet
 License:GPLv3
 Web Site:http://www.hansche.de/android/apoma/
 Source Code:http://passwordmaker.hansche.de/passwordmaker/src
-#Issue Tracker:
 
 Summary:PasswordMaker for Android
 Description:
-PasswordMaker allows users to create unique, secure passwords. For more info see passwordmaker.org. 
+PasswordMaker allows users to create and access unique, secure passwords. It is multi-platform and works by mixing the website url with unique info of your own choosing, such as a master password. The app creates an item in the share menu to quickly get at the password. For more info see passwordmaker.org. 
 .
 
 Repo Type:hg
diff --git a/metadata/com.piwi.stickeroid.txt b/metadata/com.piwi.stickeroid.txt
new file mode 100644
index 0000000000..42bb7a7d37
--- /dev/null
+++ b/metadata/com.piwi.stickeroid.txt
@@ -0,0 +1,17 @@
+Category:Office
+License:GPLv2
+Web Site:http://code.google.com/p/stickeroid/
+Source Code:http://code.google.com/p/stickeroid/source/checkout
+Issue Tracker:http://code.google.com/p/stickeroid/issues/list
+
+Summary:Stickers and cards collection manager
+Description:
+If you like collecting stickers, cards or whatever then this is an application for you. All you need is a Android-based device, and you can forget about paper and pencil troubles. 
+.
+
+Repo Type:git-svn
+Repo:http://stickeroid.googlecode.com/svn/trunk/
+
+Build Version:1.1,4,19
+Build Version:1.1.2,6,20
+
diff --git a/metadata/com.powerje.nyan.txt b/metadata/com.powerje.nyan.txt
new file mode 100644
index 0000000000..c62866d414
--- /dev/null
+++ b/metadata/com.powerje.nyan.txt
@@ -0,0 +1,21 @@
+Category:Wallpaper
+License:CCv3.0
+Web Site:https://github.com/powerje/NyanDroid
+Source Code:https://github.com/powerje/NyanDroid
+Issue Tracker:https://github.com/powerje/NyanDroid/issues
+
+Summary:Flying cat wallpaper
+Description:
+Endless, silent, flying pop-tart cat wallpaper
+.
+
+Repo Type:git
+Repo:https://github.com/powerje/NyanDroid.git
+
+#non-functional
+#Build Version:1.5,4,adaa1,target=android-10
+
+Update Check Mode:RepoManifest
+Current Version:1.5
+Current Version Code:4
+
diff --git a/metadata/com.proch.practicehub.txt b/metadata/com.proch.practicehub.txt
index b6ee89df32..29d88bd1c8 100644
--- a/metadata/com.proch.practicehub.txt
+++ b/metadata/com.proch.practicehub.txt
@@ -14,6 +14,8 @@ Repo Type:git
 Repo:https://code.google.com/p/music-practice-tools/
 
 Build Version:1.0,1,109c0bddf346
+#scanner caught something
+#Build Version:2.0,2,6e1c575b30d7
 
 Update Check Mode:Market
 Current Version:2.0
diff --git a/metadata/com.qubling.sidekick.txt b/metadata/com.qubling.sidekick.txt
new file mode 100644
index 0000000000..c157764297
--- /dev/null
+++ b/metadata/com.qubling.sidekick.txt
@@ -0,0 +1,24 @@
+Category:System
+License:Artistic2
+Web Site:https://github.com/zostay/CPAN-Sidekick
+Source Code:https://github.com/zostay/CPAN-Sidekick
+Issue Tracker:https://github.com/zostay/CPAN-Sidekick/issues
+
+Summary:CPAN browser
+Description:
+Every super Perl developer needs a sidekick.
+
+Ask a Perl developer what her favorite feature of the language is and chances are good that the answer is CPAN. CPAN Sidekick brings all the great information and documentation of the Comprehensive Perl Archive Network to your Android phone.
+.
+
+Repo Type:git
+Repo:https://github.com/zostay/CPAN-Sidekick.git
+
+#may not work with this target, maybe better use 11
+Build Version:0.4.3,11,c9271,target=android-15
+
+#version name in res/
+Update Check Mode:Market
+Current Version:0.4.3
+Current Version Code:11
+
diff --git a/metadata/com.roozen.SoundManager.txt b/metadata/com.roozen.SoundManager.txt
index 1a411328c9..23d72f60e3 100644
--- a/metadata/com.roozen.SoundManager.txt
+++ b/metadata/com.roozen.SoundManager.txt
@@ -17,9 +17,10 @@ Repo:http://app-soundmanager.googlecode.com/svn/tags/
 
 Build Version:2.0.0,18,127,subdir=SoundManager-2.0.0,target=android-8,fixapos=yes
 #Missing resources....
-#Build Version:2.1.0,19,156,subdir=SoundManager-2.0.0,target=android-8,fixapos=yes # release candidate since last april
+#release candidate since last april
+#Build Version:2.1.0,19,156,subdir=SoundManager-2.0.0,target=android-8,fixapos=yes
 
-Update Check Mode:Market
-Current Version:2.0.0
-Current Version Code:18
+Update Check Mode:None
+Current Version:2.1.0
+Current Version Code:19
 
diff --git a/metadata/com.saibotd.bitbeaker.txt b/metadata/com.saibotd.bitbeaker.txt
new file mode 100644
index 0000000000..b783710a1a
--- /dev/null
+++ b/metadata/com.saibotd.bitbeaker.txt
@@ -0,0 +1,21 @@
+Category:System
+License:Apache2
+Web Site:https://bitbucket.org/saibotd/bitbeaker
+Source Code:https://bitbucket.org/saibotd/bitbeaker/src
+Issue Tracker:https://bitbucket.org/saibotd/bitbeaker/issues
+
+Summary:Bitbucket app
+Description:
+Bitbucket.org is a site that hosts code in git and hg (mercurial) repositories
+.
+
+Repo Type:hg
+Repo:https://bitbucket.org/saibotd/bitbeaker
+
+#again i have no idea what the prebuild command does, but it works
+Build Version:2.1,11,b156ba,srclibs=ActionBarSherlock@6e3f2bb5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Update Check Mode:Market
+Current Version:2.1
+Current Version Code:11
+
diff --git a/metadata/com.sam.hex.txt b/metadata/com.sam.hex.txt
new file mode 100644
index 0000000000..188d162bbd
--- /dev/null
+++ b/metadata/com.sam.hex.txt
@@ -0,0 +1,17 @@
+Category:Games
+License:NCSA
+Web Site:https://xlythe.github.com/HexGame_Android
+Source Code:https://github.com/Xlythe/HexGame_Android
+Issue Tracker:https://github.com/Xlythe/HexGame_Android/issues
+
+Summary:Two-player game
+Description:
+Hex is a simple board game where two players race to connect their sides of the board. The winner is the first to build a solid path connecting their two sides.
+.
+
+Repo Type:git
+Repo:https://github.com/Xlythe/HexGame_Android.git
+
+Build Version:2.2,13,900717,target=android-15
+
+Update Check Mode:RepoManifest
diff --git a/metadata/com.seavenois.tetris.txt b/metadata/com.seavenois.tetris.txt
index 9f24417814..d254daf606 100644
--- a/metadata/com.seavenois.tetris.txt
+++ b/metadata/com.seavenois.tetris.txt
@@ -14,3 +14,6 @@ Repo Type:git-svn
 Repo:http://tttris.googlecode.com/svn/trunk/
 
 Build Version:0.8-beta,1,32
+Build Version:0.9-beta,3,44
+
+Update Check Mode:Market
diff --git a/metadata/com.showmehills.txt b/metadata/com.showmehills.txt
index f6b6cf2126..5c16af9666 100644
--- a/metadata/com.showmehills.txt
+++ b/metadata/com.showmehills.txt
@@ -24,7 +24,7 @@ echo "sdk.dir=$$SDK$$" >../ShowMeX/local.properties
 
 #Note that 0.17 will either need acra.disabled patching to be true by default, or
 #the appropriate AntiFeature flag adding.
+
 Update Check Mode:Market
 Current Version:0.20
 Current Version Code:20
-
diff --git a/metadata/com.shurik.droidzebra.txt b/metadata/com.shurik.droidzebra.txt
new file mode 100644
index 0000000000..939e9389d0
--- /dev/null
+++ b/metadata/com.shurik.droidzebra.txt
@@ -0,0 +1,24 @@
+Category:Games
+License:GPLv3
+Web Site:http://code.google.com/p/droidzebra/
+Source Code:http://code.google.com/p/droidzebra/source/checkout
+Issue Tracker:http://code.google.com/p/droidzebra/issues/list
+Donate:http://droidzebra.appspot.com/droidzebra/donate
+
+Summary:Reversii game
+Description:
+DroidZebra is advanced Reversi program based on Zebra Othello Engine written by Gunnar Andersson. Features:
+- difficulty levels from beginner (practice mode) to world-class play
+- opening book with more than 500,000 positions
+- unlimited undo
+.
+
+Repo Type:git
+Repo:https://code.google.com/p/droidzebra/
+
+Build Version:1.4,10,1e08eec,subdir=project,buildjni=yes
+
+Update Check Mode:RepoManifest
+Current Version:1.4.1
+Current Version Code:12
+
diff --git a/metadata/com.sinpo.xnfc.txt b/metadata/com.sinpo.xnfc.txt
new file mode 100644
index 0000000000..63ab2d4944
--- /dev/null
+++ b/metadata/com.sinpo.xnfc.txt
@@ -0,0 +1,22 @@
+Category:Office
+License:GPLv3
+Web Site:http://code.google.com/p/nfcard/
+Source Code:http://code.google.com/p/nfcard/source/checkout
+Issue Tracker:http://code.google.com/p/nfcard/issues/list
+
+Summary:Read info from cards
+Description:
+Nfcard can read contactless ic card using NFC sensor. Supports a range of iso7816-3 / iso15693 / felicia compliant e-wallet / RFID cards, and can be extended to support many specific data protocol, e.g. pboc2.0 of china. nfcard can read information like balance of account, transaction log, etc. from these cards
+nfcard程序使用android机器的NFC传感器读取非接触式IC卡，电子标签（如公交卡，银行卡，图书馆射频标贴等）。
+支持符合iso7816-3 / iso15693 / felicia等国际标准的卡片，并且可以扩充支持一些专门标准（如中国的pboc2.0）
+nfcard程序可以用来读取电子钱包（主要是公交卡）中未加密的余额，交易记录，电子标签中的标识等信息。
+使用模块化设计，方便扩充支持特殊的卡片协议和指令。
+.
+
+Repo Type:git-svn
+Repo:http://nfcard.googlecode.com/svn/trunk/
+
+Build Version:1.2.120228,1,12,subdir=nfcard,target=android-15
+
+Update Check Mode:Market
+
diff --git a/metadata/com.teleca.jamendo.txt b/metadata/com.teleca.jamendo.txt
index 8439456c1d..936cb39a2d 100644
--- a/metadata/com.teleca.jamendo.txt
+++ b/metadata/com.teleca.jamendo.txt
@@ -19,7 +19,8 @@ Build Version:1.0.2 [BETA],33,!No source in repo
 Build Version:1.0.3 [BETA],34,!No source in repo
 Build Version:1.0.4 [BETA],35,63dceec70d59132b6311289c62edd0acb795ab27,target=android-11
 
-Update Check Mode:Market
+#Device variable
+Update Check Mode:None
 Current Version:1.0.4 [BETA]
 Current Version Code:35
 
diff --git a/metadata/com.textuality.lifesaver2.txt b/metadata/com.textuality.lifesaver2.txt
index bf4b32fbb0..fa85250828 100644
--- a/metadata/com.textuality.lifesaver2.txt
+++ b/metadata/com.textuality.lifesaver2.txt
@@ -9,6 +9,12 @@ Description:
 A simple way to transfer  your SMS and call logs to another phone via a Google App-Engine server.
 .
 
+Repo Type:git-svn
+Repo:http://lifesaver.googlecode.com/svn/trunk/
+
+#doesn't build
+#Build Version:2.0,4,23
+
 Update Check Mode:Market
 Current Version:2.1
 Current Version Code:5
diff --git a/metadata/com.tj.qotd.txt b/metadata/com.tj.qotd.txt
deleted file mode 100644
index 315c964937..0000000000
--- a/metadata/com.tj.qotd.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Disabled:Can't identify release
-Category:Games
-License:Unknown
-Web Site:https://github.com/thibault/OpenQOTD
-Source Code:https://github.com/thibault/OpenQOTD
-Issue Tracker:https://github.com/thibault/OpenQOTD/issues
-
-Summary:Widget to display random quotes
-Description:
-A simple widget that displays random quotes in English or French.
-.
-
-Repo Type:git
-Repo:https://github.com/thibault/OpenQOTD.git
-
-Update Check Mode:Market
-Current Version:1.0.1
-Current Version Code:2
-
diff --git a/metadata/com.totsp.crossword.shortyz.txt b/metadata/com.totsp.crossword.shortyz.txt
index b1d3bae1ea..c5f56ce291 100644
--- a/metadata/com.totsp.crossword.shortyz.txt
+++ b/metadata/com.totsp.crossword.shortyz.txt
@@ -17,6 +17,9 @@ Build Version:3.1.0,30100,1ce970a00083,subdir=shortyz,target=android-11,prebuild
 	cd ../shortyz
 Build Version:3.1.7,30107,!No source code apparently
 
+#don't have maven to check
+#Build Version:3.2.1,30201,0aa74b9d2bef
+
 Update Check Mode:Market
 Current Version:3.2.7
 Current Version Code:30207
diff --git a/metadata/com.tum.yahtzee.txt b/metadata/com.tum.yahtzee.txt
new file mode 100644
index 0000000000..fb66ac9f9d
--- /dev/null
+++ b/metadata/com.tum.yahtzee.txt
@@ -0,0 +1,19 @@
+Category:Games
+License:GPLv3
+Web Site:https://github.com/MichaelE1000/yahtzee4android
+Source Code:https://github.com/MichaelE1000/yahtzee4android
+Issue Tracker:https://github.com/MichaelE1000/yahtzee4android/issues
+
+Summary:Yahtzee/Kniffle game
+Description:
+.
+
+Repo Type:git
+Repo:https://github.com/MichaelE1000/yahtzee4android.git
+
+Build Version:1.0,1,aa4443
+
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/com.unitedcoders.android.gpodroid.txt b/metadata/com.unitedcoders.android.gpodroid.txt
index b03051f1d4..766eced19f 100644
--- a/metadata/com.unitedcoders.android.gpodroid.txt
+++ b/metadata/com.unitedcoders.android.gpodroid.txt
@@ -6,13 +6,16 @@ Issue Tracker:https://github.com/gpodder/GpodRoid/issues
 
 Summary:Podcasting client
 Description:
-A gpodder.net podcasting client.
+At gpodder.net you can manage your podcast subscriptions easily. This app can connect to you account to serve you podcasts
 .
 
 Repo Type:git
 Repo:git://github.com/gpodder/GpodRoid.git
 
+#barely functional, disable?
 Build Version:0.4.7,12,0.4.7,target=android-7,prebuild=mv jars libs
 
-Update Check Mode:Market
+Update Check Mode:RepoManifest
+Current Version:0.4.6
+Current Version Code:11
 
diff --git a/metadata/com.zoffcc.applications.zanavi.txt b/metadata/com.zoffcc.applications.zanavi.txt
index 059d8e4239..d7786752d7 100644
--- a/metadata/com.zoffcc.applications.zanavi.txt
+++ b/metadata/com.zoffcc.applications.zanavi.txt
@@ -28,5 +28,3 @@ Update Check Mode:Market
 Current Version:2.0.0
 Current Version Code:200
 
-#......
-#Build Version:1.0.52
diff --git a/metadata/cx.hell.android.pdfview.txt b/metadata/cx.hell.android.pdfview.txt
index 5e9129991b..7e12c09bca 100644
--- a/metadata/cx.hell.android.pdfview.txt
+++ b/metadata/cx.hell.android.pdfview.txt
@@ -24,6 +24,9 @@ Repo Type:hg
 Repo:https://code.google.com/p/apv/
 
 Build Version:0.3.2,32000,ff030f8b49e6,subdir=pdfview,buildjni=yes,patch=fdroid-ndk-build.patch,prebuild=scripts/build-native.sh
+#syntax error in script n.b last digit of version code corresponds to arch build
+#Build Version:0.3.3dev01,33010,57eb20,subdir=pdfview,prebuild=python2.7 ./scripts/pjpp.py --configuration pro
+
 
 Update Check Mode:Market
 Current Version:0.3.0
diff --git a/metadata/de.antonwolf.agendawidget.txt b/metadata/de.antonwolf.agendawidget.txt
new file mode 100644
index 0000000000..1aff1400c1
--- /dev/null
+++ b/metadata/de.antonwolf.agendawidget.txt
@@ -0,0 +1,20 @@
+Category:Office
+License:MIT
+Web Site:http://code.google.com/p/antons-apps/
+Source Code:http://code.google.com/p/antons-apps/source/checkout
+Issue Tracker:http://code.google.com/p/antons-apps/issues/list
+
+Summary:Calendar Widget
+Description:
+Display agenda from the calendar on your homescreen
+.
+
+Repo Type:git-svn
+Repo:http://antons-apps.googlecode.com/svn/trunk/
+
+Build Version:1.7.0,22,110
+
+Update Check Mode:Market
+Current Version:1.7.1
+Current Version Code:23
+
diff --git a/metadata/de.danoeh.antennapod.txt b/metadata/de.danoeh.antennapod.txt
new file mode 100644
index 0000000000..7e72633fac
--- /dev/null
+++ b/metadata/de.danoeh.antennapod.txt
@@ -0,0 +1,17 @@
+License:MIT
+Web Site:https://github.com/danieloeh/AntennaPod
+Source Code:https://github.com/danieloeh/AntennaPod
+Issue Tracker:https://github.com/danieloeh/AntennaPod/issues
+
+Summary:Podcatcher
+Description:
+AntennaPod is a podcast manager for Android 2.3.3 and above. It offers all the basic features you expect from a podcatcher, like streaming and downloading episodes, refreshing all feeds automatically or adding them to a queue to listen to them later.
+
+AntennaPod is still in beta and might lack some advanced features or have bugs.
+.
+
+Repo Type:git
+Repo:https://github.com/danieloeh/AntennaPod.git
+
+#needs android-viewpageindicator
+#Build Version:0.9.2,7,d8d055cf24f09084b326510c1276fb04ab977fc5,srclibs=ActionBarSherlock@6e3f2bb5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
diff --git a/metadata/de.mbutscher.wikiandpad.alphabeta.txt b/metadata/de.mbutscher.wikiandpad.alphabeta.txt
new file mode 100644
index 0000000000..7af9f3fe03
--- /dev/null
+++ b/metadata/de.mbutscher.wikiandpad.alphabeta.txt
@@ -0,0 +1,20 @@
+Category:Office
+License:BSD New
+Web Site:http://wikidpad.sourceforge.net/WikiAndPad.html
+Source Code:http://svnandroid.wikidpad2.webfactional.com/
+Issue Tracker:http://groups.yahoo.com/group/WikiAndPad/
+Donate:http://sourceforge.net/donate/index.php?user_id=483683
+
+Summary:WikidPad for Android
+Description:
+WikidPad is a Wiki-like notebook for storing your thoughts, ideas, todo lists, contacts, or anything else you can think of to write down. It is Open Source and available for Windows (binary installer) and Linux and Mac OS (as Python source). You can clip snippets from a browser, syntax-highlight wiki words and search notes. This app is in the early stages of development but is (in the editor's experience) quite stable. WikidAndPad uses text files indexed by a database stored on your sdcard, but it is currently not possible to create the database from within the app. First, you must create the database of the type Original Sqlite within WikidPad on the desktop and copy it to your sdcard.
+.
+
+Repo Type:git-svn
+Repo:http://svnandroid.wikidpad2.webfactional.com/trunk
+
+Build Version:0.2alpha02,200200,17,target=android-10
+
+Update Check Mode:None
+Current Version:0.2alpha02
+Current Version Code:200200
diff --git a/metadata/de.schildbach.wallet.txt b/metadata/de.schildbach.wallet.txt
index 31e73be264..a39fb53739 100644
--- a/metadata/de.schildbach.wallet.txt
+++ b/metadata/de.schildbach.wallet.txt
@@ -48,6 +48,6 @@ mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3
 mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
 
 Update Check Mode:RepoManifest
-Current Version:2.16
-Current Version Code:87
+Current Version:2.20
+Current Version Code:91
 
diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt
index 92fe0cfbb0..ecbcf97ec3 100644
--- a/metadata/de.schildbach.wallet_test.txt
+++ b/metadata/de.schildbach.wallet_test.txt
@@ -4,6 +4,7 @@ Web Site:http://code.google.com/p/bitcoin-wallet/
 Source Code:http://code.google.com/p/bitcoin-wallet/source/checkout
 Issue Tracker:http://code.google.com/p/bitcoin-wallet/issues/list
 
+Name:Bitcoin Wallet Test
 Summary:Bitcoin Wallet Test
 Description:
 A bitcoin wallet, allowing you to store, send and receive bitcoins on your
@@ -39,6 +40,8 @@ cd ../integration-android && mvn3 install && cd ../wallet && \
 mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
 mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
 
+Build Version:2.20_test,91,197963d9a457 ## new version of BitcoinJWallet. 
+
 Update Check Mode:RepoManifest
 Current Version:2.21_test
 Current Version Code:92
diff --git a/metadata/de.shandschuh.sparserss.txt b/metadata/de.shandschuh.sparserss.txt
index e40dcf9c52..6c5f93d0ce 100644
--- a/metadata/de.shandschuh.sparserss.txt
+++ b/metadata/de.shandschuh.sparserss.txt
@@ -32,7 +32,7 @@ Build Version:1.4.1,78,65bb8ffda0c0,target=android-10
 Build Version:1.4.2_2,80,91dc1cc9b5d8,target=android-15
 Build Version:1.5.1,82,f0ed84016848,target=android-15
 Build Version:1.5.2,83,52b1faf748f3,target=android-15
-Build Version:1.6.2,86,eb3283a03b1f
+Build Version:1.6.2,86,eb3283a03b1f,target=android-15
 
 Update Check Mode:RepoManifest
 Current Version:1.6.2
diff --git a/metadata/dk.andsen.asqlitemanager.txt b/metadata/dk.andsen.asqlitemanager.txt
index d2d15a458f..18cfa2ca8b 100644
--- a/metadata/dk.andsen.asqlitemanager.txt
+++ b/metadata/dk.andsen.asqlitemanager.txt
@@ -3,13 +3,14 @@ License:EUPL
 Web Site:http://aaa.andsen.dk/aSQLiteManager.html
 Source Code:http://sourceforge.net/scm/?type=svn&group_id=362274
 Issue Tracker:http://sourceforge.net/tracker/?group_id=362274
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=matin.andsen%40gmail%2ecom&item_name=Donate%20to%20aSqlite
 
 Summary:SQLite (small database) Frontend
 Description:
-Front end allowing management of SQLite databases.
+Front end allowing management of SQLite databases. These are very commonly used by apps to store settings in the /data directory, but you would need root access to move them to a location that this app can edit them from. If you try to enter that directory with this app's file manager it suggests you install aShell to do it directly, but we don't have that in the repo as it is not FOSS
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:https://asqlitemanager.svn.sourceforge.net/svnroot/asqlitemanager
 
 Build Version:2.6,7,190,subdir=aSQLiteManager
@@ -18,6 +19,7 @@ Build Version:3.0,10,211,subdir=aSQLiteManager,target=android-10
 Build Version:3.1,11,227,subdir=aSQLiteManager,target=android-10
 Build Version:3.2,12,236,subdir=aSQLiteManager,target=android-10
 Build Version:3.3,13,241,subdir=aSQLiteManager,target=android-10
+Build Version:3.3.1,14,243,subdir=aSQLiteManager,target=android-15
 
 Update Check Mode:Market
 Current Version:3.3.1
diff --git a/metadata/es.prodevelop.gvsig.mini.txt b/metadata/es.prodevelop.gvsig.mini.txt
index 6b77a17567..6f55e1b31a 100644
--- a/metadata/es.prodevelop.gvsig.mini.txt
+++ b/metadata/es.prodevelop.gvsig.mini.txt
@@ -9,10 +9,14 @@ Description:
 A tile-based map viewer with support for maps from many sources.
 .
 
-## it has been reported that v2.0 which is starred is not the stable version, v1.2.2 is
-## i don't know how to mark the stable version
 
-Update Check Mode:Market
-Current Version:1.2.3
+Repo Type:git-svn
+Repo:https://svn.prodevelop.es/public/gvsigmini/gvsig_mini_android/trunk/
+
+#cannot obtain source. besides i'm not sure about revisions
+#Build Version:1.2.0,443,1332
+
+Update Check Mode:None
+Current Version:1.2.2
 Current Version Code:457
 
diff --git a/metadata/faenza.adw.theme.txt b/metadata/faenza.adw.theme.txt
new file mode 100644
index 0000000000..ae5057142b
--- /dev/null
+++ b/metadata/faenza.adw.theme.txt
@@ -0,0 +1,15 @@
+Category:System
+License:GPLv3
+Web Site:https://code.google.com/p/faenza-adw-theme/
+Source Code:https://code.google.com/p/faenza-adw-theme/source/list
+
+Summary:ADW theme
+Description:
+Theme based on the Faenza set
+.
+
+Repo Type:git-svn
+Repo:http://faenza-adw-theme.googlecode.com/svn/trunk/
+
+#should build:didn't try
+#Build Version:1,1.0,1
diff --git a/metadata/info.guardianproject.browser.txt b/metadata/info.guardianproject.browser.txt
index 8e0dd683b4..1e03f4bc36 100644
--- a/metadata/info.guardianproject.browser.txt
+++ b/metadata/info.guardianproject.browser.txt
@@ -13,7 +13,7 @@ Repo Type:git
 Repo:git://github.com/guardianproject/Orweb.git
 
 Build Version:0.2.2,3,460a5a92bc5a426f7ff710f03bc1341359a17d4b
-Build Version:0.4.2,15,!No source code
+Build Version:0.4.2,15,3cab65406614bb43ce65133cda731f80939b3b5c
 
 Update Check Mode:Market
 Current Version:0.4.2
diff --git a/metadata/info.guardianproject.otr.app.im.txt b/metadata/info.guardianproject.otr.app.im.txt
index 5b8d1a7b24..ca8b8dae74 100644
--- a/metadata/info.guardianproject.otr.app.im.txt
+++ b/metadata/info.guardianproject.otr.app.im.txt
@@ -16,6 +16,7 @@ Repo:https://github.com/guardianproject/Gibberbot.git
 
 Build Version:0.0.7-RC1,25,e17dbbcf338af00466cabc5178634cd0d5ffded8,target=android-4
 Build Version:0.0.8-FINAL,31,e4b49ca9508477564c2cba4cfe2821b270281218,target=android-11
+Build Version:0.0.9-RC3,34,9311f2ebdcf06660fa4f145a1c2d88b6b15341f3,target=android-15
 
 Update Check Mode:Market
 Current Version:0.0.9-RC4
diff --git a/metadata/info.staticfree.android.robotfindskitten.txt b/metadata/info.staticfree.android.robotfindskitten.txt
new file mode 100644
index 0000000000..87f6d3aba8
--- /dev/null
+++ b/metadata/info.staticfree.android.robotfindskitten.txt
@@ -0,0 +1,17 @@
+Category:Game
+License:GPLv3
+Web Site:http://staticfree.info/projects/rfk/
+Source Code:http://staticfree.info/git/robotfindskitten/
+FlattrID:633876
+
+Summary:A retro Zen simulation
+Description:
+You are the robot and your goal is to find the kitten
+.
+
+Repo Type:git
+Repo:git://staticfree.info/git/robotfindskitten/
+
+Build Version:0.9.406,6,0e2f7ec02268397073d82b1b69a9fac13b634650
+
+Update Check Mode:None
diff --git a/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt b/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
index 5677729cdd..a1f3ca0197 100644
--- a/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
+++ b/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
@@ -18,3 +18,5 @@ Current Version Code:410044
 
 #Build problems
 #Build Version:1.19,410044,1370e4cfe884,subdir=AmpacheProvider
+
+Update Check Mode:Market
diff --git a/metadata/jp.co.kayo.android.localplayer.ds.podcast.txt b/metadata/jp.co.kayo.android.localplayer.ds.podcast.txt
index 32ba90ad81..bf419c8466 100644
--- a/metadata/jp.co.kayo.android.localplayer.ds.podcast.txt
+++ b/metadata/jp.co.kayo.android.localplayer.ds.podcast.txt
@@ -15,3 +15,5 @@ Repo:https://bitbucket.org/yokmama/just-player-providers.git
 
 #Build problems
 #Build Version:1.1a,1010008,1370e4cfe884,subdir=PodcastProvider
+
+Update Check Mode:Market
diff --git a/metadata/jp.co.kayo.android.localplayer.txt b/metadata/jp.co.kayo.android.localplayer.txt
index 323cae4a6d..a560aa6881 100644
--- a/metadata/jp.co.kayo.android.localplayer.txt
+++ b/metadata/jp.co.kayo.android.localplayer.txt
@@ -15,3 +15,6 @@ Repo:https://bitbucket.org/yokmama/just-player.git
 
 #Build problems
 #Build Version:3.12d,141400247,ad3c639598fa
+
+#device variable
+Update Check Mode:None
diff --git a/metadata/jp.sblo.pandora.jota.txt b/metadata/jp.sblo.pandora.jota.txt
index a31feb0772..31b633be70 100644
--- a/metadata/jp.sblo.pandora.jota.txt
+++ b/metadata/jp.sblo.pandora.jota.txt
@@ -21,4 +21,3 @@ Build Version:0.2.13,63,113,buildjni=yes,target=android-11
 Update Check Mode:Market
 Current Version:0.2.26
 Current Version Code:76
-
diff --git a/metadata/kdk.android.simplydo.txt b/metadata/kdk.android.simplydo.txt
index fbed1669ec..ccc7ec5301 100644
--- a/metadata/kdk.android.simplydo.txt
+++ b/metadata/kdk.android.simplydo.txt
@@ -13,3 +13,9 @@ Repo Type:git-svn
 Repo:http://simply-do.googlecode.com/svn/trunk/
 
 Build Version:0.9.1,1,18,subdir=simply-do-app
+
+#not in market,yet
+Update Check Mode:None
+Current Version:1.9.1
+Current Version Code:1
+
diff --git a/metadata/li.klass.fhem.txt b/metadata/li.klass.fhem.txt
index 5deac98f3b..2a8f163683 100644
--- a/metadata/li.klass.fhem.txt
+++ b/metadata/li.klass.fhem.txt
@@ -19,7 +19,7 @@ Build Version:1.5.0,51,b7dbf11a18ca66f20e2489d2904773689b2bc24a,init=rm ant.prop
 Build Version:1.5.8,58,19ebe524d48630db88c28d44872e5cbc84c885d6,init=rm ant.properties,srclibs=ActionBarSherlock@436230d,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 Build Version:1.7.0,70,!0de6e6f but now has proprietary software
 
-Update Check Mode:RepoManifest
-Current Version:1.7.0
-Current Version Code:70
+Update Check Mode:Market
+Current Version:1.8.2
+Current Version Code:82
 
diff --git a/metadata/me.guillaumin.android.osmtracker.txt b/metadata/me.guillaumin.android.osmtracker.txt
index 24db62156c..dd4c23f56e 100644
--- a/metadata/me.guillaumin.android.osmtracker.txt
+++ b/metadata/me.guillaumin.android.osmtracker.txt
@@ -19,6 +19,7 @@ Repo:https://github.com/nguillaumin/osmtracker-android.git
 
 Build Version:0.5.6,21,0.5.6,target=android-8
 Build Version:0.5.7,22,eac27c8a37066988f784cbc2ad7e7a2ab0326839,target=android-8
+Build Version:0.5.8,23,623453d4f0,target=android-8
 
 Update Check Mode:Market
 Current Version:0.6.2
diff --git a/metadata/me.kuehle.carreport.txt b/metadata/me.kuehle.carreport.txt
new file mode 100644
index 0000000000..9f321cdbde
--- /dev/null
+++ b/metadata/me.kuehle.carreport.txt
@@ -0,0 +1,18 @@
+Category:Navigation
+License:Apache2
+Web Site:https://bitbucket.org/frigus02/car-report/
+Source Code:https://bitbucket.org/frigus02/car-report/src
+Issue Tracker:https://bitbucket.org/frigus02/car-report/issues
+
+Summary:Track your car costs
+Description:
+.
+
+Repo Type:git
+Repo:https://bitbucket.org/frigus02/car-report.git
+
+Build Version:1.6,8,fff5eac,subdir=CarReport
+
+#version in strings.xml and can't find version code on market
+Update Check Mode:None
+
diff --git a/metadata/mobi.cyann.nstools.txt b/metadata/mobi.cyann.nstools.txt
index 1e5db2676d..651c5321e6 100644
--- a/metadata/mobi.cyann.nstools.txt
+++ b/metadata/mobi.cyann.nstools.txt
@@ -16,5 +16,4 @@ Update Check Mode:Market
 Current Version:1.16
 Current Version Code:20
 
-#Missing dependencies, should be easy to solve, they are already in our extlib
-#Build Version:1.16,20,caa8eec7
+Build Version:1.16,20,caa8eec7,extlibs=android/android-support-v4.jar
diff --git a/metadata/net.bible.android.activity.txt b/metadata/net.bible.android.activity.txt
new file mode 100644
index 0000000000..e063e90b57
--- /dev/null
+++ b/metadata/net.bible.android.activity.txt
@@ -0,0 +1,23 @@
+License:LGPL
+Web Site:http://code.google.com/p/and-bible/
+Source Code:https://github.com/mjdenham/and-bible
+Issue Tracker:https://code.google.com/p/and-bible/issues/list
+
+Summary:Offline Bible, commentaries and dictionaries reader.
+Description:
+Read the bible and refer to commentaries wherever you are:
+over 40 English versions of the bible including ESV, KJV and NET
+totally offline after initial downloads
+the bible in over 50 different languages - Swedish, Hungarian, Chinese, Russian and many more
+26 commentaries
+uses the JSword engine from CrossWire
+user interface translated into many different languages
+the code is open source so you can see how it works and improve it
+you can add more bibles to the list via the CrossWire site
+free to you with no ads or nags 
+.
+
+Repo Type:git
+Repo:https://github.com/mjdenham/and-bible.git
+
+Build Version:1.5.5,79,7d7e23e88da2ea9ce598fc6c454e52b508d70c48,subdir=AndBible,target=android-8
diff --git a/metadata/net.dahanne.android.regalandroid.txt b/metadata/net.dahanne.android.regalandroid.txt
index fca67dd30e..4352f6c998 100644
--- a/metadata/net.dahanne.android.regalandroid.txt
+++ b/metadata/net.dahanne.android.regalandroid.txt
@@ -3,6 +3,7 @@ License:GPLv3
 Web Site:http://code.google.com/p/regalandroid/
 Source Code:https://github.com/anthonydahanne/ReGalAndroid
 Issue Tracker:http://code.google.com/p/regalandroid/issues/list
+FlattrID:93967
 
 Summary:Gallery client for G2/3 and Piwigo
 Description:
@@ -10,7 +11,13 @@ A gallery client with support for G2 and G3 (also known as Menalto Gallery) and
 Piwigo.
 .
 
-Update Check Mode:Market
-Current Version:1.1.2
-Current Version Code:5
+Repo Type:git
+Repo:git://github.com/anthonydahanne/ReGalAndroid.git
 
+#Doesn't build, but I didn't try very hard
+#Build Version:1.2.0,5,f78d420f47da140dbd28bc2d831ea80f9f903e68,subdir=regalandroid
+
+#market is far behind
+Update Check Mode:None
+Current Version:1.2.0
+Current Version Code:5
diff --git a/metadata/net.exclaimindustries.geohashandroid.txt b/metadata/net.exclaimindustries.geohashandroid.txt
index 906e0d8dcf..5f43db25f7 100644
--- a/metadata/net.exclaimindustries.geohashandroid.txt
+++ b/metadata/net.exclaimindustries.geohashandroid.txt
@@ -20,3 +20,5 @@ Repo Type:git
 Repo:https://code.google.com/p/geohashdroid/
 
 Build Version:0.7.17,702,b82c9dc6f747
+
+Update Check Mode:Market
diff --git a/metadata/net.gaast.giggity.txt b/metadata/net.gaast.giggity.txt
index 5298d9031a..a74045d753 100644
--- a/metadata/net.gaast.giggity.txt
+++ b/metadata/net.gaast.giggity.txt
@@ -18,7 +18,9 @@ Build Version:0.8.1,4,133
 Build Version:0.9.8,16,238
 Build Version:0.9.9,17,!No source in repo
 
-Update Check Mode:Market
+#device variable
+##no source code either
+Update Check Mode:None
 Current Version:0.9.9
 Current Version Code:17
 
diff --git a/metadata/net.georgewhiteside.android.abstractart.txt b/metadata/net.georgewhiteside.android.abstractart.txt
new file mode 100644
index 0000000000..95ddcd055a
--- /dev/null
+++ b/metadata/net.georgewhiteside.android.abstractart.txt
@@ -0,0 +1,20 @@
+Category:Wallpaper
+License:GPLv3
+Web Site:https://github.com/gwhiteside/abstract-art
+Source Code:https://github.com/gwhiteside/abstract-art
+Issue Tracker:https://github.com/gwhiteside/abstract-art/issues
+
+Summary:Live Wallpaper
+Description:
+This live wallpaper recreates the hypnotic tripped-out visuals featured in the cult classic SNES game Earthbound (Mother 2). Even if you’ve never heard of it, these animated wallpapers stand on their own. With the hundreds of backgrounds available in this tiny < 300kB package, you practically can’t afford not to download it! Equip it now to give your device sweet visuals with low power consumption, and be the first person on your street with a totally boss wallpaper that doesn’t bust the battery.
+.
+
+Repo Type:git
+Repo:https://github.com/gwhiteside/abstract-art.git
+
+Build Version:1.0.0,15,da9f0
+
+Update Check Mode:RepoManifest
+Current Version:1.0.0
+Current Version Code:15
+
diff --git a/metadata/net.gorry.aicia.txt b/metadata/net.gorry.aicia.txt
index ea8cedd850..8b72426737 100644
--- a/metadata/net.gorry.aicia.txt
+++ b/metadata/net.gorry.aicia.txt
@@ -1,3 +1,4 @@
+Disabled:Source in zip only
 Category:Internet
 License:Apache2
 Web Site:http://gorry.haun.org/android/aicia/
@@ -9,7 +10,7 @@ Description:
 Internet Relay Chat client with a twin-pane view.
 .
 
-Update Check Mode:Market
+Update Check Mode:None
 Current Version:2012.0220.1
 Current Version Code:201202201
 
diff --git a/metadata/net.jaqpot.netcounter.txt b/metadata/net.jaqpot.netcounter.txt
index 7ed968f415..2f7fbed9ce 100644
--- a/metadata/net.jaqpot.netcounter.txt
+++ b/metadata/net.jaqpot.netcounter.txt
@@ -11,11 +11,10 @@ to you in an easy to read format. It can also alert you when you reach a predefi
 limit.
 .
 
-#Not valid...
-#Repo Type:git-svn
-#Repo:https://www.jaqpot.net/svn/android/netcounter/trunk 
+#repo doesn't work
+Repo Type:git-svn
+Repo:https://www.jaqpot.net/svn/android/netcounter/trunk 
 
-#Build Version:0.14.1,22,153
 
 Update Check Mode:Market
 Current Version:0.14.1
diff --git a/metadata/net.mafro.android.wakeonlan.txt b/metadata/net.mafro.android.wakeonlan.txt
index 7fe0918e08..73f48dec16 100644
--- a/metadata/net.mafro.android.wakeonlan.txt
+++ b/metadata/net.mafro.android.wakeonlan.txt
@@ -13,6 +13,7 @@ Repo Type:git
 Repo:https://github.com/mafrosis/Wake-On-Lan.git
 
 Build Version:1.4.2,12,468312845057e78a70f7b6260f2b116042571c42
+Build Version:1.5,13,0f21d8beec740b823a45927df36f6c55dca526ad
 
 Update Check Mode:Market
 Current Version:1.5
diff --git a/metadata/net.micode.compass.txt b/metadata/net.micode.compass.txt
index ddc6d6c639..3b8f42f8ce 100644
--- a/metadata/net.micode.compass.txt
+++ b/metadata/net.micode.compass.txt
@@ -14,5 +14,6 @@ Repo:https://github.com/MiCode/Compass.git
 
 Build Version:0.1,1,077fdb627bb7511f52cde8eddfdc24c2409e4190,target=android-8
 
+Update Check Mode:RepoManifest
 Current Version:0.1
 Current Version Code:1
diff --git a/metadata/net.micode.fileexplorer.txt b/metadata/net.micode.fileexplorer.txt
new file mode 100644
index 0000000000..f7e4a18495
--- /dev/null
+++ b/metadata/net.micode.fileexplorer.txt
@@ -0,0 +1,20 @@
+Category:System
+License:AGPL
+Web Site:https://micode.net
+Source Code:https://github.com/MiCode/FileExplorer
+Issue Tracker:https://github.com/MiCode/FileExplorer/issues
+
+Summary:File Manager
+Description:
+Manage and open files on the phone or access them wirelessly on your computer via the built in ftp server. This project is part of the MiCode organization on GitHub.
+.
+
+Repo Type:git
+Repo:https://github.com/MiCode/FileExplorer.git
+
+Build Version:0.1,1,a9dc,target=android-15
+
+Update Check Mode:RepoManifest
+Current Version:0.1
+Current Version Code:1
+
diff --git a/metadata/net.nightwhistler.pageturner.txt b/metadata/net.nightwhistler.pageturner.txt
index 1b951f3085..89947da7b1 100644
--- a/metadata/net.nightwhistler.pageturner.txt
+++ b/metadata/net.nightwhistler.pageturner.txt
@@ -21,5 +21,4 @@ Build Version:1.1.2,6,1.1.2,extlibs=guice/guice-2.0-no_aop.jar;roboguice/robogui
 Build Version:1.2.1,8,d7a087618ba4390d8f154da656cc26ad92d2354c,srclibs=ActionBarNW@1a98f283,extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT2.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.2.jar;htmlcleaner/htmlcleaner-2.2.jar,prebuild=sed -i 's@\(android\.library\.reference\.1=\).*@\1$$ActionBarNW$$@' project.properties,target=android-15
 Build Version:1.3.4,14,6d28de0b2c,srclibs=ActionBarNW@1a98f283,extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT2.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.2.jar;htmlcleaner/htmlcleaner-2.2.jar,prebuild=sed -i 's@\(android\.library\.reference\.1=\).*@\1$$ActionBarNW$$@' project.properties,target=android-15
 
-Update Check Mode:Market
-
+Update Check Mode:RepoManifest
diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index 8b0ebbeb81..734eaebedc 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -1,17 +1,34 @@
 Category:Navigation
-License:LGPL
+License:GPLv3
 Web Site:http://code.google.com/p/osmand/
 Source Code:https://github.com/osmandapp/Osmand
 Issue Tracker:http://code.google.com/p/osmand/issues/list
-Donate:https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&SESSION=Vf3sHQ7L04cDtH85Y50oV6iGrMczL-knML1tuAbtUoNJ96-3axviegypjVi&dispatch=5885d80a13c0db1f8e263663d3faee8d8494db9703d295b4a2116480ee01a05c
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=victor.shcherb%40gmail.com&lc=US&item_name=Osmand%20Donation
 
 Name:OsmAnd+
 Summary:OpenStreetMap navigation & routing
 Description:
-Navigation and routing based on OpenStreetMap, including the ability for
-OSM contributors to edit directly.
+Osmand is a navigation application with access to a wide source of popular open street map data. All map data including vector and raster maps can be stored on the phone memory card for offline usage. Osmand also has online routing and audible guidance.
+
+Some of the core features:
+- offline data, configurable folder for the maps and tiles
+- compact vector maps for whole world
+- offline search of addresses and places
+- custom tile map area download
+- pedestrian, bicycle and car modes
+- many map layers with customized transparency at a time
+- offline routing for short distance (experimental)
+- Galaxy Tab supported
+
+Limitations of Osmand compared to Osmand+:
+- number of map downloads
+- no access to Wikipedia offline POIs
+
+Please consider donating money via PayPal to support OsmAnd development
 .
 
+
+
 Repo Type:git
 Repo:https://github.com/osmandapp/Osmand.git
 
diff --git a/metadata/net.osmand.txt b/metadata/net.osmand.txt
index f537e83494..9588a4bb90 100644
--- a/metadata/net.osmand.txt
+++ b/metadata/net.osmand.txt
@@ -1,14 +1,27 @@
 Category:Navigation
-License:LGPL
+License:GPLv3
 Web Site:http://code.google.com/p/osmand/
 Source Code:https://github.com/osmandapp/Osmand
 Issue Tracker:http://code.google.com/p/osmand/issues/list
-Donate:https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&SESSION=Vf3sHQ7L04cDtH85Y50oV6iGrMczL-knML1tuAbtUoNJ96-3axviegypjVi&dispatch=5885d80a13c0db1f8e263663d3faee8d8494db9703d295b4a2116480ee01a05c
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=victor.shcherb%40gmail.com&lc=US&item_name=Osmand%20Donation
 
 Summary:OpenStreetMap navigation & routing
 Description:
-Navigation and routing based on OpenStreetMap, including the ability for
-OSM contributors to edit directly.
+Osmand is a navigation application with access to a wide source of popular open street map data. All map data including vector and raster maps can be stored on the phone memory card for offline usage. Osmand also has online routing and audible guidance.
+
+Some of the core features:
+- offline data, configurable folder for the maps and tiles
+- compact vector maps for whole world
+- offline search of addresses and places
+- custom tile map area download
+- pedestrian, bicycle and car modes
+- many map layers with customized transparency at a time
+- offline routing for short distance (experimental)
+- Galaxy Tab supported
+
+Limitations of Osmand compared to Osmand+:
+- number of map downloads
+- no access to Wikipedia offline POIs
 .
 
 Repo Type:git
diff --git a/metadata/net.rocrail.androc.txt b/metadata/net.rocrail.androc.txt
index 051393bd3c..d7e55467e3 100644
--- a/metadata/net.rocrail.androc.txt
+++ b/metadata/net.rocrail.androc.txt
@@ -37,6 +37,7 @@ Build Version:347,347,347,target=android-14
 Build Version:348,348,348,target=android-14
 Build Version:350,350,350,target=android-14
 Build Version:351,351,351,target=android-14
+Build Version:359,359,359,target=android-14
 Build Version:362,362,362,target=android-14
 
 Update Check Mode:Market
diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt
index 55901f6849..5ff2dd21a5 100644
--- a/metadata/net.sourceforge.servestream.txt
+++ b/metadata/net.sourceforge.servestream.txt
@@ -3,6 +3,7 @@ License:Apache2
 Web Site:http://sourceforge.net/projects/servestream/
 Source Code:http://servestream.svn.sourceforge.net/viewvc/servestream/
 Issue Tracker:http://sourceforge.net/tracker/?group_id=361303
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=wseemann%40gmail.com&lc=US&item_name=Servestream%20Donation&
 
 Summary:Media server browser/stream player.
 Description:
diff --git a/metadata/no.rkkc.bysykkel.txt b/metadata/no.rkkc.bysykkel.txt
index 3e0f49fb38..017f7db7b3 100644
--- a/metadata/no.rkkc.bysykkel.txt
+++ b/metadata/no.rkkc.bysykkel.txt
@@ -1,3 +1,4 @@
+AntiFeatures:NonFreeDep
 Category:Navigation
 License:GPLv3
 Web Site:http://www.kind-kristiansen.no/projects/bysyklist-oslo
diff --git a/metadata/nu.firetech.android.pactrack.txt b/metadata/nu.firetech.android.pactrack.txt
index 72830384e3..13ab6e7784 100644
--- a/metadata/nu.firetech.android.pactrack.txt
+++ b/metadata/nu.firetech.android.pactrack.txt
@@ -16,7 +16,7 @@ Repo:https://github.com/firetech/PactrackDroid.git
 
 Build Version:1.3.1,1310,a2722a4062afbef38ec91e9af41908c9548d7a76
 
-Update Check Mode:Market
+Update Check Mode:None
 Current Version:1.3.1
 Current Version Code:1310
 
diff --git a/metadata/orbitlivewallpaperfree.puzzleduck.com.txt b/metadata/orbitlivewallpaperfree.puzzleduck.com.txt
new file mode 100644
index 0000000000..1aadcf9055
--- /dev/null
+++ b/metadata/orbitlivewallpaperfree.puzzleduck.com.txt
@@ -0,0 +1,20 @@
+Category:Wallpaper
+License:GPLv2
+Web Site:https://github.com/PuZZleDucK/Orbital-Live-Wallpaper/
+Source Code:https://github.com/PuZZleDucK/Orbital-Live-Wallpaper
+Issue Tracker:https://github.com/PuZZleDucK/Orbital-Live-Wallpaper/issues
+
+Summary:Animated wallpaper
+Description:
+Rotating circles that respond to your touch. Wallpaper that takes up little ram.
+.
+
+Repo Type:git
+Repo:https://github.com/PuZZleDucK/Orbital-Live-Wallpaper.git
+
+Build Version:1.0,1,3cdb9d,subdir=Orbital-Live-Wallpaper
+
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/org.ab.x48.txt b/metadata/org.ab.x48.txt
new file mode 100644
index 0000000000..713f3a2e56
--- /dev/null
+++ b/metadata/org.ab.x48.txt
@@ -0,0 +1,20 @@
+Category:Science & Education
+License:GPLv3
+Web Site:https://github.com/shagr4th/droid48
+Source Code:https://github.com/shagr4th/droid48
+Issue Tracker:https://github.com/shagr4th/droid48/issues
+
+Summary:Scientific Calculator
+Description:
+Emulated HP48. The bundled ROM is free for non-commercial use
+.
+
+Repo Type:git
+Repo:https://github.com/shagr4th/droid48.git
+
+Build Version:1.35,35,da314fd,buildjni=yes
+
+Update Check Mode:RepoManifest
+Current Version:1.35
+Current Version Code:35
+
diff --git a/metadata/org.abrantix.rockon.rockonnggl.txt b/metadata/org.abrantix.rockon.rockonnggl.txt
index 219d3f0fbf..043309dfef 100644
--- a/metadata/org.abrantix.rockon.rockonnggl.txt
+++ b/metadata/org.abrantix.rockon.rockonnggl.txt
@@ -5,16 +5,11 @@ License:GPLv3
 Web Site:http://abrantix.org/3.php
 Source Code:http://github.com/fabrantes/rockonnggl
 Issue Tracker:http://github.com/fabrantes/rockonnggl/issues
+Donate:http://abrantix.org/cubed-donate.php
 
-#Don't want to encourage donating when the source is no longer available.
-#Donate:http://abrantix.org/cubed-donate.php
 Summary:Music player
 Description:
 A music player. Cubed is also known as ³.
-
-Note: There are more recent binary versions of this application available in
-the Google Market, but the author does not want to publish the source code
-for those (yet?).
 .
 
 Repo Type:git
diff --git a/metadata/org.andnav.osm.txt b/metadata/org.andnav.osm.txt
index dd513dda82..aa0be64f80 100644
--- a/metadata/org.andnav.osm.txt
+++ b/metadata/org.andnav.osm.txt
@@ -15,7 +15,8 @@ Repo:http://osmdroid.googlecode.com/svn/trunk/
 #Doesn't build - needs lots of work on building dependencies
 #Build Version:3.0.9,10,1098,subdir=OpenStreetMapViewer
 
-Update Check Mode:Market
+#market not update in a while
+Update Check Mode:None
 Current Version:2.0.0
 Current Version Code:3
 
diff --git a/metadata/org.androhid.txt b/metadata/org.androhid.txt
index f266d77fd2..f53be7a9ae 100644
--- a/metadata/org.androhid.txt
+++ b/metadata/org.androhid.txt
@@ -15,7 +15,10 @@ Requires Root:Yes
 Repo Type:svn
 Repo:http://androhid.googlecode.com/svn/trunk/
 
-Update Check Mode:Market
+#not in the market
+Update Check Mode:None
+Current Version:0.6
+Current Version Code:6
 
 # needs libbluetooth-dev to build
 #Build Version:0.6,6,34,buildjni=yes
diff --git a/metadata/org.andstatus.app.txt b/metadata/org.andstatus.app.txt
index 47a08500b3..de2e34a464 100644
--- a/metadata/org.andstatus.app.txt
+++ b/metadata/org.andstatus.app.txt
@@ -4,15 +4,20 @@ Web Site:http://andstatus.org/
 Source Code:https://github.com/andstatus/andstatus
 Issue Tracker:https://github.com/andstatus/andstatus/issues
 
-Summary:a light-weight Twitter alternative
+Summary:a light-weight Twitter/Identi.ca alternative
 Description:
-It allows you to read tweets, send Status updates, create Favorites etc. even when you are offline. 
+It allows you to read tweets, send status updates, create Favorites etc. even when you are offline. 
+Basic auth only for Identi.ca.
 .
 
 Repo Type:git
 Repo:git://github.com/andstatus/andstatus.git
 
-Update Check Mode:Market
-
 # needs to adapt src/org/andstatus/app/net/OAuthKeys.java
 #Build Version:1.2.4,48,9dba38c8d77fe8068564b88c197fb60ec64b60a3,target=android-3
+Build Version:1.9.1,61,92a6933279,extlibs=android/android-support-v4.jar,target=android-15
+
+Update Check Mode:RepoManifest
+Current Version:1.9.1
+Current Version Code:61
+
diff --git a/metadata/org.bc_bd.mrwhite.txt b/metadata/org.bc_bd.mrwhite.txt
index 2295d873c9..e4fc7c7005 100644
--- a/metadata/org.bc_bd.mrwhite.txt
+++ b/metadata/org.bc_bd.mrwhite.txt
@@ -16,3 +16,4 @@ Repo:git://bc-bd.org/git/mrwhite.git
 Build Version:1.0,1,87b4fc811619fc58ab6a0642effd75fa08f32741
 Build Version:1.1,2,ed4a9ebb58b5063b701c23669f3856acfba05462
 
+Update Check Mode:None
diff --git a/metadata/org.beide.bomber.txt b/metadata/org.beide.bomber.txt
index 97ed8f2f18..2d30eca927 100644
--- a/metadata/org.beide.bomber.txt
+++ b/metadata/org.beide.bomber.txt
@@ -20,3 +20,4 @@ Repo:git://github.com/beide/Bomber-for-android.git
 
 Build Version:1.0,1,11fc0eafff0b7c16ddb34cce8ff0a692cfd7b5b8
 
+Update Check Mode:None
diff --git a/metadata/org.bostonandroid.umbrellatoday.txt b/metadata/org.bostonandroid.umbrellatoday.txt
new file mode 100644
index 0000000000..d31c4722a8
--- /dev/null
+++ b/metadata/org.bostonandroid.umbrellatoday.txt
@@ -0,0 +1,20 @@
+Category:Navigation
+License:BSD
+Web Site:https://github.com/bostonandroid/UmbrellaToday
+Source Code:https://github.com/bostonandroid/UmbrellaToday
+Issue Tracker:https://github.com/bostonandroid/UmbrellaToday/issues
+
+Summary:Weather info
+Description:
+No description available
+.
+
+Repo Type:git
+Repo:https://github.com/bostonandroid/UmbrellaToday.git
+
+Build Version:1.3,4,4cf296,target=android-8
+
+Update Check Mode:RepoManifest
+Current Version:1.3
+Current Version Code:4
+
diff --git a/metadata/org.broeuschmeul.android.gps.bluetooth.provider.txt b/metadata/org.broeuschmeul.android.gps.bluetooth.provider.txt
new file mode 100644
index 0000000000..6bcc714ac5
--- /dev/null
+++ b/metadata/org.broeuschmeul.android.gps.bluetooth.provider.txt
@@ -0,0 +1,16 @@
+Category:Navigation
+License:GPLv3
+Web Site:http://sourceforge.net/p/bluegps4droid/
+Source Code:http://sourceforge.net/p/bluegps4droid/git
+Issue Tracker:http://sourceforge.net/p/bluegps4droid/tickets/
+
+Summary:Connect a GPS via bluetooth
+Description:
+Allows the connection of an external GPS tracker/mouse via bluetooth, injecting the location data as a “mock provider”. This can provide more accurate location than the build-in receiver (very useful for tracking in dense areas or in the woods, esp. for small tracks or streetaddresses etc), as well as make it possible to use GPS inside a car/boot, where the GPS receiver is mounted outside to get better reception.
+.
+
+Repo Type:git
+Repo:git://git.code.sf.net/p/bluegps4droid/git
+
+Build Version:1.2.5,125,e67872c,target=android-7
+
diff --git a/metadata/org.coolreader.txt b/metadata/org.coolreader.txt
index d241780aa5..bd9d8e517f 100644
--- a/metadata/org.coolreader.txt
+++ b/metadata/org.coolreader.txt
@@ -62,7 +62,8 @@ Build Version:3.0.55-32,532,cr3.0.55-32,subdir=android,rm=android/ant.properties
 #Build Version:3.0.56-5,565,cr3.0.56-5,subdir=android,rm=android/ant.properties,buildjni=yes,target=android-14
 Build Version:3.0.56-19,579,!Need MIPS NDK - see comments
 
-Update Check Mode:RepoManifest
-Current Version:3.0.56-19
-Current Version Code:579
+#RepoManifest gets wrong path
+Update Check Mode:None
+Current Version:3.0.57-16
+Current Version Code:626
 
diff --git a/metadata/org.cry.otp.txt b/metadata/org.cry.otp.txt
new file mode 100644
index 0000000000..83537afb95
--- /dev/null
+++ b/metadata/org.cry.otp.txt
@@ -0,0 +1,20 @@
+Category:Office
+License:Apache2
+Web Site:http://code.google.com/p/motp/
+Source Code:http://code.google.com/p/motp/source/checkout
+Issue Tracker:http://code.google.com/p/motp/issues/list
+
+Summary:One-time password generator
+Description:
+Generating otp's without the need for a special hardware token. Using motp, hotp or totp algorithms, wih multiple profiles and time-zone support
+.
+
+Repo Type:git-svn
+Repo:http://motp.googlecode.com/svn/trunk/
+
+Build Version:1.5,20,4,target=android-15
+
+Update Check Mode:Market
+Current Version:1.5
+Current Version Code:20
+
diff --git a/metadata/org.curiouscreature.android.shelves.txt b/metadata/org.curiouscreature.android.shelves.txt
index ca0ef0efd5..64cc00dc76 100644
--- a/metadata/org.curiouscreature.android.shelves.txt
+++ b/metadata/org.curiouscreature.android.shelves.txt
@@ -17,7 +17,8 @@ Repo:http://shelves.googlecode.com/svn/trunk/Shelves
 Build Version:1.0,1,26,oldsdkloc=yes
 Build Version:1.5,2,!No source code apparently
 
-Update Check Mode:Market
+#not in market
+Update Check Mode:None
 Current Version:1.5
 Current Version Code:2
 
diff --git a/metadata/org.epstudios.epmobile.txt b/metadata/org.epstudios.epmobile.txt
new file mode 100644
index 0000000000..ef4ba897ec
--- /dev/null
+++ b/metadata/org.epstudios.epmobile.txt
@@ -0,0 +1,20 @@
+Category:Science & Education
+License:GPLv3
+Web Site:http://www.epstudiossoftware.com/blog/?page_id=6
+Source Code:https://github.com/mannd/epmobile
+Issue Tracker:https://github.com/mannd/epmobile/issues
+
+Summary:Medical tools
+Description:
+EP Mobile is an application that provides a set of tools for electrophysiologists and other health care workers who deal with cardiac arrhythmias. The program includes EP calculators, drug dose calculators, risk scores, diagnostic tools, ECG figures, and more.
+.
+
+Repo Type:git
+Repo:https://github.com/mannd/epmobile.git
+
+Build Version:1.2,18,74c857
+
+Update Check Mode:RepoManifest
+Current Version:1.2
+Current Version Code:18
+
diff --git a/metadata/org.epstudios.morbidmeter.txt b/metadata/org.epstudios.morbidmeter.txt
new file mode 100644
index 0000000000..9c67f3eb15
--- /dev/null
+++ b/metadata/org.epstudios.morbidmeter.txt
@@ -0,0 +1,18 @@
+Category:Science & Education
+License:GPLv3
+Web Site:https://github.com/mannd/morbidmeter-android
+Source Code:https://github.com/mannd/morbidmeter-android
+Issue Tracker:
+
+Summary:Life expectancy widget
+Description:
+Morbid Meter is a widget that puts your time on earth into perspective. Choose a life-expectancy and a timescale and the widget will display how much of that timescale you have already lived. The default is years, so that will show what month of the year it is, so to speak. Choose it to be reversed, with seconds, and it will show you how many more seconds you can be expected to live for.
+.
+
+Repo Type:git
+Repo:https://github.com/mannd/morbidmeter-android.git
+
+Build Version:1.2.1,4,48f92
+
+Update Check Mode:RepoManifest
+
diff --git a/metadata/org.fdroid.taskstrid.txt b/metadata/org.fdroid.taskstrid.txt
index 3a7cfbbe56..5fdc5e4ed0 100644
--- a/metadata/org.fdroid.taskstrid.txt
+++ b/metadata/org.fdroid.taskstrid.txt
@@ -16,5 +16,5 @@ Repo:git://gitorious.org/astrid-foss/astrid-foss.git
 
 Build Version:3.6.4,170,f583967d77a28f7a83392095d7edb1537dfe8a73,submodules=yes,prebuild=sed -i "s@\.\./astridApi@astridApi@" default.properties
 
-Update Check Mode:Market
+Update Check Mode:None
 
diff --git a/metadata/org.hermit.netscramble.txt b/metadata/org.hermit.netscramble.txt
index b8393768f8..87f177ff09 100644
--- a/metadata/org.hermit.netscramble.txt
+++ b/metadata/org.hermit.netscramble.txt
@@ -11,6 +11,12 @@ the network randomly rotated and must rotate them to connect all the terminals
 to the server. A port of the KDE game "knetwalk".
 .
 
+Repo Type:git-svn
+Repo:http://moonblink.googlecode.com/svn/trunk/Scrambled%20Net%20Full
+
+# doesn't build
+#Build Version:5.0.1,26,840
+
 Update Check Mode:Market
 Current Version:5.0.2
 Current Version Code:28
diff --git a/metadata/org.hermit.tricorder.txt b/metadata/org.hermit.tricorder.txt
index 468b9a7c73..098b0cb72b 100644
--- a/metadata/org.hermit.tricorder.txt
+++ b/metadata/org.hermit.tricorder.txt
@@ -9,7 +9,8 @@ Description:
 Turns your Android device into a functional Tricorder in the style of Star Trek.
 .
 
-Update Check Mode:Market
+#not in market
+Update Check Mode:None
 Current Version:5.12
 Current Version Code:41
 
diff --git a/metadata/org.jf.Penroser.txt b/metadata/org.jf.Penroser.txt
new file mode 100644
index 0000000000..96106616b6
--- /dev/null
+++ b/metadata/org.jf.Penroser.txt
@@ -0,0 +1,20 @@
+Category:Wallpaper
+License:BSD/Apache
+Web Site:https://github.com/JesusFreke/Penroser/
+Source Code:https://github.com/JesusFreke/Penroser
+Issue Tracker:https://github.com/JesusFreke/Penroser/issues
+
+Summary:Scrolling Wallpaper
+Description:
+Infinite, aperiodic wallpaper, that scrolls and zooms
+.
+
+Repo Type:git
+Repo:https://github.com/JesusFreke/Penroser.git
+
+Build Version:1.2,6,0c3827
+
+Update Check Mode:RepoManifest
+Current Version:1.2
+Current Version Code:6
+
diff --git a/metadata/org.jtb.httpmon.txt b/metadata/org.jtb.httpmon.txt
index 5fab2bfc6d..cad6142754 100644
--- a/metadata/org.jtb.httpmon.txt
+++ b/metadata/org.jtb.httpmon.txt
@@ -10,6 +10,12 @@ A simple HTTP monitoring application. Get notified when remote web sites are
 down.
 .
 
+Repo Type:git-svn
+Repo:http://httpmon.googlecode.com/svn/trunk/
+
+Build Version:0.4.9,26,53
+Build Version:0.4.10,27,!already included as a binary
+
 Update Check Mode:Market
 Current Version:0.4.10
 Current Version Code:27
diff --git a/metadata/org.mailboxer.saymyname.txt b/metadata/org.mailboxer.saymyname.txt
index 0d743c2af9..4dd639785c 100644
--- a/metadata/org.mailboxer.saymyname.txt
+++ b/metadata/org.mailboxer.saymyname.txt
@@ -12,7 +12,8 @@ SayMyName reads out loud the name saved in your address book and tells you
 who's calling. Also works with incoming SMS and email via K-9 Mail.
 .
 
-Update Check Mode:Market
+#now abandoned in favour of a rewrite, Annoouncify (that doesn't have analytics, I think)
+Update Check Mode:None
 Current Version:2.5.4.6 (http://goo.gl/N10G)
 Current Version Code:131
 
diff --git a/metadata/org.mozilla.firefox.txt b/metadata/org.mozilla.firefox.txt
index b476b5aeb6..c82c3e3d9b 100644
--- a/metadata/org.mozilla.firefox.txt
+++ b/metadata/org.mozilla.firefox.txt
@@ -1,13 +1,16 @@
 Category:Internet
-License:MPL
-Web Site:http://www.firefox.com
+#mostly...
+License:MPL2
+#also links to ftp site 
+Website:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements
 Source Code:http://hg.mozilla.org/
-Issue Tracker:
+Issue Tracker:https://bugzilla.mozilla.org/buglist.cgi?resolution=---&op_sys=Android
 
-Summary:Firefox Mobile web browser
+Summary:Web browser
 Description:
-Mozilla Firefox Mobile web browser.  Uses the Gecko layout engine to render
-web pages, which implements current and anticipated web standards.
+Mobile version of the Mozilla Firefox Mobile web browser.  Uses the Gecko layout engine to render web pages, which implements current and anticipated web standards. Features include bookmark sync and custom search engines. Since v13 the interface has been changed to speed things up, but any old addons will not work. Please see the website for the list of supported devices. 
+
+Warning: the issue tracker link is not mobile-friendly.
 .
 
 #Binaries in repo for now, build process is large and complex. They are very
diff --git a/metadata/org.mozilla.firefox_beta.txt b/metadata/org.mozilla.firefox_beta.txt
index 46db497e98..23ac460a99 100644
--- a/metadata/org.mozilla.firefox_beta.txt
+++ b/metadata/org.mozilla.firefox_beta.txt
@@ -1,17 +1,23 @@
 Category:Internet
-License:MPL
-Web Site:http://www.firefox.com
+#mostly...
+License:MPL2
+#this links to ftp site too
+Website:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements
 Source Code:http://hg.mozilla.org/
-Issue Tracker:
+Issue Tracker:https://bugzilla.mozilla.org/buglist.cgi?resolution=---&op_sys=Android
 
-Summary:Firefox Mobile Beta web browser
+Summary:Next version of the web browser
 Description:
-Beta version of Firefox Mobile web browser.
+N.B each version has several betas but only one of them is here. See the website for a link to the ftp site. 
+
+Mobile version of the Mozilla Firefox Mobile web browser.  Uses the Gecko layout engine to render web pages, which implements current and anticipated web standards. Features include bookmark sync and custom search engines. Since v13 the interface has been changed to speed things up, but any old addons will not work. Please see the website for the list of supported devices. 
+
+Warning: the issue tracker link is not mobile-friendly.
 .
 
 #Binaries in repo for now, build process is large and complex. They are very
 #well hidden - Mozilla appear very keen to force use of the proprietary market.
-#They come from here: http://ftp.mozilla.org/pub/mozilla.org/mobile/releases/latest/android/multi/
+#They come from here: http://ftp.mozilla.org/pub/mozilla.org/mobile/releases/
 Update Check Mode:Market
 Current Version:15.0
 Current Version Code:2012081423
diff --git a/metadata/org.opensatnav.txt b/metadata/org.opensatnav.txt
index f7af9b9afe..dce227c61d 100644
--- a/metadata/org.opensatnav.txt
+++ b/metadata/org.opensatnav.txt
@@ -4,11 +4,17 @@ Web Site:https://launchpad.net/opensatnav
 Source Code:https://code.launchpad.net/opensatnav
 Issue Tracker:https://bugs.launchpad.net/opensatnav
 
+
 Summary:Satellite Navigation
 Description:
 Satellite Navitation using OpenStreetMap data. Supports car, bicycle and
 pedestrian modes of transport.
 .
 
-Update Check Mode:Market
+Repo Type:bzr
+Repo:lp:opensatnav
 
+Build Version:1.0-fdroidbuild,199,199,forceversion=yes,target=android-4
+
+#not in the market
+Update Check Mode:None
diff --git a/metadata/org.peterbaldwin.client.android.tinyurl.txt b/metadata/org.peterbaldwin.client.android.tinyurl.txt
new file mode 100644
index 0000000000..312672f790
--- /dev/null
+++ b/metadata/org.peterbaldwin.client.android.tinyurl.txt
@@ -0,0 +1,20 @@
+Category:Internet
+License:GPLv3
+Web Site:http://code.google.com/p/android-tinyurl
+Source Code:http://code.google.com/p/android-tinyurl/source/list
+Issue Tracker:http://code.google.com/p/android-tinyurl/issues/list
+
+Summary:Shorten urls to tinyurl urls
+Description:
+This app works standalone but also via the share menu
+.
+
+Repo Type:git-svn
+Repo:http://android-tinyurl.googlecode.com/svn/trunk/
+
+Build Version:1.0.9,10,30,target=android-7
+
+Update Check Mode:Market
+Current Version:1.0.9
+Current Version Code:10
+
diff --git a/metadata/org.peterbaldwin.client.android.vlcremote.txt b/metadata/org.peterbaldwin.client.android.vlcremote.txt
new file mode 100644
index 0000000000..41a8aeaa6b
--- /dev/null
+++ b/metadata/org.peterbaldwin.client.android.vlcremote.txt
@@ -0,0 +1,20 @@
+Category:Multimedia
+License:GPLv3
+Web Site:http://code.google.com/p/android-vlc-remote
+Source Code:http://code.google.com/p/android-vlc-remote/source/list
+Issue Tracker:http://code.google.com/p/android-vlc-remote/issues/list
+
+Summary:Control VLC with your phone
+Description:
+The website has instructions on how to enable the VLC web server. Album art features are experimental. See https://github.com/peterseverin/RMPlayer for using the app with MPlayer
+.
+
+Repo Type:git
+Repo:https://code.google.com/p/android-vlc-remote/
+
+Build Version:0.5.5,55,edd1029
+
+Update Check Mode:RepoManifest
+Current Version:0.5.5
+Current Version Code:55
+
diff --git a/metadata/org.projectvoodoo.audiomeasurementsplayer.txt b/metadata/org.projectvoodoo.audiomeasurementsplayer.txt
new file mode 100644
index 0000000000..ca68c231cc
--- /dev/null
+++ b/metadata/org.projectvoodoo.audiomeasurementsplayer.txt
@@ -0,0 +1,22 @@
+Category:Multimedia
+License:GPL
+Web Site:https://github.com/project-voodoo/audio-measurements-player-app
+Source Code:https://github.com/project-voodoo/audio-measurements-player-app
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=curio%40free%2efr&item_name=Donate%20to%20Supercurio
+
+Summary:Tool for making audio measurements
+Description:
+Little app that plays RMAA and udial samples to ease Android devices sound performance measurements. In order to complete measurements, connect your phone or tablet headphone/line-out JACK to a computer with a high quality soundcard line-in then record the output manually or with RMAA program directly. Samples are compressed in lossless FLAC format to reduce APK size. Using this app instead of playing samples through a vendor or third-party music player also let you be sure no signal processing is done by the player itself, as RAW PCM data is sent to Android sound system.
+
+If the manufacturer adds audio effects, you’ll be able to spot them with confidence through measurements.
+Without additional (like SRS, Beats audio) processing and if digital volume is maxed out, DAC will be fed by un-altered PCM data.
+.
+
+Repo Type:git
+Repo:https://github.com/project-voodoo/audio-measurements-player-app.git
+
+#not working on p990 with wierd custom rom, tried another build too
+Build Version:1.1.4,8,6fcff
+
+Update Check Mode:RepoManifest
+
diff --git a/metadata/org.projectvoodoo.otarootkeeper.txt b/metadata/org.projectvoodoo.otarootkeeper.txt
new file mode 100644
index 0000000000..3625d1d485
--- /dev/null
+++ b/metadata/org.projectvoodoo.otarootkeeper.txt
@@ -0,0 +1,27 @@
+Category:System
+License:WTFPL
+Web Site:https://github.com/project-voodoo/ota-rootkeeper-app
+Source Code:https://github.com/project-voodoo/ota-rootkeeper-app
+Issue Tracker:https://github.com/project-voodoo/ota-rootkeeper-app/issues
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=curio%40free%2efr&item_name=Donate%20to%20Supercurio
+
+Summary:Maintain root access
+Description:
+This application makes a backup or a protected backup of your device's root.
+This device must already be rooted: OTA RootKeeper doesn't have the ability to root devices.
+If several conditions are matched, OTA RootKeeper will make root survive OTAs and... pretty much well anything :) − except /system partition formatting.
+Requirement:
+- /system partition as Ext2, Ext3 or Ext4
+- Upgrades not formatting or overwriting completely the /system partition.
+- See website for info about devices that meet these requirements
+.
+
+Requires Root:Yes
+Repo Type:git
+Repo:https://github.com/project-voodoo/ota-rootkeeper-app.git
+
+#contains busybox binary from unknown source
+#Build Version:2.0.3,10,05cc30
+
+Update Check Mode:None
+
diff --git a/metadata/org.projectvoodoo.simplecarrieriqdetector.txt b/metadata/org.projectvoodoo.simplecarrieriqdetector.txt
index d4fa96ee8b..7866a2053f 100644
--- a/metadata/org.projectvoodoo.simplecarrieriqdetector.txt
+++ b/metadata/org.projectvoodoo.simplecarrieriqdetector.txt
@@ -13,6 +13,7 @@ Repo Type:git
 Repo:https://github.com/project-voodoo/simple_carrieriq_detector_app.git
 
 Build Version:2.0.4,16,05512cb0
+Build Version:2.0.5,18,!no source code
 
 Update Check Mode:Market
 Current Version:2.0.5
diff --git a/metadata/org.scid.android.txt b/metadata/org.scid.android.txt
new file mode 100644
index 0000000000..2d7fda834b
--- /dev/null
+++ b/metadata/org.scid.android.txt
@@ -0,0 +1,20 @@
+Category:Games
+License:GPLv2
+Web Site:https://code.google.com/p/scidonthego/
+Source Code:https://code.google.com/p/scidonthego/source/checkout
+Issue Tracker:https://code.google.com/p/scidonthego/issues/list
+
+Summary:View chess games
+Description:
+A browser for Scid chess database files for Android. 
+.
+
+Repo Type:git-svn
+Repo:http://scidonthego.googlecode.com/svn/trunk/
+
+Build Version:1.29,30,146,buildjni=yes,target=android-15,extlibs=android/android-support-v4.jar
+
+Update Check Mode:Market
+Current Version:1.29
+Current Version Code:30
+
diff --git a/metadata/org.scoutant.blokish.txt b/metadata/org.scoutant.blokish.txt
index 1bb9025318..1196cb04e5 100644
--- a/metadata/org.scoutant.blokish.txt
+++ b/metadata/org.scoutant.blokish.txt
@@ -19,7 +19,7 @@ Build Version:1.6,9,ebd1b966b70e,target=android-10
 Build Version:1.7,10,!requires proprietary "heyzap" library
 Build Version:1.8,11,a297e22247bb1ef7ecd4e764124703488354626d,target=android-10
 
-Update Check Mode:None
+Update Check Mode:Market
 Current Version:1.8
 Current Version Code:11
 
diff --git a/metadata/org.tomdroid.txt b/metadata/org.tomdroid.txt
index ef43b8058b..4da2be8e2a 100644
--- a/metadata/org.tomdroid.txt
+++ b/metadata/org.tomdroid.txt
@@ -16,8 +16,9 @@ Repo:lp:tomdroid
 
 Build Version:0.4.1,6,214
 Build Version:0.5.0,7,248
+Build Version:0.7.0,9,362.1.1
 
 Update Check Mode:Market
-Current Version:0.5.0
-Current Version Code:7
+Current Version:0.4.1
+Current Version Code:6
 
diff --git a/metadata/org.transdroid.txt b/metadata/org.transdroid.txt
index 38119844e7..f58292e83d 100644
--- a/metadata/org.transdroid.txt
+++ b/metadata/org.transdroid.txt
@@ -12,7 +12,8 @@ and rTorrent are supported. It can show the active torrents, pause, resume or re
 them and new torrents can be added via URL, RSS feed or using the integrated search.
 .
 
-Update Check Mode:Market
-Current Version:1.0.4
-Current Version Code:136
+#not in market
+Update Check Mode:None
+Current Version:1.1.6
+Current Version Code:147
 
diff --git a/metadata/org.tunesremote.txt b/metadata/org.tunesremote.txt
new file mode 100644
index 0000000000..c3ab5abeda
--- /dev/null
+++ b/metadata/org.tunesremote.txt
@@ -0,0 +1,17 @@
+Category:Multimedia
+License:GPLv3
+Web Site:http://code.google.com/p/tunesremote-plus
+Source Code:http://code.google.com/p/tunesremote-plus/source/checkout
+Issue Tracker:http://code.google.com/p/tunesremote-plus/issues/list
+
+Summary:Remote-control for DACP media players
+Description:
+.
+
+Repo Type:git-svn
+Repo:http://tunesremote-plus.googlecode.com/svn/trunk/
+
+Build Version:2.5.3,253,154
+
+Update Check Mode:None
+
diff --git a/metadata/org.wahtod.wififixer.txt b/metadata/org.wahtod.wififixer.txt
index 6e469e40af..9459a4d677 100644
--- a/metadata/org.wahtod.wififixer.txt
+++ b/metadata/org.wahtod.wififixer.txt
@@ -22,6 +22,7 @@ Build Version:0.8.0.5,822,846b5c057e886f8436eb,subdir=wififixer,target=android-8
 Build Version:0.8.0.6,838,81e9557f73d8529755cd,subdir=wififixer,target=android-8
 Build Version:0.9.0.1,915,!commit 7155ca938dc1 but can't compile for some reason
 Build Version:0.9.0.2,922,b354e4538bf242f10125af49050e36126b668972,subdir=wififixer,target=android-15
+Build Version:0.9.5,952,4d6dda4c9aa283c162fd1d4c3edaeb8c0d6d8a32,subdir=wififixer,target=android-15
 
 Update Check Mode:Market
 Current Version:0.9.5.1
diff --git a/metadata/org.webodf.txt b/metadata/org.webodf.txt
new file mode 100644
index 0000000000..48e0d3322c
--- /dev/null
+++ b/metadata/org.webodf.txt
@@ -0,0 +1,21 @@
+Category:Office
+License:AGPL
+Web Site:https://gitorious.org/webodf/webodf
+Source Code:https://gitorious.org/webodf/webodf
+Issue Tracker:http://webodf.org/redmine/projects/webodf/issues
+
+Summary:Document Viewer
+Description:
+WebODF is a library that allows ODF files to be viewed in browsers and in apps. This app lets you view Open Document format files directly.
+.
+
+Repo Type:git
+Repo:https://git.gitorious.org/webodf/webodf.git
+
+#not sure about target
+Build Version:1.2,3,5262fc,subdir=programs/android,target=android-10
+
+Update Check Mode:RepoManifest
+Current Version:1.2
+Current Version Code:3
+
diff --git a/metadata/org.zakky.memopad.txt b/metadata/org.zakky.memopad.txt
new file mode 100644
index 0000000000..29587be3d2
--- /dev/null
+++ b/metadata/org.zakky.memopad.txt
@@ -0,0 +1,21 @@
+Category:Office
+License:Apache2
+Web Site:https://github.com/zaki50/MemoPad
+Source Code:https://github.com/zaki50/MemoPad
+Issue Tracker:https://github.com/zaki50/MemoPad/issues
+
+Summary:Free Drawing
+Description:
+Dual canvases. Variable line width, canvas and pen colours
+.
+
+Repo Type:git
+Repo:https://github.com/zaki50/MemoPad.git
+
+#hard to find tags so I just took the head
+Build Version:1.0.3,4,3290a
+
+Update Check Mode:RepoManifest
+Current Version:1.0.3
+Current Version Code:4
+
diff --git a/metadata/paulscode.android.mupen64plusae.txt b/metadata/paulscode.android.mupen64plusae.txt
new file mode 100644
index 0000000000..554341e5f6
--- /dev/null
+++ b/metadata/paulscode.android.mupen64plusae.txt
@@ -0,0 +1,20 @@
+Category:Games
+License:GPL
+Web Site:http://www.paulscode.com/forum/index.php?topic=96
+Source Code:https://github.com/paulscode/mupen64plus-ae
+Issue Tracker:https://github.com/paulscode/mupen64plus-ae/issues
+
+Summary:Nintendo 64 Emulator
+Description:
+N64 emulator now in beta. See website for link to compatibility wiki
+.
+
+Repo Type:git
+Repo:https://github.com/paulscode/mupen64plus-ae.git
+
+#haven't tried to build it, need ssh to machine :-( .see readme for howto
+#Build Version=1.9.2,14,1408b6,buildjni=yes,subdir=main
+
+Update Check Mode:RepoManifest
+Current Version:1.9.2
+Current Version Code:14
diff --git a/metadata/remuco.client.android.txt b/metadata/remuco.client.android.txt
index 37463f442b..5dc8b40827 100644
--- a/metadata/remuco.client.android.txt
+++ b/metadata/remuco.client.android.txt
@@ -3,7 +3,7 @@ License:GPLv3
 Web Site:https://code.google.com/p/remuco/
 Source Code:https://code.google.com/p/remuco/source/browse/
 Issue Tracker:https://code.google.com/p/remuco/wiki/Issues?tm=3
-Donate:http://flattr.com/thing/141543/Remuco
+FlattrID:141543
 
 Summary:Remote control for Linux media players
 Description:
@@ -26,5 +26,6 @@ Repo:https://code.google.com/p/remuco/
 
 Build Version:0.9.6,1,0.9.6,subdir=client/android,prebuild=cp -R ../common/src .,target=android-10
 
-Update Check Mode:Market
+#not in market
+Update Check Mode:None
 
diff --git a/metadata/ru.gelin.android.sendtosd.txt b/metadata/ru.gelin.android.sendtosd.txt
new file mode 100644
index 0000000000..9224a53515
--- /dev/null
+++ b/metadata/ru.gelin.android.sendtosd.txt
@@ -0,0 +1,20 @@
+Category:System
+License:GPLv3
+Web Site:http://code.google.com/p/sendtosd-android
+Source Code:http://code.google.com/p/sendtosd-android/source/checkout
+Issue Tracker:http://code.google.com/p/sendtosd-android/issues/list
+
+Summary:Copy files to the sdcard
+Description:
+Adds an item to the share menu to save the object to the sdcard. e.g. you place a memory card in the phone to look at some pictures. You look at them in the gallery and as you go you copy the good ones to the internal memory
+.
+
+Repo Type:hg
+Repo:https://code.google.com/p/sendtosd-android/
+
+Build Version:0.3.7-beta2,34,01897
+
+Update Check Mode:Market
+Current Version:0.3.7-beta1
+Current Version Code:33
+
diff --git a/metadata/ru.qrck.quitetaskmanager.txt b/metadata/ru.qrck.quitetaskmanager.txt
index 9b6fef5572..ae4df7f504 100644
--- a/metadata/ru.qrck.quitetaskmanager.txt
+++ b/metadata/ru.qrck.quitetaskmanager.txt
@@ -12,4 +12,6 @@ Simple task/process manager with task kill support.
 Repo Type:git-svn
 Repo:http://quitetaskmanager.googlecode.com/svn/trunk/
 
+#not in market
+Update Check Mode:None
 Build Version:1.2,2,14
diff --git a/metadata/se.sandos.android.delayed.txt b/metadata/se.sandos.android.delayed.txt
index b1827eabc1..4797b4d915 100644
--- a/metadata/se.sandos.android.delayed.txt
+++ b/metadata/se.sandos.android.delayed.txt
@@ -14,3 +14,6 @@ Repo Type:hg
 Repo:https://code.google.com/p/android-delayed/
 
 Build Version:0.9-BETA5,18,d89732dab,target=android-15
+
+#not in market
+Update Check Mode:None
diff --git a/metadata/sk.madzik.android.logcatudp.txt b/metadata/sk.madzik.android.logcatudp.txt
new file mode 100644
index 0000000000..b05f09767a
--- /dev/null
+++ b/metadata/sk.madzik.android.logcatudp.txt
@@ -0,0 +1,27 @@
+Category:System
+License:Apache2
+Web Site:http://code.google.com/p/logcatudp/
+Source Code:http://code.google.com/p/logcatudp/source/checkout
+Issue Tracker:http://code.google.com/p/logcatudp/issues/list
+
+Summary:Wireless logging
+Description:
+Simple tool for android development that sends a log to UDP port or share it via email, bluetooth, etc.
+Background service is collecting logs and sending them to destination IP and UDP port. You can send logs to desktop computer through home wifi network, or to server with public IP or cname.
+
+To listen logs use this python script http://code.google.com/p/logcatudp/source/browse/test/listener.py
+Example:
+$ ./listener.py 192.168.1.10 10009
+
+You can also use your desktop syslog server to receive logs.
+.
+
+Repo Type:hg
+Repo:https://code.google.com/p/logcatudp/
+
+Build Version:0.5,5,235851
+
+Update Check Mode:Market
+Current Version:0.5
+Current Version Code:5
+
diff --git a/metadata/to.networld.android.divedroid.txt b/metadata/to.networld.android.divedroid.txt
index 77d0ff1c97..cad7e85762 100644
--- a/metadata/to.networld.android.divedroid.txt
+++ b/metadata/to.networld.android.divedroid.txt
@@ -1,8 +1,8 @@
 Category:Office
-License:GPLv3
+License:MIT
 Web Site:http://divedroid.android.networld.to
-Source Code:http://sources.networld.to/?p=android/DiveDroid.git;a=summary
-Issue Tracker:
+Source Code:https://github.com/obale/divedroid
+Issue Tracker:https://github.com/obale/divedroid/issues
 
 Summary:Scuba Dive Logbook
 Description:
@@ -19,12 +19,11 @@ Portable data through the use of RDFS Ontology.
 .
 
 Repo Type:git
-#The following would appear to be the correct new address (see
-#http://sources.networld.to/?p=android/DiveDroid.git;a=summary) but it
-#isn't working currently for some reason
-Repo:git://gandalf.networld.to/home/repos/semweb/android/DiveDroid.git
+Repo:https://github.com/obale/divedroid.git
 
 Build Version:0.6,1,c50b1e638253cedf32dce49ef836fd30ba6071f9,encoding=utf-8,prebuild=mkdir libs && cd libs && wget http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.3.zip && unzip -j jaxen-1.1.3.zip jaxen-1.1.3/jaxen-1.1.3.jar && rm *.zip && wget -O org.dom4j.jar http://sourceforge.net/projects/dom4j/files/dom4j-2.0.0-ALPHA-2/dom4j-2.0.0-ALPHA-2.jar/download && wget http://achartengine.googlecode.com/files/achartengine-0.5.0.jar && cd ..
 
-Update Check Mode:Market
+Update Check Mode:RepoManifest
+Current Version:0.6
+Current Version Code:1
 
diff --git a/metadata/to.networld.android.foafviewer.txt b/metadata/to.networld.android.foafviewer.txt
index f1b780a023..ad747bc9b6 100644
--- a/metadata/to.networld.android.foafviewer.txt
+++ b/metadata/to.networld.android.foafviewer.txt
@@ -1,9 +1,9 @@
 Disabled:Build problem
 Category:Office
-License:GPLv3
+License:MIT
 Web Site:http://foafviewer.android.networld.to
-Source Code:git://networld.to/var/scm/android/FOAFViewer.git
-Issue Tracker:
+Source Code:https://github.com/obale/foafviewer
+Issue Tracker:https://github.com/obale/foafviewer/issues
 
 Summary:FOAF (Friend Of A Friend) Viewer
 Description:
@@ -13,7 +13,7 @@ view.
 .
 
 Repo Type:git
-Repo:git://networld.to/var/scm/android/FOAFViewer.git
+Repo:https://github.com/obale/foafviewer.git
 
 Build Version:0.11,3,FOAFViewer_v0.11,prebuild=mkdir libs && cd libs && wget http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.3.zip && unzip -j jaxen-1.1.3.zip jaxen-1.1.3/jaxen-1.1.3.jar && rm *.zip && wget -O org.dom4j.jar http://sourceforge.net/projects/dom4j/files/dom4j-2.0.0-ALPHA-2/dom4j-2.0.0-ALPHA-2.jar/download && cd ..
 
diff --git a/metadata/trikita.obsqr.txt b/metadata/trikita.obsqr.txt
new file mode 100644
index 0000000000..9b8aa67d32
--- /dev/null
+++ b/metadata/trikita.obsqr.txt
@@ -0,0 +1,22 @@
+Category:System
+License:MIT
+Web Site:http://trikita.co/#obsqr
+Source Code:https://bitbucket.org/trikita/obsqr/src
+Issue Tracker:https://bitbucket.org/trikita/obsqr/issues?status=new&status=open
+
+Summary:QR code scanner
+Description:
+Fast and simple QR code scanner. Fast and easy to use. Minimalistic design allows you to access QR content with a single tap. Can be launched by long pressing
+the hardware search button, if you have one. N.B QR codes only.
+.
+
+Repo Type:hg
+Repo:https://bitbucket.org/trikita/obsqr
+
+Build Version:2.4,9,071341595ce3,target=android-15,buildjni=yes,prebuild=bash fetch-zbar.sh
+Build Version:2.5,10,4c6ad70039ba,target=android-16,buildjni=yes,prebuild=bash fetch-zbar.sh
+
+Update Check Mode:Market
+Current Version:2.5
+Current Version Code:10
+
diff --git a/metadata/triqita.obsqr.txt b/metadata/triqita.obsqr.txt
deleted file mode 100644
index 750109583a..0000000000
--- a/metadata/triqita.obsqr.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Category:System
-License:MIT
-Web Site:http://trikita.co/#obsqr
-Source Code:https://bitbucket.org/trikita/obsqr/src
-Issue Tracker:https://bitbucket.org/trikita/obsqr/issues?status=new&status=open
-Donate:
-
-Summary:QR code scanner
-Description:
-Minimalistic QR code scanner. Fast and easy to use. Can be launched by long pressing
-the hardware search button, if you have one. N.B QR codes only.
-.
-
-Repo Type:hg
-Repo:https://bitbucket.org/trikita/obsqr
-
-#Native code doesn't build for some reason
-#Build Version:2.4,9,071341595ce3,target=android-15,buildjni=yes
diff --git a/metadata/tritop.android.androsens.txt b/metadata/tritop.android.androsens.txt
new file mode 100644
index 0000000000..8597b9c7dd
--- /dev/null
+++ b/metadata/tritop.android.androsens.txt
@@ -0,0 +1,16 @@
+Category:System
+License:GPLv3
+Web Site:https://code.google.com/p/androsens
+Source Code:https://code.google.com/p/androsens/source/checkout
+
+Summary:Read data from sensors
+Description:
+Why would you need this? Well if you ever get stuck under an avalanche this could show you the right direction to start digging. Or if your smartphone has very accurate magnetic field sensors you can use this to find submerged submarines. If you're not sure if the sensors on your smartphone are working you can use this app to find out.
+.
+
+#git-svn doesn't like it
+Repo Type:svn
+Repo:http://androsens.googlecode.com/svn
+
+#hard to find commit
+Build Version:1.2,2,33
diff --git a/metadata/uk.co.jarofgreen.JustADamnCompass.txt b/metadata/uk.co.jarofgreen.JustADamnCompass.txt
index b9897592ff..1069b891b3 100644
--- a/metadata/uk.co.jarofgreen.JustADamnCompass.txt
+++ b/metadata/uk.co.jarofgreen.JustADamnCompass.txt
@@ -14,5 +14,5 @@ Repo:https://github.com/jarofgreen/Just-A-Damn-Compass.git
 
 Build Version:1.1,2,32e3d60ecadac260f71da17a6cb4b22084c5bcc2,target=android-8
 
-Update Check Mode:Market
+Update Check Mode:RepoManifest
 
diff --git a/metadata/wb.receiptspro.txt b/metadata/wb.receiptspro.txt
index 1890b13d09..599437f974 100644
--- a/metadata/wb.receiptspro.txt
+++ b/metadata/wb.receiptspro.txt
@@ -2,7 +2,7 @@ Category:Office
 License:AGPL
 Web Site:https://github.com/wbaumann/Smart-Receipts
 Source Code:https://github.com/wbaumann/Smart-Receipts
-Issue Tracker:
+Issue Tracker:https://github.com/wbaumann/Smart-Receipts/issues
 
 Summary:Receipt scanner/expense reporter
 Description:
@@ -20,6 +20,9 @@ Repo:https://github.com/wbaumann/Smart-Receipts.git
 # default.properties references an unknown lib, breaking the build. Fortunately, the lib is not needed.
 # See https://github.com/wbaumann/Smart-Receipts/issues/2
 Build Version:1.1.1,12,d5684ee0bb7210e8b9205e932feba1b2eed21f50,subdir=SmartReceipts,prebuild=sed -i -e 's/^android.library.reference.1/#android.library.reference.1/' project.properties
+# the above issue is supposed to be fixed but still it won't build
+#Build Version:1.1.14,45,e51ae123,subdir=SmartReceipts
 
-Update Check Mode:Market
+#device variable
+Update Check Mode:None