Merge branch 'develop' into branding_configurable_URL_input_field

.classpath

@@ -4,6 +4,6 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

AndroidManifest.xml

@@ -18,8 +18,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="104000"
-    android:versionName="1.4.0" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="104001"
+    android:versionName="1.4.1" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@ -95,7 +95,7 @@
 		        
         <activity	android:name="com.owncloud.android.ui.preview.PreviewVideoActivity"
 					android:label="@string/app_name"
-					android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+					android:theme="@style/Theme.ownCloud.Fullscreen" >
 		</activity>        
 
         <service

oc_jb_workaround/AndroidManifest.xml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android.workaround.accounts"
-    android:versionCode="0100002"
-    android:versionName="1.0.2" >
+    android:versionCode="0100003"
+    android:versionName="1.0.3" >
 
     <uses-sdk
         android:minSdkVersion="16"
-        android:targetSdkVersion="16" />
+        android:targetSdkVersion="16" 
+        android:maxSdkVersion="17"
+        />
 
     <application
         android:allowBackup="false"

res/layout-land/account_setup.xml

@@ -54,26 +54,46 @@
 			    android:gravity="center"
 			    android:orientation="vertical"
 			    android:padding="8dp" >
-
+			    
 				<Button
-				    android:id="@+id/checkServerButton"
+				    android:id="@+id/centeredRefreshButton"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:layout_gravity="center_horizontal"
+            		android:onClick="onRefreshClick"
 				    android:text="@string/auth_check_server"
 				    android:visibility="gone" />
 		
-				<EditText
-					android:id="@+id/hostUrlInput"
+			    <FrameLayout 
+	        		android:id="@+id/hostUrlFrame"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:ems="10"
-					android:hint="@string/auth_host_url"
-					android:inputType="textUri"
-					android:drawablePadding="5dp"
-					>
-					<requestFocus />
-				</EditText>
+			        >
+					<EditText
+						android:id="@+id/hostUrlInput"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:hint="@string/auth_host_url"
+						android:inputType="textUri"
+						android:drawablePadding="5dp"
+						android:paddingRight="55dp"
+						>
+						<requestFocus />
+					</EditText>
+					<ImageButton
+					    android:id="@+id/embeddedRefreshButton"
+					    android:layout_width="48dp"
+					    android:layout_height="48dp"
+					    android:layout_gravity="center_vertical|right"
+					    android:layout_marginRight="5dp"
+					    android:padding="0dp"
+					    android:scaleType="fitCenter"
+					    android:src="@drawable/ic_action_refresh_black"
+            			android:onClick="onRefreshClick"
+					    android:visibility="gone"
+						android:background="@android:color/transparent"
+					    />
+				</FrameLayout>
 		
 				<TextView
 					android:id="@+id/server_status_text"

res/layout/account_setup.xml

@@ -41,26 +41,46 @@
             android:src="@drawable/logo" />
 
         <Button
-            android:id="@+id/checkServerButton"
+            android:id="@+id/centeredRefreshButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
+            android:onClick="onRefreshClick"
             android:text="@string/auth_check_server"
             android:visibility="gone" />
 
-		<EditText
-			android:id="@+id/hostUrlInput"
+	    <FrameLayout 
+	        android:id="@+id/hostUrlFrame"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:ems="10"
-			android:hint="@string/auth_host_url"
-			android:inputType="textUri"
-			android:drawablePadding="5dp"
-			>
-			<requestFocus />
-		</EditText>
-
-        <TextView
+	        >
+			<EditText
+				android:id="@+id/hostUrlInput"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:hint="@string/auth_host_url"
+				android:inputType="textUri"
+				android:drawablePadding="5dp"
+				android:paddingRight="55dp"
+				>
+				<requestFocus />
+			</EditText>
+			<ImageButton
+			    android:id="@+id/embeddedRefreshButton"
+			    android:layout_width="48dp"
+			    android:layout_height="48dp"
+			    android:layout_gravity="center_vertical|right"
+			    android:layout_marginRight="5dp"
+			    android:padding="0dp"
+			    android:scaleType="fitCenter"
+			    android:src="@drawable/ic_action_refresh_black"
+            	android:onClick="onRefreshClick"
+				android:visibility="gone"
+				android:background="@android:color/transparent"
+			    />
+		</FrameLayout>
+
+		<TextView
             android:id="@+id/server_status_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

res/layout/video_layout.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout	xmlns:android="http://schemas.android.com/apk/res/android"
-				android:layout_width="fill_parent"
-				android:layout_height="fill_parent" >
+				android:layout_width="match_parent"
+				android:layout_height="match_parent" >
 
 	<VideoView  android:id="@+id/videoPlayer"
 				android:layout_width="wrap_content"

res/menu/account_picker_long_click.xml

@@ -18,7 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/change_password" android:title="@string/change_password"></item>
     <item android:id="@+id/delete_account" android:title="@string/delete_account"></item>
-    
-
 </menu>

res/values-af-rZA/strings.xml

@@ -6,4 +6,5 @@
   <string name="auth_password">Wagwoord</string>
   <string name="setup_hint_username">Gebruikersnaam</string>
   <string name="setup_hint_password">Wagwoord</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-ar/strings.xml

@@ -1,28 +1,97 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">كلمة السر: </string>
+  <string name="main_login">اسم المستخدم</string>
   <string name="main_button_login">تسجيل الدخول</string>
+  <string name="main_welcome">مرحباً </string>
   <string name="main_files">الملفات</string>
   <string name="main_music">الموسيقى</string>
-  <string name="main_contacts">المعارف</string>
+  <string name="main_contacts">جهات الاتصال</string>
+  <string name="main_calendar">تقويم</string>
+  <string name="main_bookmarks">الإشارات المرجعية</string>
   <string name="main_settings">تعديلات</string>
-  <string name="actionbar_upload">إرفع</string>
+  <string name="main_tit_accsetup">إعداد حساب</string>
+  <string name="main_wrn_accsetup">لا يوجد أي حساب على الجهاز الخاص بك. من اجل استخدام هذا التطبيق، تحتاج إلى إنشاء واحد.</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="auth_host_url">عنوان الموقع</string>
+  <string name="prefs_add_session">إضافة جلسة عمل جديدة</string>
+  <string name="prefs_create_img_thumbnails">إنشاء مصغرات الصور</string>
+  <string name="prefs_select_oc_account">حدد حسابا</string>
+  <string name="prefs_summary_select_oc_account">اختيار أي من حساباتك  يجب على التطبيق أن تستخدم.</string>
+  <string name="prefs_trackmydevice"> تتبع الجهاز</string>
+  <string name="prefs_trackmydevice_summary_off">تمكين هذا التطبيق لتتبع مكان الجهاز</string>
+  <string name="prefs_trackmydevice_summary_on">هذا التطبيق يتتبع هذا الجهاز</string>
+  <string name="prefs_trackmydevice_interval"> الفاصل الزمني للتحديث</string>
+  <string name="prefs_accounts">حسابات</string>
+  <string name="auth_host_url">عنوان الخادم</string>
   <string name="auth_username">إسم المستخدم</string>
   <string name="auth_password">كلمات السر</string>
+  <string name="new_session_uri_error">العنوان المعطى غير صحيحة</string>
+  <string name="new_session_session_name_error"> اسم الدورة غير  صحيح</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="filedetails_select_file">اضغظ على الملف ليتم عرض خيارات أكثر</string>
+  <string name="filedetails_size">الحجم</string>
+  <string name="filedetails_type">النوع</string>
+  <string name="filedetails_modified">عُدل</string>
   <string name="filedetails_download">انزال</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_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_upload_in_progress_ticker">يتم الرفع</string>
+  <string name="uploader_upload_succeeded_ticker">تم الرفع بنجاح</string>
+  <string name="uploader_upload_failed_ticker">عملية الرفع فشلت</string>
+  <string name="downloader_download_in_progress_ticker">يتم التحميل</string>
+  <string name="downloader_download_failed_ticker">فشل التحميل</string>
+  <string name="common_choose_account">اختر حساب</string>
   <string name="sync_string_contacts">المعارف</string>
+  <string name="foreign_files_move">نقل الكل</string>
+  <string name="foreign_files_success">تم نقل جميع الملفات</string>
+  <string name="foreign_files_fail">بعض الملفات لا يمكن نقلها</string>
+  <string name="use_ssl">استخدم اتصال آمن</string>
+  <string name="pincode_enter_pin_code">فضلا, ادخل كلمة السر</string>
+  <string name="pincode_enter_new_pin_code">فضلا, ادخل كلمة كلمة سر جديدة</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_unknown_error_title">حدث خطأ غير معروف</string>
+  <string name="auth_wrong_connection_title">لا يمكن إنشاء اتصال</string>
+  <string name="auth_secure_connection">تم إنشاء اتصال آمن</string>
+  <string name="crashlog_dont_send_report">لا ترسل تقرير</string>
   <string name="common_share">شارك</string>
+  <string name="common_rename">إعادة تسميه</string>
   <string name="common_remove">الغى</string>
+  <string name="confirmation_remove_remote">حذف من الخادم</string>
+  <string name="remove_success_msg">يتم الحذف بنجاح</string>
+  <string name="remove_fail_msg">لقد فشل الحذف</string>
+  <string name="wait_a_moment">فضلاً, انتظر</string>
+  <string name="filedisplay_no_file_selected">لم يتم اختيار أي ملف</string>
+  <string name="ssl_validator_title">تحذير</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-be/strings.xml

@@ -1,2 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <!--we need to improve the communication of errors to the user-->
+</resources>

res/values-bg-rBG/strings.xml

@@ -12,20 +12,110 @@
   <string name="main_bookmarks">Предпочитани</string>
   <string name="main_settings">Настройки</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="auth_host_url">Уеб адрес</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="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_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_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>

res/values-bn-rBD/strings.xml

@@ -9,21 +9,19 @@
   <string name="main_bookmarks">ঠিকা</string>
   <string name="main_settings">নিয়ামকসমূহ</string>
   <string name="main_tit_accsetup">একাউন্ট সেটআপ</string>
-  <string name="actionbar_sync">নবোদ্যম</string>
   <string name="actionbar_upload">আপলোড</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_category_trackmydevice">ডিভাইস ট্র্যাকিং</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">ডিভাইস ট্র্যাকিং</string>
   <string name="prefs_trackmydevice_interval">পরিবর্ধনের মধ্যবিরতি</string>
   <string name="prefs_accounts">একাউন্ট</string>
-  <string name="auth_host_url">URL</string>
+  <string name="auth_host_url">সার্ভার ঠিকানা</string>
   <string name="auth_username">ব্যবহারকারি</string>
   <string name="auth_password">কূটশব্দ</string>
   <string name="new_session_uri_error">ভুল ঠিকানা প্রদান করা হয়েছে</string>
@@ -45,7 +43,6 @@
   <string name="filedetails_created">তৈরীর নির্ঘন্টঃ</string>
   <string name="filedetails_modified">পরিবর্তিতঃ</string>
   <string name="filedetails_download">ডাউনলোড</string>
-  <string name="filedetails_open">খোল</string>
   <string name="common_yes">হ্যাঁ</string>
   <string name="common_no">না</string>
   <string name="common_ok">তথাস্তু</string>
@@ -55,6 +52,9 @@
   <string name="common_error">সমস্যা</string>
   <string name="uploader_info_dirname">ডিরেক্টরির নাম</string>
   <string name="common_choose_account">একাউন্ট নির্বাচন</string>
+  <string name="sync_string_contacts">ঠিকানাপঞ্জী</string>
   <string name="common_share">ভাগাভাগি কর</string>
   <string name="common_rename">পূনঃনামকরণ</string>
+  <string name="common_remove">অপসারণ</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-bs/strings.xml

@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="common_share">Podijeli</string>
+  <!--we need to improve the communication of errors to the user-->
+</resources>

res/values-ca/strings.xml

@@ -13,16 +13,18 @@
   <string name="main_settings">Configuració</string>
   <string name="main_tit_accsetup">Configuració de comptes</string>
   <string name="main_wrn_accsetup">No hi ha comptes d\'ownCloud en el dispositiu. Per usar l\'aplicació, n\'heu de crear un.</string>
-  <string name="about_message">Client ownCloud per Android\n\nversió: %1$s</string>
-  <string name="actionbar_sync">Sincronitza el compte</string>
+  <string name="about_android">%1$s aplicació per Android</string>
+  <string name="about_version">versió %1$s</string>
+  <string name="actionbar_sync">Actualitza compte</string>
   <string name="actionbar_upload">Puja un fitxer</string>
   <string name="actionbar_upload_from_apps">Contingut d\'altres aplicacions</string>
   <string name="actionbar_upload_files">Fitxers</string>
+  <string name="actionbar_open_with">Obre amb</string>
   <string name="actionbar_mkdir">Crea una carpeta</string>
   <string name="actionbar_search">Cerca</string>
   <string name="actionbar_settings">Configuració</string>
+  <string name="actionbar_see_details">Detalls</string>
   <string name="prefs_category_general">General</string>
-  <string name="prefs_category_trackmydevice">Seguiment del dispositiu</string>
   <string name="prefs_add_session">Afegeix una sessió nova</string>
   <string name="prefs_create_img_thumbnails">Crea miniatures d\'imatges</string>
   <string name="prefs_select_oc_account">Seleccioneu un compte</string>
@@ -38,7 +40,12 @@
   <string name="prefs_pincode_summary">Protegiu el client ownCloud</string>
   <string name="prefs_instant_upload">Activa la pujada instantània</string>
   <string name="prefs_instant_upload_summary">Puja instantàniament les fotografies preses amb la càmera</string>
-  <string name="auth_host_url">URL de ownCloud</string>
+  <string name="prefs_log_title">Habilita el registre</string>
+  <string name="prefs_log_summary">Això s\'usa per registrar problemes</string>
+  <string name="prefs_log_title_history">Història del registre</string>
+  <string name="prefs_log_summary_history">Això mostra els registres desats</string>
+  <string name="prefs_log_delete_history_button">Esborra la història</string>
+  <string name="auth_host_url">Adreça del servidor</string>
   <string name="auth_username">Nom d\'usuari</string>
   <string name="auth_password">Contrasenya</string>
   <string name="auth_register">Sóc nou a ownCloud</string>
@@ -53,6 +60,7 @@
   <string name="setup_title">Connecta amb ownCloud</string>
   <string name="setup_btn_connect">Connecta</string>
   <string name="uploader_btn_upload_text">Puja</string>
+  <string name="uploader_top_message">Seleccioneu la carpeta de pujada:</string>
   <string name="uploader_wrn_no_account_title">No s\'ha trobat el compte</string>
   <string name="uploader_wrn_no_account_text">No hi ha comptes ownCloud en el dispositiu. Configureu un compte primer</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configura</string>
@@ -69,9 +77,8 @@
   <string name="filedetails_created">Creat:</string>
   <string name="filedetails_modified">Modificat:</string>
   <string name="filedetails_download">Baixa</string>
-  <string name="filedetails_sync_file">Refrescar</string>
+  <string name="filedetails_sync_file">Actualitza el fitxer</string>
   <string name="filedetails_redownload">Baixa de nou</string>
-  <string name="filedetails_open">Obre</string>
   <string name="filedetails_renamed_in_upload_msg">L\'arxiu s\'ha canviat de nom a %1$s durant la càrrega</string>
   <string name="common_yes">Sí</string>
   <string name="common_no">No</string>
@@ -82,6 +89,8 @@
   <string name="common_save_exit">Desa &amp; Surt</string>
   <string name="common_exit">Surt de ownCloud</string>
   <string name="common_error">Error</string>
+  <string name="common_loading">Carregant...</string>
+  <string name="common_error_unknown">Error desconegut</string>
   <string name="about_title">Quant a</string>
   <string name="delete_account">Elimina compte</string>
   <string name="create_account">Crea un compte</string>
@@ -101,14 +110,25 @@
   <string name="downloader_download_succeeded_content">%1$s s\'han baixat correctament</string>
   <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="common_choose_account">Escolliu el compte</string>
   <string name="sync_string_contacts">Contactes</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>
+  <string name="sync_fail_content_unauthorized">Credencials no vàlides per %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">S\'han trobat conflictes</string>
   <string name="sync_conflicts_in_favourites_content">%1$d mantinguts els arxius que no podien ser sincronitzats</string>
   <string name="sync_fail_in_favourites_ticker">Es mantenent els arxius a sincronitzar erronis</string>
   <string name="sync_fail_in_favourites_content">El contingut de %1$d arxius no es va poder sincronitzar (%2$d conflictes)</string>
+  <string name="sync_foreign_files_forgotten_ticker">S\'han oblidat alguns fitxers locals</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d fitxers no s\'han pogut copiar dins de %2$s carpetes</string>
+  <string name="sync_foreign_files_forgotten_explanation">Des de la versió 1.3.16, els fitxers pujats des d\'aquest dispositiu es copien a la carpeta local %1$s per prevenir pèrdues de dades quan es sincronitza un únic fitxer amb diversos comptes.\n\nDegut a aquest canvi, tots els fitxers pujats en versions anteriors d\'aquesta aplicació es copiaven a la carpeta %2$s. Malgrat tot, un error impedia aquesta operació durant la sinconització del compte. Podeu deixar els fitxer(s) tal i com estan i eliminar l\'enllaç a %3$2, o moure els fitxer(s) a la carpeta %1$s i retenir l\'enllaç a %4$s.\n\nA baix hi ha els fitxers local(s) i els fitxer(s) remots a %5$s als que estaven enllaçats.</string>
+  <string name="foreign_files_move">Mou-los tots</string>
+  <string name="foreign_files_success">S\'han mogut tots els fitxers</string>
+  <string name="foreign_files_fail">Alguns fitxers no s\'han pogut moure</string>
+  <string name="foreign_files_local_text">Local: %1$s</string>
+  <string name="foreign_files_remote_text">Remot: %1$s</string>
+  <string name="upload_query_move_foreign_files">No hi ha prou espai per copiar els fitxers seleccionats a la carpeta %1$s. Els hi voleu moure?</string>
   <string name="use_ssl">Usa connexió segura</string>
   <string name="location_no_provider">ownCloud no pot fer el seguiment de l\'equip. Comproveu la configuració d\'ubicuació</string>
   <string name="pincode_enter_pin_code">Escriviu el PIN de l\'aplicació</string>
@@ -121,6 +141,27 @@
   <string name="pincode_wrong">El PIN de l\'aplicació ownCloud no és correcte</string>
   <string name="pincode_removed">S\'ha eliminat el PIN de l\'aplicació ownCloud</string>
   <string name="pincode_stored">S\'ha desat el PIN de l\'aplicació ownCloud</string>
+  <string name="media_notif_ticker">reproductor de música %1$s</string>
+  <string name="media_state_playing">%1$s (sonant)</string>
+  <string name="media_state_loading">%1$s (carregant)</string>
+  <string name="media_event_done">reproducció acabada %1$s</string>
+  <string name="media_err_nothing_to_play">No s\'han trobat fitxers multimedia</string>
+  <string name="media_err_no_account">No s\'ha proporcionat cap compte</string>
+  <string name="media_err_not_in_owncloud">El fitxer no és en un compte vàlid</string>
+  <string name="media_err_unsupported">El codec multimèdia no és compatible</string>
+  <string name="media_err_io">El fitxer multimèdia no es pot llegir</string>
+  <string name="media_err_malformed">El fitxer multimèdia no està codificat correctament</string>
+  <string name="media_err_timeout">Massa temps intentant reprduïr-lo</string>
+  <string name="media_err_invalid_progressive_playback">El fitxer multimèdia no es pot transmetre</string>
+  <string name="media_err_unknown">El fitxer multimèdia no es pot reproduir amb el reproductor per defecte</string>
+  <string name="media_err_security_ex">Error de seguretat en intentar reproduir %1$s</string>
+  <string name="media_err_io_ex">Error d\'entrada intentant reproduir %1$s</string>
+  <string name="media_err_unexpected">Error inesperat intentant reproduir %1$s</string>
+  <string name="media_previous_description">Botó de cançó anterior</string>
+  <string name="media_rewind_description">Botó de rebobinat</string>
+  <string name="media_play_pause_description">Botó de reproducció o pausa</string>
+  <string name="media_forward_description">Botó de reproducció ràpida</string>
+  <string name="media_next_description">Botó de cançó següent</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 Minuts</item>
     <item>30 Minuts</item>
@@ -131,14 +172,14 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">S\'està intentant acreditar-vos...</string>
+  <string name="auth_trying_to_login">Intentant l\'accés...</string>
   <string name="auth_no_net_conn_title">Sense connexió de xarxa</string>
   <string name="auth_no_net_conn_message">No s\'ha detectat cap connexió, comproveu la connexió i torneu a intentar-ho.</string>
   <string name="auth_connect_anyway">Connecta igualment</string>
   <string name="auth_nossl_plain_ok_title">La connexió segura no està disponible.</string>
   <string name="auth_nossl_plain_ok_message">L\'aplicació no ha pogut establir una connexió segura amb el servidor. Malgrat tot, una connexió no segura està disponible. Podeu continuar o cancel·lar.</string>
   <string name="auth_connection_established">S\'ha establert la connexió</string>
-  <string name="auth_testing_connection">S\'està comprovant la connexió...</string>
+  <string name="auth_testing_connection">Comprovant la connexió...</string>
   <string name="auth_not_configured_title">La configuració de ownCloud està malformada</string>
   <string name="auth_not_configured_message">Sembla que la instància ownCloud no està configurada correctament. Per més detalls contacteu amb l\'administrador.</string>
   <string name="auth_unknown_error_title">S\'ha produït un error desconegut</string>
@@ -154,10 +195,14 @@
   <string name="auth_bad_oc_version_title">Versió del servidor ownCloud desconeguda</string>
   <string name="auth_wrong_connection_title">No s\'ha pogut establir la connexió</string>
   <string name="auth_secure_connection">S\'ha establert la connexió segura</string>
-  <string name="auth_login_details">Detalls de connexió</string>
-  <string name="auth_unauthorized">Login / contrasenya incorrectes</string>
+  <string name="auth_unauthorized">Credencials no vàlides</string>
+  <string name="auth_oauth_error">Autorització sense èxit</string>
+  <string name="auth_oauth_error_access_denied">El servidor d\'autenticació us ha denegat l\'accés</string>
   <string name="auth_not_found">Camí equivocat</string>
   <string name="auth_internal">Error intern del servidor, codi %1$d</string>
+  <string name="auth_wtf_reenter_URL">Estat inesperat; escriviu l\'adreça de nou</string>
+  <string name="auth_expired_oauth_token_toast">La vostra autorització ha vençut.\nAcrediteu-vos de nou</string>
+  <string name="auth_expired_basic_auth_toast">Les credencials desades no són correctes.\nEscriviu les credencials actuals</string>
   <string name="crashlog_message">L\'aplicació s\'ha aturat de manera no prevista. Voleu enviar el registre d\'errors?</string>
   <string name="crashlog_send_report">Envia el registre d\'errors</string>
   <string name="crashlog_dont_send_report">No envïis el registre d\'errors</string>
@@ -172,7 +217,7 @@
   <string name="confirmation_remove_local">Només local</string>
   <string name="confirmation_remove_folder_local">Només contiguts locals</string>
   <string name="confirmation_remove_remote">Elimina del servidor</string>
-  <string name="confirmation_remove_remote_and_local">Tant el remot com el local</string>
+  <string name="confirmation_remove_remote_and_local">Remot i local</string>
   <string name="remove_success_msg">L\'eliminació ha tingut èxit</string>
   <string name="remove_fail_msg">No s\'ha pogut completar l\'eliminació</string>
   <string name="rename_dialog_title">Introdueix un nom nou</string>
@@ -184,6 +229,11 @@
   <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>
+  <string name="oauth_host_url">URL de oAuth2</string>
+  <string name="oauth_check_onoff">Accés per oAuth2.</string>
+  <string name="oauth_login_connection">Connectant amb el servidor oAuth2...</string>
+  <string name="oauth_code_validation_message">Obriu un navegador i accediu a:\n%1$s.\nValideu-hi aquest codi:\n%2$s</string>
+  <string name="oauth_connection_url_unavailable">La connexió amb la URL no està disponible.</string>
   <string name="ssl_validator_title">Avís</string>
   <string name="ssl_validator_header">No s\'ha pogut verificar la identitat del lloc web</string>
   <string name="ssl_validator_reason_cert_not_trusted">- El certificat del servidor no està autenticat</string>
@@ -208,7 +258,12 @@
   <string name="ssl_validator_label_validity_to">A:</string>
   <string name="ssl_validator_label_signature">Signatura:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritme:</string>
-  <string name="text_placeholder">Això és un text variable</string>
+  <string name="placeholder_sentence">Això és un text variable</string>
+  <string name="placeholder_filename">placeholder.txt</string>
+  <string name="placeholder_filetype">Imatge 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">Puja les fotos només via WiFi</string>
   <string name="instant_upload_path">/CarregaInstantània</string>
   <string name="conflict_title">Conflicte d\'actualització</string>
@@ -216,4 +271,20 @@
   <string name="conflict_keep_both">Mantén-los ambdós</string>
   <string name="conflict_overwrite">Sobrescriu</string>
   <string name="conflict_dont_upload">No el pugis</string>
+  <string name="preview_image_description">Visualització prèvia d\'imatge</string>
+  <string name="preview_image_error_unknown_format">Auquesta imatge no es pot mostrar</string>
+  <string name="preview_image_error_out_of_memory">\"No teniu suficient memòria per mostrar aquesta imatge</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s no s\'ha pogut copiar a la carpeta local %2$s</string>
+  <string name="actionbar_failed_instant_upload">ha fallat la pujada instantània\"</string>
+  <string name="failed_upload_headline_text">Fallada de pujades instantànies</string>
+  <string name="failed_upload_headline_hint">Resum de totes les pujades instantànies que han fallat</string>
+  <string name="failed_upload_all_cb">selecciona-ho tot</string>
+  <string name="failed_upload_headline_retryall_btn">reintenta els seleccionats</string>
+  <string name="failed_upload_headline_delete_all_btn">elimina tots els seleccionats de la cua de pujada</string>
+  <string name="failed_upload_retry_text">intenta pujar de nou la imatge:</string>
+  <string name="failed_upload_load_more_images">Carrega més imatges</string>
+  <string name="failed_upload_retry_do_nothing_text">no facis res, no estàs en lína per la pujada instantània</string>
+  <string name="failed_upload_failure_text">Missatge d\'Error:</string>
+  <string name="failed_upload_quota_exceeded_text">Comproveu la configuració del servidor, potser heu excedit la quota.</string>
 </resources>

res/values-cs-rCZ/strings.xml

@@ -13,16 +13,14 @@
   <string name="main_settings">Nastavení</string>
   <string name="main_tit_accsetup">Nastavit účet</string>
   <string name="main_wrn_accsetup">Nemáte nastavené žádné účty ownCloud. Aby bylo možné tuto aplikaci používat, musíte si nějaký vytvořit.</string>
-  <string name="about_message">klient ownCloud pro Android\n\nverze: %1$s</string>
-  <string name="actionbar_sync">Obnovit</string>
   <string name="actionbar_upload">Odeslat</string>
   <string name="actionbar_upload_from_apps">Obsah z ostatních aplikací</string>
   <string name="actionbar_upload_files">Soubory</string>
   <string name="actionbar_mkdir">Vytvořit adresář</string>
   <string name="actionbar_search">Hledat</string>
   <string name="actionbar_settings">Nastavení</string>
+  <string name="actionbar_see_details">Podrobnosti</string>
   <string name="prefs_category_general">Obecné</string>
-  <string name="prefs_category_trackmydevice">Sledování zařízení</string>
   <string name="prefs_add_session">Přidat nové sezení</string>
   <string name="prefs_create_img_thumbnails">Vytvořit náhledy obrázků</string>
   <string name="prefs_select_oc_account">Vybrat účet</string>
@@ -38,7 +36,7 @@
   <string name="prefs_pincode_summary">Chraňte svého klienta ownCloud</string>
   <string name="prefs_instant_upload">Povolit okamžité odeslání</string>
   <string name="prefs_instant_upload_summary">Okamžitě odesílat vytvořené fotografie</string>
-  <string name="auth_host_url">URL ownCloud</string>
+  <string name="auth_host_url">Adresa serveru</string>
   <string name="auth_username">Uživatelské jméno</string>
   <string name="auth_password">Heslo</string>
   <string name="auth_register">Jsem nový na ownCloud.</string>
@@ -53,6 +51,7 @@
   <string name="setup_title">Připojit k Vašemu ownCloudu</string>
   <string name="setup_btn_connect">Připojit</string>
   <string name="uploader_btn_upload_text">Odeslat</string>
+  <string name="uploader_top_message">Vyberte adresář pro nahrané soubory:</string>
   <string name="uploader_wrn_no_account_title">Nenalezen žádný účet</string>
   <string name="uploader_wrn_no_account_text">Nemáte žádné ownCloud účty. Vytvořte si, prosím,  nejdříve účet.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nastavení</string>
@@ -69,9 +68,7 @@
   <string name="filedetails_created">Vytvořen:</string>
   <string name="filedetails_modified">Upraven:</string>
   <string name="filedetails_download">Stáhnout</string>
-  <string name="filedetails_sync_file">Obnovit</string>
   <string name="filedetails_redownload">Znovu stáhnout</string>
-  <string name="filedetails_open">Otevřít</string>
   <string name="filedetails_renamed_in_upload_msg">Soubor byl v průběhu odesílání přejmenován na %1$s</string>
   <string name="common_yes">Ano</string>
   <string name="common_no">Ne</string>
@@ -82,6 +79,8 @@
   <string name="common_save_exit">Uložit a ukončit</string>
   <string name="common_exit">Opustit ownCloud</string>
   <string name="common_error">Chyba</string>
+  <string name="common_loading">Načítání...</string>
+  <string name="common_error_unknown">Neznámá chyba</string>
   <string name="about_title">O aplikaci</string>
   <string name="delete_account">Smazat účet</string>
   <string name="create_account">Vytvořit účet</string>
@@ -101,6 +100,7 @@
   <string name="downloader_download_succeeded_content">%1$s byl úspěšně stažen</string>
   <string name="downloader_download_failed_ticker">Stažení selhalo</string>
   <string name="downloader_download_failed_content">Stažení %1$s nemohlo být dokončeno</string>
+  <string name="downloader_not_downloaded_yet">Ještě nestaženo</string>
   <string name="common_choose_account">Vybrat účet</string>
   <string name="sync_string_contacts">Kontakty</string>
   <string name="sync_fail_ticker">Synchronizace selhala</string>
@@ -109,6 +109,15 @@
   <string name="sync_conflicts_in_favourites_content">%1$d souborů z automatické synchronizace nelze synchronizovat</string>
   <string name="sync_fail_in_favourites_ticker">Automatická synchronizace souborů selhala</string>
   <string name="sync_fail_in_favourites_content">Obsah %1$d souborů nemohl být synchronizován (počet konfliktů: %2$d)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Některé místní soubory byly zapomenuty</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d souborů z adresáře %2$s nelze zkopírovat do</string>
+  <string name="sync_foreign_files_forgotten_explanation">\"Od verze 1.3.16 jsou soubory odeslané z tohoto zařízení, pro ochranu proti ztrátě dat při synchronizaci z více účtů, nahrány do místního adresáře %1$s.\n\nVšechny soubory odeslané předchozími verzemi byly kvůli této změně přesunuty do složky %2$s. Bohužel chyba zabránila dokončení této operace při synchronizaci účtu. Můžete nyní ponechat soubory ve stávajícím stavu a smazat odkaz na %3$s, nebo přesunout soubory do adresáře %1$s a zachovat odkazy na %4$s.\n\nNásleduje seznam místních souborů a jejich odkazů na vzdálené soubory v %5$s.</string>
+  <string name="foreign_files_move">Přesunout vše</string>
+  <string name="foreign_files_success">Všechny soubory byly přesunuty</string>
+  <string name="foreign_files_fail">Některé soubory nebylo možno přesunout</string>
+  <string name="foreign_files_local_text">Místní: %1$s</string>
+  <string name="foreign_files_remote_text">Vzdálené: %1$s</string>
+  <string name="upload_query_move_foreign_files">Nedostatek místa pro kopírování vybraných souborů do složky %1$s. Přejete si je místo kopírování přesunout?</string>
   <string name="use_ssl">Použít zabezpečené spojení</string>
   <string name="location_no_provider">ownCloud nemůže sledovat vaše zařízení. Zkontroluje nastavení zjišťování polohy.</string>
   <string name="pincode_enter_pin_code">Zadejte PIN aplikace</string>
@@ -121,6 +130,27 @@
   <string name="pincode_wrong">Neplatný PIN</string>
   <string name="pincode_removed">PIN ownCloud aplikace odstraněn</string>
   <string name="pincode_stored">PIN ownCloud aplikace uložen</string>
+  <string name="media_notif_ticker">Hudební přehrávač %1$s</string>
+  <string name="media_state_playing">%1$s (přehrává)</string>
+  <string name="media_state_loading">%1$s (načítá)</string>
+  <string name="media_event_done">%1$s přehrávání dokončeno</string>
+  <string name="media_err_nothing_to_play">Nenalezen žádný multimediální soubor</string>
+  <string name="media_err_no_account">Neposkytnut žádný účet</string>
+  <string name="media_err_not_in_owncloud">Soubor není v platném účtu</string>
+  <string name="media_err_unsupported">Nepodporovaný kodek</string>
+  <string name="media_err_io">Multimediální soubor nelze přečíst</string>
+  <string name="media_err_malformed">Multimediální soubor není správně kódován</string>
+  <string name="media_err_timeout">Příliš mnoho času bylo zkoušeno přehrání</string>
+  <string name="media_err_invalid_progressive_playback">Multimediální soubor nelze proudově odesílat</string>
+  <string name="media_err_unknown">Multimediální soubor nemůže být přehrán s výchozím přehrávačem</string>
+  <string name="media_err_security_ex">Chyba zabezpečení při pokusu o přehrání %1$s</string>
+  <string name="media_err_io_ex">Chyba vstupu při pokusu o přehrání %1$s</string>
+  <string name="media_err_unexpected">Neočekávaná chyba při pokusu o přehrání %1$s</string>
+  <string name="media_previous_description">Tlačítko Předchozí stopa</string>
+  <string name="media_rewind_description">Tlačítko Přetočit</string>
+  <string name="media_play_pause_description">Tlačítko Přehrát/Pozastavit</string>
+  <string name="media_forward_description">Tlačítko Rychle vpřed</string>
+  <string name="media_next_description">Tlačítko Následující stopa</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 Minut</item>
     <item>30 Minut</item>
@@ -131,14 +161,12 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Zkouším se přihlásit...</string>
   <string name="auth_no_net_conn_title">Žádné síťové spojení</string>
   <string name="auth_no_net_conn_message">Nebylo nalezeno připojení k síti, zkontrolujte svoje připojení a zkuste to znovu.</string>
   <string name="auth_connect_anyway">I přesto připojit</string>
   <string name="auth_nossl_plain_ok_title">Zabezpečené spojení není k dispozici</string>
   <string name="auth_nossl_plain_ok_message">Aplikace nemůže navázat zabezpečené spojení se serverem. Ačkoliv nezabezpečené spojení je k dispozici. Můžete pokračovat, či přerušit spojení.</string>
   <string name="auth_connection_established">Spojení navázáno</string>
-  <string name="auth_testing_connection">Zkouším spojení...</string>
   <string name="auth_not_configured_title">Neplatné nastavení ownCloudu</string>
   <string name="auth_not_configured_message">Vypadá to že nastavení Vaší instance ownCloud není správné. Kontaktujte svého správce pro více informací.</string>
   <string name="auth_unknown_error_title">Nastala neznámá chyba</string>
@@ -154,8 +182,6 @@
   <string name="auth_bad_oc_version_title">Nerozpoznaná verze serveru ownCloud</string>
   <string name="auth_wrong_connection_title">Nemohu navázat spojení</string>
   <string name="auth_secure_connection">Zabezpečené spojení navázáno</string>
-  <string name="auth_login_details">Podrobnosti přihlášení</string>
-  <string name="auth_unauthorized">Neplatné přihlašovací údaje</string>
   <string name="auth_not_found">Zadána neplatná cesta</string>
   <string name="auth_internal">Interní chyba serveru, kód %1$d</string>
   <string name="crashlog_message">Aplikace neočekávaně skončila. Chcete odeslat zprávu o chybě?</string>
@@ -208,7 +234,12 @@
   <string name="ssl_validator_label_validity_to">Pro:</string>
   <string name="ssl_validator_label_signature">Podpis:</string>
   <string name="ssl_validator_label_signature_algorithm">Alogritmus:</string>
-  <string name="text_placeholder">Zástupný text</string>
+  <string name="placeholder_sentence">Zástupný text</string>
+  <string name="placeholder_filename">placeholder.txt</string>
+  <string name="placeholder_filetype">Obrázek 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">Odesílat obrázky pouze skrze WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Konflikt při aktualizaci</string>
@@ -216,4 +247,20 @@
   <string name="conflict_keep_both">Ponechat oba</string>
   <string name="conflict_overwrite">Přepsat</string>
   <string name="conflict_dont_upload">Nenahrávat</string>
+  <string name="preview_image_description">Náhled obrázku</string>
+  <string name="preview_image_error_unknown_format">Obrázek nemůže být zobrazen</string>
+  <string name="preview_image_error_out_of_memory">\"Nedostatek paměti pro zobrazení obrázku</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s nelze zkopírovat do místního adresáře %2$s</string>
+  <string name="actionbar_failed_instant_upload">Selhalo Okamžité odeslání\"</string>
+  <string name="failed_upload_headline_text">Selhaná okamžitá odeslání</string>
+  <string name="failed_upload_headline_hint">Souhrn všech selhaných okamžitých odeslání</string>
+  <string name="failed_upload_all_cb">vybrat vše</string>
+  <string name="failed_upload_headline_retryall_btn">zkusit znovu vybrané</string>
+  <string name="failed_upload_headline_delete_all_btn">smazat vybrané z fronty k nahrání</string>
+  <string name="failed_upload_retry_text">zkusit znovu odeslat obrázek:</string>
+  <string name="failed_upload_load_more_images">Načíst více obrázků</string>
+  <string name="failed_upload_retry_do_nothing_text">nic nedělat nejste připojení pro okamžité odeslání</string>
+  <string name="failed_upload_failure_text">Chybová zpráva:</string>
+  <string name="failed_upload_quota_exceeded_text">Zkontrolujte prosím nastavení vašeho serveru, možná jste překročili kvótu.</string>
 </resources>

res/values-cy-rGB/strings.xml

@@ -0,0 +1,218 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">Cyfrinair:</string>
+  <string name="main_login">Enw defnyddiwr:</string>
+  <string name="main_button_login">Mewngofnodi</string>
+  <string name="main_welcome">Croeso</string>
+  <string name="main_files">Ffeiliau</string>
+  <string name="main_music">Cerddoriaeth</string>
+  <string name="main_contacts">Cysylltiadau</string>
+  <string name="main_calendar">Calendr</string>
+  <string name="main_bookmarks">Llyfrnodau</string>
+  <string name="main_settings">Gosodiadau</string>
+  <string name="main_tit_accsetup">Gosod Cyfrif</string>
+  <string name="main_wrn_accsetup">Does dim cyfrif wedi\'i sefydlu ar eich dyfais. I ddefnyddio\'r Ap hwn, mae angen i chi greu un.</string>
+  <string name="actionbar_upload">Llwytho i fyny</string>
+  <string name="actionbar_upload_from_apps">Cynnwys o becynnau eraill</string>
+  <string name="actionbar_upload_files">Ffeiliau</string>
+  <string name="actionbar_mkdir">Creu cyfeiriadur</string>
+  <string name="actionbar_search">Chwilio</string>
+  <string name="actionbar_settings">Gosodiadau</string>
+  <string name="prefs_category_general">Cyffredinol</string>
+  <string name="prefs_add_session">Ychwanegu sesiwn newydd</string>
+  <string name="prefs_create_img_thumbnails">Creu bawdluniau delweddau</string>
+  <string name="prefs_select_oc_account">Dewis cyfrif</string>
+  <string name="prefs_summary_select_oc_account">Dewis pa un o\'ch cyfrifon y dylai\'r ap ddefnyddio.</string>
+  <string name="prefs_trackmydevice">Tracio Dyfais</string>
+  <string name="prefs_trackmydevice_summary_off">Galluogwch yr ap hwn i dracio lleoliad eich dyfais</string>
+  <string name="prefs_trackmydevice_summary_on">Mae\'r ap hwn yn tracio\'r ddyfais hon</string>
+  <string name="prefs_trackmydevice_interval">Ysbaid diweddaru</string>
+  <string name="prefs_trackmydevice_interval_summary">Diweddaru pob %1$s munud</string>
+  <string name="prefs_accounts">Cyfrifon</string>
+  <string name="prefs_manage_accounts">Rheoli Cyfrifon</string>
+  <string name="prefs_pincode">PIN Ap</string>
+  <string name="prefs_pincode_summary">Amddiffyn eich cleient</string>
+  <string name="prefs_instant_upload">Galluogi llwytho i fyny\'n syth</string>
+  <string name="prefs_instant_upload_summary">Llwytho lluniau dynnwyd â chamera i fyny\'n syth</string>
+  <string name="auth_username">Enw defnyddiwr</string>
+  <string name="auth_password">Cyfrinair</string>
+  <string name="auth_register">Rwy\'n newydd i %1$s</string>
+  <string name="new_session_uri_error">Cyflwynwyd cyfeiriad anghywir</string>
+  <string name="new_session_session_name_error">Enw sesiwn anghywir</string>
+  <string name="sync_string_files">Ffeiliau</string>
+  <string name="uploader_no_file_selected">Ni ddewiswyd ffeil i\'w llwytho fyny</string>
+  <string name="setup_hint_username">Enw defnyddiwr</string>
+  <string name="setup_hint_password">Cyfrinair</string>
+  <string name="setup_hint_address">Cyfeiriad gwe</string>
+  <string name="setup_hint_show_password">Dangos cyfrinair?</string>
+  <string name="setup_title">Cysylltu â\'ch %1$s</string>
+  <string name="setup_btn_connect">Cysylltu</string>
+  <string name="uploader_btn_upload_text">Llwytho i fyny</string>
+  <string name="uploader_wrn_no_account_title">Heb ganfod cyfrif</string>
+  <string name="uploader_wrn_no_account_text">Does dim cyfrifon %1$s ar eich dyfais. Sefydlwch gyfrif yn gyntaf.</string>
+  <string name="uploader_wrn_no_account_setup_btn_text">Gosod</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">Gadael</string>
+  <string name="uploader_wrn_no_content_title">Dim cynnwys i lwytho i fyny</string>
+  <string name="uploader_wrn_no_content_text">Heb dderbyn cynnwys. Dim cynnwys i lwytho i fyny</string>
+  <string name="uploader_error_forbidden_content">Does dim mynediad gan %1$s i gynnwys a rennir</string>
+  <string name="uploader_info_uploading">Yn llwytho i fyny</string>
+  <string name="uploader_btn_create_dir_text">Creu cyfeiriadur ar gyfer llwytho i fyny</string>
+  <string name="file_list_empty">Does dim ffeilau yn y blygell hon.\nGellir ychwanegu rhai newydd drwy ddewis \"Llwytho i fyny\" yn y ddewislen.</string>
+  <string name="filedetails_select_file">Tapiwch ffeil i ddangos gwybodaeth ychwanegol</string>
+  <string name="filedetails_size">Maint:</string>
+  <string name="filedetails_type">Math:</string>
+  <string name="filedetails_created">Crewyd:</string>
+  <string name="filedetails_modified">Addaswyd:</string>
+  <string name="filedetails_download">Llwytho i lawr</string>
+  <string name="filedetails_redownload">Ail-lwytho i lawr</string>
+  <string name="filedetails_renamed_in_upload_msg">Ailenwyd y ffeil i %1$s wrth lwytho i fyny</string>
+  <string name="common_yes">Ie</string>
+  <string name="common_no">Na</string>
+  <string name="common_ok">Iawn</string>
+  <string name="common_cancel_download">Diddymu llwytho i lawr</string>
+  <string name="common_cancel_upload">Diddymu llwytho i fyny</string>
+  <string name="common_cancel">Diddymu</string>
+  <string name="common_save_exit">Cadw &amp; Gadael</string>
+  <string name="common_exit">Gadael %1$s</string>
+  <string name="common_error">Gwall</string>
+  <string name="about_title">Ynglyn â</string>
+  <string name="delete_account">Dileu cyfrif</string>
+  <string name="create_account">Creu cyfrif</string>
+  <string name="upload_chooser_title">Llwytho i fyny o ...</string>
+  <string name="uploader_info_dirname">Enw cyfeiriadur</string>
+  <string name="uploader_upload_in_progress_ticker">Yn llwytho i fyny ...</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% Llwytho i fyny %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">Llwytho i fyny\'n llwyddiannus</string>
+  <string name="uploader_upload_succeeded_content_single">Llwythwyd %1$s i fyny\'n llwyddiannus</string>
+  <string name="uploader_upload_succeeded_content_multiple">Llwythwyd %1$d ffeil i fyny\'n llwyddiannus</string>
+  <string name="uploader_upload_failed_ticker">Methwyd llwytho i fyny</string>
+  <string name="uploader_upload_failed_content_single">Methwyd cwblhau llwytho %1$s i fyny</string>
+  <string name="uploader_upload_failed_content_multiple">Methwyd llwytho i fyny: Llwythwyd %1$d/%2$d ffeil i fyny</string>
+  <string name="downloader_download_in_progress_ticker">Llwytho i lawr ...</string>
+  <string name="downloader_download_in_progress_content">%1$d%% Llwytho i lawr %2$s</string>
+  <string name="downloader_download_succeeded_ticker">Llwyddiant llwytho i lawr</string>
+  <string name="downloader_download_succeeded_content">Llwythwyd %1$s i lawr yn llwyddiannus</string>
+  <string name="downloader_download_failed_ticker">Methwyd llwytho i lawr</string>
+  <string name="downloader_download_failed_content">Methwyd cwblhau llwytho %1$s i lawr</string>
+  <string name="common_choose_account">Dewiswch gyfrif</string>
+  <string name="sync_string_contacts">Cysylltiadau</string>
+  <string name="sync_fail_ticker">Methodd y cydamseriad</string>
+  <string name="sync_fail_content">Methwyd cwblhau cydamseru %1$s</string>
+  <string name="sync_conflicts_in_favourites_ticker">Canfuwyd gwrthdaro</string>
+  <string name="sync_conflicts_in_favourites_content">Methwyd cydamseru\'r ffeil cadw-yn-gydamserol %1$d</string>
+  <string name="sync_fail_in_favourites_ticker">Methodd ffeiliau cadw-yn-gydamserol</string>
+  <string name="sync_fail_in_favourites_content">Methwyd cydamseru cynnwys ffeiliau %1$d (gwrthdaro %2$d )</string>
+  <string name="sync_foreign_files_forgotten_ticker">Anghofiwyd am rai ffeiliau lleol</string>
+  <string name="sync_foreign_files_forgotten_content">Methwyd copio %1$d ffeil o gyfeiriadur %2$s i mewn i</string>
+  <string name="foreign_files_move">Symud y cyfan</string>
+  <string name="foreign_files_success">Symudwyd pob ffeil</string>
+  <string name="foreign_files_fail">Methwyd symud rhai ffeiliau</string>
+  <string name="foreign_files_local_text">Lleol: %1$s</string>
+  <string name="foreign_files_remote_text">Pell: %1$s</string>
+  <string name="upload_query_move_foreign_files">Does dim digon o le i gopïo\'r ffeiliau ddewiswyd i blygell %1$s . Would like to move them into instead? </string>
+  <string name="use_ssl">Defnyddio Cysylltiad Diogel</string>
+  <string name="location_no_provider">Ni all %1$s dracio\'ch dyfais. Gwiriwch eich gosodiadau lleoliad</string>
+  <string name="pincode_enter_pin_code">Cyflwynwch PIN eich Ap</string>
+  <string name="pincode_enter_new_pin_code">Cyflwynwch PIN newydd eich Ap</string>
+  <string name="pincode_configure_your_pin">Cyflwynwch PIN eich Ap</string>
+  <string name="pincode_configure_your_pin_explanation">Bydd cais am y PIN bob tro mae\'r ap yn cychwyn</string>
+  <string name="pincode_reenter_your_pincode">Ailgyflwynwch PIN eich Ap</string>
+  <string name="pincode_remove_your_pincode">Gwaredwch PIN eich Ap</string>
+  <string name="pincode_mismatch">Nid yw PINau yr Ap yr un fath</string>
+  <string name="pincode_wrong">PIN Ap anghywir</string>
+  <string name="pincode_removed">Gwaredwyd PIN Ap</string>
+  <string name="pincode_stored">Cadwyd PIN Ap</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 Munud</item>
+    <item>30 Munud</item>
+    <item>60 Munud</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
+  <string name="auth_no_net_conn_title">Dim cysylltiad rhwydwaith</string>
+  <string name="auth_no_net_conn_message">Dim cysylltiad rhwydwaith wedi ei ganfod, gwiriwch eich gosodiadau rhyngrwyd a cheisio eto.</string>
+  <string name="auth_connect_anyway">Cysylltu beth bynnag</string>
+  <string name="auth_nossl_plain_ok_title">Nid oes cysylltiad diogel ar gael.</string>
+  <string name="auth_nossl_plain_ok_message">Nid yw\'r rhaglen yn medru sefydlu cysylltiad diogel â\'r gweinydd. Mae cysylltiad anniogel ar gael. Gallwch barhau neu ddiddymu.</string>
+  <string name="auth_connection_established">Sefydlwyd y cysylltiad</string>
+  <string name="auth_not_configured_title">Cyfluniad gweinydd wedi\'i gamffurfio</string>
+  <string name="auth_not_configured_message">Ymddengys nad yw eich gweinydd wedi\'i gyflunio\'n gywir. Cysylltwch â\'ch gweinyddwr am fanylion pellach.</string>
+  <string name="auth_unknown_error_title">Digwyddodd gwall anhysbys!</string>
+  <string name="auth_unknown_error_message">Digwyddodd gwall anhysbys. Ceisiwch gymorth, a chynnwys logiau o\'ch dyfais.</string>
+  <string name="auth_unknown_host_title">Methwyd canfod gwesteiwr</string>
+  <string name="auth_unknown_host_message">Methwyd canfod y gwesteiwr gyflwynwyd. Gwiriwch enw gwesteiwr ac argaeledd y gweinydd a cheisio eto.</string>
+  <string name="auth_incorrect_path_title">Enghraifft o\'r gweinydd heb ei ganfod</string>
+  <string name="auth_incorrect_path_message">Methodd y rhaglen ganfod y gweinydd drwy\'r llwybr nodwyd. Gwiriwch y llwybr a cheisio eto.</string>
+  <string name="auth_timeout_title">Cymrodd y gweinydd rhy hir i ymateb</string>
+  <string name="auth_incorrect_address_title">URL Camffurfiedig</string>
+  <string name="auth_ssl_general_error_title">Methwyd ymgychwyn SSL</string>
+  <string name="auth_ssl_unverified_server_title">Methu gwirio hunaniaeth gweinydd SSL</string>
+  <string name="auth_bad_oc_version_title">Fersiwn gweinydd heb ei gydnabod</string>
+  <string name="auth_wrong_connection_title">Methwyd creu cysylltiad</string>
+  <string name="auth_secure_connection">Sefydlwyd cysylltiad diogel</string>
+  <string name="auth_not_found">Cyflwynwyd llwybr anghywir</string>
+  <string name="auth_internal">Gwall gweinydd mewnol, cod %1$d</string>
+  <string name="crashlog_message">Caeodd y rhaglen yn annisgwyl. Hoffech chi anfon adroddiad chwalu?</string>
+  <string name="crashlog_send_report">Anfon adroddiad</string>
+  <string name="crashlog_dont_send_report">Peidio anfon adroddiad</string>
+  <string name="extensions_avail_title">Estyniadau ar gael!</string>
+  <string name="extensions_avail_message">Ymddengys fel petai\'ch gweinydd yn cefnogi estyniadau uwch. Hoffech chi weld yr estyniadau sydd ar gael ar gyfer android ?</string>
+  <string name="fd_keep_in_sync">Cadw\'r ffeil yn gyfredol</string>
+  <string name="common_share">Rhannu</string>
+  <string name="common_rename">Ailenwi</string>
+  <string name="common_remove">Gwaredu</string>
+  <string name="confirmation_remove_alert">Ydych chi wir am gael gwared ar %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Ydych chi wir am waredu %1$s a\'i gynnwys?</string>
+  <string name="confirmation_remove_local">Lleol yn unig</string>
+  <string name="confirmation_remove_folder_local">Cynnwys lleol yn unig</string>
+  <string name="confirmation_remove_remote">Gwaredu o\'r gweinydd</string>
+  <string name="confirmation_remove_remote_and_local">Pell a lleol</string>
+  <string name="remove_success_msg">Gwaredwyd yn llwyddiannus</string>
+  <string name="remove_fail_msg">Methwyd gwaredu</string>
+  <string name="rename_dialog_title">Rhowch enw newydd</string>
+  <string name="rename_local_fail_msg">Methwyd ailenwi copi lleol; rhowch gynnig ar enw arall</string>
+  <string name="rename_server_fail_msg">Methwyd cwblhau\'r ailenwi</string>
+  <string name="sync_file_fail_msg">Methwyd gwirio\'r ffeil bell</string>
+  <string name="sync_file_nothing_to_do_msg">Cynnwys y ffeil eisoes wedi cydamseru</string>
+  <string name="create_dir_fail_msg">Methwyd creu cyfeiriadur</string>
+  <string name="wait_a_moment">Arhoswch eiliad</string>
+  <string name="filedisplay_unexpected_bad_get_content">Gwall annisgwyl ; dewiswch y ffeil o ap gwahanol</string>
+  <string name="filedisplay_no_file_selected">Ni ddewiswyd ffeil</string>
+  <string name="ssl_validator_title">Rhybudd</string>
+  <string name="ssl_validator_header">Methwyd gwirio hunaniaeth y safle</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- Nid yw tystysgrif y gweinydd yn ddibynadwy</string>
+  <string name="ssl_validator_reason_cert_expired">- Mae tystysgrif y gweinydd wedi dod i ben</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- Mae dyddiadau dilysrwydd tystysgrif y gweinydd yn y dyfodol</string>
+  <string name="ssl_validator_reason_hostname_not_verified">-  Nid yw\'r URL yn cyfateb i\'r enw gwesteiwr yn y dystysgrif</string>
+  <string name="ssl_validator_certificate_not_available">Methwyd darganfod tystysgrif y gweinydd</string>
+  <string name="ssl_validator_question">Ydych chi\'n ymddiried yn y dystysgrif hon beth bynnag?</string>
+  <string name="ssl_validator_not_saved">Methwyd cadw\'r dystysgrif</string>
+  <string name="ssl_validator_btn_details_see">Manylion</string>
+  <string name="ssl_validator_btn_details_hide">Cuddio</string>
+  <string name="ssl_validator_label_subject">Rhoddwyd i:</string>
+  <string name="ssl_validator_label_issuer">Rhoddwyd gan:</string>
+  <string name="ssl_validator_label_CN">Enw cyffredin:</string>
+  <string name="ssl_validator_label_O">Sefydliad:</string>
+  <string name="ssl_validator_label_OU">Uned sefydliad:</string>
+  <string name="ssl_validator_label_C">Gwlad:</string>
+  <string name="ssl_validator_label_ST">Sir:</string>
+  <string name="ssl_validator_label_L">Lleoliad:</string>
+  <string name="ssl_validator_label_validity">Dilysrwydd:</string>
+  <string name="ssl_validator_label_validity_from">O:</string>
+  <string name="ssl_validator_label_validity_to">I:</string>
+  <string name="ssl_validator_label_signature">Llofnod:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algorithm:</string>
+  <string name="instant_upload_on_wifi">Llwytho lluniau i fyny drwy WiFi\'n unig</string>
+  <string name="instant_upload_path">/LlwythoSyth</string>
+  <string name="conflict_title">Gwrthdaro diweddaru</string>
+  <string name="conflict_message">Nid yw ffeil bell %s wedi cydamseru â\'r ffeil leol. Bydd parhau yn amnewid cynnwys y ffeil ar y gweinydd.</string>
+  <string name="conflict_keep_both">Cadw\'r ddau</string>
+  <string name="conflict_overwrite">Trosysgrifio</string>
+  <string name="conflict_dont_upload">Peidio llwytho i fyny</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">Methwyd copïo %1$s i blygell lleol %2$s</string>
+</resources>

res/values-da/strings.xml

@@ -13,8 +13,6 @@
   <string name="main_settings">Indstillinger</string>
   <string name="main_tit_accsetup">Opsæt konto</string>
   <string name="main_wrn_accsetup">Der er ingen ownCloud konti på enheden. For at bruge denne App, skal du oprette en.</string>
-  <string name="about_message">ownCloud Android klient\n\nversion: %1$s</string>
-  <string name="actionbar_sync">Opdater</string>
   <string name="actionbar_upload">Upload</string>
   <string name="actionbar_upload_from_apps">Indhold fra andre apps</string>
   <string name="actionbar_upload_files">Filer</string>
@@ -22,7 +20,6 @@
   <string name="actionbar_search">Søg</string>
   <string name="actionbar_settings">Indstillinger</string>
   <string name="prefs_category_general">Generel</string>
-  <string name="prefs_category_trackmydevice">Enheds sporing</string>
   <string name="prefs_add_session">Tilføj ny session</string>
   <string name="prefs_create_img_thumbnails">Opret billede thumbnails</string>
   <string name="prefs_select_oc_account">Vælg en konto</string>
@@ -38,7 +35,7 @@
   <string name="prefs_pincode_summary">Beskyt din ownCloud klient</string>
   <string name="prefs_instant_upload">Slå øjeblikkelig upload til</string>
   <string name="prefs_instant_upload_summary">Upload billeder taget med kamera med det samme</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="auth_host_url">Serveradresse</string>
   <string name="auth_username">Brugernavn</string>
   <string name="auth_password">Kodeord</string>
   <string name="auth_register">Jeg er ny til ownCloud</string>
@@ -69,9 +66,7 @@
   <string name="filedetails_created">Oprettet:</string>
   <string name="filedetails_modified">Ændret:</string>
   <string name="filedetails_download">Hent</string>
-  <string name="filedetails_sync_file">Opdater</string>
   <string name="filedetails_redownload">Download igen</string>
-  <string name="filedetails_open">Åben</string>
   <string name="filedetails_renamed_in_upload_msg">Filen blev omdøbt til %1$s under upload</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nej</string>
@@ -109,6 +104,14 @@
   <string name="sync_conflicts_in_favourites_content">%1$d hold-synkroniseret filer kunne ikke synkroniseres</string>
   <string name="sync_fail_in_favourites_ticker">Hold-synkroniseret filer mislykkedes</string>
   <string name="sync_fail_in_favourites_content">Indholdet af %1$d filer ikke kunne synkroniseres (%2$d konflikter)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Visse lokale filer blev glemt</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d filer ud af %2$s mappe kunne ikke kopieres ind i</string>
+  <string name="foreign_files_move">Flyt alle</string>
+  <string name="foreign_files_success">Alle filer blev flyttet</string>
+  <string name="foreign_files_fail">Visse filer kunne ikke flyttes</string>
+  <string name="foreign_files_local_text">Lokal: %1$s</string>
+  <string name="foreign_files_remote_text">Fjernplacering: %1$s</string>
+  <string name="upload_query_move_foreign_files">Der er ikke tilstrækkelig plads til at kopiere de valgte filer ind i %1$s mappen. Vil du flytte dem i stedet?</string>
   <string name="use_ssl">Brug sikker forbindelse</string>
   <string name="location_no_provider">ownCloud kan ikke spore din enhed. Tjek venligst dine indstillinger for brug af GPS</string>
   <string name="pincode_enter_pin_code">Indsæt venligst din App PIN</string>
@@ -131,14 +134,12 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Forsøger at logge ind...</string>
   <string name="auth_no_net_conn_title">Ingen netværksforbindelse</string>
   <string name="auth_no_net_conn_message">Der blev ikke fundet nogen netværksforbindelse, tjek din internetforbindelse, og prøv igen</string>
   <string name="auth_connect_anyway">Forbind alligevel</string>
   <string name="auth_nossl_plain_ok_title">Sikker forbindelse ikke tilgængelig.</string>
   <string name="auth_nossl_plain_ok_message">Applikationen kunne ikke oprette en sikker forbindelse med serveren. Selvom en sikker forbindelse ikke er tilgængeligt, kan du vælge at fortsætte eller annullere.</string>
   <string name="auth_connection_established">Forbindelse oprettet</string>
-  <string name="auth_testing_connection">Afprøver forbindelse ...</string>
   <string name="auth_not_configured_title">Misdannet ownCloud konfiguration</string>
   <string name="auth_not_configured_message">Det ser ud til, at din ownCloud instans ikke er konfigureret korrekt. KOntakt din administrator for flere detaljer.</string>
   <string name="auth_unknown_error_title">Ukendt fejl opstod!</string>
@@ -154,8 +155,6 @@
   <string name="auth_bad_oc_version_title">Ikke genkendt ownCloud server version</string>
   <string name="auth_wrong_connection_title">Ikke ikke oprette forbindelse</string>
   <string name="auth_secure_connection">Sikker forbindelse oprettet</string>
-  <string name="auth_login_details">Login detaljer</string>
-  <string name="auth_unauthorized">Ugyldig login / password</string>
   <string name="auth_not_found">Forkert sti angivet</string>
   <string name="auth_internal">Intern serverfejl, kode %1$d</string>
   <string name="crashlog_message">Applikation afsluttede mod forventning. Vil du indsende en fejl rapport?</string>
@@ -208,7 +207,7 @@
   <string name="ssl_validator_label_validity_to">Til:</string>
   <string name="ssl_validator_label_signature">Signatur:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritme:</string>
-  <string name="text_placeholder">Dette er en pladsholder</string>
+  <string name="placeholder_sentence">Dette er en pladsholder</string>
   <string name="instant_upload_on_wifi">Upload billeder kun via WiFi </string>
   <string name="instant_upload_path">/Øjeblikkelig upload</string>
   <string name="conflict_title">Opdaterings konflikt</string>
@@ -216,4 +215,6 @@
   <string name="conflict_keep_both">Behold begge</string>
   <string name="conflict_overwrite">Overskriv</string>
   <string name="conflict_dont_upload">Upload ikke</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s kunne ikke kopieres til %2$s lokale mappe</string>
 </resources>

res/values-de-rDE/strings.xml

@@ -13,16 +13,18 @@
   <string name="main_settings">Einstellungen</string>
   <string name="main_tit_accsetup">Konto einrichten</string>
   <string name="main_wrn_accsetup">Auf Ihrem Gerät sind keine Konten eingerichtet. Bitte erstellen Sie ein Konto, um diese App zu nutzen.</string>
-  <string name="about_message">%1$s Android App\n\nVersion: %2$s</string>
-  <string name="actionbar_sync">Aktualisieren</string>
+  <string name="about_android">%1$s Android App</string>
+  <string name="about_version">Version %1$s</string>
+  <string name="actionbar_sync">Konto aktualisieren</string>
   <string name="actionbar_upload">Datei hochladen</string>
   <string name="actionbar_upload_from_apps">Inhalt von anderen Apps</string>
   <string name="actionbar_upload_files">Dateien</string>
+  <string name="actionbar_open_with">Öffnen mit</string>
   <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>
@@ -38,7 +40,12 @@
   <string name="prefs_pincode_summary">Schützen Sie Ihren Client</string>
   <string name="prefs_instant_upload">Aktiviert den sofortigen Upload</string>
   <string name="prefs_instant_upload_summary">Laden Sie Ihre Fotos von der Kamera sofort hoch</string>
-  <string name="auth_host_url">URL</string>
+  <string name="prefs_log_title">Protokollierung aktivieren</string>
+  <string name="prefs_log_summary">Dies wird zur Protokollierung von Problemen genutzt</string>
+  <string name="prefs_log_title_history">Protokollierungsverlauf</string>
+  <string name="prefs_log_summary_history">Dies zeigt die gespeicherten Protokollierungen</string>
+  <string name="prefs_log_delete_history_button">Verlauf löschen</string>
+  <string name="auth_host_url">Adresse des Servers</string>
   <string name="auth_username">Benutzername</string>
   <string name="auth_password">Passwort</string>
   <string name="auth_register">Ich bin neu bei %1$s</string>
@@ -53,7 +60,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>
@@ -70,9 +77,8 @@
   <string name="filedetails_created">Erstellt:</string>
   <string name="filedetails_modified">Geändert:</string>
   <string name="filedetails_download">Herunterladen</string>
-  <string name="filedetails_sync_file">Aktualisieren</string>
+  <string name="filedetails_sync_file">Datei aktualisieren</string>
   <string name="filedetails_redownload">Neu laden</string>
-  <string name="filedetails_open">Öffnen</string>
   <string name="filedetails_renamed_in_upload_msg">Datei wurde wärend des Uploads zu %1$s umbenannt</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nein</string>
@@ -83,7 +89,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>
@@ -109,10 +115,20 @@
   <string name="sync_string_contacts">Kontakte</string>
   <string name="sync_fail_ticker">Synchronisation fehlgeschlagen</string>
   <string name="sync_fail_content">Bei der Synchronisation konnte %1$s nicht übertragen werden</string>
+  <string name="sync_fail_content_unauthorized">Ungültige Anmeldeinformationen für %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Konflikte gefunden</string>
   <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 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. Sie können die Datei(en) entweder wie sie sind belassen und den Link zu %3$s entfernen oder die Datei(en) in den %1$s Ordner verschieben und  den Link zu %4$s beibehalten.\n\nUnten befindet sich eine Liste der lokalen Datei(en) und der mit ihnen verbundenen Remote-Datei(en) 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 +141,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 gültigen Account</string>
+  <string name="media_err_unsupported">Nicht unterstützter Media-codec</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">Vorheriger 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>
@@ -162,7 +179,7 @@
   <string name="auth_nossl_plain_ok_title">Sichere Verbindung nicht verfügbar.</string>
   <string name="auth_nossl_plain_ok_message">Die App konnte keine sichere Verbindung zum Server herstellen. Eine unsichere Verbindung ist verfügbar. Möchten Sie fortfahren oder abbrechen?</string>
   <string name="auth_connection_established">Verbindung hergestellt</string>
-  <string name="auth_testing_connection">Verbindung testen...</string>
+  <string name="auth_testing_connection">Teste Verbindung...</string>
   <string name="auth_not_configured_title">Fehlerhafte Server Konfiguration</string>
   <string name="auth_not_configured_message">Es scheint, als wäre Ihre Server-Installation nicht richtig konfiguriert. Bitte kontaktieren Sie Ihren Administrator, um weitere Details zu erhalten.</string>
   <string name="auth_unknown_error_title">Ein unbekannter Fehler ist aufgetreten!</string>
@@ -178,10 +195,14 @@
   <string name="auth_bad_oc_version_title">Unbekannte Server-Version</string>
   <string name="auth_wrong_connection_title">Konnte keine Verbindung aufbauen.</string>
   <string name="auth_secure_connection">Sichere Verbindung hergestellt</string>
-  <string name="auth_login_details">Anmeldedetails</string>
-  <string name="auth_unauthorized">Benutzername oder Passwort ungültig</string>
+  <string name="auth_unauthorized">Ungültige Anmeldeinformationen</string>
+  <string name="auth_oauth_error">Autorisierung nicht erfolgreich</string>
+  <string name="auth_oauth_error_access_denied">Zugriff durch den Autorisierungsserver abgelehnt</string>
   <string name="auth_not_found">Falsche Pfadangabe</string>
   <string name="auth_internal">Interner Server Fehler, Fehlercode %1$d</string>
+  <string name="auth_wtf_reenter_URL">Unerwarteter Zustand; bitte geben Sie die URL des Servers nochmals ein</string>
+  <string name="auth_expired_oauth_token_toast">Ihre Autorisierung ist abgelaufen\nBitte Autorisierung nochmals durchführen</string>
+  <string name="auth_expired_basic_auth_toast">Ihre gespeicherten Anmeldeinformationen sind ungültig.\nBitte geben Sie die aktuellen Anmeldeinformationen ein</string>
   <string name="crashlog_message">Die Anwendung ist abgestürzt. Möchten Sie einen Bericht senden?</string>
   <string name="crashlog_send_report">Bericht senden</string>
   <string name="crashlog_dont_send_report">Keinen Bericht senden</string>
@@ -208,6 +229,11 @@
   <string name="wait_a_moment">Bitte warten Sie einen Moment.</string>
   <string name="filedisplay_unexpected_bad_get_content">Ein unerwartetes Problem ist aufgetreten. Bitte versuchen Sie, die Datei in einer anderen App zu öffnen.</string>
   <string name="filedisplay_no_file_selected">Es wurde keine Datei ausgewählt.</string>
+  <string name="oauth_host_url">oAuth2 URL</string>
+  <string name="oauth_check_onoff">Anmelden mit oAuth2.</string>
+  <string name="oauth_login_connection">Verbinde mit dem oAuth2-Server…</string>
+  <string name="oauth_code_validation_message">Bitte öffnen Sie einen Web-Browser und gehen Sie zu:\n%1$s.\nBestätigen Sie diesen Code dort:\n%2$s</string>
+  <string name="oauth_connection_url_unavailable">Die Verbindung zu dieses URL ist nicht verfügbar.</string>
   <string name="ssl_validator_title">Warnung</string>
   <string name="ssl_validator_header">Die Identität der Website konnte nicht überprüft werden</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Das Zertifikat des Servers ist nicht vertrauenswürdig</string>
@@ -232,7 +258,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 +272,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>

res/values-de/strings.xml

@@ -13,16 +13,14 @@
   <string name="main_settings">Einstellungen</string>
   <string name="main_tit_accsetup">Account einrichten</string>
   <string name="main_wrn_accsetup">Auf Deinem Gerät sind keine Konten eingerichtet. Bitte erstelle ein Konto, um diese App zu nutzen.</string>
-  <string name="about_message">%1$s Android App\n\nVersion: %2$s</string>
-  <string name="actionbar_sync">Aktualisieren</string>
   <string name="actionbar_upload">Datei hochladen</string>
   <string name="actionbar_upload_from_apps">Inhalt von anderen Apps</string>
   <string name="actionbar_upload_files">Dateien</string>
   <string name="actionbar_mkdir">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>
@@ -38,7 +36,7 @@
   <string name="prefs_pincode_summary">Schütze Deinen Client</string>
   <string name="prefs_instant_upload">Aktiviert den sofortigen Upload</string>
   <string name="prefs_instant_upload_summary">Lade Deine Fotos von der Kamera sofort hoch</string>
-  <string name="auth_host_url">URL</string>
+  <string name="auth_host_url">Adresse des Servers</string>
   <string name="auth_username">Benutzername</string>
   <string name="auth_password">Passwort</string>
   <string name="auth_register">Ich bin neu bei %1$s</string>
@@ -53,7 +51,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>
@@ -70,9 +68,7 @@
   <string name="filedetails_created">Erstellt:</string>
   <string name="filedetails_modified">Geändert:</string>
   <string name="filedetails_download">Herunterladen</string>
-  <string name="filedetails_sync_file">Aktualisieren</string>
   <string name="filedetails_redownload">Neu laden</string>
-  <string name="filedetails_open">Öffnen</string>
   <string name="filedetails_renamed_in_upload_msg">Datei wurde wärend des Uploads zu %1$s umbenannt</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nein</string>
@@ -83,6 +79,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 +100,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 +109,14 @@
   <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="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 +129,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 gültigen 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 Standardplayer 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 Knopf</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 Minuten</item>
     <item>30 Minuten</item>
@@ -132,14 +160,12 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Anmeldungsversuch...</string>
   <string name="auth_no_net_conn_title">Keine Netzwerkverbindung</string>
   <string name="auth_no_net_conn_message">Es konnte keine Netzwerkverbindung gefunden werden, bitte überprüfe Deine Internetverbindung.</string>
   <string name="auth_connect_anyway">Trotzdem verbinden</string>
   <string name="auth_nossl_plain_ok_title">Sichere Verbindung nicht verfügbar.</string>
   <string name="auth_nossl_plain_ok_message">Die App konnte keine sichere Verbindung zum Server herstellen. Eine nicht sichere Verbindung ist nichtsdestotrotz verfügbar. Möchtest Du fortfahren oder abbrechen?</string>
   <string name="auth_connection_established">Verbindung hergestellt</string>
-  <string name="auth_testing_connection">Verbindung testen...</string>
   <string name="auth_not_configured_title">Fehlerhafte Server Konfiguration</string>
   <string name="auth_not_configured_message">Es scheint, als wäre Deine Server-Installation nicht richtig konfiguriert. Bitte kontaktiere Deinen Administrator, um weitere Details zu erhalten.</string>
   <string name="auth_unknown_error_title">Ein unbekannter Fehler ist aufgetreten!</string>
@@ -155,8 +181,6 @@
   <string name="auth_bad_oc_version_title">Unbekannte Server-Version</string>
   <string name="auth_wrong_connection_title">Konnte keine Verbindung aufbauen.</string>
   <string name="auth_secure_connection">Sichere Verbindung hergestellt</string>
-  <string name="auth_login_details">Anmeldedetails</string>
-  <string name="auth_unauthorized">Benutzername oder Passwort ungültig</string>
   <string name="auth_not_found">Falsche Pfadangabe</string>
   <string name="auth_internal">Interner Server Fehler, Fehlercode %1$d</string>
   <string name="crashlog_message">Die Andwendung ist abgestürzt. Möchtest Du einen Bericht senden?</string>
@@ -209,7 +233,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 +246,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">SofortUpload fehlgeschlagen</string>
+  <string name="failed_upload_headline_hint">Übersicht aller fehlgeschlagenen SofortUploads</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üfe Deine Servereinstellungen. Eventuell ist Dein Nutzungslimit überschritten.</string>
 </resources>

res/values-el/strings.xml

@@ -13,16 +13,14 @@
   <string name="main_settings">Ρυθμίσεις</string>
   <string name="main_tit_accsetup">Ρύθμιση Λογαριασμού</string>
   <string name="main_wrn_accsetup">Δεν υπάρχουν λογαριασμοί ownCloud στη συσκευή σας. Για να χρησιμοποιήσετε την εφαρμογή, πρέπει να δημιουργήσετε ένα.</string>
-  <string name="about_message">ownCloud εφαρμογή για Android\n\nέκδοση: %1$s</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="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>
@@ -38,7 +36,7 @@
   <string name="prefs_pincode_summary">Προστατέψτε την ownCloud εφαρμογή</string>
   <string name="prefs_instant_upload">Ενεργοποιήστε την άμεση μεταφόρτωση</string>
   <string name="prefs_instant_upload_summary">Άμεση μεταφόρτωση των φωτογραφιών που τραβάει η φωτογρ. μηχανή</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="auth_host_url">Διεύθυνση εξυπηρέτη</string>
   <string name="auth_username">Όνομα χρήστη</string>
   <string name="auth_password">Συνθηματικό</string>
   <string name="auth_register">Είμαι νέος στο ownCloud</string>
@@ -69,9 +67,7 @@
   <string name="filedetails_created">Δημιουργήθηκε:</string>
   <string name="filedetails_modified">Τροποποιήθηκε:</string>
   <string name="filedetails_download">Λήψη</string>
-  <string name="filedetails_sync_file">Ανανέωση </string>
   <string name="filedetails_redownload">Κατέβασμα ξανά</string>
-  <string name="filedetails_open">Άνοιγμα</string>
   <string name="filedetails_renamed_in_upload_msg">Το αρχείο μετονομάστηκε σε %1$s κατά την μεταφόρτωση</string>
   <string name="common_yes">Ναι</string>
   <string name="common_no">Όχι</string>
@@ -82,6 +78,8 @@
   <string name="common_save_exit">Αποθήκευση &amp; Έξοδος</string>
   <string name="common_exit">Κλείσιμο</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 +107,14 @@
   <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">%1$d αρχεια απο τον %2$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">Remote: %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">Παρακαλώ, εισάγετε το PIN σας</string>
@@ -131,14 +137,12 @@
     <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_no_net_conn_message">Δεν ανιχνεύθηκε σύνδεση δικτύου, ελέγξτε την σύνδεση στο Internet και προσπαθήστε ξανά.</string>
   <string name="auth_connect_anyway">Συνδεθείτε παρ\' αυτά</string>
   <string name="auth_nossl_plain_ok_title">Μη διαθέσιμη ασφαλής σύνδεση.</string>
   <string name="auth_nossl_plain_ok_message">Αδυναμία καθιέρωσης ασφαλούς σύνδεσης με τον διακομιστή. Παρόλο που είναι διαθέσιμη μη ασφαλή σύνδεση. Μπορείτε να συνεχίσετε ή να ακυρώσετε.</string>
   <string name="auth_connection_established">Επετεύχθη σύνδεση</string>
-  <string name="auth_testing_connection">Έλεγχος σύνδεσης...</string>
   <string name="auth_not_configured_title">Λανθασμένες ρυθμίσεις ownCloud</string>
   <string name="auth_not_configured_message">Φαίνεται ότι το ownCloud δεν είναι σωστά ρυθμισμένο. Παρακαλώ επικοινωνήστε με τον διαχειριστή σας, για περισσότερες πληροφορίες. </string>
   <string name="auth_unknown_error_title">Παρουσιάστηκε άγνωστο σφάλμα</string>
@@ -154,8 +158,6 @@
   <string name="auth_bad_oc_version_title">Μη αναγνωρίσιμη έκδοση διακομιστή ownCloud</string>
   <string name="auth_wrong_connection_title">Δεν ήταν δυνατή η σύνδεση</string>
   <string name="auth_secure_connection">Επιτεύχθηκε ασφαλής σύνδεση</string>
-  <string name="auth_login_details">Λεπτομέρειες σύνδεσης</string>
-  <string name="auth_unauthorized">Μη έγκυρο συνθηματικό εισόδου</string>
   <string name="auth_not_found">Δόθηκε εσφαλμένη διαδρομή</string>
   <string name="auth_internal">Εσωτερικό σφάλμα διακομιστή, κωδικός %1$d</string>
   <string name="crashlog_message">Η εφαρμογή τερματίστηκε ξαφνικά. Θα θέλατε να υποβάλετε αναφορά σφάλματος;</string>
@@ -208,7 +210,7 @@
   <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="instant_upload_on_wifi">Μεταφόρτωση εικόνων μόνο μέσω WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Ενημέρωση σύγκρουσης</string>
@@ -216,4 +218,6 @@
   <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>
 </resources>

res/values-eo/strings.xml

@@ -13,16 +13,14 @@
   <string name="main_settings">Agordo</string>
   <string name="main_tit_accsetup">Agordi konton</string>
   <string name="main_wrn_accsetup">Estas neniu konto de ownCloud en via aparato. Por povi uzi ĉi tiun aplikaĵon, vi devas krei iun.</string>
-  <string name="about_message">Android-aplikaĵo %1$s\n\neldono: %2$s</string>
-  <string name="actionbar_sync">Refreŝigi</string>
   <string name="actionbar_upload">Alŝuti dosieron</string>
   <string name="actionbar_upload_from_apps">Enhavo el aliaj aplikaĵoj</string>
   <string name="actionbar_upload_files">Dosieroj</string>
   <string name="actionbar_mkdir">Krei dosierujon</string>
   <string name="actionbar_search">Serĉi</string>
   <string name="actionbar_settings">Agordo</string>
+  <string name="actionbar_see_details">Detaloj</string>
   <string name="prefs_category_general">Ĝeneralo</string>
-  <string name="prefs_category_trackmydevice">Spurado de aparato</string>
   <string name="prefs_add_session">Aldoni novan sesion</string>
   <string name="prefs_create_img_thumbnails">Krei bildetojn</string>
   <string name="prefs_select_oc_account">Elekti konton</string>
@@ -37,7 +35,7 @@
   <string name="prefs_pincode_summary">Protekti vian ownCloud-klienton</string>
   <string name="prefs_instant_upload">Kapabligi tujan alŝuton</string>
   <string name="prefs_instant_upload_summary">Tuje alŝuti fotojn faritajn per fotilo</string>
-  <string name="auth_host_url">URL de ownCloud</string>
+  <string name="auth_host_url">Servila adreso</string>
   <string name="auth_username">Uzantonomo</string>
   <string name="auth_password">Pasvorto</string>
   <string name="auth_register">Mi estas nova ĉe ownCloud</string>
@@ -67,9 +65,7 @@
   <string name="filedetails_created">Kreita je:</string>
   <string name="filedetails_modified">Modifita je:</string>
   <string name="filedetails_download">Elŝuti</string>
-  <string name="filedetails_sync_file">Refreŝigi</string>
   <string name="filedetails_redownload">Reelŝuti</string>
-  <string name="filedetails_open">Malfermi</string>
   <string name="filedetails_renamed_in_upload_msg">La dosiero alinomiĝis al %1$s dum alŝuto</string>
   <string name="common_yes">Jes</string>
   <string name="common_no">Ne</string>
@@ -80,6 +76,7 @@
   <string name="common_save_exit">Konservi kaj forlasi</string>
   <string name="common_exit">Forlasi ownCloud-on</string>
   <string name="common_error">Eraro</string>
+  <string name="common_error_unknown">Nekonata eraro</string>
   <string name="about_title">Pri</string>
   <string name="delete_account">Forigi konton</string>
   <string name="create_account">Krei konton</string>
@@ -128,13 +125,11 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Provante ensaluti...</string>
   <string name="auth_no_net_conn_title">Neniu reta konekto</string>
   <string name="auth_no_net_conn_message">Neniu reta konekto detektiĝis; kontrolu vian Interretan konekton kaj provu denove.</string>
   <string name="auth_connect_anyway">Konekti ĉiuokaze</string>
   <string name="auth_nossl_plain_ok_title">Sekura konekto ne haveblas.</string>
   <string name="auth_connection_established">Konekto stariĝis</string>
-  <string name="auth_testing_connection">Testante konekton...</string>
   <string name="auth_not_configured_title">Malĝuste formita ownCloud-agordo</string>
   <string name="auth_unknown_error_title">Nekonata eraro okazis</string>
   <string name="auth_unknown_error_message">Nekonata eraro okazis. Bonvolu kontakti verkintojn kaj inkluzivigi registrojn el via aparato.</string>
@@ -148,8 +143,6 @@
   <string name="auth_bad_oc_version_title">Nerekonita eldono de ownCloud-servilo</string>
   <string name="auth_wrong_connection_title">Ne eblis starigi konekton</string>
   <string name="auth_secure_connection">Sekura konekto stariĝis</string>
-  <string name="auth_login_details">Ensalutaj detaloj</string>
-  <string name="auth_unauthorized">Nevalida ensalutonomo/pasvorto</string>
   <string name="auth_not_found">Malĝusta vojo doniĝis</string>
   <string name="auth_internal">Ena servila eraro: kodo %1$d</string>
   <string name="crashlog_message">Aplikaĵo finis neatendite. Ĉu vi volus sendi paneoraporton?</string>
@@ -199,11 +192,12 @@
   <string name="ssl_validator_label_validity_to">Al:</string>
   <string name="ssl_validator_label_signature">Subskribo:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
-  <string name="text_placeholder">Ĉi tio estas lokokupilo</string>
+  <string name="placeholder_sentence">Ĉi tio estas lokokupilo</string>
   <string name="instant_upload_on_wifi">Alŝuti bildojn nur per WiFi</string>
   <string name="conflict_title">Alŝuta konflikto</string>
   <string name="conflict_message">La malloka dosiero %s estas ne sinkronigita kun loka dosiero. Se la ago daŭrus, enhavo de la dosiero en la servilo anstataŭiĝus.</string>
   <string name="conflict_keep_both">Konservi ambaŭ</string>
   <string name="conflict_overwrite">Anstataŭigi</string>
   <string name="conflict_dont_upload">Ne alŝuti</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-es-rAR/strings.xml

@@ -13,16 +13,18 @@
   <string name="main_settings">Configuración</string>
   <string name="main_tit_accsetup">Configurar cuenta</string>
   <string name="main_wrn_accsetup">No hay cuentas en tu dispositivo. Para usar esta aplicación, tenés que crear una.</string>
-  <string name="about_message">%1$s para Android\n\nversión: %2$s</string>
-  <string name="actionbar_sync">Recargar</string>
+  <string name="about_android">App Android %1$s</string>
+  <string name="about_version">versión %1$s</string>
+  <string name="actionbar_sync">Actualizar cuenta</string>
   <string name="actionbar_upload">Subir</string>
   <string name="actionbar_upload_from_apps">Contenido de otras aplicaciones</string>
   <string name="actionbar_upload_files">Archivos</string>
+  <string name="actionbar_open_with">Abrir con</string>
   <string name="actionbar_mkdir">Crear directorio</string>
   <string name="actionbar_search">Buscar</string>
   <string name="actionbar_settings">Configuración</string>
+  <string name="actionbar_see_details">Detalles</string>
   <string name="prefs_category_general">General</string>
-  <string name="prefs_category_trackmydevice">Seguimiento del dispositivo</string>
   <string name="prefs_add_session">Agregar una sesión nueva</string>
   <string name="prefs_create_img_thumbnails">Crear miniaturas de las imágenes</string>
   <string name="prefs_select_oc_account">Elegir una cuenta</string>
@@ -38,7 +40,12 @@
   <string name="prefs_pincode_summary">Protejé tu cliente</string>
   <string name="prefs_instant_upload">Habilitar la subida inmediata</string>
   <string name="prefs_instant_upload_summary">Subir inmediatamente las fotos sacadas con la cámara</string>
-  <string name="auth_host_url">URL</string>
+  <string name="prefs_log_title">Habilitar registro</string>
+  <string name="prefs_log_summary">Esto es usado para registrar problemas</string>
+  <string name="prefs_log_title_history">Historia del Registro</string>
+  <string name="prefs_log_summary_history">Esto muestra los registros grabados</string>
+  <string name="prefs_log_delete_history_button">Eliminar Historial</string>
+  <string name="auth_host_url">Dirección del servidor</string>
   <string name="auth_username">Nombre de usuario</string>
   <string name="auth_password">Contraseña</string>
   <string name="auth_register">Soy nuevo en %1$s</string>
@@ -53,6 +60,7 @@
   <string name="setup_title">Conectate a tu %1$s</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Subir</string>
+  <string name="uploader_top_message">Elegí el directorio de subida:</string>
   <string name="uploader_wrn_no_account_title">No se encontraron cuentas</string>
   <string name="uploader_wrn_no_account_text">No hay cuentas de %1$s en tu dispositivo. Creá una cuenta primero.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurar</string>
@@ -69,9 +77,8 @@
   <string name="filedetails_created">Creado:</string>
   <string name="filedetails_modified">Modificado:</string>
   <string name="filedetails_download">Descargar</string>
-  <string name="filedetails_sync_file">Recargar</string>
+  <string name="filedetails_sync_file">Actualizar archivo</string>
   <string name="filedetails_redownload">Volver a descargar</string>
-  <string name="filedetails_open">Abrir</string>
   <string name="filedetails_renamed_in_upload_msg">El archivo fue renombrado como %1$s durante la subida</string>
   <string name="common_yes">Sí</string>
   <string name="common_no">No</string>
@@ -82,6 +89,8 @@
   <string name="common_save_exit">Guardar y salir</string>
   <string name="common_exit">Salir de %1$s</string>
   <string name="common_error">Error</string>
+  <string name="common_loading">Cargando ...</string>
+  <string name="common_error_unknown">Error desconocido</string>
   <string name="about_title">Acerca de</string>
   <string name="delete_account">Eliminar cuenta</string>
   <string name="create_account">Crear cuenta</string>
@@ -101,14 +110,25 @@
   <string name="downloader_download_succeeded_content">%1$s fue descargado con éxito</string>
   <string name="downloader_download_failed_ticker">Error al descargar</string>
   <string name="downloader_download_failed_content">No fue posible completar la descarga de %1$s</string>
+  <string name="downloader_not_downloaded_yet">No descargado</string>
   <string name="common_choose_account">Elegí una cuenta</string>
   <string name="sync_string_contacts">Contactos</string>
   <string name="sync_fail_ticker">Error en la sincronización</string>
   <string name="sync_fail_content">No se pudo completar la sincronización de %1$s </string>
+  <string name="sync_fail_content_unauthorized">Credenciales inválidas para %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Se encontraron conflictos</string>
   <string name="sync_conflicts_in_favourites_content">No se pudieron sincronizar %1$d archivos</string>
   <string name="sync_fail_in_favourites_ticker">Fallo la sincronización de archivos</string>
   <string name="sync_fail_in_favourites_content">%1$d archivos no pudieron ser sincronizados (%2$d conflictos)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Algunos archivos locales fueron olvidados</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d archivos del directorio %2$s no pudieron ser copiados en</string>
+  <string name="sync_foreign_files_forgotten_explanation">Desde la versión 1.3.16, los archivos subidos desde este dispositivo se copian a un directorio local %1$s para prevenir la pérdida de datos cuando un único archivo es sincronizado con múltiples cuentas. \n\nDebido a este cambio, todos los archivos subidos en versiones previas de esta aplicación fueron copiados al directorio %2$s. No obstante, debido a un error, esta operación no pudo ser completada durante la sincronización de la cuenta. Podés dejar los archivos así y borrar el enlace a %3$s, o podés mover el/los archivos al directorio %1$s y conservar el enlace a %4$s. \n\nAbajo, encontrás la lista con los enlaces a los archivos locales y remotos en %5$s a los que están enlazados.</string>
+  <string name="foreign_files_move">Mover todos</string>
+  <string name="foreign_files_success">Todos los archivos fueron movidos</string>
+  <string name="foreign_files_fail">Algunos archivos no pudieron ser movidos</string>
+  <string name="foreign_files_local_text">Local: %1$s</string>
+  <string name="foreign_files_remote_text">Remote: %1$s</string>
+  <string name="upload_query_move_foreign_files">No hay suficiente espacio para copiar los archivos seleccionados al directorio %1$s. Querés moverlos ahí?</string>
   <string name="use_ssl">Usar conexión segura</string>
   <string name="location_no_provider">%1$s no puede rastear tu dispositivo. Verificá la configuración de localización</string>
   <string name="pincode_enter_pin_code">Por favor, escribí el PIN de la aplicación</string>
@@ -121,6 +141,27 @@
   <string name="pincode_wrong">El PIN de la aplicación es incorrecto</string>
   <string name="pincode_removed">El PIN de la aplicación fue borrado</string>
   <string name="pincode_stored">El PIN de la aplicación fue almacenado</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 proporcionó cuenta</string>
+  <string name="media_err_not_in_owncloud">El archivo no está en una cuenta válida </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 está correctamente codificado</string>
+  <string name="media_err_timeout">Demasiado tiempo intentando reproducir</string>
+  <string name="media_err_invalid_progressive_playback">Archivo de medios 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>
     <item>30 minutos</item>
@@ -131,7 +172,7 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Intentado iniciar sesión...</string>
+  <string name="auth_trying_to_login">Intentando iniciar sesión...</string>
   <string name="auth_no_net_conn_title">Sin conexión de red</string>
   <string name="auth_no_net_conn_message">No se ha detectado una conexión de red, revisá tu conexión a internet e intentá nuevamente.</string>
   <string name="auth_connect_anyway">Conectar de todos modos</string>
@@ -154,10 +195,14 @@
   <string name="auth_bad_oc_version_title">No es posible reconocer la versión del servidor</string>
   <string name="auth_wrong_connection_title">No fue posible establecer la conexión</string>
   <string name="auth_secure_connection">Conexión segura establecida</string>
-  <string name="auth_login_details">Detalles de inicio de sesión</string>
-  <string name="auth_unauthorized">Nombre / contraseña incorrectos</string>
+  <string name="auth_unauthorized">Credenciales inválidas</string>
+  <string name="auth_oauth_error">Autorización no satisfactoria</string>
+  <string name="auth_oauth_error_access_denied">Acceso denegado por el servidor de autorización</string>
   <string name="auth_not_found">Ruta incorrecta</string>
   <string name="auth_internal">Error interno en el servidor, código %1$d</string>
+  <string name="auth_wtf_reenter_URL">Estado inesperado; por favor, introducí la URL del servidor de nuevo</string>
+  <string name="auth_expired_oauth_token_toast">Tu autorización expiró. Por favor, autorizá de nuevo</string>
+  <string name="auth_expired_basic_auth_toast">Tus credenciales guardadas son inválidas. Por favor, introducí tus credenciales actuales</string>
   <string name="crashlog_message">La aplicación finalizó inesperadamente. ¿Querés mandar un reporte de error?</string>
   <string name="crashlog_send_report">Enviar reporte</string>
   <string name="crashlog_dont_send_report">No enviar reporte</string>
@@ -184,6 +229,11 @@
   <string name="wait_a_moment">Esperá un momento</string>
   <string name="filedisplay_unexpected_bad_get_content">Problema inesperado; por favor, intentá con otra aplicación para abrir el archivo</string>
   <string name="filedisplay_no_file_selected">No se seleccionó ningún archivo</string>
+  <string name="oauth_host_url">URL oAuth2</string>
+  <string name="oauth_check_onoff">Ingresar con oAuth2.</string>
+  <string name="oauth_login_connection">Conectando al servidor oAuth2...</string>
+  <string name="oauth_code_validation_message">Por favor, abrí un navegador web y andá a: %1$s. \nValidá este código ahí: %2$s</string>
+  <string name="oauth_connection_url_unavailable">Conexión a esta URL no disponible.</string>
   <string name="ssl_validator_title">Alerta</string>
   <string name="ssl_validator_header">La identidad del sitio no pudo ser verificada</string>
   <string name="ssl_validator_reason_cert_not_trusted">- El certificado del servidor no es confiable</string>
@@ -208,7 +258,12 @@
   <string name="ssl_validator_label_validity_to">Para:</string>
   <string name="ssl_validator_label_signature">Firma:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
-  <string name="text_placeholder">Este es un texto temporario</string>
+  <string name="placeholder_sentence">Este es un texto temporario</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 solamente a través de WiFi</string>
   <string name="instant_upload_path">/SubidasInstantáneas</string>
   <string name="conflict_title">Conflicto en la actualización</string>
@@ -216,4 +271,20 @@
   <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-->
+  <string name="error__upload__local_file_not_copied">%1$s no pudo ser copiado al directorio local %2$s</string>
+  <string name="actionbar_failed_instant_upload">Error en Carga instantánea </string>
+  <string name="failed_upload_headline_text">Error en Cargas instantánea </string>
+  <string name="failed_upload_headline_hint">Resumen de todas las cargas instantáneas con error</string>
+  <string name="failed_upload_all_cb">Seleccionar todos</string>
+  <string name="failed_upload_headline_retryall_btn">Reintentar con 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ás 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, revisá la configuración de servidor, posiblemente tu cuota se haya excedido.</string>
 </resources>

res/values-es/strings.xml

@@ -13,16 +13,18 @@
   <string name="main_settings">Ajustes</string>
   <string name="main_tit_accsetup">Configuración de cuenta</string>
   <string name="main_wrn_accsetup">No hay cuentas en tu dispositivo. Para usar esta aplicación, necesitas crear una.</string>
-  <string name="about_message">%1$s para Android\n\nversión: %2$s</string>
-  <string name="actionbar_sync">Sincronización de cuenta</string>
+  <string name="about_android">App Android %1$s</string>
+  <string name="about_version">versión %1$s</string>
+  <string name="actionbar_sync">Actualizar cuenta</string>
   <string name="actionbar_upload">Subir archivo</string>
   <string name="actionbar_upload_from_apps">Contenido de otras aplicaciones</string>
   <string name="actionbar_upload_files">Archivos</string>
+  <string name="actionbar_open_with">Abrir con</string>
   <string name="actionbar_mkdir">Crear directorio</string>
   <string name="actionbar_search">Buscar</string>
   <string name="actionbar_settings">Ajustes</string>
+  <string name="actionbar_see_details">Detalles</string>
   <string name="prefs_category_general">General</string>
-  <string name="prefs_category_trackmydevice">Rastreo de dispositivo</string>
   <string name="prefs_add_session">Agregar nueva sesión</string>
   <string name="prefs_create_img_thumbnails">Crear miniaturas de imagen</string>
   <string name="prefs_select_oc_account">Seleccionar una cuenta</string>
@@ -38,7 +40,12 @@
   <string name="prefs_pincode_summary">Proteja su cliente</string>
   <string name="prefs_instant_upload">Habilita la subida instantánea</string>
   <string name="prefs_instant_upload_summary">Subir instantáneamente las fotos tomadas por la cámara</string>
-  <string name="auth_host_url">URL</string>
+  <string name="prefs_log_title">Habilitar registro</string>
+  <string name="prefs_log_summary">Esto es usado para registrar problemas</string>
+  <string name="prefs_log_title_history">Historia del Registro</string>
+  <string name="prefs_log_summary_history">Esto muestra los registros grabados</string>
+  <string name="prefs_log_delete_history_button">Eliminar Historial</string>
+  <string name="auth_host_url">Dirección del servidor</string>
   <string name="auth_username">Nombre de usuario</string>
   <string name="auth_password">Contraseña</string>
   <string name="auth_register">Soy nuevo en %1$s</string>
@@ -53,6 +60,7 @@
   <string name="setup_title">Conectar a tu %1$s</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Subir</string>
+  <string name="uploader_top_message">Escoja el directorio de carga:</string>
   <string name="uploader_wrn_no_account_title">No se encontraron cuentas</string>
   <string name="uploader_wrn_no_account_text">No hay cuentas de %1$s en tu dispositivo. Por favor configura una cuenta primero.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configuración</string>
@@ -69,9 +77,8 @@
   <string name="filedetails_created">Creado:</string>
   <string name="filedetails_modified">Modificado:</string>
   <string name="filedetails_download">Descargar</string>
-  <string name="filedetails_sync_file">Actualizar</string>
+  <string name="filedetails_sync_file">Actualizar archivo</string>
   <string name="filedetails_redownload">Volver a descargar</string>
-  <string name="filedetails_open">Abrir</string>
   <string name="filedetails_renamed_in_upload_msg">El fichero fue renombrado como %1$s durante la subida</string>
   <string name="common_yes">Sí</string>
   <string name="common_no">No</string>
@@ -82,6 +89,8 @@
   <string name="common_save_exit">Guardar &amp; Salir</string>
   <string name="common_exit">Salir de %1$s</string>
   <string name="common_error">Error</string>
+  <string name="common_loading">Cargando ...</string>
+  <string name="common_error_unknown">Error desconocido</string>
   <string name="about_title">Acerca de</string>
   <string name="delete_account">Eliminar cuenta</string>
   <string name="create_account">Crear cuenta</string>
@@ -101,14 +110,25 @@
   <string name="downloader_download_succeeded_content">%1$s se ha descargado con éxito</string>
   <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="common_choose_account">Elige una cuenta</string>
   <string name="sync_string_contacts">Contactos</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>
+  <string name="sync_fail_content_unauthorized">Credenciales inválidas para %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Se encontraron conflictos</string>
   <string name="sync_conflicts_in_favourites_content">Falló la sincronización de contenidos de %1$d ficheros</string>
   <string name="sync_fail_in_favourites_ticker">Fallos en la sincronización de contenidos</string>
   <string name="sync_fail_in_favourites_content">Los contenidos de %1$d ficheros no fueron sincronizados (%2$d conflictos)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Algunos archivos locales se han perdido</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d archivos de %2$s no han podido ser copiados</string>
+  <string name="sync_foreign_files_forgotten_explanation">Como versión 1.3.16, los archivos subidos desde este dispositivo son copiados a un archivo %1$s local para prevenir perdida de datos cuando un simple archivo es sincronizado con multiples cuentas.\n\nDebido a este cambio, todos los archivos subidos en versiones previas de esta aplicación han sido copiados a la carpeta %2$s. No obtante, un error previno el completado de esta operación durante la sincronización de cuenta. Debería dejar el o los archivos así y eliminar el enlace a %3$s o mover el o los archivos al %1$s directorio y conservar el enlace a %4$s.\n\nListado abajo tiene los enlaces a los archivos locales y archivos remotos en %5$s </string>
+  <string name="foreign_files_move">Mover todo</string>
+  <string name="foreign_files_success">Todos los archivos fueron movidos</string>
+  <string name="foreign_files_fail">Algunos archivos no han podido ser movidos</string>
+  <string name="foreign_files_local_text">Local: %1$s</string>
+  <string name="foreign_files_remote_text">Remoto: %1$s</string>
+  <string name="upload_query_move_foreign_files">No hay suficiente espacio para copiar los archivos seleccionados en la carpeta %1$s. ¿Quiere moverlos en lugar de copiarlos?</string>
   <string name="use_ssl">Usar conexión segura</string>
   <string name="location_no_provider">%1$s no puede rastear tu dispositivo. Por favor chequea tu configuración de localización</string>
   <string name="pincode_enter_pin_code">Por favor, inserta tu PIN de aplicación</string>
@@ -121,6 +141,27 @@
   <string name="pincode_wrong">PIN de aplicación incorrecto</string>
   <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>
     <item>30 minutos</item>
@@ -131,7 +172,7 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Intentado iniciar sesión...</string>
+  <string name="auth_trying_to_login">Intentando iniciar sesión...</string>
   <string name="auth_no_net_conn_title">Sin conexión de red</string>
   <string name="auth_no_net_conn_message">No se ha detectado una conexión de red, chequea tu conexión a internet e intenta nuevamente.</string>
   <string name="auth_connect_anyway">Conectar de todos modos</string>
@@ -154,10 +195,14 @@
   <string name="auth_bad_oc_version_title">No se reconoce  la versión del servidor </string>
   <string name="auth_wrong_connection_title">No se ha podido establecer la conexión</string>
   <string name="auth_secure_connection">Conexión segura establecida</string>
-  <string name="auth_login_details">Detalles de inicio de sesión</string>
-  <string name="auth_unauthorized">Nombre / contraseña incorrectos</string>
+  <string name="auth_unauthorized">Credenciales inválidas</string>
+  <string name="auth_oauth_error">Autorización no satisfactoria</string>
+  <string name="auth_oauth_error_access_denied">Acceso denegado por servidor de autorización</string>
   <string name="auth_not_found">Ruta errónea</string>
   <string name="auth_internal">Error interno en el servidor, código %1$d</string>
+  <string name="auth_wtf_reenter_URL">Estado inesperado; por favor, introduzca la URL del servidor de nuevo</string>
+  <string name="auth_expired_oauth_token_toast">Su autorización ha expirado.\nPor favor, autorice de nuevo</string>
+  <string name="auth_expired_basic_auth_toast">Sus credenciales guardadas son inválidas.\nPor favor, introduzca sus credenciales actuales</string>
   <string name="crashlog_message">La aplicación finalizó inesperadamente. ¿Desea enviar un reporte de error?</string>
   <string name="crashlog_send_report">Enviar reporte</string>
   <string name="crashlog_dont_send_report">No enviar reporte</string>
@@ -184,6 +229,11 @@
   <string name="wait_a_moment">Espere un momento</string>
   <string name="filedisplay_unexpected_bad_get_content">Problema inesperado; por favor, prueba otra app para seleccionar el archivo</string>
   <string name="filedisplay_no_file_selected">No fué seleccionado ningún archivo</string>
+  <string name="oauth_host_url">URL oAuth2</string>
+  <string name="oauth_check_onoff">Ingresar con oAuth2.</string>
+  <string name="oauth_login_connection">Conectando al servidor oAuth2...</string>
+  <string name="oauth_code_validation_message">Por favor, abra un navegador web y vaya a:\n%1$s.\nValidarse ahí con este código:\n%2$s</string>
+  <string name="oauth_connection_url_unavailable">Conexión a está URL no disponible.</string>
   <string name="ssl_validator_title">Atención</string>
   <string name="ssl_validator_header">La identidad del sitio no puede ser verificada</string>
   <string name="ssl_validator_reason_cert_not_trusted">- El certificado del servidor no es de confianza</string>
@@ -208,7 +258,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="text_placeholder">Es un marcador de posición</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>
@@ -216,4 +271,20 @@
   <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-->
+  <string name="error__upload__local_file_not_copied">%1$s no puede ser copiado al %2$s directorio local </string>
+  <string name="actionbar_failed_instant_upload">Carga instantánea fallida</string>
+  <string name="failed_upload_headline_text">Cargas instantáneas fallidas</string>
+  <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>

res/values-et-rEE/strings.xml

@@ -4,25 +4,23 @@
   <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>
   <string name="main_settings">Seaded</string>
   <string name="main_tit_accsetup">Konto seadistamine</string>
   <string name="main_wrn_accsetup">Sinu seadmes pole ühtegi ownCloudi kontot. Selle rakenduse kasutamiseks pead sa ühe looma.</string>
-  <string name="about_message">ownCloud Androidi klient\n\nversioon: %1$s</string>
-  <string name="actionbar_sync">Värskenda</string>
   <string name="actionbar_upload">Lae fail üles</string>
   <string name="actionbar_upload_from_apps">Sisu teistest rakendustest</string>
   <string name="actionbar_upload_files">Failid</string>
   <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>
@@ -38,14 +36,14 @@
   <string name="prefs_pincode_summary">Kaitse oma ownCloudi klienti</string>
   <string name="prefs_instant_upload">Luba kohene üleslaadimine</string>
   <string name="prefs_instant_upload_summary">Lae kaamera poolt tehtud fotod automaatselt üles</string>
-  <string name="auth_host_url">ownCloudi URL</string>
+  <string name="auth_host_url">Serveri aadress</string>
   <string name="auth_username">Kasutajanimi</string>
   <string name="auth_password">Parool</string>
   <string name="auth_register">Olen uus ownCloudi kasutaja</string>
   <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 +51,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>
@@ -69,9 +68,8 @@
   <string name="filedetails_created">Loodud:</string>
   <string name="filedetails_modified">Muudetud:</string>
   <string name="filedetails_download">Lae alla</string>
-  <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 +79,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 +100,23 @@
   <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="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 +129,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>
@@ -127,14 +160,12 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Proovitakse sisse logida...</string>
   <string name="auth_no_net_conn_title">Võrguühendust pole</string>
   <string name="auth_no_net_conn_message">Internetiühendust ei leitud, kontrolli oma interneti ühendust ja proovi uuesti.</string>
   <string name="auth_connect_anyway">Ühenda sellegipoolest</string>
   <string name="auth_nossl_plain_ok_title">Turvaline ühendus pole saadaval</string>
   <string name="auth_nossl_plain_ok_message">Rakendus ei suutnud serveriga turvalist ühendust luua. Kuid saadaval on mitteturvaline ühendus. Sa võid jätkata või loobuda.</string>
   <string name="auth_connection_established">Saadi ühendus</string>
-  <string name="auth_testing_connection">Ühenduse testimine...</string>
   <string name="auth_not_configured_title">Vigases vormingus ownCloud seadistus</string>
   <string name="auth_not_configured_message">Näib, et sinu ownCloud pole korralikult seadistatud. Lisainfo saamiseks võta ühendust oma administraatoriga.</string>
   <string name="auth_unknown_error_title">Tekkis tundmatu tõrge!</string>
@@ -150,8 +181,6 @@
   <string name="auth_bad_oc_version_title">Tundmatu ownCloud serveri versioon</string>
   <string name="auth_wrong_connection_title">Ühenduse loomine ebaõnnestus</string>
   <string name="auth_secure_connection">Saavutati turvaline ühendus</string>
-  <string name="auth_login_details">Sisselogimise andmed</string>
-  <string name="auth_unauthorized">Vigane kasutajanimi /parool</string>
   <string name="auth_not_found">Sisestati vale asukoht</string>
   <string name="auth_internal">Sisemine serveri viga, kood %1$d</string>
   <string name="crashlog_message">Rakdnus suleti ootamatult. Kas sa sooviksid saata kokkujooksmise kohta teavitust arendajale?</string>
@@ -191,19 +220,46 @@
   <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_filename">placeholder.txt</string>
+  <string name="placeholder_filetype">PNG pilt</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">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>

res/values-eu/strings.xml

@@ -13,16 +13,18 @@
   <string name="main_settings">Ezarpenak</string>
   <string name="main_tit_accsetup">Konfiguratu kontua</string>
   <string name="main_wrn_accsetup"> Ez dago ownCloud konturik zure gailuan. Programa hau erabiltzeko, kontu bat sortu behar duzu.</string>
-  <string name="about_message">ownCloud Android bezeroa\n\nBertsioa: %1$s</string>
-  <string name="actionbar_sync">Birkargatu</string>
+  <string name="about_android">%1$s Android Aplikazioa</string>
+  <string name="about_version">%1$s bertsioa</string>
+  <string name="actionbar_sync">Freskatu kontua</string>
   <string name="actionbar_upload">Igo fitxategia</string>
   <string name="actionbar_upload_from_apps">Beste app-en edukia</string>
   <string name="actionbar_upload_files">Fitxategiak</string>
+  <string name="actionbar_open_with">Ireki honekin</string>
   <string name="actionbar_mkdir">Sortu karpeta</string>
   <string name="actionbar_search">Bilatu</string>
   <string name="actionbar_settings">Ezarpenak</string>
+  <string name="actionbar_see_details">Xehetasunak</string>
   <string name="prefs_category_general">Orokorra</string>
-  <string name="prefs_category_trackmydevice">Gailuaren jarraipena</string>
   <string name="prefs_add_session">Gehitu saio berria</string>
   <string name="prefs_create_img_thumbnails">Sortu irudien koadro txikiak</string>
   <string name="prefs_select_oc_account">Aukeratu kontu bat</string>
@@ -38,7 +40,12 @@
   <string name="prefs_pincode_summary">Babestu zure ownCloud bezeroa</string>
   <string name="prefs_instant_upload">Gaitu berehalako igoera</string>
   <string name="prefs_instant_upload_summary">Igo berehala kamerak ateratako argazkiak</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="prefs_log_title">Gaitu erregistroa</string>
+  <string name="prefs_log_summary">Arazoen erregistroa gordetzeko erabiltzen da</string>
+  <string name="prefs_log_title_history">Erregistro historia</string>
+  <string name="prefs_log_summary_history">Honek gordetako erregistroak bistaratzen ditu.</string>
+  <string name="prefs_log_delete_history_button">Ezabatu historia</string>
+  <string name="auth_host_url">Zerbitzariaren helbidea</string>
   <string name="auth_username">Erabiltzaile izena</string>
   <string name="auth_password">Pasahitza</string>
   <string name="auth_register">Berria naiz ownCloud-en</string>
@@ -53,6 +60,7 @@
   <string name="setup_title">Konektatu zure ownCloudera</string>
   <string name="setup_btn_connect">Konektatu</string>
   <string name="uploader_btn_upload_text">Igo</string>
+  <string name="uploader_top_message">Hautatu igoera direktorioa:</string>
   <string name="uploader_wrn_no_account_title">Ez da konturik aurkitu</string>
   <string name="uploader_wrn_no_account_text">Zure gailuan ez dago ownCloud konturik. Mesedez konfiguratu kontu bat lehenengo.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Konfiguratu</string>
@@ -69,9 +77,8 @@
   <string name="filedetails_created">Sortuta:</string>
   <string name="filedetails_modified">Aldatuta:</string>
   <string name="filedetails_download">Deskargatu</string>
-  <string name="filedetails_sync_file">Birkargatu</string>
+  <string name="filedetails_sync_file">Freskatu fitxaegia</string>
   <string name="filedetails_redownload">Birdeskargatzen</string>
-  <string name="filedetails_open">Ireki</string>
   <string name="filedetails_renamed_in_upload_msg">Fitxategiaren izena %1$sra aldatu da igotzean</string>
   <string name="common_yes">Bai</string>
   <string name="common_no">Ez</string>
@@ -82,6 +89,8 @@
   <string name="common_save_exit">Gorde eta Irten</string>
   <string name="common_exit">Utzi ownCloud</string>
   <string name="common_error">Errorea</string>
+  <string name="common_loading">Kargatzen ...</string>
+  <string name="common_error_unknown">Errore ezezaguna</string>
   <string name="about_title">Honi buruz</string>
   <string name="delete_account">Ezabatu kontua</string>
   <string name="create_account">Sortu kontua</string>
@@ -101,6 +110,7 @@
   <string name="downloader_download_succeeded_content">%1$s ongi deskargatu da</string>
   <string name="downloader_download_failed_ticker">Deskargak huts egin du</string>
   <string name="downloader_download_failed_content">%1$s fitxategiaren deskarga ezin izan da burutu</string>
+  <string name="downloader_not_downloaded_yet">Oraindik deskargatu gabe</string>
   <string name="common_choose_account">Hautatu kontua</string>
   <string name="sync_string_contacts">Kontaktuak</string>
   <string name="sync_fail_ticker">Sinkronizazioak huts egin du</string>
@@ -109,6 +119,14 @@
   <string name="sync_conflicts_in_favourites_content">sinkronizatu beharreko %1$d fitxategiak ezin dira sinkronizatu</string>
   <string name="sync_fail_in_favourites_ticker">edukien sinkronizazioak huts egin du</string>
   <string name="sync_fail_in_favourites_content">%1$d fitxategien edukiak ezin dira sinkronizatu (%2$d gatazka)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Bertako fitxategi batzuk ahaztu dira</string>
+  <string name="sync_foreign_files_forgotten_content">%2$s karpetako %1$d fitxategi ezin dira dira kopiatu</string>
+  <string name="foreign_files_move">Mugitu denak</string>
+  <string name="foreign_files_success">Fitxategi guztiak mugitu dira</string>
+  <string name="foreign_files_fail">Fitxategi batzuk ezin dira mugitu</string>
+  <string name="foreign_files_local_text">Bertakoa: %1$s</string>
+  <string name="foreign_files_remote_text">Urrunekoa: %1$s</string>
+  <string name="upload_query_move_foreign_files">Ez dago leku nahikorik hautatutako fitxategiak %1$s karpetan kopiatzeko. Nahi al duzu kopiatu ordez bertara mugitzea?</string>
   <string name="use_ssl">Erabili konexio segurua</string>
   <string name="location_no_provider">ownCloudek ezin du zure gailua jarraitu. Mesedez begiratu zure kokapen ezarpenak</string>
   <string name="pincode_enter_pin_code">Mesedez, sartu zure aplikazioaren PINa</string>
@@ -121,6 +139,26 @@
   <string name="pincode_wrong">ownCloud aplikazioaren PINa ezda zuzena</string>
   <string name="pincode_removed">ownCloud aplikazioaren PINa kendu da</string>
   <string name="pincode_stored">ownCloud aplikazioaren PINa gorde da</string>
+  <string name="media_notif_ticker">%1$s musika erreproduzigailua</string>
+  <string name="media_state_playing">%1$s (jotzen)</string>
+  <string name="media_state_loading">%1$s (kargatzen)</string>
+  <string name="media_event_done">%1$s erreprodukzioa amaitua</string>
+  <string name="media_err_nothing_to_play">Ez da euskarri fitxategia aurkitu</string>
+  <string name="media_err_no_account">Ez da konturik eman</string>
+  <string name="media_err_not_in_owncloud">Fitxategiak ez du baliozko kontu bat</string>
+  <string name="media_err_unsupported">Onartzen ez de euskarri kodeka</string>
+  <string name="media_err_io">Euskarri fitxategia ezin da bihurtu</string>
+  <string name="media_err_malformed">Euskarri fitxategia ezin da kodetu</string>
+  <string name="media_err_timeout">Denbora gehiegi erreproduzitzen saiatzen</string>
+  <string name="media_err_invalid_progressive_playback">Euskarri fitxategia ezin da jariotu</string>
+  <string name="media_err_security_ex">Segurtasun errorea %1$s erreproduzitzen saiatzean</string>
+  <string name="media_err_io_ex">Sarrera errorea %1$s erreproduzitzen saiatzean</string>
+  <string name="media_err_unexpected">Ezusteko errorea %1$s erreproduzitzen saiatzean</string>
+  <string name="media_previous_description">Aurreko pista botoia</string>
+  <string name="media_rewind_description">Atzeratu botoia</string>
+  <string name="media_play_pause_description">Erreproduzitu edo pausatu botoia</string>
+  <string name="media_forward_description">Azkar aurreratu botoia</string>
+  <string name="media_next_description">Hurrengo pista botoia</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 Minutu</item>
     <item>30 Minutu</item>
@@ -138,7 +176,7 @@
   <string name="auth_nossl_plain_ok_title">Konexio segurua ez dago eskuragarri</string>
   <string name="auth_nossl_plain_ok_message">Aplikazioak ezin izan du zerbitzariarekin konexio seguru bat ezarri. Hala ere konexio ez segurua egin daiteke. Jarraitu edo ezeztatu dezakezu.</string>
   <string name="auth_connection_established">Konexioa ezarri da</string>
-  <string name="auth_testing_connection">Konexioa probatzen...</string>
+  <string name="auth_testing_connection">Konexioa frogatzen...</string>
   <string name="auth_not_configured_title">gaizki egindako ownCloud konfigurazioa</string>
   <string name="auth_not_configured_message">Badirudi zure ownCloud instantzia ez dagoela ongi konfiguratuta. Jarri zure harremanetan administradorearkin informazio gehiago izateko.</string>
   <string name="auth_unknown_error_title">Errore ezezagun bat gertatu da</string>
@@ -154,8 +192,6 @@
   <string name="auth_bad_oc_version_title">ownCloud zerbitzari bertsio ezezaguna</string>
   <string name="auth_wrong_connection_title">Ezin izan da konexioa egin</string>
   <string name="auth_secure_connection">Konexio segurua ezarri da</string>
-  <string name="auth_login_details">Saio hasierako ezarpenak</string>
-  <string name="auth_unauthorized">Erabiltzaile / pasahitz baliogabea</string>
   <string name="auth_not_found">Okerreko bidea emanda</string>
   <string name="auth_internal">Barne zerbitzari errorea, kodea: %1$d</string>
   <string name="crashlog_message">Programa ezustekoan bukatu da. Nahiko zenuke huts egitearen berri eman?</string>
@@ -208,7 +244,11 @@
   <string name="ssl_validator_label_validity_to">Noiz arte:</string>
   <string name="ssl_validator_label_signature">Sinadura:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmoa:</string>
-  <string name="text_placeholder">Hau leku-marka da</string>
+  <string name="placeholder_sentence">Hau leku-marka da</string>
+  <string name="placeholder_filetype">PNG Irudia</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">Igo irudiak bakarrik WIFIren bidez</string>
   <string name="instant_upload_path">/BerehalakoIgoerak</string>
   <string name="conflict_title">Igoera konfliktoa</string>
@@ -216,4 +256,19 @@
   <string name="conflict_keep_both">Mantendu biak</string>
   <string name="conflict_overwrite">Gainidatzi</string>
   <string name="conflict_dont_upload">Ez igo</string>
+  <string name="preview_image_description">Irudi aurreikuspena</string>
+  <string name="preview_image_error_unknown_format">Ezin da irudi hau erakutsi</string>
+  <string name="preview_image_error_out_of_memory">\"Ez dago orrialde hau erakusteko memoria aski</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s ezin da %2$s bertako karpetara kopiatu</string>
+  <string name="actionbar_failed_instant_upload">UnekoIgoerak huts egin du\"</string>
+  <string name="failed_upload_headline_text">Uneko igoerek huts egin dute</string>
+  <string name="failed_upload_headline_hint">Huts egindako igoeren laburpena</string>
+  <string name="failed_upload_all_cb">Hautatu dena</string>
+  <string name="failed_upload_headline_retryall_btn">Berriz saiatu hautatutakoak</string>
+  <string name="failed_upload_headline_delete_all_btn">kendu hautatutakoak igoera-ilaratik</string>
+  <string name="failed_upload_retry_text">Berriz saiatu irudia igotzen:</string>
+  <string name="failed_upload_load_more_images">Kargatu irudi gehiago</string>
+  <string name="failed_upload_failure_text">Hutsegite mezua:</string>
+  <string name="failed_upload_quota_exceeded_text">Egiaztatu zure konfigurazioa, agian zure kuota muga gainditu  duzu.</string>
 </resources>

res/values-fa/strings.xml

@@ -13,77 +13,179 @@
   <string name="main_settings">تنظیمات</string>
   <string name="main_tit_accsetup">نصب حساب کاربری</string>
   <string name="main_wrn_accsetup">حساب کاربری ownCloud در دستگاه شما وجود ندارد. برای استفاده از این برنامه می‌بایست یکی ایجاد کنید.</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_category_trackmydevice">ردیابی دستگاه</string>
   <string name="prefs_add_session">ایجاد جلسه جدید</string>
   <string name="prefs_create_img_thumbnails">ایجاد پیش نمایش تصاویر</string>
   <string name="prefs_select_oc_account">انتخاب یک حساب</string>
+  <string name="prefs_summary_select_oc_account">یکی از حسابهایتان را برای استفاده ی برنامه انتخاب کنید.</string>
   <string name="prefs_trackmydevice">ردیابی دستگاه</string>
   <string name="prefs_trackmydevice_summary_off">برنامه را فعال کنید تا محل دستگاه شما پیگیری شود</string>
   <string name="prefs_trackmydevice_interval">به روز رسانی بازه</string>
+  <string name="prefs_trackmydevice_interval_summary">بروز رسانی هر %1$s دقیقه یکبار</string>
   <string name="prefs_accounts">حساب‌ها</string>
-  <string name="auth_host_url">آدرس ownCloud </string>
+  <string name="prefs_manage_accounts">مدیریت حسابها</string>
+  <string name="prefs_pincode">PIN برنامه</string>
+  <string name="prefs_instant_upload">فعال کردن بارگذاری فوری</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="auth_register">من تازه وارد %1$s شدم</string>
+  <string name="new_session_uri_error">نشانی داده شده صحیح نیست</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_title">متصل شوید به %1$s خودتان</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_text">هیچ حسابی در %1$s بر روی دستگاه شما موجود نیست.لطفا اول یک حساب ترتیب دهید.</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_error_forbidden_content">%1$s اجازه ی دسترسی به محتوای مشترک را نمی دهد</string>
   <string name="uploader_info_uploading">در حال بارگزاری</string>
   <string name="uploader_btn_create_dir_text">ایجاد دایرکتوری برای بارگذاری</string>
+  <string name="file_list_empty">هیچ فایل در این پوشه نیست.\nفایل های جدید می توانند بوسیله ی گزینه ی \"بارگزاری\" در لیست اضافه کنید.</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_redownload">بارگزاری دوباره</string>
+  <string name="filedetails_renamed_in_upload_msg">فایل در هنگام بارگزاری به %1$s تغییر نام یافت</string>
   <string name="common_yes">بله</string>
   <string name="common_no">نه</string>
   <string name="common_ok">باشه</string>
+  <string name="common_cancel_download">قطع دانلود</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_succeeded_content_single">%1$s با موفقیت بار گذاری شد</string>
+  <string name="uploader_upload_succeeded_content_multiple">فایل های %1$d با موفقیت بارگذاری شدند</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_succeeded_ticker">بارگیری موفقیت‌آمیز بود</string>
+  <string name="downloader_download_succeeded_content">%1$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="sync_conflicts_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">در اینجا %1$d تعداد فایل از لیست %2$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="upload_query_move_foreign_files">فضایی به اندازه ی کافی برای کپی کردن فایل ها در پوشه ی %1$s نیست.آیا می خواهید آنها را به جای دیگری انتقال دهید؟</string>
+  <string name="use_ssl">استفاده از ارتباط امن</string>
+  <string name="location_no_provider">%1$sدستگاه شما را نمی تواند بیابد.لطفا تنظیمات موقعیت خود را بررسی کنید</string>
+  <string name="pincode_enter_pin_code">لطفا PIN برنامه خودتان را وارد کنید</string>
+  <string name="pincode_enter_new_pin_code">لطفا PIN برنامه ی جدید خودتان را وارد کنید</string>
+  <string name="pincode_configure_your_pin">PIN برنامه را وارد کنید</string>
+  <string name="pincode_reenter_your_pincode">لطفا PIN برنامه خودتان را دوباره وارد کنید</string>
+  <string name="pincode_remove_your_pincode">PIN برنامه خودتان را حذف کنید</string>
+  <string name="pincode_mismatch">PIN های برنامه یکسان نیستند</string>
+  <string name="pincode_wrong">PIN برنامه نادرست است</string>
+  <string name="pincode_removed">PIN برنامه حذف شده است</string>
+  <string name="pincode_stored">PIN برنامه ذخیره شده است</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_no_net_conn_title">هیچ ارتباطی به شبکه موجود نیست</string>
+  <string name="auth_no_net_conn_message">هیچ شبکه ی ارتباطی ای یافت نشد، ارتباط اینترنت خودتان را بررسی کنید و دوباره امتحان کنید.</string>
+  <string name="auth_connect_anyway">ارتباط به هر طریق</string>
   <string name="auth_nossl_plain_ok_title">اتصال امن در دسترس نیست</string>
+  <string name="auth_nossl_plain_ok_message">برنامه نمی تواند یک ارتباط امن با سرور ایجاد کند. ارتباط نا امن در دسترس است.شما می تواند ادامه داده یا منصرف شوید.</string>
   <string name="auth_connection_established">اتصال برقرار شد</string>
-  <string name="auth_testing_connection">آزمایش اتصال...</string>
+  <string name="auth_not_configured_title">پیکربندی سرور ناقص است</string>
   <string name="auth_unknown_error_title">خطای ناشناخته رخ داده است!</string>
-  <string name="auth_login_details">جزئیات ورود</string>
+  <string name="auth_incorrect_path_title">نمونه ی سرور یافت نشد</string>
+  <string name="auth_bad_oc_version_title">نسخه ی سرور ناشناخته</string>
+  <string name="auth_secure_connection">ایجاد ارتباط ایمن</string>
+  <string name="auth_not_found">مسیر داده شده اشتباه است</string>
+  <string name="auth_internal">خطای سرور داخلی، کد %1$d</string>
+  <string name="crashlog_message">برنامه به شکل غیر منتظره خاتمه یافت.آیا می خواهید این مشکل را گزارش کنید؟</string>
   <string name="crashlog_send_report">ارسال گزارش</string>
   <string name="crashlog_dont_send_report">گزارش را ارسال نکن</string>
-  <string name="common_share">اشتراک‌گزاری</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_folder_alert">آیا واقعا می خواهید %1$s و محتوای آن را حذف کنید؟</string>
+  <string name="confirmation_remove_local">فقط محلی</string>
+  <string name="confirmation_remove_folder_local">فقط محتوای محلی</string>
   <string name="confirmation_remove_remote">پاک کردن از سرور</string>
+  <string name="remove_success_msg">حذف با موفقیت انجام شد</string>
+  <string name="remove_fail_msg">حذف نا موفق بود</string>
+  <string name="rename_dialog_title">نام جدید وارد کنید</string>
+  <string name="rename_server_fail_msg">نامگذاری نمی تواند به طور کامل انجام شود</string>
+  <string name="sync_file_nothing_to_do_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>
+  <string name="ssl_validator_reason_cert_not_trusted">- گواهی سرور نامعتبر است</string>
+  <string name="ssl_validator_reason_cert_expired">- گواهی سرور انقضا یافته</string>
+  <string name="ssl_validator_question">آیا می خواهید در هر صورت به این مدرک اطمینان کنید؟</string>
+  <string name="ssl_validator_not_saved">گواهی نمی تواند ذخیره شود</string>
   <string name="ssl_validator_btn_details_see">جزییات</string>
   <string name="ssl_validator_btn_details_hide">پنهان کردن</string>
+  <string name="ssl_validator_label_subject">صدور به:</string>
+  <string name="ssl_validator_label_issuer">صدور بوسیله:</string>
+  <string name="ssl_validator_label_CN">نام مشترک:</string>
+  <string name="ssl_validator_label_O">سازمان</string>
+  <string name="ssl_validator_label_OU">واحد سازمان</string>
   <string name="ssl_validator_label_C">کشور:</string>
+  <string name="ssl_validator_label_ST">ایالت</string>
+  <string name="ssl_validator_label_L">مکان:</string>
+  <string name="ssl_validator_label_validity">اعتبار:</string>
+  <string name="ssl_validator_label_validity_from">از:</string>
+  <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="instant_upload_on_wifi">تصاویر را فقط از طریق wifi بارگذاری کن</string>
+  <string name="conflict_title">بارگذاری ناسازگار</string>
+  <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>
 </resources>

res/values-fi-rFI/strings.xml

@@ -13,16 +13,18 @@
   <string name="main_settings">Asetukset</string>
   <string name="main_tit_accsetup">Aseta tili</string>
   <string name="main_wrn_accsetup">Laitteessasi ei ole ownCloud-tilejä. Luo tili käyttääksesi tätä sovellusta.</string>
-  <string name="about_message">ownCloudin Android-sovellus\n\nversio: %1$s</string>
-  <string name="actionbar_sync">Päivitä</string>
+  <string name="about_android">%1$s-Android-sovellus</string>
+  <string name="about_version">versio %1$s</string>
+  <string name="actionbar_sync">Päivitä tili</string>
   <string name="actionbar_upload">Lähetä tiedosto</string>
   <string name="actionbar_upload_from_apps">Sisältö toisista sovelluksista</string>
   <string name="actionbar_upload_files">Tiedostot</string>
+  <string name="actionbar_open_with">Avaa sovelluksella</string>
   <string name="actionbar_mkdir">Luo kansio</string>
   <string name="actionbar_search">Etsi</string>
   <string name="actionbar_settings">Asetukset</string>
+  <string name="actionbar_see_details">Tiedot</string>
   <string name="prefs_category_general">Yleiset</string>
-  <string name="prefs_category_trackmydevice">Laitteen jäljitys</string>
   <string name="prefs_add_session">Lisää uusi istunto</string>
   <string name="prefs_create_img_thumbnails">Luo kuvista pikkukuvat</string>
   <string name="prefs_select_oc_account">Valitse tili</string>
@@ -38,7 +40,8 @@
   <string name="prefs_pincode_summary">Suojaa ownCloud-asiakasohjelmasi</string>
   <string name="prefs_instant_upload">Käytä välitöntä lähetystä</string>
   <string name="prefs_instant_upload_summary">Lähetä kameralla otetut kuvat välittömästi</string>
-  <string name="auth_host_url">ownCloud-osoite</string>
+  <string name="prefs_log_delete_history_button">Poista historia</string>
+  <string name="auth_host_url">Palvelimen osoite</string>
   <string name="auth_username">Käyttäjätunnus</string>
   <string name="auth_password">Salasana</string>
   <string name="auth_register">Olen uusi ownCloudin kanssa</string>
@@ -53,6 +56,7 @@
   <string name="setup_title">Yhdistä omaan ownCloudiin</string>
   <string name="setup_btn_connect">Yhdistä</string>
   <string name="uploader_btn_upload_text">Lähetä</string>
+  <string name="uploader_top_message">Valitse lähetyskansio:</string>
   <string name="uploader_wrn_no_account_title">Tiliä ei löytynyt</string>
   <string name="uploader_wrn_no_account_text">Laitteelle ei ole asetettu ownCloud-tiliä. Luo tili ensin.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Asetukset</string>
@@ -69,9 +73,8 @@
   <string name="filedetails_created">Luotu:</string>
   <string name="filedetails_modified">Muokattu:</string>
   <string name="filedetails_download">Lataa</string>
-  <string name="filedetails_sync_file">Päivitä</string>
+  <string name="filedetails_sync_file">Päivitä tiedosto</string>
   <string name="filedetails_redownload">Lataa uudelleen</string>
-  <string name="filedetails_open">Avaa</string>
   <string name="filedetails_renamed_in_upload_msg">Tiedoston nimeksi muutettiin %1$s siirron yhteydessä</string>
   <string name="common_yes">Kyllä</string>
   <string name="common_no">Ei</string>
@@ -82,6 +85,8 @@
   <string name="common_save_exit">Tallenna ja poistu</string>
   <string name="common_exit">Jätä ownCloud</string>
   <string name="common_error">Virhe</string>
+  <string name="common_loading">Ladataan…</string>
+  <string name="common_error_unknown">Tuntematon virhe</string>
   <string name="about_title">Tietoja</string>
   <string name="delete_account">Poista tili</string>
   <string name="create_account">Luo tili</string>
@@ -109,6 +114,11 @@
   <string name="sync_conflicts_in_favourites_content">%1$d \"pidä synkronoituna\" tiedostoja ei voitu synkronoida</string>
   <string name="sync_fail_in_favourites_ticker">\"Pidä synkronoituna\" epäonnistui</string>
   <string name="sync_fail_in_favourites_content">Hakemiston %1$d tiedostoja ei voitu synkronoida (%2$d konfliktia)</string>
+  <string name="foreign_files_move">Siirrä kaikki</string>
+  <string name="foreign_files_success">Kaikki tiedostot siirrettiin</string>
+  <string name="foreign_files_fail">Joidenkin tiedostojen siirtäminen epäonnistui</string>
+  <string name="foreign_files_local_text">Paikallinen: %1$s</string>
+  <string name="foreign_files_remote_text">Etä: %1$s</string>
   <string name="use_ssl">Käytä salattua yhteyttä</string>
   <string name="location_no_provider">ownCloud ei voi jäljittää laitettasi. Tarkista laitteesi sijaintiasetukset</string>
   <string name="pincode_enter_pin_code">Aseta sovelluksesi PIN</string>
@@ -121,6 +131,15 @@
   <string name="pincode_wrong">Väärä ownCloud-sovelluksen PIN</string>
   <string name="pincode_removed">ownCloud-sovelluksen PIN poistettu</string>
   <string name="pincode_stored">ownCloud-sovelluksen PIN-koodi tallennettu</string>
+  <string name="media_state_playing">%1$s (toistetaan)</string>
+  <string name="media_state_loading">%1$s (ladataan)</string>
+  <string name="media_err_nothing_to_play">Mediatiedostoa ei löytynyt</string>
+  <string name="media_err_io">Mediatiedoston luku ei onnistunut</string>
+  <string name="media_previous_description">Edellinen kappale -painike</string>
+  <string name="media_rewind_description">Taaksepäin kelaus -painike</string>
+  <string name="media_play_pause_description">Toisto tai keskeytys -painike</string>
+  <string name="media_forward_description">Eteenpäin kelaus -painike</string>
+  <string name="media_next_description">Seuraava kappale -painike</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minuuttia</item>
     <item>30 minuuttia</item>
@@ -131,7 +150,6 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Yritetään kirjautua...</string>
   <string name="auth_no_net_conn_title">Ei verkkoyhteyttä</string>
   <string name="auth_no_net_conn_message">Verkkoyhteyttä ei havaittu. Tarkista internetyhteyden tila ja yritä uudelleen.</string>
   <string name="auth_connect_anyway">Yhdistä silti</string>
@@ -154,10 +172,9 @@
   <string name="auth_bad_oc_version_title">Tuntematon ownCloud-palvelimen versio</string>
   <string name="auth_wrong_connection_title">Yhteyden muodostus epäonnistui</string>
   <string name="auth_secure_connection">Salattu yhteys muodostettu</string>
-  <string name="auth_login_details">Kirjautumistiedot</string>
-  <string name="auth_unauthorized">Virheellinen tunnus tai salasana</string>
   <string name="auth_not_found">Väärä polku</string>
   <string name="auth_internal">Sisäinen palvelinvirhe, koodi %1$d</string>
+  <string name="auth_wtf_reenter_URL">Odottamaton tila; anna palvelimen osoite uudelleen</string>
   <string name="crashlog_message">Sovellus sulkeutui yllättäen. Haluatko lähettää vikailmoituksen?</string>
   <string name="crashlog_send_report">Lähetä ilmoitus</string>
   <string name="crashlog_dont_send_report">Älä lähetä ilmoitusta</string>
@@ -184,6 +201,8 @@
   <string name="wait_a_moment">Odota hetki</string>
   <string name="filedisplay_unexpected_bad_get_content">Odottamaton ongelma; kokeile valita tiedosto toisella sovelluksella</string>
   <string name="filedisplay_no_file_selected">Tiedostoa ei valittu</string>
+  <string name="oauth_check_onoff">Kirjaudu oAuth2:lla.</string>
+  <string name="oauth_login_connection">Yhdistetään oAuth2-palvelimeen…</string>
   <string name="ssl_validator_title">Varoitus</string>
   <string name="ssl_validator_header">Sivuston identiteetin vahvistaminen ei onnistunut</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Palvelimen varmenteeseen ei luoteta</string>
@@ -208,7 +227,7 @@
   <string name="ssl_validator_label_validity_to">Päättyen:</string>
   <string name="ssl_validator_label_signature">Allekirjoitus:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmi:</string>
-  <string name="text_placeholder">Tämä on paikkavaraus</string>
+  <string name="placeholder_filetype">PNG-kuva</string>
   <string name="instant_upload_on_wifi">Lähetä kuvat vain WiFi-verkossa</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Päivitysristiriita</string>
@@ -216,4 +235,10 @@
   <string name="conflict_keep_both">Säilytä molemmat</string>
   <string name="conflict_overwrite">Korvaa</string>
   <string name="conflict_dont_upload">Älä lähetä</string>
+  <string name="preview_image_error_unknown_format">Kuvaa ei voi näyttää</string>
+  <string name="preview_image_error_out_of_memory">\"Muisti ei riitä tämän kuvan näyttämiseen</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="failed_upload_all_cb">valitse kaikki</string>
+  <string name="failed_upload_headline_retryall_btn">yritä uudelleen kaikkia valittuja</string>
+  <string name="failed_upload_failure_text">Virheviesti:</string>
 </resources>

res/values-fr/strings.xml

@@ -13,16 +13,18 @@
   <string name="main_settings">Paramètres</string>
   <string name="main_tit_accsetup">Paramètres du compte</string>
   <string name="main_wrn_accsetup">Aucun compte ownCloud n\'est encore paramétré. Pour utiliser cette application, il vous faut en ajouter un.</string>
-  <string name="about_message">client ownCloud pour Android\n\nversion : %1$s</string>
-  <string name="actionbar_sync">Synchronisation du compte</string>
+  <string name="about_android">%1$s Android App</string>
+  <string name="about_version">version %1$s</string>
+  <string name="actionbar_sync">Actualiser le compte</string>
   <string name="actionbar_upload">Téléverser un fichier</string>
   <string name="actionbar_upload_from_apps">Contenu d\'une autre application</string>
   <string name="actionbar_upload_files">Fichiers</string>
+  <string name="actionbar_open_with">Ouvrir avec</string>
   <string name="actionbar_mkdir">Créer un répertoire</string>
   <string name="actionbar_search">Rechercher</string>
   <string name="actionbar_settings">Paramètres</string>
+  <string name="actionbar_see_details">Détails</string>
   <string name="prefs_category_general">Généraux</string>
-  <string name="prefs_category_trackmydevice">Traçage de l\'appareil</string>
   <string name="prefs_add_session">Ajouter une nouvelle session</string>
   <string name="prefs_create_img_thumbnails">Créer les miniatures</string>
   <string name="prefs_select_oc_account">Sélectionnez un compte</string>
@@ -38,7 +40,12 @@
   <string name="prefs_pincode_summary">Protéger l\'accès aux données maniplulées par le client ownCloud</string>
   <string name="prefs_instant_upload">Activer le téléversement instantané</string>
   <string name="prefs_instant_upload_summary">Import instantané des photos prises par la caméra</string>
-  <string name="auth_host_url">URL ownCloud</string>
+  <string name="prefs_log_title">Activer les logs</string>
+  <string name="prefs_log_summary">Utilisé pour enregistrer les problèmes dans les logs</string>
+  <string name="prefs_log_title_history">Historique des logs</string>
+  <string name="prefs_log_summary_history">Cela affiche les logs enregistrés</string>
+  <string name="prefs_log_delete_history_button">Supprimer l\'historique</string>
+  <string name="auth_host_url">Adresse du serveur</string>
   <string name="auth_username">Nom d\'utilisateur</string>
   <string name="auth_password">Mot de passe</string>
   <string name="auth_register">Je suis nouveau sur ownCloud</string>
@@ -53,6 +60,7 @@
   <string name="setup_title">Me connecter à mon ownCloud</string>
   <string name="setup_btn_connect">Connecter</string>
   <string name="uploader_btn_upload_text">Téléverser</string>
+  <string name="uploader_top_message">Choisissez le répertoire de destination:</string>
   <string name="uploader_wrn_no_account_title">Aucun compte n\'a été trouvé</string>
   <string name="uploader_wrn_no_account_text">Aucun compte ownCloud n\'a été trouvé. Veuillez commencer par en configurer un.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Paramètres</string>
@@ -69,9 +77,8 @@
   <string name="filedetails_created">Créé le :</string>
   <string name="filedetails_modified">Modifié le :</string>
   <string name="filedetails_download">Télécharger</string>
-  <string name="filedetails_sync_file">Rafraîchir</string>
+  <string name="filedetails_sync_file">Actualiser le fichier</string>
   <string name="filedetails_redownload">Télécharger à nouveau</string>
-  <string name="filedetails_open">Ouvrir</string>
   <string name="filedetails_renamed_in_upload_msg">Le fichier a été renommé en %s pendant le téléversement</string>
   <string name="common_yes">Oui</string>
   <string name="common_no">Non</string>
@@ -82,6 +89,8 @@
   <string name="common_save_exit">Sauvegarder &amp; Quitter</string>
   <string name="common_exit">Quitter ownCloud</string>
   <string name="common_error">Erreur</string>
+  <string name="common_loading">Chargement ...</string>
+  <string name="common_error_unknown">Erreur Inconnue </string>
   <string name="about_title">À propos de</string>
   <string name="delete_account">Effacer ce compte</string>
   <string name="create_account">Créer un compte</string>
@@ -101,14 +110,25 @@
   <string name="downloader_download_succeeded_content">%1$s a été téléchargé avec succès</string>
   <string name="downloader_download_failed_ticker">Le téléchargement a échoué</string>
   <string name="downloader_download_failed_content">Le téléchargement de %1$s a échoué</string>
+  <string name="downloader_not_downloaded_yet">Pas encore téléchargé</string>
   <string name="common_choose_account">Choisissez un compte</string>
   <string name="sync_string_contacts">Contacts</string>
   <string name="sync_fail_ticker">La synchronisation a échoué</string>
   <string name="sync_fail_content">La synchronisation de %1$s ne peut pas être complétée</string>
+  <string name="sync_fail_content_unauthorized">Paramètres d\'identification invalides pour %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Des conflits ont été trouvés</string>
   <string name="sync_conflicts_in_favourites_content">%1$d fichiers à garder synchronisés n\'ont put être synchronisé</string>
   <string name="sync_fail_in_favourites_ticker">La synchronisation des fichiers a échoué</string>
   <string name="sync_fail_in_favourites_content">Le contenu de %1$d fichiers n\'a put être synchronisé (%2$d conflits)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Certains fichiers locaux ont été oubliés</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d fichiers du dossier %2$s n\'ont pas pu être copiés dans</string>
+  <string name="sync_foreign_files_forgotten_explanation">Depuis la version 1.3.16, les fichiers téléversés depuis cet équipement sont copiés dans le dossier local %1$s pour éviter toute perte de données lorsqu\'un fichier est synchronisé avec plusieurs comptes.\n\nEn raison de ce changement, tous les fichiers téléversés avec une version antérieure de cette application étaient copiés dans le dossier %2$s. Cependant, une erreur empêchait l\'achèvement de cette opération pendant la synchronisation. Vous pouvez soit laisser les fichiers tels quels et supprimer le lien à %3$s, soit déplacer les fichiers dans le dossier %1$s et garder le lien vers %4$s.\n\nCi-dessous la liste des fichiers locaux, et les fichiers distants de %5$s auxquels ils étaient liés.</string>
+  <string name="foreign_files_move">Tout déplacer</string>
+  <string name="foreign_files_success">Tous les fichiers ont été déplacés</string>
+  <string name="foreign_files_fail">Certains fichiers n\'ont pu être déplacés</string>
+  <string name="foreign_files_local_text">Local: %1$s</string>
+  <string name="foreign_files_remote_text">Distant: %1$s</string>
+  <string name="upload_query_move_foreign_files">Il n\'y a pas assez de place disponible pour copier les fichiers sélectionnés dans le dossier %1$s. Voulez-vous les déplacer à la place ?</string>
   <string name="use_ssl">Utiliser une connexion sécurisée</string>
   <string name="location_no_provider">ownCloud ne peut pister votre appareil, veuillez vérifier vos paramètres de localisation</string>
   <string name="pincode_enter_pin_code">Veuillez saisir votre code de sécurité</string>
@@ -121,6 +141,27 @@
   <string name="pincode_wrong">code de sécurité ownCloud incorrect</string>
   <string name="pincode_removed">code de sécurité ownCloud retiré</string>
   <string name="pincode_stored">code de sécurité ownCloud enregistré</string>
+  <string name="media_notif_ticker">%1$s lecteur de musique</string>
+  <string name="media_state_playing">%1$s (lecture)</string>
+  <string name="media_state_loading">%1$s (chargement)</string>
+  <string name="media_event_done">%1$s pourcentage de lecture finie</string>
+  <string name="media_err_nothing_to_play">Fichier média introuvable </string>
+  <string name="media_err_no_account">Aucun compte n\'a été trouvé</string>
+  <string name="media_err_not_in_owncloud">Le fichier n\'est pas dans un compte valide</string>
+  <string name="media_err_unsupported">Le codec de ce média n\'est pas supporté </string>
+  <string name="media_err_io">Le fichier média ne peut pas être lu</string>
+  <string name="media_err_malformed">Le fichier média n\'est pas correctement encodé</string>
+  <string name="media_err_timeout">Trop de temps a essayer de jouer</string>
+  <string name="media_err_invalid_progressive_playback">Le fichier média ne peut pas être diffusé</string>
+  <string name="media_err_unknown">Fichier média ne peut être joué avec le stock de media player</string>
+  <string name="media_err_security_ex">taux %1$s erreurs de sécurité essayant de jouer</string>
+  <string name="media_err_io_ex">Taux %1$s d\'erreurs de saisie essayant de jouer</string>
+  <string name="media_err_unexpected">Taux %1$s d\'erreurs inattendues essayant de jouer</string>
+  <string name="media_previous_description">Chanson précédente</string>
+  <string name="media_rewind_description">Bouton de rem-bobinage</string>
+  <string name="media_play_pause_description">Bouton de Lecture ou de Pause</string>
+  <string name="media_forward_description">Bouton d\'avance rapide</string>
+  <string name="media_next_description">Chanson suivante</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minutes</item>
     <item>30 minutes</item>
@@ -131,14 +172,14 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Tentative de connexion …</string>
+  <string name="auth_trying_to_login">Connexion en cours...</string>
   <string name="auth_no_net_conn_title">Pas de connexion réseau</string>
   <string name="auth_no_net_conn_message">Aucune connexion réseau n\'a été trouvée, veuillez vérifier votre connectivité à internet puis réessayez.</string>
   <string name="auth_connect_anyway">Se connecter malgré tout</string>
   <string name="auth_nossl_plain_ok_title">Connexion sécurisée non disponible</string>
   <string name="auth_nossl_plain_ok_message">L\'application ne peut établir de connexion sécurisée avec le serveur. Cependant, une connexion non sécurisée est disponible. Vous pouvez continuer en utilisant celle-ci ou annuler.</string>
   <string name="auth_connection_established">Connexion établie</string>
-  <string name="auth_testing_connection">Test de la connexion…</string>
+  <string name="auth_testing_connection">Test de la connexion en cours...</string>
   <string name="auth_not_configured_title">Configuration ownCloud erronée</string>
   <string name="auth_not_configured_message">Il semblerait que votre instance ownCloud ne soit pas correctement configurée. Veuillez contacter votre administrateur pour plus de détails.</string>
   <string name="auth_unknown_error_title">Une erreur inconnue s\'est produite</string>
@@ -154,10 +195,14 @@
   <string name="auth_bad_oc_version_title">La version ownCloud du serveur n\'est pas reconnue</string>
   <string name="auth_wrong_connection_title">Impossible d\'établir la connexion</string>
   <string name="auth_secure_connection">Connexion sécurisée établie</string>
-  <string name="auth_login_details">Détails des informations de connexion</string>
-  <string name="auth_unauthorized">Login / mot de passe invalides</string>
+  <string name="auth_unauthorized">Paramètres d\'identification invalides</string>
+  <string name="auth_oauth_error">Echec d\'autorisation</string>
+  <string name="auth_oauth_error_access_denied">Accès refusé par le serveur d\'autorisation</string>
   <string name="auth_not_found">Le chemin fourni est erroné</string>
   <string name="auth_internal">Erreur interne du serveur, code %1$d</string>
+  <string name="auth_wtf_reenter_URL">État inattendu ; veuillez entrer à nouveau l\'URL du serveur</string>
+  <string name="auth_expired_oauth_token_toast">Votre autorisation a expiré.\nVeuillez procéder à nouveau à une autorisation</string>
+  <string name="auth_expired_basic_auth_toast">Vos paramètres d\'identifications sauvegardés sont invalides.\nVeuillez entrer les paramètres d\'identification courant.</string>
   <string name="crashlog_message">L\'application s\'est fermée de façon inattendue, voulez-vous envoyer un rapport d\'erreur ?</string>
   <string name="crashlog_send_report">Envoyer un rapport</string>
   <string name="crashlog_dont_send_report">Ne rien envoyer</string>
@@ -184,6 +229,11 @@
   <string name="wait_a_moment">Veuillez patienter</string>
   <string name="filedisplay_unexpected_bad_get_content">Problème inattendu ; veuillez essayer une autre app pour la sélection du fichier</string>
   <string name="filedisplay_no_file_selected">Aucun fichier sélectionné</string>
+  <string name="oauth_host_url">URL d\'aAuth2</string>
+  <string name="oauth_check_onoff">Connexion avec aAuth2.</string>
+  <string name="oauth_login_connection">Connexion au serveur aAuth2...</string>
+  <string name="oauth_code_validation_message">Veuillez ouvrir un navigateur web et dirigez-vous à l\'adresse :\n%1$s.\nPuis validez ce code :\n%2$s</string>
+  <string name="oauth_connection_url_unavailable">Connexion impossible à cet URL.</string>
   <string name="ssl_validator_title">Attention</string>
   <string name="ssl_validator_header">L\'identité du site ne peut être vérifiée</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Le certificat du serveur n\'est pas sûr</string>
@@ -208,7 +258,12 @@
   <string name="ssl_validator_label_validity_to">À :</string>
   <string name="ssl_validator_label_signature">Signature :</string>
   <string name="ssl_validator_label_signature_algorithm">Algorithme :</string>
-  <string name="text_placeholder">Ceci est un espace réservé</string>
+  <string name="placeholder_sentence">Ceci est un espace réservé</string>
+  <string name="placeholder_filename">placeholder.txt</string>
+  <string name="placeholder_filetype">Image PNG</string>
+  <string name="placeholder_filesize">389 Ko</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">Ne téléverser les images que via une connexion WiFi</string>
   <string name="instant_upload_path">/TéléversementInstantané</string>
   <string name="conflict_title">Conflit de mise à jour</string>
@@ -216,4 +271,20 @@
   <string name="conflict_keep_both">Garder les deux versions</string>
   <string name="conflict_overwrite">Écraser</string>
   <string name="conflict_dont_upload">Ne pas téléverser</string>
+  <string name="preview_image_description">Prévisualisation de l\'image</string>
+  <string name="preview_image_error_unknown_format">Cette image ne peut pas être affichée</string>
+  <string name="preview_image_error_out_of_memory">\"Mémoire insuffisante pour afficher cette image</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s n\'a pas pu être copié vers le dossier local suivant %2$s</string>
+  <string name="actionbar_failed_instant_upload">Téléchargement instantané échoué</string>
+  <string name="failed_upload_headline_text">Téléchargements instantanés échoués</string>
+  <string name="failed_upload_headline_hint">Résumé de tous les téléchargements instantanés échoués</string>
+  <string name="failed_upload_all_cb">Tous sélectionner</string>
+  <string name="failed_upload_headline_retryall_btn">réessayer de tous sélectionner</string>
+  <string name="failed_upload_headline_delete_all_btn">Supprimez tous les sélectionnés de la file d\'attente de téléchargement</string>
+  <string name="failed_upload_retry_text">Ré-essayer de charger l\'image:</string>
+  <string name="failed_upload_load_more_images">Charger plus d\'images</string>
+  <string name="failed_upload_retry_do_nothing_text">Ne rien faire vous n\'êtes pas connecté pour le téléchargement instantané</string>
+  <string name="failed_upload_failure_text">Message d\'échec:</string>
+  <string name="failed_upload_quota_exceeded_text">Veuillez vérifier la configuration de votre serveur, peut-être que votre quota est dépassé.</string>
 </resources>

res/values-gl/strings.xml

@@ -13,16 +13,18 @@
   <string name="main_settings">Preferencias</string>
   <string name="main_tit_accsetup">Activar a conta</string>
   <string name="main_wrn_accsetup">Non hai ningunha conta configurada no seu dispositivo. Para empregar o aplicativo necesita crear unha.</string>
-  <string name="about_message">O aplicativo  %1$s para Android\n\nversión: %2$s</string>
-  <string name="actionbar_sync">Actualizar</string>
+  <string name="about_android">Aplicativo Android %1$s</string>
+  <string name="about_version">versión %1$s</string>
+  <string name="actionbar_sync">Actualizar a conta</string>
   <string name="actionbar_upload">Enviar</string>
   <string name="actionbar_upload_from_apps">Contido doutros aplicativos</string>
   <string name="actionbar_upload_files">Ficheiros</string>
+  <string name="actionbar_open_with">Abrir con</string>
   <string name="actionbar_mkdir">Crear un directorio</string>
   <string name="actionbar_search">Buscar</string>
   <string name="actionbar_settings">Preferencias</string>
+  <string name="actionbar_see_details">Detalles</string>
   <string name="prefs_category_general">Xeral</string>
-  <string name="prefs_category_trackmydevice">Seguimento do dispositivo</string>
   <string name="prefs_add_session">Engadir unha nova sesión</string>
   <string name="prefs_create_img_thumbnails">Crear miniaturas das imaxes</string>
   <string name="prefs_select_oc_account">Escoller unha conta</string>
@@ -38,7 +40,12 @@
   <string name="prefs_pincode_summary">Protexe o seu cliente</string>
   <string name="prefs_instant_upload">Activar o envío instantáneo</string>
   <string name="prefs_instant_upload_summary">Enviar instantaneamente as fotos tiradas coa cámara</string>
-  <string name="auth_host_url">URL</string>
+  <string name="prefs_log_title">Activar o rexistro</string>
+  <string name="prefs_log_summary">Isto empregase para rexistrar os problemas</string>
+  <string name="prefs_log_title_history">Historial do rexistro</string>
+  <string name="prefs_log_summary_history">Isto amosa os rexistros gravados</string>
+  <string name="prefs_log_delete_history_button">Eliminar o historial</string>
+  <string name="auth_host_url">Enderezo do servidor</string>
   <string name="auth_username">Nome de usuario</string>
   <string name="auth_password">Contrasinal</string>
   <string name="auth_register">Son novo en  %1$s</string>
@@ -53,6 +60,7 @@
   <string name="setup_title">Conectar co seu %1$s</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Enviar</string>
+  <string name="uploader_top_message">Escolla o directorio para o envío:</string>
   <string name="uploader_wrn_no_account_title">Non se atoparon contas</string>
   <string name="uploader_wrn_no_account_text">Non hai contas de %1$s no seu dispositivo. Cree unha nova conta primeiro.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Instalación</string>
@@ -69,9 +77,8 @@
   <string name="filedetails_created">Creado:</string>
   <string name="filedetails_modified">Modificado:</string>
   <string name="filedetails_download">Descargar</string>
-  <string name="filedetails_sync_file">Actualizar</string>
+  <string name="filedetails_sync_file">Actualizar o ficheiro</string>
   <string name="filedetails_redownload">Descargar de novo</string>
-  <string name="filedetails_open">Abrir</string>
   <string name="filedetails_renamed_in_upload_msg">O ficheiro foi renomeado a %1$s durante o envío</string>
   <string name="common_yes">Si</string>
   <string name="common_no">Non</string>
@@ -82,6 +89,8 @@
   <string name="common_save_exit">Gardar e saír</string>
   <string name="common_exit">Abandonar %1$s</string>
   <string name="common_error">Erro</string>
+  <string name="common_loading">Cargando ...</string>
+  <string name="common_error_unknown">Produciuse un erro descoñecido</string>
   <string name="about_title">Sobre</string>
   <string name="delete_account">Eliminar a conta</string>
   <string name="create_account">Crear unha conta</string>
@@ -101,14 +110,25 @@
   <string name="downloader_download_succeeded_content">%1$s descargouse correctamente</string>
   <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="common_choose_account">Escoller unha conta</string>
   <string name="sync_string_contacts">Contactos</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>
+  <string name="sync_fail_content_unauthorized">Credenciais incorrectas para %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Atopáronse conflictos</string>
-  <string name="sync_conflicts_in_favourites_content">Non foi posíbel sincronizar %1$d ficheiros «kept-in-sync»</string>
-  <string name="sync_fail_in_favourites_ticker">Produciuse un fallou ao sincronizar ficheiros «kept-in-sync»</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d ficheiros «manter sincronizados» non foi posíbel sincronizalos</string>
+  <string name="sync_fail_in_favourites_ticker">Produciuse unha falla no mantemento sincronizado de ficheiros</string>
   <string name="sync_fail_in_favourites_content">Non foi posíbel sincronizar o contido de %1$d ficheiros (%2$d conflitos)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Algúns ficheiros locais foron esquecidos</string>
+  <string name="sync_foreign_files_forgotten_content">Non é posíbel copiar %1$d ficheiros do directorio %2$s en</string>
+  <string name="sync_foreign_files_forgotten_explanation">Desde a versión 1.3.16, os ficheiros enviados desde este dispositivo cópianse no cartafol local %1$s para evitar a perda de datos cando se sincroniza un ficheiro con varias contas.\n\nPor mor deste cambio, todos os ficheiros enviados nas versións anteriores deste aplicativo cópianse no cartafol %2$s. Porén, un erro impediu a finalización desta operación durante a sincronización da conta. É posíbel deixar o(s) ficheiro(s) como está(n) e retirar a ligazón a %3$s, ou mover o(s) ficheiro(s) ao directorio %1$s e manter a ligazón a %4$s.\n\nA seguir enuméranse o(s) fichero(s) local(is), e o(s) fichero(s) remoto(s) en %5$s co(s) que estaba(n) ligados.</string>
+  <string name="foreign_files_move">Mover todo</string>
+  <string name="foreign_files_success">Foron movidos todos os ficheiros</string>
+  <string name="foreign_files_fail">Algúns ficheiros non puideron seren movidos</string>
+  <string name="foreign_files_local_text">Local: %1$s</string>
+  <string name="foreign_files_remote_text">Remoto: %1$s</string>
+  <string name="upload_query_move_foreign_files">Non hai espazo abondo para copiar os ficheiros seleccionados no cartafol %1$s. Quere movelos no canto de copialos?</string>
   <string name="use_ssl">Empregar a conexión segura</string>
   <string name="location_no_provider">%1$s non pode rastrexar o seu dispositivo. Comprobe as configuracións de localización.</string>
   <string name="pincode_enter_pin_code">Insira o seu PIN do aplicativo</string>
@@ -121,6 +141,27 @@
   <string name="pincode_wrong">PIN do aplicativo incorrecto</string>
   <string name="pincode_removed">O PIN do aplicativo foi retirado</string>
   <string name="pincode_stored">Almacenouse o PIN do aplicativo</string>
+  <string name="media_notif_ticker">%1$s reprodutor musical</string>
+  <string name="media_state_playing">%1$s (reproducindo)</string>
+  <string name="media_state_loading">%1$s (cargando)</string>
+  <string name="media_event_done">Rematou a reprodución de %1$s</string>
+  <string name="media_err_nothing_to_play">Non se atopan ficheiros multimedia</string>
+  <string name="media_err_no_account">Non foi fornecida unha conta</string>
+  <string name="media_err_not_in_owncloud">O ficheiro non está nunha conta axeitada</string>
+  <string name="media_err_unsupported">Códec multimedia non admitido</string>
+  <string name="media_err_io">Non é posíbel ler o ficheiro multimedia</string>
+  <string name="media_err_malformed">O ficheiro multimedia non está codificado correctamente</string>
+  <string name="media_err_timeout">Tempo de máis tentando reproducir</string>
+  <string name="media_err_invalid_progressive_playback">Non é posíbel enviar como fluxo o ficheiro multimedia</string>
+  <string name="media_err_unknown">Non é posíbel reproducir o ficheiro multimedia co reprodutor «stock»</string>
+  <string name="media_err_security_ex">Produciuse un erro de seguranza tentando reproducir %1$s</string>
+  <string name="media_err_io_ex">Produciuse un erro de entrada tentando reproducir %1$s</string>
+  <string name="media_err_unexpected">Produciuse un erro non agardado tentando reproducir %1$s</string>
+  <string name="media_previous_description">Botón de pista anterior</string>
+  <string name="media_rewind_description">Botón de retroceso</string>
+  <string name="media_play_pause_description">Botón de reprodución/pausa</string>
+  <string name="media_forward_description">Botón de avance rápido</string>
+  <string name="media_next_description">Botón de pista seguinte</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minutos</item>
     <item>30 minutos</item>
@@ -131,14 +172,14 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Tentando acceder…</string>
+  <string name="auth_trying_to_login">Tentando acceder...</string>
   <string name="auth_no_net_conn_title">Sen conexión de rede</string>
   <string name="auth_no_net_conn_message">Non se detectaron conexións de rede. Comprobe a conexión a Internet e tenteo de novo.</string>
   <string name="auth_connect_anyway">Conectar igualmente</string>
   <string name="auth_nossl_plain_ok_title">Non hai conexión seguras dispoñíbeis.</string>
   <string name="auth_nossl_plain_ok_message">O aplicativo non puido facer unha conexión segura co servidor. Inda que non é segura, hai unha conexión posíbel. Pode continuar ou cancelala.</string>
   <string name="auth_connection_established">Estabeleceuse a conexión</string>
-  <string name="auth_testing_connection">Comprobando a conexión…</string>
+  <string name="auth_testing_connection">Probando a conexión...</string>
   <string name="auth_not_configured_title">Configuración errada do servidor</string>
   <string name="auth_not_configured_message">Semella que a súa instancia do servidor non está configurada correctamente. Contacte co seu administrador para máis detalles.</string>
   <string name="auth_unknown_error_title">Produciuse un erro descoñecido!</string>
@@ -154,10 +195,14 @@
   <string name="auth_bad_oc_version_title">Versión do servidor non recoñecida</string>
   <string name="auth_wrong_connection_title">Non é posíbel estabelecer a conexión</string>
   <string name="auth_secure_connection">Estabeleceuse unha conexión segura</string>
-  <string name="auth_login_details">Detalles do acceso</string>
-  <string name="auth_unauthorized">Usuario ou contrasinal incorrectos</string>
+  <string name="auth_unauthorized">Credenciais incorrectas</string>
+  <string name="auth_oauth_error">A autorización non foi aceptada</string>
+  <string name="auth_oauth_error_access_denied">O acceso foi denegado polo servidor de autorización</string>
   <string name="auth_not_found">Deuse unha ruta incorrecta</string>
   <string name="auth_internal">Produciuse un erro interno do servidor, código %1$d</string>
+  <string name="auth_wtf_reenter_URL">Estado inesperado, introduza de novo o enderezo URL do servidor</string>
+  <string name="auth_expired_oauth_token_toast">A súa autorización caducou.\nAutorícese de novo</string>
+  <string name="auth_expired_basic_auth_toast">Os seus credenciais gardados son incorrectos.\nIntroduza os seus credenciais actuais</string>
   <string name="crashlog_message">O aplicativo deixou de funcionar de xeito inesperado. Quere enviar un informe desta quebra?</string>
   <string name="crashlog_send_report">Enviar un informe</string>
   <string name="crashlog_dont_send_report">Non enviar un informe</string>
@@ -184,6 +229,11 @@
   <string name="wait_a_moment">Agarde un chisco</string>
   <string name="filedisplay_unexpected_bad_get_content">Produciuse un erro non agardado. Seleccione o ficheiro con outro aplicativo diferente</string>
   <string name="filedisplay_no_file_selected">Non se escolleu ningún ficheiro</string>
+  <string name="oauth_host_url">URL do oAuth2</string>
+  <string name="oauth_check_onoff">Acceder con oAuth2.</string>
+  <string name="oauth_login_connection">Conectando co servidor oAuth2…</string>
+  <string name="oauth_code_validation_message">Abra un navegador  web e vaia a:\n%1$s.\nValide alí este código:\n%2$s</string>
+  <string name="oauth_connection_url_unavailable">Non está dispoñíbel a conexión con este URL</string>
   <string name="ssl_validator_title">Aviso</string>
   <string name="ssl_validator_header">Non foi posíbel verificar a identidade do sitio</string>
   <string name="ssl_validator_reason_cert_not_trusted">- O certificado do servidor non é de confianza</string>
@@ -208,7 +258,12 @@
   <string name="ssl_validator_label_validity_to">A:</string>
   <string name="ssl_validator_label_signature">Sinatura:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
-  <string name="text_placeholder">Isto é unha marca de posición</string>
+  <string name="placeholder_sentence">Isto é un marcador de posición</string>
+  <string name="placeholder_filename">marcador_de_posición.txt</string>
+  <string name="placeholder_filetype">Imaxe 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">Enviar imaxes só medinte WiFi</string>
   <string name="instant_upload_path">/EnvíoInstantáneo</string>
   <string name="conflict_title">Conflito de actualización</string>
@@ -216,4 +271,20 @@
   <string name="conflict_keep_both">Manter ambos</string>
   <string name="conflict_overwrite">Sobrescribir</string>
   <string name="conflict_dont_upload">Non enviar</string>
+  <string name="preview_image_description">Vista previa da imaxe</string>
+  <string name="preview_image_error_unknown_format">Esta imaxe non pode ser amosada</string>
+  <string name="preview_image_error_out_of_memory">«Non hai memoria abondo para amosar esta imaxe</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">Non foi posíbel copiar %1$s no directorio local %2$s</string>
+  <string name="actionbar_failed_instant_upload">produciuse un fallo de EnvíoInstantáneo»</string>
+  <string name="failed_upload_headline_text">Envíos instantáneos fallados</string>
+  <string name="failed_upload_headline_hint">Resumo de todos os envíos instantáneos fallados</string>
+  <string name="failed_upload_all_cb">seleccionar todo</string>
+  <string name="failed_upload_headline_retryall_btn">tentar de novo todo o seleccionado</string>
+  <string name="failed_upload_headline_delete_all_btn">eliminar todo o seleccionado da cola de envío</string>
+  <string name="failed_upload_retry_text">tentar de novo o envío da imaxe:</string>
+  <string name="failed_upload_load_more_images">Cargar máis imaxes</string>
+  <string name="failed_upload_retry_do_nothing_text">non facer nada que non estea en liña para o envío instantáneo</string>
+  <string name="failed_upload_failure_text">Mensaxe de fallo:</string>
+  <string name="failed_upload_quota_exceeded_text">Comprobe a configuración do seu servidor. é probábel que xa excedera a cota.</string>
 </resources>

res/values-he/strings.xml

@@ -13,16 +13,14 @@
   <string name="main_settings">הגדרות</string>
   <string name="main_tit_accsetup">הגדרת חשבון</string>
   <string name="main_wrn_accsetup">לא הוגדר חשבון בהתקן שלך. כדי להשתמש ביישום זה עליך ליצור אחד.</string>
-  <string name="about_message">יישום האנדרויד של %1$s\n\nגרסה: %2$s</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="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>
@@ -38,7 +36,7 @@
   <string name="prefs_pincode_summary">הגנה על הלקוח שלך</string>
   <string name="prefs_instant_upload">הפעלת העלאות מהירות</string>
   <string name="prefs_instant_upload_summary">העלאה מהירה של תמונות שמצולמות במצלמה שלך</string>
-  <string name="auth_host_url">כתובת</string>
+  <string name="auth_host_url">כתובת שרת</string>
   <string name="auth_username">שם משתמש</string>
   <string name="auth_password">ססמה</string>
   <string name="auth_register">%1$s חדש לי</string>
@@ -53,6 +51,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>
@@ -69,9 +68,7 @@
   <string name="filedetails_created">מועד היצירה:</string>
   <string name="filedetails_modified">מועד השינוי:</string>
   <string name="filedetails_download">הורדה</string>
-  <string name="filedetails_sync_file">רענון</string>
   <string name="filedetails_redownload">הורדה מחדש</string>
-  <string name="filedetails_open">פתיחה</string>
   <string name="filedetails_renamed_in_upload_msg">שם הקובץ השתנה ל־ %1$s במהלך ההעלאה</string>
   <string name="common_yes">כן</string>
   <string name="common_no">לא</string>
@@ -82,6 +79,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 +108,12 @@
   <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_fail">לא ניתן להעביר חלק מהקבצים</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 +126,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>
@@ -131,14 +144,12 @@
     <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_no_net_conn_message">לא נבחר חיבור לאינטרנט, נא לבדוק את החיבור שלך לאינטרנט ולנסות שוב.</string>
   <string name="auth_connect_anyway">להתחבר בכל זאת</string>
   <string name="auth_nossl_plain_ok_title">אין חיבור מוצפן זמין.</string>
   <string name="auth_nossl_plain_ok_message">היישום לא יכול לקיים חיבור מאובטח לשרת. עם זאת קיים חיבור שאינו מאובטח. ניתן להמשיך או לבטל.</string>
   <string name="auth_connection_established">החיבור נוצר</string>
-  <string name="auth_testing_connection">החיבור נבדק…</string>
   <string name="auth_not_configured_title">תצורת השרת פגומה</string>
   <string name="auth_not_configured_message">מסתבר כי עותק השרת שלך אינו מוגדר נכון. נא ליצור קשר עם המנהל שלך לקבלת פרטים נוספים.</string>
   <string name="auth_unknown_error_title">אירעה שגיאה בלתי ידועה!</string>
@@ -154,8 +165,6 @@
   <string name="auth_bad_oc_version_title">גרסה השרת אינה מזוהה</string>
   <string name="auth_wrong_connection_title">לא ניתן ליצור את החיבור</string>
   <string name="auth_secure_connection">נוצר חיבור מאובטח</string>
-  <string name="auth_login_details">פרטי הכניסה</string>
-  <string name="auth_unauthorized">שם משתמש / ססמה שגויים</string>
   <string name="auth_not_found">הנתיב שצוין שגוי</string>
   <string name="auth_internal">שגיאת שרת פנימית, קוד </string>
   <string name="crashlog_message">היישום הושבת באופן בלתי צפוי. האם לשלוח דוח קריסה?</string>
@@ -208,7 +217,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 +227,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>

res/values-hi/strings.xml

@@ -6,4 +6,6 @@
   <string name="auth_password">पासवर्ड</string>
   <string name="setup_hint_username">प्रयोक्ता का नाम</string>
   <string name="setup_hint_password">पासवर्ड</string>
+  <string name="common_share">साझा करें</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-hr/strings.xml

@@ -10,7 +10,6 @@
   <string name="main_calendar">Kalendar</string>
   <string name="main_bookmarks">Zabilješke</string>
   <string name="main_settings">Postavke</string>
-  <string name="actionbar_sync">Osvježi</string>
   <string name="actionbar_upload">Učitaj</string>
   <string name="actionbar_upload_files">Datoteke</string>
   <string name="actionbar_mkdir">Kreiraj direktorij</string>
@@ -20,7 +19,6 @@
   <string name="prefs_add_session">Dodaj novo pretraživanje</string>
   <string name="prefs_select_oc_account">Izaberi račun</string>
   <string name="prefs_accounts">Korisnićki računi</string>
-  <string name="auth_host_url">ownCloud URL</string>
   <string name="auth_username">Korisničko ime</string>
   <string name="auth_password">Lozinka</string>
   <string name="sync_string_files">Datoteke</string>
@@ -32,15 +30,15 @@
   <string name="uploader_btn_upload_text">Učitaj</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Izlaz</string>
   <string name="filedetails_download">Preuzimanje</string>
-  <string name="filedetails_sync_file">Osvježi</string>
   <string name="filedetails_redownload">Osvježi</string>
   <string name="common_yes">Da</string>
+  <string name="common_no">Ne</string>
   <string name="common_cancel_upload">Prekini upload</string>
   <string name="common_cancel">Odustani</string>
   <string name="common_error">Greška</string>
   <string name="sync_string_contacts">Kontakti</string>
-  <string name="auth_trying_to_login">Trying to login…</string>
   <string name="common_share">Podijeli</string>
   <string name="common_rename">Promjeni ime</string>
   <string name="common_remove">Makni</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-hu-rHU/strings.xml

@@ -13,16 +13,14 @@
   <string name="main_settings">Beállítások</string>
   <string name="main_tit_accsetup">Fiók beállítása</string>
   <string name="main_wrn_accsetup">Nincs beállított fiók a készülékén. Ahhoz, hogy használja ezt a programot, létre kell hozzon egyet.</string>
-  <string name="about_message">%1$s Android alkalmazás\nverzió: %2$s</string>
-  <string name="actionbar_sync">Frissítés</string>
   <string name="actionbar_upload">Feltöltés</string>
   <string name="actionbar_upload_from_apps">Más alkalmazásokból származó tartalom</string>
   <string name="actionbar_upload_files">Fájlok</string>
   <string name="actionbar_mkdir">Mappa létrehozása</string>
   <string name="actionbar_search">Keresés</string>
   <string name="actionbar_settings">Beállítások</string>
+  <string name="actionbar_see_details">Részletek</string>
   <string name="prefs_category_general">Általános</string>
-  <string name="prefs_category_trackmydevice">Eszközkövetés</string>
   <string name="prefs_add_session">Új munkafolyamat létrehozása</string>
   <string name="prefs_create_img_thumbnails">Bélyegkép készítése</string>
   <string name="prefs_select_oc_account">Válasszon egy felhasználónevet</string>
@@ -38,7 +36,7 @@
   <string name="prefs_pincode_summary">Védje meg az alkalmazást</string>
   <string name="prefs_instant_upload">Az azonnali feltöltés engedélyezése</string>
   <string name="prefs_instant_upload_summary">Az eszköz által készített fényképek azonnali feltöltése</string>
-  <string name="auth_host_url">URL</string>
+  <string name="auth_host_url">A kiszolgáló címe</string>
   <string name="auth_username">Felhasználói név</string>
   <string name="auth_password">Jelszó</string>
   <string name="auth_register">Új kapcsolat: %1$s</string>
@@ -53,6 +51,7 @@
   <string name="setup_title">Kapcsolódás ehhez: %1$s</string>
   <string name="setup_btn_connect">Kapcsolódás</string>
   <string name="uploader_btn_upload_text">Feltöltés</string>
+  <string name="uploader_top_message">Feltöltési mappa választása:</string>
   <string name="uploader_wrn_no_account_title">Nincs ilyen felhasználói fiók</string>
   <string name="uploader_wrn_no_account_text">Nem található %1$s fiók ezen a készüléken. Hozzon létre egy fiókot előbb.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Beállítás</string>
@@ -69,9 +68,7 @@
   <string name="filedetails_created">Készült:</string>
   <string name="filedetails_modified">Módosítva:</string>
   <string name="filedetails_download">Letöltés</string>
-  <string name="filedetails_sync_file">Frissítés</string>
   <string name="filedetails_redownload">Ismételt letöltés</string>
-  <string name="filedetails_open">Megnyitás</string>
   <string name="filedetails_renamed_in_upload_msg">A feltöltés során az állmányt erre neveztük át: %1$s</string>
   <string name="common_yes">Igen</string>
   <string name="common_no">Nem</string>
@@ -82,6 +79,8 @@
   <string name="common_save_exit">Mentés &amp; Kilépés</string>
   <string name="common_exit">%1$s elhagyása</string>
   <string name="common_error">Hiba</string>
+  <string name="common_loading">Betöltés ...</string>
+  <string name="common_error_unknown">Ismeretlen hiba</string>
   <string name="about_title">Rólunk</string>
   <string name="delete_account">Fiók törlése</string>
   <string name="create_account">Fiók létrehozása</string>
@@ -101,6 +100,7 @@
   <string name="downloader_download_succeeded_content">%1$s sikeresen letöltve</string>
   <string name="downloader_download_failed_ticker">A letöltés sikertelen</string>
   <string name="downloader_download_failed_content">A letöltésből %1$s nem lett befejezve</string>
+  <string name="downloader_not_downloaded_yet">Még nem töltötte le</string>
   <string name="common_choose_account">Válasszon azonosítót</string>
   <string name="sync_string_contacts">Címtár</string>
   <string name="sync_fail_ticker">A szinkronizálás sikertelen</string>
@@ -109,6 +109,14 @@
   <string name="sync_conflicts_in_favourites_content">%1$d szinkronizálandó állományokat nem sikerült szinkronizálni</string>
   <string name="sync_fail_in_favourites_ticker">A szinkronizálandó fájlokat nem sikerült szinkronizálni</string>
   <string name="sync_fail_in_favourites_content">%1$d fájl szinkronizálása nem sikerült (%2$d ütközés)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Néhány helyi fájlt figyelmen kívül hagytunk</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d fájlt nem sikerült a %2$s mappából  bemásolni</string>
+  <string name="foreign_files_move">Helyezzük át mindet</string>
+  <string name="foreign_files_success">Az összes fájlt áthelyeztük</string>
+  <string name="foreign_files_fail">Egyes fájlokat nem sikerült áthelyezni</string>
+  <string name="foreign_files_local_text">Helyi: %1$s</string>
+  <string name="foreign_files_remote_text">Távoli: %1$s</string>
+  <string name="upload_query_move_foreign_files">Nincs elég hely ahhoz, hogy a kiválasztott fájlokat a %1$s mappába másoljuk. Akkor inkább helyezzük át őket oda?</string>
   <string name="use_ssl">Biztonságos kapcsolat használata</string>
   <string name="location_no_provider">%1$s nem tudja követni az eszközét. Kérem ellenőrizze a helybeállításait</string>
   <string name="pincode_enter_pin_code">Kérem adja meg az alkalmazás PIN-kódját</string>
@@ -121,6 +129,27 @@
   <string name="pincode_wrong">Rossz a megadott PIN</string>
   <string name="pincode_removed">Az alkalmazás PIN-ját eltávolítottuk</string>
   <string name="pincode_stored">Az alkalmazás PIN-jét eltároltuk</string>
+  <string name="media_notif_ticker">%1$s zene lejátszó</string>
+  <string name="media_state_playing">%1$s (lejátszás)</string>
+  <string name="media_state_loading">%1$s (betöltés)</string>
+  <string name="media_event_done">%1$s lejátszás véget ért</string>
+  <string name="media_err_nothing_to_play">Nincs média fájl találat</string>
+  <string name="media_err_no_account">Nincs felhasználói fiók</string>
+  <string name="media_err_not_in_owncloud">A fájl nincs egy felhasználó fiókban</string>
+  <string name="media_err_unsupported">Nem támogatott média kodek</string>
+  <string name="media_err_io">Media fájl nem olvasható</string>
+  <string name="media_err_malformed">Médiafájl kódolása nem megfelelő</string>
+  <string name="media_err_timeout">Túl sok időn keresztül próbál játszani</string>
+  <string name="media_err_invalid_progressive_playback">A média fájlt nem lehet streamelni.</string>
+  <string name="media_err_unknown">A média fájlt nem tudja lejátszani a jelenlegi médialejátszó</string>
+  <string name="media_err_security_ex">Biztonsági hiba amikor megpróbálja lejátszani a %1$s</string>
+  <string name="media_err_io_ex">Bemeneteli hiba amikor megpróbálja lejátszani a %1$s</string>
+  <string name="media_err_unexpected">Váratlan hiba amikor megpróbálja lejátszani a %1$s</string>
+  <string name="media_previous_description">Előző zeneszám gomb</string>
+  <string name="media_rewind_description">Következő button</string>
+  <string name="media_play_pause_description">Lejátszás vagy pillanat állj gomb</string>
+  <string name="media_forward_description">Gyors előre gomb</string>
+  <string name="media_next_description">Következő zeneszám gomb</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 perc</item>
     <item>30 perc</item>
@@ -131,14 +160,12 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Bejelentkezés...</string>
   <string name="auth_no_net_conn_title">Nincs hálózati kapcsolat</string>
   <string name="auth_no_net_conn_message">Nem található hálózati kapcsolat, ellenőrizze az internetkapcsolatát, és próbálja újra.</string>
   <string name="auth_connect_anyway">Csatlakozás mindenképpen</string>
   <string name="auth_nossl_plain_ok_title">Nem érhető el biztonságos kapcsolat.</string>
   <string name="auth_nossl_plain_ok_message">Az alkalmazás nem tudott titkosított kapcsolatot kialakítani a kiszolgálóval. A nem titkosított kapcsolat elérhető. Folytathatja vagy kiléphet.</string>
   <string name="auth_connection_established">A kapcsolat létrejött</string>
-  <string name="auth_testing_connection">Kapcsolat tesztelése...</string>
   <string name="auth_not_configured_title">Hibás a kiszolgáló beállítása</string>
   <string name="auth_not_configured_message">Úgy tűnik a kiszolgáló nincs megfelelően beállítva. Lépjen kapcsolatba a rendszergazdával további információkért.</string>
   <string name="auth_unknown_error_title">Ismeretlen hiba történt!</string>
@@ -154,8 +181,6 @@
   <string name="auth_bad_oc_version_title">Ismeretlen változat a kiszolgálón</string>
   <string name="auth_wrong_connection_title">A kapcsolat nem hozható létre</string>
   <string name="auth_secure_connection">Létrejött a titkosított kapcsolat</string>
-  <string name="auth_login_details">Belépési adatok</string>
-  <string name="auth_unauthorized">Érvénytelen felhasználónév / jelszó</string>
   <string name="auth_not_found">Rossz a megadott útvonal</string>
   <string name="auth_internal">Belső hiba történt a kiszolgálón, hibakód: %1$d</string>
   <string name="crashlog_message">A program összeomlott. El akar küldeni egy összeomlási jelentést?</string>
@@ -208,7 +233,12 @@
   <string name="ssl_validator_label_validity_to">Eddig a dátumig:</string>
   <string name="ssl_validator_label_signature">Aláírás:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmus:</string>
-  <string name="text_placeholder">Ez egy helykitöltő</string>
+  <string name="placeholder_sentence">Ez egy helyőrző</string>
+  <string name="placeholder_filename">helyörző.txt</string>
+  <string name="placeholder_filetype">PNG kép</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">Képeket csak WiFi kapcsolaton keresztül töltsünk föl</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Frissítési ütközés</string>
@@ -216,4 +246,20 @@
   <string name="conflict_keep_both">Mindkettő megtartása</string>
   <string name="conflict_overwrite">Felülírás</string>
   <string name="conflict_dont_upload">Ne töltsük föl</string>
+  <string name="preview_image_description">Előnézeti kép</string>
+  <string name="preview_image_error_unknown_format">Ez a kép nem jelenik meg</string>
+  <string name="preview_image_error_out_of_memory">\"Nincs elég memória megmutatni ezt a képet</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s-t nem sikerült átmásolni ide: %2$s </string>
+  <string name="actionbar_failed_instant_upload">Sikertelen azonnali feltöltés\"</string>
+  <string name="failed_upload_headline_text">Sikertelen Azonnali feltöltés</string>
+  <string name="failed_upload_headline_hint">Összefoglaló az összes sikertelen instant feltöltésről</string>
+  <string name="failed_upload_all_cb">Összes kijelölése</string>
+  <string name="failed_upload_headline_retryall_btn">újra az összes kiválasztott</string>
+  <string name="failed_upload_headline_delete_all_btn">törölje az összes kiválasztottat a feltöltési sorból</string>
+  <string name="failed_upload_retry_text">újra feltölteni a képet:</string>
+  <string name="failed_upload_load_more_images">További képek betöltése</string>
+  <string name="failed_upload_retry_do_nothing_text">nem vagyunk online üzemmódban az azonnali feltöltéshez</string>
+  <string name="failed_upload_failure_text">Hibaüzenet</string>
+  <string name="failed_upload_quota_exceeded_text">Kérjük ellenőrizd a szerver konfigurációt, mert lehet, hogy a kvótát túllépted.</string>
 </resources>

res/values-hy/strings.xml

@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="filedetails_download">Բեռնել</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-ia/strings.xml

@@ -12,9 +12,13 @@
   <string name="sync_string_files">Files</string>
   <string name="setup_hint_username">Nomine de usator</string>
   <string name="setup_hint_password">Contrasigno</string>
+  <string name="setup_btn_connect">Connecte</string>
   <string name="uploader_btn_upload_text">Incargar</string>
   <string name="filedetails_download">Discargar</string>
   <string name="common_cancel">Cancellar</string>
+  <string name="common_error">Error</string>
+  <string name="common_error_unknown">Error Incognite</string>
   <string name="sync_string_contacts">Contactos</string>
   <string name="common_share">Compartir</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-id/strings.xml

@@ -13,24 +13,30 @@
   <string name="main_settings">pengaturan</string>
   <string name="main_tit_accsetup">Mengatur Akun</string>
   <string name="main_wrn_accsetup">Tidak ada akun yang diatur di alat anda. Dalam rangka menggunakan App ini, anda hrus membuatnya.</string>
+  <string name="actionbar_upload">Unggah</string>
   <string name="actionbar_upload_files">Berkas</string>
   <string name="actionbar_settings">pengaturan</string>
   <string name="prefs_category_general">umum</string>
-  <string name="auth_host_url">tautan</string>
+  <string name="auth_host_url">alamat server</string>
   <string name="auth_username">nama pengguna</string>
   <string name="auth_password">kata kunci</string>
   <string name="sync_string_files">Berkas</string>
   <string name="setup_hint_username">nama pengguna</string>
   <string name="setup_hint_password">kata kunci</string>
+  <string name="uploader_btn_upload_text">Unggah</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">Keluar</string>
   <string name="filedetails_download">unduh</string>
-  <string name="filedetails_open">buka</string>
   <string name="common_yes">Ya</string>
+  <string name="common_no">Tidak</string>
+  <string name="common_ok">Oke</string>
   <string name="common_cancel_upload">Batal mengunggah</string>
   <string name="common_cancel">batal</string>
   <string name="common_error">kesalahan</string>
   <string name="sync_string_contacts">kontak</string>
   <string name="common_share">berbagi</string>
+  <string name="common_rename">Ubah nama</string>
   <string name="common_remove">hilangkan</string>
   <string name="ssl_validator_title">peringatan</string>
   <string name="ssl_validator_btn_details_hide">sembunyikan</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-is/strings.xml

@@ -2,12 +2,13 @@
 <resources>
   <string name="main_files">Skrár</string>
   <string name="main_music">Tónlist</string>
+  <string name="main_calendar">Dagatal</string>
   <string name="main_bookmarks">Bókamerki</string>
   <string name="main_settings">Stillingar</string>
   <string name="actionbar_upload">Senda inn</string>
   <string name="actionbar_upload_files">Skrár</string>
   <string name="actionbar_settings">Stillingar</string>
-  <string name="auth_host_url">URL</string>
+  <string name="auth_host_url">Host nafn netþjóns</string>
   <string name="auth_username">Notendanafn</string>
   <string name="auth_password">Lykilorð</string>
   <string name="sync_string_files">Skrár</string>
@@ -15,7 +16,6 @@
   <string name="setup_hint_password">Lykilorð</string>
   <string name="uploader_btn_upload_text">Senda inn</string>
   <string name="filedetails_download">Niðurhal</string>
-  <string name="filedetails_open">Opna</string>
   <string name="common_yes">Já</string>
   <string name="common_no">Nei</string>
   <string name="common_cancel_upload">Hætta við innsendingu</string>
@@ -25,4 +25,5 @@
   <string name="common_rename">Endurskýra</string>
   <string name="common_remove">Fjarlægja</string>
   <string name="ssl_validator_title">Aðvörun</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-it/strings.xml

@@ -13,16 +13,18 @@
   <string name="main_settings">Impostazioni</string>
   <string name="main_tit_accsetup">Configurazione account</string>
   <string name="main_wrn_accsetup">Non ci sono account ownCloud su questo dispositivo. Per utilizzare questa applicazione, devi crearne uno.</string>
-  <string name="about_message">%1$s per Android\n\nversione: %2$s</string>
-  <string name="actionbar_sync">Sincronizza account</string>
+  <string name="about_android">Applicazione Android di %1$s </string>
+  <string name="about_version">versione %1$s</string>
+  <string name="actionbar_sync">Aggiorna account</string>
   <string name="actionbar_upload">Carica un file</string>
   <string name="actionbar_upload_from_apps">Contenuti da altre applicazioni</string>
   <string name="actionbar_upload_files">File</string>
+  <string name="actionbar_open_with">Apri con</string>
   <string name="actionbar_mkdir">Crea cartella</string>
   <string name="actionbar_search">Cerca</string>
   <string name="actionbar_settings">Impostazioni</string>
+  <string name="actionbar_see_details">Dettagli</string>
   <string name="prefs_category_general">Generale</string>
-  <string name="prefs_category_trackmydevice">Tracciamento dispositivo</string>
   <string name="prefs_add_session">Aggiungi nuova sessione</string>
   <string name="prefs_create_img_thumbnails">Crea anteprime immagini</string>
   <string name="prefs_select_oc_account">Scegli un account</string>
@@ -38,7 +40,12 @@
   <string name="prefs_pincode_summary">Proteggi il tuo client ownCloud</string>
   <string name="prefs_instant_upload">Caricamento immediato</string>
   <string name="prefs_instant_upload_summary">Carica immediatamente le foto dalla fotocamera</string>
-  <string name="auth_host_url">URL ownCloud</string>
+  <string name="prefs_log_title">Abilita registrazione log</string>
+  <string name="prefs_log_summary">Usato per registrare i problemi nei log</string>
+  <string name="prefs_log_title_history">Cronologia di registrazione log</string>
+  <string name="prefs_log_summary_history">Mostra i log registrati</string>
+  <string name="prefs_log_delete_history_button">Elimina la cronologia</string>
+  <string name="auth_host_url">Indirizzo del server</string>
   <string name="auth_username">Nome utente</string>
   <string name="auth_password">Password</string>
   <string name="auth_register">Sono nuovo di ownCloud</string>
@@ -53,6 +60,7 @@
   <string name="setup_title">Connettiti al tuo ownCloud</string>
   <string name="setup_btn_connect">Connetti</string>
   <string name="uploader_btn_upload_text">Carica</string>
+  <string name="uploader_top_message">Scegli la cartella di caricamento:</string>
   <string name="uploader_wrn_no_account_title">Nessun account trovato</string>
   <string name="uploader_wrn_no_account_text">Non ci sono account ownCloud sul tuo dispositivo. Configura prima un account.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurazione</string>
@@ -69,9 +77,8 @@
   <string name="filedetails_created">Creato:</string>
   <string name="filedetails_modified">Modificato:</string>
   <string name="filedetails_download">Scarica</string>
-  <string name="filedetails_sync_file">Aggiorna</string>
+  <string name="filedetails_sync_file">Aggiorna file</string>
   <string name="filedetails_redownload">Scarica nuovamente</string>
-  <string name="filedetails_open">Apri</string>
   <string name="filedetails_renamed_in_upload_msg">Il file è stato rinominato in %1$s durante il caricamento</string>
   <string name="common_yes">Sì</string>
   <string name="common_no">No</string>
@@ -82,6 +89,8 @@
   <string name="common_save_exit">Salva ed esci</string>
   <string name="common_exit">Esci da ownCloud</string>
   <string name="common_error">Errore</string>
+  <string name="common_loading">Caricamento in corso...</string>
+  <string name="common_error_unknown">Errore sconosciuto</string>
   <string name="about_title">Informazioni</string>
   <string name="delete_account">Elimina account</string>
   <string name="create_account">Crea account</string>
@@ -101,14 +110,25 @@
   <string name="downloader_download_succeeded_content">%1$s è stato scaricato correttamente</string>
   <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="common_choose_account">Scegli account</string>
   <string name="sync_string_contacts">Contatti</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>
+  <string name="sync_fail_content_unauthorized">Credenziali non valide per </string>
   <string name="sync_conflicts_in_favourites_ticker">Conflitti rilevati</string>
   <string name="sync_conflicts_in_favourites_content">%1$d file non possono essere sincronizzati</string>
   <string name="sync_fail_in_favourites_ticker">Sincronizzazione dei file non riuscita</string>
   <string name="sync_fail_in_favourites_content">I contenuti di %1$d file non possono essere sincronizzati (%2$d conflitti)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Alcuni file locali sono stati trascurati</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d file della cartella %2$s non possono essere copiati</string>
+  <string name="sync_foreign_files_forgotten_explanation">Dalla versione 1.3.16, i file caricati da questo dispositivo sono copiati nella cartella locale %1$s per evitare perdite di dati in caso di sincronizzazione di un singolo file con più account.\n\nA causa di questa modifica, tutti i file caricati nelle versioni precedenti di questa applicazione sono copiati nella cartella %2$s. In ogni caso, un errore ha impedito il completamento di questa operazione durante la sincronizzazione dell\'account.  Puoi mantenere i file intatti e rimuovere il collegamento a %3$s o spostare i file nella cartella %1$s e mantenere il collegamento a %4$s.\n\nQui sotto sono elencati i file locali e i file remoti in %5$s ai quali sono collegati.</string>
+  <string name="foreign_files_move">Sposta tutto</string>
+  <string name="foreign_files_success">Tutti i file sono stati spostati</string>
+  <string name="foreign_files_fail">Alcuni file non possono essere spostati</string>
+  <string name="foreign_files_local_text">Locale: %1$s</string>
+  <string name="foreign_files_remote_text">Remoto %1$s</string>
+  <string name="upload_query_move_foreign_files">Non c\'è spazio sufficiente per copiare i file selezionati nella cartella %1$s. Vuoi invece spostarli nella cartella?</string>
   <string name="use_ssl">Usa connessione sicura</string>
   <string name="location_no_provider">ownCloud non può tracciare questo dispositivo. Controlla le impostazioni di posizionamento</string>
   <string name="pincode_enter_pin_code">Inserisci il PIN dell\'applicazione</string>
@@ -121,6 +141,27 @@
   <string name="pincode_wrong">PIN di ownCloud non corretto</string>
   <string name="pincode_removed">PIN di ownCloud rimosso</string>
   <string name="pincode_stored">PIN di ownCloud memorizzato</string>
+  <string name="media_notif_ticker">Lettore musicale %1$s</string>
+  <string name="media_state_playing">%1$s (in riproduzione)</string>
+  <string name="media_state_loading">%1$s (in caricamento)</string>
+  <string name="media_event_done">Riproduzione di %1$s terminata</string>
+  <string name="media_err_nothing_to_play">Nessun file multimediale trovato</string>
+  <string name="media_err_no_account">Nessun account fornito</string>
+  <string name="media_err_not_in_owncloud">Il file non è in un account valido</string>
+  <string name="media_err_unsupported">Codificatore multimediale non supportato</string>
+  <string name="media_err_io">Il file multimediale non può essere letto</string>
+  <string name="media_err_malformed">File multimediale non codificato correttamente</string>
+  <string name="media_err_timeout">La riproduzione ha richiesto troppo tempo</string>
+  <string name="media_err_invalid_progressive_playback">Il file multimediale non può essere trasmesso</string>
+  <string name="media_err_unknown">Il file multimediale non può essere riprodotto con il lettore integrato</string>
+  <string name="media_err_security_ex">Errore di sicurezza durante il tentativo di riprodurre %1$s</string>
+  <string name="media_err_io_ex">Errore di input durante il tentativo di riprodurre %1$s</string>
+  <string name="media_err_unexpected">Errore inatteso durante il tentativo di riprodurre %1$s</string>
+  <string name="media_previous_description">Pulsante Traccia precedente</string>
+  <string name="media_rewind_description">Pulsante Riavvolgi</string>
+  <string name="media_play_pause_description">Pulsante Riproduci o pausa</string>
+  <string name="media_forward_description">Pulsante Avanti veloce</string>
+  <string name="media_next_description">Pulsante Traccia successiva</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minuti</item>
     <item>30 minuti</item>
@@ -131,14 +172,14 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Tentativo di accesso in corso...</string>
+  <string name="auth_trying_to_login">Tentativo di connessione...</string>
   <string name="auth_no_net_conn_title">Nessuna connessione di rete</string>
   <string name="auth_no_net_conn_message">Non sono state rilevate connessioni di rete, controlla la tua connessione a  Internet e prova ancora.</string>
   <string name="auth_connect_anyway">Connetti comunque</string>
   <string name="auth_nossl_plain_ok_title">Connessione sicura disponibile.</string>
   <string name="auth_nossl_plain_ok_message">L\'applicazione non è in grado di stabilire una connessione sicura al server. È comunque disponibile una connessione non sicura. Puoi continuare o annullare.</string>
   <string name="auth_connection_established">Connessione stabilita</string>
-  <string name="auth_testing_connection">Test della connessione in corso...</string>
+  <string name="auth_testing_connection">Prova di connessione in corso...</string>
   <string name="auth_not_configured_title">Configurazione non corretta di ownCloud</string>
   <string name="auth_not_configured_message">Sembra che l\'istanza di ownCloud non sia configurata correttamente. Contatta il tuo amministratore per ulteriori dettagli.</string>
   <string name="auth_unknown_error_title">Errore sconosciuto</string>
@@ -154,10 +195,14 @@
   <string name="auth_bad_oc_version_title">Versione del server ownCloud non riconosciuta</string>
   <string name="auth_wrong_connection_title">Impossibile stabilire la connessione</string>
   <string name="auth_secure_connection">Connessione sicura stabilita</string>
-  <string name="auth_login_details">Dettagli di accesso</string>
-  <string name="auth_unauthorized">Credenziali di accesso non valide</string>
+  <string name="auth_unauthorized">Credenziali non valide</string>
+  <string name="auth_oauth_error">Autorizzazione non riuscita</string>
+  <string name="auth_oauth_error_access_denied">Accesso negato dal server di autorizzazione</string>
   <string name="auth_not_found">Il percorso fornito non è valido</string>
   <string name="auth_internal">Errore interno del server, codice %1$d</string>
+  <string name="auth_wtf_reenter_URL">Stato inatteso; inserisci nuovamente l\'URL del server</string>
+  <string name="auth_expired_oauth_token_toast">Autorizzazione scaduta.\nRichiedi l\'autorizzazione</string>
+  <string name="auth_expired_basic_auth_toast">Le credenziali salvate non sono valide.\nDigita le credenziali attuali</string>
   <string name="crashlog_message">Applicazione terminata in modo inatteso. Vuoi inviare una segnalazione del problema?</string>
   <string name="crashlog_send_report">Invia segnalazione</string>
   <string name="crashlog_dont_send_report">Non inviare la segnalazione</string>
@@ -184,6 +229,11 @@
   <string name="wait_a_moment">Attendi</string>
   <string name="filedisplay_unexpected_bad_get_content">Problema inatteso; prova un\'altra applicazione per selezionare il file</string>
   <string name="filedisplay_no_file_selected">Non è stato selezionato alcun file</string>
+  <string name="oauth_host_url">URL oAuth2</string>
+  <string name="oauth_check_onoff">Accedi con oAuth2.</string>
+  <string name="oauth_login_connection">Connessione al server oAuth2 in corso...</string>
+  <string name="oauth_code_validation_message">Apri il browser e visita il collegamento:\n%1$s.\nConvalida il codice contenuto:\n%2$s</string>
+  <string name="oauth_connection_url_unavailable">Connessione con questo URL non avviabile.</string>
   <string name="ssl_validator_title">Avviso</string>
   <string name="ssl_validator_header">L\'identità del sito non può essere verificata</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Il certificato del server non è affidabile</string>
@@ -208,7 +258,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="text_placeholder">Questo è un segnaposto</string>
+  <string name="placeholder_sentence">Questo è un segnaposto</string>
+  <string name="placeholder_filename">segnaposto.txt</string>
+  <string name="placeholder_filetype">Immagine 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">Carica le immagini solo via WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Conflitto di aggiornamento</string>
@@ -216,4 +271,20 @@
   <string name="conflict_keep_both">Mantieni entrambi</string>
   <string name="conflict_overwrite">Sovrascrivi</string>
   <string name="conflict_dont_upload">Non inviare</string>
+  <string name="preview_image_description">Anteprima dell\'immagine</string>
+  <string name="preview_image_error_unknown_format">Questa immagine non può essere mostrata</string>
+  <string name="preview_image_error_out_of_memory">\"Memoria insufficiente per mostrare questa immagine</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s non può essere copiato nella cartella locale %2$s</string>
+  <string name="actionbar_failed_instant_upload">Caricamento istantaneo non riuscito\"</string>
+  <string name="failed_upload_headline_text">Caricamenti istantanei non riusciti</string>
+  <string name="failed_upload_headline_hint">Riepilogo dei caricamenti istantanei non riusciti</string>
+  <string name="failed_upload_all_cb">seleziona tutto</string>
+  <string name="failed_upload_headline_retryall_btn">riprova tutti i selezionati</string>
+  <string name="failed_upload_headline_delete_all_btn">elimina tutti i selezionati dalla coda di caricamento</string>
+  <string name="failed_upload_retry_text">riprova a caricare l\'immagine:</string>
+  <string name="failed_upload_load_more_images">Carica altre immagini</string>
+  <string name="failed_upload_retry_do_nothing_text">non fare niente, non sei collegato per i caricamenti istantanei</string>
+  <string name="failed_upload_failure_text">Messaggio d\'errore:</string>
+  <string name="failed_upload_quota_exceeded_text">Controlla la configurazione del server, forse hai superato la tua quota.</string>
 </resources>

res/values-ja-rJP/strings.xml

@@ -13,16 +13,18 @@
   <string name="main_settings">設定</string>
   <string name="main_tit_accsetup">アカウントを設定</string>
   <string name="main_wrn_accsetup">このデバイスには、ownCloudのアカウントがありません。このアプリケーションを使用するにはアカウントを作成してください。</string>
-  <string name="about_message">ownCloud Android クライアント\n\nバージョン: %1$s</string>
-  <string name="actionbar_sync">同期</string>
+  <string name="about_android">%1$s アンドロイドアプリ</string>
+  <string name="about_version">バージョン %1$s</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_open_with">次で開く</string>
   <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>
@@ -38,7 +40,12 @@
   <string name="prefs_pincode_summary">ownCloudクライアントを保護する</string>
   <string name="prefs_instant_upload">自動アップロードを有効</string>
   <string name="prefs_instant_upload_summary">カメラで撮影した画像を自動アップロード</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="prefs_log_title">記録を有効化</string>
+  <string name="prefs_log_summary">これは問題を記録するのにつかわれます。</string>
+  <string name="prefs_log_title_history">記録している履歴</string>
+  <string name="prefs_log_summary_history">これは記録されたログを表示します</string>
+  <string name="prefs_log_delete_history_button">履歴を削除</string>
+  <string name="auth_host_url">サーバアドレス</string>
   <string name="auth_username">ユーザー名</string>
   <string name="auth_password">パスワード</string>
   <string name="auth_register">私は、ownCloudの新規ユーザーです。</string>
@@ -53,6 +60,7 @@
   <string name="setup_title">ownCloudに接続</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">デバイスにownCloudのアカウントがありません。まず最初にアカウントを登録してください。</string>
   <string name="uploader_wrn_no_account_setup_btn_text">設定</string>
@@ -69,9 +77,8 @@
   <string name="filedetails_created">作成:</string>
   <string name="filedetails_modified">更新:</string>
   <string name="filedetails_download">ダウンロード</string>
-  <string name="filedetails_sync_file">同期</string>
+  <string name="filedetails_sync_file">ファイルを同期</string>
   <string name="filedetails_redownload">再ダウンロード</string>
-  <string name="filedetails_open">開く</string>
   <string name="filedetails_renamed_in_upload_msg">アップロード中にファイル名を %1$s に変更しました</string>
   <string name="common_yes">はい</string>
   <string name="common_no">いいえ</string>
@@ -82,6 +89,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>
@@ -101,14 +110,25 @@
   <string name="downloader_download_succeeded_content">%1$s は正常にダウンロードされました</string>
   <string name="downloader_download_failed_ticker">ダウンロードに失敗</string>
   <string name="downloader_download_failed_content">%1$s のダウンロードは完了しませんでした</string>
+  <string name="downloader_not_downloaded_yet">未ダウンロード</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="sync_fail_content_unauthorized">%1$sへの無効な資格情報</string>
   <string name="sync_conflicts_in_favourites_ticker">競合が見つかりました</string>
   <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$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>
@@ -121,6 +141,27 @@
   <string name="pincode_wrong">無効なownCloudアプリのパスワードです</string>
   <string name="pincode_removed">ownCloudアプリのパスワードを削除しました</string>
   <string name="pincode_stored">ownCloudアプリのパスワードを保存しました</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_event_done">%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 name="media_err_malformed">メディアファイルが正確にエンコードされていません</string>
+  <string name="media_err_timeout">プレイを試みた回数が多すぎます</string>
+  <string name="media_err_invalid_progressive_playback">メディアファイルをストリーミングできません</string>
+  <string name="media_err_unknown">メディアファイルをStock Media Playerでプレイ出来ません</string>
+  <string name="media_err_security_ex">プレイに際してセキュリティエラー %1$s</string>
+  <string name="media_err_io_ex">プレイに際して入力エラー %1$s</string>
+  <string name="media_err_unexpected">プレイに際して予期しないエラー %1$s</string>
+  <string name="media_previous_description">前のトラックボタン</string>
+  <string name="media_rewind_description">巻き戻しボタン</string>
+  <string name="media_play_pause_description">プレイ/ポーズボタン</string>
+  <string name="media_forward_description">早送りボタン</string>
+  <string name="media_next_description">次のトラックボタン</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15分</item>
     <item>30分</item>
@@ -154,10 +195,14 @@
   <string name="auth_bad_oc_version_title">認識出来ないownCloudサーバのバージョンです</string>
   <string name="auth_wrong_connection_title">接続を確立できませんでした</string>
   <string name="auth_secure_connection">暗号化通信を確立しました</string>
-  <string name="auth_login_details">ログインの詳細</string>
-  <string name="auth_unauthorized">無効なログイン／パスワード</string>
+  <string name="auth_unauthorized">無効な資格情報</string>
+  <string name="auth_oauth_error">認証失敗</string>
+  <string name="auth_oauth_error_access_denied">認証サーバーによってアクセスが拒否されました</string>
   <string name="auth_not_found">誤ったパスが指定されました</string>
   <string name="auth_internal">内部サーバエラー、コード %1$d</string>
+  <string name="auth_wtf_reenter_URL">予期しない状態。もう一度サーバーのURLを入力してください</string>
+  <string name="auth_expired_oauth_token_toast">認証の期限が切れています。\nもう一度認証してください。</string>
+  <string name="auth_expired_basic_auth_toast">保存された資格情報が無効です。\n正確な資格情報を入力してください。</string>
   <string name="crashlog_message">アプリケーションが予期せず終了しました。クラッシュレポートを送ってもよろしいでしょうか？</string>
   <string name="crashlog_send_report">レポートを送信</string>
   <string name="crashlog_dont_send_report">レポートを送信しない</string>
@@ -184,6 +229,11 @@
   <string name="wait_a_moment">しばらくお待ちください</string>
   <string name="filedisplay_unexpected_bad_get_content">予期せぬ問題；他のアプリでファイルを選択してみてください。</string>
   <string name="filedisplay_no_file_selected">ファイルは選択されていません</string>
+  <string name="oauth_host_url">oAuth2のURL</string>
+  <string name="oauth_check_onoff">oAuth2でログイン</string>
+  <string name="oauth_login_connection">oAuth2サーバーに接続中...</string>
+  <string name="oauth_code_validation_message">ウェブブラウザで次を開いてください:\n%1$s。\nここでこのコードを確認してください:\n%2$s</string>
+  <string name="oauth_connection_url_unavailable">このURLへの接続は利用できません。</string>
   <string name="ssl_validator_title">警告</string>
   <string name="ssl_validator_header">サイトの識別子を確認できませんでした</string>
   <string name="ssl_validator_reason_cert_not_trusted">- サーバ証明書は信頼されていません</string>
@@ -208,7 +258,12 @@
   <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_filename">placeholder.txt</string>
+  <string name="placeholder_filetype">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">WiFi経由でのみ写真をアップロード</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">更新の競合</string>
@@ -216,4 +271,20 @@
   <string name="conflict_keep_both">両方を保持</string>
   <string name="conflict_overwrite">上書き</string>
   <string name="conflict_dont_upload">アップロードしない</string>
+  <string name="preview_image_description">イメージプレビュー</string>
+  <string name="preview_image_error_unknown_format">この画像は表示できません</string>
+  <string name="preview_image_error_out_of_memory">「この画像を表示するのに十分なメモリがありません</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="actionbar_failed_instant_upload">インスタントアップロードに失敗」</string>
+  <string name="failed_upload_headline_text">インスタントアップロードに失敗</string>
+  <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_retry_do_nothing_text">オンラインでなく、インスタントアップロードのために何もしません</string>
+  <string name="failed_upload_failure_text">失敗メッセージ:</string>
+  <string name="failed_upload_quota_exceeded_text">サーバーの設定を確認してください。許容を超過している可能性があります。</string>
 </resources>

res/values-ka-rGE/strings.xml

@@ -1,32 +1,220 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="app_name">ownCloud–ი</string>
+  <string name="main_password">პაროლი:</string>
+  <string name="main_login">იუზერნეიმი:</string>
+  <string name="main_button_login">ლოგინი</string>
+  <string name="main_welcome">კეთილი იყოს თქვენი მობრძანება</string>
   <string name="main_files">ფაილები</string>
   <string name="main_music">მუსიკა</string>
   <string name="main_contacts">კონტაქტები</string>
+  <string name="main_calendar">კალენდარი</string>
   <string name="main_bookmarks">ბუქმარკები</string>
   <string name="main_settings">პარამეტრები</string>
+  <string name="main_tit_accsetup">შექმენით ანგარიში</string>
+  <string name="main_wrn_accsetup">ანგარიში არ არის მითითებული თქვენს მოწყობილობაში. ამ აპლიკაციის გამოსაყენებლად, თქვენ უნდა შექმნათ ის ერთხელ.</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="auth_host_url">URL</string>
+  <string name="prefs_add_session">ახალი სესიის დამატება</string>
+  <string name="prefs_create_img_thumbnails">სურათის ესკიზების შექმნა</string>
+  <string name="prefs_select_oc_account">აირჩიეთ რაიმე ანგარიში</string>
+  <string name="prefs_summary_select_oc_account">აირჩიეთ რომელ ანგარიშს გამოიყენებთ აპლიკაციისთვის.</string>
+  <string name="prefs_trackmydevice">მოწყობილობის თრექინგი</string>
+  <string name="prefs_trackmydevice_summary_off">ჩართეთ ეს აპლიკაცია რომ გაიგოთ თქვენი მოწყობილობის ადგილმდებარეობა</string>
+  <string name="prefs_trackmydevice_summary_on">ეს აპლიკაცია აღმოაჩენს ამ მოწყობილობას</string>
+  <string name="prefs_trackmydevice_interval">ატვირთვის ინტერვალი</string>
+  <string name="prefs_trackmydevice_interval_summary">განაახლე ყოველ %1$s წუთში</string>
+  <string name="prefs_accounts">ანგარიში</string>
+  <string name="prefs_manage_accounts">ანგარიშების მენეჯმენტი</string>
+  <string name="prefs_pincode">აპლიკაციის PIN–ი</string>
+  <string name="prefs_pincode_summary">თქვენი კლიენტის დაცვა</string>
+  <string name="prefs_instant_upload">ჩართე ეგრევე ატვირთვის ფუნქცია</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="auth_register">მე ვარ ახალი %1$s–ში</string>
+  <string name="new_session_uri_error">შეყვანილ იქნა არასწორი მისამართი</string>
+  <string name="new_session_session_name_error">არასწორი სესიის სახელი</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">Web მისამართი</string>
+  <string name="setup_hint_show_password">გამოვაჩინო პაროლი?</string>
+  <string name="setup_title">დაუკავშირდით თქვენს %1$s–ს</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_text"> %1$s ანგარიში არ არის თქვენს მოწყობილობაში. გთხოვთ ჯერ დააყენოთ ის.</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_error_forbidden_content">%1$s–ი არ დაიშვება გაზიარებული კონტენტის სანახავად</string>
+  <string name="uploader_info_uploading">მიმდინარეობს ატვირთვა</string>
+  <string name="uploader_btn_create_dir_text">შექმენით დირექტორია ასატვირთად</string>
+  <string name="file_list_empty">ამ ფოლდერში ფაილები არ არის.⏎\nახალი ფაილები შეიძლება დაემატოს \"ატვირთვა\" მენიუს ოფციით.</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_open">გახსნა</string>
+  <string name="filedetails_redownload">ხელთავიდან გადმოწერა</string>
+  <string name="filedetails_renamed_in_upload_msg">ფაილ %1$s–ზე გადარქმეულ იქნა სახელი ატვირთვის დროს</string>
   <string name="common_yes">კი</string>
+  <string name="common_no">არა</string>
+  <string name="common_ok">დიახ</string>
+  <string name="common_cancel_download">ჩამოტვირთვის შეჩერება</string>
   <string name="common_cancel_upload">ატვირთვის გაუქმება</string>
   <string name="common_cancel">გაუქმება</string>
+  <string name="common_save_exit">შენახვა &amp;გამოსვლა</string>
+  <string name="common_exit">გამოდი %1$s–დან</string>
   <string name="common_error">შეცდომა</string>
+  <string name="common_error_unknown">უცნობი შეცდომა</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_succeeded_content_single">%1$s–ი წარმატებით ატვირთულ იქნა</string>
+  <string name="uploader_upload_succeeded_content_multiple">%1$d იყო წარმატებით ატვირთული</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_succeeded_ticker">გადმოწერა დასრულდა</string>
+  <string name="downloader_download_succeeded_content">%1$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="sync_conflicts_in_favourites_ticker">კონფლიქტი წარმოიშვა</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync ფაილების სინქრონიზაცია არ შეიძლება</string>
+  <string name="sync_fail_in_favourites_ticker">Kept-in-sync ფაილები ვერ მოხერხდა</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">%1$d ფაილები არ არის %2$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">%1$s–მ ვერ მოახდინა თქვენი მოწყობილობის თრექინგი. გთხოვთ შეამოწმოთ თქვენი ადგილმდებარეობის პარამეტრები</string>
+  <string name="pincode_enter_pin_code">გთხოვთ, ჩასვათ თქვენი აპლიკაციის PIN–ი</string>
+  <string name="pincode_enter_new_pin_code">გთხოვთ, ჩასვათ თქვენი ახალი აპლიკაციის PIN–ი</string>
+  <string name="pincode_configure_your_pin">შეიყვანეთ თქვენი აპლიკაციის PIN–ი</string>
+  <string name="pincode_configure_your_pin_explanation">PIN–ი მოთხოვნილი იქნება აპლიკაციის ყოველ ჩართვაზე</string>
+  <string name="pincode_reenter_your_pincode">გთხოვთ შეიყვანოთ თქვენი აპლიკაციის PIN–ი ხელთავიდან</string>
+  <string name="pincode_remove_your_pincode">წაშალეთ თქვენი აპლიკაციის PIN–ი</string>
+  <string name="pincode_mismatch">აპლიკაციის PIN–ი არ არის იგივე</string>
+  <string name="pincode_wrong">არასწორი აპლიკაციის PIN–ი</string>
+  <string name="pincode_removed">აპლიკაციის PIN–ი წაიშალა</string>
+  <string name="pincode_stored">აპლიკაციის PIN–ი დამახსოვრებულ იქნა</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_no_net_conn_title">ქსელური კავშირი არ არის</string>
+  <string name="auth_no_net_conn_message">ქსელური კავშირი ვერ ინახა, გთხოვთ შეამოწმოთ თქვენი ინტერნეტ კავშირი და სცადოთ ხელთავიდან.</string>
+  <string name="auth_connect_anyway">დაუკავშირდი მაინც</string>
+  <string name="auth_nossl_plain_ok_title">დაცული კავშირი არ არსებობს.</string>
+  <string name="auth_nossl_plain_ok_message">აპლიკაციამ ვერ მოახდინა სერვერთან დაცული კავშირის დამყარება. აღმოჩენილ იქნა დაუცველი კავშირი. თქვენ შეგძლიათ გააგრძელოთ ან უარყოთ.</string>
+  <string name="auth_connection_established">კავშირი დამყარდა</string>
+  <string name="auth_not_configured_title">არასწორი სერვერის კონფიგურაცია</string>
+  <string name="auth_not_configured_message">ეს ნიშნავს იმას რომ სერვერის ინსტანცია არასწორად არის კონფიგურირებული. დაუკავშირდით თქვენს ადმინისტრატორს დატალური ინფორმაციისთვის.</string>
+  <string name="auth_unknown_error_title">აღმოჩენილია უცნობი შეცდომა!</string>
+  <string name="auth_unknown_error_message">აღმოჩენილ იქნა უცნობი შეცდომა. გთხოვთ დაუკავშირდით დახმარებას და გაუგზავნეთ ლოგი თქვენი მოწყობილობიდან.</string>
+  <string name="auth_unknown_host_title">ჰოსტი ვერ მოიძებნა</string>
+  <string name="auth_unknown_host_message">შეყვანილი ჰოსტი ვერ მოიძებნა. გთხოვთ შეამოწმოთ ჰოსტის სახელი, დაშვებადობა და სცადოთ ისევ.</string>
+  <string name="auth_incorrect_path_title">სერვერის ინსტანცია ვერ მოიძებნა</string>
+  <string name="auth_incorrect_path_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_bad_oc_version_title">ამოუცნობი სერვერის ვერსია</string>
+  <string name="auth_wrong_connection_title">კავშირის დამყარება ვერ მოხერხდა</string>
+  <string name="auth_secure_connection">დაცული კავშირი დამყარდა</string>
+  <string name="auth_not_found">არასწორი გზა</string>
+  <string name="auth_internal">სერვერის შიდა შეცდომა, კოდით %1$d</string>
+  <string name="crashlog_message">აპლიკაცია გაითიშა მოულოდნელად. გინდათ გააგზავნოთ ქრეშ რეპორტი?</string>
+  <string name="crashlog_send_report">გაგზავნე რეპორტი</string>
+  <string name="crashlog_dont_send_report">არ გაგზავნო რეპორტი</string>
+  <string name="extensions_avail_title">გაფართოება დაშვებადია!</string>
+  <string name="extensions_avail_message">სერვერის ინსტანციას აქვს რთული დამატებებეის მხარდაჭერა. გინდათ ნახოთ დამატებები ანდროიდისთვის?</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_folder_alert">თქვენ აუცილებლად გინდათ %1$s–ის წაშლა თავისი კონტენტით?</string>
+  <string name="confirmation_remove_local">მხოლოდ ლოკალური</string>
+  <string name="confirmation_remove_folder_local">მხოლოდ ლოკალური კონტენტი</string>
+  <string name="confirmation_remove_remote">სერვერიდან წაშლა</string>
+  <string name="confirmation_remove_remote_and_local">დაშორებული და ლოკალური</string>
+  <string name="remove_success_msg">წაშლა შარმატებით დასრულდა</string>
+  <string name="remove_fail_msg">წაშლა წარუმატებლად დამთავრდა</string>
+  <string name="rename_dialog_title">შეიყვანეთ ახალი სახელი</string>
+  <string name="rename_local_fail_msg">ლოკალურ კოპიაზე სახელის გადარქმევა ვერ მოხერხდა: გთხოვთ მიუთითოთ სხვა სახელი</string>
+  <string name="rename_server_fail_msg">გადარქმევა ვერ დასრულდა წარმატებით</string>
+  <string name="sync_file_fail_msg">დაშორებული ფაილის შემოწმება ვერ მოხერხდა</string>
+  <string name="sync_file_nothing_to_do_msg">ფაილების კონტენტის სინქრონიზაცია ვერ მოხერხდა</string>
+  <string name="create_dir_fail_msg">დირექტორია ვერ შეიქმნა</string>
+  <string name="wait_a_moment">გთხოვთ მოითმინოთ</string>
+  <string name="filedisplay_unexpected_bad_get_content">მოულოდნელი პრობლემა: გთხოვთ აირჩიოთ ფაილი სხვადასხვა აპლიკაციიდან</string>
+  <string name="filedisplay_no_file_selected">ფაილი არ ყოფილა მონიშნული</string>
   <string name="ssl_validator_title">გაფრთხილება</string>
+  <string name="ssl_validator_header">საიტის იდენტობა ვერ დამოწმდა</string>
+  <string name="ssl_validator_reason_cert_not_trusted">– სერვერის სერთიფიკატები არ არის ცნობიადი</string>
+  <string name="ssl_validator_reason_cert_expired">– სერვერის სერთიფიკატი ვადაგასულია</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">–სერვერის სერთიფიკატი არის დაშვებადი მომავალში</string>
+  <string name="ssl_validator_reason_hostname_not_verified">– URL არ ემთხვევა სერთიფიკატში არსებულ ჰოსტნეიმს</string>
+  <string name="ssl_validator_certificate_not_available">სერვერის სერთიფიკატი ვერ იქნა მიღებული</string>
+  <string name="ssl_validator_question">გინდათ მაინც ენდოთ მოცემულ სერთიფიკატს?</string>
+  <string name="ssl_validator_not_saved">სერთიფიკატის შენახვა ვერ მოხერხდა</string>
+  <string name="ssl_validator_btn_details_see">დეტალური ინფორმაცია</string>
   <string name="ssl_validator_btn_details_hide">დამალვა</string>
+  <string name="ssl_validator_label_subject">გაცემულია:</string>
+  <string name="ssl_validator_label_issuer">გაცემულია მიერ:</string>
+  <string name="ssl_validator_label_CN">ზოგადი სახელი:</string>
+  <string name="ssl_validator_label_O">ორგანიზაცია:</string>
+  <string name="ssl_validator_label_OU">ორგანიზაციის განყოფილება:</string>
+  <string name="ssl_validator_label_C">ქვეყანა:</string>
+  <string name="ssl_validator_label_ST">შტატი:</string>
+  <string name="ssl_validator_label_L">ადგილმდებარეობა:</string>
+  <string name="ssl_validator_label_validity">მოქმედების ვადა:</string>
+  <string name="ssl_validator_label_validity_from">დან:</string>
+  <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="instant_upload_on_wifi">ატვირთეთ სურათები მხოლოდ WiFi–ით</string>
+  <string name="instant_upload_path">/ეგრევე ატვირთვა</string>
+  <string name="conflict_title">კონფლიქტი განახლებისას</string>
+  <string name="conflict_message">დაშორებული ფაილი %s არ არის სინქრონიზირებული ლოკალურ ფაილთან. ოპერაციის გაგრძელება გამოიწვევს სერვერზე ფაილის შეცვლას.</string>
+  <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>
 </resources>

res/values-ka/strings.xml

@@ -6,4 +6,5 @@
   <string name="sync_string_files">ფაილები</string>
   <string name="setup_hint_password">პაროლი</string>
   <string name="filedetails_download">გადმოწერა</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-kn/strings.xml

@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--we need to improve the communication of errors to the user-->
+</resources>

res/values-ko/strings.xml

@@ -13,8 +13,6 @@
   <string name="main_settings">설정</string>
   <string name="main_tit_accsetup">계정 설정</string>
   <string name="main_wrn_accsetup">이 장치에 ownCloud 계정이 설정되어 있지 않습니다. 이 앱을 사용하려면 계정을 설정하십시오.</string>
-  <string name="about_message">%1$s Android 앱\n\n버전: %2$s</string>
-  <string name="actionbar_sync">새로 고침</string>
   <string name="actionbar_upload">업로드</string>
   <string name="actionbar_upload_from_apps">다른 앱의 콘텐츠</string>
   <string name="actionbar_upload_files">파일</string>
@@ -22,7 +20,6 @@
   <string name="actionbar_search">검색</string>
   <string name="actionbar_settings">설정</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>
@@ -38,7 +35,7 @@
   <string name="prefs_pincode_summary">내 클라이언트 보호</string>
   <string name="prefs_instant_upload">자동 업로드 사용</string>
   <string name="prefs_instant_upload_summary">카메라로 촬영한 사진 자동 업로드</string>
-  <string name="auth_host_url">URL</string>
+  <string name="auth_host_url">서버 주소</string>
   <string name="auth_username">사용자 이름</string>
   <string name="auth_password">암호</string>
   <string name="auth_register">%1$s의 새로운 사용자입니다</string>
@@ -69,9 +66,7 @@
   <string name="filedetails_created">만든 날짜:</string>
   <string name="filedetails_modified">수정한 날짜:</string>
   <string name="filedetails_download">다운로드</string>
-  <string name="filedetails_sync_file">새로 고침</string>
   <string name="filedetails_redownload">다시 다운로드</string>
-  <string name="filedetails_open">열기</string>
   <string name="filedetails_renamed_in_upload_msg">업로드 중 파일 이름을 %1$s(으)로 변경하였습니다</string>
   <string name="common_yes">예</string>
   <string name="common_no">아니요</string>
@@ -109,6 +104,14 @@
   <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">%1$d 파일을 %2$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">%1$s에서 장치 위치를 추적할 수 없습니다. 위치 설정을 확인하십시오.</string>
   <string name="pincode_enter_pin_code">앱 암호를 입력하십시오</string>
@@ -131,14 +134,12 @@
     <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_no_net_conn_message">네트워크 연결을 시도할 수 없습니다. 인터넷 연결을 확인하고 다시 시도하십시오.</string>
   <string name="auth_connect_anyway">그래도 접속하기</string>
   <string name="auth_nossl_plain_ok_title">암호화된 연결을 사용할 수 없습니다.</string>
   <string name="auth_nossl_plain_ok_message">서버와 암호화된 통신을 시도할 수 없었습니다. 암호화되지 않은 연결을 사용할 수 있습니다. 그래도 접속하거나 취소할 수 있습니다.</string>
   <string name="auth_connection_established">연결됨</string>
-  <string name="auth_testing_connection">연결 테스트 중...</string>
   <string name="auth_not_configured_title">서버 설정이 잘못됨</string>
   <string name="auth_not_configured_message">서버 인스턴스가 잘못 설정된 것 같습니다. 서버 관리자에게 문의하십시오.</string>
   <string name="auth_unknown_error_title">알 수 없는 오류가 발생하였습니다!</string>
@@ -154,8 +155,6 @@
   <string name="auth_bad_oc_version_title">확인할 수 없는 서버 버전</string>
   <string name="auth_wrong_connection_title">연결을 수립할 수 없음</string>
   <string name="auth_secure_connection">암호화된 연결 사용 중</string>
-  <string name="auth_login_details">로그인 정보</string>
-  <string name="auth_unauthorized">잘못된 로그인/암호</string>
   <string name="auth_not_found">경로가 잘못되었습니다</string>
   <string name="auth_internal">내부 서버 오류, 코드 %1$d</string>
   <string name="crashlog_message">프로그램이 예상치 못하게 종료되었습니다. 충돌 보고서를 전송하시겠습니까?</string>
@@ -208,7 +207,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 +214,6 @@
   <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>
 </resources>

res/values-ku-rIQ/strings.xml

@@ -5,14 +5,14 @@
   <string name="main_settings">ده‌ستكاری</string>
   <string name="actionbar_upload">بارکردن</string>
   <string name="actionbar_settings">ده‌ستكاری</string>
-  <string name="auth_host_url">ناونیشانی به‌سته‌ر</string>
+  <string name="auth_host_url">ناونیشانی ڕاژه</string>
   <string name="auth_username">ناوی به‌کارهێنه‌ر</string>
   <string name="auth_password">وشەی تێپەربو</string>
   <string name="setup_hint_username">ناوی به‌کارهێنه‌ر</string>
   <string name="setup_hint_password">وشەی تێپەربو</string>
   <string name="uploader_btn_upload_text">بارکردن</string>
   <string name="filedetails_download">داگرتن</string>
-  <string name="filedetails_open">کردنه‌وه</string>
   <string name="common_error">هه‌ڵه</string>
   <string name="ssl_validator_title">ئاگاداری</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-lb/strings.xml

@@ -36,7 +36,6 @@
   <string name="filedetails_created">Erstallt:</string>
   <string name="filedetails_modified">Geännert:</string>
   <string name="filedetails_download">Download</string>
-  <string name="filedetails_open">Opmaachen</string>
   <string name="common_yes">Jo</string>
   <string name="common_no">Nee</string>
   <string name="common_ok">OK</string>
@@ -46,4 +45,5 @@
   <string name="sync_string_contacts">Kontakter</string>
   <string name="common_share">Deelen</string>
   <string name="ssl_validator_title">Warnung</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-lt-rLT/strings.xml

@@ -13,13 +13,13 @@
   <string name="main_settings">Nustatymai</string>
   <string name="main_tit_accsetup">Nustatyti paskyrą</string>
   <string name="main_wrn_accsetup">Jūsų prietaise nėra nė vienos ownCloud paskyros. Kad galėtumėte naudoti šią programą, turite sukurti paskyrą.</string>
-  <string name="actionbar_sync">Atnaujinti</string>
   <string name="actionbar_upload">Įkelti</string>
   <string name="actionbar_upload_from_apps">Turinys iš kitų programų</string>
   <string name="actionbar_upload_files">Failai</string>
   <string name="actionbar_mkdir">Kurti aplanką</string>
   <string name="actionbar_search">Paieška</string>
   <string name="actionbar_settings">Nustatymai</string>
+  <string name="prefs_category_general">Bendras</string>
   <string name="prefs_add_session">Pridėti naują sesiją</string>
   <string name="prefs_create_img_thumbnails">Sukurti paveikslėlių miniatiūras</string>
   <string name="prefs_select_oc_account">Pasirinkite paskyrą</string>
@@ -30,7 +30,7 @@
   <string name="prefs_pincode">ownCloud programos PIN kodas</string>
   <string name="prefs_pincode_summary">Apsaugokite savo ownCloud klientą</string>
   <string name="prefs_instant_upload_summary">Iš karto nusiųsti nufotografuotas nuotraukas</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="auth_host_url">Serverio adresas</string>
   <string name="auth_username">Prisijungimo vardas</string>
   <string name="auth_password">Slaptažodis</string>
   <string name="new_session_uri_error">Neteisingas URL</string>
@@ -53,12 +53,11 @@
   <string name="filedetails_created">Sukurta:</string>
   <string name="filedetails_modified">Modifikuota:</string>
   <string name="filedetails_download">Atsisiųsti</string>
-  <string name="filedetails_sync_file">Atnaujinti</string>
   <string name="filedetails_redownload">Atnaujinti</string>
-  <string name="filedetails_open">Atidaryti</string>
   <string name="common_yes">Taip</string>
   <string name="common_no">Ne</string>
   <string name="common_ok">Gerai</string>
+  <string name="common_cancel_download">Atšaukti parsiuntimą</string>
   <string name="common_cancel_upload">Atšaukti siuntimą</string>
   <string name="common_cancel">Atšaukti</string>
   <string name="common_error">Klaida</string>
@@ -97,12 +96,10 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Bandoma prisijungti...</string>
   <string name="auth_no_net_conn_title">Nėra tinklo ryšio</string>
   <string name="auth_connect_anyway">Vis tiek prisijungti</string>
   <string name="auth_nossl_plain_ok_title">Saugus prisijungimas negalimas.</string>
   <string name="auth_connection_established">Ryšys užmegztas</string>
-  <string name="auth_testing_connection">Išbandomas prisijungimas...</string>
   <string name="auth_not_configured_title">Sugadinta ownCloud konfigūracija</string>
   <string name="auth_unknown_error_title">Įvyko nežinoma klaida!</string>
   <string name="auth_timeout_title">Serveris per ilgai neatsako</string>
@@ -111,7 +108,6 @@
   <string name="auth_bad_oc_version_title">Nežinoma ownCloud serverio versija</string>
   <string name="auth_wrong_connection_title">Nepavyko užmegzti ryšio</string>
   <string name="auth_secure_connection">Užmegztas saugus ryšys</string>
-  <string name="auth_login_details">Prisijungimo duomenys</string>
   <string name="crashlog_message">Programa netikėtai sustojo. Ar norite nusiųsti šio lūžimo ataskaitą programos kūrėjams?</string>
   <string name="crashlog_send_report">Siųsti ataskaitą </string>
   <string name="crashlog_dont_send_report">Nesiųsti ataskaitos</string>
@@ -149,4 +145,5 @@
   <string name="conflict_keep_both">Palikti abu</string>
   <string name="conflict_overwrite">Perrašyti</string>
   <string name="conflict_dont_upload">Nebesiųsti</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-lv/strings.xml

@@ -13,8 +13,6 @@
   <string name="main_settings">Iestatījumi</string>
   <string name="main_tit_accsetup">Iestatīt kontu</string>
   <string name="main_wrn_accsetup">Uz šīs ierīces nav iestatīta konta. Lai lietotu šo lietotni, tāds ir jāizveido.</string>
-  <string name="about_message">%1$s Android lietotne\n\nversija: %2$s</string>
-  <string name="actionbar_sync">Atsvaidzināt</string>
   <string name="actionbar_upload">Augšupielādēt</string>
   <string name="actionbar_upload_from_apps">Saturs no citām lietotnēm</string>
   <string name="actionbar_upload_files">Datnes</string>
@@ -22,7 +20,6 @@
   <string name="actionbar_search">Meklēt</string>
   <string name="actionbar_settings">Iestatījumi</string>
   <string name="prefs_category_general">Vispārīgi</string>
-  <string name="prefs_category_trackmydevice">Ierīces izsekošana</string>
   <string name="prefs_add_session">Pievienot jaunu sesiju</string>
   <string name="prefs_create_img_thumbnails">Izveidot attēlu sīktēlus</string>
   <string name="prefs_select_oc_account">Izvēlieties kontu</string>
@@ -38,7 +35,7 @@
   <string name="prefs_pincode_summary">Aizsargā savu klientu</string>
   <string name="prefs_instant_upload">Aktivēt tūlītējo augšupielādēšanu</string>
   <string name="prefs_instant_upload_summary">Nekavējoties augšupielādēt kameras uzņemtos attēlus</string>
-  <string name="auth_host_url">URL</string>
+  <string name="auth_host_url">Servera adrese</string>
   <string name="auth_username">Lietotājvārds</string>
   <string name="auth_password">Parole</string>
   <string name="auth_register">Esmu %1$s iesācējs</string>
@@ -69,9 +66,7 @@
   <string name="filedetails_created">Izveidota:</string>
   <string name="filedetails_modified">Modificēta:</string>
   <string name="filedetails_download">Lejupielādēt</string>
-  <string name="filedetails_sync_file">Atsvaidzināt</string>
   <string name="filedetails_redownload">Atkārtoti lejupielādēt</string>
-  <string name="filedetails_open">Atvērt</string>
   <string name="filedetails_renamed_in_upload_msg">Datne tika pārsaukta uz %1$s augšupielādes laikā</string>
   <string name="common_yes">Jā</string>
   <string name="common_no">Nē</string>
@@ -131,14 +126,12 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Mēģina ierakstīties...</string>
   <string name="auth_no_net_conn_title">Nav tīkla savienojumu</string>
   <string name="auth_no_net_conn_message">Nav atklātu tīkla savienojumu. Pārbaudiet interneta savienojumus un mēģiniet vēlreiz.</string>
   <string name="auth_connect_anyway">Tomēr savienoties</string>
   <string name="auth_nossl_plain_ok_title">Nav pieejams drošs savienojums.</string>
   <string name="auth_nossl_plain_ok_message">Lietotne nevar izveidot drošu savienojumu ar serveri. Ir pieejams nedrošs savienojums. Jūs varat turpināt vai atcelt.</string>
   <string name="auth_connection_established">Savienojums ir izveidots</string>
-  <string name="auth_testing_connection">Testē savienojumu...</string>
   <string name="auth_not_configured_title">Slikti formatēta servera konfigurācija</string>
   <string name="auth_not_configured_message">Izskatās, ka jūsu servera instance nav pareizi konfigurēta. Sazinieties ar servera administratoru, lai uzzinātu vairāk.</string>
   <string name="auth_unknown_error_title">Gadījās nezināma kļūda!</string>
@@ -154,8 +147,6 @@
   <string name="auth_bad_oc_version_title">Neatpazīta servera versija</string>
   <string name="auth_wrong_connection_title">Nevarēja izveidot savienojumu</string>
   <string name="auth_secure_connection">Ir izveidots drošs savienojums</string>
-  <string name="auth_login_details">Sīkāka informācija par ierakstīšanos</string>
-  <string name="auth_unauthorized">Nederīgs lietotājvārds/parole</string>
   <string name="auth_not_found">Dots nepareizs ceļš</string>
   <string name="auth_internal">Iekšējā servera kļūda, kods %1$d</string>
   <string name="crashlog_message">Lietotne negaidīti beidza darbu. Vai vēlaties iesniegt kļūdas ziņojumu?</string>
@@ -208,7 +199,6 @@
   <string name="ssl_validator_label_validity_to">Kam:</string>
   <string name="ssl_validator_label_signature">Paraksts:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritms:</string>
-  <string name="text_placeholder">Šis ir vietturis</string>
   <string name="instant_upload_on_wifi">Attēlus augšupielādēt tikai caur WiFi</string>
   <string name="instant_upload_path">/TūlītējaAugšupielāde</string>
   <string name="conflict_title">Atjaunināšanas konflikts</string>
@@ -216,4 +206,5 @@
   <string name="conflict_keep_both">Paturēt abas</string>
   <string name="conflict_overwrite">Pārrakstīt</string>
   <string name="conflict_dont_upload">Neaugšupielādēt</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-mk/strings.xml

@@ -13,14 +13,12 @@
   <string name="main_settings">Параметри</string>
   <string name="main_tit_accsetup">Постави сметка</string>
   <string name="main_wrn_accsetup">Нема конфигурирано сметка на овој уред, за да можете да ја користите апликацијава треба да направите сметка.</string>
-  <string name="actionbar_sync">Освежи</string>
   <string name="actionbar_upload">Подигни</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_category_trackmydevice">Следење на уред</string>
   <string name="prefs_add_session">Додади нова сесија</string>
   <string name="prefs_create_img_thumbnails">Направи мали слики</string>
   <string name="prefs_select_oc_account">Избери сметка</string>
@@ -31,7 +29,7 @@
   <string name="prefs_trackmydevice_interval">Интервал на ажурирање</string>
   <string name="prefs_trackmydevice_interval_summary">Ажурирај секои %1$s минути</string>
   <string name="prefs_accounts">Сметки</string>
-  <string name="auth_host_url">Адреса</string>
+  <string name="auth_host_url">Адреса на сервер</string>
   <string name="auth_username">Корисничко име</string>
   <string name="auth_password">Лозинка</string>
   <string name="new_session_uri_error">Дадена неточна адреса</string>
@@ -46,7 +44,6 @@
   <string name="filedetails_created">Создадено:</string>
   <string name="filedetails_modified">Изменето:</string>
   <string name="filedetails_download">Преземање</string>
-  <string name="filedetails_open">Отвори</string>
   <string name="common_yes">Да</string>
   <string name="common_no">Не</string>
   <string name="common_ok">Во ред</string>
@@ -58,4 +55,5 @@
   <string name="common_rename">Преименувај</string>
   <string name="common_remove">Отстрани</string>
   <string name="ssl_validator_title">Предупредување</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-ms-rMY/strings.xml

@@ -13,14 +13,12 @@
   <string name="main_settings">Tetapan-tetapan</string>
   <string name="main_tit_accsetup">Set akaun</string>
   <string name="main_wrn_accsetup">Peranti anda tidak mempunyai akaun ownCloud. Anda perlu membina satu akaun untuk menggunakan aplikasi ini</string>
-  <string name="actionbar_sync">Refresh</string>
   <string name="actionbar_upload">Muat naik</string>
   <string name="actionbar_upload_files">Fail-fail</string>
   <string name="actionbar_mkdir">Bina direktori</string>
   <string name="actionbar_search">Cari</string>
   <string name="actionbar_settings">Set</string>
   <string name="prefs_category_general">Umum</string>
-  <string name="prefs_category_trackmydevice">Jejak peranti</string>
   <string name="prefs_add_session">Tambah sesi baru</string>
   <string name="prefs_create_img_thumbnails">Bina lakaran kecil imej </string>
   <string name="prefs_select_oc_account">Pilih akaun</string>
@@ -28,7 +26,7 @@
   <string name="prefs_trackmydevice">Peranti sedang dijejaki</string>
   <string name="prefs_trackmydevice_interval_summary">Kemaskini setiap %1$s minit</string>
   <string name="prefs_accounts">Akaun</string>
-  <string name="auth_host_url">URL ownCloud</string>
+  <string name="auth_host_url">Alamat pelayan</string>
   <string name="auth_username">Nama pengguna</string>
   <string name="auth_password">Kata laluan</string>
   <string name="new_session_uri_error">URL yang diberikan adalah salah</string>
@@ -50,9 +48,7 @@
   <string name="filedetails_created">Telah dibina:</string>
   <string name="filedetails_modified">Telah diubah:</string>
   <string name="filedetails_download">Muatturun</string>
-  <string name="filedetails_sync_file">Refresh</string>
   <string name="filedetails_redownload">Refresh</string>
-  <string name="filedetails_open">Buka</string>
   <string name="common_yes">Ya</string>
   <string name="common_no">Tidak</string>
   <string name="common_ok">OK</string>
@@ -65,4 +61,5 @@
   <string name="sync_string_contacts">Hubungi </string>
   <string name="common_share">Kongsi</string>
   <string name="ssl_validator_title">Amaran</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-my/strings.xml

@@ -12,4 +12,5 @@
   <string name="common_yes">ဟုတ်</string>
   <string name="common_no">မဟုတ်ဘူး</string>
   <string name="common_cancel">ပယ်ဖျက်မည်</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-nb-rNO/strings.xml

@@ -13,7 +13,6 @@
   <string name="main_settings">Innstillinger</string>
   <string name="main_tit_accsetup">Sett opp konto</string>
   <string name="main_wrn_accsetup">Det finnes ingen ownClound kontoer for din enhent. For å bruker denne appen må du opprette en,</string>
-  <string name="actionbar_sync">Oppdater</string>
   <string name="actionbar_upload">Last opp</string>
   <string name="actionbar_upload_from_apps">Innhold fra andre applikasjoner</string>
   <string name="actionbar_upload_files">Filer</string>
@@ -21,7 +20,6 @@
   <string name="actionbar_search">Søk</string>
   <string name="actionbar_settings">Innstillinger</string>
   <string name="prefs_category_general">Generelt</string>
-  <string name="prefs_category_trackmydevice">Enhetssporing</string>
   <string name="prefs_add_session">Legg til ny sesjon</string>
   <string name="prefs_create_img_thumbnails">Opprett miniatyrbilder</string>
   <string name="prefs_select_oc_account">Velg konto</string>
@@ -30,7 +28,7 @@
   <string name="prefs_trackmydevice_interval_summary">Oppdater hvert %1$s minutt</string>
   <string name="prefs_accounts">Kontoer</string>
   <string name="prefs_instant_upload_summary">Last opp bilder tatt med kamera øyeblikkelig</string>
-  <string name="auth_host_url">URL</string>
+  <string name="auth_host_url">Server-adresse</string>
   <string name="auth_username">Brukernavn</string>
   <string name="auth_password">Passord</string>
   <string name="sync_string_files">Filer</string>
@@ -54,9 +52,7 @@
   <string name="filedetails_created">Opprettet:</string>
   <string name="filedetails_modified">Endret:</string>
   <string name="filedetails_download">Last ned</string>
-  <string name="filedetails_sync_file">Oppdater</string>
   <string name="filedetails_redownload">Last ned igjen</string>
-  <string name="filedetails_open">Åpne</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nei</string>
   <string name="common_ok">OK</string>
@@ -99,12 +95,10 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Prøver å logge inn...</string>
   <string name="auth_no_net_conn_title">Ingen nettverkstilkobling</string>
   <string name="auth_connect_anyway">Koble til likevel</string>
   <string name="auth_nossl_plain_ok_title">Sikker tilkobling ikke tilgjengelig.</string>
   <string name="auth_connection_established">Tilkobling opprettet</string>
-  <string name="auth_testing_connection">Tester tilkobling...</string>
   <string name="auth_unknown_error_title">Ukjent feil oppstod!</string>
   <string name="auth_unknown_host_title">Fant ikke tjener</string>
   <string name="auth_unknown_host_message">Fant ikke spesifisert tjener.  Vennligst sjekk tjenernavnet og server-tilgjengeligheten, og prøv på nytt.</string>
@@ -114,8 +108,6 @@
   <string name="auth_ssl_unverified_server_title">Uverifisert SSL-servers identitet</string>
   <string name="auth_wrong_connection_title">Klarte ikke å opprette tilkobling</string>
   <string name="auth_secure_connection">Sikker tilkobling opprettet</string>
-  <string name="auth_login_details">Innloggingsdetaljer</string>
-  <string name="auth_unauthorized">Ugyldig brukernavn / passord</string>
   <string name="crashlog_send_report">Send rapport</string>
   <string name="crashlog_dont_send_report">Ikke send rapport</string>
   <string name="extensions_avail_title">Utvidelser tilgjengelig!</string>
@@ -140,6 +132,6 @@
   <string name="ssl_validator_label_validity_from">Fra:</string>
   <string name="ssl_validator_label_validity_to">Til:</string>
   <string name="ssl_validator_label_signature">Signatur:</string>
-  <string name="text_placeholder">Dette er en plassholder</string>
   <string name="conflict_keep_both">Behold begge</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-ne/strings.xml

@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--we need to improve the communication of errors to the user-->
+</resources>

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>
@@ -13,16 +13,18 @@
   <string name="main_settings">Instellingen</string>
   <string name="main_tit_accsetup">Account configureren.</string>
   <string name="main_wrn_accsetup">Er zijn nog geen ownCloud accounts op dit apparaat. Als je deze app wilt gebruiken zul je een account moeten aanmaken.</string>
-  <string name="about_message">ownCloud Android client\n\nversie: %1$s</string>
-  <string name="actionbar_sync">Verversen</string>
+  <string name="about_android">%1$s Android App</string>
+  <string name="about_version">versie %1$s</string>
+  <string name="actionbar_sync">Account verversen</string>
   <string name="actionbar_upload">Uploaden</string>
   <string name="actionbar_upload_from_apps">Inhoud van andere apps</string>
   <string name="actionbar_upload_files">Bestanden</string>
+  <string name="actionbar_open_with">Open met</string>
   <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>
@@ -38,7 +40,12 @@
   <string name="prefs_pincode_summary">Beveilig je ownCloud client</string>
   <string name="prefs_instant_upload">Schakel direct uploaden in</string>
   <string name="prefs_instant_upload_summary">Upload afbeeldingen van camera automatisch</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="prefs_log_title">Loggen aanzetten</string>
+  <string name="prefs_log_summary">Dit wordt gebruikt om problemen te loggen.</string>
+  <string name="prefs_log_title_history">Log-geschiedenis</string>
+  <string name="prefs_log_summary_history">Dit toont de bijgehouden logs</string>
+  <string name="prefs_log_delete_history_button">Verwijder Geschiedenis</string>
+  <string name="auth_host_url">Server adres</string>
   <string name="auth_username">Gebruikersnaam</string>
   <string name="auth_password">Wachtwoord</string>
   <string name="auth_register">Ik ben nieuw op ownCloud</string>
@@ -53,6 +60,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>
@@ -69,9 +77,8 @@
   <string name="filedetails_created">Aangemaakt:</string>
   <string name="filedetails_modified">Aangepast:</string>
   <string name="filedetails_download">Download</string>
-  <string name="filedetails_sync_file">Verversen</string>
+  <string name="filedetails_sync_file">Bestand verversen</string>
   <string name="filedetails_redownload">Opnieuw downloaden</string>
-  <string name="filedetails_open">Open</string>
   <string name="filedetails_renamed_in_upload_msg">Bestand was hernoemt naar %1$s tijdens het uploaden</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nee</string>
@@ -82,6 +89,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,14 +110,25 @@
   <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>
   <string name="sync_fail_content">Synchronisatie van %1$s kon niet worden voltooid</string>
+  <string name="sync_fail_content_unauthorized">Ongeldige inloggegevens voor %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Conflicten gevonden</string>
   <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 die geüpload zijn vanaf dit apparaat gekopieerd naar de lokale %1$s map om gegevensverlies te voorkomen wanneer een enkel bestand wordt gesynchroniseerd met meerdere accounts.\n\nDoor deze wijziging zijn alle bestanden die met een voorgaande versie van deze app zijn geüpload gekopieërd naar de %2$s map. Echter, door een fout kon deze bewerking niet volledig uitgevoerd worden tijdens het synchroniseren van het account. U kunt het bestand / de bestanden laten zoals ze zijn en de link naar %3$s verwijderen, of het bestand / de bestanden verplaatsen naar de %1$s map en de links naar %4$s behouden.\n\nHieronder staan de locale 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 +141,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>
@@ -131,14 +172,14 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Proberen om in te loggen...</string>
+  <string name="auth_trying_to_login">Bezig met inloggen...</string>
   <string name="auth_no_net_conn_title">Geen netwerkverbinding</string>
   <string name="auth_no_net_conn_message">Er kon geen netwerkverbinding worden gevonden, controleer je internet verbinding en probeer het opnieuw.</string>
   <string name="auth_connect_anyway">Toch verbinden</string>
   <string name="auth_nossl_plain_ok_title">Veilige verbinding niet beschikbaar.</string>
   <string name="auth_nossl_plain_ok_message">De applicatie kon geen beveiligde verbinding met de server maken. Er is echter wel een onbeveiligde verbinding beschikbaar. Je kunt verdergaan of annuleren.</string>
   <string name="auth_connection_established">Verbinding tot stand gebracht</string>
-  <string name="auth_testing_connection">Probeer verbinding...</string>
+  <string name="auth_testing_connection">Verbinding aan het testen...</string>
   <string name="auth_not_configured_title">Foutieve ownCloud configuratie</string>
   <string name="auth_not_configured_message">Het lijkt erop dat je ownCloud instantie niet correct geconfigureerd is. Neem contact op met je beheerder voor meer details.</string>
   <string name="auth_unknown_error_title">Onbekende fout opgetreden!</string>
@@ -154,10 +195,14 @@
   <string name="auth_bad_oc_version_title">Onherkende ownCloud server versie</string>
   <string name="auth_wrong_connection_title">Kon verbinding niet tot stand brengen.</string>
   <string name="auth_secure_connection">Veilige verbinding tot stand gebracht</string>
-  <string name="auth_login_details">Inloggegevens</string>
-  <string name="auth_unauthorized">login / password niet juist</string>
+  <string name="auth_unauthorized">Ongeldige inloggegevens</string>
+  <string name="auth_oauth_error">Authorisatie niet succesvol</string>
+  <string name="auth_oauth_error_access_denied">Toegang geweigerd door authorizatieserver</string>
   <string name="auth_not_found">Verkeerde pad opgegeven</string>
   <string name="auth_internal">Interne server fout, code %1$d</string>
+  <string name="auth_wtf_reenter_URL">Onverwachte toestand; voer a.u.b de server-URL nogmaals in.</string>
+  <string name="auth_expired_oauth_token_toast">Uw authorisatie is verlopen.</string>
+  <string name="auth_expired_basic_auth_toast">Uw opgeslagen inloggegevens zijn ongeldig.\n\nVoer a.u.b. uw huidige inloggegevens in.</string>
   <string name="crashlog_message">De applicatie is onverwacht beëindigd. Wilt je een crash report versturen?</string>
   <string name="crashlog_send_report">Rapport verzenden</string>
   <string name="crashlog_dont_send_report">Rapport niet verzenden</string>
@@ -184,6 +229,11 @@
   <string name="wait_a_moment">Even geduld</string>
   <string name="filedisplay_unexpected_bad_get_content">Onverwacht probleem; probeer een andere app om het bestand te selecteren</string>
   <string name="filedisplay_no_file_selected">Er werd geen bestand geselecteerd</string>
+  <string name="oauth_host_url">oAuth2 URL</string>
+  <string name="oauth_check_onoff">Login met oAuth2.</string>
+  <string name="oauth_login_connection">Verbinden met oAuth2-server.</string>
+  <string name="oauth_code_validation_message">Open a.u.b. een webbrpwser en ga naar:\n%1$s.\nValideer deze code daar:\n%2$s</string>
+  <string name="oauth_connection_url_unavailable">Verbinding met deze URL is niet beschikbaar.</string>
   <string name="ssl_validator_title">Waarschuwing</string>
   <string name="ssl_validator_header">De identiteit van de site kan niet worden gecontroleerd</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Het server certificaat wordt niet vertrouwd</string>
@@ -208,7 +258,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 +271,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>

res/values-nn-rNO/strings.xml

@@ -1,20 +1,129 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">Passord:</string>
+  <string name="main_login">Brukarnamn:</string>
+  <string name="main_button_login">Logg inn</string>
   <string name="main_files">Filer</string>
   <string name="main_music">Musikk</string>
   <string name="main_contacts">Kotaktar</string>
+  <string name="main_calendar">Kalender</string>
+  <string name="main_bookmarks">Bokmerkje</string>
   <string name="main_settings">Innstillingar</string>
+  <string name="main_tit_accsetup">Set opp konto</string>
   <string name="actionbar_upload">Last opp</string>
+  <string name="actionbar_upload_from_apps">Innhald frå andre program</string>
   <string name="actionbar_upload_files">Filer</string>
+  <string name="actionbar_mkdir">Opprett mappe</string>
+  <string name="actionbar_search">Søk</string>
   <string name="actionbar_settings">Innstillingar</string>
+  <string name="prefs_category_general">Generelt</string>
+  <string name="prefs_add_session">Legg til ny økt</string>
+  <string name="prefs_create_img_thumbnails">Lag miniatyrbilete</string>
+  <string name="prefs_select_oc_account">Vel ein konto</string>
+  <string name="prefs_trackmydevice_interval_summary">Oppdater med %1$s minutts mellomrom</string>
+  <string name="prefs_accounts">Kontoar</string>
+  <string name="prefs_instant_upload_summary">Last opp kamerabilete med ein gong du tek dei</string>
+  <string name="auth_host_url">Tenaradresse</string>
   <string name="auth_username">Brukarnamn</string>
   <string name="auth_password">Passord</string>
   <string name="sync_string_files">Filer</string>
+  <string name="uploader_no_file_selected">Inga fil valt for opplasting</string>
   <string name="setup_hint_username">Brukarnamn</string>
   <string name="setup_hint_password">Passord</string>
+  <string name="setup_hint_address">Nettadresse</string>
+  <string name="setup_hint_show_password">Vis passord?</string>
+  <string name="setup_btn_connect">Kopla til</string>
   <string name="uploader_btn_upload_text">Last opp</string>
+  <string name="uploader_wrn_no_account_title">Fann ingen konto</string>
+  <string name="uploader_wrn_no_account_setup_btn_text">Oppsett</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">Avslutt</string>
+  <string name="uploader_wrn_no_content_title">Inga innhald å lasta opp</string>
+  <string name="uploader_wrn_no_content_text">Mottok ikkje noko innhald. Ingenting å lasta opp.</string>
+  <string name="uploader_info_uploading">Lastar opp</string>
+  <string name="uploader_btn_create_dir_text">Opprett mappe for opplasting</string>
+  <string name="filedetails_select_file">Trykk på ei fil for å visa meir informasjon.</string>
+  <string name="filedetails_size">Storleik:</string>
+  <string name="filedetails_type">Type:</string>
+  <string name="filedetails_created">Oppretta:</string>
+  <string name="filedetails_modified">Endra:</string>
   <string name="filedetails_download">Last ned</string>
-  <string name="common_cancel">Kanseller</string>
+  <string name="common_yes">Ja</string>
+  <string name="common_no">Nei</string>
+  <string name="common_ok">Greitt</string>
+  <string name="common_cancel_download">Avbryt nedlasting</string>
+  <string name="common_cancel_upload">Avbryt opplasting</string>
+  <string name="common_cancel">Avbryt</string>
+  <string name="common_save_exit">Lagra &amp; avslutt</string>
   <string name="common_error">Feil</string>
+  <string name="about_title">Om</string>
+  <string name="delete_account">Slett konto</string>
+  <string name="create_account">Opprett konto</string>
+  <string name="upload_chooser_title">Last opp frå …</string>
+  <string name="uploader_info_dirname">Mappenamn</string>
+  <string name="uploader_upload_in_progress_ticker">Lastar opp …</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% lastar opp %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">Opplasting fullført</string>
+  <string name="uploader_upload_failed_ticker">Feil ved opplasting</string>
+  <string name="uploader_upload_failed_content_single">Klarte ikkje å lasta %1$s ferdig opp</string>
+  <string name="uploader_upload_failed_content_multiple">Feil ved opplasting: Lasta opp %1$d av %2$d filer</string>
+  <string name="downloader_download_in_progress_ticker">Lastar ned …</string>
+  <string name="downloader_download_in_progress_content">%1$d%% lastar ned %2$s</string>
+  <string name="downloader_download_failed_ticker">Feil ved nedlasting</string>
+  <string name="downloader_download_failed_content">Klarte ikkje å lasta %1$s ferdig ned</string>
+  <string name="common_choose_account">Vel konto</string>
   <string name="sync_string_contacts">Kotaktar</string>
+  <string name="sync_fail_ticker">Feil ved synkronisering</string>
+  <string name="sync_fail_content">Klarte ikkje å synkronisera ferdig %1$s</string>
+  <string name="use_ssl">Bruk trygg tilkopling</string>
+  <string name="pincode_enter_pin_code">Ver venleg og skriv inn programpinkoden</string>
+  <string name="pincode_enter_new_pin_code">Ver venleg og skriv inn den nye programpinkoden</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 minutt</item>
+    <item>30 minutt</item>
+    <item>60 minutt</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
+  <string name="auth_no_net_conn_title">Inga nettilkopling</string>
+  <string name="auth_connect_anyway">Kopla til uansett</string>
+  <string name="auth_nossl_plain_ok_title">Trygg tilkopling ikkje tilgjengeleg.</string>
+  <string name="auth_nossl_plain_ok_message">Applikasjonen klarte ikkje å oppretta ei trygg tilkopling til tenaren. Ei ikkje-trygg tilkopling er mogleg. Du kan fortsetja eller avbryta.</string>
+  <string name="auth_connection_established">Tilkopling oppretta</string>
+  <string name="auth_unknown_error_title">Ein ukjend feil oppstod!</string>
+  <string name="auth_unknown_host_title">Klarte ikkje å finna tenaren</string>
+  <string name="auth_unknown_host_message">Klarte ikkje å finna tenaren du skreiv inn. Ver venleg og sjekk vertsnamnet og om tenaren er tilgjengeleg og prøv igjen.</string>
+  <string name="auth_timeout_title">Tenaren brukte for lang tid på å svara</string>
+  <string name="auth_incorrect_address_title">Ugyldig URL</string>
+  <string name="auth_ssl_general_error_title">Feil ved SSL-oppstart</string>
+  <string name="auth_ssl_unverified_server_title">SSL-tenaren har ein ikkje-stadfesta identitet</string>
+  <string name="auth_wrong_connection_title">Klarte ikkje å oppretta ei tilkopling</string>
+  <string name="auth_secure_connection">Trygg tilkopling oppretta</string>
+  <string name="crashlog_send_report">Send rapport</string>
+  <string name="crashlog_dont_send_report">Ikkje send rapport</string>
+  <string name="extensions_avail_title">Utvidingar tilgjengeleg!</string>
+  <string name="fd_keep_in_sync">Hald fila oppdatert</string>
+  <string name="common_share">Del</string>
+  <string name="common_rename">Endra namn</string>
+  <string name="common_remove">Fjern</string>
+  <string name="confirmation_remove_alert">Vil du verkeleg fjerna %1$s?</string>
+  <string name="confirmation_remove_local">Berre lokalt</string>
+  <string name="confirmation_remove_remote">Fjern frå tenaren</string>
+  <string name="rename_server_fail_msg">Klarte ikkje å fullføra omdøyping</string>
+  <string name="create_dir_fail_msg">Klarte ikkje å oppretta mappa</string>
+  <string name="wait_a_moment">Vent litt</string>
+  <string name="filedisplay_no_file_selected">Inga fil valt</string>
+  <string name="ssl_validator_title">Åtvaring</string>
+  <string name="ssl_validator_header">Klarte ikkje å stadfesta identiteten til nettstaden</string>
+  <string name="ssl_validator_reason_cert_not_trusted">– Tenarsertifikatet er ikkje klarert</string>
+  <string name="ssl_validator_reason_cert_expired">– Tenarsertifikatet er utløpt</string>
+  <string name="ssl_validator_reason_hostname_not_verified">– URL-en stemmer ikkje med tenarnamnet i sertifikatet</string>
+  <string name="ssl_validator_certificate_not_available">Klarte ikkje å henta sertifikatet til tenaren</string>
+  <string name="ssl_validator_question">Vil du stola på dette sertifikatet uansett?</string>
+  <string name="ssl_validator_not_saved">Klarte ikkje å lagra sertifikatet</string>
+  <string name="instant_upload_on_wifi">Berre last opp bilete over WiFi</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-oc/strings.xml

@@ -12,14 +12,12 @@
   <string name="main_bookmarks">Marcapaginas</string>
   <string name="main_settings">Configuracion</string>
   <string name="main_tit_accsetup">Compte de configuracion</string>
-  <string name="actionbar_sync">Refresca</string>
   <string name="actionbar_upload">Amontcarga</string>
   <string name="actionbar_upload_files">Fichièrs</string>
   <string name="actionbar_mkdir">Crea un repertòri</string>
   <string name="actionbar_search">Cèrca</string>
   <string name="actionbar_settings">Configuracion</string>
   <string name="prefs_category_general">General</string>
-  <string name="prefs_category_trackmydevice">Traqua lo daquòs</string>
   <string name="prefs_add_session">Apond una session novèla</string>
   <string name="prefs_create_img_thumbnails">Crea imatgonels</string>
   <string name="prefs_select_oc_account">Selecciona un compte</string>
@@ -27,7 +25,6 @@
   <string name="prefs_trackmydevice">Traqua lo daquòs</string>
   <string name="prefs_accounts">Comptes</string>
   <string name="prefs_manage_accounts">Maneja comptes</string>
-  <string name="auth_host_url">URL del ownCloud</string>
   <string name="auth_username">Nom d\'usancièr</string>
   <string name="auth_password">Senhal</string>
   <string name="new_session_uri_error">As donat un URL fals</string>
@@ -49,9 +46,7 @@
   <string name="filedetails_created">Creat :</string>
   <string name="filedetails_modified">Modificat :</string>
   <string name="filedetails_download">Avalcarga</string>
-  <string name="filedetails_sync_file">Refresca</string>
   <string name="filedetails_redownload">Torna avalcargar</string>
-  <string name="filedetails_open">Dubrís</string>
   <string name="common_yes">Òc</string>
   <string name="common_no">Non</string>
   <string name="common_ok">D\'accòrdi</string>
@@ -69,10 +64,10 @@
   <string name="sync_string_contacts">Contactes</string>
   <string name="use_ssl">Utiliza una conneccion segura</string>
   <string name="pincode_enter_pin_code">Dintras ton PIN d\'App, se te plai</string>
-  <string name="auth_login_details">Detalhs de login</string>
   <string name="crashlog_send_report">Rapòrt mandat</string>
   <string name="crashlog_dont_send_report">Mandes pas de rapòrt</string>
   <string name="extensions_avail_title">Extensions disponibles !</string>
   <string name="common_share">Parteja</string>
   <string name="common_rename">Torna nomenar</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-pl/strings.xml

@@ -13,16 +13,18 @@
   <string name="main_settings">Ustawienia</string>
   <string name="main_tit_accsetup">Załóż konto</string>
   <string name="main_wrn_accsetup">Nie wykryto kont ownCloud. Aby korzystać z tej aplikacji, musisz utworzyć konto.</string>
-  <string name="about_message">%1$s Android App⏎ ⏎ wersja: %2$s</string>
-  <string name="actionbar_sync">Odśwież</string>
+  <string name="about_android">%1$s Aplikacja Android</string>
+  <string name="about_version">wersja %1$s</string>
+  <string name="actionbar_sync">Odśwież konto</string>
   <string name="actionbar_upload">Wyślij plik</string>
   <string name="actionbar_upload_from_apps">Zasoby innych aplikacji</string>
   <string name="actionbar_upload_files">Pliki</string>
+  <string name="actionbar_open_with">Otwórz za pomocą</string>
   <string name="actionbar_mkdir">Nowy katalog</string>
   <string name="actionbar_search">Szukaj</string>
   <string name="actionbar_settings">Ustawienia</string>
+  <string name="actionbar_see_details">Szczegóły</string>
   <string name="prefs_category_general">Ogólne</string>
-  <string name="prefs_category_trackmydevice">Śledzenie urządzenia</string>
   <string name="prefs_add_session">Dodaj nową sesję</string>
   <string name="prefs_create_img_thumbnails">Utwórz miniaturki obrazów</string>
   <string name="prefs_select_oc_account">Wybierz konto</string>
@@ -38,7 +40,12 @@
   <string name="prefs_pincode_summary">Chroń klienta</string>
   <string name="prefs_instant_upload">Włącz natychmiastowe wysyłanie</string>
   <string name="prefs_instant_upload_summary">Natychmiast wysyłaj zdjęcia zrobione aparatem</string>
-  <string name="auth_host_url">URL</string>
+  <string name="prefs_log_title">Włączone Logi</string>
+  <string name="prefs_log_summary">To jest używane do logów problemów</string>
+  <string name="prefs_log_title_history">Zapisuj historię</string>
+  <string name="prefs_log_summary_history">To pokazuje zapisane logi</string>
+  <string name="prefs_log_delete_history_button">Usuń histrorię</string>
+  <string name="auth_host_url">Adres Serwera</string>
   <string name="auth_username">Nazwa użytkownika</string>
   <string name="auth_password">Hasło</string>
   <string name="auth_register">Jestem nowym użytkownikiem %1$s</string>
@@ -53,6 +60,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>
@@ -69,9 +77,8 @@
   <string name="filedetails_created">Utworzono:</string>
   <string name="filedetails_modified">Zmodyfikowano:</string>
   <string name="filedetails_download">Pobierz</string>
-  <string name="filedetails_sync_file">Odśwież</string>
+  <string name="filedetails_sync_file">Odśwież plik</string>
   <string name="filedetails_redownload">Pobierz ponownie</string>
-  <string name="filedetails_open">Otwórz</string>
   <string name="filedetails_renamed_in_upload_msg">Podczas wysyłania nazwa pliku została zmieniona na %1$s</string>
   <string name="common_yes">Tak</string>
   <string name="common_no">Nie</string>
@@ -82,6 +89,8 @@
   <string name="common_save_exit">Zapisz i wyjdź</string>
   <string name="common_exit">Opuść %1$s</string>
   <string name="common_error">Błąd</string>
+  <string name="common_loading">Wczytuję ...</string>
+  <string name="common_error_unknown">Nieznany błąd</string>
   <string name="about_title">O aplikacji</string>
   <string name="delete_account">Usuń konto</string>
   <string name="create_account">Utwórz konto</string>
@@ -101,14 +110,25 @@
   <string name="downloader_download_succeeded_content">Pobrano %1$s plików</string>
   <string name="downloader_download_failed_ticker">Pobieranie nieudane</string>
   <string name="downloader_download_failed_content">Pobieranie %1$s nie powiodło się</string>
+  <string name="downloader_not_downloaded_yet">Nie poprane jeszcze</string>
   <string name="common_choose_account">Wybierz konto</string>
   <string name="sync_string_contacts">Kontakty</string>
   <string name="sync_fail_ticker">Błąd synchronizacji</string>
   <string name="sync_fail_content">Nie można było ukończyć synchronizacji %1$s </string>
+  <string name="sync_fail_content_unauthorized">Błędne dane logowania dla %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Znaleziono konflikty</string>
   <string name="sync_conflicts_in_favourites_content">%1$d synchronizowanych plików nie może zostać zsynchronizowanych</string>
   <string name="sync_fail_in_favourites_ticker">Synchronizacja plików nie powiodła się</string>
   <string name="sync_fail_in_favourites_content">Zawartość %1$d plików nie może zostać synchronizowana (%2$d konfliktów)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Niektóre lokalne pliki zostały zgubione.</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d plików z %2$s katalogu nie może zostać skopiowana do niego</string>
+  <string name="sync_foreign_files_forgotten_explanation">\"W wersji 1.3.16, pliki załadowane z tego urządzenia są skopiowane do lokalnego folderu %1$s aby zapobiec utracie danych, gdy pojedynczy plik jest synchronizowany z kilku kont.⏎ ⏎ Ze zwględu na tą zmianę, wszystkie pliki załadowane w poprzedniej wersji tej aplikacji były kopiowane do folderu %2$s. Jednakże błąd podczas synchronizacji spowodował przerwanie procesu. Możesz zostawić plik(i) i usunąć link do %3$s, lub przenieść plik(i) to katalogu %1$s i zostawić link do %4$s.⏎ ⏎ Lista poniżej zawiera lokalne i zdalne pliki, które są podlinkowane do %5$s.</string>
+  <string name="foreign_files_move">Przenieś wszystko</string>
+  <string name="foreign_files_success">Wszystkie pliki zostały przeniesione</string>
+  <string name="foreign_files_fail">Niektóre pliki nie mogły być przeniesione</string>
+  <string name="foreign_files_local_text">Lokalna ścieżka: %1$s</string>
+  <string name="foreign_files_remote_text">Zdalna ścieżka: %1$s</string>
+  <string name="upload_query_move_foreign_files">Nie ma wystarczająco miejśca, aby skopiować zaznaczone pliki do folderu %1$s. Chciałbyś je przenieść?</string>
   <string name="use_ssl">Użyj bezpiecznego połączenia</string>
   <string name="location_no_provider">%1$s nie może śledzić urządzenia. Sprawdź ustawienia lokalizacji</string>
   <string name="pincode_enter_pin_code">Podaj PIN aplikacji</string>
@@ -121,6 +141,27 @@
   <string name="pincode_wrong">Niepoprawny PIN aplikacji</string>
   <string name="pincode_removed">Usunięto PIN aplikacji</string>
   <string name="pincode_stored">Zapisano PIN aplikacji</string>
+  <string name="media_notif_ticker">%1$s odtwarzacz muzyki</string>
+  <string name="media_state_playing">%1$s (odtwarzane)</string>
+  <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>
@@ -154,10 +195,14 @@
   <string name="auth_bad_oc_version_title">Nie rozpoznano wersji serwera</string>
   <string name="auth_wrong_connection_title">Nie można ustanowić połączenia</string>
   <string name="auth_secure_connection">Nawiązano bezpieczne połączenie</string>
-  <string name="auth_login_details">Szczegóły logowania</string>
-  <string name="auth_unauthorized">Nieprawidłowa nazwa użytkownika / hasło</string>
+  <string name="auth_unauthorized">Błędne dane logowania </string>
+  <string name="auth_oauth_error">Nieudana autoryzacja</string>
+  <string name="auth_oauth_error_access_denied">Dostęp zabroniony przez serwer autoryzacji</string>
   <string name="auth_not_found">Wprowadzono nieprawidłową ścieżkę</string>
   <string name="auth_internal">Wewnętrzny błąd serwera, kod %1$d</string>
+  <string name="auth_wtf_reenter_URL">Nieoczekiwany stan; Proszę wpisz adres URL serwera ponownie</string>
+  <string name="auth_expired_oauth_token_toast">Twoja sesja wygasła.\nProszę zaloguj się ponownie</string>
+  <string name="auth_expired_basic_auth_toast">Zapisane dane logowania są nieprawidłowe.\nWprowadź nowe dane logowania.</string>
   <string name="crashlog_message">Aplikacja została nieoczekiwanie zakończona. Czy chcesz przesłać raport awarii?</string>
   <string name="crashlog_send_report">Wyślij raport</string>
   <string name="crashlog_dont_send_report">Nie wysyłaj raportu</string>
@@ -184,6 +229,11 @@
   <string name="wait_a_moment">Poczekaj chwilę</string>
   <string name="filedisplay_unexpected_bad_get_content">Nieoczekiwany problem; spróbuj wybrać plik z innej aplikacji</string>
   <string name="filedisplay_no_file_selected">Nie wybrano żadnych plików</string>
+  <string name="oauth_host_url">oAuth2 URL</string>
+  <string name="oauth_check_onoff">Loguj przez oAuth2</string>
+  <string name="oauth_login_connection">Łączenie z serwerem oAuth2...</string>
+  <string name="oauth_code_validation_message">Proszę Otwórz przeglądarkę internetową i przejdź do:\n%1$s.\nSprawdź ten kod tam:\n%2$s</string>
+  <string name="oauth_connection_url_unavailable">Połączenie do tego adresu URL jest niedostępne.</string>
   <string name="ssl_validator_title">Uwaga</string>
   <string name="ssl_validator_header">Nie można zweryfikować tożsamości strony</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Certyfikat serwera jest niezaufany</string>
@@ -208,7 +258,12 @@
   <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="text_placeholder">Tekst zastępczy</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>
   <string name="instant_upload_on_wifi">Wysyłaj zdjęcia tylko przez WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Konflikt aktualizacji</string>
@@ -216,4 +271,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>

res/values-pt-rBR/strings.xml

@@ -13,16 +13,18 @@
   <string name="main_settings">Ajustes</string>
   <string name="main_tit_accsetup">Configuração de conta</string>
   <string name="main_wrn_accsetup">Não existem contas ownCloud no seu dispositivo. Para usar este aplicativo, você precisa criar uma.</string>
-  <string name="about_message">Cliente ownCloud para Android\n\nversão: %1$s</string>
-  <string name="actionbar_sync">Atualizar</string>
+  <string name="about_android">%1$s Android App</string>
+  <string name="about_version">versão %1$s</string>
+  <string name="actionbar_sync">Atualização de conta</string>
   <string name="actionbar_upload">Upload</string>
   <string name="actionbar_upload_from_apps">Conteúdo de outros apps</string>
   <string name="actionbar_upload_files">Arquivos</string>
+  <string name="actionbar_open_with">Abrir com</string>
   <string name="actionbar_mkdir">Criar pasta</string>
   <string name="actionbar_search">Procurar</string>
   <string name="actionbar_settings">Ajustes</string>
+  <string name="actionbar_see_details">Detalhes</string>
   <string name="prefs_category_general">Geral</string>
-  <string name="prefs_category_trackmydevice">Rastreamento de dispositivo</string>
   <string name="prefs_add_session">Adicionar nova sessão</string>
   <string name="prefs_create_img_thumbnails">Criar miniaturas de imagens</string>
   <string name="prefs_select_oc_account">Selecione uma conta</string>
@@ -38,7 +40,12 @@
   <string name="prefs_pincode_summary">Proteja seu cliente ownCloud</string>
   <string name="prefs_instant_upload">Habilitar upload instantâneo</string>
   <string name="prefs_instant_upload_summary">Instantaneamente faça upload das fotos tiradas pela câmera</string>
-  <string name="auth_host_url">URL ownCloud</string>
+  <string name="prefs_log_title">Habilitar conexão</string>
+  <string name="prefs_log_summary">Isto é usado para registrar os problemas</string>
+  <string name="prefs_log_title_history">História de Registro</string>
+  <string name="prefs_log_summary_history">Isso mostra os registros gravados</string>
+  <string name="prefs_log_delete_history_button">Excluir Histórico</string>
+  <string name="auth_host_url">Endereço do servidor</string>
   <string name="auth_username">Nome de usuário</string>
   <string name="auth_password">Senha</string>
   <string name="auth_register">Sou novo no ownCloud</string>
@@ -53,6 +60,7 @@
   <string name="setup_title">Conecte ao seu ownCloud</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Upload</string>
+  <string name="uploader_top_message">Escolher pasta para enviar:</string>
   <string name="uploader_wrn_no_account_title">Nenhuma conta encontrada</string>
   <string name="uploader_wrn_no_account_text">Não existem contas ownCloud no seu dispositivo. Por favor, configure uma conta primeiro.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Instalação</string>
@@ -69,9 +77,8 @@
   <string name="filedetails_created">Criado:</string>
   <string name="filedetails_modified">Modificado:</string>
   <string name="filedetails_download">Download</string>
-  <string name="filedetails_sync_file">Atualizar</string>
+  <string name="filedetails_sync_file">Atualizar arquivo</string>
   <string name="filedetails_redownload">Baixar novamente</string>
-  <string name="filedetails_open">Abrir</string>
   <string name="filedetails_renamed_in_upload_msg">Arquivo foi renomeado para %1$s durante o upload</string>
   <string name="common_yes">Sim</string>
   <string name="common_no">Não</string>
@@ -82,6 +89,8 @@
   <string name="common_save_exit">Salvar &amp; Sair</string>
   <string name="common_exit">Sair do ownCloud</string>
   <string name="common_error">Erro</string>
+  <string name="common_loading">Carregando ...</string>
+  <string name="common_error_unknown">Erro desconhecido</string>
   <string name="about_title">Sobre</string>
   <string name="delete_account">Remover conta</string>
   <string name="create_account">Criar conta</string>
@@ -101,14 +110,25 @@
   <string name="downloader_download_succeeded_content">%1$s foi baixado com sucesso</string>
   <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="common_choose_account">Escolha a conta</string>
   <string name="sync_string_contacts">Contatos</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>
+  <string name="sync_fail_content_unauthorized">Credenciais inválidas para %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Conflitos encontrados</string>
   <string name="sync_conflicts_in_favourites_content">%1$d arquivos \"manter sincronizados\" não puderam ser sincronizados</string>
   <string name="sync_fail_in_favourites_ticker">Falha ao manter arquivos sincronizados</string>
   <string name="sync_fail_in_favourites_content">O conteúdo de %1$d arquivos não puderam ser sincronizados (%2$d conflitos)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Alguns arquivos locais foram esquecidos</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d arquivos da pasta %2$s não foram copiados</string>
+  <string name="sync_foreign_files_forgotten_explanation">A partir da versão 1.3.16, os arquivos enviados a partir deste dispositivo são copiados para a pasta local %1$s para evitar a perda de dados quando um único arquivo é sincronizado com várias contas. \n\nDevido a essa mudança, todos os arquivos carregados em versões anteriores deste aplicativo foram copiados para a pasta %2$s. No entanto, um erro evita a conclusão desta operação durante a conta de sincronização. Você pode tanto deixar os arquivos como é e remover o link para %3$s, ou mover o arquivos para o diretório %1$s e manter o link para %4$s. \n\nListados abaixo estão os arquivos locais, e os arquivos remotos em %5$s que estavam vinculados.</string>
+  <string name="foreign_files_move">Mover todos</string>
+  <string name="foreign_files_success">Todos os arquivos foram movidos</string>
+  <string name="foreign_files_fail">Alguns arquivos não puderam ser movidos</string>
+  <string name="foreign_files_local_text">Local: %1$s</string>
+  <string name="foreign_files_remote_text">Remoto: %1$s</string>
+  <string name="upload_query_move_foreign_files">Não há espaço suficiente para copiar os arquivos selecionados para a pasta %1$s. Ao invés disso, gostaria de movê-los?</string>
   <string name="use_ssl">Usar Conexão Segura</string>
   <string name="location_no_provider">%1$s não pode rastrear seu dispositivo. Por favor verifique suas configurações de localização</string>
   <string name="pincode_enter_pin_code">Por favor, insira o seu PIN de Aplicativo</string>
@@ -121,6 +141,27 @@
   <string name="pincode_wrong">PIN de Aplicativo incorreto</string>
   <string name="pincode_removed">PIN de Aplicativo removido</string>
   <string name="pincode_stored">PIN de Aplicativo armazenado</string>
+  <string name="media_notif_ticker">%1$s reprodutor de música</string>
+  <string name="media_state_playing">%1$s (reproduzindo)</string>
+  <string name="media_state_loading">%1$s (carregando)</string>
+  <string name="media_event_done">%1$s reprodução finalizada</string>
+  <string name="media_err_nothing_to_play">Nenhum arquivo de mídia encontrado</string>
+  <string name="media_err_no_account">Nenhuma conta fornecida</string>
+  <string name="media_err_not_in_owncloud">Arquivo não está em uma conta válida</string>
+  <string name="media_err_unsupported">Codec de mídia não suportado</string>
+  <string name="media_err_io">Arquivo de mídia não pode ser lido</string>
+  <string name="media_err_malformed">Arquivo de mídia não corretamente codificado</string>
+  <string name="media_err_timeout">Muito tempo tentando reproduzir</string>
+  <string name="media_err_invalid_progressive_playback">Arquivo de mídia não pode ser transmitido</string>
+  <string name="media_err_unknown">Arquivo de mídia não pode ser reproduzido com o estoque media player</string>
+  <string name="media_err_security_ex">Erro de segurança tentando reproduzir %1$s</string>
+  <string name="media_err_io_ex">Erro de entrada tentando reproduzir %1$s</string>
+  <string name="media_err_unexpected">Erro inesperado tentando reproduzir %1$s</string>
+  <string name="media_previous_description">Botão para trilha anterior</string>
+  <string name="media_rewind_description">Botão rebobinar</string>
+  <string name="media_play_pause_description">Botão reproduzir parar</string>
+  <string name="media_forward_description">Botão de adiantamento rápido</string>
+  <string name="media_next_description">Botão próxima trilha</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minutos</item>
     <item>30 minutos</item>
@@ -131,7 +172,7 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Tentando fazer login...</string>
+  <string name="auth_trying_to_login">Tentando fazer o login ...</string>
   <string name="auth_no_net_conn_title">Sem conexão de rede</string>
   <string name="auth_no_net_conn_message">Nenhuma conexão foi detectada, verifique sua conexão com a Internet e tente novamente.</string>
   <string name="auth_connect_anyway">Conectar mesmo assim</string>
@@ -154,10 +195,14 @@
   <string name="auth_bad_oc_version_title">Versão do servidor ownCloud é irreconhecível</string>
   <string name="auth_wrong_connection_title">Não foi possível estabelecer conexão</string>
   <string name="auth_secure_connection">Conexão segura estabelecida</string>
-  <string name="auth_login_details">Detalhes de login</string>
-  <string name="auth_unauthorized">Login / senha inválida</string>
+  <string name="auth_unauthorized">Credenciais inválidas</string>
+  <string name="auth_oauth_error">Autorização sem sucesso</string>
+  <string name="auth_oauth_error_access_denied">Acesso negado pelo servidor de autorização</string>
   <string name="auth_not_found">Caminho dado está errado</string>
   <string name="auth_internal">Erro interno do servidor, código %1$d</string>
+  <string name="auth_wtf_reenter_URL">Estado inesperado, por favor, digite a URL do servidor novamente</string>
+  <string name="auth_expired_oauth_token_toast">Sua autorização expirou. ⏎\nPor favor, pedir autorização novamente</string>
+  <string name="auth_expired_basic_auth_toast">Suas credenciais salvas são inválidos. ⏎\nPor favor, insira as credenciais atuais</string>
   <string name="crashlog_message">O aplicativo terminou inesperadamente. Gostaria de enviar um relatório de erros?</string>
   <string name="crashlog_send_report">Enviar relatório</string>
   <string name="crashlog_dont_send_report">Não enviar relatório</string>
@@ -184,6 +229,11 @@
   <string name="wait_a_moment">Aguarde um momento</string>
   <string name="filedisplay_unexpected_bad_get_content">Problema inesperado; por favor, tente selecionar o arquivo com outro app</string>
   <string name="filedisplay_no_file_selected">Nenhum arquivo foi selecionado</string>
+  <string name="oauth_host_url">oAuth2 URL</string>
+  <string name="oauth_check_onoff">Entrar com oAuth2.</string>
+  <string name="oauth_login_connection">Conectando-se a oAuth2 servidor ...</string>
+  <string name="oauth_code_validation_message">Por favor, abra um navegador e vá para: ⏎\n%1$s. ⏎\nValidar este código lá: ⏎\n%2$s</string>
+  <string name="oauth_connection_url_unavailable">O acesso a este URL não está disponível.</string>
   <string name="ssl_validator_title">Aviso</string>
   <string name="ssl_validator_header">A identidade do site não pode ser verificada</string>
   <string name="ssl_validator_reason_cert_not_trusted">- O certificado do servidor não é confiável</string>
@@ -208,7 +258,12 @@
   <string name="ssl_validator_label_validity_to">Para:</string>
   <string name="ssl_validator_label_signature">Assinatura:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
-  <string name="text_placeholder">Isso é um marcador de espaço</string>
+  <string name="placeholder_sentence">Este é um espaço reservado</string>
+  <string name="placeholder_filename">espaçoreservado.txt</string>
+  <string name="placeholder_filetype">Imagem 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">Fazer upload de fotos somente via WiFi</string>
   <string name="instant_upload_path">/Upload instantâneo</string>
   <string name="conflict_title">Conflito de atualização</string>
@@ -216,4 +271,20 @@
   <string name="conflict_keep_both">Manter ambos</string>
   <string name="conflict_overwrite">Sobrescrever</string>
   <string name="conflict_dont_upload">Não fazer upload</string>
+  <string name="preview_image_description">Pré-visualização da imagem</string>
+  <string name="preview_image_error_unknown_format">Esta imagem não pode ser mostrada</string>
+  <string name="preview_image_error_out_of_memory">\"Não há memoria suficiente para mostrar esta imagem</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s não pode ser copiado a pasta local %2$s</string>
+  <string name="actionbar_failed_instant_upload">Falha no envio imediato</string>
+  <string name="failed_upload_headline_text">Falhas nos envios imediatos</string>
+  <string name="failed_upload_headline_hint">Sumario de todas as falhas nos envios imediatos</string>
+  <string name="failed_upload_all_cb">selecionar tudo</string>
+  <string name="failed_upload_headline_retryall_btn">tentar novamente todos os selecionados</string>
+  <string name="failed_upload_headline_delete_all_btn">excluir todos os selecionados da lista de envio</string>
+  <string name="failed_upload_retry_text">tentar novamente envio da imagem:</string>
+  <string name="failed_upload_load_more_images">Carregar mais Imagens</string>
+  <string name="failed_upload_retry_do_nothing_text">não fazer nada voce não está conectado para envio instantâneo </string>
+  <string name="failed_upload_failure_text">Mensagem de Falha:</string>
+  <string name="failed_upload_quota_exceeded_text">Por favor verifique a configuração do servidor, talvez a sua cota esteja vencida.</string>
 </resources>

res/values-pt-rPT/strings.xml

@@ -13,16 +13,17 @@
   <string name="main_settings">Definições</string>
   <string name="main_tit_accsetup">Configurar conta</string>
   <string name="main_wrn_accsetup">Não há contas no seu aparelho. Para usar esta Aplicação, precisa de criar uma.</string>
-  <string name="about_message">cliente Android  %1$s\n\nversão: %1$s</string>
-  <string name="actionbar_sync">Actualizar</string>
+  <string name="about_version">versão %1$s</string>
+  <string name="actionbar_sync">Recarregar a conta</string>
   <string name="actionbar_upload">Enviar</string>
   <string name="actionbar_upload_from_apps">Conteúdo das outras apps</string>
   <string name="actionbar_upload_files">Ficheiros</string>
+  <string name="actionbar_open_with">Abrir com</string>
   <string name="actionbar_mkdir">Criar pasta</string>
   <string name="actionbar_search">Procurar</string>
   <string name="actionbar_settings">Definições</string>
+  <string name="actionbar_see_details">Detalhes</string>
   <string name="prefs_category_general">Geral</string>
-  <string name="prefs_category_trackmydevice">Rastreamento de dispositivo</string>
   <string name="prefs_add_session">Acrescentar nova sessão</string>
   <string name="prefs_create_img_thumbnails">Criar miniaturas de imagens</string>
   <string name="prefs_select_oc_account">Escolha uma conta</string>
@@ -38,7 +39,10 @@
   <string name="prefs_pincode_summary">Proteja o seu cliente ownCloud</string>
   <string name="prefs_instant_upload">Activar envio instantâneo</string>
   <string name="prefs_instant_upload_summary">Enviar automaticamente as fotografias tiradas pela camera</string>
-  <string name="auth_host_url">URL ownCloud</string>
+  <string name="prefs_log_title">Ativar Rastreio</string>
+  <string name="prefs_log_title_history">Historico do rastreio</string>
+  <string name="prefs_log_delete_history_button">Eliminar Histórico</string>
+  <string name="auth_host_url">Endereço do servidor</string>
   <string name="auth_username">Nome de Utilizador</string>
   <string name="auth_password">Palavra-passe</string>
   <string name="auth_register">Sou novo na  %1$s</string>
@@ -53,6 +57,7 @@
   <string name="setup_title">Ligar à sua  %1$s</string>
   <string name="setup_btn_connect">Ligar</string>
   <string name="uploader_btn_upload_text">Enviar</string>
+  <string name="uploader_top_message">Escolha a directoria do upload:</string>
   <string name="uploader_wrn_no_account_title">Nenhuma conta encontrada</string>
   <string name="uploader_wrn_no_account_text">Não tem nenhuma conta  %1$s no seu dispositivo. Configure uma conta.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurar</string>
@@ -69,9 +74,7 @@
   <string name="filedetails_created">Criado:</string>
   <string name="filedetails_modified">Modificado:</string>
   <string name="filedetails_download">Descarregar</string>
-  <string name="filedetails_sync_file">Actualizar</string>
   <string name="filedetails_redownload">Actualizar</string>
-  <string name="filedetails_open">Abrir</string>
   <string name="filedetails_renamed_in_upload_msg">O nome do ficheiro foi alterado para %1$s durante o envio.</string>
   <string name="common_yes">Sim</string>
   <string name="common_no">Não</string>
@@ -82,6 +85,8 @@
   <string name="common_save_exit">Guardar &amp; Sair</string>
   <string name="common_exit">Sair de  %1$s</string>
   <string name="common_error">Erro</string>
+  <string name="common_loading">A carregar...</string>
+  <string name="common_error_unknown">Erro Desconhecido</string>
   <string name="about_title">Sobre</string>
   <string name="delete_account">Apagar conta</string>
   <string name="create_account">Criar conta</string>
@@ -101,14 +106,24 @@
   <string name="downloader_download_succeeded_content">%1$s foi descarregado com sucesso</string>
   <string name="downloader_download_failed_ticker">Descarga falhou</string>
   <string name="downloader_download_failed_content">O descarregamento %1$s não foi possível descarregar</string>
+  <string name="downloader_not_downloaded_yet">Não transferido</string>
   <string name="common_choose_account">Escolha a conta</string>
   <string name="sync_string_contacts">Contactos</string>
   <string name="sync_fail_ticker">Falhou a sincronização</string>
   <string name="sync_fail_content">Não foi possível sincronizar %1$s</string>
+  <string name="sync_fail_content_unauthorized">Credenciais inválidas para %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Foram encontrados conflitos</string>
   <string name="sync_conflicts_in_favourites_content">Não foi possível sincronizar o ficheiro %1$d</string>
   <string name="sync_fail_in_favourites_ticker">Falhou a operação de manter os ficheiros sincronizados</string>
   <string name="sync_fail_in_favourites_content">Não foi possível sincronizar  o conteúdo de %1$d ficheiros  (%2$d conflictos)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Alguns ficheiros locais ficaram esquecidos</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d ficheiros da directoria %2$s não foram copiados</string>
+  <string name="foreign_files_move">Mover Todos</string>
+  <string name="foreign_files_success">Todos os ficheiros foram movidos</string>
+  <string name="foreign_files_fail">Não foi possível mover alguns ficheiros</string>
+  <string name="foreign_files_local_text">Local: %1$s</string>
+  <string name="foreign_files_remote_text">Remoto: %1$s</string>
+  <string name="upload_query_move_foreign_files">Não existe espaço suficiente para copiar os ficheiros seleccionados para a pasta %1$s . Deseja move-los?</string>
   <string name="use_ssl">Usar Ligação Segura</string>
   <string name="location_no_provider">Nao é possível detectar a sua localização. Por favor verifique se os serviços de localização/GPS estão activados.</string>
   <string name="pincode_enter_pin_code">Por favor escreva o PIN da Aplicação</string>
@@ -121,6 +136,27 @@
   <string name="pincode_wrong">Código PIN Incorrecto.</string>
   <string name="pincode_removed">PIN da aplicação ownCloud removido</string>
   <string name="pincode_stored">PIN da aplicação ownCloud guardado</string>
+  <string name="media_notif_ticker">%1$s leitor de música</string>
+  <string name="media_state_playing">A tocar: %1$s</string>
+  <string name="media_state_loading">%1$s (A carregar)</string>
+  <string name="media_event_done">%1$s leitura terminada</string>
+  <string name="media_err_nothing_to_play">Não foi encontrado nenhum ficheiro de média</string>
+  <string name="media_err_no_account">Não foi fornecida conta</string>
+  <string name="media_err_not_in_owncloud">O ficheiro não está numa conta válida</string>
+  <string name="media_err_unsupported">Codec de média não suportado</string>
+  <string name="media_err_io">Não foi possível reproduzir o ficheiro</string>
+  <string name="media_err_malformed">Ficheiro erradamente codificado (codec)</string>
+  <string name="media_err_timeout">Demasiado tempo a tentar reproduzir</string>
+  <string name="media_err_invalid_progressive_playback">O ficheiro não pode ser reproduzido (streaming)</string>
+  <string name="media_err_unknown">O ficheiro não pode ser reproduzido com o leitor de média de origem</string>
+  <string name="media_err_security_ex">Erro de segurança a tentar reproduzir o ficheiro %1$s</string>
+  <string name="media_err_io_ex">Erro de input a tentar reproduzir %1$s</string>
+  <string name="media_err_unexpected">Erro inesperado a tentar reproduzir %1$s</string>
+  <string name="media_previous_description">Faixa anterior</string>
+  <string name="media_rewind_description">Botão de rebobinar</string>
+  <string name="media_play_pause_description">Botão Tocar/Pausa</string>
+  <string name="media_forward_description">Botão de avanço rápido</string>
+  <string name="media_next_description">Botão Próxima Faixa</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 Minutos</item>
     <item>30 Minutos</item>
@@ -154,8 +190,7 @@
   <string name="auth_bad_oc_version_title">Versão do servidor ownCloud não reconhecida</string>
   <string name="auth_wrong_connection_title">Não consegue estabelecer ligação</string>
   <string name="auth_secure_connection">Ligação segura estabelecida</string>
-  <string name="auth_login_details">Detalhes de entrada</string>
-  <string name="auth_unauthorized">Palavra-passe ou nome de utilizador inválidos!</string>
+  <string name="auth_unauthorized">Credenciais inválidas</string>
   <string name="auth_not_found">Foi dado um caminho inválido</string>
   <string name="auth_internal">Erro interno de servidor, código: %1$d</string>
   <string name="crashlog_message">A aplicação terminou de forma inesperada. Deseja enviar o relatório do erro?</string>
@@ -184,6 +219,8 @@
   <string name="wait_a_moment">Aguarde um momento</string>
   <string name="filedisplay_unexpected_bad_get_content">Erro inesperado. Por favor tente outra aplicação para seleccionar o ficheiro.</string>
   <string name="filedisplay_no_file_selected">Não selecionou nenhum ficheiro</string>
+  <string name="oauth_check_onoff">Entrar usando oAuth2</string>
+  <string name="oauth_login_connection">A ligar ao servidor oAuth2</string>
   <string name="ssl_validator_title">Aviso</string>
   <string name="ssl_validator_header">Não foi possível verificar a identidade do site.</string>
   <string name="ssl_validator_reason_cert_not_trusted">- O certificado do servidor não é de confiança</string>
@@ -208,7 +245,12 @@
   <string name="ssl_validator_label_validity_to">Para:</string>
   <string name="ssl_validator_label_signature">Assinatura:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmo</string>
-  <string name="text_placeholder">Isto é uma variável.</string>
+  <string name="placeholder_sentence">Isto é uma variável.</string>
+  <string name="placeholder_filename">placeholder.txt</string>
+  <string name="placeholder_filetype">Imagem 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">Enviar fotografias apenas via WiFi</string>
   <string name="instant_upload_path">/Upload-Instantâneo </string>
   <string name="conflict_title">Conflito na actualização</string>
@@ -216,4 +258,20 @@
   <string name="conflict_keep_both">Manter os dois</string>
   <string name="conflict_overwrite">Sobrepor</string>
   <string name="conflict_dont_upload">Não enviar.</string>
+  <string name="preview_image_description">Pré-Visualização da imagem</string>
+  <string name="preview_image_error_unknown_format">Esta imagem não pode ser mostrada</string>
+  <string name="preview_image_error_out_of_memory">\"Falta de memória para mostrar esta imagem</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">Não foi possível copiar %1$s para a pasta local %2$s</string>
+  <string name="actionbar_failed_instant_upload">Falhou o Upload-Instantâneo\"</string>
+  <string name="failed_upload_headline_text">Falharam os Uploads-Instantâneos</string>
+  <string name="failed_upload_headline_hint">Sumário dos Uploads-Instantâneos falhados</string>
+  <string name="failed_upload_all_cb">Seleccionar Todos</string>
+  <string name="failed_upload_headline_retryall_btn">Tentar todos os seleccionados</string>
+  <string name="failed_upload_headline_delete_all_btn">Eliminar todos os seleccionados da lista de envio</string>
+  <string name="failed_upload_retry_text">Tentar envio da imagem:</string>
+  <string name="failed_upload_load_more_images">Carregar mais imagens</string>
+  <string name="failed_upload_retry_do_nothing_text">não fazer nada, nao está online para o Upload-Instantâneo</string>
+  <string name="failed_upload_failure_text">Mensagem de erro:</string>
+  <string name="failed_upload_quota_exceeded_text">Por favor verifique a configuração do servidor, talvez tenha excedido a sua quota</string>
 </resources>

res/values-ro/strings.xml

@@ -13,7 +13,6 @@
   <string name="main_settings">Setări</string>
   <string name="main_tit_accsetup">Configurează cont</string>
   <string name="main_wrn_accsetup">Nu există conturi ownCloud pe dispozitivul tău. Pentru a folosi această aplicație, trebuie să creezi un cont.</string>
-  <string name="actionbar_sync">Împrospătare</string>
   <string name="actionbar_upload">Încarcă</string>
   <string name="actionbar_upload_from_apps">Conținut de la alte aplicații</string>
   <string name="actionbar_upload_files">Fișiere</string>
@@ -21,7 +20,6 @@
   <string name="actionbar_search">Căutare</string>
   <string name="actionbar_settings">Setări</string>
   <string name="prefs_category_general">General</string>
-  <string name="prefs_category_trackmydevice">Urmărire dispozitiv</string>
   <string name="prefs_add_session">Adaugă sesiune nouă</string>
   <string name="prefs_select_oc_account">Selectează un cont</string>
   <string name="prefs_summary_select_oc_account">Alege contul pe care ar trebui să-l folosească aplicația.</string>
@@ -33,7 +31,7 @@
   <string name="prefs_accounts">Conturi</string>
   <string name="prefs_manage_accounts">Administrare conturi</string>
   <string name="prefs_instant_upload">Activează încărcarea instant</string>
-  <string name="auth_host_url">URL ownCloud</string>
+  <string name="auth_host_url">Adresa server-ului</string>
   <string name="auth_username">Nume utilizator</string>
   <string name="auth_password">Parolă</string>
   <string name="auth_register">Sunt novice în ownCloud</string>
@@ -59,9 +57,7 @@
   <string name="filedetails_created">Creat:</string>
   <string name="filedetails_modified">Modificat:</string>
   <string name="filedetails_download">Descarcă</string>
-  <string name="filedetails_sync_file">Împrospătare</string>
   <string name="filedetails_redownload">Descarcă din nou</string>
-  <string name="filedetails_open">Deschide</string>
   <string name="common_yes">Da</string>
   <string name="common_no">Nu</string>
   <string name="common_ok">OK</string>
@@ -110,10 +106,8 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">În curs de autentificare...</string>
   <string name="auth_nossl_plain_ok_title">Conexiune securizată indisponibilă</string>
   <string name="auth_connection_established">Conexiune stabilită</string>
-  <string name="auth_testing_connection">Se testează conexiunea...</string>
   <string name="auth_not_configured_title">Configurație ownCloud incorectă</string>
   <string name="auth_not_configured_message">Se pare că instanța ta ownCloud nu este configurată corect. Contactează administratorul pentru mai multe detalii.</string>
   <string name="auth_unknown_error_title">A apărut o eroare necunoscută!</string>
@@ -121,7 +115,6 @@
   <string name="auth_ssl_general_error_title">Inițializarea SSL a eșuat</string>
   <string name="auth_wrong_connection_title">Nu s-a putut stabili conexiunea</string>
   <string name="auth_secure_connection">Conexiune sigură stabilită</string>
-  <string name="auth_login_details">Detalii autentificare</string>
   <string name="crashlog_message">Aplicația s-a terminat într-un mod neașteptat. Dorești să trimiți un raport despre asta?</string>
   <string name="crashlog_send_report">Trimite raport</string>
   <string name="crashlog_dont_send_report">Nu trimite raport</string>
@@ -139,4 +132,5 @@
   <string name="wait_a_moment">Așteaptă un moment</string>
   <string name="filedisplay_no_file_selected">Nu a fost selectat nici un fișier</string>
   <string name="ssl_validator_title">Atenție</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-ru/strings.xml

@@ -13,16 +13,14 @@
   <string name="main_settings">Настройки</string>
   <string name="main_tit_accsetup">Настроить аккаунт</string>
   <string name="main_wrn_accsetup">На вашем устройстве нет ownCloud аккаунтов. Вам нужно создать аккаунт, чтобы пользоваться этим приложеним.</string>
-  <string name="about_message">ownCloud клиент для Android\n\nверсия: %1$s</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="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>
@@ -38,7 +36,7 @@
   <string name="prefs_pincode_summary">Защитить ваш клиент ownCloud</string>
   <string name="prefs_instant_upload">Включить моментальную загрузку</string>
   <string name="prefs_instant_upload_summary">Моментально загружать фотографии, полученные с камеры</string>
-  <string name="auth_host_url">Ссылка на ownCloud</string>
+  <string name="auth_host_url">Адрес сервера</string>
   <string name="auth_username">Пользователь</string>
   <string name="auth_password">Пароль</string>
   <string name="auth_register">Я новичёк в ownCloud</string>
@@ -69,9 +67,7 @@
   <string name="filedetails_created">Создан:</string>
   <string name="filedetails_modified">Изменён:</string>
   <string name="filedetails_download">Скачать</string>
-  <string name="filedetails_sync_file">Обновить</string>
   <string name="filedetails_redownload">Скачать заново</string>
-  <string name="filedetails_open">Открыть</string>
   <string name="filedetails_renamed_in_upload_msg">Файл был переименован в %1$s во время загрузки</string>
   <string name="common_yes">Да</string>
   <string name="common_no">Нет</string>
@@ -82,6 +78,7 @@
   <string name="common_save_exit">Сохранить &amp; Выйти</string>
   <string name="common_exit">Выйти из ownCloud</string>
   <string name="common_error">Ошибка</string>
+  <string name="common_error_unknown">Неизвестная ошибка</string>
   <string name="about_title">О программе</string>
   <string name="delete_account">Удалить аккаунт</string>
   <string name="create_account">Создать аккаунт</string>
@@ -109,6 +106,14 @@
   <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">%1$d файлы из %2$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">Вставьте PIN вашего приложения</string>
@@ -131,14 +136,12 @@
     <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_no_net_conn_message">Сетевое соединение не обнаружено , проверьте соединение с Интернет и попробуйте ещё раз.</string>
   <string name="auth_connect_anyway">Соединить всё равно</string>
   <string name="auth_nossl_plain_ok_title">Защищённое соединение недоступно.</string>
   <string name="auth_nossl_plain_ok_message">Приложение не может установить защищённое соединение с сервером. Однако доступно не защищённое соединение. Вы можете продолжить или прервать.</string>
   <string name="auth_connection_established">Соединение установлено</string>
-  <string name="auth_testing_connection">Тестирование соединения...</string>
   <string name="auth_not_configured_title">Неверная конфигурация ownCloud</string>
   <string name="auth_not_configured_message">Похоже что ваш экземпляр ownCloud не был корректно сконфигурирован. Обратитесь за деталями к вашему администратору.</string>
   <string name="auth_unknown_error_title">Произошла неизвестная ошибка!</string>
@@ -154,8 +157,6 @@
   <string name="auth_bad_oc_version_title">Неизвестная версия сервера ownCloud</string>
   <string name="auth_wrong_connection_title">Невозможно установить соединение</string>
   <string name="auth_secure_connection">Защищённое соединение установлено</string>
-  <string name="auth_login_details">Детали входа</string>
-  <string name="auth_unauthorized">Неправильный логин / пароль</string>
   <string name="auth_not_found">Указан неверный путь</string>
   <string name="auth_internal">Внутренняя ошибка сервера, код %1$d</string>
   <string name="crashlog_message">Приложение завершилось неожиданно. Хотите отправить аварийный отчёт?</string>
@@ -208,7 +209,7 @@
   <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="instant_upload_on_wifi">Загружать изображения только через WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Конфликт обновления</string>
@@ -216,4 +217,6 @@
   <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>
 </resources>

res/values-si-rLK/strings.xml

@@ -13,14 +13,12 @@
   <string name="main_settings">සිටුවම්</string>
   <string name="main_tit_accsetup">පරිශීලක ගිණුම ස්ථාපිත කරන්න</string>
   <string name="main_wrn_accsetup">owncloud ගිණුම් මෙම යන්ත්‍රයේ නොමැත. මෙම යෙදුම භාවිතයට ගිණුමක් තිබිය යුතුය</string>
-  <string name="actionbar_sync">නැවුම් කරන්න</string>
   <string name="actionbar_upload">උඩුගත කිරීම</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_category_trackmydevice">මෙවලම සෙවීම</string>
   <string name="prefs_add_session">නව සැසියක් එකතු කරන්න</string>
   <string name="prefs_create_img_thumbnails">සිඟිති රූ සාදන්න</string>
   <string name="prefs_select_oc_account">ගිණුමක් තෝරන්න</string>
@@ -35,7 +33,7 @@
   <string name="prefs_pincode_summary">ඔබේ ownCloud සේවාලාභියා සුරකින්න</string>
   <string name="prefs_instant_upload">ක්‍ෂණික උඩුගත කිරීම් සක්‍රිය කරන්න</string>
   <string name="prefs_instant_upload_summary">කැමරාවෙන් ගත් රූප ක්‍ෂණිකව උඩුගත කරන්න</string>
-  <string name="auth_host_url">ownCloud යොමුව</string>
+  <string name="auth_host_url">සේවාදායකයේ ලිපිනය</string>
   <string name="auth_username">පරිශීලක නම</string>
   <string name="auth_password">මුර පදය</string>
   <string name="auth_register">මම ownCloudට නවකයෙක්මි</string>
@@ -62,9 +60,7 @@
   <string name="filedetails_created">සෑදු දිනය:</string>
   <string name="filedetails_modified">වෙනස් කළ දිනය:</string>
   <string name="filedetails_download">භාගත කරන්න</string>
-  <string name="filedetails_sync_file">නැවුම් කරන්න</string>
   <string name="filedetails_redownload">නැවුම් කරන්න</string>
-  <string name="filedetails_open">විවෘත කරන්න</string>
   <string name="common_yes">ඔව්</string>
   <string name="common_no">එපා</string>
   <string name="common_ok">හරි</string>
@@ -97,13 +93,11 @@
     <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_no_net_conn_message">ජාල සම්බන්ධතාවක් සොයා ගත නොහැක. ඔබගේ අන්තර්ජාල සම්බන්ධතාව පරීක්ෂාකර නැවත උත්සහ කරන්න</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_not_configured_title">විකෘතිවු OwnCloud හැඩගැසුමක්</string>
   <string name="auth_unknown_error_title">නොදන්නා දෝෂයක් ඇතිවිය</string>
   <string name="auth_unknown_host_title">සේවාදායකයා සොයාගත නොහැක</string>
@@ -113,7 +107,6 @@
   <string name="auth_bad_oc_version_title">හඳුනාගත නොහැකි ownCloud අනුවාදයක්</string>
   <string name="auth_wrong_connection_title">සම්බන්ධයක් ඇතිකර ගැනීමට නොහැකි විය</string>
   <string name="auth_secure_connection">රක්‍ෂිත සම්බන්ධතාවක් සාදන ලදී</string>
-  <string name="auth_login_details">පිවිසුම් සඳහා විස්තර</string>
   <string name="crashlog_send_report">වාර්තාව යවන්න</string>
   <string name="crashlog_dont_send_report">වාර්තාව යවන්න එපා</string>
   <string name="fd_keep_in_sync">ගොනුව යාවත්කාලීනව තබාගන්න</string>
@@ -133,4 +126,5 @@
   <string name="filedisplay_no_file_selected">ගොනුවක් තෝරා නැත</string>
   <string name="ssl_validator_title">අනතුරු ඇඟවිම</string>
   <string name="ssl_validator_btn_details_hide">සඟවන්න</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-sk-rSK/strings.xml

@@ -13,16 +13,14 @@
   <string name="main_settings">Nastavenia</string>
   <string name="main_tit_accsetup">Nastavenie účtu</string>
   <string name="main_wrn_accsetup">Vo vašom zariadení nie sú žiadne účty. Vytvorte si účet ak chcete používať túto aplikáciu.</string>
-  <string name="about_message">%1$s Android App\n\nverzia: %2$s</string>
-  <string name="actionbar_sync">Obnoviť</string>
   <string name="actionbar_upload">Nahraj súbor</string>
   <string name="actionbar_upload_from_apps">Obsah z inej aplikácie</string>
   <string name="actionbar_upload_files">Súbory</string>
   <string name="actionbar_mkdir">Vytvor priečinok</string>
   <string name="actionbar_search">Hľadaj</string>
   <string name="actionbar_settings">Nastavenia</string>
+  <string name="actionbar_see_details">Podrobnosti</string>
   <string name="prefs_category_general">Všeobecné</string>
-  <string name="prefs_category_trackmydevice">Sledovanie zariadenia</string>
   <string name="prefs_add_session">Vytvoriť nové sedenie</string>
   <string name="prefs_create_img_thumbnails">Vytvor náhľad obrázku</string>
   <string name="prefs_select_oc_account">Vyber účet</string>
@@ -38,7 +36,7 @@
   <string name="prefs_pincode_summary">Chrániť klienta ownCloud</string>
   <string name="prefs_instant_upload">Zapnúť okamžité odosielanie</string>
   <string name="prefs_instant_upload_summary">Okamžite odosielať fotky z fotoaparátu</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="auth_host_url">Adresa servera</string>
   <string name="auth_username">Používateľské meno</string>
   <string name="auth_password">Heslo</string>
   <string name="auth_register">Som nový v %1$s</string>
@@ -53,6 +51,7 @@
   <string name="setup_title">Pripojiť k ownCloud</string>
   <string name="setup_btn_connect">Pripoj</string>
   <string name="uploader_btn_upload_text">Nahrať</string>
+  <string name="uploader_top_message">Vyberte priečinok pre nahrané súbory:</string>
   <string name="uploader_wrn_no_account_title">Účet sa nenašiel</string>
   <string name="uploader_wrn_no_account_text">Na tomto zariadení nie je zadaný žiadny ownCloud účet. Zadajte ho prosím.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nastavenie</string>
@@ -69,9 +68,7 @@
   <string name="filedetails_created">Vytvorený:</string>
   <string name="filedetails_modified">Zmenený:</string>
   <string name="filedetails_download">Stiahnuť</string>
-  <string name="filedetails_sync_file">Obnoviť</string>
   <string name="filedetails_redownload">Obnoviť</string>
-  <string name="filedetails_open">Otvoriť</string>
   <string name="filedetails_renamed_in_upload_msg">Súbor bol premenovaný na %1$s počas nahrávania</string>
   <string name="common_yes">Áno</string>
   <string name="common_no">Nie</string>
@@ -82,6 +79,8 @@
   <string name="common_save_exit">Uložiť a ukončiť</string>
   <string name="common_exit">Opustiť ownCloud</string>
   <string name="common_error">Chyba</string>
+  <string name="common_loading">Načítavam...</string>
+  <string name="common_error_unknown">Neznáma chyba</string>
   <string name="about_title">O</string>
   <string name="delete_account">Zmazať účet</string>
   <string name="create_account">Vytvoriť účet</string>
@@ -101,6 +100,7 @@
   <string name="downloader_download_succeeded_content">%1$s bol úspešne stiahnutý</string>
   <string name="downloader_download_failed_ticker">Stiahnutie zlyhalo</string>
   <string name="downloader_download_failed_content">Sťahovanie %1$s nebolo dokončené</string>
+  <string name="downloader_not_downloaded_yet">Ešte nie je stiahnuté</string>
   <string name="common_choose_account">Zvoliť účet</string>
   <string name="sync_string_contacts">Kontakty</string>
   <string name="sync_fail_ticker">Synchronizácia zlyhala</string>
@@ -109,6 +109,14 @@
   <string name="sync_conflicts_in_favourites_content">%1$d súborov z automatickej synchronizácie nemožno synchronizovať</string>
   <string name="sync_fail_in_favourites_ticker">Automatická synchronizácia súborov zlyhala</string>
   <string name="sync_fail_in_favourites_content">Obsah %1$d súborov nemohol byť synchronizovaný (%2$d konfliktov)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Niektoré lokálne súbory boli zabudnuté</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d súborov z priečinka %2$s nemožno skopírovať do</string>
+  <string name="foreign_files_move">Premiestniť všetko</string>
+  <string name="foreign_files_success">Všetky súbory boli premiestnené</string>
+  <string name="foreign_files_fail">Niektoré súbory nebolo možné premiestniť</string>
+  <string name="foreign_files_local_text">Lokálne: %1$s</string>
+  <string name="foreign_files_remote_text">Vzdialené: %1$s</string>
+  <string name="upload_query_move_foreign_files">Nie je dostatok miesta na kopírovanie vybraných súborov do priečinka %1$s. Želáte si miesto kopírovania zmeniť?</string>
   <string name="use_ssl">Použiť zabezpečené pripojenie</string>
   <string name="location_no_provider">ownCloud nemôže sledovať polohu vášho zariadenia. Skontrolujte nastavenia umiestnenia.</string>
   <string name="pincode_enter_pin_code">Zadajte PIN aplikácie</string>
@@ -121,6 +129,11 @@
   <string name="pincode_wrong">Nesprávny PIN aplikácie</string>
   <string name="pincode_removed">PIN aplikácie bol odstránený</string>
   <string name="pincode_stored">PIN aplikácie bol uložený</string>
+  <string name="media_notif_ticker">Prehrávač hudby %1$s</string>
+  <string name="media_state_playing">%1$s (prehráva)</string>
+  <string name="media_state_loading">%1$s (načítava)</string>
+  <string name="media_event_done">%1$s prehrávanie dokončené</string>
+  <string name="media_err_nothing_to_play">Nenájdený žiaden multimediálny súbor</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minút</item>
     <item>30 minút</item>
@@ -131,14 +144,12 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Pokus o pripojenie...</string>
   <string name="auth_no_net_conn_title">Bez sieťového pripojenia</string>
   <string name="auth_no_net_conn_message">Skontrolujte pripojenie k sieti a opakujte pripojenie znovu.</string>
   <string name="auth_connect_anyway">Aj tak pripojiť</string>
   <string name="auth_nossl_plain_ok_title">Nie je k dispozícii bezpečné pripojenie</string>
   <string name="auth_nossl_plain_ok_message">Aplikácia nemôže nadviazať zabezpečené spojenie so serverom. Nezabezpečené pripojenie je k dispozícii. Môžete pokračovať alebo prerušiť spojenie.</string>
   <string name="auth_connection_established">Pripojenie vytvorené</string>
-  <string name="auth_testing_connection">Testovane pripojenia...</string>
   <string name="auth_not_configured_title">Nesprávna konfigurácia ownCloud</string>
   <string name="auth_not_configured_message">Nastavenie ownCloud nie je správne. Kontaktujte administrátora pre získanie viac informácií.</string>
   <string name="auth_unknown_error_title">Nastala neznáma chyba!</string>
@@ -154,8 +165,6 @@
   <string name="auth_bad_oc_version_title">Nerozpoznaná verzia servera</string>
   <string name="auth_wrong_connection_title">Nie je možne vytvoriť spojenie</string>
   <string name="auth_secure_connection">Vytvorené zabezpečené spojenie</string>
-  <string name="auth_login_details">Podrobnosti prihlásenia</string>
-  <string name="auth_unauthorized">Neplatné prihlasovacie meno / heslo</string>
   <string name="auth_not_found">Je zadaná neplatná cesta</string>
   <string name="auth_internal">Interná chyba servera, kód %1$d</string>
   <string name="crashlog_message">Aplikácia neočakávane ukončila činnosť. Chcete poslať správu o chybe?</string>
@@ -208,7 +217,6 @@
   <string name="ssl_validator_label_validity_to">Do: </string>
   <string name="ssl_validator_label_signature">Podpis:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmus:</string>
-  <string name="text_placeholder">To je zástupný znak</string>
   <string name="instant_upload_on_wifi">Odoslať fotografie iba cez WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Konflikt pri aktualizácii</string>
@@ -216,4 +224,6 @@
   <string name="conflict_keep_both">Ponechať oba</string>
   <string name="conflict_overwrite">Prepísať</string>
   <string name="conflict_dont_upload">Nenahrávajte</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s nemožno skopírovať do lokálneho priečinka %2$s</string>
 </resources>

res/values-sk/strings.xml

@@ -1,2 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <!--we need to improve the communication of errors to the user-->
+</resources>

res/values-sl/strings.xml

@@ -13,19 +13,18 @@
   <string name="main_settings">Nastavitve</string>
   <string name="main_tit_accsetup">Nastavi račun</string>
   <string name="main_wrn_accsetup">Na vaši napravi ni računa ownCloud. Za uporabo tega programa je treba račun ustvariti.</string>
-  <string name="about_message">Odjemalec ownCloud za Android\n\nrazličica: %1$s</string>
-  <string name="actionbar_sync">Osveži</string>
   <string name="actionbar_upload">Pošlji datoteko</string>
   <string name="actionbar_upload_from_apps">Vsebina iz drugih programov</string>
   <string name="actionbar_upload_files">Datoteke</string>
+  <string name="actionbar_open_with">Odpri z:</string>
   <string name="actionbar_mkdir">Ustvari mapo</string>
   <string name="actionbar_search">Poišči</string>
   <string name="actionbar_settings">Nastavitve</string>
+  <string name="actionbar_see_details">Podrobnosti</string>
   <string name="prefs_category_general">Splošno</string>
-  <string name="prefs_category_trackmydevice">Sledenje napravi</string>
   <string name="prefs_add_session">Dodaj novo sejo</string>
   <string name="prefs_create_img_thumbnails">Ustvari sličice slik</string>
-  <string name="prefs_select_oc_account">Izberite račun</string>
+  <string name="prefs_select_oc_account">Izberi račun</string>
   <string name="prefs_summary_select_oc_account">Izberite račun, ki ga naj program uporabi.</string>
   <string name="prefs_trackmydevice">Sledenje napravi</string>
   <string name="prefs_trackmydevice_summary_off">Omogoči sledenje mestu naprave preko oblaka ownCloud.</string>
@@ -38,7 +37,10 @@
   <string name="prefs_pincode_summary">Zaščitite odjemalec ownCloud</string>
   <string name="prefs_instant_upload">Omogoči takojšnje pošiljanje</string>
   <string name="prefs_instant_upload_summary">Takojšnje pošiljanje posnetih fotografij</string>
-  <string name="auth_host_url">Naslov URL ownCloud</string>
+  <string name="prefs_log_title">Omogoči zapisovanje v dnevnik</string>
+  <string name="prefs_log_title_history">Zgodovina</string>
+  <string name="prefs_log_delete_history_button">Izbriši zgodovino</string>
+  <string name="auth_host_url">Naslov strežnika</string>
   <string name="auth_username">Uporabniško ime</string>
   <string name="auth_password">Geslo</string>
   <string name="auth_register">Sem nov v oblaku ownCloud</string>
@@ -53,6 +55,7 @@
   <string name="setup_title">Poveži se z oblakom ownCloud</string>
   <string name="setup_btn_connect">Poveži</string>
   <string name="uploader_btn_upload_text">Pošlji</string>
+  <string name="uploader_top_message">Izberite mapo, v katero boste prenesli dokumente:</string>
   <string name="uploader_wrn_no_account_title">Uporabniškega računa ni mogoče najti</string>
   <string name="uploader_wrn_no_account_text">Na napravi ni računov ownCloud. Nastaviti je treba vsaj en račun.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nastavi</string>
@@ -63,25 +66,25 @@
   <string name="uploader_info_uploading">Pošiljanje</string>
   <string name="uploader_btn_create_dir_text">Ustvari mapo za pošiljanje</string>
   <string name="file_list_empty">V tej mapi ni datotek.\nNove datoteke je mogoče dodati preko možnosti menija \"Pošlji\".</string>
-  <string name="filedetails_select_file">Pritisnite n datoteko za prikaz dodatnih podrobnosti.</string>
+  <string name="filedetails_select_file">Pritisnite na datoteko za prikaz dodatnih podrobnosti.</string>
   <string name="filedetails_size">Velikost:</string>
   <string name="filedetails_type">Vrsta:</string>
   <string name="filedetails_created">Ustvarjeno:</string>
   <string name="filedetails_modified">Spremenjeno:</string>
   <string name="filedetails_download">Prejmi</string>
-  <string name="filedetails_sync_file">Osveži</string>
   <string name="filedetails_redownload">Osveži</string>
-  <string name="filedetails_open">Odpri</string>
   <string name="filedetails_renamed_in_upload_msg">Datoteka je bila med nalaganjem preimenovana v %1$s</string>
   <string name="common_yes">Da</string>
   <string name="common_no">Ne</string>
   <string name="common_ok">V redu</string>
-  <string name="common_cancel_download">Prekliči prenos</string>
+  <string name="common_cancel_download">Prekliči prejem</string>
   <string name="common_cancel_upload">Prekliči pošiljanje</string>
   <string name="common_cancel">Prekliči</string>
-  <string name="common_save_exit">Shrani &amp; končaj</string>
+  <string name="common_save_exit">Shrani in končaj</string>
   <string name="common_exit">Zapusti ownCloud</string>
   <string name="common_error">Napaka</string>
+  <string name="common_loading">Nalaganje...</string>
+  <string name="common_error_unknown">Neznana napaka</string>
   <string name="about_title">O oblaku ownCloud</string>
   <string name="delete_account">Izbriši račun</string>
   <string name="create_account">Ustvari račun</string>
@@ -94,25 +97,34 @@
   <string name="uploader_upload_succeeded_content_multiple">%1$d datotek je uspešno poslanih</string>
   <string name="uploader_upload_failed_ticker">Pošiljanje je spodletelo</string>
   <string name="uploader_upload_failed_content_single">Pošiljanja %1$s ni mogoče dokončati</string>
-  <string name="uploader_upload_failed_content_multiple">Pošiljanje je spodletelo: Poslanih je %1$d/%2$d datotek.</string>
+  <string name="uploader_upload_failed_content_multiple">Pošiljanje je spodletelo: poslanih je %1$d/%2$d datotek.</string>
   <string name="downloader_download_in_progress_ticker">Prejemanje …</string>
   <string name="downloader_download_in_progress_content">%1$d%% Prejemanje %2$s</string>
   <string name="downloader_download_succeeded_ticker">Prejemanje je uspešno končano</string>
   <string name="downloader_download_succeeded_content">%1$s je uspešno prejet</string>
   <string name="downloader_download_failed_ticker">Prejemanje je spodletelo</string>
   <string name="downloader_download_failed_content">Prejemanja %1$s ni mogoče dokončati</string>
+  <string name="downloader_not_downloaded_yet">Prenos še ni zaključen</string>
   <string name="common_choose_account">Izbor računa</string>
   <string name="sync_string_contacts">Stiki</string>
   <string name="sync_fail_ticker">Usklajevanje je spodletelo</string>
   <string name="sync_fail_content">Usklajevanja %1$s ni mogoče dokončati</string>
-  <string name="sync_conflicts_in_favourites_ticker">Najdeni spori</string>
+  <string name="sync_conflicts_in_favourites_ticker">Zaznani spori</string>
   <string name="sync_conflicts_in_favourites_content">%1$d vedno-ažurnih datotek ni bilo mogoče uskladiti</string>
   <string name="sync_fail_in_favourites_ticker">Usklajevanje vedno-ažurnih datotek je spodletelo</string>
   <string name="sync_fail_in_favourites_content">Vsebino %1$d datotek ni bilo mogoče uskladiti (%2$d sporov)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Nekatere krajevne datoteke so spregledane</string>
+  <string name="sync_foreign_files_forgotten_content">Skupno %1$d datotek iz mape %2$s ni mogoče kopirati v</string>
+  <string name="foreign_files_move">Premakni vse</string>
+  <string name="foreign_files_success">Vse datoteke so uspešno premaknjene na novo mesto</string>
+  <string name="foreign_files_fail">Nekaterih datotek ni mogoče premakniti</string>
+  <string name="foreign_files_local_text">Krajevno: %1$s</string>
+  <string name="foreign_files_remote_text">Oddaljeno: %1$s</string>
+  <string name="upload_query_move_foreign_files">Na strežniku ni dovolj prostora za kopiranje izbranih datotek v mapo %1$s. Ali želite datoteke raje premakniti na novo mesto? </string>
   <string name="use_ssl">Uporabi varno povezavo</string>
   <string name="location_no_provider">Z ownCloud ni mogoče slediti napravi. Preverite nastavitve vašega mesta nahajanja.</string>
-  <string name="pincode_enter_pin_code">Vnesite PIN programa</string>
-  <string name="pincode_enter_new_pin_code">Vnesite nov PIN programa</string>
+  <string name="pincode_enter_pin_code">Vnesite kodo PIN programa</string>
+  <string name="pincode_enter_new_pin_code">Vnesite novo kodo PIN programa</string>
   <string name="pincode_configure_your_pin">Vnesite kodo PIN programa ownCloud</string>
   <string name="pincode_configure_your_pin_explanation">Koda PIN bo zahtevana vsakič pred zagonom programa.</string>
   <string name="pincode_reenter_your_pincode">Ponovno vnesite kodo PIN programa ownCloud</string>
@@ -121,6 +133,16 @@
   <string name="pincode_wrong">Nepravilen kodo PIN programa ownCloud</string>
   <string name="pincode_removed">Koda PIN programa ownCloud je odstranjena</string>
   <string name="pincode_stored">Koda PIN programa ownCloud je shranjena</string>
+  <string name="media_state_playing">%1$s (predvajanja)</string>
+  <string name="media_state_loading">%1$s (nalaganja)</string>
+  <string name="media_err_nothing_to_play">Medijskih datotek ni bilo mogoče najti</string>
+  <string name="media_err_no_account">Niste navedli uporabniškega računa</string>
+  <string name="media_err_not_in_owncloud">Dokument ni shranjen pod veljaven račun.</string>
+  <string name="media_err_unsupported">Medijski kodek ni podprt</string>
+  <string name="media_err_io">Medijske datoteke ni bilo mogoče prebrati.</string>
+  <string name="media_err_malformed">Medijska datoteka ni pravilno kodirana.</string>
+  <string name="media_err_invalid_progressive_playback">Medijske datoteke ni mogoče predvajati</string>
+  <string name="media_err_unknown">Medijske datoteke ni mogoče predvajati s predvajalnikom Stock media player</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minut</item>
     <item>30 minut</item>
@@ -131,20 +153,18 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Poskus prijave …</string>
   <string name="auth_no_net_conn_title">Ni omrežne povezave</string>
   <string name="auth_no_net_conn_message">Omrežna povezava ni zaznana. Preverite internetno povezavo in poskusite znova.</string>
   <string name="auth_connect_anyway">Vseeno poveži</string>
   <string name="auth_nossl_plain_ok_title">Varna povezava ni na voljo.</string>
   <string name="auth_nossl_plain_ok_message">Programu ni uspelo vzpostaviti varne povezave s strežnikom. Nadaljujete lahko z ne-varno povezavo ali pa prekinete.</string>
   <string name="auth_connection_established">Povezava je vzpostavljena</string>
-  <string name="auth_testing_connection">Preizkušanje povezave ...</string>
   <string name="auth_not_configured_title">Nastavitve ownCloud so napačno oblikovane</string>
   <string name="auth_not_configured_message">Zdi se, da vaš ownCloud ni pravilno nastavljen. Za dodatna pojasnila se obrnite na skrbnika.</string>
   <string name="auth_unknown_error_title">Prišlo je do neznane napake</string>
   <string name="auth_unknown_error_message">Prišlo je do neznane napake. Na napako opozorite razvijalce in jim posredujete dnevniške zapise z naprave.</string>
   <string name="auth_unknown_host_title">Gostitelja ni mogoče najti</string>
-  <string name="auth_unknown_host_message">Vpisanega gostitelja ni bilo mogoče nati. Preverite ime gostitelja in razpoložljivost strežnika ter poskusite znova.</string>
+  <string name="auth_unknown_host_message">Vpisanega gostitelja ni mogoče najti. Preveriti je treba ime gostitelja in razpoložljivost strežnika.</string>
   <string name="auth_incorrect_path_title">Namestitve ownCloud ni mogoče najti</string>
   <string name="auth_incorrect_path_message">Na podani poti ni bilo mogoče najti namestitve ownCloud. Preverite vpisano pot in poskusite znova.</string>
   <string name="auth_timeout_title">Strežnik je potreboval preveč časa za odgovor</string>
@@ -154,8 +174,6 @@
   <string name="auth_bad_oc_version_title">Neprepoznana različica strežnika ownCloud</string>
   <string name="auth_wrong_connection_title">Povezave ni mogoče vzpostaviti</string>
   <string name="auth_secure_connection">Varna povezava je vzpostavljena</string>
-  <string name="auth_login_details">Podrobnost prijave</string>
-  <string name="auth_unauthorized">Neveljavna prijava / geslo</string>
   <string name="auth_not_found">Podana je bila napačna pot</string>
   <string name="auth_internal">Notranja napaka strežnika, koda %1$d</string>
   <string name="crashlog_message">Program se je nepričakovano zaprl. Ali bi želeli poslati poročilo o sesutju?</string>
@@ -167,9 +185,9 @@
   <string name="common_share">Souporaba</string>
   <string name="common_rename">Preimenuj</string>
   <string name="common_remove">Odstrani</string>
-  <string name="confirmation_remove_alert">Ali ste prepričani, da želite odstraniti %1$s ?</string>
+  <string name="confirmation_remove_alert">Ali res želite odstraniti %1$s ?</string>
   <string name="confirmation_remove_folder_alert">Ali ste prepričani, da želite odstraniti %1$s in njeno vsebino?</string>
-  <string name="confirmation_remove_local">Samo krajevno</string>
+  <string name="confirmation_remove_local">Le krajevno</string>
   <string name="confirmation_remove_folder_local">Samo lokalne vsebine</string>
   <string name="confirmation_remove_remote">Odstrani s strežnika</string>
   <string name="confirmation_remove_remote_and_local">Oddaljeno in krajevno</string>
@@ -201,19 +219,29 @@
   <string name="ssl_validator_label_O">Organizacija:</string>
   <string name="ssl_validator_label_OU">Organizacijska enota:</string>
   <string name="ssl_validator_label_C">Država:</string>
-  <string name="ssl_validator_label_ST">Zvezna država:</string>
-  <string name="ssl_validator_label_L">Lokacija:</string>
+  <string name="ssl_validator_label_ST">Regija:</string>
+  <string name="ssl_validator_label_L">Mesto:</string>
   <string name="ssl_validator_label_validity">Veljavnost:</string>
   <string name="ssl_validator_label_validity_from">Od:</string>
   <string name="ssl_validator_label_validity_to">Do:</string>
   <string name="ssl_validator_label_signature">Podpis:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritem:</string>
-  <string name="text_placeholder">To je vsebnik predmetov.</string>
-  <string name="instant_upload_on_wifi">Pošiljaj slike le preko protokola Wi-Fi</string>
+  <string name="placeholder_sentence">To je vsebnik predmetov.</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">Pošiljaj slike le preko povezav Wi-Fi</string>
   <string name="instant_upload_path">/NeposrednoNalaganje</string>
-  <string name="conflict_title">Posodobi konflikt</string>
-  <string name="conflict_message">Oddaljena datoteka %s ni usklajena z lokalno datoteko. Če nadaljujete, bo datoteka na strežniku zamenjana z vašo lokalno.</string>
+  <string name="conflict_title">Posodobi podatke spora</string>
+  <string name="conflict_message">Oddaljena datoteka %s ni usklajena s krajevno. Z nadaljevanem bo datoteka na strežniku zamenjana s krajevno.</string>
   <string name="conflict_keep_both">Ohrani obe</string>
   <string name="conflict_overwrite">Prepiši</string>
-  <string name="conflict_dont_upload">Ne naloži</string>
+  <string name="conflict_dont_upload">Ne pošlji</string>
+  <string name="preview_image_description">Predogled slike</string>
+  <string name="preview_image_error_unknown_format">Te slike ni mogoče prikazati</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">Datoteke %1$s ni mogoče kopirati v krajevno mapo %2$s.</string>
+  <string name="failed_upload_all_cb">izberi vse</string>
+  <string name="failed_upload_load_more_images">Naloži več slik</string>
+  <string name="failed_upload_failure_text">Sporočilo o napaki:</string>
 </resources>

res/values-sq/strings.xml

@@ -1,2 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="main_files">Skedarët</string>
+  <string name="main_music">Muzikë</string>
+  <string name="main_contacts">Kontake</string>
+  <string name="main_settings">Parametrat</string>
+  <string name="actionbar_upload">Ngarko</string>
+  <string name="actionbar_upload_files">Skedarët</string>
+  <string name="actionbar_settings">Parametrat</string>
+  <string name="auth_username">Përdoruesi</string>
+  <string name="auth_password">Kodi</string>
+  <string name="sync_string_files">Skedarët</string>
+  <string name="setup_hint_username">Përdoruesi</string>
+  <string name="setup_hint_password">Kodi</string>
+  <string name="uploader_btn_upload_text">Ngarko</string>
+  <string name="filedetails_download">Shkarko</string>
+  <string name="common_yes">Po</string>
+  <string name="common_no">Jo</string>
+  <string name="common_cancel_upload">Anulo ngarkimin</string>
+  <string name="common_cancel">Anulo</string>
+  <string name="common_error">Veprim i gabuar</string>
+  <string name="sync_string_contacts">Kontake</string>
+  <string name="common_share">Nda</string>
+  <string name="common_rename">Riemërto</string>
+  <!--we need to improve the communication of errors to the user-->
+</resources>

res/values-sr-rSP/strings.xml

@@ -14,4 +14,5 @@
   <string name="uploader_btn_upload_text">Pošalji</string>
   <string name="filedetails_download">Preuzmi</string>
   <string name="common_cancel">Otkaži</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-sr/strings.xml

@@ -11,7 +11,6 @@
   <string name="main_bookmarks">Обележивачи</string>
   <string name="main_settings">Поставке</string>
   <string name="main_tit_accsetup">Подешавање налога</string>
-  <string name="actionbar_sync">Освежи</string>
   <string name="actionbar_upload">Отпреми</string>
   <string name="actionbar_upload_from_apps">Садржај са других апликација</string>
   <string name="actionbar_upload_files">Датотеке</string>
@@ -19,13 +18,13 @@
   <string name="actionbar_search">Претражи</string>
   <string name="actionbar_settings">Поставке</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>
   <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>
@@ -50,8 +49,6 @@
   <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>
@@ -92,12 +89,10 @@
     <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>
@@ -108,7 +103,6 @@
   <string name="auth_ssl_unverified_server_title">Непроверен идентитет SSL сервера</string>
   <string name="auth_wrong_connection_title">Не могу да успоставим везу</string>
   <string name="auth_secure_connection">Безбедна веза је успостављена</string>
-  <string name="auth_login_details">Подаци за пријаву</string>
   <string name="crashlog_send_report">Пошаљи извештај</string>
   <string name="crashlog_dont_send_report">Не шаљи извештај</string>
   <string name="extensions_avail_title">Доступна су проширења.</string>
@@ -147,7 +141,7 @@
   <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">Отпремај слике само путем бежичне мреже</string>
   <string name="conflict_title">Ажурирај сукоб</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-sv/strings.xml

@@ -13,16 +13,18 @@
   <string name="main_settings">Inställningar</string>
   <string name="main_tit_accsetup">Skapa konto</string>
   <string name="main_wrn_accsetup">Det finns inget konto för ownCloud på denna enhet. För att kunna använda ownCloud så måste du skapa ett konto.</string>
-  <string name="about_message">%1$s Android klient\n\nversion: %2$s</string>
-  <string name="actionbar_sync">Uppdatera</string>
+  <string name="about_android">%1$s Android App</string>
+  <string name="about_version">version %1$s</string>
+  <string name="actionbar_sync">Uppdatera konto</string>
   <string name="actionbar_upload">Ladda upp</string>
   <string name="actionbar_upload_from_apps">Innehåll från andra program</string>
   <string name="actionbar_upload_files">Filer</string>
+  <string name="actionbar_open_with">Öppna med</string>
   <string name="actionbar_mkdir">Skapa mapp</string>
   <string name="actionbar_search">Sök</string>
   <string name="actionbar_settings">Inställningar</string>
+  <string name="actionbar_see_details">Detaljer</string>
   <string name="prefs_category_general">Allmänt</string>
-  <string name="prefs_category_trackmydevice">Spåra enhet</string>
   <string name="prefs_add_session">Lägg till ny session</string>
   <string name="prefs_create_img_thumbnails">Skapa miniatyrbilder</string>
   <string name="prefs_select_oc_account">Välj ett konto</string>
@@ -38,7 +40,12 @@
   <string name="prefs_pincode_summary">Skydda ownCloud-klienten</string>
   <string name="prefs_instant_upload">Aktivera direktuppladdning</string>
   <string name="prefs_instant_upload_summary">Direktuppladdning av kamerabilder</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="prefs_log_title">Aktivera loggning</string>
+  <string name="prefs_log_summary">Används för att logga problem</string>
+  <string name="prefs_log_title_history">Logghistorik</string>
+  <string name="prefs_log_summary_history">Visar sparade loggar</string>
+  <string name="prefs_log_delete_history_button">Radera historik</string>
+  <string name="auth_host_url">Serveradress</string>
   <string name="auth_username">Användare</string>
   <string name="auth_password">Lösenord</string>
   <string name="auth_register">%1$s är nytt för mig</string>
@@ -53,6 +60,7 @@
   <string name="setup_title">Anslut till %1$s</string>
   <string name="setup_btn_connect">Anslut</string>
   <string name="uploader_btn_upload_text">Ladda upp</string>
+  <string name="uploader_top_message">Välj mapp för uppladdning:</string>
   <string name="uploader_wrn_no_account_title">Hittar inget konto</string>
   <string name="uploader_wrn_no_account_text">Det finns inga konton för %1$s på denna enhet. Var god skapa ett konto först.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Skapa</string>
@@ -69,9 +77,8 @@
   <string name="filedetails_created">Skapad:</string>
   <string name="filedetails_modified">Ändrad:</string>
   <string name="filedetails_download">Ladda ner</string>
-  <string name="filedetails_sync_file">Uppdatera</string>
+  <string name="filedetails_sync_file">Ladda om fil</string>
   <string name="filedetails_redownload">Ladda ner igen</string>
-  <string name="filedetails_open">Öppna</string>
   <string name="filedetails_renamed_in_upload_msg">Filen bytte namn till %1$s under uppladdningen</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nej</string>
@@ -82,6 +89,8 @@
   <string name="common_save_exit">Spara &amp; Avsluta</string>
   <string name="common_exit">Lämna %1$s</string>
   <string name="common_error">Fel</string>
+  <string name="common_loading">Laddar...</string>
+  <string name="common_error_unknown">Okänt fel</string>
   <string name="about_title">Om</string>
   <string name="delete_account">Radera konto</string>
   <string name="create_account">Skapa konto</string>
@@ -90,7 +99,7 @@
   <string name="uploader_upload_in_progress_ticker">Laddar upp ...</string>
   <string name="uploader_upload_in_progress_content">%1$d%% Laddar upp %2$s</string>
   <string name="uploader_upload_succeeded_ticker">Uppladdning klar</string>
-  <string name="uploader_upload_succeeded_content_single">%1$s var uppladdade</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s laddades upp</string>
   <string name="uploader_upload_succeeded_content_multiple">%1$d filer uppladdade</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>
@@ -101,14 +110,25 @@
   <string name="downloader_download_succeeded_content">%1$s laddades ner</string>
   <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="common_choose_account">Välj konto</string>
   <string name="sync_string_contacts">Kontakter</string>
   <string name="sync_fail_ticker">Synkroniseringen misslyckades</string>
   <string name="sync_fail_content">Synkronisering av %1$s kunde inte slutföras</string>
+  <string name="sync_fail_content_unauthorized">Ogiltiga inloggningsuppgifter för %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Konflikter uppstod</string>
   <string name="sync_conflicts_in_favourites_content">%1$d Flaggad som Håll-filen-uppdaterad kan inte synkas</string>
   <string name="sync_fail_in_favourites_ticker">Filer flaggade som Håll-filen-uppdaterad misslyckades</string>
   <string name="sync_fail_in_favourites_content">Innehållet i %1$d filer kunde inte synkas (%2$d konflikter)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Vissa lokala filer glömdes</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d filer från %2$s mappar kunde inte kopieras till</string>
+  <string name="sync_foreign_files_forgotten_explanation">Från och med version 1.3.16 kopieras uppladdade filer från den här enheten till den lokala %1$s mappen för att förhindra förlust av data när en enda fil synkroniseras med flera konton.\n\nPå grund av denna förändring har alla filer som laddats upp i tidigare versioner av denna app kopierats till %2$s mappen. Men ett fel förhindrade slutförande av denna operation under synkronisering. Du kan antingen lämna fil(er) som det är och ta bort länken till %3$s, eller flytta fil(er) till %1$s mappen och behålla länken till %4$s.\n\nNedan listas dom lokala fil(er) och fjärrfil(er) i %5$s dom var länkade till.</string>
+  <string name="foreign_files_move">Flytta allt</string>
+  <string name="foreign_files_success">Alla filer flyttades</string>
+  <string name="foreign_files_fail">Vissa filer kunde inte flyttas</string>
+  <string name="foreign_files_local_text">Lokal: %1$s</string>
+  <string name="foreign_files_remote_text">Fjärr: %1$s</string>
+  <string name="upload_query_move_foreign_files">Det finns inte tillräckligt med utrymme för att kopiera valda filer till mappen %1$s. Vill du flytta filerna istället? </string>
   <string name="use_ssl">Använd säker anslutning</string>
   <string name="location_no_provider">%1$s  kan inte spåra denna enhet. Kontrollera dina platsinställningar</string>
   <string name="pincode_enter_pin_code">Ange din PIN</string>
@@ -121,6 +141,27 @@
   <string name="pincode_wrong">Felaktig ownCloud PIN</string>
   <string name="pincode_removed">ownCloud PIN raderad</string>
   <string name="pincode_stored">ownCloud PIN sparad</string>
+  <string name="media_notif_ticker">%1$ musikspelare</string>
+  <string name="media_state_playing">%1$s (spelar)</string>
+  <string name="media_state_loading">%1$s (buffrar)</string>
+  <string name="media_event_done">%1$s spelat färdigt</string>
+  <string name="media_err_nothing_to_play">Hittar ingen medie-fil</string>
+  <string name="media_err_no_account">Inget konto är angivet</string>
+  <string name="media_err_not_in_owncloud">Filen finns i ett ogiltigt konto</string>
+  <string name="media_err_unsupported">Saknar stöd för denna mediatyp</string>
+  <string name="media_err_io">Mediafil kunde inte skapas</string>
+  <string name="media_err_malformed">Mediafilen är felaktigt kodad</string>
+  <string name="media_err_timeout">Försökt att spela för länge</string>
+  <string name="media_err_invalid_progressive_playback">Meidiafilen kan inte strömmas</string>
+  <string name="media_err_unknown">Mediefilen kan inte spelas med standardspelaren</string>
+  <string name="media_err_security_ex">Säkerhetsproplem när vi försöker spela %1$s</string>
+  <string name="media_err_io_ex">Inmatningsfel när vi försöker spela %1$s</string>
+  <string name="media_err_unexpected">Oväntat fel när vi försöker spela %1$s</string>
+  <string name="media_previous_description">Tillbaka till föregående spår</string>
+  <string name="media_rewind_description">Bakåtspolningsknapp</string>
+  <string name="media_play_pause_description">Spela- / Pausknapp</string>
+  <string name="media_forward_description">Snappspolningsknapp</string>
+  <string name="media_next_description">Nästa spår</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 Minuter</item>
     <item>30 Minuter</item>
@@ -154,10 +195,14 @@
   <string name="auth_bad_oc_version_title">Okänd ownCloud serverversion</string>
   <string name="auth_wrong_connection_title">Kunde inte etablera anslutning</string>
   <string name="auth_secure_connection">Säker anslutning etablerad</string>
-  <string name="auth_login_details">Inloggningsuppgifter</string>
-  <string name="auth_unauthorized">Felaktigt användarnamn / lösenord</string>
+  <string name="auth_unauthorized">Ogiltiga inloggningsuppgifter</string>
+  <string name="auth_oauth_error">Behörighet saknas</string>
+  <string name="auth_oauth_error_access_denied">Nekad åtkomst av server</string>
   <string name="auth_not_found">Felaktig  sökväg angavs</string>
   <string name="auth_internal">Internt serverfel, kod %1$d</string>
+  <string name="auth_wtf_reenter_URL">Oväntat tillstånd; Ange serverns URL igen</string>
+  <string name="auth_expired_oauth_token_toast">Din inloggning har gått ut.\nVar god, logga in igen</string>
+  <string name="auth_expired_basic_auth_toast">Dina sparade uppgifter är felaktiga.\nVar god ange aktuella uppgifter</string>
   <string name="crashlog_message">Applikationen avslutades oväntat. Vill du skicka en felrapport?</string>
   <string name="crashlog_send_report">Skicka rapport</string>
   <string name="crashlog_dont_send_report">Skicka inte rapport</string>
@@ -184,6 +229,11 @@
   <string name="wait_a_moment">Var god vänta</string>
   <string name="filedisplay_unexpected_bad_get_content">Oväntat problem; prova annat program för aktuell fil</string>
   <string name="filedisplay_no_file_selected">Ingen fil vald</string>
+  <string name="oauth_host_url">oAuth2 URL</string>
+  <string name="oauth_check_onoff">Logga in med oAuth2.</string>
+  <string name="oauth_login_connection">Ansluter till oAuth2 servern…</string>
+  <string name="oauth_code_validation_message">Öppna en webbläsare och gå till:\n%1$s.\nAnge denna kod för validering:\n%2$s</string>
+  <string name="oauth_connection_url_unavailable">Anslutning till denna URL är inte tillgänglig.</string>
   <string name="ssl_validator_title">Varning</string>
   <string name="ssl_validator_header">Webbplatsens identitet kunde inte verifieras</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Servercertifikatet är inte tillförlitligt</string>
@@ -208,12 +258,33 @@
   <string name="ssl_validator_label_validity_to">Till:</string>
   <string name="ssl_validator_label_signature">Signatur:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritm:</string>
-  <string name="text_placeholder">Detta är en platshållare</string>
+  <string name="placeholder_sentence">Detta är en platshållare</string>
+  <string name="placeholder_filename">placeholder.txt</string>
+  <string name="placeholder_filetype">PNG Bild</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">Ladda upp bilder endast via WiFi</string>
   <string name="instant_upload_path">/DirektUppladdning</string>
-  <string name="conflict_title">Uppdatera konflikt</string>
+  <string name="conflict_title">Uppdateringskonflikt</string>
   <string name="conflict_message">Serverns fil %s är inte synkroniserad med den lokala filen. Fortsätt för att skriva över filen på servern.</string>
   <string name="conflict_keep_both">Behåll båda</string>
   <string name="conflict_overwrite">Skriv över</string>
   <string name="conflict_dont_upload">Ladda inte upp</string>
+  <string name="preview_image_description">Förhandsvisa bild</string>
+  <string name="preview_image_error_unknown_format">Denna bild kan inte visas</string>
+  <string name="preview_image_error_out_of_memory">\"Inte tillräckligt med minne för att visa bilden</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s kunde inte kopieras till %2$s lokal mapp</string>
+  <string name="actionbar_failed_instant_upload">Fel vid direktuppladdning\"</string>
+  <string name="failed_upload_headline_text">Misslyckades vid direktuppladdning</string>
+  <string name="failed_upload_headline_hint">Sammanfattning av alla misslyckade uppladdningar</string>
+  <string name="failed_upload_all_cb">välj alla</string>
+  <string name="failed_upload_headline_retryall_btn">försökt igen med alla valda</string>
+  <string name="failed_upload_headline_delete_all_btn">radera alla valda från uppladdningskön</string>
+  <string name="failed_upload_retry_text">försök igen att ladda upp bilden:</string>
+  <string name="failed_upload_load_more_images">Ladda fler bilder</string>
+  <string name="failed_upload_retry_do_nothing_text">Du är inte ansluten, direktuppladdning ej möjligt</string>
+  <string name="failed_upload_failure_text">Felmeddelande:</string>
+  <string name="failed_upload_quota_exceeded_text">Vänligen kontrollera dina serverkonfiguration. Din kvot kan ha överskridits.</string>
 </resources>

res/values-sw-rKE/strings.xml

@@ -1,2 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <!--we need to improve the communication of errors to the user-->
+</resources>

res/values-ta-rLK/strings.xml

@@ -13,16 +13,14 @@
   <string name="main_settings">அமைப்புகள்</string>
   <string name="main_tit_accsetup">கணக்கு அமைப்பு</string>
   <string name="main_wrn_accsetup">உங்களுடைய சாதனத்தில் ownCloud கணக்குகள் இல்லை. இந்த செயலிகளை பயன்படுத்துவதற்கு நீங்கள் கணக்கொன்றை உருவாக்க வேண்டும்.</string>
-  <string name="about_message">ownCloud Android சேவைப் பயனர்⏎ ⏎ பதிப்பு: %1$s</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="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>
@@ -38,7 +36,7 @@
   <string name="prefs_pincode_summary">உங்களுடைய ownCloud சேவைப் பயனரை பாதுகாக்க</string>
   <string name="prefs_instant_upload">உடனடி பதிவேற்றலை இயலுமைப்படுத்துக</string>
   <string name="prefs_instant_upload_summary">கமராவினால் எடுக்கப்பட்ட படங்கள் உடனடியாக பதிவேற்றப்பட்டன</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="auth_host_url">சேவையக முகவரி</string>
   <string name="auth_username">பயனாளர் பெயர்</string>
   <string name="auth_password">கடவுச்சொல்</string>
   <string name="auth_register">ownCloud இற்கு நான் புதிது</string>
@@ -69,9 +67,7 @@
   <string name="filedetails_created">உருவாக்கப்பட்டது:</string>
   <string name="filedetails_modified">மாற்றப்பட்டது:</string>
   <string name="filedetails_download">பதிவிறக்குக</string>
-  <string name="filedetails_sync_file">மீள் ஏற்றுக</string>
   <string name="filedetails_redownload">மீள் ஏற்றுக</string>
-  <string name="filedetails_open">திறக்க</string>
   <string name="filedetails_renamed_in_upload_msg">பதிவேற்றும்போது கோப்பின் பெயரானது %1$s ஆக பெயர்மாற்றப்பட்டது</string>
   <string name="common_yes">ஆம்</string>
   <string name="common_no">இல்லை</string>
@@ -129,14 +125,12 @@
     <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_no_net_conn_message">எந்தவொரு வலையமைப்பு இணைப்பும் கண்டுப்பிடிக்கப்படவில்லை, இணைய இணைப்பை சரிபார்த்துவிட்டு மீண்டும் முயற்சிக்கவும். </string>
   <string name="auth_connect_anyway">எப்படியாவது இணைக்க</string>
   <string name="auth_nossl_plain_ok_title">பாதுகாப்பான இணைப்பு காணப்படவில்லை.</string>
   <string name="auth_nossl_plain_ok_message">செயலியினால் சேவையகத்துடன் பாதுகாப்பான இணைப்பை ஏற்படுத்த முடியவில்லை.  பாதுகாப்பற்ற இணைப்புகளும் காணப்படுகின்றன. நீங்கள் தொடரலாம் அல்லது இரத்துசெய்யலாம்.</string>
   <string name="auth_connection_established">இணைப்பு நிறுவப்பட்டது</string>
-  <string name="auth_testing_connection">இணைப்பு சோதிக்கப்படுகிறது.....</string>
   <string name="auth_not_configured_title">பிறழ்வான ownCloud தகவமைப்பு</string>
   <string name="auth_not_configured_message">உங்களுடைய ownCloud சரியாக தகவமைக்கப்படாததாக தெரிகிறது. மேலதிக தகவல்களுக்கு நிர்வாகியை தொடர்புகொள்ளவும்</string>
   <string name="auth_unknown_error_title">அறியப்படாத வழு ஏற்பட்டுள்ளது!</string>
@@ -152,7 +146,6 @@
   <string name="auth_bad_oc_version_title">அங்கீகரிக்கப்படாத ownCloud சேவையகம் பதிப்பு</string>
   <string name="auth_wrong_connection_title">இணைப்பை நிறுவமுடியாது</string>
   <string name="auth_secure_connection">பாதுகாப்பான இணைப்பு உருவாக்கப்பட்டது.</string>
-  <string name="auth_login_details">புகுபதிகை விவரங்கள்</string>
   <string name="crashlog_message">செயலி எதிர்பாராமல் முடிவுற்றது. உங்களுக்கு முறிவு அறிக்கை ஒன்றை சமர்ப்பிப்பதற்கு விருப்பம்மா?</string>
   <string name="crashlog_send_report">அறிக்கையை அனுப்பவும்</string>
   <string name="crashlog_dont_send_report">அறிக்கையை அனுப்பவேண்டாம்</string>
@@ -203,11 +196,12 @@
   <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">இது ஒரு placeholder</string>
+  <string name="placeholder_sentence">இது ஒரு placeholder</string>
   <string name="instant_upload_on_wifi">WiFi ஊடாக மட்டும் படங்களை பதிவேற்றுக</string>
   <string name="conflict_title">இற்றைப்படுத்தலில் முரண்பாடு</string>
   <string name="conflict_message">இடத்துரி கோப்புடன் தொலைவு கோப்பு %s ஒத்திசைவாக்கப்படவில்லை. தொடர்ந்து மேற்கொண்டால் சேவையகத்தில் உள்ள கோப்பின் உள்ளடக்கம் மாற்றப்படும்.</string>
   <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-->
 </resources>

res/values-te/strings.xml

@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="main_password">సంకేతపదం:</string>
+  <string name="main_music">సంగీతం</string>
+  <string name="main_settings">అమరికలు</string>
+  <string name="actionbar_settings">అమరికలు</string>
+  <string name="auth_host_url">సేవకి చిరునామా</string>
+  <string name="auth_username">వాడుకరి పేరు</string>
+  <string name="auth_password">సంకేతపదం</string>
+  <string name="setup_hint_username">వాడుకరి పేరు</string>
+  <string name="setup_hint_password">సంకేతపదం</string>
+  <string name="common_yes">అవును</string>
+  <string name="common_no">కాదు</string>
+  <string name="common_cancel">రద్దుచేయి</string>
+  <string name="common_error">పొరపాటు</string>
+  <!--we need to improve the communication of errors to the user-->
+</resources>

res/values-th-rTH/strings.xml

@@ -13,16 +13,14 @@
   <string name="main_settings">ตั้งค่า</string>
   <string name="main_tit_accsetup">ตั้งค่าบัญชี</string>
   <string name="main_wrn_accsetup">ไม่มีบัญชี ownCloud ของคุณอยู่บนอุปกรณ์ของคุณ หากต้องการใช้งานแอปตัวนี้ คุณจำเป็นต้องสร้างบัญชีใหม่</string>
-  <string name="about_message">โปรแกรมไคลเอนต์ ownCloud สำหรับใช้งานกับแอนดรอยด์\n\nรุ่น: %1$s</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="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>
@@ -38,7 +36,7 @@
   <string name="prefs_pincode_summary">ป้องกันโปรแกรมไคลเอนต์ ownCloud ของคุณ</string>
   <string name="prefs_instant_upload">เปิดใช้งานระบบอัพโหลดได้ทันที</string>
   <string name="prefs_instant_upload_summary">อัพโหลดรูปภาพจากกล้องขึ้นไปทันที</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="auth_host_url">ที่อยู่เซิร์ฟเวอร์</string>
   <string name="auth_username">ชื่อผู้ใช้</string>
   <string name="auth_password">รหัสผ่าน</string>
   <string name="auth_register">ข้าพเจ้าเพิ่งใช้งาน ownCloud</string>
@@ -69,9 +67,7 @@
   <string name="filedetails_created">สร้างเมื่อ:</string>
   <string name="filedetails_modified">แก้ไขเมื่อ:</string>
   <string name="filedetails_download">ดาวน์โหลด</string>
-  <string name="filedetails_sync_file">รีเฟรช</string>
   <string name="filedetails_redownload">ดาวน์โหลดใหม่อีกครั้ง</string>
-  <string name="filedetails_open">เปิด</string>
   <string name="filedetails_renamed_in_upload_msg">ไฟล์ได้ถูกเปลี่ยนชื่อเป็น %1$s ในระหว่างการอัพโหลด</string>
   <string name="common_yes">ตกลง</string>
   <string name="common_no">ไม่ตกลง</string>
@@ -109,6 +105,13 @@
   <string name="sync_conflicts_in_favourites_content">%1$d ไฟล์ kept-in-sync ไม่สามารถผสานเชื่อมข้อมูลได้</string>
   <string name="sync_fail_in_favourites_ticker">ไฟล์ Kept-in-sync ล้มเหลว</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_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">กรุณาใส่ PIN แอปของคุณ</string>
@@ -131,14 +134,12 @@
     <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_no_net_conn_message">ไม่พบการเชื่อมต่อเครือข่ายใด กรุณาตรวจสอบสถานะการเชื่อมต่ออินเทอร์เน็ตของคุณ แล้วลองใหม่อีกครั้ง</string>
   <string name="auth_connect_anyway">เชื่อมต่ออยู่แล้ว</string>
   <string name="auth_nossl_plain_ok_title">การเชื่อมต่อแบบรักษาความปลอดภัยไม่สามารถใช้งานได้</string>
   <string name="auth_nossl_plain_ok_message">แอพพลิเคชั่นยังไม่ได้ติดตั้งการเชื่อมต่อแบบปลอดภัยกับเซิร์ฟเวอร์ ถึงแม้ว่าจะมีการเชื่อมต่อแบบที่ยังไม่ได้กำหนดให้มีความปลอดภัย คุณสามารถดำเนินการต่อไป หรือยกเลิกได้</string>
   <string name="auth_connection_established">ติดตั้งการเชื่อมต่อแล้ว</string>
-  <string name="auth_testing_connection">กำลังทดสอบการเชื่อมต่อ...</string>
   <string name="auth_not_configured_title">การกำหนดค่า Malformed ownCloud</string>
   <string name="auth_not_configured_message">ดูเหมือนว่าค่าตัวอย่าง ownCloud ของคุณยังไม่ได้ถูกกำหนดค่าอย่างถูกต้อง กรุณาติดต่อผู้ดูแลระบบของคุณ สำหรับรายละเอียดเพิ่มเติม</string>
   <string name="auth_unknown_error_title">เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ!</string>
@@ -154,8 +155,6 @@
   <string name="auth_bad_oc_version_title">รุ่นของเซิร์ฟเวอร์ ownCloud ไม่เป็นที่รู้จัก</string>
   <string name="auth_wrong_connection_title">ไม่สามารถเชื่อมต่อได้</string>
   <string name="auth_secure_connection">ดำเนินการติดตั้งการเชื่อมต่อแบบปลอดภัยเรียบร้อย</string>
-  <string name="auth_login_details">รายละเอียดการเข้าสู่ระบบ</string>
-  <string name="auth_unauthorized">ชื่อล็อคอิน/รหัสผ่าน ไม่ถูกต้อง</string>
   <string name="auth_not_found">กรอกตำแหน่งพาธไม่ถูกต้อง</string>
   <string name="auth_internal">เกิดข้อผิดพลาดภายในเซิร์ฟเวอร์ รหัส %1$d</string>
   <string name="crashlog_message">แอพพลิเคชั่นได้สิ้นสุดการทำงานอย่างไม่คาดคิด คุณต้องการแจ้งข้อมูลความบกพร่องดังกล่าวหรือไม่?</string>
@@ -208,7 +207,7 @@
   <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="instant_upload_on_wifi">อัพโหลดรูปภาพผ่านทาง WiFi เท่านั้น</string>
   <string name="instant_upload_path">/อัพโหลดทันที</string>
   <string name="conflict_title">ปรับปรุงปัญหาความขัดแย้ง</string>
@@ -216,4 +215,6 @@
   <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>
 </resources>

res/values-tr/strings.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">ownCloud</string>
-  <string name="main_password">Şifre:</string>
+  <string name="main_password">Parola:</string>
   <string name="main_login">Kullanıcı Adı:</string>
   <string name="main_button_login">Giriş</string>
   <string name="main_welcome">ownCloud\'ınıza hoşgeldiniz</string>
@@ -13,7 +13,6 @@
   <string name="main_settings">Ayarlar</string>
   <string name="main_tit_accsetup">Kurulum Hesabi</string>
   <string name="main_wrn_accsetup">Cihazınızda ownCloud hesabı bulunmamaktadır. Bu uygulamayı kullanabilmeniz için ownCloud hesabı oluşturmalısınız.</string>
-  <string name="actionbar_sync">Eşitleme hesabi</string>
   <string name="actionbar_upload">Dosya yükle</string>
   <string name="actionbar_upload_from_apps">Diğer uygulamalardan içerik</string>
   <string name="actionbar_upload_files">Dosyalar</string>
@@ -21,7 +20,6 @@
   <string name="actionbar_search">Arama</string>
   <string name="actionbar_settings">Ayarlar</string>
   <string name="prefs_category_general">Genel</string>
-  <string name="prefs_category_trackmydevice">Cihaz tabiki</string>
   <string name="prefs_add_session">Yeni oturum ekle</string>
   <string name="prefs_create_img_thumbnails">Küçük resim oluştur</string>
   <string name="prefs_select_oc_account">Oturum seç</string>
@@ -37,7 +35,7 @@
   <string name="prefs_pincode_summary">İstemcinizi koruyun</string>
   <string name="prefs_instant_upload">Anında yükleme etkinleştir</string>
   <string name="prefs_instant_upload_summary">Anında çekilen fotoğrafları yükle</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="auth_host_url">Sunucu Adresi</string>
   <string name="auth_username">Kullanıcı Adi:</string>
   <string name="auth_password">Şifre:</string>
   <string name="auth_register">ownCloud\'da yeniyim.</string>
@@ -68,9 +66,8 @@
   <string name="filedetails_created">Yaratma:</string>
   <string name="filedetails_modified">Değiştirme:</string>
   <string name="filedetails_download">İndir</string>
-  <string name="filedetails_sync_file">Tazele</string>
   <string name="filedetails_redownload">Tekrar indir</string>
-  <string name="filedetails_open">Aç</string>
+  <string name="filedetails_renamed_in_upload_msg">Dosya adı, yükleme sırasında %1$s olarak değiştirildi</string>
   <string name="common_yes">Evet</string>
   <string name="common_no">Hayır</string>
   <string name="common_ok">OK</string>
@@ -80,6 +77,7 @@
   <string name="common_save_exit">Kaydet %amp; Kapat</string>
   <string name="common_exit">Çıkış</string>
   <string name="common_error">Hata</string>
+  <string name="common_error_unknown">Bilinmeyen hata</string>
   <string name="about_title">Hakkında</string>
   <string name="delete_account">Hesabı sil</string>
   <string name="create_account">Hesap oluştur</string>
@@ -104,6 +102,17 @@
   <string name="sync_fail_ticker">Eşitleme başarısız</string>
   <string name="sync_fail_content">%1$s Senkronizasyonu tamamlanamadı</string>
   <string name="sync_conflicts_in_favourites_ticker">Çakışma bulundu</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d korumalı senkronizasyon dosyası, senkronize edilemedi</string>
+  <string name="sync_fail_in_favourites_ticker">Korunan dosya senkronizasyonu başarısız</string>
+  <string name="sync_fail_in_favourites_content">%1$d dosya  senkronize edilemedi  (%2$d hata)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Bazı yerel dosyalar unutuldu</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d dosyalar  %2$s dizinine kopyalanamadı</string>
+  <string name="foreign_files_move">Tümünü taşı</string>
+  <string name="foreign_files_success">Tüm dosyalar taşındı</string>
+  <string name="foreign_files_fail">Bazı dosyalar taşınamadı</string>
+  <string name="foreign_files_local_text">Yerel: %1$s</string>
+  <string name="foreign_files_remote_text">Uzak: %1$s</string>
+  <string name="upload_query_move_foreign_files">Seçilen dosyaları %1$s dizinine kopyalamak için yeterli alan yok. Bunun yerine dosyayı taşımak ister misiniz?</string>
   <string name="use_ssl">Güvenli bağlanti kullan</string>
   <string name="location_no_provider">ownCloud cihazınızı takip edemiyor. Lütfen konum ayarlarınızı kontrol ediniz</string>
   <string name="pincode_enter_pin_code">Lütfen uygulama PIN\'ınızı giriniz</string>
@@ -126,14 +135,12 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Giriş için deneniyor</string>
   <string name="auth_no_net_conn_title">Ağ bağlantısı yok</string>
   <string name="auth_no_net_conn_message">Ağ bağlantısı bulunamadı. İnternet bağlantı ayarlarınızı kontrol edin ve tekrar deneyin.</string>
   <string name="auth_connect_anyway">Her halükarda bağlan</string>
   <string name="auth_nossl_plain_ok_title">Günvenli bağlantı mevcut değil.</string>
   <string name="auth_nossl_plain_ok_message">Uygulama sunucu ile güvenli bağlantı kuramadı. Buna rağmen güvensiz bağlantı mevcut. Devam edebilirsiniz veya iptal edebilirsiniz.</string>
   <string name="auth_connection_established">Bağlantı kuruldu</string>
-  <string name="auth_testing_connection">Bağlantı kontrol ediliyor ...</string>
   <string name="auth_not_configured_title">Hatalı ownCloud ayarı.</string>
   <string name="auth_not_configured_message">Görünüşe bakılırsa ownCloud servisiniz doğru ayarlanmamış. Detaylı bilgi için sistem yöneticinize başvurunuz.</string>
   <string name="auth_unknown_error_title">Bilinmeyen hata oluştu.</string>
@@ -149,8 +156,8 @@
   <string name="auth_bad_oc_version_title">Bilinmeyen ownCloud sunucu sürümü</string>
   <string name="auth_wrong_connection_title">Bağlantı kurulamadı</string>
   <string name="auth_secure_connection">Güvenli bağlantı sağlandı.</string>
-  <string name="auth_login_details">Giriş detayları</string>
-  <string name="auth_unauthorized">Geçersiz kullanıcı adı/parola</string>
+  <string name="auth_not_found">Hatalı dosya yolu</string>
+  <string name="auth_internal">İç sunucu hatası, kod %1$d</string>
   <string name="crashlog_message">Uygulama umulmadık bir şekilde sonlandı. Hata raporunu göndermek ister misiniz ?</string>
   <string name="crashlog_send_report">Rapor gönder</string>
   <string name="crashlog_dont_send_report">Rapor gönderme</string>
@@ -171,6 +178,8 @@
   <string name="rename_dialog_title">Yeni bir isim girin</string>
   <string name="rename_local_fail_msg">Yerel kopya adlandırılamaz; farklı bir ad deneyin</string>
   <string name="rename_server_fail_msg">Yeniden  adlandırılma tamamlanmadı</string>
+  <string name="sync_file_fail_msg">Dosya teslim edilemedi</string>
+  <string name="sync_file_nothing_to_do_msg">Dosyalar başarıyla senkronize edildi</string>
   <string name="create_dir_fail_msg">Dizin oluşturulamadı</string>
   <string name="wait_a_moment">Bir süre bekleyin</string>
   <string name="filedisplay_unexpected_bad_get_content">Beklenmeyen problem ; lütfen, dosya seçmek için diğer uygulamayı deneyin</string>
@@ -179,12 +188,16 @@
   <string name="ssl_validator_header">Bu sitenin sertifikası doğrulanamadı</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Sunucu sertifikası güvenilmez</string>
   <string name="ssl_validator_reason_cert_expired">- Sunucu sertifikasının süresi geçmiş</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">Sunucu sertifikasının geçerli olacağı tarih</string>
   <string name="ssl_validator_reason_hostname_not_verified">- URL adresi sunucu isminin sertifikası ile uyuşmuyor</string>
   <string name="ssl_validator_certificate_not_available">Sunucu sertifikası elde edilemedi</string>
   <string name="ssl_validator_question">Sertifikaya yine de güvenmek istiyor musunuz?</string>
   <string name="ssl_validator_not_saved">Sertifika kaydedilemedi</string>
   <string name="ssl_validator_btn_details_see">Ayrıntılar</string>
   <string name="ssl_validator_btn_details_hide">Gizle</string>
+  <string name="ssl_validator_label_subject">Verilen:</string>
+  <string name="ssl_validator_label_issuer">Veren:</string>
+  <string name="ssl_validator_label_CN">Ortak ad:</string>
   <string name="ssl_validator_label_O">Organizasyon:</string>
   <string name="ssl_validator_label_OU">Organizasyon birimi:</string>
   <string name="ssl_validator_label_C">Ülke:</string>
@@ -195,11 +208,13 @@
   <string name="ssl_validator_label_validity_to">Kime:</string>
   <string name="ssl_validator_label_signature">İmza:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritma:</string>
-  <string name="text_placeholder">Bu bir yer tutucudur</string>
   <string name="instant_upload_on_wifi">Resimleri sadece WiFi bağlantısında yükle</string>
   <string name="instant_upload_path">/AnındaYükle</string>
   <string name="conflict_title">Çakışmayı güncelle</string>
+  <string name="conflict_message">Uzaktaki %s dosyası, yerel dosya ile senkronize edilemedi.  işleme devam etmek sunucudaki dosyanın içeriğini değiştirecektir.</string>
   <string name="conflict_keep_both">İkisini de koru</string>
   <string name="conflict_overwrite">Üzerine yaz</string>
   <string name="conflict_dont_upload">Yükleme</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s, %2$s yerel dizine kopyalanamadı</string>
 </resources>

res/values-ug/strings.xml

@@ -0,0 +1,68 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">ئىم</string>
+  <string name="main_login">ئىشلەتكۈچى ئاتى:</string>
+  <string name="main_button_login">تىزىمغا كىرىڭ</string>
+  <string name="main_welcome">مەرھابا</string>
+  <string name="main_files">ھۆججەتلەر</string>
+  <string name="main_music">نەغمە</string>
+  <string name="main_contacts">ئالاقەداشلار</string>
+  <string name="main_calendar">يىلنامە</string>
+  <string name="main_bookmarks">خەتكۈچلەر</string>
+  <string name="main_settings">تەڭشەكلەر</string>
+  <string name="main_tit_accsetup">ھېسابات تەڭشەك</string>
+  <string name="actionbar_upload">يۈكلە</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">ئۈسكۈنە ئىزلاش</string>
+  <string name="prefs_trackmydevice_interval">يېڭىلاش ئارىلىقى</string>
+  <string name="prefs_accounts">ھېساباتلار</string>
+  <string name="auth_host_url">مۇلازىمېتىر ئادرىسى</string>
+  <string name="auth_username">ئىشلەتكۈچى ئاتى</string>
+  <string name="auth_password">ئىم</string>
+  <string name="new_session_uri_error">خاتا ئادرېس كىرگۈزۈۇلدى</string>
+  <string name="new_session_session_name_error">خاتا سۆزلىشىش ئىسمى</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_title">سىزنىڭ %1$s غا باغلىنىدۇ</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_info_uploading">يۈكلەۋاتىدۇ</string>
+  <string name="uploader_btn_create_dir_text">يۈكلەيدىغان مۇندەرىجە قۇرىدۇ</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="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="common_error_unknown">يوچۇن خاتالىق</string>
+  <string name="uploader_info_dirname">مۇندەرىجە ئىسمى</string>
+  <string name="common_choose_account">ھېسابات تاللاڭ</string>
+  <string name="sync_string_contacts">ئالاقەداشلار</string>
+  <string name="use_ssl">بىخەتەر باغلىنىش ئىشلەت</string>
+  <string name="common_share">ھەمبەھىر</string>
+  <string name="common_rename">ئات ئۆزگەرت</string>
+  <string name="common_remove">چىقىرىۋەت</string>
+  <string name="ssl_validator_title">ئاگاھلاندۇرۇش</string>
+  <!--we need to improve the communication of errors to the user-->
+</resources>

res/values-uk/strings.xml

@@ -13,16 +13,14 @@
   <string name="main_settings">Налаштування</string>
   <string name="main_tit_accsetup">Налаштування облікового запису</string>
   <string name="main_wrn_accsetup">На Вашому пристрої відсутні облікові запси ownCloud. Для того, щоб користуватися цим ПО, Вам потрібно створити обліковий запис.</string>
-  <string name="about_message">%1$s Android клієнт\n\nверсія: %2$s</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="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>
@@ -38,7 +36,7 @@
   <string name="prefs_pincode_summary">Захист Вашог ownCloud клієнта</string>
   <string name="prefs_instant_upload">Включити негайне завантаження</string>
   <string name="prefs_instant_upload_summary">Негайно завантажувати фото, зроблені камерою</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="auth_host_url">Адреса сервера</string>
   <string name="auth_username">Ім\'я користувача</string>
   <string name="auth_password">Пароль</string>
   <string name="auth_register">Я новачок в ownCloud</string>
@@ -69,9 +67,7 @@
   <string name="filedetails_created">Створено:</string>
   <string name="filedetails_modified">Змінено:</string>
   <string name="filedetails_download">Завантажити</string>
-  <string name="filedetails_sync_file">Оновити</string>
   <string name="filedetails_redownload">Оновити</string>
-  <string name="filedetails_open">Відкрити</string>
   <string name="filedetails_renamed_in_upload_msg">Файл був переіменований в %1$s протягом вивантаження</string>
   <string name="common_yes">Так</string>
   <string name="common_no">Ні</string>
@@ -109,6 +105,14 @@
   <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">%1$d файлів з каталогу %2$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">Будь ласка, введіть свій програмний PIN</string>
@@ -131,14 +135,12 @@
     <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_no_net_conn_message">Не знайдено підключення до мережі, перевірте своє підключення до Інтернету та спробуйте ще.</string>
   <string name="auth_connect_anyway">Все одно з\'єднатися</string>
   <string name="auth_nossl_plain_ok_title">Безпечне з\'єднання не доступне.</string>
   <string name="auth_nossl_plain_ok_message">Програма не може встановити безпечне з\'єднання з сервером. Проте, не захищене з\'єднання можливе. Ви можете продовжити або відмінити.</string>
   <string name="auth_connection_established">З\'єднання встановлено</string>
-  <string name="auth_testing_connection">Перевірка з\'єднання…</string>
   <string name="auth_not_configured_title">Не вірні налаштування ownCloud </string>
   <string name="auth_not_configured_message">Здається, Ваш ownCloud примірник не правильно налаштовано. Зверніться до адміністратора для більш докладної інформації.</string>
   <string name="auth_unknown_error_title">Виникла невідома помилка!</string>
@@ -154,8 +156,6 @@
   <string name="auth_bad_oc_version_title">Не вдалося визначити версію ownCloud серверу</string>
   <string name="auth_wrong_connection_title">Не вдалося встановити з\'єднання</string>
   <string name="auth_secure_connection">Встановлено захищене з\'єднання</string>
-  <string name="auth_login_details">Дані для входу</string>
-  <string name="auth_unauthorized">Невірний Логін / Пароль</string>
   <string name="auth_not_found">Вказано невірний шлях</string>
   <string name="auth_internal">Внутрішня помилка серверу, код %1$d</string>
   <string name="crashlog_message">Програма несподівано закрилася. Чи бажаєте Ви надіслати доповідь про аварію?</string>
@@ -208,7 +208,7 @@
   <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="instant_upload_on_wifi">Завантажувати зображення тільки через WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Конфлікт оновлення</string>
@@ -216,4 +216,6 @@
   <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>
 </resources>

res/values-ur-rPK/strings.xml

@@ -6,4 +6,9 @@
   <string name="auth_password">پاسورڈ</string>
   <string name="setup_hint_username">یوزر نیم</string>
   <string name="setup_hint_password">پاسورڈ</string>
+  <string name="common_yes">ہاں</string>
+  <string name="common_no">نہیں</string>
+  <string name="common_cancel">منسوخ کریں</string>
+  <string name="common_error">ایرر</string>
+  <!--we need to improve the communication of errors to the user-->
 </resources>

res/values-vi/strings.xml

@@ -1,28 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">ownCloud</string>
-  <string name="main_password">Mật khẩu :</string>
-  <string name="main_login">Tên người dùng :</string>
+  <string name="main_password">Mật khẩu:</string>
+  <string name="main_login">Tên người dùng:</string>
   <string name="main_button_login">Đăng nhập</string>
   <string name="main_welcome">Chào mừng bạn đến với OwnCloud</string>
   <string name="main_files">Tập tin</string>
   <string name="main_music">Âm nhạc</string>
-  <string name="main_contacts">Danh sách liên lạc</string>
+  <string name="main_contacts">Danh bạ</string>
   <string name="main_calendar">Lịch</string>
-  <string name="main_bookmarks">Bookmarks</string>
+  <string name="main_bookmarks">Đánh dấu</string>
   <string name="main_settings">Cài đặt</string>
   <string name="main_tit_accsetup">Thiết lập tài khoản</string>
   <string name="main_wrn_accsetup">Trên thiết bị của bạn không có tài khoản ownCloud. Để sử dụng ứng dụng này bạn cần phải tạo một tài khoản.</string>
-  <string name="about_message">ownCloud Android máy trạm⏎ ⏎ phiên bản: %1$s</string>
-  <string name="actionbar_sync">Đồng bộ tài khoản</string>
   <string name="actionbar_upload">Tải lên</string>
   <string name="actionbar_upload_from_apps">Nội dung từ các ứng dụng khác</string>
   <string name="actionbar_upload_files">Các tập tin</string>
   <string name="actionbar_mkdir">Tạo thư mục</string>
   <string name="actionbar_search">Tìm kiếm</string>
   <string name="actionbar_settings">Cài đặt</string>
+  <string name="actionbar_see_details">Chi tiết</string>
   <string name="prefs_category_general">Tổng hợp</string>
-  <string name="prefs_category_trackmydevice">Thiết bị theo dõi</string>
   <string name="prefs_add_session">Thêm phiên làm việc mới</string>
   <string name="prefs_create_img_thumbnails">Tạo hình ảnh thu nhỏ</string>
   <string name="prefs_select_oc_account">Chọn một tài khoản</string>
@@ -38,7 +36,7 @@
   <string name="prefs_pincode_summary">Bảo vệ ownCloud client của bạn</string>
   <string name="prefs_instant_upload">Kích hoạt tính năng tải lên ngay lập tức</string>
   <string name="prefs_instant_upload_summary">Ngay lập tức tải lên các hình ảnh được chụp bởi camera</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="auth_host_url">Địa chỉ máy chủ</string>
   <string name="auth_username">Tên người dùng</string>
   <string name="auth_password">Mật khẩu</string>
   <string name="auth_register">Tôi mới đến ownCloud</string>
@@ -69,9 +67,7 @@
   <string name="filedetails_created">Đã tạo:</string>
   <string name="filedetails_modified">Đã chỉnh sửa:</string>
   <string name="filedetails_download">Tải về</string>
-  <string name="filedetails_sync_file">Làm mới</string>
   <string name="filedetails_redownload">Làm mới</string>
-  <string name="filedetails_open">Mở</string>
   <string name="filedetails_renamed_in_upload_msg">Tập tin đã bị đổi tên thành %1$s trong quá trình tải lên</string>
   <string name="common_yes">Yes</string>
   <string name="common_no">Không</string>
@@ -109,6 +105,14 @@
   <string name="sync_conflicts_in_favourites_content">%1$d file trong hàng đợi đồng bộ không thể được đồng bộ</string>
   <string name="sync_fail_in_favourites_ticker">Các file trong hàng đợi đồng bộ không thành công</string>
   <string name="sync_fail_in_favourites_content">Nội dung tập tin %1$d không thể đồng bộ (%2$d xung đột)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Một số tập tin cục bộ bị quên</string>
+  <string name="sync_foreign_files_forgotten_content">Các tập tin %1$d ở ngoài thư mục %2$s không thể được chép vào</string>
+  <string name="foreign_files_move">Di chuyển tất cả</string>
+  <string name="foreign_files_success">Tất cả tập tin đã được chuyển đi</string>
+  <string name="foreign_files_fail">Một vài tập tin không thể chuyển đi</string>
+  <string name="foreign_files_local_text">Cục bộ: %1$s</string>
+  <string name="foreign_files_remote_text">Từ xa: %1$s</string>
+  <string name="upload_query_move_foreign_files">Không đủ chỗ trống để chép các tập tin đã chọn vào thư mục %1$s. Bạn có muốn di chuyển chúng thay vì sao chép?</string>
   <string name="use_ssl">Sử dụng kết nối an toàn</string>
   <string name="location_no_provider">ownCloud không thể theo dõi điện thoại của bạn. Vui lòng kiểm tra cài đặt vị trí của bạn</string>
   <string name="pincode_enter_pin_code">Vui lòng, nhập mã PIN ứng dụng của bạn</string>
@@ -131,14 +135,12 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Đang cố gắng để đăng nhập…</string>
   <string name="auth_no_net_conn_title">Không có kết nối mạng</string>
   <string name="auth_no_net_conn_message">Không tìm thấy kết nối mạng, kiểm tra lại kết nối mạng và thử lại.</string>
   <string name="auth_connect_anyway">Kết nối nào</string>
   <string name="auth_nossl_plain_ok_title">Bảo mật kết nối không có giá trị.</string>
   <string name="auth_nossl_plain_ok_message">Ứng dụng không thể thiết lập một kết nối an toàn đến máy chủ. Một kết nối không an toàn đang có giá trị. Bạn có thể tiếp tục hoặc hủy bỏ.</string>
   <string name="auth_connection_established">Kết nối đã thiết lập</string>
-  <string name="auth_testing_connection">Đang kiểm tra kết nối...</string>
   <string name="auth_not_configured_title">Thay đổi cấu hình ownCloud </string>
   <string name="auth_not_configured_message">Có vẻ như phiên bản ownCloud của bạn cấu hình không đúng. Liên hệ với quản trị viên để biết thêm chi tiết.</string>
   <string name="auth_unknown_error_title">Không xác định được lỗi!</string>
@@ -154,8 +156,6 @@
   <string name="auth_bad_oc_version_title">Không chấp nhận phiên bản máy chủ ownCloud</string>
   <string name="auth_wrong_connection_title">Không thể thiết lập kết nối</string>
   <string name="auth_secure_connection">Kết nối an toàn đã được thiết lập</string>
-  <string name="auth_login_details">Chi tiết đăng nhập</string>
-  <string name="auth_unauthorized">Sai tên đăng nhập/ mật khẩu</string>
   <string name="auth_not_found">Đường dẫn đã cho không đúng</string>
   <string name="auth_internal">Lỗi máy chủ nội bộ, mã lỗi %1$d</string>
   <string name="crashlog_message">Ứng dụng chấm dứt đột ngột. Bạn có muốn gửi báo cáo sự cố?</string>
@@ -208,7 +208,7 @@
   <string name="ssl_validator_label_validity_to">Tới :</string>
   <string name="ssl_validator_label_signature">Chữ ký :</string>
   <string name="ssl_validator_label_signature_algorithm">Thuật toán :</string>
-  <string name="text_placeholder">Vị trí này đã được đặt chỗ trước</string>
+  <string name="placeholder_sentence">Vị trí này đã được đặt chỗ trước</string>
   <string name="instant_upload_on_wifi">Tải hình ảnh lên thông qua WiFi</string>
   <string name="instant_upload_path">/Upload tức thì</string>
   <string name="conflict_title">Cập nhật xung đột</string>
@@ -216,4 +216,6 @@
   <string name="conflict_keep_both">Giữ cho cả hai</string>
   <string name="conflict_overwrite">Ghi đè lên</string>
   <string name="conflict_dont_upload">Không tải lên</string>
+  <!--we need to improve the communication of errors to the user-->
+  <string name="error__upload__local_file_not_copied">%1$s không thể sao chép vào %2$s thư mục cục bộ</string>
 </resources>

res/values-zh-rBG/strings.xml

@@ -13,16 +13,14 @@
   <string name="main_settings">设置</string>
   <string name="main_tit_accsetup">设置帐号</string>
   <string name="main_wrn_accsetup">您的设备上没有 ownCloud 帐号。要使用此应用，您需要创建一个帐号。</string>
-  <string name="about_message">ownCloud Android 客户端⏎ ⏎ 版本：%1$s</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="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>
@@ -38,7 +36,7 @@
   <string name="prefs_pincode_summary">保护您的 ownCloud 客户端</string>
   <string name="prefs_instant_upload">启用即时上传</string>
   <string name="prefs_instant_upload_summary">即时上传相机拍下的相片</string>
-  <string name="auth_host_url">ownCloud 网址</string>
+  <string name="auth_host_url">服务器地址</string>
   <string name="auth_username">用户名</string>
   <string name="auth_password">密码</string>
   <string name="auth_register">我是 ownCloud 新人</string>
@@ -69,9 +67,7 @@
   <string name="filedetails_created">创建于：</string>
   <string name="filedetails_modified">修改于：</string>
   <string name="filedetails_download">下载</string>
-  <string name="filedetails_sync_file">刷新</string>
   <string name="filedetails_redownload">重新下载</string>
-  <string name="filedetails_open">打开</string>
   <string name="filedetails_renamed_in_upload_msg">文件在上传过程中被重命名为 %1$s </string>
   <string name="common_yes">是</string>
   <string name="common_no">否</string>
@@ -107,6 +103,15 @@
   <string name="sync_fail_content">不能完成 %1$s 的同步</string>
   <string name="sync_conflicts_in_favourites_ticker">存在冲突</string>
   <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_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">请插入您的应用 PIN</string>
@@ -129,14 +134,12 @@
     <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_no_net_conn_message">没有检测到网络连接，请检查您的互联网连接并重试。</string>
   <string name="auth_connect_anyway">强制连接</string>
   <string name="auth_nossl_plain_ok_title">安全连接不可用。</string>
   <string name="auth_nossl_plain_ok_message">应用未能建立到服务器的安全连接。但是非安全连接可用。您可以继续或取消。</string>
   <string name="auth_connection_established">连接已建立</string>
-  <string name="auth_testing_connection">测试连接...</string>
   <string name="auth_not_configured_title">ownCloud 配置格式不正确</string>
   <string name="auth_not_configured_message">似乎您的 ownCloud 实例未正确配置。详情联系您的管理员。</string>
   <string name="auth_unknown_error_title">发生了未知错误！</string>
@@ -152,7 +155,8 @@
   <string name="auth_bad_oc_version_title">未知 ownCloud 服务器版本</string>
   <string name="auth_wrong_connection_title">不能建立连接</string>
   <string name="auth_secure_connection">安全连接已建立</string>
-  <string name="auth_login_details">登录细节</string>
+  <string name="auth_not_found">路径错误</string>
+  <string name="auth_internal">服务器内部错误，错误代码：%1$d</string>
   <string name="crashlog_message">应用非预期终止。您愿意提交崩溃报告吗？</string>
   <string name="crashlog_send_report">发送报告</string>
   <string name="crashlog_dont_send_report">不发送报告</string>
@@ -163,13 +167,18 @@
   <string name="common_rename">重命名</string>
   <string name="common_remove">移除</string>
   <string name="confirmation_remove_alert">您确实想要移除 %1$s 吗？</string>
+  <string name="confirmation_remove_folder_alert">你确实想要移除 %1$s 还有其内容吗？</string>
   <string name="confirmation_remove_local">仅本地</string>
+  <string name="confirmation_remove_folder_local">仅本地内容</string>
   <string name="confirmation_remove_remote">从服务器移除</string>
   <string name="confirmation_remove_remote_and_local">远程和本地</string>
   <string name="remove_success_msg">成功移除</string>
   <string name="remove_fail_msg">未能移除</string>
+  <string name="rename_dialog_title">输入一个新名称</string>
   <string name="rename_local_fail_msg">本地副本不能重命名;尝试新名称</string>
   <string name="rename_server_fail_msg">不能重命名</string>
+  <string name="sync_file_fail_msg">无法检查远程文件</string>
+  <string name="sync_file_nothing_to_do_msg">文件内容已完成同步</string>
   <string name="create_dir_fail_msg">不能创建文件夹</string>
   <string name="wait_a_moment">请稍候</string>
   <string name="filedisplay_unexpected_bad_get_content">非预期问题;请尝试使用其他应用选择文件</string>
@@ -198,11 +207,14 @@
   <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="instant_upload_on_wifi">只通过 WiFi 上传图片</string>
+  <string name="instant_upload_path">/即时上传</string>
   <string name="conflict_title">上传冲突</string>
   <string name="conflict_message">远程文件 %s 未与本地文件同步。继续将替换服务器上的文件内容。</string>
   <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>
 </resources>

res/values-zh-rCN/strings.xml

@@ -13,16 +13,14 @@
   <string name="main_settings">设置</string>
   <string name="main_tit_accsetup">设置账号</string>
   <string name="main_wrn_accsetup">设备上无 ownCloud 账号，要使用此 App，需要先创建一个账号。</string>
-  <string name="about_message">ownCloud安卓客户端\n\n版本： %1$s</string>
-  <string name="actionbar_sync">刷新</string>
   <string name="actionbar_upload">上传</string>
   <string name="actionbar_upload_from_apps">来自其它app的内容</string>
   <string name="actionbar_upload_files">文件</string>
   <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>
@@ -38,7 +36,7 @@
   <string name="prefs_pincode_summary">保护您的owncloud客户端</string>
   <string name="prefs_instant_upload">开启即时上传</string>
   <string name="prefs_instant_upload_summary">即时上传相机拍摄的照片</string>
-  <string name="auth_host_url">ownCloud 网址</string>
+  <string name="auth_host_url">服务器地址</string>
   <string name="auth_username">用户名</string>
   <string name="auth_password">密码</string>
   <string name="auth_register">我是新手</string>
@@ -53,6 +51,7 @@
   <string name="setup_title">连接到你的 ownCloud</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">设备上未找到账号，请先创建账号。</string>
   <string name="uploader_wrn_no_account_setup_btn_text">设置</string>
@@ -69,9 +68,7 @@
   <string name="filedetails_created">创建于：</string>
   <string name="filedetails_modified">已修改：</string>
   <string name="filedetails_download">下载</string>
-  <string name="filedetails_sync_file">刷新</string>
   <string name="filedetails_redownload">重新下载</string>
-  <string name="filedetails_open">打开</string>
   <string name="filedetails_renamed_in_upload_msg">上传过程中文件被更名为了 %1$s</string>
   <string name="common_yes">是</string>
   <string name="common_no">否</string>
@@ -82,6 +79,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">关于</string>
   <string name="delete_account">删除账号</string>
   <string name="create_account">创建账号</string>
@@ -101,6 +100,7 @@
   <string name="downloader_download_succeeded_content">%1$s 成功下载</string>
   <string name="downloader_download_failed_ticker">下载失败</string>
   <string name="downloader_download_failed_content">下载1$s 未能完成</string>
+  <string name="downloader_not_downloaded_yet">未下载完毕</string>
   <string name="common_choose_account">选择账户</string>
   <string name="sync_string_contacts">联系人</string>
   <string name="sync_fail_ticker">同步失败</string>
@@ -109,6 +109,14 @@
   <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="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">请输入您的App PIN码</string>
@@ -121,6 +129,27 @@
   <string name="pincode_wrong">ownCloud App PIN码不正确</string>
   <string name="pincode_removed">ownCloud App PIN码已移除</string>
   <string name="pincode_stored">ownCloud App PIN码已保存。</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_event_done">%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 name="media_err_malformed">文件编码错误</string>
+  <string name="media_err_timeout">太多时间尝试播放</string>
+  <string name="media_err_invalid_progressive_playback">文件不支持流播</string>
+  <string name="media_err_unknown">当前媒体播放器不支持。</string>
+  <string name="media_err_security_ex">尝试播放%1$s时保护错误</string>
+  <string name="media_err_io_ex">尝试播放%1$s时输入错误</string>
+  <string name="media_err_unexpected">尝试播放%1$s时未知错误</string>
+  <string name="media_previous_description">前一首按钮</string>
+  <string name="media_rewind_description">后退按钮</string>
+  <string name="media_play_pause_description">播放暂停按钮</string>
+  <string name="media_forward_description">快进按钮</string>
+  <string name="media_next_description">下一首按钮</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 Minutes</item>
     <item>30 Minutes</item>
@@ -131,14 +160,12 @@
     <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_no_net_conn_message">未检测到网络连接，检查互联网连接设置后重试。</string>
   <string name="auth_connect_anyway">总是连接</string>
   <string name="auth_nossl_plain_ok_title">安全链接无效。</string>
   <string name="auth_nossl_plain_ok_message">应用无法建立安全链接到服务器，但是未加密连接可用，你可以继续或取消。</string>
   <string name="auth_connection_established">连接已建立。</string>
-  <string name="auth_testing_connection">测试连接……</string>
   <string name="auth_not_configured_title">ownCloud配置不正确。</string>
   <string name="auth_not_configured_message">看起来owncloud实例配置不正确，请联系您的管理员获取更多信息。</string>
   <string name="auth_unknown_error_title">发生未知错误！</string>
@@ -154,8 +181,6 @@
   <string name="auth_bad_oc_version_title">不可辨识的owncloud服务器版本</string>
   <string name="auth_wrong_connection_title">无法建立连接</string>
   <string name="auth_secure_connection">加密连接已建立</string>
-  <string name="auth_login_details">登录信息</string>
-  <string name="auth_unauthorized">错误的用户名或密码</string>
   <string name="auth_not_found">错误的路径</string>
   <string name="auth_internal">内部服务器错误，代码 %1$d</string>
   <string name="crashlog_message">应用崩溃，是否提交崩溃报告？</string>
@@ -208,7 +233,12 @@
   <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_filename">点位符.txt</string>
+  <string name="placeholder_filetype">PNG图像格式</string>
+  <string name="placeholder_filesize">389字节</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">仅通过WIFI上传图片。</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">上传冲突</string>
@@ -216,4 +246,20 @@
   <string name="conflict_keep_both">保留两者</string>
   <string name="conflict_overwrite">覆盖</string>
   <string name="conflict_dont_upload">不上传</string>
+  <string name="preview_image_description">图片预览</string>
+  <string name="preview_image_error_unknown_format">不能显示图片</string>
+  <string name="preview_image_error_out_of_memory">没有足够内存显示图片</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="actionbar_failed_instant_upload">限时上传失败</string>
+  <string name="failed_upload_headline_text">限时上传失败</string>
+  <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_retry_do_nothing_text">不在线时不开启即时上传</string>
+  <string name="failed_upload_failure_text">失败消息</string>
+  <string name="failed_upload_quota_exceeded_text">请检查服务器设置。可能走出配额。</string>
 </resources>

res/values-zh-rHK/strings.xml

@@ -1,2 +1,55 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="main_files">文件</string>
+  <string name="main_music">音樂</string>
+  <string name="main_contacts">聯絡人</string>
+  <string name="main_calendar">日曆</string>
+  <string name="main_bookmarks">收藏</string>
+  <string name="main_settings">設定</string>
+  <string name="main_tit_accsetup">設定帳號</string>
+  <string name="actionbar_upload">上傳</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_select_oc_account">選擇帳號</string>
+  <string name="prefs_trackmydevice_interval_summary">每%1$s分鐘更新一次</string>
+  <string name="prefs_accounts">帳號</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_info_uploading">正在上傳</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="common_yes">Yes</string>
+  <string name="common_no">No</string>
+  <string name="common_ok">確定</string>
+  <string name="common_cancel">取消</string>
+  <string name="common_error">錯誤</string>
+  <string name="uploader_info_dirname">目錄名稱</string>
+  <string name="common_choose_account">選擇帳戶</string>
+  <string name="sync_string_contacts">聯絡人</string>
+  <string name="use_ssl">安全連線</string>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
+  <string name="common_share">分享</string>
+  <!--we need to improve the communication of errors to the user-->
+</resources>

res/values-zh-rTW/strings.xml

@@ -13,14 +13,13 @@
   <string name="main_settings">設定</string>
   <string name="main_tit_accsetup">設定帳號</string>
   <string name="main_wrn_accsetup">您尚未在裝置上設定您的 ownCloud 帳號，您必需建立一組帳號才能繼續使用。</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_category_trackmydevice">裝置追蹤</string>
   <string name="prefs_add_session">增加新連線</string>
   <string name="prefs_create_img_thumbnails">建立圖片縮圖</string>
   <string name="prefs_select_oc_account">選擇一個帳號</string>
@@ -34,7 +33,7 @@
   <string name="prefs_manage_accounts">管理帳號</string>
   <string name="prefs_pincode_summary">保護您的ownCloud用戶端</string>
   <string name="prefs_instant_upload">啟用即時上傳</string>
-  <string name="auth_host_url">URL</string>
+  <string name="auth_host_url">伺服器位址</string>
   <string name="auth_username">使用者名稱</string>
   <string name="auth_password">密碼</string>
   <string name="new_session_uri_error">錯誤的位址</string>
@@ -52,6 +51,8 @@
   <string name="uploader_wrn_no_account_text">在您的裝置上找不到ownCloud的帳號. 請先設定一組帳號.</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>
@@ -60,17 +61,17 @@
   <string name="filedetails_created">建立:</string>
   <string name="filedetails_modified">修改:</string>
   <string name="filedetails_download">下載</string>
-  <string name="filedetails_sync_file">更新</string>
   <string name="filedetails_redownload">重新下載</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_download">取消下載</string>
   <string name="common_cancel_upload">取消上傳</string>
   <string name="common_cancel">取消</string>
   <string name="common_save_exit">儲存並離開</string>
   <string name="common_exit">離開ownCloud</string>
   <string name="common_error">錯誤</string>
+  <string name="common_error_unknown">未知的錯誤</string>
   <string name="about_title">關於</string>
   <string name="delete_account">刪除帳號</string>
   <string name="create_account">建立帳號</string>
@@ -86,6 +87,11 @@
   <string name="downloader_download_failed_ticker">下載失敗</string>
   <string name="common_choose_account">選擇帳號</string>
   <string name="sync_string_contacts">通訊錄</string>
+  <string name="sync_fail_ticker">同步失敗</string>
+  <string name="sync_conflicts_in_favourites_ticker">出現衝突</string>
+  <string name="foreign_files_move">移動全部</string>
+  <string name="foreign_files_success">所有文件已被移動</string>
+  <string name="foreign_files_fail">一些文件無法移動</string>
   <string name="use_ssl">使用安全連線</string>
   <string name="location_no_provider">%1$s 無法追蹤您的裝置，請檢查定位服務設定</string>
   <string name="pincode_enter_pin_code">請輸入您的 App PIN</string>
@@ -107,27 +113,28 @@
     <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_no_net_conn_message">沒有偵測到網際網路連線，請檢查您的連線然後再試一次。</string>
   <string name="auth_connect_anyway">繼續連線</string>
   <string name="auth_nossl_plain_ok_title">安全連線不可用。</string>
   <string name="auth_nossl_plain_ok_message">無法與伺服器建立安全連線，可以使用不安全連線（未加密）以繼續，您可以繼續或取消。</string>
   <string name="auth_connection_established">連線已建立</string>
-  <string name="auth_testing_connection">測試連線...</string>
   <string name="auth_not_configured_title">伺服器設定有問題</string>
   <string name="auth_not_configured_message">看起來您的伺服器並未被正確設定，請聯絡服務管理者以取得協助。</string>
   <string name="auth_unknown_error_title">發生未知的錯誤！</string>
   <string name="auth_unknown_error_message">發生未知的錯誤，請聯絡支援服務並附上您的記錄檔。</string>
+  <string name="auth_unknown_host_title">找不到伺服器</string>
   <string name="auth_incorrect_path_title">找不到伺服器</string>
   <string name="auth_incorrect_path_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_bad_oc_version_title">無法辨識的ownCloud伺服器版本</string>
   <string name="auth_wrong_connection_title">無法建立連線</string>
   <string name="auth_secure_connection">安全連線已建立</string>
-  <string name="auth_login_details">登入細節</string>
+  <string name="crashlog_send_report">發送報告</string>
+  <string name="crashlog_dont_send_report">不要發送報告</string>
   <string name="fd_keep_in_sync">讓檔案保持最新的</string>
   <string name="common_share">分享</string>
   <string name="common_rename">重新命名</string>
@@ -136,8 +143,26 @@
   <string name="confirmation_remove_local">只有本地</string>
   <string name="confirmation_remove_remote">從伺服器移除</string>
   <string name="remove_success_msg">成功地移除</string>
+  <string name="rename_dialog_title">輸入新名稱</string>
   <string name="rename_local_fail_msg">本地的複本無法被重新命名; 請嘗試一個不同的新名稱</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_btn_details_see">細節</string>
+  <string name="ssl_validator_btn_details_hide">隱藏</string>
+  <string name="ssl_validator_label_O">組織：</string>
+  <string name="ssl_validator_label_OU">組織部門：</string>
+  <string name="ssl_validator_label_C">國家：</string>
+  <string name="ssl_validator_label_ST">省：</string>
+  <string name="ssl_validator_label_L">地點：</string>
+  <string name="ssl_validator_label_validity_from">從：</string>
+  <string name="ssl_validator_label_validity_to">至：</string>
+  <string name="ssl_validator_label_signature">簽名：</string>
+  <string name="conflict_title">更新衝突</string>
+  <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-->
 </resources>

res/values/strings.xml

@@ -52,7 +52,7 @@
     <string name="auth_host_url">Server address</string>
     <string name="auth_username">Username</string>
     <string name="auth_password">Password</string>
-    <string name="auth_register">I am new to %1$s</string>
+    <string name="auth_register">New to %1$s?</string>
     <string name="new_session_uri_error">Incorrect address given</string>
     <string name="new_session_session_name_error">Incorrect session name</string>
     <string name="sync_string_files">Files</string>
@@ -96,6 +96,7 @@
     <string name="common_loading">Loading &#8230;</string>
     <string name="common_error_unknown">Unknown error</string>
     <string name="about_title">About</string>
+    <string name="change_password">Change password</string>
     <string name="delete_account">Delete account</string>
     <string name="create_account">Create account</string>
     <string name="upload_chooser_title">Upload from &#8230;</string>
@@ -119,14 +120,14 @@
     <string name="sync_string_contacts">Contacts</string>
     <string name="sync_fail_ticker">Synchronization failed</string>
     <string name="sync_fail_content">Synchronization of %1$s could not be completed</string>
-    <string name="sync_fail_content_unauthorized">Invalid credentials for %1$s</string>
+    <string name="sync_fail_content_unauthorized">Invalid password for %1$s</string>
 	<string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
 	<string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
     <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
     <string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string>
     <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
     <string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s directory could not be copied into</string>
-    <string name="sync_foreign_files_forgotten_explanation">"As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the the remote file(s) in %5$s they were linked to.</string>
+    <string name="sync_foreign_files_forgotten_explanation">As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the the remote file(s) in %5$s they were linked to.</string>
     <string name="foreign_files_move">"Move all"</string>
     <string name="foreign_files_success">"All files were moved"</string>
     <string name="foreign_files_fail">"Some files could not be moved"</string>
@@ -178,14 +179,14 @@
         <item>60</item>
     </string-array>
 
-    <string name="auth_trying_to_login">Trying to login...</string>
+    <string name="auth_trying_to_login">Trying to login&#8230;</string>
     <string name="auth_no_net_conn_title">No network connection</string>
     <string name="auth_no_net_conn_message">No network connection has been detected, check your Internet connection and try again.</string>
     <string name="auth_connect_anyway">Connect anyway</string>
     <string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string>
     <string name="auth_nossl_plain_ok_message">The Application cannot establish a secure connection to the server. A non secure connection is available. You may continue or cancel.</string>
     <string name="auth_connection_established">Connection established</string>
-    <string name="auth_testing_connection">Testing connection...</string>
+    <string name="auth_testing_connection">Testing connection&#8230;</string>
     <string name="auth_not_configured_title">Malformed server configuration</string>
     <string name="auth_not_configured_message">It seems that your server instance is not correctly configured. Contact your administrator for more details.</string>
     <string name="auth_unknown_error_title">Unknown error occurred!</string>
@@ -201,14 +202,14 @@
     <string name="auth_bad_oc_version_title">Unrecognized server version</string>
     <string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
     <string name="auth_secure_connection">Secure connection established</string>
-    <string name="auth_unauthorized">Invalid credentials</string>
+    <string name="auth_unauthorized">Wrong username or password</string>
 	<string name="auth_oauth_error">Unsuccessful authorization</string>
 	<string name="auth_oauth_error_access_denied">Access denied by authorization server</string>
     <string name="auth_not_found">Wrong path given</string>
     <string name="auth_internal">Internal server error, code %1$d</string>
     <string name="auth_wtf_reenter_URL">Unexpected state; please, enter the server URL again</string>
     <string name="auth_expired_oauth_token_toast">Your authorization expired.\nPlease, authorize again</string>
-    <string name="auth_expired_basic_auth_toast">Your saved credentials are invalid.\nPlease, enter the current credentials</string>
+    <string name="auth_expired_basic_auth_toast">Please, enter the current password</string>
     
     <string name="crashlog_message">Application terminated unexpectedly. Would you like to submit a crash report?</string>
     <string name="crashlog_send_report">Send report</string>

res/values/styles.xml

@@ -17,7 +17,7 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 	<style name="Animations" />
 
 	<!-- Default ownCloud app style -->
@@ -29,9 +29,15 @@
 	<style name="Theme.ownCloud.noActionBar" parent="style/Theme.Sherlock.Light.NoActionBar">
       <item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
       <item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
-  </style>
+    </style>
+	
+	<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.Sherlock.NoActionBar">
+      <item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
+      <item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
+      <item name="android:windowFullscreen">true</item>
+    </style>
+	
 	
-
 	<style name="Theme.ownCloud.Widget.ActionBar" parent="style/Widget.Sherlock.Light.ActionBar.Solid.Inverse">
     	<item name="android:background">@drawable/main_header_bg</item>
     	<item name="background">@drawable/main_header_bg</item>

res/xml/preferences.xml

@@ -35,12 +35,13 @@
         				android:disableDependentsState="true" 
         				android:title="@string/instant_upload_on_wifi" 
         				android:key="instant_upload_on_wifi"/>
-    <CheckBoxPreference android:key="log_to_file" 
+    <!-- DISABLED FOR RELEASE UNTIL FIXED 
+    CheckBoxPreference android:key="log_to_file" 
                         android:title="@string/prefs_log_title"  
                         android:summary="@string/prefs_log_summary"/>
 	<Preference 		android:key="log_history" 
                         android:title="@string/prefs_log_title_history"  
-                        android:summary="@string/prefs_log_summary_history"/>
+                        android:summary="@string/prefs_log_summary_history"/ -->
 	<Preference 		android:id="@+id/about_app" 
         				android:title="@string/about_title" 
         				android:key="about_app" />

src/com/owncloud/android/authentication/AccountAuthenticator.java

@@ -190,6 +190,7 @@ public class AccountAuthenticator extends AbstractAccountAuthenticator {
         intent.putExtra(KEY_AUTH_TOKEN_TYPE, authTokenType);
         intent.putExtra(KEY_LOGIN_OPTIONS, options);
         intent.putExtra(AuthenticatorActivity.EXTRA_ACCOUNT, account);
+        intent.putExtra(AuthenticatorActivity.EXTRA_ENFORCED_UPDATE, true);
         intent.putExtra(AuthenticatorActivity.EXTRA_ACTION, AuthenticatorActivity.ACTION_UPDATE_TOKEN);
         
 

src/com/owncloud/android/AccountUtils.java → src/com/owncloud/android/authentication/AccountUtils.java

@@ -16,13 +16,13 @@
  *
  */
 
-package com.owncloud.android;
+package com.owncloud.android.authentication;
 
-import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.utils.OwnCloudVersion;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.accounts.AccountsException;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
@@ -136,21 +136,37 @@ public class AccountUtils {
      * @param context
      * @param account
      * @return url or null on failure
+     * @throws AccountNotFoundException     When 'account' is unknown for the AccountManager
      */
-    public static String constructFullURLForAccount(Context context, Account account) {
-        try {
-            AccountManager ama = AccountManager.get(context);
-            String baseurl = ama.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL);
-            String strver  = ama.getUserData(account, AccountAuthenticator.KEY_OC_VERSION);
-            boolean supportsOAuth = (ama.getUserData(account, AccountAuthenticator.KEY_SUPPORTS_OAUTH2) != null);
-            OwnCloudVersion ver = new OwnCloudVersion(strver);
-            String webdavpath = getWebdavPath(ver, supportsOAuth);
+    public static String constructFullURLForAccount(Context context, Account account) throws AccountNotFoundException {
+        AccountManager ama = AccountManager.get(context);
+        String baseurl = ama.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL);
+        String strver  = ama.getUserData(account, AccountAuthenticator.KEY_OC_VERSION);
+        boolean supportsOAuth = (ama.getUserData(account, AccountAuthenticator.KEY_SUPPORTS_OAUTH2) != null);
+        OwnCloudVersion ver = new OwnCloudVersion(strver);
+        String webdavpath = getWebdavPath(ver, supportsOAuth);
 
-            if (webdavpath == null) return null;
-            return baseurl + webdavpath;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
+        if (baseurl == null || webdavpath == null) 
+            throw new AccountNotFoundException(account, "Account not found", null);
+        
+        return baseurl + webdavpath;
+    }
+    
+    
+    public static class AccountNotFoundException extends AccountsException {
+        
+        /** Generated - should be refreshed every time the class changes!! */
+        private static final long serialVersionUID = -9013287181793186830L;
+        
+        private Account mFailedAccount; 
+                
+        public AccountNotFoundException(Account failedAccount, String message, Throwable cause) {
+            super(message, cause);
+            mFailedAccount = failedAccount;
+        }
+        
+        public Account getFailedAccount() {
+            return mFailedAccount;
         }
     }
 

src/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -18,7 +18,6 @@
 
 package com.owncloud.android.authentication;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.ui.dialog.SslValidatorDialog;
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
@@ -54,7 +53,6 @@ import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
 import android.view.View.OnTouchListener;
 import android.view.Window;
@@ -85,6 +83,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     public static final String EXTRA_USER_NAME = "USER_NAME";
     public static final String EXTRA_HOST_NAME = "HOST_NAME";
     public static final String EXTRA_ACTION = "ACTION";
+    public static final String EXTRA_ENFORCED_UPDATE = "ENFORCE_UPDATE";
 
     private static final String KEY_HOST_URL_TEXT = "HOST_URL_TEXT";
     private static final String KEY_OC_VERSION = "OC_VERSION";
@@ -111,7 +110,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
 
     public static final byte ACTION_CREATE = 0;
     public static final byte ACTION_UPDATE_TOKEN = 1;
-    
+
     private String mHostBaseUrl;
     private OwnCloudVersion mDiscoveredVersion;
 
@@ -132,8 +131,8 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     private byte mAction;
     private Account mAccount;
 
-    private Button mCheckServerButton;
     private EditText mHostUrlInput;
+    private View mRefreshButton;
     private EditText mUsernameInput;
     private EditText mPasswordInput;
     private CheckBox mOAuth2Check;
@@ -161,7 +160,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
 
         /// set view and get references to view elements
         setContentView(R.layout.account_setup);
-        mCheckServerButton = (Button) findViewById(R.id.checkServerButton);
         mHostUrlInput = (EditText) findViewById(R.id.hostUrlInput);
         mUsernameInput = (EditText) findViewById(R.id.account_username);
         mPasswordInput = (EditText) findViewById(R.id.account_password);
@@ -187,24 +185,18 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mAction = getIntent().getByteExtra(EXTRA_ACTION, ACTION_CREATE); 
         mAccount = null;
         mHostBaseUrl = "";
+        boolean refreshButtonEnabled = false;
         
-        // URL Branding
+        // URL input configuration applied
         if (!mHostUrlInputEnabled)
         {
             mHostUrlInput.setText(getString(R.string.server_url));
-            mHostUrlInput.setVisibility(View.GONE);
+            findViewById(R.id.hostUrlFrame).setVisibility(View.GONE);
             
-            mCheckServerButton.setVisibility(View.VISIBLE);
-            mCheckServerButton.setOnClickListener(new OnClickListener() {
-                
-                @Override
-                public void onClick(View v) {
-                    checkOcServer();
-                    
-                }
-            });
-            
-            checkOcServer();
+            mRefreshButton = findViewById(R.id.centeredRefreshButton);
+
+        } else {
+            mRefreshButton = findViewById(R.id.embeddedRefreshButton);
         }
 
         if (savedInstanceState == null) {
@@ -233,7 +225,11 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             }
             mOAuth2Check.setChecked(oAuthRequired);
             changeViewByOAuth2Check(oAuthRequired);
-
+            mJustCreated = true;
+            
+            if (mAction == ACTION_UPDATE_TOKEN || !mHostUrlInputEnabled) {
+                checkOcServer(); 
+            }
 
         } else {
             /// connection state and info
@@ -264,43 +260,35 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             }            
             
             // refresh button enabled
-            mRefreshButtonEnabled = savedInstanceState.getBoolean(KEY_REFRESH_BUTTON_ENABLED);
+            refreshButtonEnabled = savedInstanceState.getBoolean(KEY_REFRESH_BUTTON_ENABLED);
+            
 
         }
 
         showServerStatus();
         showAuthStatus();
-        if (mServerIsChecked && !mServerIsValid && mRefreshButtonEnabled) showRefreshButton();
-        mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes
-
-        if (!OAUTH_MODE_OPTIONAL.equals(getString(R.string.oauth2_mode))) {
-            mOAuth2Check.setVisibility(View.GONE);
-        }
 
         if (mAction == ACTION_UPDATE_TOKEN) {
             /// lock things that should not change
             mHostUrlInput.setEnabled(false);
+            mHostUrlInput.setFocusable(false);
             mUsernameInput.setEnabled(false);
+            mUsernameInput.setFocusable(false);
+            mOAuth2Check.setVisibility(View.GONE);
+        }
+        
+        //if (mServerIsChecked && !mServerIsValid && mRefreshButtonEnabled) showRefreshButton();
+        if (mServerIsChecked && !mServerIsValid && refreshButtonEnabled) showRefreshButton();
+        mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes
+
+        if (!OAUTH_MODE_OPTIONAL.equals(getString(R.string.oauth2_mode))) {
             mOAuth2Check.setVisibility(View.GONE);
-            if (!mServerIsValid && mOcServerChkOperation == null) {
-                checkOcServer(); 
-            }
         }
 
         mPasswordInput.setText("");     // clean password to avoid social hacking (disadvantage: password in removed if the device is turned aside)
-        mJustCreated = true;
 
         /// bind view elements to listeners
         mHostUrlInput.setOnFocusChangeListener(this);
-        mHostUrlInput.setOnTouchListener(new RightDrawableOnTouchListener() {
-            @Override
-            public boolean onDrawableTouch(final MotionEvent event) {
-                if (event.getAction() == MotionEvent.ACTION_UP) {
-                    AuthenticatorActivity.this.onRefreshClick();
-                }
-                return true;
-            }
-        });
         mHostUrlInput.addTextChangedListener(new TextWatcher() {
 
             @Override
@@ -366,7 +354,8 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         }
         
         // refresh button enabled
-        outState.putBoolean(KEY_REFRESH_BUTTON_ENABLED, mRefreshButtonEnabled);
+        //outState.putBoolean(KEY_REFRESH_BUTTON_ENABLED, mRefreshButtonEnabled);
+        outState.putBoolean(KEY_REFRESH_BUTTON_ENABLED, (mRefreshButton.getVisibility() == View.VISIBLE));
 
     }
 
@@ -397,7 +386,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         super.onResume();
         // the state of mOAuth2Check is automatically recovered between configuration changes, but not before onCreate() finishes; so keep the next lines here
         changeViewByOAuth2Check(mOAuth2Check.isChecked());  
-        if (mAction == ACTION_UPDATE_TOKEN && mJustCreated) {
+        if (mAction == ACTION_UPDATE_TOKEN && mJustCreated && getIntent().getBooleanExtra(EXTRA_ENFORCED_UPDATE, false)) {
             if (mOAuth2Check.isChecked())
                 Toast.makeText(this, R.string.auth_expired_oauth_token_toast, Toast.LENGTH_LONG).show();
             else
@@ -1227,21 +1216,11 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
 
 
     private void showRefreshButton() {
-        mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0);
-        mRefreshButtonEnabled = true;
-        
-        if (!mHostUrlInputEnabled){
-           mCheckServerButton.setVisibility(View.VISIBLE); 
-        }
+        mRefreshButton.setVisibility(View.VISIBLE);
     }
 
     private void hideRefreshButton() {
-        mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
-        mRefreshButtonEnabled = false;
-        
-        if (!mHostUrlInputEnabled){
-            mCheckServerButton.setVisibility(View.INVISIBLE); 
-        }
+        mRefreshButton.setVisibility(View.GONE);
     }
 
     /**
@@ -1251,7 +1230,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
      * 
      * @param view      Refresh 'button'
      */
-    public void onRefreshClick() {
+    public void onRefreshClick(View view) {
         checkOcServer();
     }
     
@@ -1312,7 +1291,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
      * Called from SslValidatorDialog when a new server certificate was correctly saved.
      */
     public void onSavedCertificate() {
-        mOperationThread = mOcServerChkOperation.retry(this, mHandler);                
+        checkOcServer();
     }
 
     /**

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

@@ -20,8 +20,8 @@ package com.owncloud.android.files;
 
 import java.io.File;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.db.DbHandler;
 import com.owncloud.android.files.services.FileUploader;
 

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

@@ -468,6 +468,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
                 // let the user update credentials with one click
                 Intent updateAccountCredentials = new Intent(this, AuthenticatorActivity.class);
                 updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACCOUNT, download.getAccount());
+                updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ENFORCED_UPDATE, true);
                 updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACTION, AuthenticatorActivity.ACTION_UPDATE_TOKEN);
                 updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

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

@@ -795,6 +795,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
                 // let the user update credentials with one click
                 Intent updateAccountCredentials = new Intent(this, AuthenticatorActivity.class);
                 updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACCOUNT, upload.getAccount());
+                updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ENFORCED_UPDATE, true);
                 updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACTION, AuthenticatorActivity.ACTION_UPDATE_TOKEN);
                 updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

src/com/owncloud/android/network/OwnCloudClientUtils.java

@@ -36,8 +36,9 @@ import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.Log_OC;
 
 import eu.alefzero.webdav.WebdavClient;
@@ -83,8 +84,9 @@ public class OwnCloudClientUtils {
      * @throws AuthenticatorException       If the authenticator failed to get the authorization token for the account.
      * @throws OperationCanceledException   If the authenticator operation was cancelled while getting the authorization token for the account. 
      * @throws IOException                  If there was some I/O error while getting the authorization token for the account.
+     * @throws AccountNotFoundException     If 'account' is unknown for the AccountManager
      */
-    public static WebdavClient createOwnCloudClient (Account account, Context appContext) throws OperationCanceledException, AuthenticatorException, IOException {
+    public static WebdavClient createOwnCloudClient (Account account, Context appContext) throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException {
         //Log_OC.d(TAG, "Creating WebdavClient associated to " + account.name);
        
         Uri uri = Uri.parse(AccountUtils.constructFullURLForAccount(appContext, account));
@@ -105,7 +107,7 @@ public class OwnCloudClientUtils {
     }
     
     
-    public static WebdavClient createOwnCloudClient (Account account, Context appContext, Activity currentActivity) throws OperationCanceledException, AuthenticatorException, IOException {
+    public static WebdavClient createOwnCloudClient (Account account, Context appContext, Activity currentActivity) throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException {
         Uri uri = Uri.parse(AccountUtils.constructFullURLForAccount(appContext, account));
         WebdavClient client = createOwnCloudClient(uri, appContext);
         AccountManager am = AccountManager.get(appContext);

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

@@ -22,8 +22,8 @@ import org.apache.commons.httpclient.methods.GetMethod;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.utils.OwnCloudVersion;
 
 import eu.alefzero.webdav.WebdavClient;

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

@@ -32,7 +32,11 @@ import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.DavException;
 
+import android.accounts.Account;
+import android.accounts.AccountsException;
+
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.network.CertificateCombinedException;
 
 /**
@@ -46,7 +50,8 @@ import com.owncloud.android.network.CertificateCombinedException;
 public class RemoteOperationResult implements Serializable {
 
     /** Generated - should be refreshed every time the class changes!! */
-    private static final long serialVersionUID = -7805531062432602444L;
+    private static final long serialVersionUID = 6106167714625712390L;
+
     
     private static final String TAG = "RemoteOperationResult";
     
@@ -77,7 +82,9 @@ public class RemoteOperationResult implements Serializable {
         LOCAL_STORAGE_NOT_MOVED, 
         LOCAL_STORAGE_NOT_COPIED, 
         OAUTH2_ERROR_ACCESS_DENIED,
-        QUOTA_EXCEEDED
+        QUOTA_EXCEEDED, 
+        ACCOUNT_NOT_FOUND, 
+        ACCOUNT_EXCEPTION
     }
 
     private boolean mSuccess = false;
@@ -142,6 +149,12 @@ public class RemoteOperationResult implements Serializable {
         } else if (e instanceof UnknownHostException) {
             mCode = ResultCode.HOST_NOT_AVAILABLE;
 
+        } else if (e instanceof AccountNotFoundException) {
+            mCode = ResultCode.ACCOUNT_NOT_FOUND;
+            
+        } else if (e instanceof AccountsException) {
+            mCode = ResultCode.ACCOUNT_EXCEPTION;
+            
         } else if (e instanceof SSLException || e instanceof RuntimeException) {
             CertificateCombinedException se = getCertificateCombinedException(e);
             if (se != null) {
@@ -242,6 +255,13 @@ public class RemoteOperationResult implements Serializable {
             } else if (mException instanceof IOException) {
                 return "Unrecovered transport exception";
 
+            } else if (mException instanceof AccountNotFoundException) {
+                Account failedAccount = ((AccountNotFoundException)mException).getFailedAccount();
+                return mException.getMessage() + " (" + (failedAccount != null ? failedAccount.name : "NULL") + ")";
+                
+            } else if (mException instanceof AccountsException) {
+                return "Exception while using account";
+                
             } else {
                 return "Unexpected exception";
             }

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

@@ -26,8 +26,8 @@ import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.Context;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.utils.OwnCloudVersion;

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

@@ -28,7 +28,8 @@ import org.apache.http.client.ClientProtocolException;
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
 import org.apache.http.protocol.HttpContext;
 
-import com.owncloud.android.AccountUtils;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.network.OwnCloudClientUtils;
 
@@ -142,10 +143,8 @@ public abstract class AbstractOwnCloudSyncAdapter extends
         return null;
     }
 
-    protected void initClientForCurrentAccount() throws OperationCanceledException, AuthenticatorException, IOException {
-        if (AccountUtils.constructFullURLForAccount(getContext(), account) == null) {
-            throw new UnknownHostException();
-        }
+    protected void initClientForCurrentAccount() throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException {
+        AccountUtils.constructFullURLForAccount(getContext(), account);
         mClient = OwnCloudClientUtils.createOwnCloudClient(account, getContext());
     }
     

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

@@ -24,8 +24,8 @@ import java.io.IOException;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.ByteArrayEntity;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;

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

@@ -303,6 +303,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             // let the user update credentials with one click
             Intent updateAccountCredentials = new Intent(getContext(), AuthenticatorActivity.class);
             updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACCOUNT, getAccount());
+            updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ENFORCED_UPDATE, true);
             updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACTION, AuthenticatorActivity.ACTION_UPDATE_TOKEN);
             updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

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

@@ -47,8 +47,9 @@ import com.actionbarsherlock.app.SherlockListActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AuthenticatorActivity;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.Log_OC;
 
 import com.owncloud.android.R;
@@ -142,11 +143,17 @@ public class AccountSelectActivity extends SherlockListActivity implements
         return false;
     }
 
+    /**
+     * Called when the user clicked on an item into the context menu created at 
+     * {@link #onCreateContextMenu(ContextMenu, View, ContextMenuInfo)} for every
+     * ownCloud {@link Account} , containing 'secondary actions' for them.
+     * 
+     * {@inheritDoc}}
+     */
     @SuppressWarnings("unchecked")
     @Override
     public boolean onContextItemSelected(android.view.MenuItem item) {
-        AdapterContextMenuInfo info = (AdapterContextMenuInfo) item
-                .getMenuInfo();
+        AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
         int index = info.position;
         HashMap<String, String> map = null;
         try {
@@ -158,11 +165,18 @@ public class AccountSelectActivity extends SherlockListActivity implements
         
         String accountName = map.get("NAME");
         AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
-        Account accounts[] = am
-                .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
+        Account accounts[] = am.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
         for (Account a : accounts) {
             if (a.name.equals(accountName)) {
-                am.removeAccount(a, this, mHandler);
+                if (item.getItemId() == R.id.change_password) {
+                    Intent updateAccountCredentials = new Intent(this, AuthenticatorActivity.class);
+                    updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACCOUNT, a);
+                    updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACTION, AuthenticatorActivity.ACTION_UPDATE_TOKEN);
+                    startActivity(updateAccountCredentials);
+                    
+                } else if (item.getItemId() == R.id.delete_account) {
+                    am.removeAccount(a, this, mHandler);
+                }
             }
         }
 

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

@@ -18,15 +18,15 @@
 
 package com.owncloud.android.ui.activity;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.ui.dialog.ConflictsResolveDialog;
 import com.owncloud.android.ui.dialog.ConflictsResolveDialog.Decision;
 import com.owncloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener;
 
-import android.accounts.Account;
 import android.content.Intent;
 import android.os.Bundle;
 
@@ -35,32 +35,15 @@ import android.os.Bundle;
  * application. 
  * 
  * @author Bartek Przybylski
- *
+ * @author David A. Velasco
  */
-public class ConflictsResolveActivity extends SherlockFragmentActivity implements OnConflictDecisionMadeListener {
-
-    public static final String EXTRA_FILE = "FILE";
-    public static final String EXTRA_ACCOUNT = "ACCOUNT";
+public class ConflictsResolveActivity extends FileActivity implements OnConflictDecisionMadeListener {
 
     private String TAG = ConflictsResolveActivity.class.getSimpleName();
     
-    //private String mRemotePath;
-    
-    //private String mLocalPath;
-    
-    private OCFile mFile;
-    private Account mOCAccount;
-    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        
-        //mRemotePath = getIntent().getStringExtra("remotepath");
-        //mLocalPath = getIntent().getStringExtra("localpath");
-        mFile = getIntent().getParcelableExtra(EXTRA_FILE);
-        mOCAccount = getIntent().getParcelableExtra(EXTRA_ACCOUNT);
-        ConflictsResolveDialog d = ConflictsResolveDialog.newInstance(mFile.getRemotePath(), this);
-        d.showDialog(this);
     }
 
     @Override
@@ -81,11 +64,40 @@ public class ConflictsResolveActivity extends SherlockFragmentActivity implement
                 Log_OC.wtf(TAG, "Unhandled conflict decision " + decision);
                 return;
         }
-        i.putExtra(FileUploader.KEY_ACCOUNT, mOCAccount);
-        i.putExtra(FileUploader.KEY_FILE, mFile);
+        i.putExtra(FileUploader.KEY_ACCOUNT, getAccount());
+        i.putExtra(FileUploader.KEY_FILE, getFile());
         i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);
         
         startService(i);
         finish();
     }
+
+    @Override
+    protected void onAccountSet(boolean stateWasRecovered) {
+        if (getAccount() != null) {
+            OCFile file = getFile();
+            if (getFile() == null) {
+                Log_OC.e(TAG, "No conflictive file received");
+                finish();
+            } else {
+                /// Check whether the 'main' OCFile handled by the Activity is contained in the current Account
+                DataStorageManager storageManager = new FileDataStorageManager(getAccount(), getContentResolver());
+                file = storageManager.getFileByPath(file.getRemotePath());   // file = null if not in the current Account
+                if (file != null) {
+                    setFile(file);
+                    ConflictsResolveDialog d = ConflictsResolveDialog.newInstance(file.getRemotePath(), this);
+                    d.showDialog(this);
+                    
+                } else {
+                    // account was changed to a different one - just finish
+                    finish();
+                }
+            }
+            
+        } else {
+            Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!");
+            finish();
+        }
+        
+    }
 }