Up library versions and clean up some strings

markwinter · Nov 3, 2014 · d64d743 · d64d743
1 parent 5f8adf6
commit d64d743
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,11 +26,11 @@ android {
 
     buildTypes {
         release {
-            runProguard true
+            minifyEnabled true
             proguardFiles 'proguard-rules.txt'
         }
         debug {
-            runProguard true
+            minifyEnabled true
             proguardFiles 'proguard-rules.txt'
         }
     }
@@ -51,13 +51,12 @@ dependencies {
     compile files('libs/core.jar')
     compile files('libs/dnsjava-2.1.6.jar')
     compile files('libs/kalium-jni-1.0.0-SNAPSHOT.jar')
-    compile 'org.scala-lang:scala-library:2.11.2'
+    compile 'org.scala-lang:scala-library:2.11.4'
     compile 'com.android.support:support-v4:21.0.+'
     compile 'org.scaloid:scaloid_2.11:3.5-10'
     compile 'com.android.support:appcompat-v7:21.0.+'
-    compile 'com.netflix.rxjava:rxjava-core:0.20.4'
-    compile 'com.netflix.rxjava:rxjava-android:0.20.4'
-    compile 'com.netflix.rxjava:rxjava-scala:0.20.4'
-    compile 'com.github.machinarius:preferencefragment:0.1.1'
+    compile 'com.netflix.rxjava:rxjava-core:0.20.6'
+    compile 'com.netflix.rxjava:rxjava-android:0.20.6'
+    compile 'com.netflix.rxjava:rxjava-scala:0.20.6'
     compile 'com.shamanland:fab:0.0.5'
 }
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name" translatable="false">Antox</string>
-
     <!-- Activity titles -->
     <string name="title_activity_add_friend">Afegir un amic</string>
     <string name="title_activity_friend_profile">Perfil de l\'amic</string>
@@ -38,8 +36,6 @@
     <!-- Chat Activity -->
     <string name="chat_enter_message">Envia un missatge</string>
     <string name="chat_file_transfer">Transferència de fitxer</string>
-    <string name="accept_caps">ACCEPTAR</string>
-    <string name="reject_caps">REBUTJAR</string>
 
     <!-- Add Friend Activity -->
     <string name="addfriend_friend_key">El Tox ID del teu amic</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -26,7 +26,6 @@
 
     <!--Main Activity-->
   <string name="main_recent_no">Keine kürzlichen Konversationen</string>
-  <string name="main_try_adding">Warum fügst du nicht welche hinzu?</string>
   <string name="main_no_internet">Keine Internetverbindung</string>
   <string name="main_not_connected">
         Du bist nicht mit dem Internet verbunden. Ohne Internetverbindung

diff --git a/app/src/main/res/values-de/strings_activity_settings.xml b/app/src/main/res/values-de/strings_activity_settings.xml
@@ -27,10 +27,6 @@
   <string name="pref_title_enable_notifications">Benachrichtigungen aktivieren</string>
   <string name="pref_title_new_message_notifications">Benachrichtigung bei Nachrichten</string>
   <string name="pref_title_new_friend_notifications">Benachrichtigung bei Freundschaftsanfragen</string>
-  <string name="pref_title_action_messages">Aktionsnachrichten</string>
-  <string name="pref_title_ringtone">Klingelton</string>
-  <string name="pref_ringtone_silent">Lautlos</string>
-  <string name="pref_title_vibrate">Vibration</string>
 
     <!--Other-->
   <string name="pref_header_other">Andere</string>

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
@@ -65,7 +65,6 @@
   <string name="friend_action_delete">Usuń kontakt</string>
   <string name="friend_action_delete_chat">Usuń historię czatu</string>
   <string name="friend_action_block">Zablokuj</string>
-  <string name="group_action_leave">Opuść grupę</string>
   <string name="contacts_actions_on"></string>
   <string name="contacts_delimiter_requests">Zaproszenia</string>
   <string name="contacts_delimiter_friends">Kontakty</string>