avoid NPE

[pub/Android/ownCloud.git] / res / values-zh-rTW / strings.xml

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 581c684..980ba44 100644 (file)
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -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="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_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>
   <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>