X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/f150ccd21c66b05c37cd0fd0015f7738e94b9ba4..a3ccc6a559dfbe2d8cb5ccc2ab82c08de7d9aef5:/res/values-gl/strings.xml

diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 808aa2fd..0ec46b69 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -72,10 +72,6 @@ Descárgueo de aquí: %2$s</string>
   <string name="file_list_empty">Aquí non hai nada. Envíe algo!</string>
   <string name="file_list_loading">Cargando...</string>
   <string name="local_file_list_empty">Non hai ficheiros neste cartafol.</string>
-  <string name="file_list_folder">cartafol</string>
-  <string name="file_list_folders">cartafoles</string>
-  <string name="file_list_file">ficheiro</string>
-  <string name="file_list_files">ficheiros</string>
   <string name="filedetails_select_file">Prema nun ficheiro para que amose a información adicional.</string>
   <string name="filedetails_size">Tamaño:</string>
   <string name="filedetails_type">Tipo:</string>
@@ -198,7 +194,8 @@ Descárgueo de aquí: %2$s</string>
 	</string>
   <string name="auth_can_not_auth_against_server">Non pode autenticarse neste servidor</string>
   <string name="auth_account_does_not_exist">Aínda non existe a conta no dispositivo</string>
-  <string name="fd_keep_in_sync">Manter actualizado o ficheiro</string>
+  <string name="favorite">Favorito</string>
+  <string name="unfavorite">Retirar de favoritos</string>
   <string name="common_rename">Renomear</string>
   <string name="common_remove">Retirar</string>
   <string name="confirmation_remove_alert">Confirma que quere retirar %1$s?</string>
@@ -258,11 +255,7 @@ Descárgueo de aquí: %2$s</string>
   <string name="instant_upload_on_wifi">Enviar imaxes só medinte WiFi</string>
   <string name="instant_video_upload_on_wifi">Enviar os vídeos só a través de WiFi</string>
   <string name="instant_upload_path">/EnvíoInstantáneo</string>
-  <string name="conflict_title">Conflito de actualización</string>
-  <string name="conflict_message">O ficheiro remoto %s non está sincronizado co ficheiro local. Continuando substituirase o contido do ficheiro no servidor.</string>
   <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="error__upload__local_file_not_copied">Non foi posíbel copiar %1$s no cartafol local %2$s</string>
@@ -316,9 +309,17 @@ Descárgueo de aquí: %2$s</string>
   <string name="download_folder_failed_content">Non foi posíbel completar a descarga do cartafol %1$s</string>
   <string name="shared_subject_header">compartido</string>
   <string name="with_you_subject_header">con vostede</string>
-  <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
+  <string name="subject_token">%1$s compartiu «%2$s» con vostede</string>
   <string name="auth_refresh_button">Actualizar a conexión</string>
   <string name="auth_host_address">Enderezo do servidor</string>
   <string name="common_error_out_memory">Non hai memoria abondo</string>
   <string name="username">Nome de usuario</string>
+  <string name="file_list__footer__folder">1 cartafol</string>
+  <string name="file_list__footer__folders">%1$d cartafoles</string>
+  <string name="file_list__footer__file">1 ficheiro</string>
+  <string name="file_list__footer__file_and_folder">1 ficheiro, 1 cartafol</string>
+  <string name="file_list__footer__file_and_folders">1 ficheiro, %1$d cartafoles</string>
+  <string name="file_list__footer__files">%1$d ficheiros</string>
+  <string name="file_list__footer__files_and_folder">%1$d ficheiros, 1 cartafol</string>
+  <string name="file_list__footer__files_and_folders">%1$d ficheiros, %2$d cartafoles</string>
 </resources>