From: masensio <masensio@solidgear.es>
Date: Fri, 30 May 2014 10:40:55 +0000 (+0200)
Subject: Merge branch 'master' into vanish_notifications
X-Git-Tag: oc-android-1.7.0_signed~294^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/dbfbc10af43b10fc23e56fa62ef0cde6df71f0e4?hp=76c2cf5b8420de0812216414fa17376c54f42413

Merge branch 'master' into vanish_notifications
---

diff --git a/owncloud-android-library b/owncloud-android-library
index 1651d1a5..8f8c29c7 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 1651d1a5555f36a4b1d322961e3dce27e8b6e582
+Subproject commit 8f8c29c776c299a639bc21a5ffbb63aeda07b1f9
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index be4f7601..8a1d1d31 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s s\'ha pujat correctament</string>
   <string name="uploader_upload_failed_ticker">La pujada ha fallat</string>
   <string name="uploader_upload_failed_content_single">La pujada de %1$s no s\'ha pogut acabar</string>
+  <string name="uploader_upload_failed_credentials_error">La pujada ha fallat, t\'has de tornar a acreditar</string>
   <string name="downloader_download_in_progress_ticker">S\'està baixant ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% pujant %2$s</string>
   <string name="downloader_download_succeeded_ticker">La baixada ha estat correcte</string>
@@ -89,6 +90,7 @@
   <string name="downloader_download_failed_ticker">La baixada ha fallat</string>
   <string name="downloader_download_failed_content">La baixada de %1$s no s\'ha pogut acabar</string>
   <string name="downloader_not_downloaded_yet">No baixat encara</string>
+  <string name="downloader_download_failed_credentials_error">La descàrrega ha fallat, t\'has de tornar a acreditar</string>
   <string name="common_choose_account">Escolliu el compte</string>
   <string name="sync_fail_ticker">La sincronització ha fallat</string>
   <string name="sync_fail_content">La sincronització de %1$s no s\'ha pogut acabar</string>
@@ -184,6 +186,7 @@
   <string name="sync_file_nothing_to_do_msg">Contingut de l\'arxiu ja sincronitzat</string>
   <string name="create_dir_fail_msg">La carpeta no s\'ha pogut crear</string>
   <string name="filename_forbidden_characters">Caràcters no permesos: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_empty">El Nom de l\'arxiu no pot estar buit</string>
   <string name="wait_a_moment">Espereu</string>
   <string name="filedisplay_unexpected_bad_get_content">S\'ha produït un problema inesperat; proveu una altra aplicació per seleccionar el fitxer</string>
   <string name="filedisplay_no_file_selected">No heu seleccionat cap fitxer</string>
@@ -251,4 +254,8 @@
   <string name="copy_link">Copia l\'enllaç</string>
   <string name="clipboard_text_copied">S\'ha copiat al porta-retalls</string>
   <string name="error_cant_bind_to_operations_service">Error crític: no es poden realitzar operacions</string>
+  <string name="network_error_socket_exception">Hi ha hagut un error mentre es connectava al servidor.</string>
+  <string name="network_error_socket_timeout_exception">Hi ha hagut un error esperant al servidor, l\'operació no s\'ha pogut realitzar</string>
+  <string name="network_error_connect_timeout_exception">Hi ha hagut un error esperant el servidor, l\'operació no s\'ha pogut realitzar</string>
+  <string name="network_host_not_available">La operació no s\'ha pogut completar, el servidor no està disponible</string>
 </resources>
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
index 64ae5897..ed23515d 100644
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s 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_credentials_error">Hochladen fehlgeschlagen, Sie müssen sich nochmals anmelden</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>
@@ -89,6 +90,7 @@
   <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="downloader_not_downloaded_yet">Noch nicht heruntergeladen</string>
+  <string name="downloader_download_failed_credentials_error">Herunterladen fehlgeschlagen, Sie müssen sich nochmals anmelden</string>
   <string name="common_choose_account">Konto auswählen</string>
   <string name="sync_fail_ticker">Synchronisation fehlgeschlagen</string>
   <string name="sync_fail_content">Bei der Synchronisation konnte %1$s nicht übertragen werden</string>
@@ -252,4 +254,8 @@
   <string name="copy_link">Link kopieren</string>
   <string name="clipboard_text_copied">In die Zwischenablage kopiert</string>
   <string name="error_cant_bind_to_operations_service">Kritischer Fehler: Operationen können nicht ausgeführt werden</string>
+  <string name="network_error_socket_exception">Es ist ein Fehler beim Verbinden mit dem Server aufgetreten.</string>
+  <string name="network_error_socket_timeout_exception">Es ist ein Fehler beim Warten auf den Server aufgetreten, die Operation kann nicht ausgeführt werden</string>
+  <string name="network_error_connect_timeout_exception">Es ist ein Fehler beim Warten auf den Server aufgetreten, die Operation kann nicht ausgeführt werden</string>
+  <string name="network_host_not_available">Die Operation kann nicht abgeschlossen werden, der Server ist nicht erreichbar</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1491b162..dea1a35d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s 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_credentials_error">Hochladen fehlgeschlagen, Du musst dich nochmals anmelden</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>
@@ -89,6 +90,7 @@
   <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="downloader_not_downloaded_yet">Noch nicht Heruntergeladen</string>
+  <string name="downloader_download_failed_credentials_error">Herunterladen fehlgeschlagen, Du musst dich nochmals anmelden</string>
   <string name="common_choose_account">Account auswählen</string>
   <string name="sync_fail_ticker">Synchronisation fehlgeschlagen</string>
   <string name="sync_fail_content">Bei der Synchronisation konnte %1$s nicht übertragen werden</string>
@@ -252,4 +254,8 @@
   <string name="copy_link">Link kopieren</string>
   <string name="clipboard_text_copied">In die Zwischenablage kopiert</string>
   <string name="error_cant_bind_to_operations_service">Kritischer Fehler: Operationen können nicht ausgeführt werden</string>
+  <string name="network_error_socket_exception">Es ist ein Fehler beim Verbinden mit dem Server aufgetreten.</string>
+  <string name="network_error_socket_timeout_exception">Es ist ein Fehler beim Warten auf den Server aufgetreten, die Operation kann nicht ausgeführt werden</string>
+  <string name="network_error_connect_timeout_exception">Es ist ein Fehler beim Warten auf den Server aufgetreten, die Operation kann nicht ausgeführt werden</string>
+  <string name="network_host_not_available">Die Operation kann nicht abgeschlossen werden, der Server ist nicht erreichbar</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c56ffec8..642460ab 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s was successfully uploaded</string>
   <string name="uploader_upload_failed_ticker">Upload failed</string>
   <string name="uploader_upload_failed_content_single">Upload of %1$s could not be completed</string>
+  <string name="uploader_upload_failed_credentials_error">Upload failed, you need to login again</string>
   <string name="downloader_download_in_progress_ticker">Downloading …</string>
   <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
   <string name="downloader_download_succeeded_ticker">Download succeeded</string>
@@ -89,6 +90,7 @@
   <string name="downloader_download_failed_ticker">Download failed</string>
   <string name="downloader_download_failed_content">Download of %1$s could not be completed</string>
   <string name="downloader_not_downloaded_yet">Not downloaded yet</string>
+  <string name="downloader_download_failed_credentials_error">Download failed, you need to login again</string>
   <string name="common_choose_account">Choose account</string>
   <string name="sync_fail_ticker">Synchronisation failed</string>
   <string name="sync_fail_content">Synchronisation of %1$s could not be completed</string>
@@ -252,4 +254,8 @@
   <string name="copy_link">Copy link</string>
   <string name="clipboard_text_copied">Copied to clipboard</string>
   <string name="error_cant_bind_to_operations_service">Critical error: cannot perform operations</string>
+  <string name="network_error_socket_exception">An error occurred whilst connecting to the server.</string>
+  <string name="network_error_socket_timeout_exception">An error occurred whilst waiting for the server, the operation couldn\'t be done</string>
+  <string name="network_error_connect_timeout_exception">An error occurred whilst waiting for the server, the operation couldn\'t been done</string>
+  <string name="network_host_not_available">The operation couldn\'t be completed, server is unavailable</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3744433f..41d7d7b5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -89,6 +89,7 @@
   <string name="downloader_download_failed_ticker">Falló la descarga</string>
   <string name="downloader_download_failed_content">La descarga de %1$s no se pudo completar</string>
   <string name="downloader_not_downloaded_yet">No descargado</string>
+  <string name="downloader_download_failed_credentials_error">Descarga fallida, necesita reinicar la sesión</string>
   <string name="common_choose_account">Elige una cuenta</string>
   <string name="sync_fail_ticker">Falló la sincronización</string>
   <string name="sync_fail_content">La sincronización de %1$s s no se pudo completar</string>
@@ -252,4 +253,8 @@
   <string name="copy_link">Copiar enlace</string>
   <string name="clipboard_text_copied">Copiado al portapapeles</string>
   <string name="error_cant_bind_to_operations_service">Error crítico: no se pueden hacer operaciones</string>
+  <string name="network_error_socket_exception">Ocurrió un error al conectarse con el servidor.</string>
+  <string name="network_error_socket_timeout_exception">Ocurrió un error al esperar la respuesta del servidor, la operación no se pudo realizar</string>
+  <string name="network_error_connect_timeout_exception">Ocurrió un error al esperar la respuesta del servidor, la operación no se pudo realizar</string>
+  <string name="network_host_not_available">La operación no se pudo completar; el servidor no está disponible </string>
 </resources>
diff --git a/res/values-fi-rFI/strings.xml b/res/values-fi-rFI/strings.xml
index 3a02f082..48c5db16 100644
--- a/res/values-fi-rFI/strings.xml
+++ b/res/values-fi-rFI/strings.xml
@@ -73,6 +73,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s lähetettiin onnistuneesti</string>
   <string name="uploader_upload_failed_ticker">Lähetys epäonnistui</string>
   <string name="uploader_upload_failed_content_single">%1$s :n lähetys palvelimelle jäi kesken</string>
+  <string name="uploader_upload_failed_credentials_error">Lähetys epäonnistui, kirjaudu uudelleen</string>
   <string name="downloader_download_in_progress_ticker">Ladataan...</string>
   <string name="downloader_download_in_progress_content">%1$d%% ladataan palvelimelta %2$s</string>
   <string name="downloader_download_succeeded_ticker">Lataus tänne onnistui</string>
@@ -80,6 +81,7 @@
   <string name="downloader_download_failed_ticker">Lataus epäonnistui</string>
   <string name="downloader_download_failed_content">%1$s :n latausta ei pystytty suorittamaan loppuun asti</string>
   <string name="downloader_not_downloaded_yet">Ei vielä ladattu</string>
+  <string name="downloader_download_failed_credentials_error">Lataus epäonnistui, kirjaudu uudelleen</string>
   <string name="common_choose_account">Valitse tili</string>
   <string name="sync_fail_ticker">Synkronointi epäonnistui</string>
   <string name="sync_fail_content">Kohteen %1$s synkronointia ei voitu suorittaa loppuun</string>
@@ -212,4 +214,6 @@
   <string name="copy_link">Kopioi linkki</string>
   <string name="clipboard_text_copied">Kopioitu leikepöydälle</string>
   <string name="error_cant_bind_to_operations_service">Kriittinen virhe: toimintoja ei voi suorittaa</string>
+  <string name="network_error_socket_exception">Virhe palvelimeen yhdistäessä</string>
+  <string name="network_host_not_available">Toimintoa ei voitu saattaa loppuun, palvelin ei ole käytettävissä</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 7a3a243c..6a49d756 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s foi enviado correctamente</string>
   <string name="uploader_upload_failed_ticker">Produciuse un fallou no envío</string>
   <string name="uploader_upload_failed_content_single">Non foi posíbel completar o envío de %1$s</string>
+  <string name="uploader_upload_failed_credentials_error">Fallou o envío, necesita volver acceder</string>
   <string name="downloader_download_in_progress_ticker">Descargando…</string>
   <string name="downloader_download_in_progress_content">%1$d%% descargando %2$s</string>
   <string name="downloader_download_succeeded_ticker">Completouse a descarga</string>
@@ -89,6 +90,7 @@
   <string name="downloader_download_failed_ticker">Produciuse un fallo na descarga</string>
   <string name="downloader_download_failed_content">Non foi posíbel completar a descarga de %1$s</string>
   <string name="downloader_not_downloaded_yet">Non descargado aínda</string>
+  <string name="downloader_download_failed_credentials_error">Fallou a descarga, necesita volver acceder</string>
   <string name="common_choose_account">Escoller unha conta</string>
   <string name="sync_fail_ticker">Produciuse un fallo na sincronización</string>
   <string name="sync_fail_content">Non foi posíbel completar a sincronización de %1$s</string>
@@ -252,4 +254,8 @@
   <string name="copy_link">Copiar a ligazón</string>
   <string name="clipboard_text_copied">Copiado no portapapeis.</string>
   <string name="error_cant_bind_to_operations_service">Produciuse un erro crítico: non é posíbel realizar as operacións</string>
+  <string name="network_error_socket_exception">Produciuse un erro mentres conectaba co servidor.</string>
+  <string name="network_error_socket_timeout_exception">Produciuse un erro mentres agardaba polo servidor, a operación non se puido levar a fin</string>
+  <string name="network_error_connect_timeout_exception">Produciuse un erro mentres agardaba polo servidor, a operación non se puido levar a fin</string>
+  <string name="network_host_not_available">A operación non se completou, o servidor non está dispoñíbel</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index dc4d4284..4883880e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s è stato caricato correttamente</string>
   <string name="uploader_upload_failed_ticker">Caricamento non riuscito</string>
   <string name="uploader_upload_failed_content_single">Il caricamento di %1$s non può essere completato</string>
+  <string name="uploader_upload_failed_credentials_error">Caricamento non riuscito, devi ripetere l\'accesso</string>
   <string name="downloader_download_in_progress_ticker">Scaricamento in corso...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Scaricamento di %2$s</string>
   <string name="downloader_download_succeeded_ticker">Scaricamento effettuato</string>
@@ -89,6 +90,7 @@
   <string name="downloader_download_failed_ticker">Scaricamento non riuscito</string>
   <string name="downloader_download_failed_content">Scaricamento di %1$s non è stato completato</string>
   <string name="downloader_not_downloaded_yet">Non ancora scaricato</string>
+  <string name="downloader_download_failed_credentials_error">Scaricamento non riuscito, devi ripetere l\'accesso</string>
   <string name="common_choose_account">Scegli account</string>
   <string name="sync_fail_ticker">Sincronizzazione non riuscita</string>
   <string name="sync_fail_content">La sincronizzazione di %1$s non può essere completata</string>
@@ -252,4 +254,8 @@
   <string name="copy_link">Copia collegamento</string>
   <string name="clipboard_text_copied">Copiato negli appunti</string>
   <string name="error_cant_bind_to_operations_service">Errore critico: impossibile eseguire le operazioni</string>
+  <string name="network_error_socket_exception">Si è verificato un errore durante la connessione al server.</string>
+  <string name="network_error_socket_timeout_exception">Si è verificato un errore in attesa della risposta del server, l\'operazione non è stata completata</string>
+  <string name="network_error_connect_timeout_exception">Si è verificato un errore in attesa della risposta del server, l\'operazione non è stata completata</string>
+  <string name="network_host_not_available">L\'operazione non è stata completata, il server non è disponibile</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index dd207c5b..94910e78 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s foi enviado com sucesso</string>
   <string name="uploader_upload_failed_ticker">Falha no envio</string>
   <string name="uploader_upload_failed_content_single">Envio de %1$s não pôde ser finalizado</string>
+  <string name="uploader_upload_failed_credentials_error">Enviar falhou, você precisa reconectar</string>
   <string name="downloader_download_in_progress_ticker">Baixando …</string>
   <string name="downloader_download_in_progress_content">%1$d%% Baixando %2$s</string>
   <string name="downloader_download_succeeded_ticker">Download bem sucedido</string>
@@ -89,6 +90,7 @@
   <string name="downloader_download_failed_ticker">Download falhou</string>
   <string name="downloader_download_failed_content">Download de %1$s não pôde ser concluído</string>
   <string name="downloader_not_downloaded_yet">Não baixado ainda</string>
+  <string name="downloader_download_failed_credentials_error">Baixar falhou, você precisa reconectar</string>
   <string name="common_choose_account">Escolha a conta</string>
   <string name="sync_fail_ticker">Sincronização falhou</string>
   <string name="sync_fail_content">Sincronização de %1$s não pôde ser completada</string>
@@ -252,4 +254,8 @@
   <string name="copy_link">Copiar o link</string>
   <string name="clipboard_text_copied">Copiado para área de transferência</string>
   <string name="error_cant_bind_to_operations_service">Erro crítico: não pode executar operações</string>
+  <string name="network_error_socket_exception">Ocorreu um erro durante a conexão com o servidor.</string>
+  <string name="network_error_socket_timeout_exception">Ocorreu um erro enquanto se espera pelo servidor, a operação não poderia ter sido executada</string>
+  <string name="network_error_connect_timeout_exception">Ocorreu um erro enquanto se espera pelo servidor, a operação não poderia ter sido executada</string>
+  <string name="network_host_not_available">A operação não pôde ser concluída, o servidor está indisponível</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d0b4663a..69adffac 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s laddades upp</string>
   <string name="uploader_upload_failed_ticker">Misslyckad uppladdning</string>
   <string name="uploader_upload_failed_content_single">Uppladdning av %1$s kunde inte slutföras</string>
+  <string name="uploader_upload_failed_credentials_error">Uppladdning misslyckades, måste du logga in igen</string>
   <string name="downloader_download_in_progress_ticker">Laddar ner ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Laddar ner %2$s</string>
   <string name="downloader_download_succeeded_ticker">Nedladdning klar</string>
@@ -89,6 +90,7 @@
   <string name="downloader_download_failed_ticker">Misslyckad nedladdning</string>
   <string name="downloader_download_failed_content">Nedladdning av %1$s kunde inte slutföras</string>
   <string name="downloader_not_downloaded_yet">Ännu inte nedladdade</string>
+  <string name="downloader_download_failed_credentials_error">Nerladda misslyckades, måste du logga in igen</string>
   <string name="common_choose_account">Välj konto</string>
   <string name="sync_fail_ticker">Synkroniseringen misslyckades</string>
   <string name="sync_fail_content">Synkronisering av %1$s kunde inte slutföras</string>
@@ -252,4 +254,8 @@
   <string name="copy_link">Kopiera länk</string>
   <string name="clipboard_text_copied">Kopierat till urklipp</string>
   <string name="error_cant_bind_to_operations_service">Kritiskt fel: kan inte utföra operationer</string>
+  <string name="network_error_socket_exception">Ett fel uppstod vid anslutning till servern.</string>
+  <string name="network_error_socket_timeout_exception">Ett fel uppstod i väntan på servern, operationen kunde inte ha gjorts</string>
+  <string name="network_error_connect_timeout_exception">Ett fel uppstod i väntan på servern, operationen kunde inte ha gjorts</string>
+  <string name="network_host_not_available">Åtgärden kunde inte slutföras, är servern ej kontaktbar</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 34d17f4d..43e634c4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s başarıyla yüklendi</string>
   <string name="uploader_upload_failed_ticker">Yükleme başarısız</string>
   <string name="uploader_upload_failed_content_single">%1$s yüklenmesi tamamlanamadı</string>
+  <string name="uploader_upload_failed_credentials_error">Yükleme başarısız, yeniden oturum açmalısınız</string>
   <string name="downloader_download_in_progress_ticker">Ä°ndiriliyor...</string>
   <string name="downloader_download_in_progress_content">%%%1$d Ä°ndirilen: %2$s</string>
   <string name="downloader_download_succeeded_ticker">İndirme başarılı</string>
@@ -89,6 +90,7 @@
   <string name="downloader_download_failed_ticker">İndirme başarısız</string>
   <string name="downloader_download_failed_content">%1$s indirmesi tamamlanamadı</string>
   <string name="downloader_not_downloaded_yet">Henüz indirilemedi</string>
+  <string name="downloader_download_failed_credentials_error">İndirme başarısız, yeniden oturum açmalısınız</string>
   <string name="common_choose_account">Hesap seçin</string>
   <string name="sync_fail_ticker">Eşitleme başarısız</string>
   <string name="sync_fail_content">%1$s eşitlemesi tamamlanamadı</string>
@@ -252,4 +254,8 @@
   <string name="copy_link">Bağlantıyı kopyala</string>
   <string name="clipboard_text_copied">Panoya kopyalandı</string>
   <string name="error_cant_bind_to_operations_service">Ciddi hata: işlem gerçekleştirilemiyor</string>
+  <string name="network_error_socket_exception">Sunucuya bağlanılırken bir hata oluştu.</string>
+  <string name="network_error_socket_timeout_exception">Sunucu beklenirken bir hata oluştu, işlem yapılamadı</string>
+  <string name="network_error_connect_timeout_exception">Sunucu beklenirken bir hata oluştu, işlem yapılamadı</string>
+  <string name="network_host_not_available">İşlem tamamlanamadı, sunucu kullanılamıyor</string>
 </resources>
diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java
index 7a031359..b525bc4a 100644
--- a/src/com/owncloud/android/files/services/FileDownloader.java
+++ b/src/com/owncloud/android/files/services/FileDownloader.java
@@ -494,29 +494,28 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
                 mDownloadClient = null;   // grant that future retries on the same account will get the fresh credentials
                 
             } else {
-                Intent showDetailsIntent = null;
-                if (downloadResult.isSuccess()) {
-                    if (PreviewImageFragment.canBePreviewed(download.getFile())) {
-                        showDetailsIntent = new Intent(this, PreviewImageActivity.class);
-                    } else {
-                        showDetailsIntent = new Intent(this, FileDisplayActivity.class);
-                    }
-                    showDetailsIntent.putExtra(FileActivity.EXTRA_FILE, download.getFile());
-                    showDetailsIntent.putExtra(FileActivity.EXTRA_ACCOUNT, download.getAccount());
-                    showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                    
-                } else {
-                    // TODO put something smart in showDetailsIntent
-                    showDetailsIntent = new Intent();
-                }
+                // TODO put something smart in showDetailsIntent
+                Intent   showDetailsIntent = new Intent();
                 mNotificationBuilder
                     .setContentIntent(PendingIntent.getActivity(
                         this, (int) System.currentTimeMillis(), showDetailsIntent, 0));
             }
             
             mNotificationBuilder.setContentText(ErrorMessageAdapter.getErrorCauseMessage(downloadResult, download, getResources()));
-            
             mNotificationManager.notify(tickerId, mNotificationBuilder.build());
+            
+            // Remove success notification
+            if (downloadResult.isSuccess()) {   
+                // Sleep 2 seconds, so show the notification before remove it
+                Handler handler = new Handler(); 
+                handler.postDelayed(new Runnable() { 
+                     public void run() { 
+                         mNotificationManager.cancel(R.string.downloader_download_succeeded_ticker);
+                     } 
+                }, 2000); 
+                
+            }
+                
         }
     }
     
diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java
index c6408c28..7a04a22d 100644
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@ -52,8 +52,6 @@ import com.owncloud.android.ui.activity.FailedUploadActivity;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.activity.InstantUploadActivity;
-import com.owncloud.android.ui.preview.PreviewImageActivity;
-import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 import com.owncloud.android.utils.Log_OC;
 import com.owncloud.android.utils.NotificationBuilderWithProgressBar;
@@ -725,48 +723,15 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
      */
     private void notifyUploadResult(RemoteOperationResult uploadResult, UploadFileOperation upload) {
         Log_OC.d(TAG, "NotifyUploadResult with resultCode: " + uploadResult.getCode());
-        if (uploadResult.isCancelled()) {
-            // / cancelled operation -> silent removal of progress notification
-            mNotificationManager.cancel(R.string.uploader_upload_in_progress_ticker);
-
-        } else if (uploadResult.isSuccess()) {
-            // / success -> silent update of progress notification to success
-            // message
-            mNotificationBuilder
-                .setOngoing(false)
-                .setAutoCancel(true)
-                .setProgress(0, 0, false);
-            
-            /// includes a pending intent in the notification showing the details view of the file
-            Intent showDetailsIntent = null;
-            if (PreviewImageFragment.canBePreviewed(upload.getFile())) {
-                showDetailsIntent = new Intent(this, PreviewImageActivity.class); 
-            } else {
-                showDetailsIntent = new Intent(this, FileDisplayActivity.class); 
-            }
-            showDetailsIntent.putExtra(FileActivity.EXTRA_FILE, upload.getFile());
-            showDetailsIntent.putExtra(FileActivity.EXTRA_ACCOUNT, upload.getAccount());
-            showDetailsIntent.putExtra(FileActivity.EXTRA_FROM_NOTIFICATION, true);;
-            mNotificationBuilder
-                .setContentIntent(PendingIntent.getActivity(
-                        this, (int) System.currentTimeMillis(), showDetailsIntent, 0
-                ))
-                .setTicker(getString(R.string.uploader_upload_succeeded_ticker))
-                .setContentTitle(getString(R.string.uploader_upload_succeeded_ticker))
-                .setContentText(ErrorMessageAdapter.getErrorCauseMessage(uploadResult, upload, getResources()));
-
-            mNotificationManager.notify(R.string.uploader_upload_in_progress_ticker, mNotificationBuilder.build());  // NOT
-                                                                                                                     // AN
-            DbHandler db = new DbHandler(this.getBaseContext());
-            db.removeIUPendingFile(mCurrentUpload.getOriginalStoragePath());
-            db.close();
-
-        } else {
-
-            // / fail -> explicit failure notification
-            mNotificationManager.cancel(R.string.uploader_upload_in_progress_ticker);            
+        // / cancelled operation or success -> silent removal of progress notification
+        mNotificationManager.cancel(R.string.uploader_upload_in_progress_ticker);
+        
+        // Show the result: success or fail notification
+        if (!uploadResult.isCancelled()) {
+            int tickerId = (uploadResult.isSuccess()) ? R.string.uploader_upload_succeeded_ticker : 
+                R.string.uploader_upload_failed_ticker;
             
-            NotificationCompat.Builder errorBuilder = new NotificationCompat.Builder(this);
+            NotificationCompat.Builder resultBuilder = new NotificationCompat.Builder(this);
             
             String content = null;
 
@@ -774,10 +739,10 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
             boolean needsToUpdateCredentials = (uploadResult.getCode() == ResultCode.UNAUTHORIZED || 
                     (uploadResult.isIdPRedirection() &&
                             mUploadClient.getCredentials() == null));
-            int tickerId = (needsToUpdateCredentials) ? 
-                    R.string.uploader_upload_failed_credentials_error : R.string.uploader_upload_failed_ticker;
+            tickerId = (needsToUpdateCredentials) ? 
+                    R.string.uploader_upload_failed_credentials_error : tickerId;
 
-            errorBuilder
+            resultBuilder
             .setSmallIcon(R.drawable.notification_icon)
             .setTicker(getString(tickerId))
             .setContentTitle(getString(tickerId))
@@ -793,7 +758,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
                 updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
                 updateAccountCredentials.addFlags(Intent.FLAG_FROM_BACKGROUND);
-                errorBuilder.setContentIntent(PendingIntent.getActivity(
+                resultBuilder.setContentIntent(PendingIntent.getActivity(
                     this, (int) System.currentTimeMillis(), updateAccountCredentials, PendingIntent.FLAG_ONE_SHOT
                 ));
                 
@@ -811,7 +776,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
                     detailUploadIntent = new Intent(this, FailedUploadActivity.class);
                     detailUploadIntent.putExtra(FailedUploadActivity.MESSAGE, content);
                 }
-                errorBuilder
+                resultBuilder
                     .setContentIntent(PendingIntent.getActivity(
                         this, (int) System.currentTimeMillis(), detailUploadIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT
                     ))
@@ -838,10 +803,21 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
                 }
             }
             
-            errorBuilder.setContentText(content);
-            mNotificationManager.notify(tickerId, errorBuilder.build());
+            resultBuilder.setContentText(content);
+            mNotificationManager.notify(tickerId, resultBuilder.build());
+            
+            // Remove success notification
+            if (uploadResult.isSuccess()) {   
+                // Sleep 2 seconds, so show the notification before remove it
+                Handler handler = new Handler(); 
+                handler.postDelayed(new Runnable() { 
+                     public void run() { 
+                         mNotificationManager.cancel(R.string.uploader_upload_succeeded_ticker);
+                     } 
+                }, 2000); 
+                
+            }
         }
-
     }
 
     /**