From: Mr. Jenkins <jenkins@owncloud.org>
Date: Sat, 8 Mar 2014 06:14:22 +0000 (-0500)
Subject: [tx-robot] updated from transifex
X-Git-Tag: oc-android-1.5.5~21
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/cf910370168c153218e457b489cc5b715b04ce43?ds=inline;hp=-c

[tx-robot] updated from transifex
---

cf910370168c153218e457b489cc5b715b04ce43
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6231fd43..3fbae386 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -72,7 +72,7 @@
   <string name="change_password">Cambiar contraseña</string>
   <string name="delete_account">Eliminar cuenta</string>
   <string name="create_account">Crear cuenta</string>
-  <string name="upload_chooser_title">Subir</string>
+  <string name="upload_chooser_title">Subir desde...</string>
   <string name="uploader_info_dirname">Nombre de directorio</string>
   <string name="uploader_upload_in_progress_ticker">Subiendo...</string>
   <string name="uploader_upload_in_progress_content">%1$d%% Subiendo %2$s</string>
@@ -217,7 +217,7 @@
   <string name="instant_upload_path">/SubidasInstantáneas</string>
   <string name="conflict_title">Conflicto en la actualización</string>
   <string name="conflict_message">El archivo remoto %s no está sincronizado con el archivo local. Si continúa, se reemplazará el contenido del archivo en el servidor.</string>
-  <string name="conflict_keep_both">Mantener ambas</string>
+  <string name="conflict_keep_both">Mantener ambos</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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3fd979ec..ee53a44c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -231,5 +231,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>