Merge pull request #24 from jamesemorgan/development

V1.17 Development - Italian & Maven Android 3.3.0
jamesmorgan · Jul 28, 2012 · 6bc8413 · 6bc8413
2 parents 0c1ca3e + 9a8be9e
commit 6bc8413
Show file tree

Hide file tree

Showing 13 changed files with 260 additions and 18 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.morgan.design.weatherslider"
     android:installLocation="auto"
-    android:versionCode="16" 
-    android:versionName="1.16" >
+    android:versionCode="17" 
+    android:versionName="1.17" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -30,7 +30,6 @@
             android:configChanges="keyboardHidden|orientation" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>

diff --git a/assets/changelog.html b/assets/changelog.html
@@ -34,6 +34,17 @@
 		</table>
 
 
+		<h3>---- 1.17 - 28th July 2012</h3>
+		<table style="text-align: left;" border="0" cellpadding="2"
+			cellspacing="2">
+			<tbody>
+				<tr>
+					<td style="text-align: center; vertical-align: top;">+</td>
+					<td>Add Italian Translation</td>
+				</tr>
+			</tbody>
+		</table>
+
 		<h3>---- 1.16 - 28th July 2012</h3>
 		<table style="text-align: left;" border="0" cellpadding="2"
 			cellspacing="2">

diff --git a/gen/com/morgan/design/weatherslider/R.java b/gen/com/morgan/design/weatherslider/R.java
@@ -467,6 +467,7 @@ public static final class string {
         /**  List locations activity 
  List locations activity 
  List locations activity 
+ List locations activity 
  List locations activity 
          */
         public static final int alert_on_location_click_is_this_correct=0x7f06005b;
@@ -476,6 +477,7 @@ public static final class string {
         /**  Home Screen - ManageWeatherChoiceActivity.java 
  Home Screen - ManageWeatherChoiceActivity.java 
  Home Screen - ManageWeatherChoiceActivity.java 
+ Home Screen - ManageWeatherChoiceActivity.java 
  Home Screen - ManageWeatherChoiceActivity.java 
          */
         public static final int alert_title_open_overview=0x7f060053;
@@ -490,13 +492,15 @@ public static final class string {
         /**  Change Log 
  Change Log 
  Change Log 
+ Change Log 
  Change Log 
          */
         public static final int changelog_title=0x7f06000b;
         public static final int chkbox_always_use_gps=0x7f060065;
         /**  Android Mainifest 
  Android Mainifest 
  Android Mainifest 
+ Android Mainifest 
  Android Mainifest 
          */
         public static final int crash_toast_text=0x7f060007;
@@ -514,6 +518,7 @@ public static final class string {
         /**  Feedback form 
  Feedback form 
  Feedback form 
+ Feedback form 
  Feedback form 
          */
         public static final int feedbacktitle=0x7f06001a;
@@ -528,13 +533,15 @@ public static final class string {
         /**  Forecast overview tabs 
  Forecast overview tabs 
  Forecast overview tabs 
+ Forecast overview tabs 
  Forecast overview tabs 
          */
         public static final int forecast_overview_highs_of=0x7f06005c;
         public static final int forecast_overview_lows_of=0x7f06005d;
         /**  Weather Overview activity 
  Weather Overview activity 
  Weather Overview activity 
+ Weather Overview activity 
  Weather Overview activity 
          */
         public static final int further_details=0x7f06002d;
@@ -547,6 +554,7 @@ public static final class string {
         /**  Button / General 
  Button / General 
  Button / General 
+ Button / General 
  Button / General 
          */
         public static final int no_thanks=0x7f060011;
@@ -571,6 +579,7 @@ public static final class string {
         /**  User Preferences activity 
  User Preferences activity 
  User Preferences activity 
+ User Preferences activity 
  User Preferences activity 
          */
         public static final int pref_overview_mode_title=0x7f06002f;
@@ -597,6 +606,7 @@ public static final class string {
         /**  Rate Me 
  Rate Me 
  Rate Me 
+ Rate Me 
  Rate Me 
          */
         public static final int rate_me_title=0x7f06000d;
@@ -611,6 +621,7 @@ public static final class string {
         /**  Service Updates 
  Service Updates 
  Service Updates 
+ Service Updates 
  Service Updates 
          */
         public static final int service_update_getting_your_location=0x7f060071;
@@ -631,12 +642,14 @@ public static final class string {
         /**  https://play.google.com/store/apps/details?id=com.morgan.design.weatherslider 
  https://play.google.com/store/apps/details?id=com.morgan.design.weatherslider 
  https://play.google.com/store/apps/details?id=com.morgan.design.weatherslider 
+ https://play.google.com/store/apps/details?id=com.morgan.design.weatherslider 
  https://play.google.com/store/apps/details?id=com.morgan.design.weatherslider 
          */
         public static final int share_content=0x7f06000f;
         /**  Share Options 
  Share Options 
  Share Options 
+ Share Options 
  Share Options 
          */
         public static final int share_subject=0x7f06000e;
@@ -645,6 +658,7 @@ public static final class string {
         /**  Swipe Areas 
  Swipe Areas 
  Swipe Areas 
+ Swipe Areas 
  Swipe Areas 
          */
         public static final int swipe_left_for_forecast_details=0x7f060087;
@@ -653,6 +667,7 @@ public static final class string {
         /**  Enter location activity 
  Enter location activity 
  Enter location activity 
+ Enter location activity 
  Enter location activity 
          */
         public static final int title_add_a_new_location=0x7f06005e;
@@ -662,6 +677,7 @@ public static final class string {
         /**  NotificationControllerService 
  NotificationControllerService 
  NotificationControllerService 
+ NotificationControllerService 
  NotificationControllerService 
          */
         public static final int toast_max_notifications_reached=0x7f060086;
@@ -670,6 +686,7 @@ public static final class string {
         /**  StaticLookupService 
  StaticLookupService 
  StaticLookupService 
+ StaticLookupService 
  StaticLookupService 
          */
         public static final int toast_unable_to_get_weather_details=0x7f060085;
@@ -680,6 +697,7 @@ public static final class string {
         /**  Notification IDS 
  Notification IDS 
  Notification IDS 
+ Notification IDS 
  Notification IDS 
          */
         public static final int weather_notification_service_1=0x7f06002a;

diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar
diff --git a/pom.xml b/pom.xml
@@ -22,6 +22,13 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>support-v4</artifactId>
+			<version>r6</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.android</groupId>
 			<artifactId>spring-android-rest-template</artifactId>
@@ -102,7 +109,7 @@
 				<plugin>
 					<groupId>com.jayway.maven.plugins.android.generation2</groupId>
 					<artifactId>android-maven-plugin</artifactId>
-					<version>3.1.1</version>
+					<version>3.3.0</version>
 					<extensions>true</extensions>
 					<configuration>
 						<undeployBeforeDeploy>true</undeployBeforeDeploy>

diff --git a/res/values-es/menu_strings.xml b/res/values-es/menu_strings.xml
@@ -3,7 +3,7 @@
     <string name="settings">"Configuración"</string>
     <string name="change_log">"Registro de Cambios"</string>
     <string name="about">"Sobre"</string>
-    <string name="share">"Compartir ..."</string>
+    <string name="share">"Compartir…"</string>
     <string name="create_shortcut">"Crear acceso directo"</string>
     <string name="cancel_all">"Cancelar todo"</string>
     <string name="reload_all">"Actualizar todos"</string>

diff --git a/res/values-it/menu_strings.xml b/res/values-it/menu_strings.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <string name="settings">"Impostazioni"</string>
+    <string name="change_log">"Storia delle news"</string>
+    <string name="about">"circa"</string>
+    <string name="share">"Condividi"</string>
+    <string name="create_shortcut">"Crea collegamento"</string>
+    <string name="cancel_all">"Annullare tutte"</string>
+    <string name="reload_all">"Ricarica tutto"</string>
+
+</resources>