From 9706a7fac6686896ac0685896dfbba26afcbc4ee Mon Sep 17 00:00:00 2001
From: Robert Kolner <robert.kolner@gmail.com>
Date: Sat, 9 Feb 2013 15:04:27 +0100
Subject: [PATCH] Changed texts. Updated Manifest to make lint happy.

---
 AndroidManifest.xml    | 12 ++++++++----
 res/values/strings.xml |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index de239e8..7adf86a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.studentersamfundet.app"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="8" />
+      android:versionCode="2"
+      android:versionName="beta1.0">
+    <uses-sdk 
+        android:minSdkVersion="8" 
+        android:targetSdkVersion="17"/>
+    
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
     <uses-permission android:name="android.permission.INTERNET" ></uses-permission>
 
     <application android:icon="@drawable/icon"
     			 android:theme="@android:style/Theme.NoTitleBar" 
-    			 android:label="@string/app_name">
+    			 android:label="@string/app_name"
+    			 android:allowBackup="true">
         <activity android:name=".ui.DnsActivity"
                   android:label="@string/app_name">
             <intent-filter>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fa8726c..98216cc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12,8 +12,8 @@
     <string name="choose_category">Velg kategori</string>
     <string name="error_loading">Vent til oppdateringen fullfører</string><string name="main_menu_program">PROGRAM</string>
     <string name="main_menu_opening_hours">ÅPNINGSTIDER I DAG</string>
-    <string name="main_menu_tickets">BILLETTER</string><string name="main_menu_join">OM DNS</string>
-    <string name="main_menu_news">NYHETER</string>
+    <string name="main_menu_tickets">KJØP BILLETT</string><string name="main_menu_join">OM DNS</string>
+    <string name="main_menu_news">AKTUELT</string>
     <string name="calendar_not_found">Kunne ikke finne kalender-app. Avbryter.</string>
     <string name="chateau_neuf">Chateau Neuf</string>
     <string name="BC">BokCaféen</string>