From 3fd5a55516eace832d2d2300ebf7a2579ab9c6dc Mon Sep 17 00:00:00 2001
From: Dominik <dominik@dominikschuermann.de>
Date: Sat, 10 Mar 2012 20:14:01 +0100
Subject: can now be build with ant

---
 README.markdown                                    |  21 ---------------------
 README.md                                          |  21 +++++++++++++++++++++
 ...-jdk15-1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE.jar | Bin 0 -> 4013639 bytes
 ...-jdk15-1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE.jar | Bin 4013639 -> 0 bytes
 res/values-zh/strings.xml                          |   1 -
 5 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100644 README.markdown
 create mode 100644 README.md
 create mode 100644 Resources/scprov-jdk15-1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE.jar
 delete mode 100644 libs/scprov-jdk15-1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE.jar

diff --git a/README.markdown b/README.markdown
deleted file mode 100644
index de0737b97..000000000
--- a/README.markdown
+++ /dev/null
@@ -1,21 +0,0 @@
-# APG+
-
-This is a fork of Android Privacy Guard (APG) named APG+
-
-I will try to reintegrate the various forks and build a new stable version, which can be released to the market.
-
-# Build APG+
-
-# Build XZing Integration Library
-
-1. Checkout their SVN (see http://code.google.com/p/zxing/source/checkout)
-2. Change android-home variable in "build.properties" in the main directory to point to your Android SDK
-3. Change directory to android-integration
-4. Build using "ant build"
-5. We use "android-integration-supportv4.jar"
-
-On error see: http://code.google.com/p/zxing/issues/detail?id=1207
-
-# Build SpongyCastle
-
-see https://github.com/rtyley/spongycastle
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..de0737b97
--- /dev/null
+++ b/README.md
@@ -0,0 +1,21 @@
+# APG+
+
+This is a fork of Android Privacy Guard (APG) named APG+
+
+I will try to reintegrate the various forks and build a new stable version, which can be released to the market.
+
+# Build APG+
+
+# Build XZing Integration Library
+
+1. Checkout their SVN (see http://code.google.com/p/zxing/source/checkout)
+2. Change android-home variable in "build.properties" in the main directory to point to your Android SDK
+3. Change directory to android-integration
+4. Build using "ant build"
+5. We use "android-integration-supportv4.jar"
+
+On error see: http://code.google.com/p/zxing/issues/detail?id=1207
+
+# Build SpongyCastle
+
+see https://github.com/rtyley/spongycastle
\ No newline at end of file
diff --git a/Resources/scprov-jdk15-1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE.jar b/Resources/scprov-jdk15-1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE.jar
new file mode 100644
index 000000000..87c8669bb
Binary files /dev/null and b/Resources/scprov-jdk15-1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE.jar differ
diff --git a/libs/scprov-jdk15-1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE.jar b/libs/scprov-jdk15-1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE.jar
deleted file mode 100644
index 87c8669bb..000000000
Binary files a/libs/scprov-jdk15-1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE.jar and /dev/null differ
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index 1e34829a7..8fa3d23fc 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -153,7 +153,6 @@
     <string name="choice_10mins">10 分钟</string>
     <string name="choice_20mins">20 分钟</string>
     <string name="choice_40mins">40 分钟</string>
-    <string name="choice_60mins">60 分钟</string>
     <string name="choice_untilQuit">直到退出</string>
     <string name="choice_language_system">系统默认</string>
     <string name="dsa">DSA</string>
-- 
cgit v1.2.3