Increased version number to release

Switched to the standard abc_list_selector_holo_dark, that has no problems
in the current appcompat library. Using it from XML file instead of source.

This reverts changes from 03ede77bd1

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.kde.kdeconnect_tp"
-    android:versionCode="733"
-    android:versionName="0.7.3.3">
+    android:versionCode="736"
+    android:versionName="0.7.3.6">
 
     <uses-sdk android:minSdkVersion="9"
               android:targetSdkVersion="21" />
@@ -91,7 +91,7 @@
 
         <activity
                 android:name="org.kde.kdeconnect.UserInterface.CustomDevicesActivity"
-                android:label="@string/custom_device_list"
+                android:label="@string/custom_devices_settings"
                 android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity"
                 >
             <meta-data android:name="android.support.PARENT_ACTIVITY"

StaticMessages.sh

@@ -7,7 +7,7 @@ function export_pot_file # First parameter will be the path of the pot file we h
 {
 	potfile=$1
 	mkdir outdir
-	a2po export --android src/main/res/ --gettext outdir
+	a2po export --android res/ --gettext outdir
 	mv outdir/template.pot $potfile
 	rm -rf outdir
 }
@@ -15,7 +15,7 @@ function export_pot_file # First parameter will be the path of the pot file we h
 function import_po_files # First parameter will be a path that will contain several .po files with the format LANG.po
 {
 	podir=$1
-	a2po import --android src/main/res/ --gettext $podir
+	a2po import --android res/ --gettext $podir
 }
 
 

res/drawable/kitkatcompatselector_activated_background_holo_dark.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true" android:drawable="@drawable/kitkatcompatselector_list_activated_holo" />
-    <item android:drawable="@android:color/transparent" />
-</selector>

res/drawable/kitkatcompatselector_item_background_holo_dark.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/kitkatcompatselector_list_selector_disabled_holo_dark" />
-    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/kitkatcompatselector_list_selector_disabled_holo_dark" />
-    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/kitkatcompatselector_list_selector_background_transition_holo_dark" />
-    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/kitkatcompatselector_list_selector_background_transition_holo_dark" />
-    <item android:state_focused="true"                                                             android:drawable="@drawable/kitkatcompatselector_list_focused_holo" />
-    <item                                                                                          android:drawable="@android:color/transparent" />
-</selector>

res/drawable/kitkatcompatselector_list_selector_background_transition_holo_dark.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<transition xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/kitkatcompatselector_list_pressed_holo_dark"  />
-    <item android:drawable="@drawable/kitkatcompatselector_list_longpressed_holo"  />
-</transition>

res/drawable/kitkatcompatselector_list_selector_holo_dark.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_window_focused="false" android:drawable="@android:color/transparent" />
-
-    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/kitkatcompatselector_list_selector_disabled_holo_dark" />
-    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/kitkatcompatselector_list_selector_disabled_holo_dark" />
-    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/kitkatcompatselector_list_selector_background_transition_holo_dark" />
-    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/kitkatcompatselector_list_selector_background_transition_holo_dark" />
-    <item android:state_focused="true"                                                             android:drawable="@drawable/kitkatcompatselector_list_focused_holo" />
-</selector>

res/layout/list_item_entry.xml

@@ -4,11 +4,14 @@
     android:layout_width="fill_parent"
     android:baselineAligned="false"
     android:layout_height="wrap_content"
+    android:paddingLeft="12dip"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
     android:paddingRight="?android:attr/scrollbarSize"
+    android:background="@drawable/abc_list_selector_holo_dark"
     android:orientation="vertical">
-
+    <!-- We should use android:background="@android:/listChoiceBackgroundIndicator"
+         instead of abc_list_selector_holo_dark but that's only supported from API11 -->
 
     <TextView android:id="@+id/list_item_entry_title"
         android:layout_width="wrap_content"

res/menu/main.xml

@@ -29,8 +29,8 @@
         android:id="@+id/menu_custom_device_list"
         android:icon="@drawable/ic_action_settings"
         android:orderInCategory="900"
-        android:title="Custom Device List"
+        android:title="@string/custom_device_list"
         kdeconnect:showAsAction="never"
         />
 
-</menu>
+</menu>

res/values-bg/strings.xml

@@ -70,6 +70,9 @@
   <string name="device_name">Име на устройството</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Невалидно име на устройство</string>
+  <string name="custom_devices_settings">Няма устройства</string>
+  <string name="custom_device_list">Няма устройства</string>
+  <string name="custom_device_list_summary">Няма устройства</string>
   <string name="share_notification_preference">Синхронизиране на уведомленията</string>
   <string-array name="mpris_time_entries">
     <item>10 seconds</item>

res/values-ca/strings.xml

@@ -88,6 +88,9 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">El nom del dispositiu no és vàlid</string>
   <string name="shareplugin_text_saved">S\'ha rebut text i s\'ha desat al porta-retalls</string>
+  <string name="custom_devices_settings">Llista personalitzada de dispositius</string>
+  <string name="custom_device_list">Llista personalitzada de dispositius</string>
+  <string name="custom_device_list_summary">Llista personalitzada de dispositius</string>
   <string name="share_notification_preference">Rebombori de les notificacions</string>
   <string name="share_notification_preference_summary">Vibra i reprodueix un so en rebre un fitxer</string>
   <string name="sftp_internal_storage">Emmagatzematge intern</string>
@@ -96,6 +99,8 @@
   <string name="sftp_sdcard">Targeta SD</string>
   <string name="sftp_readonly">(només de lectura)</string>
   <string name="sftp_camera">Imatges de la càmera</string>
+  <string name="add_host">Afegeix una màquina/IP</string>
+  <string name="custom_dev_list_help">Empreu aquesta opció només si el dispositiu no és detectat automàticament. Introduïu a sota l\'adreça IP o nom de la màquina i premeu el botó per afegir-lo a la llista. Seleccioneu un element existent per eliminar-lo de la llista.</string>
   <string-array name="mpris_time_entries">
     <item>10 segons</item>
     <item>20 segons</item>

res/values-cs/strings.xml

@@ -88,6 +88,9 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Neplatný název zařízení</string>
   <string name="shareplugin_text_saved">Přijatý text byl uložen do schránky</string>
+  <string name="custom_devices_settings">Seznam vlastních zařízení</string>
+  <string name="custom_device_list">Seznam vlastních zařízení</string>
+  <string name="custom_device_list_summary">Seznam vlastních zařízení</string>
   <string name="share_notification_preference">Hlasitá upozornění</string>
   <string name="share_notification_preference_summary">Vibrovat a přehrát melodii při přijímání souboru</string>
   <string name="sftp_internal_storage">Interní úložiště</string>
@@ -96,6 +99,8 @@
   <string name="sftp_sdcard">SD karta</string>
   <string name="sftp_readonly">(pouze ke čtení)</string>
   <string name="sftp_camera">Obrázky z fotoaparátu</string>
+  <string name="add_host">Přidat stroj/IP</string>
+  <string name="custom_dev_list_help">Použijte tuto možnost pouze pokud není vaše zařízení automaticky detekováno. Zadejte níže IP adresu a název hostitele a stiskněte tlačítko pro přidání do seznamu. Stiskněte existující položku pro odstranění ze seznamu.</string>
   <string-array name="mpris_time_entries">
     <item>10 sekund</item>
     <item>20 sekund</item>

res/values-da/strings.xml

@@ -83,6 +83,9 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Ugyldigt enhedsnavn</string>
   <string name="shareplugin_text_saved">Modtog tekst, gemt til udklipsholder</string>
+  <string name="custom_devices_settings">Ingen enheder</string>
+  <string name="custom_device_list">Ingen enheder</string>
+  <string name="custom_device_list_summary">Ingen enheder</string>
   <string name="share_notification_preference">Synk. af bekendtgørelser</string>
   <string-array name="mpris_time_entries">
     <item>10 seconds</item>

res/values-de/strings.xml

@@ -79,6 +79,9 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Ungültiger Gerätename</string>
   <string name="shareplugin_text_saved">Text empfangen und in der Zwischenablage gespeichert</string>
+  <string name="custom_devices_settings">Benutzerdefinierte Geräteliste</string>
+  <string name="custom_device_list">Benutzerdefinierte Geräteliste</string>
+  <string name="custom_device_list_summary">Benutzerdefinierte Geräteliste</string>
   <string name="share_notification_preference">Benachrichtigungs-Abgleich</string>
   <string name="share_notification_preference_summary">Beim Empfang einer Datei vibrieren und einen Sound abspielen</string>
   <string name="sftp_internal_storage">Interner Speicher</string>
@@ -87,6 +90,7 @@
   <string name="sftp_sdcard">SD-Karte</string>
   <string name="sftp_readonly">(Nur lesen)</string>
   <string name="sftp_camera">Kamerabilder</string>
+  <string name="add_host">Rechner/IP hinzufügen</string>
   <string-array name="mpris_time_entries">
     <item>10 Sekunden</item>
     <item>20 Sekunden</item>

res/values-es/strings.xml

@@ -88,6 +88,9 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Nombre de dispositivo no válido</string>
   <string name="shareplugin_text_saved">Texto recibido y guardado en el portapapeles</string>
+  <string name="custom_devices_settings">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list_summary">Lista de dispositivos personalizada</string>
   <string name="share_notification_preference">Notificaciones ruidosas</string>
   <string name="share_notification_preference_summary">Vibrar y reproducir un sonido cuando se reciba un archivo</string>
   <string name="sftp_internal_storage">Almacenamiento interno</string>
@@ -96,6 +99,8 @@
   <string name="sftp_sdcard">Tarjeta SD</string>
   <string name="sftp_readonly">(solo lectura)</string>
   <string name="sftp_camera">Imágenes de la cámara</string>
+  <string name="add_host">Añadir IP/nombre</string>
+  <string name="custom_dev_list_help">Use esta opción solo si su dispositivo no es detectado automáticamente. Introduzca la dirección IP o nombre debajo y pulse el botón para añadirlo a la lista. Pulse un ítem existente para eliminarlo de la lista.</string>
   <string-array name="mpris_time_entries">
     <item>10 segundos</item>
     <item>20 segundos</item>

res/values-fi/strings.xml

@@ -33,23 +33,23 @@
   <string name="mousepad_right_click">Oikea napsautus</string>
   <string name="mousepad_middle_click">Keskinapsautus</string>
   <string name="category_connected_devices">Yhdistetyt laitteet</string>
-  <string name="category_not_paired_devices">Ei laitepareja</string>
+  <string name="category_not_paired_devices">Pariksi liitetyt laitteet</string>
   <string name="category_remembered_devices">Muistetut laitteet</string>
   <string name="plugins_failed_to_load">Liitännäisten lataus epäonnistui (lisätietoa napauttamalla):</string>
   <string name="device_menu_plugins">Valitse liitännäiset</string>
-  <string name="device_menu_unpair">Irrota paritus</string>
+  <string name="device_menu_unpair">Poista laitepari</string>
   <string name="device_not_reachable">Laitepari tavoittamattomissa</string>
   <string name="unknown_device">Tuntematon laite</string>
   <string name="error_not_reachable">Laite tavoittamattomissa</string>
-  <string name="error_already_requested">Paritusta on jo pyydetty</string>
-  <string name="error_already_paired">Laitepari on jo muodostettu</string>
+  <string name="error_already_requested">Pariksi kytkemistä on jo pyydetty</string>
+  <string name="error_already_paired">Laite on jo kytketty pariksi</string>
   <string name="error_could_not_send_package">Ei voitu lähettää pakettia</string>
   <string name="error_timed_out">Aikakatkaisu</string>
   <string name="error_canceled_by_user">Käyttäjä perui</string>
   <string name="error_canceled_by_other_peer">Vertaiskäyttäjä perui</string>
   <string name="error_invalid_key">Vastaanotettiin väärä avain</string>
-  <string name="pair_requested">Parituspyyntö</string>
-  <string name="pairing_request_from">Parituspyyntö kohteesta %1s</string>
+  <string name="pair_requested">Paripyyntö</string>
+  <string name="pairing_request_from">Paripyyntö kohteesta %1s</string>
   <string name="received_url_title">Vastaanotettiin linkki lähettäjältä %1s</string>
   <string name="received_url_text">Avaa ”%1s” napauttamalla</string>
   <string name="incoming_file_title">Saapuva tiedosto lähettäjältä %1s</string>
@@ -61,12 +61,12 @@
   <string name="right_click">Lähetä oikean painikkeen napsautus</string>
   <string name="middle_click">Lähetä keskipainikkeen napsautus</string>
   <string name="show_keyboard">Näytä näppäimistö</string>
-  <string name="device_not_paired">Ei laiteparia</string>
-  <string name="request_pairing">Pyydä paritusta</string>
+  <string name="device_not_paired">Laitetta ei ole kytketty pariksi</string>
+  <string name="request_pairing">Pyydä pariksi kytkemistä</string>
   <string name="pairing_accept">Hyväksy</string>
   <string name="pairing_reject">Hylkää</string>
   <string name="device">Laite</string>
-  <string name="pair_device">Parita laite</string>
+  <string name="pair_device">Kytke laite pariksi</string>
   <string name="remote_control">Kauko-ohjain</string>
   <string name="settings">KDE Connectin asetukset</string>
   <string name="mpris_play">Toista</string>
@@ -88,6 +88,9 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Virheellinen laitenimi</string>
   <string name="shareplugin_text_saved">Vastaanotettiin tekstiä, tallennettiin leikepöydälle</string>
+  <string name="custom_devices_settings">Omien laitteiden luettelo</string>
+  <string name="custom_device_list">Omien laitteiden luettelo</string>
+  <string name="custom_device_list_summary">Omien laitteiden luettelo</string>
   <string name="share_notification_preference">Äänekkäät ilmoitukset</string>
   <string name="share_notification_preference_summary">Värise ja soita ääni tiedoston saapuessa</string>
   <string name="sftp_internal_storage">Sisäinen muisti</string>
@@ -96,6 +99,8 @@
   <string name="sftp_sdcard">SD-kortti</string>
   <string name="sftp_readonly">(vain luku)</string>
   <string name="sftp_camera">Kamerakuvat</string>
+  <string name="add_host">Lisää kone/IP</string>
+  <string name="custom_dev_list_help">Käytä tätä vain, jos laitettasi ei tunnisteta automaattisesti. Kirjoita IP-osoite tai konenimi alle ja kosketa painiketta lisätäksesi sen luetteloon. Kosketa olemassa olevaa kohtaa poistaaksesi sen luettelosta.</string>
   <string-array name="mpris_time_entries">
     <item>10 sekuntia</item>
     <item>20 sekuntia</item>

res/values-fr/strings.xml

@@ -70,6 +70,9 @@
   <string name="device_name">Nom du périphérique</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Nom de périphérique non valable</string>
+  <string name="custom_devices_settings">Pas de périphériques</string>
+  <string name="custom_device_list">Pas de périphériques</string>
+  <string name="custom_device_list_summary">Pas de périphériques</string>
   <string name="share_notification_preference">Synchronisation des notifications</string>
   <string-array name="mpris_time_entries">
     <item>10 seconds</item>

res/values-hu/strings.xml

@@ -82,6 +82,9 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Érvénytelen eszköznév</string>
   <string name="shareplugin_text_saved">Szöveg érkezett, elmentve a vágólapra</string>
+  <string name="custom_devices_settings">Nincsenek eszközök</string>
+  <string name="custom_device_list">Nincsenek eszközök</string>
+  <string name="custom_device_list_summary">Nincsenek eszközök</string>
   <string name="share_notification_preference">Értesítés szinkronizáció</string>
   <string-array name="mpris_time_entries">
     <item>10 seconds</item>

res/values-it/strings.xml

@@ -68,6 +68,9 @@
   <string name="device_name">Nome dispositivo</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Nome non valido</string>
+  <string name="custom_devices_settings">Nessun dispositivo</string>
+  <string name="custom_device_list">Nessun dispositivo</string>
+  <string name="custom_device_list_summary">Nessun dispositivo</string>
   <string name="share_notification_preference">Sincronizzazione notifiche</string>
   <string-array name="mpris_time_entries">
     <item>10 seconds</item>

res/values-ko/strings.xml

@@ -70,6 +70,9 @@
   <string name="device_name">장치 이름</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">잘못된 장치 이름</string>
+  <string name="custom_devices_settings">장치 없음</string>
+  <string name="custom_device_list">장치 없음</string>
+  <string name="custom_device_list_summary">장치 없음</string>
   <string name="share_notification_preference">알림 동기화</string>
   <string-array name="mpris_time_entries">
     <item>10 seconds</item>

res/values-nl/strings.xml

@@ -88,6 +88,9 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Ongeldige apparaatnaam</string>
   <string name="shareplugin_text_saved">Oontvangen tekst, opgeslagen op klembord</string>
+  <string name="custom_devices_settings">Aangepaste lijst apparaten</string>
+  <string name="custom_device_list">Aangepaste lijst apparaten</string>
+  <string name="custom_device_list_summary">Aangepaste lijst apparaten</string>
   <string name="share_notification_preference">Luidruchtige meldingen</string>
   <string name="share_notification_preference_summary">Vibreer en speel een geluidje bij ontvangen van een bestand</string>
   <string name="sftp_internal_storage">Interne opslag</string>
@@ -96,6 +99,8 @@
   <string name="sftp_sdcard">SD-kaartje</string>
   <string name="sftp_readonly">(alleen-lezen)</string>
   <string name="sftp_camera">Afbeeldingen van camera</string>
+  <string name="add_host">Host/IP-adres toevoegen</string>
+  <string name="custom_dev_list_help">Deze optie alleen gebruiken als uw apparaat niet automatisch gedetecteerd wordt. Voer IP-adres of hostnaam hieronder in en klik op de knop om het aan de lijst toe te voegen. Klik op een bestaand item om het uit de lijst te verwijderen.</string>
   <string-array name="mpris_time_entries">
     <item>10 seconden</item>
     <item>20 seconden</item>

res/values-pl/strings.xml

@@ -88,6 +88,9 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Nieprawidłowa nazwa urządzenia</string>
   <string name="shareplugin_text_saved">Otrzymano tekst, zapisano do schowka</string>
+  <string name="custom_devices_settings">Lista własnych urządzeń</string>
+  <string name="custom_device_list">Lista własnych urządzeń</string>
+  <string name="custom_device_list_summary">Lista własnych urządzeń</string>
   <string name="share_notification_preference">Hałaśliwe powiadomienia</string>
   <string name="share_notification_preference_summary">Zadrżyj i odegraj dźwięk przy odebraniu pliku</string>
   <string name="sftp_internal_storage">"Pamięć wewnętrzna "</string>
@@ -96,6 +99,8 @@
   <string name="sftp_sdcard">Karta SD</string>
   <string name="sftp_readonly">(tylko do odczytu)</string>
   <string name="sftp_camera">Zdjęcia z aparatu</string>
+  <string name="add_host">Dodaj gospodarza/IP</string>
+  <string name="custom_dev_list_help">Użyj tej opcji tylko wtedy, gdy twoje urządzenie nie jest samoczynnie wykrywane. Podaj adres IP i nazwę gospodarza poniżej i dotknij przycisku, aby dodać je do listy. Dotknij istniejącego elementu, aby usunąć go z listy.</string>
   <string-array name="mpris_time_entries">
     <item>10 sekund</item>
     <item>20 sekund</item>

res/values-pt-rBR/strings.xml

@@ -88,6 +88,9 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Nome do dispositivo inválido</string>
   <string name="shareplugin_text_saved">Texto recebido e salvo na área de transferência</string>
+  <string name="custom_devices_settings">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list_summary">Lista de dispositivos personalizada</string>
   <string name="share_notification_preference">Notificações barulhentas</string>
   <string name="share_notification_preference_summary">Vibrar e tocar um som ao receber um arquivo</string>
   <string name="sftp_internal_storage">Armazenamento interno</string>
@@ -96,6 +99,8 @@
   <string name="sftp_sdcard">Cartão SD</string>
   <string name="sftp_readonly">(somente leitura)</string>
   <string name="sftp_camera">Imagens da câmera</string>
+  <string name="add_host">Adicionar máquina/IP</string>
+  <string name="custom_dev_list_help">Use esta opção apenas se o seu dispositivo não for detectado automaticamente. Digite o endereço IP ou nome da máquina no campo abaixo e toque o botão para adicioná-lo à lista. Toque em um item existente para removê-lo da lista.</string>
   <string-array name="mpris_time_entries">
     <item>10 segundos</item>
     <item>20 segundos</item>

res/values-pt/strings.xml

@@ -88,6 +88,9 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Nome do dispositivo inválido</string>
   <string name="shareplugin_text_saved">Texto recebido e guardado na área de transferência</string>
+  <string name="custom_devices_settings">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list_summary">Lista de dispositivos personalizada</string>
   <string name="share_notification_preference">Notificações com ruído</string>
   <string name="share_notification_preference_summary">Vibrar e tocar um som ao receber um ficheiro</string>
   <string name="sftp_internal_storage">Armazenamento interno</string>
@@ -96,6 +99,8 @@
   <string name="sftp_sdcard">Cartão SD</string>
   <string name="sftp_readonly">(apenas para leitura)</string>
   <string name="sftp_camera">Fotografias</string>
+  <string name="add_host">Adicionar uma máquina/IP</string>
+  <string name="custom_dev_list_help">Use esta opção apenas se o seu dispositivo não for detectado automaticamente. Indique o endereço IP ou nome da máquina em baixo e carregue no botão para a adicionar à lista. Carregue sobre um item existente para o remover da lista.</string>
   <string-array name="mpris_time_entries">
     <item>10 segundos</item>
     <item>20 segundos</item>

res/values-ro/strings.xml

@@ -70,6 +70,9 @@
   <string name="device_name">Denumire dispozitiv</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Denumire nevalidă a dispozitivului</string>
+  <string name="custom_devices_settings">Niciun dispozitiv</string>
+  <string name="custom_device_list">Niciun dispozitiv</string>
+  <string name="custom_device_list_summary">Niciun dispozitiv</string>
   <string name="share_notification_preference">Sincronizare notificări</string>
   <string-array name="mpris_time_entries">
     <item>10 seconds</item>

res/values-ru/strings.xml

@@ -64,6 +64,9 @@
   <string name="plugin_settings_with_name">Открыть настройки</string>
   <string name="device_name">Устройство не спарено</string>
   <string name="invalid_device_name">Недопустимый получатель ключа</string>
+  <string name="custom_devices_settings">Нет устройств</string>
+  <string name="custom_device_list">Нет устройств</string>
+  <string name="custom_device_list_summary">Нет устройств</string>
   <string name="share_notification_preference">Синхронизация уведомлений</string>
   <string-array name="mpris_time_entries">
     <item>10 seconds</item>

res/values-sk/strings.xml

@@ -88,6 +88,9 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Neplatný názov zariadenia</string>
   <string name="shareplugin_text_saved">Prijatý text, uložený do schránky</string>
+  <string name="custom_devices_settings">Zoznam vlastných zariadení</string>
+  <string name="custom_device_list">Zoznam vlastných zariadení</string>
+  <string name="custom_device_list_summary">Zoznam vlastných zariadení</string>
   <string name="share_notification_preference">Hlučné pripomienky</string>
   <string name="share_notification_preference_summary">Vibrovať a prehrať zvuk pri prijatí súboru</string>
   <string name="sftp_internal_storage">Interné úložisko</string>
@@ -96,6 +99,8 @@
   <string name="sftp_sdcard">SD karta</string>
   <string name="sftp_readonly">(iba na čítanie)</string>
   <string name="sftp_camera">Obrázky fotoaparátu</string>
+  <string name="add_host">Pridať hostiteľa/IP</string>
+  <string name="custom_dev_list_help">Túto voľbu použite iba vtedy, ak vaše zariadenie nie je automaticky detekované. Zadajte IP adresu alebo názov hostiteľa nižšie a kliknite na tlačidlo na pridanie do zoznamu. Kliknite na existujúcu položku na odstránenie jej zo zoznamu.</string>
   <string-array name="mpris_time_entries">
     <item>10 sekúnd</item>
     <item>20 sekúnd</item>

res/values-sv/strings.xml

@@ -85,6 +85,9 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Ogiltigt apparatnamn</string>
   <string name="shareplugin_text_saved">Tog emot text, spara på klippbordet</string>
+  <string name="custom_devices_settings">Inga apparater</string>
+  <string name="custom_device_list">Inga apparater</string>
+  <string name="custom_device_list_summary">Inga apparater</string>
   <string name="share_notification_preference">Ljudliga underrättelser</string>
   <string name="share_notification_preference_summary">Vibrera och spela ett ljud när en fil tas emot</string>
   <string name="sftp_internal_storage">Intern lagring</string>

res/values-sw600dp/dimens.xml

@@ -1,4 +0,0 @@
-<resources>
-    <!-- Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw600dp devices (e.g. 7" tablets) here. -->
-</resources>

res/values-sw720dp-land/dimens.xml

@@ -1,5 +0,0 @@
-<resources>
-    <!-- Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here. -->
-    <dimen name="activity_horizontal_margin">128dp</dimen>
-</resources>

res/values-uk/strings.xml

@@ -88,6 +88,9 @@
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Некоректна назва пристрою</string>
   <string name="shareplugin_text_saved">Отримано текст, збережено до буфера обміну даними</string>
+  <string name="custom_devices_settings">Список нетипових пристроїв</string>
+  <string name="custom_device_list">Список нетипових пристроїв</string>
+  <string name="custom_device_list_summary">Список нетипових пристроїв</string>
   <string name="share_notification_preference">Звукові сповіщення</string>
   <string name="share_notification_preference_summary">Вібрація і відтворення звуку у відповідь на отримання файла</string>
   <string name="sftp_internal_storage">Вбудоване сховище даних</string>
@@ -96,6 +99,8 @@
   <string name="sftp_sdcard">Картка SD</string>
   <string name="sftp_readonly">(лише читання)</string>
   <string name="sftp_camera">Знімки фотоапарата</string>
+  <string name="add_host">Додати вузол/IP</string>
+  <string name="custom_dev_list_help">Цим пунктом слід користуватися, лише якщо ваш пристрій не було визначено у автоматичному режимі. Введіть IP-адресу або назву вузла нижче і натисніть кнопку, щоб додати пункт до списку. Натисніть наявний пункт, щоб вилучити його зі списку.</string>
   <string-array name="mpris_time_entries">
     <item>10 секунд</item>
     <item>20 секунд</item>

res/values-v11/themes_kitkatcompatselector.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Generated with http://android-holo-colors.com -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <style name="KitKatCompatSelector" parent="Theme.AppCompat">
-
-    <item name="android:listChoiceBackgroundIndicator">@drawable/kitkatcompatselector_list_selector_holo_dark</item>
-
-    <item name="android:activatedBackgroundIndicator">@drawable/kitkatcompatselector_activated_background_holo_dark</item>
-
-  </style>
-
-</resources>

res/values/colors_kitkatcompatselector.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="kitkatcompatselector_color">#33b5e5</color>
-</resources>

res/values/strings.xml

@@ -40,7 +40,7 @@
     <string name="mousepad_right_click">Right click</string>
     <string name="mousepad_middle_click">Middle click</string>
     <string name="category_connected_devices">Connected devices</string>
-    <string name="category_not_paired_devices">Not paired devices</string>
+    <string name="category_not_paired_devices">Available devices</string>
     <string name="category_remembered_devices">Remembered devices</string>
     <string name="plugins_failed_to_load">Plugins failed to load (tap for more info):</string>
     <string name="device_menu_plugins">Select plugins</string>
@@ -99,8 +99,7 @@
     <string name="invalid_device_name">Invalid device name</string>
     <string name="shareplugin_text_saved">Received text, saved to clipboard</string>
     <string name="custom_devices_settings">Custom device list</string>
-    <string name="custom_device_list">Custom device list</string>
-    <string name="custom_device_list_summary">Custom device list</string>
+    <string name="custom_device_list">Add devices by IP</string>
     <string name="share_notification_preference">Noisy notifications</string>
     <string name="share_notification_preference_summary">Vibrate and play a sound when receiving a file</string>
     <string name="sftp_internal_storage">Internal storage</string>

res/values/styles_kitkatcompatselector.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Generated with http://android-holo-colors.com -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <style name="ListViewKitKatCompatSelector" parent="android:Widget.ListView">
-      <item name="android:listSelector">@drawable/kitkatcompatselector_list_selector_holo_dark</item>
-  </style>
-
-  <style name="ListViewKitKatCompatSelector.White" parent="android:Widget.ListView.White">
-      <item name="android:listSelector">@drawable/kitkatcompatselector_list_selector_holo_dark</item>
-  </style>
-
-  <style name="SpinnerItemKitKatCompatSelector" parent="android:TextAppearance.Widget.TextView.SpinnerItem">
-      <item name="android:textColor">#ffffff</item>
-  </style>
-
-</resources>

res/values/themes_kitkatcompatselector.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Generated with http://android-holo-colors.com -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <style name="KitKatCompatSelector" parent="Theme.AppCompat">
-
-    <item name="android:listViewStyle">@style/ListViewKitKatCompatSelector</item>
-
-    <item name="android:listViewWhiteStyle">@style/ListViewKitKatCompatSelector.White</item>
-
-    <item name="android:spinnerItemStyle">@style/SpinnerItemKitKatCompatSelector</item>
-
-  </style>
-
-</resources>

src/org/kde/kdeconnect/Helpers/StorageHelper.java

@@ -32,6 +32,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Scanner;
 import java.util.StringTokenizer;
 
 //Code from http://stackoverflow.com/questions/9340332/how-can-i-get-the-list-of-mounted-external-storage-of-android-device/19982338#19982338
@@ -83,20 +84,29 @@ public class StorageHelper {
 
         File storage = new File("/storage/");
         if (storage.exists() && storage.isDirectory()) {
+            String mounts = null;
+            try {
+                mounts = new Scanner( new File("/proc/mounts") ).useDelimiter("\\A").next();
+                //Log.e("Mounts",mounts);
+            } catch(Exception e) {
+                e.printStackTrace();
+            }
+
             File dirs[] = storage.listFiles();
-            for (File dir : dirs)
-            {
-                Log.e("getStorageList", "path: "+dir.getAbsolutePath());
+            for (File dir : dirs) {
+                //Log.e("getStorageList", "path: "+dir.getAbsolutePath());
                 if (dir.isDirectory()) {
-                    String path;
+                    String path, path2;
+                    path2 = dir.getAbsolutePath();
                     try {
-                        Log.e(dir.getAbsolutePath(), dir.getCanonicalPath());
+                        //Log.e(dir.getAbsolutePath(), dir.getCanonicalPath());
                         path = dir.getCanonicalPath();
                     } catch(Exception e){
-                        path = dir.getAbsolutePath();
+                        path = path2;
                     }
                     if (!path.startsWith("/storage/emulated") || dirs.length == 1) {
-                        if (!paths.contains(path) && !paths.contains(dir.getAbsolutePath())) {
+                        if (!paths.contains(path) && !paths.contains(path2)) {
+                            if (mounts == null || mounts.contains(path) || mounts.contains(path2))
                             list.add(0, new StorageInfo(path, false, true, cur_removable_number++));
                             paths.add(path);
                         }
@@ -105,47 +115,22 @@ public class StorageHelper {
             }
         } else {
 
+            //Legacy code for Android < 4.0 that still didn't have /storage
+
+            ArrayList<String> entries = new ArrayList<String>();
             BufferedReader buf_reader = null;
             try {
-
                 buf_reader = new BufferedReader(new FileReader("/proc/mounts"));
-                ArrayList<String> entries = new ArrayList<String>();
                 String entry;
-                while ((entry = buf_reader.readLine()) != null) {
-                    Log.e("getStorageList", entry);
-                    if (entry.contains("vfat") || entry.contains("/mnt")) {
+                while((entry = buf_reader.readLine()) != null) {
+                    //Log.e("getStorageList", entry);
+                    if (entry.contains("vfat") || entry.contains("exfat") || entry.contains("ntfs") || entry.contains("/mnt")) {
                         if (entry.contains("/storage/sdcard")) entries.add(0, entry);
                         else entries.add(entry);
                     }
                 }
-
-                for (String line : entries) {
-                    StringTokenizer tokens = new StringTokenizer(line, " ");
-                    String unused = tokens.nextToken(); //device
-                    String mount_point = tokens.nextToken(); //mount point
-                    if (paths.contains(mount_point)) {
-                        continue;
-                    }
-                    unused = tokens.nextToken(); //file system
-                    List<String> flags = Arrays.asList(tokens.nextToken().split(",")); //flags
-                    boolean readonly = flags.contains("ro");
-
-                    if (line.contains("/dev/block/vold")) {
-                        if (!line.contains("/mnt/secure")
-                                && !line.contains("/mnt/asec")
-                                && !line.contains("/mnt/obb")
-                                && !line.contains("/dev/mapper")
-                                && !line.contains("tmpfs")) {
-                            paths.add(mount_point);
-                            list.add(new StorageInfo(mount_point, readonly, true, cur_removable_number++));
-                        }
-                    }
-                }
-
-            } catch (FileNotFoundException ex) {
-                ex.printStackTrace();
-            } catch (IOException ex) {
-                ex.printStackTrace();
+            } catch (Exception e) {
+                e.printStackTrace();
             } finally {
                 if (buf_reader != null) {
                     try {
@@ -154,7 +139,32 @@ public class StorageHelper {
                     }
                 }
             }
+
+            for (String line : entries) {
+                StringTokenizer tokens = new StringTokenizer(line, " ");
+                String unused = tokens.nextToken(); //device
+                String mount_point = tokens.nextToken(); //mount point
+                if (paths.contains(mount_point)) {
+                    continue;
+                }
+                unused = tokens.nextToken(); //file system
+                List<String> flags = Arrays.asList(tokens.nextToken().split(",")); //flags
+                boolean readonly = flags.contains("ro");
+
+                if (line.contains("/dev/block/vold")) {
+                    if (!line.contains("/mnt/secure")
+                            && !line.contains("/mnt/asec")
+                            && !line.contains("/mnt/obb")
+                            && !line.contains("/dev/mapper")
+                            && !line.contains("tmpfs")) {
+                        paths.add(mount_point);
+                        list.add(new StorageInfo(mount_point, readonly, true, cur_removable_number++));
+                    }
+                }
+            }
+
         }
+
         return list;
     }
 

src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java

@@ -26,6 +26,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.preference.PreferenceManager;
+import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -45,7 +46,7 @@ import org.kde.kdeconnect_tp.R;
 
 import java.util.ArrayList;
 
-public class MprisActivity extends Activity {
+public class MprisActivity extends ActionBarActivity {
 
     //TODO: Add a loading spinner at the beginning (to distinguish the loading state from a no-players state).
     //TODO 2: Add a message when no players are detected after loading completes

src/org/kde/kdeconnect/UserInterface/List/DeviceItem.java

@@ -24,7 +24,6 @@ package org.kde.kdeconnect.UserInterface.List;
 import android.app.Activity;
 import android.content.Intent;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TextView;
 
@@ -47,9 +46,6 @@ public class DeviceItem implements ListAdapter.Item {
     public View inflateView(LayoutInflater layoutInflater) {
         final View v = layoutInflater.inflate(R.layout.list_item_entry, null);
 
-        //Highlight when selected effect
-        v.setBackgroundDrawable(layoutInflater.getContext().getResources().getDrawable(R.drawable.kitkatcompatselector_list_selector_holo_dark));
-
         TextView titleView = (TextView)v.findViewById(R.id.list_item_entry_title);
         if (titleView != null) titleView.setText(device.getName());
         if (device.compareProtocolVersion() != 0) {

src/org/kde/kdeconnect/UserInterface/List/SmallEntryItem.java

@@ -50,8 +50,7 @@ public class SmallEntryItem implements ListAdapter.Item {
         if (titleView != null) titleView.setText(title);
         if (clickListener != null) {
             titleView.setOnClickListener(clickListener);
-            v.setBackgroundDrawable(layoutInflater.getContext().getResources().getDrawable(R.drawable.kitkatcompatselector_list_selector_holo_dark));
-
+            v.setBackgroundDrawable(layoutInflater.getContext().getResources().getDrawable(R.drawable.abc_list_selector_holo_dark));
         }
 
         return v;

store/.gitignore

@@ -0,0 +1,2 @@
+l10n-kde4
+localized

store/Messages.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+cp store-texts.pot $podir/kdeconnect-android-store.pot
+

store/fetchTranslations.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+if [ -e l10n-kde4 ]; then
+    cd l10n-kde4
+    svn update
+    cd ..
+else
+    svn co svn://anonsvn.kde.org/home/kde/trunk/l10n-kde4/
+fi
+
+mkdir -p localized
+for subdir in `cat l10n-kde4/subdirs`; do
+    if [ -e l10n-kde4/$subdir/messages/playground-base/kdeconnect-android-store.po ]; then
+        #echo "Found translation for $subdir"
+        cp l10n-kde4/$subdir/messages/playground-base/kdeconnect-android-store.po localized/$subdir.new.po
+        if [ -e localized/$subdir.po ]; then
+            #echo "Comparing with existing translation"
+            if diff localized/$subdir.new.po localized/$subdir.po > /dev/null; then
+                #echo "Same translation for $subdir"
+                rm localized/$subdir.new.po
+            else
+                echo "Translation for $subdir changed"
+                mv localized/$subdir.new.po localized/$subdir.po
+            fi
+        else
+            echo "New translation for $subdir"
+            mv localized/$subdir.new.po localized/$subdir.po
+        fi
+    fi
+done

store/store-texts.pot

@@ -0,0 +1,39 @@
+# KDE Connect store listing texts
+# Copyright (C) 2014 Albert Vaca Cintora
+# This file is distributed under the same license as kdeconnect-android.
+# Albert Vaca Cintora <albertvaka@gmail.com>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2014-11-23 22:02-0800\n"
+"PO-Revision-Date: 2014-11-23 22:02-0800\n"
+"Last-Translator: Albert Vaca Cintora <albertvaka@gmail.com>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: dummy:1
+msgid "Integrate Android with the KDE Plasma Desktop."
+msgstr ""
+
+#: dummy:2
+msgid ""
+"KDE Connect provides several features to integrate your phone and your computer:"
+""
+"- Share files and URLs to KDE from any app, without wires."
+"- Touchpad emulation: Use your phone screen as your computer's touchpad*."
+"- Notifications sync (4.3+): Read your Android notifications from the desktop."
+"- Shared clipboard: copy and paste between your phone and your computer."
+"- Multimedia remote control: Use your phone as a remote for Linux media players."
+"- WiFi connection: no usb wire or bluetooth needed."
+"- RSA Encryption: your information is safe."
+""
+"Please note you will need to install KDE Connect on your computer for this app to work, and keep the desktop version up-to-date with the Android version for the latest features to work."
+""
+"*NOTE for Ubuntu users: The Ubuntu folks are not updating their repos as fast as this app gets updated. Some features will not work if the KDE Connect version in you desktop doesn't match the one in your phone. To make sure you always have the latest version on your desktop, use this PPA  repository:  https://code.launchpad.net/~vikoadi/+archive/ubuntu/ppa/"
+""
+"This app is part of an open source project, visit the website to grab the sources."
+msgstr ""