From 1b77e7f8467590998825689c761cd840d379364c Mon Sep 17 00:00:00 2001
From: masensio <masensio@solidgear.es>
Date: Thu, 27 Feb 2014 12:32:28 +0100
Subject: [PATCH 1/3] Hotfix on develop: Show share file instead send_file for
 folders

---
 src/com/owncloud/android/ui/fragment/OCFileListFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 87fd686976..34584ab460 100644
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -222,7 +222,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
             toHide.add(R.id.action_cancel_upload);
             toHide.add(R.id.action_sync_file);
             toHide.add(R.id.action_see_details);
-            toHide.add(R.id.action_share_file);
+            toHide.add(R.id.action_send_file);
             if (    mContainerActivity.getFileDownloaderBinder().isDownloading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile) ||
                     mContainerActivity.getFileUploaderBinder().isUploading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile)           ) {
                 toDisable.add(R.id.action_rename_file);

From 0f104952f30c1706afbbab0f3f133b6cb0d470fd Mon Sep 17 00:00:00 2001
From: Luke Owncloud <owncloud@ohrt.org>
Date: Thu, 27 Feb 2014 14:37:44 +0100
Subject: [PATCH 2/3] tiny SETUP.md correction

---
 SETUP.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SETUP.md b/SETUP.md
index 12db83dcfa..a965064413 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -12,6 +12,7 @@ NOTE: You must have git in your environment path variable to perform the next op
 * Pull changes from your develop branch: "git pull origin develop"
 * Make official ownCloud repo known as upstream: "git remote add upstream git@github.com:owncloud/android.git"
 * Make sure to get the latest changes from official android/develop branch: "git pull upstream develop"
+* Complete the setup of project properties and resolve pending dependencies running "setup_env.bat" or "./setup_env.sh" .
 
 At this point you can continue using different tools to build the project. Section 2, 3 and 4 describe some of the existing alternatives.  
 
@@ -19,9 +20,8 @@ At this point you can continue using different tools to build the project. Secti
   
 NOTE: You must have the Android SDK 'tools/', and 'platforms-tools/' folders in your environment path variable.
 
-* Complete the setup of project properties and resolve pending dependencies running "setup_env.bat" or "./setup_env.sh" .
 * Run "ant clean" .
-* Run "ant debug" to generate a debuggable version of the ownCkoud app.
+* Run "ant debug" to generate a debuggable version of the ownCloud app.
 
 ### 3. Building with console/maven:
 

From 2805dc76d615ad5bb4975c41f2df6398855708db Mon Sep 17 00:00:00 2001
From: "Mr. Jenkins" <jenkins@owncloud.org>
Date: Fri, 28 Feb 2014 01:14:30 -0500
Subject: [PATCH 3/3] [tx-robot] updated from transifex

---
 res/values-ca/strings.xml     |  2 ++
 res/values-da/strings.xml     |  1 +
 res/values-zh-rTW/strings.xml | 16 ++++++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 9720f81fe6..67967f3cbf 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -97,6 +97,7 @@
   <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$s, 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="sync_current_folder_was_removed">La carpeta %1$s ja no existeix</string>
   <string name="foreign_files_move">Mou-los tots</string>
   <string name="foreign_files_success">S\'han mogut tots els fitxers</string>
@@ -238,5 +239,6 @@
   <string name="share_link_file_error">S\'ha produït un error en intentar compartir aquest fitxer o carpeta</string>
   <string name="unshare_link_file_no_exist">No es pot deixar de compartir aquest fitxer o carpeta. No existeix.</string>
   <string name="unshare_link_file_error">S\'ha produït un error en intentar deixar de compartir aquest fitxer o carpeta</string>
+  <string name="copy_link">Copia l\'enllaç</string>
   <string name="clipboard_text_copied">S\'ha copiat al porta-retalls</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b8d75dd7ae..96345b5782 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -237,5 +237,6 @@
   <string name="share_link_file_no_exist">Kan ikke dele denne fil eller mappe. Find venligst ud af om den eksisterer</string>
   <string name="share_link_file_error">Der opstod en fejl ved deling af denne fil eller mappe</string>
   <string name="unshare_link_file_error">Der opstod en fejl ved stopning af deling af denne mappe.</string>
+  <string name="copy_link">Kopier link</string>
   <string name="clipboard_text_copied">Kopieret til udklipsholder</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5a423a80e4..c963cc384b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -25,9 +25,12 @@
   <string name="prefs_log_summary_history">顯示之前的記錄檔</string>
   <string name="prefs_log_delete_history_button">刪除歷史記錄</string>
   <string name="prefs_help">說明</string>
+  <string name="prefs_recommend">推薦給朋友</string>
   <string name="prefs_feedback">反饋</string>
   <string name="prefs_imprint">法律聲明</string>
+  <string name="recommend_subject">在您的手機中試用%1$s!</string>
   <string name="auth_check_server">檢查伺服器</string>
+  <string name="auth_host_url">伺服器位址 https://...</string>
   <string name="auth_username">使用者名稱</string>
   <string name="auth_password">密碼</string>
   <string name="auth_register">新增到 %1$s?</string>
@@ -53,6 +56,7 @@
   <string name="filedetails_sync_file">更新檔案列表</string>
   <string name="filedetails_renamed_in_upload_msg">檔案名稱在上傳時已被更改為 %1$s</string>
   <string name="action_share_file">分享連結</string>
+  <string name="action_unshare_file">取消共享連結</string>
   <string name="common_yes">是</string>
   <string name="common_no">否</string>
   <string name="common_ok">好</string>
@@ -92,6 +96,7 @@
   <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="sync_current_folder_was_removed">資料夾 %1$s 不存在</string>
   <string name="foreign_files_move">移動全部</string>
   <string name="foreign_files_success">所有文件已被移動</string>
   <string name="foreign_files_fail">部份文件無法被移動</string>
@@ -117,6 +122,7 @@
   <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>
@@ -137,6 +143,7 @@
   <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>
@@ -145,6 +152,10 @@
   <string name="auth_oauth_error_access_denied">被授登伺服器拒絕登入</string>
   <string name="auth_wtf_reenter_URL">未知的狀態; 請再輸入一次伺服器的名稱</string>
   <string name="auth_expired_basic_auth_toast">請輸入目錄的密碼</string>
+  <string name="auth_expired_saml_sso_token_toast">您的連接已逾期. 請重新連線.</string>
+  <string name="auth_connecting_auth_server">連線到認證伺服器...</string>
+  <string name="auth_unsupported_auth_method">伺服器不支援這種認證方式</string>
+  <string name="auth_unsupported_multiaccount">%1$s 不支援複數賬戶</string>
   <string name="fd_keep_in_sync">讓檔案保持最新的</string>
   <string name="common_rename">重新命名</string>
   <string name="common_remove">移除</string>
@@ -162,9 +173,12 @@
   <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="filename_forbidden_characters">禁止使用字符: / \\ &lt; &gt; : \" | ? *</string>
   <string name="wait_a_moment">請稍後</string>
   <string name="filedisplay_unexpected_bad_get_content">未知的問題; 請選擇其他程式開啟檔案</string>
   <string name="filedisplay_no_file_selected">沒有挑選檔案</string>
+  <string name="activity_chooser_title">傳送連結至 ...</string>
+  <string name="oauth_check_onoff">以 oAuth2 方式登入</string>
   <string name="oauth_login_connection">連線到 oAuth2 伺服器…</string>
   <string name="ssl_validator_header">這個網站的憑證無法被驗證</string>
   <string name="ssl_validator_reason_cert_not_trusted">- 這個伺服器使用未被信任的憑證</string>
@@ -204,6 +218,7 @@
   <string name="preview_image_description">圖片預覽</string>
   <string name="preview_image_error_unknown_format">無法顯示圖片</string>
   <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>
@@ -214,5 +229,6 @@
   <string name="failed_upload_retry_do_nothing_text">未連線, 所以無法使用上傳功能</string>
   <string name="failed_upload_failure_text">失敗訊息: </string>
   <string name="failed_upload_quota_exceeded_text">請檢查你的伺服器設定, 可能你的額度已超過.</string>
+  <string name="copy_link">複製連結</string>
   <string name="clipboard_text_copied">複製至剪貼簿中</string>
 </resources>