Merge branch 'dev'

nightscout · Jan 27, 2015 · 1eb45d6 · 1eb45d6
2 parents 6e4cedd + daaf1cb
commit 1eb45d6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.nightscout.android"
-    android:versionCode="20"
-    android:versionName="0.1.11">
+    android:versionCode="21"
+    android:versionName="0.1.12">
 
     <uses-feature android:name="android.hardware.usb.host" />
 

diff --git a/app/src/main/res/values-it/strings_activity_settings.xml b/app/src/main/res/values-it/strings_activity_settings.xml
@@ -94,7 +94,7 @@
     <string name="pref_header_about">A proposito</string>
 
     <string name="pref_title_about_release_name">Nome della versione</string>
-    <string name="pref_summary_about_release_name">Cookie Monster</string>
+    <string name="pref_summary_about_release_name">Dreamsicle</string>
 
     <string name="pref_title_about_version_number">Numero della versione</string>
 

diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml
@@ -94,7 +94,7 @@
     <string name="pref_header_about">About</string>
 
     <string name="pref_title_about_release_name">Release name</string>
-    <string name="pref_summary_about_release_name">Cookie Monster</string>
+    <string name="pref_summary_about_release_name">Dreamsicle</string>
 
     <string name="pref_title_about_version_number">Version number</string>