From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Thu, 6 Jun 2013 23:36:11 +0000 (+0200)
Subject: [tx-robot] updated from transifex
X-Git-Tag: oc-android-1.4.3~12^2~20
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2f2720636097b5a3d5461176d9226feaffd182a9?ds=inline

[tx-robot] updated from transifex
---

diff --git a/res/values-bg-rBG/strings.xml b/res/values-bg-rBG/strings.xml
index aec32fd5..c85d5970 100644
--- a/res/values-bg-rBG/strings.xml
+++ b/res/values-bg-rBG/strings.xml
@@ -11,21 +11,116 @@
   <string name="main_calendar">Календар</string>
   <string name="main_bookmarks">Предпочитани</string>
   <string name="main_settings">Настройки</string>
+  <string name="actionbar_sync">Опресняване</string>
   <string name="actionbar_upload">Качване</string>
+  <string name="actionbar_upload_from_apps">Съдържание от други приложения</string>
   <string name="actionbar_upload_files">Файлове</string>
+  <string name="actionbar_mkdir">Нова директория</string>
+  <string name="actionbar_search">Търсене</string>
   <string name="actionbar_settings">Настройки</string>
   <string name="prefs_category_general">Общи</string>
+  <string name="prefs_add_session">Добавяне на нова сесия</string>
+  <string name="prefs_create_img_thumbnails">Създавае на миниатюри</string>
+  <string name="prefs_select_oc_account">Изберете профил</string>
+  <string name="prefs_trackmydevice_interval">Интервал за обновяване</string>
+  <string name="prefs_trackmydevice_interval_summary">Обнови всеки %1$s минути</string>
+  <string name="prefs_accounts">Профили</string>
+  <string name="prefs_instant_upload_summary">Своевременно качване на снимки направени с камерата</string>
   <string name="auth_host_url">Уеб адрес</string>
+  <string name="auth_username">Потребител</string>
   <string name="auth_password">Парола</string>
   <string name="sync_string_files">Файлове</string>
+  <string name="uploader_no_file_selected">Не е избран файл за качване</string>
+  <string name="setup_hint_username">Потребител</string>
   <string name="setup_hint_password">Парола</string>
+  <string name="setup_hint_address">Уеб адрес</string>
+  <string name="setup_hint_show_password">Показва паролата?</string>
+  <string name="setup_btn_connect">Свързване</string>
   <string name="uploader_btn_upload_text">Качване</string>
+  <string name="uploader_wrn_no_account_title">Няма открит профил</string>
+  <string name="uploader_wrn_no_account_setup_btn_text">Инсталиране</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Изход</string>
+  <string name="uploader_wrn_no_content_title">Няма съдържание за качване</string>
+  <string name="uploader_wrn_no_content_text">Не беше получено съдържание. Няма какво да се качи.</string>
+  <string name="uploader_info_uploading">Качване</string>
+  <string name="uploader_btn_create_dir_text">Създаване на директория за качване</string>
+  <string name="filedetails_select_file">Натиснете върху файл за да видите повече информация.</string>
+  <string name="filedetails_size">Размер:</string>
+  <string name="filedetails_type">Тип:</string>
+  <string name="filedetails_created">Създаден:</string>
+  <string name="filedetails_modified">Променен:</string>
   <string name="filedetails_download">Изтегляне</string>
+  <string name="filedetails_sync_file">Опресняване</string>
+  <string name="filedetails_open">Отвори</string>
+  <string name="common_yes">Да</string>
+  <string name="common_no">Не</string>
+  <string name="common_ok">ОК</string>
   <string name="common_cancel_upload">Спри качването</string>
+  <string name="common_cancel">Отказ</string>
+  <string name="common_save_exit">Запази и Излез</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>
+  <string name="uploader_info_dirname">Име на папка</string>
+  <string name="uploader_upload_in_progress_ticker">Качване ...</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% Качване %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">Качване е успешно</string>
+  <string name="uploader_upload_failed_ticker">Качването е неуспешно</string>
+  <string name="uploader_upload_failed_content_single">Качването на %1$s не може да бъде завършено</string>
+  <string name="uploader_upload_failed_content_multiple">Качването неуспешно: %1$d/%2$d файла бяха качени</string>
+  <string name="downloader_download_in_progress_ticker">Сваляне ...</string>
+  <string name="downloader_download_in_progress_content">%1$d%% Сваляне %2$s</string>
+  <string name="downloader_download_failed_ticker">Свалянето е неуспешно</string>
+  <string name="downloader_download_failed_content">Свалянето на %1$s не може да бъде завършено</string>
+  <string name="common_choose_account">Изберете акаунт</string>
   <string name="sync_string_contacts">Контакти</string>
+  <string name="sync_fail_ticker">Синхронизацияте е неуспешна</string>
+  <string name="sync_fail_content">Синхронизацията на %1$s не може да бъде осъществена</string>
+  <string name="use_ssl">Използвай Сигурна Връзка</string>
+  <string name="pincode_enter_pin_code">Моля въведете Вашия App ПИН</string>
+  <string name="pincode_enter_new_pin_code">Моля въведете Вашият нов App ПИН</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 Минути</item>
+    <item>30 Минути</item>
+    <item>60 Минути</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">Опит за влизане...</string>
+  <string name="auth_no_net_conn_title">Няма мрежова свързаност</string>
+  <string name="auth_connect_anyway">Свързване въпреки това</string>
+  <string name="auth_nossl_plain_ok_title">Защитена връзка не е налична</string>
+  <string name="auth_connection_established">Осъществена връзка</string>
+  <string name="auth_testing_connection">Проверка на свързаност...</string>
+  <string name="auth_unknown_error_title">Появи се неизвестна грешка!</string>
+  <string name="auth_unknown_host_title">Невъзможност за намиране на хоста</string>
+  <string name="auth_unknown_host_message">Не възможност за намиране на въведения хост. Моля проверете името му и дали е в изправност и опитайте отново.</string>
+  <string name="auth_timeout_title">Сървърът се забави прекалено много с отговора</string>
+  <string name="auth_incorrect_address_title">Грешен URL</string>
+  <string name="auth_ssl_general_error_title">Инициализацията на SSL е неуспешна</string>
+  <string name="auth_ssl_unverified_server_title">Непроверена идентичност на SSL сървъра</string>
+  <string name="auth_wrong_connection_title">Невъзможност за осъществяване на връзка</string>
+  <string name="auth_secure_connection">Осъществена защитена връзка</string>
+  <string name="crashlog_send_report">Изпрати доклад</string>
+  <string name="crashlog_dont_send_report">Не изпращай доклад</string>
+  <string name="extensions_avail_title">Има разширения!</string>
+  <string name="fd_keep_in_sync">Дръж файлът обновен</string>
   <string name="common_share">Споделяне</string>
   <string name="common_rename">Преименуване</string>
   <string name="common_remove">Премахване</string>
+  <string name="confirmation_remove_alert">Наистина ли искате да изтриете %1$s ?</string>
+  <string name="confirmation_remove_local">Само локално</string>
+  <string name="confirmation_remove_remote">Премахни от сървъра</string>
+  <string name="rename_server_fail_msg">Преименуването не може да се осъществи</string>
+  <string name="create_dir_fail_msg">Папката не може да бъде създадена</string>
+  <string name="wait_a_moment">Изчакайте малко</string>
+  <string name="filedisplay_no_file_selected">Не е избран файл</string>
+  <string name="ssl_validator_title">Внимание</string>
+  <string name="ssl_validator_header">Самоличността на сайта не може да бъде проверена</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
index 77a5a82e..793aef33 100644
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@ -21,8 +21,8 @@
   <string name="actionbar_mkdir">Ordner anlegen</string>
   <string name="actionbar_search">Suche</string>
   <string name="actionbar_settings">Einstellungen</string>
+  <string name="actionbar_see_details">Details</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">Account auswählen</string>
@@ -53,7 +53,7 @@
   <string name="setup_title">Mit Ihrer %1$s verbinden</string>
   <string name="setup_btn_connect">Verbinden</string>
   <string name="uploader_btn_upload_text">Hochladen</string>
-  <string name="uploader_top_message">Wähle Zielverzeichnis:</string>
+  <string name="uploader_top_message">Wähle Zielordner:</string>
   <string name="uploader_wrn_no_account_title">Kein Konto gefunden</string>
   <string name="uploader_wrn_no_account_text">Es sind keine %1$s-Konten auf Ihrem Gerät eingerichtet. Bitte richten Sie zuerst ein Konto ein.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Einrichten</string>
@@ -83,7 +83,7 @@
   <string name="common_save_exit">Speichern &amp; Schließen</string>
   <string name="common_exit">%1$s verlassen</string>
   <string name="common_error">Fehler</string>
-  <string name="common_loading">Wird geladen &#8230;</string>
+  <string name="common_loading">Lade …</string>
   <string name="common_error_unknown">Unbekannter Fehler</string>
   <string name="about_title">Über</string>
   <string name="delete_account">Account löschen</string>
@@ -113,6 +113,15 @@
   <string name="sync_conflicts_in_favourites_content">%1$d Synchronisationsdateien konnten nicht synchronisiert werden.</string>
   <string name="sync_fail_in_favourites_ticker">Synchronisationsdateien konnten nicht synchronisiert werden.</string>
   <string name="sync_fail_in_favourites_content">Inhalte von %1$d konnte nicht synchronisiert werden (%2$d Konflikte)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Einige lokale Dateien wurden vergessen</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d Dateien aus dem Verzeichnis %2$s konnten nicht kopiert werden nach</string>
+  <string name="sync_foreign_files_forgotten_explanation">\"Mit Version 1.3.16 werden Dateien, die von diesem Gerät aus hoch geladen werden, in den lokalen Ordner %1$s kopiert, um Datenverlust zu vermeiden wenn eine einzelne Datei mit mehreren Accounts synchronisiert wird.\n\nInfolge dieser Änderung wurden alle Dateien, die mit vorherigen Versionen dieser App hochgeladen wurden in den Ordner %2$s verschoben. Jedoch ist während der Account-Synchronisation ein Fehler aufgetreten der das Abschließen dieses Vorgangs verhindert. Sie können die Dateien entweder wie sie sind belassen und den Link zu %3$s entfernen, oder die Dateien in den %1$s Ordner verschieben und  den Link zu %4$s beibehalten.\n\nUnten befindet sich eine Liste der lokalen Dateien und der mit ihnen verbundenen Remote-Dateien in %5$s.</string>
+  <string name="foreign_files_move">Verschiebe alle</string>
+  <string name="foreign_files_success">Alle Dateien wurden verschoben</string>
+  <string name="foreign_files_fail">Einige Dateien konnten nicht verschoben werden</string>
+  <string name="foreign_files_local_text">Lokal: %1$s</string>
+  <string name="foreign_files_remote_text">Remote: %1$s</string>
+  <string name="upload_query_move_foreign_files">Es steht nicht genügend Speicherplatz zur Verfügung, um die ausgewählten Dateien in den %1$s Ordner zu kopieren. Möchten Sie sie stattdessen verschieben?</string>
   <string name="use_ssl">Sichere Verbindung benutzen</string>
   <string name="location_no_provider">%1$s kann Ihr Gerät nicht verfolgen. Bitte überprüfen Sie Ihre Standorteinstellungen.</string>
   <string name="pincode_enter_pin_code">Bitte geben Sie Ihre App-PIN ein</string>
@@ -125,26 +134,27 @@
   <string name="pincode_wrong">Falsche App-PIN</string>
   <string name="pincode_removed">Die App-PIN wurde entfernt</string>
   <string name="pincode_stored">Die App-PIN wurde gespeichert</string>
-  <string name="media_notif_ticker">"%1$s Musik Player"</string>
-  <string name="media_state_playing">"%1$s (wird abgespielt)"</string>
-  <string name="media_state_loading">"%1$s (wird geladen)"</string>
-  <string name="media_event_done">"%1$s Wiedergabe beendet"</string>
-  <string name="media_err_nothing_to_play">Keine Media-Datei gefunden</string>
-  <string name="media_err_no_account">Ungültiger Account</string>
-  <string name="media_err_not_in_owncloud">Datei ist nicht in einem gültigen Account</string>
-  <string name="media_err_unsupported">Nicht unterstützter Medien-Codec</string>
-  <string name="media_err_io">Media-Datei konnte nicht gelesen werden</string>
-  <string name="media_err_malformed">Die Media-Datei ist noch nicht kodiert</string>
-  <string name="media_err_timeout">Zeitüberschreitung ist beim Abspielen aufgetreten</string>
-  <string name="media_err_invalid_progressive_playback">Media-Datei konnte nicht gestreamt werden</string>
-  <string name="media_err_unknown">Media-Datei kann nicht vom Standard Player wiedergegeben werden</string>
-  <string name="media_err_security_ex">Sicherheits-Fehler ist beim Abspielen aufgetreten %1$s</string>
-  <string name="media_err_io_ex">Eingabe-Fehler ist beim Abspielen aufgetreten %1$s</string>
-  <string name="media_err_unexpected">Unerwarteter Fehler bei der Wiedergabe %1$s</string>
-  <string name="media_rewind_description">Zurückspulen</string>
-  <string name="media_play_pause_description">Wiedergabe oder Pause</string>
-  <string name="media_forward_description">Vorspulen</string>
-	
+  <string name="media_notif_ticker">%1$s Musikplayer</string>
+  <string name="media_state_playing">%1$s (abspielend)</string>
+  <string name="media_state_loading">%1$s (lädt)</string>
+  <string name="media_event_done">%1$s Wiedergabe beendet</string>
+  <string name="media_err_nothing_to_play">Keine Mediadatei gefunden</string>
+  <string name="media_err_no_account">Kein Account angegeben</string>
+  <string name="media_err_not_in_owncloud">Datei nicht in einem validen Account</string>
+  <string name="media_err_unsupported">Nicht unterstützter Media-Kodierung</string>
+  <string name="media_err_io">Mediendatei konnte nicht gelesen werden</string>
+  <string name="media_err_malformed">Mediendatei nicht korrekt kodiert</string>
+  <string name="media_err_timeout">Zu lange schon versucht abzuspielen</string>
+  <string name="media_err_invalid_progressive_playback">Mediendatei kann nicht gestreamt werden</string>
+  <string name="media_err_unknown">Die Mediendatei kann nicht mit dem vorinstallierten Media Player abgespielt werden</string>
+  <string name="media_err_security_ex">Sicherheitsfehler beim abspielen von %1$s</string>
+  <string name="media_err_io_ex">Eingabefehler beim Versuch %1$s abzuspielen</string>
+  <string name="media_err_unexpected">Unerwarteter Fehler beim Versuch %1$s abzuspielen</string>
+  <string name="media_previous_description">Voriger Titel Button</string>
+  <string name="media_rewind_description">Zurückspulen Button</string>
+  <string name="media_play_pause_description">Abspielen oder Pausieren Button</string>
+  <string name="media_forward_description">Vorspulen Button</string>
+  <string name="media_next_description">Nächster Titel Button</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 Minuten</item>
     <item>30 Minuten</item>
@@ -232,7 +242,12 @@
   <string name="ssl_validator_label_validity_to">An:</string>
   <string name="ssl_validator_label_signature">Signatur:</string>
   <string name="ssl_validator_label_signature_algorithm">Algorithmus:</string>
-  <string name="text_placeholder">Dies ist ein Platzhalter</string>
+  <string name="placeholder_sentence">Dies ist ein Platzhalter</string>
+  <string name="placeholder_filename">platzhalter.txt</string>
+  <string name="placeholder_filetype">PNG Bild</string>
+  <string name="placeholder_filesize">389 KB</string>
+  <string name="placeholder_timestamp">18.05.2012 12:23</string>
+  <string name="placeholder_media_time">12:23:45</string>
   <string name="instant_upload_on_wifi">Fotos nur über WiFi hochladen</string>
   <string name="instant_upload_path">/SofortUpload</string>
   <string name="conflict_title">Konflikt beim Update</string>
@@ -241,16 +256,19 @@
   <string name="conflict_overwrite">Überschreiben</string>
   <string name="conflict_dont_upload">Nicht hochladen</string>
   <string name="preview_image_description">Bildvorschau</string>
-  <string name="preview_image_error_unknown_format">Das Bild kann nicht angezeigt werden</string>
-  <string name="preview_image_error_out_of_memory">"Nicht genug Speicherplatz um das Bild anzuzeigen</string>
-  
-  <string name="actionbar_failed_instant_upload">Fehlgeschlagene Sofortuploads</string>  
-  <string name="failed_upload_headline_text">Fehlgeschlagene Sofortuploads</string>
-  <string name="failed_upload_headline_hint">Auflistung aller fehlgeschlagenen Softuploads</string>
+  <string name="preview_image_error_unknown_format">Dieses Bild kann nicht angezeigt werden</string>
+  <string name="preview_image_error_out_of_memory">\"Nicht genügend Arbeitsspeicher um dieses Bild anzuzeigen</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s konnte nicht in den lokalen %2$s Ordner kopiert werden</string>
+  <string name="actionbar_failed_instant_upload">Sofort Upload fehlgeschlagen\"</string>
+  <string name="failed_upload_headline_text">Sofortige Uploads fehlgeschlagen</string>
+  <string name="failed_upload_headline_hint">Zusammenfassung aller fehlgeschlagenen Uploads</string>
   <string name="failed_upload_all_cb">Alle auswählen</string>
-  <string name="failed_upload_headline_retryall_btn">Ausgewählte wiederholen</string>
-  <string name="failed_upload_headline_delete_all_btn">Ausgewählte löschen </string>
-  <string name="failed_upload_retry_text">Versuche ausgewählte erneut hochzuladen</string>
-  <string name="failed_upload_load_more_images">Load more Picrures</string>
-  <string name="failed_upload_retry_do_nothing_text">do nothing you are not online for instant upload</string>
+  <string name="failed_upload_headline_retryall_btn">Versuche alle ausgewählten erneut</string>
+  <string name="failed_upload_headline_delete_all_btn">Lösche alle ausgewählten aus der Uploadwarteschlange</string>
+  <string name="failed_upload_retry_text">Bildupload erneut versuchen:</string>
+  <string name="failed_upload_load_more_images">Lade weitere Bilder</string>
+  <string name="failed_upload_retry_do_nothing_text">Nicht durchgeführt nicht online für sofortigen Upload</string>
+  <string name="failed_upload_failure_text">Fehlermeldung:</string>
+  <string name="failed_upload_quota_exceeded_text">Bitte überprüfen Sie Ihre Serverkonfiguration. Vielleicht ist Ihr Nutzungslimit überschritten.</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8013575d..31163e89 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -21,8 +21,8 @@
   <string name="actionbar_mkdir">Ordner anlegen</string>
   <string name="actionbar_search">Suche</string>
   <string name="actionbar_settings">Einstellungen</string>
+  <string name="actionbar_see_details">Details</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">Account auswählen</string>
@@ -53,7 +53,7 @@
   <string name="setup_title">Mit Deiner %1$s verbinden</string>
   <string name="setup_btn_connect">Verbinden</string>
   <string name="uploader_btn_upload_text">Hochladen</string>
-  <string name="uploader_top_message">Wähle Zielverzeichnis:</string>
+  <string name="uploader_top_message">Wähle einen Ordner zum hochladen:</string>
   <string name="uploader_wrn_no_account_title">Kein Account gefunden</string>
   <string name="uploader_wrn_no_account_text">Es sind keine %1$s-Accounts auf Deinem Gerät eingerichtet. Bitte richte zuerst ein Konto ein.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Einrichten</string>
@@ -83,6 +83,8 @@
   <string name="common_save_exit">Speichern &amp; schließen</string>
   <string name="common_exit">%1$s verlasse</string>
   <string name="common_error">Fehler</string>
+  <string name="common_loading">Lädt ...</string>
+  <string name="common_error_unknown">Unbekannter Fehler</string>
   <string name="about_title">Über</string>
   <string name="delete_account">Account löschen</string>
   <string name="create_account">Account erstellen</string>
@@ -102,6 +104,7 @@
   <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="downloader_not_downloaded_yet">Noch nicht Heruntergeladen</string>
   <string name="common_choose_account">Account auswählen</string>
   <string name="sync_string_contacts">Kontakte</string>
   <string name="sync_fail_ticker">Synchronisation fehlgeschlagen</string>
@@ -110,6 +113,15 @@
   <string name="sync_conflicts_in_favourites_content">%1$d synchron zu haltende Dateien konnte nicht synchronisiert werden.</string>
   <string name="sync_fail_in_favourites_ticker">Synchron halten schlug fehl.</string>
   <string name="sync_fail_in_favourites_content">Inhalte von %1$d konnte nicht synchronisiert werden (%2$d Konflikte)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Einige lokale Dateien wurden vergessen</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d Dateien aus dem Verzeichnis %2$s konnten nicht kopiert werden nach</string>
+  <string name="sync_foreign_files_forgotten_explanation">\"Mit Version 1.3.16 werden Dateien, die von diesem Gerät aus hochgeladen werden in den lokalen Ordner %1$s kopiert um Datenverlust zu vermeiden wenn eine einzelne Datei mit mehreren Accounts synchronisiert wird.\n\nInfolge dieser Änderung wurden alle Dateien, die mit vorherigen Versionen dieser App hochgeladen wurden, in den Ordner %2$s verschoben. Jedoch ist während der Account-Synchronisation ein Fehler aufgetreten, der das Abschließen dieses Vorgangs verhindert. Du kannst die Dateien entweder belassen, wie sie sind und den Link zu %3$s entfernen, oder die Dateien in den %1$s Ordner verschieben und  den Link zu %4$s beibehalten.\n\nUnten befindet sich eine Liste der lokalen Dateien und der mit ihnen verbundenen Remote-Dateien in %5$s.</string>
+  <string name="foreign_files_move">Verschiebe alle</string>
+  <string name="foreign_files_success">Alle Dateien wurden verschoben</string>
+  <string name="foreign_files_fail">Einige Dateien konnten nicht verschoben werden</string>
+  <string name="foreign_files_local_text">Lokal: %1$s</string>
+  <string name="foreign_files_remote_text">Remote: %1$s</string>
+  <string name="upload_query_move_foreign_files">Es steht nicht genügend Speicherplatz zur Verfügung, um die ausgewählten Dateien in den %1$s Ordner zu kopieren. Möchtest Du sie stattdessen verschieben?</string>
   <string name="use_ssl">Sichere Verbindung benutzen</string>
   <string name="location_no_provider">%1$s 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>
@@ -122,6 +134,27 @@
   <string name="pincode_wrong">Falsche App-PIN</string>
   <string name="pincode_removed">Die App-PIN wurde entfernt</string>
   <string name="pincode_stored">Die App-PIN wurde gespeichert</string>
+  <string name="media_notif_ticker">%1$s Musik Player</string>
+  <string name="media_state_playing">%1$s (playing)</string>
+  <string name="media_state_loading">%1$s (loading)</string>
+  <string name="media_event_done">%1$s Beendet</string>
+  <string name="media_err_nothing_to_play">Keine Meidendatei gefunden</string>
+  <string name="media_err_no_account">Kein Konto angeben</string>
+  <string name="media_err_not_in_owncloud">Datei ist nicht in einem validen account</string>
+  <string name="media_err_unsupported">Codierung wird nicht unterstützt</string>
+  <string name="media_err_io">Fehler beim Lesen der Datei</string>
+  <string name="media_err_malformed">Mediendatei nicht korrekt encodiert</string>
+  <string name="media_err_timeout">Zeitüberschreitung beim spielen</string>
+  <string name="media_err_invalid_progressive_playback">Mediendatei konnte nicht gestreamt werden</string>
+  <string name="media_err_unknown">Diese Mediendatei konnte nicht mit dem standart Media Player geöffnet werden</string>
+  <string name="media_err_security_ex">Sicherheitsfehler beim versuch %1$s zu spielen</string>
+  <string name="media_err_io_ex">Eingabefehler beim versuch %1$s zu spielen</string>
+  <string name="media_err_unexpected">Ein Unerwarteter Fehler ist aufgetreten beim versuch %1$s abzuspielen</string>
+  <string name="media_previous_description">Vorheriges Lied Knopf</string>
+  <string name="media_rewind_description">Zurückspielen Knopf</string>
+  <string name="media_play_pause_description">Play-/Pause Knopf</string>
+  <string name="media_forward_description">Vorspulen Knopf</string>
+  <string name="media_next_description">Nächster Titel Knop</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 Minuten</item>
     <item>30 Minuten</item>
@@ -209,7 +242,12 @@
   <string name="ssl_validator_label_validity_to">Bis:</string>
   <string name="ssl_validator_label_signature">Signatur:</string>
   <string name="ssl_validator_label_signature_algorithm">Algorithmus:</string>
-  <string name="text_placeholder">Dies ist ein Platzhalter</string>
+  <string name="placeholder_sentence">Dies ist ein Platzhalter</string>
+  <string name="placeholder_filename">platzhalter.txt</string>
+  <string name="placeholder_filetype">PNG-Bild</string>
+  <string name="placeholder_filesize">389 KB</string>
+  <string name="placeholder_timestamp">18.5.2012 12:23</string>
+  <string name="placeholder_media_time">12:23:45</string>
   <string name="instant_upload_on_wifi">Fotos nur über WiFi hochladen</string>
   <string name="instant_upload_path">/SofortUpload</string>
   <string name="conflict_title">Konflikt beim Update</string>
@@ -217,16 +255,19 @@
   <string name="conflict_keep_both">Beide behalten</string>
   <string name="conflict_overwrite">Überschreiben</string>
   <string name="conflict_dont_upload">Nicht hochladen</string>
-  
-  <string name="actionbar_failed_instant_upload">Fehlgeschlagene Sofortuploads</string>  
-  <string name="failed_upload_headline_text">Fehlgeschlagene Sofortuploads</string>
-  <string name="failed_upload_headline_hint">Auflistung aller fehlgeschlagenen Softuploads</string>
-  <string name="failed_upload_all_cb">Alle auswählen</string>
-  <string name="failed_upload_headline_retryall_btn">Ausgewählte wiederholen</string>
-  <string name="failed_upload_headline_delete_all_btn">Ausgewählte löschen </string>
-  <string name="failed_upload_retry_text">Versuche ausgewählte erneut hochzuladen</string>
+  <string name="preview_image_description">Bildvorschau</string>
+  <string name="preview_image_error_unknown_format">Dieses Bild kann nicht angezeigt werden</string>
+  <string name="preview_image_error_out_of_memory">Nicht genügend Speicher um das Bild anzuzueigen</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s konnte nicht in den lokalen %2$s Ordner kopiert werden</string>
+  <string name="actionbar_failed_instant_upload">Fehlgeschlagener SofortUpload\"</string>
+  <string name="failed_upload_headline_text">Soforthochladen fehlgeschlagen</string>
+  <string name="failed_upload_headline_hint">Übersicht aller fehlgeschlagenen sofort Uploads</string>
+  <string name="failed_upload_all_cb">Alles auswählen</string>
+  <string name="failed_upload_headline_retryall_btn">Alles auswählen erneut versuchen</string>
+  <string name="failed_upload_headline_delete_all_btn">Auswahl aus der Upload Warteschlange entfernen</string>
+  <string name="failed_upload_retry_text">Hochladen des Bildes erneut versuchen:</string>
   <string name="failed_upload_load_more_images">Weitere Bilder laden</string>
-  <string name="failed_upload_retry_do_nothing_text">Upload nicht gestarted, Sie sind nicht online für ein Softupload</string>
-  <string name="failed_upload_failure_text">Fehlermeldung: </string>
-  <string name="failed_upload_quota_exceeded_text">Bitte überprüfen sie ihre Serverkonfiguration, möglicherweise ist ihre Upload Limit überschritten</string>
+  <string name="failed_upload_failure_text">Fehlermeldung:</string>
+  <string name="failed_upload_quota_exceeded_text">Bitte überprüfen Sie Ihre Servereinstellungen. Eventuell ist ihr Postfach voll.</string>
 </resources>
diff --git a/res/values-en-rpirate/strings.xml b/res/values-en-rpirate/strings.xml
new file mode 100644
index 00000000..46111eb6
--- /dev/null
+++ b/res/values-en-rpirate/strings.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="main_music">Music</string>
+  <string name="auth_password">Passcode</string>
+  <string name="setup_hint_password">Passcode</string>
+  <string name="filedetails_download">Download</string>
+  <!--we need to improve the communication of errors to the user-->
+</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8b147488..a8844c4a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -135,15 +135,25 @@
   <string name="pincode_removed">PIN de aplicación borrado</string>
   <string name="pincode_stored">PIN de aplicación guardado</string>
   <string name="media_notif_ticker">Reproductor de música %1$s</string>
+  <string name="media_state_playing">%1$s (reproduciendo)</string>
   <string name="media_state_loading">%1$s (cargando)</string>
+  <string name="media_event_done">%1$s reproducción finalizada</string>
+  <string name="media_err_nothing_to_play">No se encuentra archivo de medio</string>
+  <string name="media_err_no_account">No se ha proporcionado cuenta</string>
   <string name="media_err_not_in_owncloud">El archivo no esta en una cuenta valida </string>
+  <string name="media_err_unsupported">Codec No Soportado</string>
   <string name="media_err_io">El archivo de medios no pudo ser leído </string>
+  <string name="media_err_malformed">Archivo no codificado correctamente</string>
+  <string name="media_err_timeout">Demasiado tiempo intentando reproducir</string>
+  <string name="media_err_invalid_progressive_playback">Archivo de medio no puede ser transmitido</string>
   <string name="media_err_unknown">El archivo de medios no se puede reproducir con el reproductor de medios por defecto </string>
   <string name="media_err_security_ex">Error de seguridad al intentar reproducir %1$s</string>
   <string name="media_err_io_ex">Error de entrada al intentar reproducir %1$s</string>
   <string name="media_err_unexpected">Error inesperado intentando reproducir %1$s</string>
   <string name="media_previous_description">Botón de canción anterior </string>
+  <string name="media_rewind_description">Botón Rebobinado</string>
   <string name="media_play_pause_description">Botón de reproducción o pausa </string>
+  <string name="media_forward_description">Botón avance rápido</string>
   <string name="media_next_description">Botón de siguiente canción </string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minutos</item>
@@ -232,7 +242,12 @@
   <string name="ssl_validator_label_validity_to">A:</string>
   <string name="ssl_validator_label_signature">Firma:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
+  <string name="placeholder_sentence">Esto es un marcador de posición</string>
+  <string name="placeholder_filename">marcadordeposición.txt</string>
   <string name="placeholder_filetype">Imagen PNG</string>
+  <string name="placeholder_filesize">389 KB</string>
+  <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
+  <string name="placeholder_media_time">12:23:45</string>
   <string name="instant_upload_on_wifi">Subir imágenes sólo via WiFi</string>
   <string name="instant_upload_path">/SubidasInstantáneas</string>
   <string name="conflict_title">Conflicto en la actualización</string>
@@ -240,6 +255,7 @@
   <string name="conflict_keep_both">Mantener ambas</string>
   <string name="conflict_overwrite">Sobrescribir</string>
   <string name="conflict_dont_upload">No subir</string>
+  <string name="preview_image_description">Previsualización de imagen</string>
   <string name="preview_image_error_unknown_format">No se puede mostrar la imagen</string>
   <string name="preview_image_error_out_of_memory">No hay suficiente memoria para mostrar esta imagen</string>
   <!--we need to improve the communication of errors to the user-->
@@ -249,7 +265,10 @@
   <string name="failed_upload_headline_hint">Resumen de todas las cargas instantáneas fallidas</string>
   <string name="failed_upload_all_cb">Seleccionar todos</string>
   <string name="failed_upload_headline_retryall_btn">Reintentar todos los seleccionados</string>
+  <string name="failed_upload_headline_delete_all_btn">Eliminar todo de la cola de subida</string>
+  <string name="failed_upload_retry_text">Reintentar subida de imagen:</string>
   <string name="failed_upload_load_more_images">Cargar mas imágenes</string>
+  <string name="failed_upload_retry_do_nothing_text">No hacer nada no está conectado para subida instantánea</string>
   <string name="failed_upload_failure_text">Mensaje de error:</string>
   <string name="failed_upload_quota_exceeded_text">Por favor revise su configuración de servidor, posiblemente su cuota se haya excedido.</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 400aeb4f..a23c1316 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -4,9 +4,9 @@
   <string name="main_password">Parool:</string>
   <string name="main_login">Kasutajanimi:</string>
   <string name="main_button_login">Logi sisse</string>
-  <string name="main_welcome">Teretulemast sinu enda ownCloudi</string>
+  <string name="main_welcome">Teretulemast</string>
   <string name="main_files">Failid</string>
-  <string name="main_music">uusika</string>
+  <string name="main_music">Muusika</string>
   <string name="main_contacts">ntaktid</string>
   <string name="main_calendar">Kalender</string>
   <string name="main_bookmarks">Järjehoidjad</string>
@@ -21,8 +21,8 @@
   <string name="actionbar_mkdir">Loo kaust</string>
   <string name="actionbar_search">Otsi</string>
   <string name="actionbar_settings">Seaded</string>
+  <string name="actionbar_see_details">Üksikasjad</string>
   <string name="prefs_category_general">Üldine</string>
-  <string name="prefs_category_trackmydevice">Seadme jälgimine</string>
   <string name="prefs_add_session">Lisa uus sessioon</string>
   <string name="prefs_create_img_thumbnails">Loo pisipildid</string>
   <string name="prefs_select_oc_account">Vali konto</string>
@@ -45,7 +45,7 @@
   <string name="new_session_uri_error">Anti vale URL</string>
   <string name="new_session_session_name_error">Vale sessiooni nimi</string>
   <string name="sync_string_files">Failid</string>
-  <string name="uploader_no_file_selected">Üleslaadimiseks pole ühtegi faili laetud</string>
+  <string name="uploader_no_file_selected">Üleslaadimiseks pole ühtegi faili valitud</string>
   <string name="setup_hint_username">Kasutajanimi</string>
   <string name="setup_hint_password">Parool</string>
   <string name="setup_hint_address">Veebiaadress</string>
@@ -53,6 +53,7 @@
   <string name="setup_title">Ühenda oma ownCloudiga</string>
   <string name="setup_btn_connect">Ühenda</string>
   <string name="uploader_btn_upload_text">Lae üles</string>
+  <string name="uploader_top_message">Vali kataloog serveris: </string>
   <string name="uploader_wrn_no_account_title">Kontot ei leitud</string>
   <string name="uploader_wrn_no_account_text">Selles seadmes pole ühtegi ownCloudi kontot. Palun seadista esmalt konto.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Seadista</string>
@@ -72,6 +73,7 @@
   <string name="filedetails_sync_file">Värskenda</string>
   <string name="filedetails_redownload">Lae uuesti alla</string>
   <string name="filedetails_open">Ava</string>
+  <string name="filedetails_renamed_in_upload_msg">Fail nimetati üleslaadimise käigus ümber %1$ </string>
   <string name="common_yes">Jah</string>
   <string name="common_no">Ei</string>
   <string name="common_ok">OK</string>
@@ -81,6 +83,8 @@
   <string name="common_save_exit">Salvesta &amp; Välju</string>
   <string name="common_exit">Lahku ownCloudist</string>
   <string name="common_error">Viga</string>
+  <string name="common_loading">Laadin ...</string>
+  <string name="common_error_unknown">Tundmatu viga</string>
   <string name="about_title">Info</string>
   <string name="delete_account">Kustuta konto</string>
   <string name="create_account">Loo konto</string>
@@ -100,11 +104,24 @@
   <string name="downloader_download_succeeded_content">%1$s laeti alla</string>
   <string name="downloader_download_failed_ticker">Allalaadimine ebaõnnestus</string>
   <string name="downloader_download_failed_content">%1$s allalaadimist ei õnnestunud lõpetada</string>
+  <string name="downloader_not_downloaded_yet">Allalaadimata</string>
   <string name="common_choose_account">Vali konto</string>
   <string name="sync_string_contacts">Kontaktid</string>
   <string name="sync_fail_ticker">Sünkroniseerimine ebaõnnestus</string>
   <string name="sync_fail_content">%1$s sünkroniseerimise lõpetamine ebaõnnestus</string>
   <string name="sync_conflicts_in_favourites_ticker">Leite konflikte</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d sünkroniseeritavad faile ei suudeta sünkroniseerida</string>
+  <string name="sync_fail_in_favourites_ticker">Sünkroniseeritavad failid ebaõnnestusid</string>
+  <string name="sync_fail_in_favourites_content">Faili %1$d sisu ei suudeta sünkroniseerida (konflikt %2$d)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Osad kohalikud faili ununesid</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d faili %2$s kataloogist ei suudeta kopeerida</string>
+  <string name="sync_foreign_files_forgotten_explanation">Alates versioonist 1.3.16 failid, mis on üles laetud kopeeritakse kohalikku kataloogi %1$s vältimaks andmete kadu, kui ühte faili sünkroniseeritakse mitmelt kontolt.\n\nSelle muudatusega seoses kõik failid, mis on üles laetud rakenduse vanemate versioonidega, kopeeriti kataloogi %2$s. Selle tegevuse peatas viga, mis tekkis konto sünkroniseerimise käigus. Sa saad jätta failid nagu nad on ning eemaldata viide %3$s või tõsta failid %1$s kataloogi ja säilitada viide %4$s.\n\nAllpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s millele nad viitavad.</string>
+  <string name="foreign_files_move">Tõsta ümber</string>
+  <string name="foreign_files_success">Kõik failid tõsteti ümber</string>
+  <string name="foreign_files_fail">Osasid faile ei saa ümber tõsta</string>
+  <string name="foreign_files_local_text">Kohalik: %1$s</string>
+  <string name="foreign_files_remote_text">Serveris: %1$s</string>
+  <string name="upload_query_move_foreign_files">Pole piisavalt ruumi kopeerimaks valitud faile kataloogi %1$s. Soovid kopeerimise asemel neid ümber tõsta?</string>
   <string name="use_ssl">Kasuta turvalist ühendust</string>
   <string name="location_no_provider">ownCloud ei saa sinu seadet jälgida. Palun kontrolli oma asukoha seadeid</string>
   <string name="pincode_enter_pin_code">Palun sisesta oma rakenduse PIN</string>
@@ -117,6 +134,27 @@
   <string name="pincode_wrong">Vigane ownCloudii rakenduse PIN</string>
   <string name="pincode_removed">ownCloud rakenduse PIN on eemaldatud</string>
   <string name="pincode_stored">ownCloud rakenduse PIN on salvestatud</string>
+  <string name="media_notif_ticker">%1$s muusika mängija</string>
+  <string name="media_state_playing">%1$s (mängib)</string>
+  <string name="media_state_loading">%1$s (laeb)</string>
+  <string name="media_event_done">%1$s esitus lõpetatud</string>
+  <string name="media_err_nothing_to_play">Meedia faili ei leitud</string>
+  <string name="media_err_no_account">Ühtegi kontot pole antud</string>
+  <string name="media_err_not_in_owncloud">Fail ei kuulu õigele kontole</string>
+  <string name="media_err_unsupported">Mittetoetatud meedia koodek</string>
+  <string name="media_err_io">Ei suuda lugeda meediafaili</string>
+  <string name="media_err_malformed">Meediafail pole korralikult kodeeritud</string>
+  <string name="media_err_timeout">Liiga palju kordi püüti mängida</string>
+  <string name="media_err_invalid_progressive_playback">Ei suuda voogesitada meediafaili</string>
+  <string name="media_err_unknown">Meediafaili ei saa mängida Stock Media Player-iga</string>
+  <string name="media_err_security_ex">Turbe viga  %1$s esitamisel</string>
+  <string name="media_err_io_ex">Sisendi viga  %1$s esitamisel</string>
+  <string name="media_err_unexpected">Ootamatu viga  %1$s esitamisel</string>
+  <string name="media_previous_description">Eelmise loo nupp</string>
+  <string name="media_rewind_description">Tagasikerimise nupp</string>
+  <string name="media_play_pause_description">Mägi või pausi nupp</string>
+  <string name="media_forward_description">Kiire kerimise nupp</string>
+  <string name="media_next_description">Järgmise pala nupp</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minutit</item>
     <item>30 minutit</item>
@@ -191,19 +229,42 @@
   <string name="ssl_validator_not_saved">Sertifikaadi salvestamine ebaõnnestus</string>
   <string name="ssl_validator_btn_details_see">Üksikasjad</string>
   <string name="ssl_validator_btn_details_hide">Peida</string>
+  <string name="ssl_validator_label_subject">Väljastatud:</string>
+  <string name="ssl_validator_label_issuer">Väljastaja:</string>
+  <string name="ssl_validator_label_CN">Üldnimetus:</string>
   <string name="ssl_validator_label_O">Organisatsioon:</string>
   <string name="ssl_validator_label_OU">Organisatsiooni üksus:</string>
   <string name="ssl_validator_label_C">Riik:</string>
   <string name="ssl_validator_label_ST">Maakond:</string>
   <string name="ssl_validator_label_L">Asukoht:</string>
   <string name="ssl_validator_label_validity">Kehtivus:</string>
+  <string name="ssl_validator_label_validity_from">Saatja:</string>
+  <string name="ssl_validator_label_validity_to">Saaja:</string>
   <string name="ssl_validator_label_signature">Allkiri:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritm:</string>
-  <string name="text_placeholder">See on kohahoidja</string>
+  <string name="placeholder_sentence">See on kohahoidja</string>
+  <string name="placeholder_filetype">PNG pilt</string>
   <string name="instant_upload_on_wifi">Lae pilte üles ainult läbi WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Uuenduse konflikt</string>
+  <string name="conflict_message">Serveris asuvat faili ei sünkroniseeritud kohaliku failiga. Jätkates kirjutatakse serveris asuva faili sisu üle.</string>
   <string name="conflict_keep_both">Säilita mõlemad</string>
   <string name="conflict_overwrite">Kirjuta üle</string>
   <string name="conflict_dont_upload">Ära uuenda</string>
+  <string name="preview_image_description">Pildi eelvaade</string>
+  <string name="preview_image_error_unknown_format">Seda pilti ei saa näidata</string>
+  <string name="preview_image_error_out_of_memory">Pole piisavat mälu pildi näitamiseks</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s ei suudetud kopeerida kohalikku kataloogi failina %2$s</string>
+  <string name="actionbar_failed_instant_upload">Ebaõnnestunud kohene üleslaadimine</string>
+  <string name="failed_upload_headline_text">Ebaõnnestunud kohesed üleslaadimised</string>
+  <string name="failed_upload_headline_hint">Kõikide ebaõnnestunud üleslaadimiste kokkuvõte</string>
+  <string name="failed_upload_all_cb">vali kõik</string>
+  <string name="failed_upload_headline_retryall_btn">proovi uuesti kõik valitud</string>
+  <string name="failed_upload_headline_delete_all_btn">eemalda kõik valitud üleslaadimise järjekorrast</string>
+  <string name="failed_upload_retry_text">proovi uuesti pilti üles laadida:</string>
+  <string name="failed_upload_load_more_images">Lae veel pilte</string>
+  <string name="failed_upload_retry_do_nothing_text">ära tee midagi, sa pole võrku ühendatud koheseks üleslaadimiseks</string>
+  <string name="failed_upload_failure_text">Veateade:</string>
+  <string name="failed_upload_quota_exceeded_text">Palun kontrolli oma serveri seadeid, võib-olla on mahulimiit ületatud.</string>
 </resources>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 15a26118..06d9d437 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -21,8 +21,8 @@
   <string name="actionbar_mkdir">יצירת תיקייה</string>
   <string name="actionbar_search">חיפוש</string>
   <string name="actionbar_settings">הגדרות</string>
+  <string name="actionbar_see_details">פרטים</string>
   <string name="prefs_category_general">כללי</string>
-  <string name="prefs_category_trackmydevice">מעקב אחר מכשירים</string>
   <string name="prefs_add_session">הוספת הפעלה חדשה</string>
   <string name="prefs_create_img_thumbnails">יצירת תמונות ממוזערות</string>
   <string name="prefs_select_oc_account">נא לבחור בחשבון</string>
@@ -53,6 +53,7 @@
   <string name="setup_title">התחברות ל־%1$s שלך</string>
   <string name="setup_btn_connect">התחברות</string>
   <string name="uploader_btn_upload_text">העלאה</string>
+  <string name="uploader_top_message">נא לבחור את תיקיית ההעלאה:</string>
   <string name="uploader_wrn_no_account_title">לא נמצא חשבון</string>
   <string name="uploader_wrn_no_account_text">אין חשבונות %1$s בהתקן שלך. נא להגדיר חשבון תחילה.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">הגדרות</string>
@@ -82,6 +83,8 @@
   <string name="common_save_exit">לשמור ולצאת</string>
   <string name="common_exit">לעזוב את %1$s</string>
   <string name="common_error">שגיאה</string>
+  <string name="common_loading">בטעינה …</string>
+  <string name="common_error_unknown">שגיאה בלתי ידועה</string>
   <string name="about_title">על אודות</string>
   <string name="delete_account">מחיקת חשבון</string>
   <string name="create_account">יצירת חשבון</string>
@@ -109,6 +112,11 @@
   <string name="sync_conflicts_in_favourites_content">לא ניתן לסנכרן %1$d קבצים שהוגדרו לסנכרון</string>
   <string name="sync_fail_in_favourites_ticker">קבצים שהוגדרו לסנכרון נכשלו</string>
   <string name="sync_fail_in_favourites_content">לא ניתן לסנכרם את תוכנם של %1$d מהקבצים (%2$d התנגשויות)</string>
+  <string name="sync_foreign_files_forgotten_ticker">חלק מהקבצים המקומיים נשכחו</string>
+  <string name="foreign_files_move">להעביר הכול</string>
+  <string name="foreign_files_success">כל הקבצים הועברו</string>
+  <string name="foreign_files_local_text">מקומי: %1$s</string>
+  <string name="foreign_files_remote_text">מרוחק: %1$s</string>
   <string name="use_ssl">להשתמש בחיבור מאובטח</string>
   <string name="location_no_provider">ל־%1$s אין אפשרות לעקוב אחר ההתקן שלך. נא לבדוק את הגדרות המיקום שלך</string>
   <string name="pincode_enter_pin_code">נא להזין את קוד היישום שלך</string>
@@ -121,6 +129,14 @@
   <string name="pincode_wrong">קוד היישום שגוי</string>
   <string name="pincode_removed">קוד היישום הוסר</string>
   <string name="pincode_stored">קוד היישום אוחסן</string>
+  <string name="media_notif_ticker">נגנן המוזיקה %1$s</string>
+  <string name="media_state_playing">%1$s (מתנגן)</string>
+  <string name="media_state_loading">%1$s (בטעינה)</string>
+  <string name="media_err_nothing_to_play">לא נמצא קובץ מדיה</string>
+  <string name="media_err_no_account">לא צוין חשבון</string>
+  <string name="media_err_not_in_owncloud">הקובץ אינו בחשבון תקני</string>
+  <string name="media_err_unsupported">מקודד המדיה אינו נתמך</string>
+  <string name="media_err_io">לא ניתן לקרוא את קובץ המדיה</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>רבע שעה</item>
     <item>חצי שעה</item>
@@ -208,7 +224,9 @@
   <string name="ssl_validator_label_validity_to">סיום:</string>
   <string name="ssl_validator_label_signature">חתימה:</string>
   <string name="ssl_validator_label_signature_algorithm">אלגוריתם:</string>
-  <string name="text_placeholder">זהו ממלא מקום</string>
+  <string name="placeholder_sentence">זהו ממלא מקום</string>
+  <string name="placeholder_filetype">תמונת PNG</string>
+  <string name="placeholder_filesize">389 ק״ב</string>
   <string name="instant_upload_on_wifi">העלאת תמונות דרך WiFi בלבד</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">התנגשות עדכון</string>
@@ -216,4 +234,14 @@
   <string name="conflict_keep_both">להשאיר את שניהם</string>
   <string name="conflict_overwrite">לשכתב</string>
   <string name="conflict_dont_upload">לא להעלות</string>
+  <string name="preview_image_error_out_of_memory">\"אין די זיכרון כדי להציג את התמונה הזאת</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="failed_upload_headline_hint">הסיכום של כל ההעלאות המהירות שנכשלו</string>
+  <string name="failed_upload_all_cb">לבחור הכול</string>
+  <string name="failed_upload_headline_retryall_btn">לנסות שוב את כל הנבחרים</string>
+  <string name="failed_upload_headline_delete_all_btn">למחוק את כל הנבחרים מתור ההעלאה</string>
+  <string name="failed_upload_retry_text">לנסות להעלות את התמונה מחדש:</string>
+  <string name="failed_upload_load_more_images">טעינת תמונות נוספות</string>
+  <string name="failed_upload_failure_text">הודעת התקלה:</string>
+  <string name="failed_upload_quota_exceeded_text">נא לבדוק את תצורת שרת שלך, יתכן שחרגת מהמיכסה שלך.</string>
 </resources>
diff --git a/res/values-ja-rJP/strings.xml b/res/values-ja-rJP/strings.xml
index 383f7eba..a06d0488 100644
--- a/res/values-ja-rJP/strings.xml
+++ b/res/values-ja-rJP/strings.xml
@@ -21,8 +21,8 @@
   <string name="actionbar_mkdir">ディレクトリを作成</string>
   <string name="actionbar_search">検索</string>
   <string name="actionbar_settings">設定</string>
+  <string name="actionbar_see_details">詳細</string>
   <string name="prefs_category_general">一般</string>
-  <string name="prefs_category_trackmydevice">デバイスの追跡</string>
   <string name="prefs_add_session">新しいセッションを追加</string>
   <string name="prefs_create_img_thumbnails">サムネイル画像を作成</string>
   <string name="prefs_select_oc_account">アカウントを選択</string>
@@ -82,6 +82,8 @@
   <string name="common_save_exit">保存して終了</string>
   <string name="common_exit">ownCloudを終了</string>
   <string name="common_error">エラー</string>
+  <string name="common_loading">読込中...</string>
+  <string name="common_error_unknown">不明なエラー</string>
   <string name="about_title">ownCloudについて</string>
   <string name="delete_account">アカウントを削除</string>
   <string name="create_account">アカウントを作成</string>
@@ -109,6 +111,15 @@
   <string name="sync_conflicts_in_favourites_content">%1$d 同期ファイルを同期できませんでした</string>
   <string name="sync_fail_in_favourites_ticker">ファイルの同期に失敗しました</string>
   <string name="sync_fail_in_favourites_content">%1$d ファイルのコンテンツを同期できませんでした（%2$d の競合）</string>
+  <string name="sync_foreign_files_forgotten_ticker">いくつかのローカルファイルが忘れられています</string>
+  <string name="sync_foreign_files_forgotten_content">%2$s ディレクトリ内の %1$d ファイルはコピーすることができませんでした</string>
+  <string name="sync_foreign_files_forgotten_explanation">バージョン 1.3.16から、複数のアカウントで1つのファイルを同期する場合、データが壊れることを防ぐため、この端末からアップロードされたファイルはローカルの %1$s フォルダにコピーされます。\n\nこの変更により、以前のバージョンでアップロードされた全てのファイルは、 %2$s フォルダーへコピーされます。しかし、アカウントの同期中のエラーによって、この操作は完了しませんでした。ファイルをそのまま残して %3$s へのリンクを削除するか、ファイルを %1$s ディレクトリに移動して %4$s へのリンクを残したままにすることができます。\n\n以下にリストアップされたものは、ローカルファイルおよびリンクされている %5$s のリモートファイルです。</string>
+  <string name="foreign_files_move">全て移動</string>
+  <string name="foreign_files_success">全てのファイルは移動されました</string>
+  <string name="foreign_files_fail">いくつかのファイルは移動出来ませんでした</string>
+  <string name="foreign_files_local_text">ローカル: %1$s</string>
+  <string name="foreign_files_remote_text">リモート: %1$s</string>
+  <string name="upload_query_move_foreign_files">%1$s フォルダに選択されたファイルをコピーするのに十分なスペースがありません。コピーする代わりに、それらを移動させますか？</string>
   <string name="use_ssl">暗号通信を利用</string>
   <string name="location_no_provider">ownCloudがあなたのデバイスの位置情報を取得出来ません。位置情報設定を確認してください。</string>
   <string name="pincode_enter_pin_code">アプリのパスワードを入力してください</string>
@@ -208,7 +219,6 @@
   <string name="ssl_validator_label_validity_to">先:</string>
   <string name="ssl_validator_label_signature">署名:</string>
   <string name="ssl_validator_label_signature_algorithm">アルゴリズム:</string>
-  <string name="text_placeholder">これはプレースホルダです</string>
   <string name="instant_upload_on_wifi">WiFi経由でのみ写真をアップロード</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">更新の競合</string>
@@ -216,4 +226,7 @@
   <string name="conflict_keep_both">両方を保持</string>
   <string name="conflict_overwrite">上書き</string>
   <string name="conflict_dont_upload">アップロードしない</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s は %2$s ローカルディレクトリにコピー出来ませんでした</string>
+  <string name="failed_upload_all_cb">すべて選択</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index fcb9489b..1c181be5 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -3,7 +3,7 @@
   <string name="app_name">ownCloud</string>
   <string name="main_password">Wachtwoord:</string>
   <string name="main_login">Gebruikersnaam:</string>
-  <string name="main_button_login">Inloggen</string>
+  <string name="main_button_login">Login</string>
   <string name="main_welcome">Welkom in je ownCloud</string>
   <string name="main_files">Bestanden</string>
   <string name="main_music">Muziek</string>
@@ -21,8 +21,8 @@
   <string name="actionbar_mkdir">Creëer map</string>
   <string name="actionbar_search">Zoeken</string>
   <string name="actionbar_settings">Instellingen</string>
+  <string name="actionbar_see_details">Details</string>
   <string name="prefs_category_general">Algemeen</string>
-  <string name="prefs_category_trackmydevice">Apparaat volgen</string>
   <string name="prefs_add_session">Voeg nieuwe sessie toe</string>
   <string name="prefs_create_img_thumbnails">Maak afbeeldingsminiaturen</string>
   <string name="prefs_select_oc_account">Selecteer een account</string>
@@ -53,6 +53,7 @@
   <string name="setup_title">Verbinden met je ownCloud</string>
   <string name="setup_btn_connect">Verbinden</string>
   <string name="uploader_btn_upload_text">Uploaden</string>
+  <string name="uploader_top_message">Selecteer upload map:</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>
@@ -82,6 +83,8 @@
   <string name="common_save_exit">Opslaan &amp; Afsluiten</string>
   <string name="common_exit">Verlaat ownCloud</string>
   <string name="common_error">Fout</string>
+  <string name="common_loading">Laden...</string>
+  <string name="common_error_unknown">Onbekende fout</string>
   <string name="about_title">Over</string>
   <string name="delete_account">Verwijder account</string>
   <string name="create_account">Maak account aan</string>
@@ -101,6 +104,7 @@
   <string name="downloader_download_succeeded_content">%1$s werd succesvol gedownload</string>
   <string name="downloader_download_failed_ticker">Downloaden mislukt</string>
   <string name="downloader_download_failed_content">Download van %1$s kon niet worden voltooid</string>
+  <string name="downloader_not_downloaded_yet">Nog niet gedownload</string>
   <string name="common_choose_account">Kies account</string>
   <string name="sync_string_contacts">Contactpersonen</string>
   <string name="sync_fail_ticker">Synchronisatie mislukt</string>
@@ -109,6 +113,15 @@
   <string name="sync_conflicts_in_favourites_content">%1$d in-synch-houden bestanden konden niet worden gesync\'d</string>
   <string name="sync_fail_in_favourites_ticker">In-sync-houden bestanden mislukt</string>
   <string name="sync_fail_in_favourites_content">Inhoud van %1$d bestanden kon niet worden gesynchroniseerd (%2$d conflicten)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Een paar lokale bestanden werden vergeten</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d bestanden uit de %2$s directory konden niet worden gekopieerd naar</string>
+  <string name="sync_foreign_files_forgotten_explanation">\"Vanaf versie 1.3.16, worden bestanden ge-upload vanaf dit apparaat ook gekopieerd naar de lokale %1$s map om gegevensverlies te voorkomen wanneer een enkel bestand wordt gesynchroniseerd met meerdere accounts.\n\nDoor deze verandering zijn alle bestanden die met een voorgaande versie van deze app zijn ge-uploaded gekopieerd naar de %2$s map. Maar door een fout is dit niet helemaal gelukt bij de account synchronisatie. U kunt de bestanden laten zoals ze zijn en de %3$s verwijderen, of de bestanden verplaatsen naar de %1$s map en de links naar %4$s behouden.\n\nHieronder staan de lokalen bestanden, en de externe bestanden in %5$s waarnaar ze doorverwezen.</string>
+  <string name="foreign_files_move">Alle verplaatsen</string>
+  <string name="foreign_files_success">Alle bestanden zijn verplaatst</string>
+  <string name="foreign_files_fail">Een paar bestanden konden niet worden verplaatst</string>
+  <string name="foreign_files_local_text">Lokaal: %1$s</string>
+  <string name="foreign_files_remote_text">Extern: %1$s</string>
+  <string name="upload_query_move_foreign_files">Er is niet genoeg ruimte om de gekopieerde bestanden ook te plaatsen in map %1$s. Wilt u ze erheen verplaatsten? </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>
@@ -121,6 +134,27 @@
   <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 name="media_notif_ticker">%1$s muziekspeler</string>
+  <string name="media_state_playing">%1$s (speelt)</string>
+  <string name="media_state_loading">%1$s (laden)</string>
+  <string name="media_event_done">%1$s playback geëindigd</string>
+  <string name="media_err_nothing_to_play">Geen mediabestand gevonden</string>
+  <string name="media_err_no_account">Geen account opgegeven</string>
+  <string name="media_err_not_in_owncloud">Bestand niet in een geldig account</string>
+  <string name="media_err_unsupported">Niet ondersteunde media codec</string>
+  <string name="media_err_io">Mediabestand kon niet worden gelezen</string>
+  <string name="media_err_malformed">Mediabestand niet goed gecodeerd</string>
+  <string name="media_err_timeout">Te veel tijd geprobeerd te spelen</string>
+  <string name="media_err_invalid_progressive_playback">Mediabestand kan niet worden gestreamd</string>
+  <string name="media_err_unknown">Mediabestand kan niet worden afgespeeld met de standaard mediaplayer</string>
+  <string name="media_err_security_ex">Beveiligingsfout bij afspelen %1$s</string>
+  <string name="media_err_io_ex">Invoerfout bij afspelen %1$1s</string>
+  <string name="media_err_unexpected">Onverwachte fout bij afspelen %1$s</string>
+  <string name="media_previous_description">Vorige nummer knop</string>
+  <string name="media_rewind_description">terugpoel knop</string>
+  <string name="media_play_pause_description">Speel of pauze knop</string>
+  <string name="media_forward_description">Doorspoel knop</string>
+  <string name="media_next_description">Volgende nummer knop</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minuten</item>
     <item>30 minuten</item>
@@ -208,7 +242,12 @@
   <string name="ssl_validator_label_validity_to">Aan:</string>
   <string name="ssl_validator_label_signature">Handtekening:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritme:</string>
-  <string name="text_placeholder">Dit is een gereserveerde ruimte</string>
+  <string name="placeholder_sentence">Dit is een plaatshouder</string>
+  <string name="placeholder_filename">plaatshouder.txt</string>
+  <string name="placeholder_filetype">PNG Afbeelding</string>
+  <string name="placeholder_filesize">389 KB</string>
+  <string name="placeholder_timestamp">2012/05/18 12:23</string>
+  <string name="placeholder_media_time">12:23:45</string>
   <string name="instant_upload_on_wifi">Upload afbeeldingen alleen via WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Update conflict</string>
@@ -216,4 +255,20 @@
   <string name="conflict_keep_both">Beide bewaren</string>
   <string name="conflict_overwrite">Overschrijven</string>
   <string name="conflict_dont_upload">Niet uploaden</string>
+  <string name="preview_image_description">Afbeelding voorbeeld</string>
+  <string name="preview_image_error_unknown_format">Deze afbeelding kan niet weergegeven worden</string>
+  <string name="preview_image_error_out_of_memory">\"Niet voldoende geheugen om deze afbeelding weer te geven</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s kon niet worden gekopieerd naar de %2$s lokale map</string>
+  <string name="actionbar_failed_instant_upload">Mislukte Directe Upload</string>
+  <string name="failed_upload_headline_text">Mislukte directe uploads</string>
+  <string name="failed_upload_headline_hint">Samenvatting van alle mislukte directe uploads</string>
+  <string name="failed_upload_all_cb">alles selecteren</string>
+  <string name="failed_upload_headline_retryall_btn">opnieuw proberen alles te selecteren</string>
+  <string name="failed_upload_headline_delete_all_btn">verwijderen alle geselecteerde van de upload wachtrij</string>
+  <string name="failed_upload_retry_text">probeer de afbeelding opnieuw te uploaden:</string>
+  <string name="failed_upload_load_more_images">Laadt meer Afbeeldingen</string>
+  <string name="failed_upload_retry_do_nothing_text">doe niks, u bent niet online voor directe upload</string>
+  <string name="failed_upload_failure_text">Mislukkings Bericht:</string>
+  <string name="failed_upload_quota_exceeded_text">Controleer uw server instellingen, misschien is uw quota overschreden.</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d7ccc464..18428d33 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -53,6 +53,7 @@
   <string name="setup_title">Połącz z %1$s</string>
   <string name="setup_btn_connect">Połącz</string>
   <string name="uploader_btn_upload_text">Wyślij</string>
+  <string name="uploader_top_message">Wybierz folder do wysłania:</string>
   <string name="uploader_wrn_no_account_title">Nie znaleziono konta</string>
   <string name="uploader_wrn_no_account_text">Nie wykryto kont %1$s na twoim urządzeniu. Załóż konto.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Ustawienia</string>
@@ -138,6 +139,22 @@
   <string name="media_state_loading">%1$s (wczytywane)</string>
   <string name="media_event_done">%1$s odtwarzanie zakończone</string>
   <string name="media_err_nothing_to_play">Nie znaleziono plików multimedialnych</string>
+  <string name="media_err_no_account">Nie znaleziono konta</string>
+  <string name="media_err_not_in_owncloud">Plik na nieprawidłowym koncie</string>
+  <string name="media_err_unsupported">Nieobsługiwany kodek multimediów</string>
+  <string name="media_err_io">Błąd odczytu pliku multimedialnego</string>
+  <string name="media_err_malformed">Błąd kodowania pliku multimedialnego</string>
+  <string name="media_err_timeout">Przekroczono czas próby odtworzenia multimediów</string>
+  <string name="media_err_invalid_progressive_playback">Ni udało się przesłać pliku multimedialnego</string>
+  <string name="media_err_unknown">Plik multimediów nie może być odtworzony we wbudowanym odtwarzaczu</string>
+  <string name="media_err_security_ex">Błąd zabezpieczeń podczas próby odtworzenia %1$s</string>
+  <string name="media_err_io_ex">Błąd wprowadzania podczas próby odtworzenia %1$s</string>
+  <string name="media_err_unexpected">Nieoczekiwany błąd podczas próby odtworzenia %1$s</string>
+  <string name="media_previous_description">Przycisk przejścia do poprzedniego utworu</string>
+  <string name="media_rewind_description">Przycisk przewijania</string>
+  <string name="media_play_pause_description">Przycisk odtwarzania / pauzowania</string>
+  <string name="media_forward_description">Przycisk przewijania do przodu</string>
+  <string name="media_next_description">Przycisk przejścia do kolejnego utworu</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minut</item>
     <item>30 minut</item>
@@ -225,6 +242,9 @@
   <string name="ssl_validator_label_validity_to">Do:</string>
   <string name="ssl_validator_label_signature">Sygnatura:</string>
   <string name="ssl_validator_label_signature_algorithm">Algorytm:</string>
+  <string name="placeholder_sentence">Tekst zastępczy</string>
+  <string name="placeholder_filename">placeholder.txt</string>
+  <string name="placeholder_filetype">Obraz PNG</string>
   <string name="placeholder_filesize">389 KB</string>
   <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
   <string name="placeholder_media_time">12:23:45</string>
@@ -235,9 +255,20 @@
   <string name="conflict_keep_both">Zatrzymaj oba</string>
   <string name="conflict_overwrite">Zastąp</string>
   <string name="conflict_dont_upload">Nie wysyłaj</string>
+  <string name="preview_image_description">Podgląd</string>
+  <string name="preview_image_error_unknown_format">Obraz nie może zostać wyświetlony</string>
+  <string name="preview_image_error_out_of_memory">\"Brak wystarczającej ilości pamięci do wyświetlenia obrazu</string>
   <!--we need to improve the communication of errors to the user-->
   <string name="error__upload__local_file_not_copied">%1$s nie może zostać skopiowany do lokalnego %2$s katalogu</string>
+  <string name="actionbar_failed_instant_upload">Autoprzesyłanie nieudane\"</string>
+  <string name="failed_upload_headline_text">Błąd automatycznego przesyłania</string>
+  <string name="failed_upload_headline_hint">Podsumowanie wszystkich nieudanych transferów</string>
   <string name="failed_upload_all_cb">zaznacz wszystkie</string>
   <string name="failed_upload_headline_retryall_btn">spróbuj zaznaczyć wszystkie</string>
+  <string name="failed_upload_headline_delete_all_btn">usuń wszystko z kolejki wysyłania</string>
+  <string name="failed_upload_retry_text">ponów wysyłanie obrazu:</string>
   <string name="failed_upload_load_more_images">Wczytaj więcej obrazów</string>
+  <string name="failed_upload_retry_do_nothing_text">nic nie rób, ponieważ nie jesteś online, nie możesz przesyłać plików</string>
+  <string name="failed_upload_failure_text">Komunikat błędu:</string>
+  <string name="failed_upload_quota_exceeded_text">Proszę sprawdź ustawienia serwera, możliwe że przekroczyłes limit wielkości pliku</string>
 </resources>