updating marketing text; about page and removing icon credits from bi…

…tcoin-wallet.
Crypto-Expert · Jan 26, 2014 · 825681a · 825681a
1 parent 1838abc
commit 825681a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/market/market-description-da.txt b/market/market-description-da.txt
@@ -12,10 +12,10 @@ FUNKTIONER:
 • App-widget for Bitcoin-saldo.
 
 Du kan finde mere om Bitcoin på
-http://bitcoin.org
+http://digitalcoin.co
 
 Hvis du vil bidrage til Bitcoin Wallet, kan projektet findes på
-https://github.com/schildbach/bitcoin-wallet
+https://github.com/HashEngineering/digitalcoin-wallet
 
 Licens: GPLv3
 Brug for egen risiko!

diff --git a/market/market-description-sk.txt b/market/market-description-sk.txt
@@ -12,10 +12,10 @@ FUNKCIE:
 • Widget s celkovým zostatkom.
 
 Viac informácií o Bitcoine
-http://bitcoin.org
+http://digitalcoin.co
 
 Ak chcete prispieť do projektu Bitcoin Wallet nájdete ho na adrese
-https://github.com/schildbach/bitcoin-wallet
+https://github.com/HashEngineering/digitalcoin-wallet
 
 Licencia: GPLv3
 Použitie len na vlastné riziko!

diff --git a/wallet/res/xml/about.xml b/wallet/res/xml/about.xml
@@ -6,7 +6,7 @@
 			android:key="about_version"
 			android:title="Version" />
 		<Preference
-			android:summary="© 2011-2014, Andreas Schildbach\n2013-2014, HashEngineering Solutions"
+			android:summary="© 2011-2014, Andreas Schildbach\n© 2013-2014, HashEngineering Solutions"
 
 			android:title="Copyright" />
         <Preference
@@ -22,9 +22,9 @@
 			android:key="about_market_app"
 			android:summary="@string/about_market_app_summary"
 			android:title="@string/about_market_app_title" />
-		<Preference
+		<!--Preference
 			android:key="about_credits_icon"
-			android:title="@string/about_credits_icon_title" />
+			android:title="@string/about_credits_icon_title" /-->
         <Preference
                 android:key="about_credits_website"
                 android:title="@string/about_credits_website_title" />

diff --git a/wallet/src/de/schildbach/wallet/Constants.java b/wallet/src/de/schildbach/wallet/Constants.java
@@ -93,7 +93,7 @@ public class Constants
 	public static final String REPORT_SUBJECT_CRASH = "Crash report";
 
 	public static final String LICENSE_URL = "http://www.gnu.org/licenses/gpl-3.0.txt";
-    public static final String FORKED_FROM_SOURCE = "based on bitcoin-wallet 3.29\n";
+    public static final String FORKED_FROM_SOURCE = "based on bitcoin-wallet 3.30\n";
 	public static final String SOURCE_URL = "https://github.com/HashEngineering/" + CoinDefinition.coinName + "-wallet";
 	public static final String BINARY_URL = "http://code.google.com/p/bitcoin-wallet/downloads/list";
 	public static final String CREDITS_BITCOINJ_URL = "https://github.com/HashEngineering/" + CoinDefinition.coinName + "j";

diff --git a/wallet/src/de/schildbach/wallet/ui/AboutActivity.java b/wallet/src/de/schildbach/wallet/ui/AboutActivity.java
@@ -156,11 +156,11 @@ else if (KEY_ABOUT_CREDITS_ZXING.equals(key))
 			startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.CREDITS_ZXING_URL)));
 			finish();
 		}
-		else if (KEY_ABOUT_CREDITS_ICON.equals(key))
+		/*else if (KEY_ABOUT_CREDITS_ICON.equals(key))
 		{
 			startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.CREDITS_ICON_URL)));
 			finish();
-		}
+		}*/
 		return false;
 	}
 }