X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7623a8af613126bdfdaaabe1ef8424c3cb5788fc..e9bf119fa40ab59e44e712fc4e0bf49478683fb8:/res/values-zh-rTW/strings.xml

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d5f9b677..980ba44c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -181,7 +181,7 @@
 	</string>
   <string name="auth_can_not_auth_against_server">無法在這個伺服器上取得認證</string>
   <string name="auth_account_does_not_exist">帳號目前不存在於本裝置</string>
-  <string name="fd_keep_in_sync">讓檔案保持最新的</string>
+  <string name="favorite">我的最愛</string>
   <string name="common_rename">重新命名</string>
   <string name="common_remove">移除</string>
   <string name="confirmation_remove_alert">您真的要移除 %1$s ?</string>
@@ -239,11 +239,7 @@
   <string name="instant_upload_on_wifi">只使用 WiFi 來執行即時圖片上傳的功能</string>
   <string name="instant_video_upload_on_wifi">只使用 WiFi 來執行即時影像上傳的功能</string>
   <string name="instant_upload_path">/InstantUpload</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>
   <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>