Merge two-way synch changes with synch-service refactoring for SSL warning

AndroidManifest.xml

@@ -143,12 +143,12 @@
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
             </intent-filter>
         </receiver>
-        <!--  receiver android:name=".files.BootupBroadcastReceiver">
+        <receiver android:name=".files.BootupBroadcastReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
-        </receiver -->
-        <!--  service android:name=".files.services.FileObserverService"/ -->
+        </receiver>
+        <service android:name=".files.services.FileObserverService"/>
     </application>
 
 </manifest>

res/values-de-rDE/strings.xml

@@ -0,0 +1,180 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="hello">Hallo Welt, ownCloud-Start-Bildschirm!</string>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">Passwort:</string>
+  <string name="main_login">Benutzername:</string>
+  <string name="main_button_login">Anmelden</string>
+  <string name="main_welcome">Herzlich willkommen bei Deiner ownCloud!</string>
+  <string name="main_files">Dateien</string>
+  <string name="main_music">Musik</string>
+  <string name="main_contacts">Kontakte</string>
+  <string name="main_calendar">Kalender</string>
+  <string name="main_bookmarks">Lesezeichen</string>
+  <string name="main_settings">Einstellungen</string>
+  <string name="main_tit_accsetup">Konto einrichten</string>
+  <string name="main_wrn_accsetup">Auf Deinem Gerät sind keine ownCloud Konten eingerichtet. Bitte erstelle ein Konto, um diese App zu nutzen.</string>
+  <string name="actionbar_sync">Aktualisieren</string>
+  <string name="actionbar_upload">Datei hochladen</string>
+  <string name="actionbar_upload_from_apps">Inhalt von anderen Apps</string>
+  <string name="actionbar_upload_files">Dateien</string>
+  <string name="actionbar_mkdir">Verzeichnis erstellen</string>
+  <string name="actionbar_search">Suche</string>
+  <string name="actionbar_settings">Einstellungen</string>
+  <string name="prefs_category_general">Allgemein</string>
+  <string name="prefs_category_trackmydevice">Gerät verfolgen</string>
+  <string name="prefs_add_session">Neue Sitzung hinzufügen</string>
+  <string name="prefs_create_img_thumbnails">Bildvorschau erstellen</string>
+  <string name="prefs_select_oc_account">Konto auswählen</string>
+  <string name="prefs_summary_select_oc_account">Bitte wähle, welches Konto von der App verwendet werden soll.</string>
+  <string name="prefs_trackmydevice">Gerät verfolgen</string>
+  <string name="prefs_trackmydevice_summary_off">Geräteverfolgung in ownCloud aktivieren</string>
+  <string name="prefs_trackmydevice_summary_on">Deine ownCloud verfolgt dieses Gerät</string>
+  <string name="prefs_trackmydevice_interval">Aktualisierungsintervall</string>
+  <string name="prefs_trackmydevice_interval_summary">Alle %1$s Minuten aktualisieren</string>
+  <string name="prefs_accounts">Konten</string>
+  <string name="prefs_manage_accounts">Konten verwalten</string>
+  <string name="prefs_pincode">ownCloud-App-PIN</string>
+  <string name="prefs_pincode_summary">Schütze Deinen OwnCloud-Client.</string>
+  <string name="prefs_instant_upload">Aktiviere sofortigen Upload.</string>
+  <string name="prefs_instant_upload_summary">Lade Fotos von der Kamera sofort hoch.</string>
+  <string name="auth_host_url">ownCloud-URL</string>
+  <string name="auth_username">Benutzername</string>
+  <string name="auth_password">Passwort</string>
+  <string name="auth_register">Ich bin neu bei ownCloud</string>
+  <string name="new_session_uri_error">Falsche URL angegeben</string>
+  <string name="new_session_session_name_error">Falscher Sitzungsname</string>
+  <string name="sync_string_files">Dateien</string>
+  <string name="uploader_no_file_selected">Du hast keine Datei zum Hochladen ausgewählt</string>
+  <string name="setup_hint_username">Benutzername</string>
+  <string name="setup_hint_password">Passwort</string>
+  <string name="setup_hint_address">Internetadresse</string>
+  <string name="setup_hint_show_password">Passwort anzeigen?</string>
+  <string name="setup_title">Mit Deiner ownCloud verbinden</string>
+  <string name="setup_btn_connect">Verbinden</string>
+  <string name="uploader_btn_upload_text">Hochladen</string>
+  <string name="uploader_wrn_no_account_title">Kein Konto gefunden</string>
+  <string name="uploader_wrn_no_account_text">Es sind keine ownCloud-Konten auf Deinem Gerät eingerichtet. Bitte richte zuerst ein Konto ein.</string>
+  <string name="uploader_wrn_no_account_setup_btn_text">Einrichten</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">Beenden</string>
+  <string name="uploader_wrn_no_content_title">Keine Inhalte zum Hochladen vorhanden</string>
+  <string name="uploader_wrn_no_content_text">Es wurden keine Inhalte empfangen. Es gibt nichts zum Hochladen.</string>
+  <string name="uploader_error_forbidden_content">ownCloud darf den geteilten Inhalt nicht nutzen.</string>
+  <string name="uploader_info_uploading">Lade hoch</string>
+  <string name="uploader_btn_create_dir_text">Verzeichnis für hochzuladene Dateien erstellen</string>
+  <string name="filedetails_select_file">Klicken Sie auf eine Datei für weitere Informationen.</string>
+  <string name="filedetails_size">Größe:</string>
+  <string name="filedetails_type">Art:</string>
+  <string name="filedetails_created">Erstellt:</string>
+  <string name="filedetails_modified">Geändert:</string>
+  <string name="filedetails_download">Herunterladen</string>
+  <string name="filedetails_redownload">Neu laden</string>
+  <string name="filedetails_open">Öffnen</string>
+  <string name="common_yes">Ja</string>
+  <string name="common_no">Nein</string>
+  <string name="common_ok">OK</string>
+  <string name="common_cancel">Abbrechen</string>
+  <string name="common_save_exit">Speichern &amp; schließen</string>
+  <string name="common_exit">Verlasse ownCloud</string>
+  <string name="common_error">Fehler</string>
+  <string name="about_title">Über</string>
+  <string name="delete_account">Konto löschen</string>
+  <string name="create_account">Konto erstellen</string>
+  <string name="upload_chooser_title">Dateien hochladen von...</string>
+  <string name="uploader_info_dirname">Verzeichnisname</string>
+  <string name="uploader_upload_in_progress_ticker">Hochladen...</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% Hochladen %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">Hochladen erfolgreich</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s wurde(n) erfolgreich hochgeladen</string>
+  <string name="uploader_upload_succeeded_content_multiple">%1$d Datei(en) wurde(n) erfolgreich hochgeladen</string>
+  <string name="uploader_upload_failed_ticker">Hochladen fehlgeschlagen</string>
+  <string name="uploader_upload_failed_content_single">Hochladen von  %1$s konnte nicht abgeschlossen werden</string>
+  <string name="uploader_upload_failed_content_multiple">Hochladen fehlgeschlagen: %1$d/%2$d Dateien wurden hochgeladen</string>
+  <string name="downloader_download_in_progress_ticker">Herunterladen...</string>
+  <string name="downloader_download_in_progress_content">%1$d%% Herunterladen %2$s</string>
+  <string name="downloader_download_succeeded_ticker">Herunterladen erfolgreich</string>
+  <string name="downloader_download_succeeded_content">%1$s wurde erfolgreich heruntergeladen</string>
+  <string name="downloader_download_failed_ticker">Herunterladen fehlgeschlagen</string>
+  <string name="downloader_download_failed_content">Herunterladen von %1$s konnte nicht abgeschlossen werden</string>
+  <string name="common_choose_account">Konto auswählen</string>
+  <string name="sync_string_contacts">Kontakte</string>
+  <string name="sync_fail_ticker">Synchronisation fehlgeschlagen</string>
+  <string name="sync_fail_content">Bei der Synchronisation konnte %1$s nicht übertragen werden</string>
+  <string name="use_ssl">Sichere Verbindung benutzen</string>
+  <string name="location_no_provider">ownCloud kann Dein Gerät nicht verfolgen. Bitte überprüfe Deine Standorteinstellungen</string>
+  <string name="pincode_enter_pin_code">Bitte gib Deine App-PIN ein</string>
+  <string name="pincode_enter_new_pin_code">Bitte gib eine neue App-PIN ein</string>
+  <string name="pincode_configure_your_pin">Bitte gib Deine ownCloud-App-PIN ein</string>
+  <string name="pincode_reenter_your_pincode">Bitte gib Deine ownCloud-App-PIN erneut ein.</string>
+  <string name="pincode_remove_your_pincode">ownCloud-App-PIN entfernen</string>
+  <string name="pincode_mismatch">Die ownCloud-App-PINs stimmen nicht überein</string>
+  <string name="pincode_wrong">Falsche ownCloud-App-PIN</string>
+  <string name="pincode_removed">Die ownCloud-App-PIN wurde entfernt</string>
+  <string name="pincode_stored">Die ownCloud-App-PIN wurde gespeichert</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 Minuten</item>
+    <item>30 Minuten</item>
+    <item>60 Minuten</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
+  <string name="auth_trying_to_login">Anmeldungsversuch...</string>
+  <string name="auth_no_net_conn_title">Keine Netzwerkverbindung</string>
+  <string name="auth_no_net_conn_message">Es konnte keine Netzwerkverbindung gefunden werden, bitte überprüfe Deine Internetverbindung.</string>
+  <string name="auth_connect_anyway">Trotzdem verbinden</string>
+  <string name="auth_nossl_plain_ok_title">Sichere Verbindung nicht verfügbar.</string>
+  <string name="auth_nossl_plain_ok_message">Die App konnte keine sichere Verbindung zum Server herstellen. Eine nicht sichere Verbindung ist nichtsdestotrotz verfügbar. Möchtest Du fortfahren oder abbrechen?</string>
+  <string name="auth_connection_established">Verbindung hergestellt</string>
+  <string name="auth_testing_connection">Verbindung testen...</string>
+  <string name="auth_not_configured_title">Falsch konfigurierte ownCloud</string>
+  <string name="auth_not_configured_message">Es scheint, als wäre Deine ownCloud-Installation nicht richtig konfiguriert. Bitte kontaktiere Deinen Administrator, um weitere Details zu erhalten.</string>
+  <string name="auth_unknown_error_title">Ein unbekannter Fehler ist aufgetreten!</string>
+  <string name="auth_unknown_error_message">Ein unbekannter Fehler ist aufgetreten. Bitte kontaktiere Deinen Administrator unter Zu­hil­fe­nah­me der Log-Dateien Deines Gerätes.</string>
+  <string name="auth_unknown_host_title">Konnte den Host nicht finden.</string>
+  <string name="auth_unknown_host_message">Konnte den eingetragenen Host nicht finden. Bitte prüfe den Hostnamen und die Verfügbarkeit des Servers und versuche es erneut.</string>
+  <string name="auth_incorrect_path_title">ownCloud-Installation nicht gefunden</string>
+  <string name="auth_incorrect_path_message">Die App konnte die ownCloud unter dem angegebenen Pfad nicht finden. Bitte überprüfe den Pfad und versuche es erneut.</string>
+  <string name="auth_timeout_title">Der Server brauchte zu lange für eine Antwort.</string>
+  <string name="auth_incorrect_address_title">Fehlerhafte URL</string>
+  <string name="auth_ssl_general_error_title">SSL-Initialisierung fehlgeschlagen.</string>
+  <string name="auth_ssl_unverified_server_title">Nichtüberprüfte SSL-Server-Identität</string>
+  <string name="auth_bad_oc_version_title">Unbekannte ownCloud-Server-Version</string>
+  <string name="auth_wrong_connection_title">Konnte keine Verbindung aufbauen.</string>
+  <string name="auth_secure_connection">Sichere Verbindung hergestellt</string>
+  <string name="auth_login_details">Anmeldedetails</string>
+  <string name="crashlog_message">Die Andwendung ist abgestürzt. Möchtest Du einen Bericht senden?</string>
+  <string name="crashlog_send_report">Bericht senden</string>
+  <string name="crashlog_dont_send_report">Keinen Bericht senden</string>
+  <string name="extensions_avail_title">Erweiterung verfügbar!</string>
+  <string name="extensions_avail_message">Scheinbar unterstützt Deine ownCloud weitere Erweiterungen. Möchtest Du die verfügbaren Erweiterungen für Android sehen?</string>
+  <string name="fd_keep_in_sync">Datei aktuell halten</string>
+  <string name="common_share">Teilen</string>
+  <string name="common_rename">Umbenennen</string>
+  <string name="common_remove">Löschen</string>
+  <string name="confirmation_remove_alert">Möchtest Du %1$s wirklich löschen?</string>
+  <string name="confirmation_remove_local">Nur lokal</string>
+  <string name="confirmation_remove_remote">Vom Server entfernen</string>
+  <string name="confirmation_remove_remote_and_local">Lokal und auf dem Server</string>
+  <string name="remove_success_msg">Erfolgreich gelöscht</string>
+  <string name="remove_fail_msg">Der Löschvorgang konnte nicht beendet werden</string>
+  <string name="rename_local_fail_msg">Die lokale Kopie konnte nicht umbenannt werden. Versuchen Sie es mit einem anderen neuen Namen.</string>
+  <string name="rename_server_fail_msg">Die Umbenennung konnte nicht abgeschlossen werden.</string>
+  <string name="create_dir_fail_msg">Das Verzeichnis konnte nicht erstellt werden.</string>
+  <string name="wait_a_moment">Bitte warten Sie einen Moment.</string>
+  <string name="filedisplay_unexpected_bad_get_content">Ein unerwartetes Problem ist aufgetreten. Bitte versuche, die Datei in einer anderen App zu öffnen</string>
+  <string name="filedisplay_no_file_selected">Es wurde keine Datei ausgewählt.</string>
+  <string name="ssl_validator_title">Warnung</string>
+  <string name="ssl_validator_header">Die Identität der Website konnte nicht überprüft werden</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- Das Zertifikat des Servers ist nicht vertrauenswürdig</string>
+  <string name="ssl_validator_reason_cert_expired">- Das Zertifikat des Servers ist abgelaufen</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- Das Zertifikat des Servers ist zu neu</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- Die Adresse stimmt nicht mit dem im Zertifikat angegebenen Hostnamen  überein</string>
+  <string name="ssl_validator_certificate_not_available">Das Zertifikat des Servers konnte nicht abgerufen werden</string>
+  <string name="ssl_validator_question">Möchtest Du diesem Zertifikat trotzdem vertrauen?</string>
+  <string name="ssl_validator_not_saved">Das Zertifikat konnte nicht gespeichert werden</string>
+  <string name="text_placeholder">Dies ist ein Platzhalter</string>
+  <string name="instant_upload_on_wifi">Fotos nur über WiFi hochladen</string>
+</resources>

res/values-et-rEE/strings.xml

@@ -166,4 +166,15 @@
   <string name="wait_a_moment">Oota hetk</string>
   <string name="filedisplay_unexpected_bad_get_content">Ootamatu tõrge ; palun kasuta faili valimiseks mõnda teist rakendust</string>
   <string name="filedisplay_no_file_selected">Ühtegi faili pole valitud</string>
+  <string name="ssl_validator_title">Hoiatus</string>
+  <string name="ssl_validator_header">Saidi identiteeti ei suudetud kinnitada</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- Serveri sertifikaat pole usaldusväärne</string>
+  <string name="ssl_validator_reason_cert_expired">- Serveri sertifikaat on aegunud</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- Serveri sertifikaat on liiga noor</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- URL ei kattu sertifikaadis oleva hostinimega</string>
+  <string name="ssl_validator_certificate_not_available">Serveri sertifikaati ei õnnestunud hankida</string>
+  <string name="ssl_validator_question">Kas sa soovid siiski seda sertifikaati usaldada?</string>
+  <string name="ssl_validator_not_saved">Sertifikaadi salvestamine ebaõnnestus</string>
+  <string name="text_placeholder">See on kohahoidja</string>
+  <string name="instant_upload_on_wifi">Lae pilte üles ainult läbi WiFi</string>
 </resources>

res/values-ka-rGE/strings.xml

@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>

res/values-nl/strings.xml

@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="hello">Hallo Wereld! OwnCloud beginscherm!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Wachtwoord:</string>
   <string name="main_login">Gebruikersnaam:</string>
@@ -11,6 +12,8 @@
   <string name="main_calendar">Kalender</string>
   <string name="main_bookmarks">Bladwijzers</string>
   <string name="main_settings">Instellingen</string>
+  <string name="main_tit_accsetup">Account configureren.</string>
+  <string name="main_wrn_accsetup">Er zijn nog geen ownCloud accounts op dit apparaat. Als je deze app wilt gebruiken zul je een account moeten aanmaken.</string>
   <string name="actionbar_sync">Verversen</string>
   <string name="actionbar_upload">Uploaden</string>
   <string name="actionbar_upload_from_apps">Inhoud van andere apps</string>
@@ -26,10 +29,15 @@
   <string name="prefs_summary_select_oc_account">Kies welke accounts de app mag gebruiken.</string>
   <string name="prefs_trackmydevice">Apparaat volgen</string>
   <string name="prefs_trackmydevice_summary_off">Sta toe dat ownCloud je apparaat locatie volgt</string>
+  <string name="prefs_trackmydevice_summary_on">ownCloud houdt dit apparaat in de gaten</string>
   <string name="prefs_trackmydevice_interval">Update interval</string>
   <string name="prefs_trackmydevice_interval_summary">Ververs elke %1$s minuten</string>
   <string name="prefs_accounts">Accounts</string>
+  <string name="prefs_manage_accounts">Beheer accounts</string>
+  <string name="prefs_pincode">ownCloud App PIN</string>
+  <string name="prefs_pincode_summary">Beveilig uw ownCloud client</string>
   <string name="prefs_instant_upload">Schakel direct uploaden in</string>
+  <string name="prefs_instant_upload_summary">Upload afbeeldingen van camera automatisch</string>
   <string name="auth_host_url">ownCloud URL</string>
   <string name="auth_username">Gebruikersnaam</string>
   <string name="auth_password">Wachtwoord</string>
@@ -46,12 +54,17 @@
   <string name="setup_btn_connect">Verbinden</string>
   <string name="uploader_btn_upload_text">Uploaden</string>
   <string name="uploader_wrn_no_account_title">Geen account gevonden</string>
+  <string name="uploader_wrn_no_account_text">Er zijn nog geen ownCloud accounts op je apparaat. Stel eerst een account in.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configureren</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Afsluiten</string>
   <string name="uploader_wrn_no_content_title">Geen inhoud om te uploaden</string>
   <string name="uploader_wrn_no_content_text">Er werd geen inhoud ontvangen. Niets om te uploaden.</string>
   <string name="uploader_error_forbidden_content">ownCloud is niet toegestaan om toegang te hebben tot de publieke inhoud</string>
   <string name="uploader_info_uploading">Uploaden</string>
+  <string name="uploader_btn_create_dir_text">Maak nieuwe map voor upload</string>
+  <string name="filedetails_select_file">Druk op een bestand om extra informatie weer te geven</string>
+  <string name="filedetails_size">Grootte:</string>
+  <string name="filedetails_type">Type:</string>
   <string name="filedetails_created">Aangemaakt:</string>
   <string name="filedetails_modified">Aangepast:</string>
   <string name="filedetails_download">Download</string>
@@ -61,13 +74,20 @@
   <string name="common_no">Nee</string>
   <string name="common_ok">OK</string>
   <string name="common_cancel">Annuleren</string>
+  <string name="common_save_exit">Opslaan &amp; Afsluiten</string>
   <string name="common_exit">Verlaat ownCloud</string>
   <string name="common_error">Fout</string>
   <string name="about_title">Over</string>
+  <string name="delete_account">Verwijder account</string>
+  <string name="create_account">Maak account aan</string>
+  <string name="upload_chooser_title">Upload van ...</string>
+  <string name="uploader_info_dirname">Map naam</string>
+  <string name="uploader_upload_in_progress_ticker">Uploading ...</string>
   <string name="uploader_upload_succeeded_ticker">Upload succesvol</string>
   <string name="uploader_upload_succeeded_content_single">%1$s is met succes geupload</string>
   <string name="uploader_upload_failed_ticker">Upload mislukt</string>
   <string name="uploader_upload_failed_content_single">Upload van %1$s kon niet voltooid worden</string>
+  <string name="downloader_download_in_progress_ticker">Downloading ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Aan het downloaden %2$s</string>
   <string name="downloader_download_succeeded_ticker">Downloaden gelukt</string>
   <string name="downloader_download_succeeded_content">%1$s was succesvol gedownload</string>
@@ -78,19 +98,42 @@
   <string name="sync_fail_ticker">Synchronisatie mislukt</string>
   <string name="sync_fail_content">Synchronisatie van %1$s kon niet worden voltooid</string>
   <string name="use_ssl">Gebruik veilige verbinding</string>
+  <string name="location_no_provider">ownCloud kan het apparaat niet volgen. Configureer de locatie instellingen (location settings).</string>
+  <string name="pincode_enter_pin_code">Voer App PIN in</string>
+  <string name="pincode_enter_new_pin_code">Voer nieuwe App PIN in</string>
+  <string name="pincode_configure_your_pin">Voer App PIN in</string>
+  <string name="pincode_reenter_your_pincode">Voer App PIN opnieuw in</string>
+  <string name="pincode_remove_your_pincode">Verwijder App PIN</string>
+  <string name="pincode_mismatch">App PIN\'s komen niet overeen</string>
+  <string name="pincode_wrong">Foutieve ownCloud applicatie PIN</string>
+  <string name="pincode_removed">ownCloud App PIN verwijderd</string>
+  <string name="pincode_stored">ownCloud App PIN opgeslagen</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 minuten</item>
+    <item>30 minuten</item>
+    <item>60 mintuen</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
   <string name="auth_trying_to_login">Proberen om in te loggen...</string>
   <string name="auth_no_net_conn_title">Geen netwerk verbinding</string>
   <string name="auth_no_net_conn_message">Geen netwerkverbinding konden gevonden worden, controleer uw internet verbinding en probeer het opnieuw.</string>
   <string name="auth_connect_anyway">Toch verbinden</string>
   <string name="auth_nossl_plain_ok_title">Veilige verbinding niet beschikbaar.</string>
+  <string name="auth_nossl_plain_ok_message">De applicatie kon geen beveiligde verbinding met de server maken. Er is echter wel een onbeveiligde verbinding beschikbaar. U kunt verder gaan of annuleren.</string>
   <string name="auth_connection_established">Verbinding tot stand gebracht</string>
   <string name="auth_testing_connection">Probeer verbinding...</string>
   <string name="auth_not_configured_title">Foutieve ownCloud configuratie</string>
   <string name="auth_not_configured_message">Het lijkt erop dat uw ownCloud instantie niet correct geconfigureerd is. Neem contact op met uw beheerder voor meer details.</string>
   <string name="auth_unknown_error_title">Onbekende fout opgetreden!</string>
+  <string name="auth_unknown_error_message">Er heeft zich een onbekend fout voorgedaan. Neem alstublieft contact op met de beheerders en voeg de logs toe van uw apparaat.</string>
   <string name="auth_unknown_host_title">Kon geen host vinden</string>
   <string name="auth_unknown_host_message">Kon de ingevoerde host niet vinden. Controleer de hostnaam en servertoegankelijkheid en probeer opnieuw.</string>
   <string name="auth_incorrect_path_title">ownCloud instantie niet gevonden</string>
+  <string name="auth_incorrect_path_message">De applicatie kon geen instantie van ownCloud vinden op de opgegeven locatie. Controleer het pad en probeer opnieuw.</string>
   <string name="auth_timeout_title">De server had te lang nodig om te reageren</string>
   <string name="auth_incorrect_address_title">Misvormde URL</string>
   <string name="auth_ssl_general_error_title">SSL initialisatie mislukt</string>
@@ -99,17 +142,29 @@
   <string name="auth_wrong_connection_title">Kon verbinding niet tot stand brengen.</string>
   <string name="auth_secure_connection">Veilige verbinding tot stand gebracht</string>
   <string name="auth_login_details">Login gegevens</string>
+  <string name="crashlog_message">De applicatie is onverwacht beëindigd. Wilt u een crash report versturen?</string>
   <string name="crashlog_send_report">Rapport verzenden</string>
   <string name="crashlog_dont_send_report">Rapport niet verzenden</string>
   <string name="extensions_avail_title">Uitbreidingen aanwezig!</string>
+  <string name="fd_keep_in_sync">Houd bestand actueel</string>
   <string name="common_share">Delen</string>
   <string name="common_rename">Hernoemen</string>
   <string name="common_remove">Verwijderen</string>
   <string name="confirmation_remove_alert">Wilt u werkelijk %1$s verwijderen?</string>
+  <string name="confirmation_remove_local">Lokaal alleen</string>
   <string name="confirmation_remove_remote">Verwijder van server</string>
+  <string name="confirmation_remove_remote_and_local">Lokaal en op de server</string>
   <string name="remove_success_msg">Succesvol verwijderd</string>
+  <string name="remove_fail_msg">Verwijdering kon niet voltooid worden</string>
   <string name="rename_local_fail_msg">Lokaal kopie kon niet worden hernoemt.</string>
   <string name="rename_server_fail_msg">Hernoemen kon niet worden voltooid</string>
+  <string name="create_dir_fail_msg">Map kon niet worden aangemaakt</string>
   <string name="wait_a_moment">Even geduld</string>
   <string name="filedisplay_no_file_selected">Er werd geen bestand geselecteerd</string>
+  <string name="ssl_validator_title">Waarschuwing</string>
+  <string name="ssl_validator_certificate_not_available">Het server certificaat kon niet opgevraagd worden</string>
+  <string name="ssl_validator_question">Wil je dit certificaat alsnog vertrouwen?</string>
+  <string name="ssl_validator_not_saved">Het certificaat kon niet worden opgeslagen</string>
+  <string name="text_placeholder">Dit is een placeholder</string>
+  <string name="instant_upload_on_wifi">Upload afbeeldingen alleen via WiFi</string>
 </resources>

res/values-pt-rPT/strings.xml

@@ -16,22 +16,31 @@
   <string name="main_wrn_accsetup">Não há contas ownCloud no seu aparelho. Para usar esta Aplicação, precisa de criar uma.</string>
   <string name="actionbar_sync">Actualizar</string>
   <string name="actionbar_upload">Enviar</string>
+  <string name="actionbar_upload_from_apps">Conteúdo das outras apps</string>
+  <string name="actionbar_upload_files">Ficheiros</string>
   <string name="actionbar_mkdir">Criar pasta</string>
   <string name="actionbar_search">Procurar</string>
   <string name="actionbar_settings">Definições</string>
   <string name="prefs_category_general">Geral</string>
+  <string name="prefs_category_trackmydevice">Rastreamento de dispositivo</string>
   <string name="prefs_add_session">Acrescentar nova sessão</string>
   <string name="prefs_create_img_thumbnails">Criar miniaturas de imagens</string>
   <string name="prefs_select_oc_account">Escolha uma conta</string>
   <string name="prefs_summary_select_oc_account">Escolha qual das suas contas deve ser usada pela app.</string>
+  <string name="prefs_trackmydevice">Rastreamento de dispositivo</string>
   <string name="prefs_trackmydevice_summary_off">Permitir que ownCloud siga a localização do seu aparelho.</string>
   <string name="prefs_trackmydevice_summary_on">A sua ownCloud segue a localização deste aparelho.</string>
   <string name="prefs_trackmydevice_interval">Intervalo de actualização</string>
   <string name="prefs_trackmydevice_interval_summary">Actualizar a cada %1$s minutos</string>
   <string name="prefs_accounts">Contas</string>
+  <string name="prefs_manage_accounts">Gerir contas</string>
+  <string name="prefs_pincode">ownCloud App PIN</string>
+  <string name="prefs_pincode_summary">Proteja o seu cliente ownCloud</string>
+  <string name="prefs_instant_upload">Activar envio instantâneo</string>
   <string name="auth_host_url">URL ownCloud</string>
   <string name="auth_username">Nome de Utilizador</string>
   <string name="auth_password">Palavra-passe</string>
+  <string name="auth_register">Sou novo na ownCloud</string>
   <string name="new_session_uri_error">URL dado errado</string>
   <string name="new_session_session_name_error">Nome de sessão errado</string>
   <string name="sync_string_files">Ficheiros</string>
@@ -44,29 +53,51 @@
   <string name="setup_btn_connect">Ligar</string>
   <string name="uploader_btn_upload_text">Enviar</string>
   <string name="uploader_wrn_no_account_title">Nenhuma conta encontrada</string>
+  <string name="uploader_wrn_no_account_text">Não tem nenhuma conta ownCloud no seu dispositivo. Configure uma conta.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurar</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Sair</string>
+  <string name="uploader_wrn_no_content_title">Sem conteúdo para carregar</string>
   <string name="uploader_info_uploading">A enviar</string>
   <string name="uploader_btn_create_dir_text">Criar directoria para envio</string>
+  <string name="filedetails_select_file">Clique no ficheiro para visualizar informação adicional.</string>
   <string name="filedetails_size">Tamanho:</string>
   <string name="filedetails_type">Tipo:</string>
   <string name="filedetails_created">Criado:</string>
   <string name="filedetails_modified">Modificado:</string>
   <string name="filedetails_download">Descarregar</string>
+  <string name="filedetails_redownload">Actualizar</string>
   <string name="filedetails_open">Abrir</string>
   <string name="common_yes">Sim</string>
   <string name="common_no">Não</string>
   <string name="common_ok">OK</string>
   <string name="common_cancel">Cancelar</string>
   <string name="common_save_exit">Guardar &amp; Sair</string>
+  <string name="common_exit">Sair de ownCloud</string>
   <string name="common_error">Erro</string>
+  <string name="about_title">Sobre</string>
+  <string name="delete_account">Apagar conta</string>
+  <string name="create_account">Criar conta</string>
+  <string name="upload_chooser_title">Carregar de...</string>
   <string name="uploader_info_dirname">Nome da directoria</string>
+  <string name="uploader_upload_in_progress_ticker">A carregar...</string>
+  <string name="uploader_upload_succeeded_ticker">Carregado com sucesso</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s foi carregado com sucesso</string>
+  <string name="uploader_upload_succeeded_content_multiple">%1$d foram carregados com sucesso</string>
+  <string name="uploader_upload_failed_ticker">Carregamento falhou</string>
+  <string name="downloader_download_in_progress_ticker">A descarregar...</string>
+  <string name="downloader_download_in_progress_content">%1$d%% A decarregar %2$s</string>
+  <string name="downloader_download_succeeded_ticker">Descarga com sucesso</string>
+  <string name="downloader_download_succeeded_content">%1$s foi descarregado com sucesso</string>
+  <string name="downloader_download_failed_ticker">Descarga falhou</string>
+  <string name="downloader_download_failed_content">O descarregamento %1$s não foi possível descarregar</string>
   <string name="common_choose_account">Escolha a conta</string>
   <string name="sync_string_contacts">Contactos</string>
+  <string name="sync_fail_ticker">Falhou a sincronização</string>
   <string name="use_ssl">Usar Ligação Segura</string>
   <string name="pincode_enter_pin_code">Por favor escreva o PIN da Aplicação</string>
   <string name="pincode_enter_new_pin_code">Por favor escreva o novo PIN da Aplicação</string>
   <string name="pincode_configure_your_pin">Escreva o PIN da Aplicação ownCloud</string>
+  <string name="pincode_reenter_your_pincode">Volte a inserir o ownCloud App PIN, por favor</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 Minutos</item>
     <item>30 Minutos</item>
@@ -84,11 +115,29 @@
   <string name="auth_connection_established">Ligação estabelecida</string>
   <string name="auth_testing_connection">A testar a ligação...</string>
   <string name="auth_unknown_error_title">Ocorreu um erro desconhecido!</string>
+  <string name="auth_unknown_host_title">Não é possível encontrar o servidor</string>
   <string name="auth_incorrect_path_title">Instância ownCloud não encontrada</string>
+  <string name="auth_timeout_title">O servidor levou demasiado tempo a responder</string>
+  <string name="auth_incorrect_address_title">URL errado</string>
+  <string name="auth_ssl_general_error_title">Inicialização de SSL falhou</string>
+  <string name="auth_bad_oc_version_title">Versão do servidor ownCloud não reconhecida</string>
+  <string name="auth_wrong_connection_title">Não consegue estabelecer ligação</string>
   <string name="auth_secure_connection">Ligação segura estabelecida</string>
+  <string name="auth_login_details">Detalhes de entrada</string>
   <string name="crashlog_send_report">Enviar relatório</string>
   <string name="crashlog_dont_send_report">Não enviar relatório</string>
   <string name="extensions_avail_title">Extensões disponíveis!</string>
+  <string name="fd_keep_in_sync">manter ficheiro actualizado</string>
   <string name="common_share">Partilhar</string>
+  <string name="common_rename">Renomear</string>
   <string name="common_remove">Remover</string>
+  <string name="confirmation_remove_local">Apenas localmente</string>
+  <string name="confirmation_remove_remote">Apagar do servidor</string>
+  <string name="confirmation_remove_remote_and_local">ambos os remoto e local</string>
+  <string name="remove_success_msg">Removido com sucesso</string>
+  <string name="rename_server_fail_msg">Não foi possível renomear</string>
+  <string name="create_dir_fail_msg">Não foi possível criar a pasta</string>
+  <string name="wait_a_moment">Aguarde um momento</string>
+  <string name="filedisplay_no_file_selected">Não selecionou nenhum ficheiro</string>
+  <string name="ssl_validator_title">Aviso</string>
 </resources>

res/values-ru-rRU/strings.xml

@@ -77,6 +77,7 @@
   <string name="common_save_exit">Сохранить &amp; Выход</string>
   <string name="common_exit">Покинуть ownCloud</string>
   <string name="common_error">Ошибка</string>
+  <string name="about_title">О программе</string>
   <string name="delete_account">Удалить аккаунт</string>
   <string name="create_account">Создать аккаунт</string>
   <string name="upload_chooser_title">Загрузить из...</string>

res/values-ru/strings.xml

@@ -166,4 +166,15 @@
   <string name="wait_a_moment">Подождите немного</string>
   <string name="filedisplay_unexpected_bad_get_content">Неизвестная ошибка; попробуйте другое приложение для выбора файла</string>
   <string name="filedisplay_no_file_selected">Файлы не выбраны</string>
+  <string name="ssl_validator_title">Предупреждение</string>
+  <string name="ssl_validator_header">Подлинность сайта не может быть проверена</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- Сертификат сервера не является доверенным</string>
+  <string name="ssl_validator_reason_cert_expired">- Срок действия сертификата сервера истёк</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- Сертификат сервера слишком новый</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- Адрес не совпадает с именем в сертификате</string>
+  <string name="ssl_validator_certificate_not_available">Сертификат сервера не доступен</string>
+  <string name="ssl_validator_question">Все-равно доверять данному сертификату?</string>
+  <string name="ssl_validator_not_saved">Сертификат не может быть сохранён</string>
+  <string name="text_placeholder">Это заполнитель</string>
+  <string name="instant_upload_on_wifi">Загружать изображения только через WiFi</string>
 </resources>

res/values-si-rLK/strings.xml

@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>

res/values-ta-rLK/strings.xml

@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>

res/values-zh-rBG/strings.xml

@@ -166,4 +166,15 @@
   <string name="wait_a_moment">请稍候</string>
   <string name="filedisplay_unexpected_bad_get_content">非预期问题;请尝试使用其他应用选择文件</string>
   <string name="filedisplay_no_file_selected">未选择文件</string>
+  <string name="ssl_validator_title">警告</string>
+  <string name="ssl_validator_header">此站点身份不能确认</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- 服务器证书不受信任</string>
+  <string name="ssl_validator_reason_cert_expired">- 服务器证书过期</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- 服务器证书太新</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- URL 不匹配证书中的主机名</string>
+  <string name="ssl_validator_certificate_not_available">无法获取服务器证书</string>
+  <string name="ssl_validator_question">您想要强行信任此证书吗？</string>
+  <string name="ssl_validator_not_saved">证书不能保存</string>
+  <string name="text_placeholder">这是一个占位符</string>
+  <string name="instant_upload_on_wifi">只通过 WiFi 上传图片</string>
 </resources>

res/values-zh-rCN/strings.xml

@@ -166,4 +166,15 @@
   <string name="wait_a_moment">请稍候</string>
   <string name="filedisplay_unexpected_bad_get_content">未知问题；请试试用其他程序选择此文件</string>
   <string name="filedisplay_no_file_selected">未选择文件。</string>
+  <string name="ssl_validator_title">警告</string>
+  <string name="ssl_validator_header">站点身份无法验证</string>
+  <string name="ssl_validator_reason_cert_not_trusted">不受信任的服务器证书</string>
+  <string name="ssl_validator_reason_cert_expired">服务器证书过期</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">服务器证书过新</string>
+  <string name="ssl_validator_reason_hostname_not_verified">主机名与证书中的记录不匹配</string>
+  <string name="ssl_validator_certificate_not_available">无法获得服务器证书</string>
+  <string name="ssl_validator_question">是否信任此证书？</string>
+  <string name="ssl_validator_not_saved">证书无法保存</string>
+  <string name="text_placeholder">占位符一枚</string>
+  <string name="instant_upload_on_wifi">仅通过WIFI上传图片。</string>
 </resources>

src/com/owncloud/android/files/OwnCloudFileObserver.java

@@ -52,9 +52,14 @@ public class OwnCloudFileObserver extends FileObserver {
         return mPath;
     }
     
+    public String getRemotePath() {
+        return mFile.getRemotePath();
+    }
+    
     @Override
     public void onEvent(int event, String path) {
-        if ((event | mMask) == 0) {
+        Log.d(TAG, "Got file modified with event " + event + " and path " + path);
+        if ((event & mMask) == 0) {
             Log.wtf(TAG, "Incorrect event " + event + " sent for file " + path +
                          " with registered for " + mMask + " and original path " +
                          mPath);

src/com/owncloud/android/files/services/FileObserverService.java

@@ -28,6 +28,7 @@ public class FileObserverService extends Service {
     public final static int CMD_INIT_OBSERVED_LIST = 1;
     public final static int CMD_ADD_OBSERVED_FILE = 2;
     public final static int CMD_DEL_OBSERVED_FILE = 3;
+    public final static int CMD_ADD_DOWNLOADING_FILE = 4;
 
     private static String TAG = "FileObserverService";
     private static List<OwnCloudFileObserver> mObservers;
@@ -70,13 +71,16 @@ public class FileObserverService extends Service {
             case CMD_DEL_OBSERVED_FILE:
                 removeObservedFile(intent.getStringExtra(KEY_CMD_ARG));
                 break;
+            case CMD_ADD_DOWNLOADING_FILE:
+                addDownloadingFile(intent.getStringExtra(KEY_CMD_ARG));
+                break;
             default:
                 Log.wtf(TAG, "Incorrect key given");
         }
 
         return Service.START_STICKY;
     }
-    
+
     private void initializeObservedList() {
         if (mObservers != null) return; // nothing to do here
         mObservers = new ArrayList<OwnCloudFileObserver>();
@@ -107,7 +111,7 @@ public class FileObserverService extends Service {
             String path = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH));
             OwnCloudFileObserver observer =
                     new OwnCloudFileObserver(path, OwnCloudFileObserver.CHANGES_ONLY);
-            observer.setContext(getBaseContext());
+            observer.setContext(getApplicationContext());
             observer.setAccount(account);
             observer.setStorageManager(storage);
             observer.setOCFile(storage.getFileByPath(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PATH))));
@@ -167,6 +171,24 @@ public class FileObserverService extends Service {
         }
         Log.d(TAG, "Stopped watching " + path);
     }
+        
+    private void addDownloadingFile(String remotePath) {
+        OwnCloudFileObserver observer = null;
+        for (OwnCloudFileObserver o : mObservers) {
+            if (o.getRemotePath().equals(remotePath)) {
+                observer = o;
+                break;
+            }
+        }
+        if (observer == null) {
+            Log.e(TAG, "Couldn't find observer for remote file " + remotePath);
+            return;
+        }
+        observer.stopWatching();
+        DownloadCompletedReceiver dcr = new DownloadCompletedReceiver(observer.getPath(), observer);
+        registerReceiver(dcr, new IntentFilter(FileDownloader.DOWNLOAD_FINISH_MESSAGE));
+    }
+
     
     private static void addReceiverToList(DownloadCompletedReceiver r) {
         synchronized(mReceiverListLock) {

src/com/owncloud/android/operations/SynchronizeFolderOperation.java

@@ -33,6 +33,7 @@ import android.util.Log;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
+import com.owncloud.android.files.services.FileObserverService;
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavEntry;
@@ -130,6 +131,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
                     OCFile oldFile = mStorageManager.getFileByPath(file.getRemotePath());
                     if (oldFile != null) {
                         if (oldFile.keepInSync() && file.getModificationTimestamp() > oldFile.getModificationTimestamp()) {
+                            disableObservance(file);        // first disable observer so we won't get file upload right after download
                             requestContentDownload(file);
                         }
                         file.setKeepInSync(oldFile.keepInSync());
@@ -137,8 +139,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
                 
                     updatedFiles.add(file);
                 }
-                
-                
+                                
                 // save updated contents in local database; all at once, trying to get a best performance in database update (not a big deal, indeed)
                 mStorageManager.saveFiles(updatedFiles);
 
@@ -179,7 +180,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
         return result;
     }
     
-    
+
     public boolean isMultiStatus(int status) {
         return (status == HttpStatus.SC_MULTI_STATUS); 
     }
@@ -202,6 +203,21 @@ public class SynchronizeFolderOperation extends RemoteOperation {
     }
     
     
+    /**
+     * Request to stop the observance of local updates for a file.  
+     * 
+     * @param file      OCFile representing the remote file to stop to monitor for local updates
+     */
+    private void disableObservance(OCFile file) {
+        Log.d(TAG, "Disabling observation of remote file" + file.getRemotePath());
+        Intent intent = new Intent(mContext, FileObserverService.class);
+        intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_ADD_DOWNLOADING_FILE);
+        intent.putExtra(FileObserverService.KEY_CMD_ARG, file.getRemotePath());
+        mContext.startService(intent);
+        
+    }
+
+
     /** 
      * Requests a download to the file download service
      * 

src/com/owncloud/android/syncadapter/FileSyncAdapter.java

@@ -28,9 +28,15 @@ import com.owncloud.android.R;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
+//<<<<<<< HEAD
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.SynchronizeFolderOperation;
 import com.owncloud.android.operations.UpdateOCVersionOperation;
+/*=======
+import com.owncloud.android.files.services.FileDownloader;
+import com.owncloud.android.files.services.FileObserverService;
+import com.owncloud.android.utils.OwnCloudVersion;
+>>>>>>> origin/master*/
 
 import android.accounts.Account;
 import android.app.Notification;
@@ -185,6 +191,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             List<OCFile> children = synchFolderOp.getChildren();
             fetchChildren(children);    // beware of the 'hidden' recursion here!
             
+//<<<<<<< HEAD
         } else {
             if (result.getCode() == RemoteOperationResult.ResultCode.UNAUTHORIZED) {
                 mSyncResult.stats.numAuthExceptions++;
@@ -194,6 +201,32 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                 
             } else if (result.getException() instanceof IOException) { 
                 mSyncResult.stats.numIoExceptions++;
+/*=======
+                // insertion or update of files
+                List<OCFile> updatedFiles = new Vector<OCFile>(resp.getResponses().length - 1);
+                for (int i = 1; i < resp.getResponses().length; ++i) {
+                    WebdavEntry we = new WebdavEntry(resp.getResponses()[i], getUri().getPath());
+                    OCFile file = fillOCFile(we);
+                    file.setParentId(parentId);
+                    if (getStorageManager().getFileByPath(file.getRemotePath()) != null &&
+                            getStorageManager().getFileByPath(file.getRemotePath()).keepInSync() &&
+                            file.getModificationTimestamp() > getStorageManager().getFileByPath(file.getRemotePath())
+                                                                         .getModificationTimestamp()) {
+                        // first disable observer so we won't get file upload right after download
+                        Log.d(TAG, "Disabling observation of remote file" + file.getRemotePath());
+                        Intent intent = new Intent(getContext(), FileObserverService.class);
+                        intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_ADD_DOWNLOADING_FILE);
+                        intent.putExtra(FileObserverService.KEY_CMD_ARG, file.getRemotePath());
+                        getContext().startService(intent);
+                        intent = new Intent(this.getContext(), FileDownloader.class);
+                        intent.putExtra(FileDownloader.EXTRA_ACCOUNT, getAccount());
+                        intent.putExtra(FileDownloader.EXTRA_FILE, file);
+                        file.setKeepInSync(true);
+                        getContext().startService(intent);
+                    }
+                    if (getStorageManager().getFileByPath(file.getRemotePath()) != null)
+                        file.setKeepInSync(getStorageManager().getFileByPath(file.getRemotePath()).keepInSync());
+>>>>>>> origin/master*/
                 
             }
             mFailedResultsCounter++;

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -68,6 +68,7 @@ import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
+import com.owncloud.android.files.services.FileObserverService;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.network.OwnCloudClientUtils;
@@ -161,10 +162,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         }
 
         // file observer
-        /*Intent observer_intent = new Intent(this, FileObserverService.class);
+        Intent observer_intent = new Intent(this, FileObserverService.class);
         observer_intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_INIT_OBSERVED_LIST);
         startService(observer_intent);
-        */
+        
             
         /// USER INTERFACE
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);

src/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -78,6 +78,7 @@ import com.owncloud.android.authenticator.AccountAuthenticator;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
+import com.owncloud.android.files.services.FileObserverService;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
@@ -302,7 +303,7 @@ public class FileDetailFragment extends SherlockFragment implements
                 } else {
                     mContainerActivity.onFileStateChanged();    // put inside 'else' to not call it twice (here, and in the virtual click on fdDownloadBtn)
                 }
-                /*
+                
                 Intent intent = new Intent(getActivity().getApplicationContext(),
                                            FileObserverService.class);
                 intent.putExtra(FileObserverService.KEY_FILE_CMD,
@@ -310,8 +311,9 @@ public class FileDetailFragment extends SherlockFragment implements
                                    FileObserverService.CMD_ADD_OBSERVED_FILE:
                                    FileObserverService.CMD_DEL_OBSERVED_FILE));
                 intent.putExtra(FileObserverService.KEY_CMD_ARG, mFile.getStoragePath());
+                Log.e(TAG, "starting observer service");
                 getActivity().startService(intent);
-                */
+                
                 break;
             }
             case R.id.fdRenameBtn: {