From e6ef9889d02174effa81c31d56ff5b94d7b18b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 15 Oct 2013 14:42:13 +0200
Subject: [PATCH] Place strings not to translate in separate file

---
 .android2po             |  2 --
 AndroidManifest.xml     |  2 +-
 res/values/no_trans.xml | 14 ++++++++++++++
 res/values/strings.xml  |  6 ------
 4 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 res/values/no_trans.xml

diff --git a/.android2po b/.android2po
index 9d4c5ada8..0b0179665 100644
--- a/.android2po
+++ b/.android2po
@@ -1,8 +1,6 @@
 --gettext locale/
 --groups strings array
 
---ignore about_sitec about_mailc
---ignore repo_add_http
 --ignore /updateIntervalValues.*/
 --ignore /dbSyncModeValues.*/
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e95127630..69f65a75e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,7 +3,7 @@
     package="org.fdroid.fdroid"
     android:installLocation="auto"
     android:versionCode="52"
-    android:versionName="0.52-test" >
+    android:versionName="@string/version_name" >
 
     <uses-sdk
         android:minSdkVersion="4"
diff --git a/res/values/no_trans.xml b/res/values/no_trans.xml
new file mode 100644
index 000000000..db3f45ec4
--- /dev/null
+++ b/res/values/no_trans.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<string name="app_name">F-Droid</string>
+	<string name="version_name">0.52-test</string>
+
+	<string name="about_sitec">http://f-droid.org</string>
+	<string name="about_mailc">admin@f-droid.org</string>
+
+	<string name="menu_bitcoin">Bitcoin</string>
+	<string name="menu_litecoin">Litecoin</string>
+	<string name="menu_flattr">Flattr</string>
+
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f48bba028..136432f8a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -23,7 +23,6 @@
 	<string name="never">never</string>
 	<string name="automatic_repo_scan">Automatic repo scan</string>
 
-	<string name="app_name">F-Droid</string>
 	<string name="search_results">Search Results</string>
 	<string name="app_details">App Details</string>
 	<string name="no_such_app">No such app found</string>
@@ -32,9 +31,7 @@
 	<string name="about_desc">Originally based on Aptoide.\nReleased under the
 		GNU GPLv3 license.</string>
 	<string name="about_site">Website: </string>
-	<string name="about_sitec">http://f-droid.org</string>
 	<string name="about_mail">Email: </string>
-	<string name="about_mailc">admin@f-droid.org</string>
 	<string name="about_version">Version: </string>
 	<string name="about_website">Website</string>
 
@@ -94,9 +91,6 @@
 	<string name="menu_issues">Issues</string>
 	<string name="menu_source">Source Code</string>
 	<string name="menu_update">Update</string>
-	<string name="menu_bitcoin">Bitcoin</string>
-	<string name="menu_litecoin">Litecoin</string>
-	<string name="menu_flattr">Flattr</string>
 	<string name="menu_donate">Donate</string>
 
 	<string name="details_installed">Version %s installed</string>