From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 19 Jun 2013 15:56:46 +0000 (+0200)
Subject: Merge branch 'develop'after SPRINT-002
X-Git-Tag: oc-android-1.4.3~12^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/63a3522ab7c8940ccc48be09e2247f86cbf60598?ds=inline;hp=-c

Merge branch 'develop'after SPRINT-002

Conflicts:
	.classpath
---

63a3522ab7c8940ccc48be09e2247f86cbf60598
diff --combined .classpath
index 0b084083,2731f9c5..7bc01d9a
--- a/.classpath
+++ b/.classpath
@@@ -1,9 -1,9 +1,9 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
- 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
  	<classpathentry kind="src" path="src"/>
  	<classpathentry kind="src" path="gen"/>
+ 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+ 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 -	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 +	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
  	<classpathentry kind="output" path="bin/classes"/>
  </classpath>
diff --combined res/values-pt-rBR/strings.xml
index c2e6ca0b,8851c6c2..41f2dd62
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@@ -21,8 -21,8 +21,8 @@@
    <string name="actionbar_mkdir">Criar pasta</string>
    <string name="actionbar_search">Procurar</string>
    <string name="actionbar_settings">Ajustes</string>
 +  <string name="actionbar_see_details">Detalhes</string>
    <string name="prefs_category_general">Geral</string>
 -  <string name="prefs_category_trackmydevice">Rastreamento de dispositivo</string>
    <string name="prefs_add_session">Adicionar nova sessão</string>
    <string name="prefs_create_img_thumbnails">Criar miniaturas de imagens</string>
    <string name="prefs_select_oc_account">Selecione uma conta</string>
@@@ -53,7 -53,6 +53,7 @@@
    <string name="setup_title">Conecte ao seu ownCloud</string>
    <string name="setup_btn_connect">Conectar</string>
    <string name="uploader_btn_upload_text">Upload</string>
 +  <string name="uploader_top_message">Escolher pasta para enviar:</string>
    <string name="uploader_wrn_no_account_title">Nenhuma conta encontrada</string>
    <string name="uploader_wrn_no_account_text">Não existem contas ownCloud no seu dispositivo. Por favor, configure uma conta primeiro.</string>
    <string name="uploader_wrn_no_account_setup_btn_text">Instalação</string>
@@@ -83,8 -82,6 +83,8 @@@
    <string name="common_save_exit">Salvar &amp; Sair</string>
    <string name="common_exit">Sair do ownCloud</string>
    <string name="common_error">Erro</string>
 +  <string name="common_loading">Carregando ...</string>
 +  <string name="common_error_unknown">Erro desconhecido</string>
    <string name="about_title">Sobre</string>
    <string name="delete_account">Remover conta</string>
    <string name="create_account">Criar conta</string>
@@@ -104,7 -101,6 +104,7 @@@
    <string name="downloader_download_succeeded_content">%1$s foi baixado com sucesso</string>
    <string name="downloader_download_failed_ticker">Download falhou</string>
    <string name="downloader_download_failed_content">Download de %1$s não pôde ser concluído</string>
 +  <string name="downloader_not_downloaded_yet">Não baixado ainda</string>
    <string name="common_choose_account">Escolha a conta</string>
    <string name="sync_string_contacts">Contatos</string>
    <string name="sync_fail_ticker">Sincronização falhou</string>
@@@ -113,15 -109,6 +113,15 @@@
    <string name="sync_conflicts_in_favourites_content">%1$d arquivos \"manter sincronizados\" não puderam ser sincronizados</string>
    <string name="sync_fail_in_favourites_ticker">Falha ao manter arquivos sincronizados</string>
    <string name="sync_fail_in_favourites_content">O conteúdo de %1$d arquivos não puderam ser sincronizados (%2$d conflitos)</string>
 +  <string name="sync_foreign_files_forgotten_ticker">Alguns arquivos locais foram esquecidos</string>
 +  <string name="sync_foreign_files_forgotten_content">%1$d arquivos da pasta %2$s não foram copiados</string>
-   <string name="sync_foreign_files_forgotten_explanation">A partir da versão 1.3.16, os arquivos enviados a partir deste dispositivo são copiados para a pasta local %1$s para evitar a perda de dados quando um único arquivo é sincronizado com várias contas. \n\nDevido a essa mudança, todos os arquivos carregados em versões anteriores deste aplicativo foram copiados para a pasta %2$s. No entanto, um erro evita a conclusão desta operação durante a conta de sincronização. Você pode tanto deixar os arquivos como é e remover o link para %3$s, ou mover o arquivos para o diretório %1$s e manter o link para 4%$s. \n\nListados abaixo estão os arquivos locais, e os arquivos remotos em 5%$s que estavam vinculados.</string>
++  <string name="sync_foreign_files_forgotten_explanation">A partir da versão 1.3.16, os arquivos enviados a partir deste dispositivo são copiados para a pasta local %1$s para evitar a perda de dados quando um único arquivo é sincronizado com várias contas. \n\nDevido a essa mudança, todos os arquivos carregados em versões anteriores deste aplicativo foram copiados para a pasta %2$s. No entanto, um erro evita a conclusão desta operação durante a conta de sincronização. Você pode tanto deixar os arquivos como é e remover o link para %3$s, ou mover o arquivos para o diretório %1$s e manter o link para %4$s. \n\nListados abaixo estão os arquivos locais, e os arquivos remotos em %5$s que estavam vinculados.</string>
 +  <string name="foreign_files_move">Mover todos</string>
 +  <string name="foreign_files_success">Todos os arquivos foram movidos</string>
 +  <string name="foreign_files_fail">Alguns arquivos não puderam ser movidos</string>
 +  <string name="foreign_files_local_text">Local: %1$s</string>
 +  <string name="foreign_files_remote_text">Remoto: %1$s</string>
 +  <string name="upload_query_move_foreign_files">Não há espaço suficiente para copiar os arquivos selecionados para a pasta %1$s. Ao invés disso, gostaria de movê-los?</string>
    <string name="use_ssl">Usar Conexão Segura</string>
    <string name="location_no_provider">%1$s não pode rastrear seu dispositivo. Por favor verifique suas configurações de localização</string>
    <string name="pincode_enter_pin_code">Por favor, insira o seu PIN de Aplicativo</string>
@@@ -134,27 -121,6 +134,27 @@@
    <string name="pincode_wrong">PIN de Aplicativo incorreto</string>
    <string name="pincode_removed">PIN de Aplicativo removido</string>
    <string name="pincode_stored">PIN de Aplicativo armazenado</string>
 +  <string name="media_notif_ticker">%1$s reprodutor de música</string>
 +  <string name="media_state_playing">%1$s (reproduzindo)</string>
 +  <string name="media_state_loading">%1$s (carregando)</string>
 +  <string name="media_event_done">%1$s reprodução finalizada</string>
 +  <string name="media_err_nothing_to_play">Nenhum arquivo de mídia encontrado</string>
 +  <string name="media_err_no_account">Nenhuma conta fornecida</string>
 +  <string name="media_err_not_in_owncloud">Arquivo não está em uma conta válida</string>
 +  <string name="media_err_unsupported">Codec de mídia não suportado</string>
 +  <string name="media_err_io">Arquivo de mídia não pode ser lido</string>
 +  <string name="media_err_malformed">Arquivo de mídia não corretamente codificado</string>
 +  <string name="media_err_timeout">Muito tempo tentando reproduzir</string>
 +  <string name="media_err_invalid_progressive_playback">Arquivo de mídia não pode ser transmitido</string>
 +  <string name="media_err_unknown">Arquivo de mídia não pode ser reproduzido com o estoque media player</string>
 +  <string name="media_err_security_ex">Erro de segurança tentando reproduzir %1$s</string>
 +  <string name="media_err_io_ex">Erro de entrada tentando reproduzir %1$s</string>
 +  <string name="media_err_unexpected">Erro inesperado tentando reproduzir %1$s</string>
 +  <string name="media_previous_description">Botão para trilha anterior</string>
 +  <string name="media_rewind_description">Botão rebobinar</string>
 +  <string name="media_play_pause_description">Botão reproduzir parar</string>
 +  <string name="media_forward_description">Botão de adiantamento rápido</string>
 +  <string name="media_next_description">Botão próxima trilha</string>
    <string-array name="prefs_trackmydevice_intervall_keys">
      <item>15 minutos</item>
      <item>30 minutos</item>
@@@ -242,12 -208,7 +242,12 @@@
    <string name="ssl_validator_label_validity_to">Para:</string>
    <string name="ssl_validator_label_signature">Assinatura:</string>
    <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
 -  <string name="text_placeholder">Isso é um marcador de espaço</string>
 +  <string name="placeholder_sentence">Este é um espaço reservado</string>
 +  <string name="placeholder_filename">espaçoreservado.txt</string>
 +  <string name="placeholder_filetype">Imagem PNG</string>
 +  <string name="placeholder_filesize">389 KB</string>
 +  <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
 +  <string name="placeholder_media_time">12:23:45</string>
    <string name="instant_upload_on_wifi">Fazer upload de fotos somente via WiFi</string>
    <string name="instant_upload_path">/Upload instantâneo</string>
    <string name="conflict_title">Conflito de atualização</string>
@@@ -255,20 -216,4 +255,20 @@@
    <string name="conflict_keep_both">Manter ambos</string>
    <string name="conflict_overwrite">Sobrescrever</string>
    <string name="conflict_dont_upload">Não fazer upload</string>
 +  <string name="preview_image_description">Pré-visualização da imagem</string>
 +  <string name="preview_image_error_unknown_format">Esta imagem não pode ser mostrada</string>
 +  <string name="preview_image_error_out_of_memory">\"Não há memoria suficiente para mostrar esta imagem</string>
 +  <!--we need to improve the communication of errors to the user-->
 +  <string name="error__upload__local_file_not_copied">%1$s não pode ser copiado a pasta local %2$s</string>
 +  <string name="actionbar_failed_instant_upload">Falha no envio imediato</string>
 +  <string name="failed_upload_headline_text">Falhas nos envios imediatos</string>
 +  <string name="failed_upload_headline_hint">Sumario de todas as falhas nos envios imediatos</string>
 +  <string name="failed_upload_all_cb">selecionar tudo</string>
 +  <string name="failed_upload_headline_retryall_btn">tentar novamente todos os selecionados</string>
 +  <string name="failed_upload_headline_delete_all_btn">excluir todos os selecionados da lista de envio</string>
 +  <string name="failed_upload_retry_text">tentar novamente envio da imagem:</string>
 +  <string name="failed_upload_load_more_images">Carregar mais Imagens</string>
 +  <string name="failed_upload_retry_do_nothing_text">não fazer nada voce não está conectado para envio instantâneo </string>
 +  <string name="failed_upload_failure_text">Mensagem de Falha:</string>
 +  <string name="failed_upload_quota_exceeded_text">Por favor verifique a configuração do servidor, talvez a sua cota esteja vencida.</string>
  </resources>
diff --combined res/values/strings.xml
index 67e195f0,708fbfbb..4ea31574
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -14,11 -14,13 +14,13 @@@
      <string name="main_settings">Settings</string>
      <string name="main_tit_accsetup">Setup Account</string>
      <string name="main_wrn_accsetup">There is no account set up on your device. In order to use this App, you need to create one.</string>
-     <string name="about_message">%1$s Android App\n\nversion: %2$s</string>
-     <string name="actionbar_sync">Refresh</string>
+     <string name="about_android">%1$s Android App</string>
+     <string name="about_version">version %1$s</string>
+     <string name="actionbar_sync">Refresh account</string>
      <string name="actionbar_upload">Upload</string>
      <string name="actionbar_upload_from_apps">Content from other apps</string>
      <string name="actionbar_upload_files">Files</string>
+     <string name="actionbar_open_with">Open with</string>
      <string name="actionbar_mkdir">Create directory</string>
      <string name="actionbar_search">Search</string>
      <string name="actionbar_settings">Settings</string>
@@@ -40,7 -42,13 +42,13 @@@
      <string name="prefs_pincode_summary">Protect your client</string>
      <string name="prefs_instant_upload">Enable instant uploads</string>
      <string name="prefs_instant_upload_summary">Instantly upload photos taken by camera</string>
-     <string name="auth_host_url">URL</string>
+     <string name="prefs_log_title">Enable Logging</string>
+     <string name="prefs_log_summary">This is used to log problems</string>
+     <string name="prefs_log_title_history">Logging History</string>
+     <string name="prefs_log_summary_history">This shows the recorded logs</string>
+     <string name="prefs_log_delete_history_button">Delete History</string>
+     
+     <string name="auth_host_url">Server address</string>
      <string name="auth_username">Username</string>
      <string name="auth_password">Password</string>
      <string name="auth_register">I am new to %1$s</string>
@@@ -72,9 -80,8 +80,8 @@@
      <string name="filedetails_created">Created:</string>
      <string name="filedetails_modified">Modified:</string>
      <string name="filedetails_download">Download</string>
-     <string name="filedetails_sync_file">Refresh</string>
+     <string name="filedetails_sync_file">Refresh file</string>
      <string name="filedetails_redownload">Redownload</string>
-     <string name="filedetails_open">Open</string>
      <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
      <string name="common_yes">Yes</string>
      <string name="common_no">No</string>
@@@ -111,13 -118,14 +118,14 @@@
      <string name="sync_string_contacts">Contacts</string>
      <string name="sync_fail_ticker">Synchronization failed</string>
      <string name="sync_fail_content">Synchronization of %1$s could not be completed</string>
-     <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
-     <string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
+     <string name="sync_fail_content_unauthorized">Invalid credentials for %1$s</string>
+ 	<string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
+ 	<string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
      <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
      <string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string>
      <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
      <string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s directory could not be copied into</string>
 -    <string name="sync_foreign_files_forgotten_explanation">"As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the the remote file(s) in %5$s they were linked to.</string>
 +    <string name="sync_foreign_files_forgotten_explanation">As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the the remote file(s) in %5$s they were linked to.</string>
      <string name="foreign_files_move">"Move all"</string>
      <string name="foreign_files_success">"All files were moved"</string>
      <string name="foreign_files_fail">"Some files could not be moved"</string>
@@@ -169,14 -177,14 +177,14 @@@
          <item>60</item>
      </string-array>
  
-     <string name="auth_trying_to_login">Trying to login…</string>
+     <string name="auth_trying_to_login">Trying to login...</string>
      <string name="auth_no_net_conn_title">No network connection</string>
      <string name="auth_no_net_conn_message">No network connection has been detected, check your Internet connection and try again.</string>
      <string name="auth_connect_anyway">Connect anyway</string>
      <string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string>
      <string name="auth_nossl_plain_ok_message">The Application cannot establish a secure connection to the server. A non secure connection is available. You may continue or cancel.</string>
      <string name="auth_connection_established">Connection established</string>
-     <string name="auth_testing_connection">Testing connection…</string>
+     <string name="auth_testing_connection">Testing connection...</string>
      <string name="auth_not_configured_title">Malformed server configuration</string>
      <string name="auth_not_configured_message">It seems that your server instance is not correctly configured. Contact your administrator for more details.</string>
      <string name="auth_unknown_error_title">Unknown error occurred!</string>
@@@ -192,10 -200,15 +200,15 @@@
      <string name="auth_bad_oc_version_title">Unrecognized server version</string>
      <string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
      <string name="auth_secure_connection">Secure connection established</string>
-     <string name="auth_login_details">Login details</string>
-     <string name="auth_unauthorized">Invalid login / password</string>
+     <string name="auth_unauthorized">Invalid credentials</string>
+ 	<string name="auth_oauth_error">Unsuccessful authorization</string>
+ 	<string name="auth_oauth_error_access_denied">Access denied by authorization server</string>
      <string name="auth_not_found">Wrong path given</string>
      <string name="auth_internal">Internal server error, code %1$d</string>
+     <string name="auth_wtf_reenter_URL">Unexpected state; please, enter the server URL again</string>
+     <string name="auth_expired_oauth_token_toast">Your authorization expired.\nPlease, authorize again</string>
+     <string name="auth_expired_basic_auth_toast">Your saved credentials are invalid.\nPlease, enter the current credentials</string>
+     
      <string name="crashlog_message">Application terminated unexpectedly. Would you like to submit a crash report?</string>
      <string name="crashlog_send_report">Send report</string>
      <string name="crashlog_dont_send_report">Don\'t send report</string>
@@@ -222,6 -235,13 +235,13 @@@
      <string name="wait_a_moment">Wait a moment</string>
      <string name="filedisplay_unexpected_bad_get_content">"Unexpected problem ; please select the file from a different app"</string>
      <string name="filedisplay_no_file_selected">No file was selected</string>
+     
+     <string name="oauth_host_url">oAuth2 URL</string> 
+     <string name="oauth_check_onoff">Login with oAuth2.</string> 
+     <string name="oauth_login_connection">Connecting to oAuth2 server…</string>    
+     <string name="oauth_code_validation_message">Please, open a web browser and go to:\n%1$s.\nValidate this code there:\n%2$s</string>
+     <string name="oauth_connection_url_unavailable">Connection to this URL not available.</string> 
+         
      <string name="ssl_validator_title">Warning</string>
      <string name="ssl_validator_header">The identity of the site could not be verified</string>
      <string name="ssl_validator_reason_cert_not_trusted">- The server certificate is not trusted</string>