Merge branch 'master' of gitorious.org:~dalb8/f-droid/daithib8s-fdroiddata

Conflicts:
	metadata/triqita.obsqr.txt

metadata/android.tether.txt

@@ -0,0 +1,19 @@
+Category:System
+License:GPLv3
+Web Site:https://code.google.com/p/android-wifi-tether/
+Source Code:https://code.google.com/p/android-wifi-tether/source/list
+Issue Tracker:https://code.google.com/p/android-wifi-tether/issues/list
+Donate:https://code.google.com/p/android-wifi-tether/
+
+Summary:Wireless internet tethering
+Description:
+This program enables tethering (via wifi) for "rooted" handsets running android (such as the Android DevPhone 1). Clients (your laptop for example) can connect via wifi (ad-hoc mode)and get access to the internet using the 3G, 2G mobile connection which is established by the handset.
+
+This application requires a "rooted"-device and(probably) a custom-kernel which supports netfilter (iptables)! Please see the FAQ for detailed information. 
+.
+
+Requires Root:Yes
+Repo Type:git-svn
+Repo:http://android-wifi-tether.googlecode.com/svn/trunk/
+
+Build Version:2.0.7,26,r523

metadata/com.alfray.asqare.txt

@@ -0,0 +1,20 @@
+Category:Games
+License:GPLv3
+Web Site:https://code.google.com/p/asqare/
+Source Code:https://code.google.com/p/asqare/source/list
+Issue Tracker:
+Donate:
+
+Summary:Remove the sprites by gathering colours
+Description:
+The screen is covered with colored sprites (squares or circles). When you align 3 or more in a row, all adjacents sprites of the shape & color vanish.
+
+You can only swap adjacent sprites vertically or horizontally. You can swap sprites even if it won't result in a 3-or-more alignment, but that will cost you 10% of your current score.
+
+The game offers two variations on the gameplay and manages a list of current games, that you can pause and recall at any time. 
+.
+
+Repo Type:git
+Repo:https://code.google.com/p/asqare/
+
+Build Version:1.3,103,61828d08

metadata/com.brocktice.JustSit.txt

@@ -0,0 +1,20 @@
+Category:Science
+License:GPLv3/CCv3.0by
+Web Site:https://code.google.com/p/justsit/
+Source Code:https://code.google.com/p/justsit/source/list
+Issue Tracker:https://code.google.com/p/justsit/issues/list
+Donate:
+
+Summary:Meditation timer
+Description:
+JustSit is designed to help you meditate. It currently runs timers for preparation to meditate and meditation, and allows you to turn off audible ringing and/or the device radios, and keep the screen on while the timer is running.
+
+The name is inspired by the saying,
+
+"If you walk, just walk, if you sit, just sit, but whatever you do, don't wobble." -Zen Master Unmon 
+.
+
+Repo Type:git-svn
+Repo:http://justsit.googlecode.com/svn/trunk/
+
+Build Version:0.3.3,17,r24

metadata/com.gcstar.scanner.txt

@@ -0,0 +1,16 @@
+Category:Office
+License:GPLv2+
+Web Site:http://wiki.gcstar.org/en/gcstar_scanner
+Source Code:http://svn.gna.org/viewcvs/gcstar/scanner/
+Issue Tracker:
+Donate:http://gcstar.org/contribute.en.php#donate
+
+Summary:Scan items for your collections
+Description:
+GCstar is a cross-platform application for managing your collections. Detailed information on each item can be automatically retrieved from the internet and you can store additional data, such as the location or who you've lent it to. You may also search and filter your collection by many criteria. 
+.
+
+Repo Type:git-svn
+Repo:http://svn.gna.org/viewcvs/gcstar/scanner
+
+Build Version:1.0,1,r2124

metadata/com.gcstar.viewer.txt

@@ -0,0 +1,17 @@
+Category:Office
+License:GPLv2+
+Web Site:http://wiki.gcstar.org/en/gcstar_viewer
+Source Code:http://svn.gna.org/viewcvs/gcstar/viewer/
+Issue Tracker:
+Donate:http://gcstar.org/contribute.en.php#donate
+
+Summary:View and manage your collections
+Description:
+GCstar is a cross-platform application for managing your collections. Detailed information on each item can be automatically retrieved from the internet and you can store additional data, such as the location or who you've lent it to. You may also search and filter your collection by many criteria. 
+.
+
+Repo Type:git-svn
+Repo:http://svn.gna.org/viewcvs/gcstar/viewer
+
+Build Version:name,code,commit/tag/revision
+Build Version:2.8,10,r2149

metadata/com.glTron.txt

@@ -1,4 +1,3 @@
-Disabled:Contains ads with proprietary blob, https://github.com/Chluverman/android-gltron/issues/2
 Category:Games
 License:GPL
 Web Site:https://github.com/Chluverman/android-gltron/

metadata/com.google.zxing.client.android.txt

@@ -10,6 +10,6 @@ Barcode scanner from ZXing.
 .
 
 Update Check Mode:None
-Current Version:4.0
-Current Version Code:79
+Current Version:4.2
+Current Version Code:84
 

metadata/com.ihunda.android.binauralbeat.txt

@@ -23,6 +23,7 @@ Build Version:1.2,24,85160b47e80d1cac025d02756f642f3c8f667191
 Build Version:1.3,25,!No source in repo
 Build Version:1.6,29,!973a1ee943cfb251759f5e29137892f262a1d860 but source is incomplete - missing class and drawables
 Build Version:1.6.2,32,!No source in repo
+Build Version:1.7,34,e65c60a8ac
 
 Update Check Mode:Market
 Current Version:1.7

metadata/com.uploadedlobster.PwdHash.txt

@@ -0,0 +1,16 @@
+Category:Internet
+License:BSD
+Web Site:https://github.com/phw/Android-PwdHash
+Source Code:https://github.com/phw/Android-PwdHash
+Issue Tracker:https://github.com/phw/Android-PwdHash/issues
+Donate:
+
+Summary:Create passwords from website addresses
+Description:
+Lightweight tool to generate website specific, theft-resistant passwords. Just use the "Share page" option in the Android browser or open Password Hash directly. Based upon and compatible with pwdhash.com.
+.
+
+Repo Type:git
+Repo:https://github.com/phw/Android-PwdHash.git
+
+Build Version:1.2.4,7,069d5044

metadata/com.zoffcc.applications.zanavi.txt

@@ -0,0 +1,28 @@
+Category:Navigation
+License:GPLv2
+Web Site:http://zanavi.cc/index.php/Main_Page
+Source Code:http://viewsvn1.zanavi.cc/viewvc.cgi/zanavi_public1/navit/
+Issue Tracker:http://trac.zanavi.cc/
+Donate:
+
+Summary:Offline Navigation
+Description:
+Based on Navit, Zanavi aims to be an easy to use offline navigator
+Features include:
+*) works on Ice Cream Sandwich (ICS) (Android 4)
+*) support to show GPX files
+*) Navigate to target from google maps
+*) APP2SD
+*) works offline (offline navigation)
+*) world overview map
+*) tunnels are visible on map
+*) bridges visible on map
+*) map turns with compass
+*) map management (download/update/delete maps)
+*) search offline OR online
+.
+
+Repo Type:git-svn
+Repo:http://zanavi.cc/zanavi_public1/navit
+
+Build Version:1.0.52

metadata/de.antonfluegge.android.yubnubwidgetadfree.txt

@@ -0,0 +1,16 @@
+Category:Internet
+License:GPLv3
+Web Site:http://sourceforge.net/p/yubnubapp/
+Source Code:http://sourceforge.net/p/yubnubapp/code
+Issue Tracker:http://sourceforge.net/p/yubnubapp/tickets/
+Donate:
+
+Summary:Search the web and get answers with Yubnub
+Description:
+Yubnub is a social command line for the web. By typing short commands into the widget you can search various websites, translate words and even fetch random quotes from the Simpsons!
+.
+
+Repo Type:git
+Repo:git://git.code.sf.net/p/yubnubapp/code
+
+Build Version:1.1.4,6,bb92bd86a

metadata/de.danielweisser.android.ldapsync.txt

@@ -0,0 +1,16 @@
+Category:Office
+License:Apache2
+Web Site:http://www.danielweisser.de/blog
+Source Code:https://github.com/weisserd/LDAP-Sync
+Issue Tracker:https://github.com/weisserd/LDAP-Sync/issues
+Donate:
+
+Summary:Sync your contacts with LDAP
+Description:
+LDAP synchronization adapter for Android phones. It integrates seamlessly into the Android accounts and allows the synchronization of contacts stored in a LDAP or Active Directory server.
+.
+
+Repo Type:git
+Repo:https://github.com/weisserd/LDAP-Sync.git
+
+Build Version:1.5,12,6198272a

metadata/de.kugihan.dictionaryformids.hmi_android.txt

@@ -0,0 +1,20 @@
+Category:Office
+License:GPLv2+
+Web Site:http://dictionarymid.sourceforge.net/android.html
+Source Code:http://dictionarymid.sourceforge.net/android.html
+Issue Tracker:http://dictionarymid.german-fighters.com/forum/index.php?board=12.0
+Donate:
+
+Summary:Offline dictionaries
+Description:
+DictionaryForMIDs is a flexible dictionary that can be set up with dictionaries for all languages around the world. For example it is possible to set up (= configure) DictionaryForMIDs with an English to Spanish dictionary as well as for an English to Chinese dictionary.
+
+Beyond language dictionaries, it is possible to set up any other dictionary for DictionaryForMIDs, for example a ZIP-dictionary, a phone dictionary, a dictionary of medical terms, etc.
+
+Please note that the dictionaries that are set up for DictionaryForMIDs may have different copyrights. All dictionaries that can be downloaded from the website are free to use. Several dictionaries come with the app and more are provided in the section dictionaries for download of the website.
+.
+
+Repo Type:git-svn
+Repo:http://dictionarymid.sourceforge.net/android-dl.html
+
+Build Version:0.90.1,89,r461

metadata/kaljurand_at_gmail_dot_com.diktofon.txt

@@ -0,0 +1,22 @@
+Category:Office
+License:Apache 2.0
+Web Site:http://code.google.com/p/diktofon/
+Source Code:https://github.com/Kaljurand/Diktofon/
+Issue Tracker:http://code.google.com/p/diktofon/issues/list
+Donate:
+
+Summary:Dictaphone with text-to-speech for Estonian
+Description:
+The Diktofon project develops a dictaphone application for Android-based smart phones. The application focuses on Estonian language speech recordings by including an interface to an online Estonian speech-to-text service (http://bark.phon.ioc.ee/webtrans/) to turn the recordings into written text. In addition to providing the transcription, this service also detects speakers in the recordings. This allows for novel and powerful ways to search, sort and playback the recordings, e.g.
+
+    you can easily locate in your set of recordings all the paragraphs where given words are mentioned, and then playback these paragraphs
+    you can sort your recordings by how many speakers they feature
+    you can "scroll" the recording to see where one speaker finishes and the next starts, useful when listening to podcasts or press conferences with multiple speakers 
+
+The Diktofon app provides also language independent features like tagging, high quality built-in voice recorder, possibility to use an external recorder app, etc. that turn it into a general purpose voice recorder and recording manager app. 
+.
+
+Repo Type:git
+Repo:https://github.com/Kaljurand/Diktofon.git
+
+Build Version:0.9.76,976,8036d6c7

metadata/mobi.cyann.nstools.txt

@@ -0,0 +1,17 @@
+Category:System
+License:GPLv3
+Web Site:http://cyann.mobi/article/show/nstools 
+Source Code:https://github.com/arifhn/nstools
+Issue Tracker:https://github.com/arifhn/nstools/issues
+Donate:
+
+Summary:Manage kernel tweaks for Nexus S
+Description:
+Manage BLX,BLN,Deep Idle,Governor and voltage settings for custom kernels. Relevant for most custom kernels on the i9020 and i9023, Crespo and Crespo 4g. 
+.
+
+Root Required:Yes
+Repo Type:git
+Repo:https://github.com/arifhn/NSTools.git
+
+Build Version:1.16,20,caa8eec7

metadata/org.aprsdroid.app.txt

@@ -0,0 +1,16 @@
+Category:Internet
+License:GPLv2
+Web Site:http://aprsdroid.org
+Source Code:https://github.com/ge0rg/aprsdroid
+Issue Tracker:https://github.com/ge0rg/aprsdroid/issues
+Donate:
+
+Summary:App for Amateur Radio Operators
+Description:
+Report your position to the APRS-IS network and view nearby stations on a map. Aradio operator callsign is required.
+.
+
+Repo Type:git
+Repo:https://github.com/ge0rg/aprsdroid.git
+
+Build Version:1.2.0,10,6060f53846

metadata/org.projectvoodoo.simplecarrieriqdetector.txt

@@ -0,0 +1,16 @@
+Category:System
+License:WTFPL
+Web Site:https://twitter.com/supercurio
+Source Code:https://github.com/project-voodoo/simple_carrieriq_detector_app
+Issue Tracker:https://github.com/project-voodoo/simple_carrieriq_detector_app/issues
+Donate:
+
+Summary:Find out if your device hosts CarrierIQ Agent
+Description:
+CarrierIQ is a diagnostics tool that is embedded in the firmware of some Android phones
+.
+
+Repo Type:git
+Repo:https://github.com/project-voodoo/simple_carrieriq_detector_app.git
+
+Build Version:2.0.4,16,05512cb0

metadata/org.torproject.android.txt

@@ -3,6 +3,7 @@ License:BSD
 Web Site:http://www.torproject.org/docs/android.html.en
 Source Code:https://svn.torproject.org/svn/projects/android/
 Issue Tracker:https://trac.torproject.org/projects/tor
+Donation:https://www.torproject.org/donate/donate.html.en
 
 Summary:Tor (anonymity) client
 Description:

metadata/se.sandos.android.delayed.txt

@@ -0,0 +1,16 @@
+Category:Navigation
+License:GPLv3
+Web Site:https://code.google.com/p/android-delayed/
+Source Code:https://code.google.com/p/android-delayed/source/browse
+Issue Tracker:https://code.google.com/p/android-delayed/issues/list
+Donate:https://code.google.com/p/android-delayed/
+
+Summary:Realtime train departures and delays for Sweden
+Description:
+
+.
+
+Repo Type:hg
+Repo:https://code.google.com/p/android-delayed/
+
+Build Version:0.9-BETA5,18,d89732dab

metadata/sk.baka.aedict.txt

@@ -0,0 +1,34 @@
+Category:Office
+License:GPLv3
+Web Site:https://code.google.com/p/aedict
+Source Code:https://code.google.com/p/aedict/source/list
+Issue Tracker:https://code.google.com/p/aedict/issues/list
+Donate:https://code.google.com/p/aedict/
+Bitcoin:1KJyEutxrm3yL7chvsciMJTvXahXoWE3Pw
+
+Summary:English-Japanese dictionary
+Description:
+A free, open-source english-japanese dictionary for Android which uses Jim Breen's edict data. Does not require japanese keyboard. Works offline. The dictionary data is downloaded automatically. 
+
+Automatic download of the indexed EDict/Kanjidic/Tanaka dictionaries (Warning: the dictionaries files are quite large, e.g. English EDict zip file is 8mb long, which may take some time to download. Perform this download over a Wi-Fi or with a quick internet access if possible)
+Allows automatic download of a German/French EDict, the names dictionary and the computer terminology dictionary
+    Once the dictionary is downloaded it works completely off-line
+    Kanjipad for drawing and searching kanji characters
+    Search kanji characters by radicals and stroke numbers
+    Shows a kanji analysis in a word
+    SKIP search (a search based on the kanji visual look)
+    Custom dictionaries
+    Optionally shows romaji instead of hiragana/katakana - good for beginner learners. Also provides a hiragana/katakana learning table.
+    Search in Tanaka Example sentences
+    Optional verb deinflection (e.g. searching for あえない will find あう)
+    Kanji drawing order for more than 1500 kanjis
+    A basic sentence translation
+    Integration with Simeji
+    Verb conjugations with example sentences
+    Integrates with Android Search (Android 1.6 or higher only
+.
+
+Repo Type:hg
+Repo:https://code.google.com/p/aedict/
+
+Build Version:2.10,2100,df770685

metadata/triqita.obsqr.txt

@@ -15,4 +15,4 @@ Repo Type:hg
 Repo:https://bitbucket.org/trikita/obsqr
 
 #Native code doesn't build for some reason
-#Build Version:2.4,9,9cc4cd1804c0,target=android-15,buildjni=yes
+#Build Version:2.4,9,071341595ce3,target=android-15,buildjni=yes