Merge branch 'master' into dependency-injection

2025-10-27 12:53:55 +01:00 · 2017-11-30 21:41:38 -06:00 · 2017-11-30 21:41:38 -06:00 · fb30a34478
commit fb30a34478
parent 07577d73a1 078feb9531
41 changed files with 339 additions and 50 deletions
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
@ -333,7 +333,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
        Fragment fragment = new NearbyMapFragment();
        fragment.setArguments(bundle);
-        fragmentTransaction.replace(R.id.container, fragment);
+        fragmentTransaction.replace(R.id.container, fragment, fragment.getClass().getSimpleName());
        fragmentTransaction.commitAllowingStateLoss();
    }

@ -344,7 +344,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
        Fragment fragment = new NearbyListFragment();
        fragment.setArguments(bundle);
-        fragmentTransaction.replace(R.id.container, fragment);
+        fragmentTransaction.replace(R.id.container, fragment, fragment.getClass().getSimpleName());
        fragmentTransaction.commitAllowingStateLoss();
    }

--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@ -201,4 +201,6 @@
  <string name="send_log_file">লগ ফাইল পাঠান</string>
  <string name="send_log_file_description">ইমেইলের মাধ্যমে উন্নয়নকারীর কাছে লগ ফাইল পাঠান</string>
  <string name="login_to_your_account">আপনার অ্যাকাউন্টে প্রবেশ করুন</string>
+  <string name="nearby_location_has_not_changed">অবস্থান পরিবর্তন হয়নি।</string>
+  <string name="nearby_location_not_available">অবস্থান বোধগম্য নয়।</string>
 </resources>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -201,4 +201,6 @@
  <string name="send_log_file">Send logfil</string>
  <string name="send_log_file_description">Send logfil til udviklerne via e-post</string>
  <string name="login_to_your_account">Log ind på din konto</string>
+  <string name="nearby_location_has_not_changed">Sted er ikke ændret.</string>
+  <string name="nearby_location_not_available">Sted ikke tilgængeligt.</string>
 </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -201,4 +201,6 @@
  <string name="send_log_file">Logdatei senden</string>
  <string name="send_log_file_description">Logdatei an die Entwickler per E-Mail senden</string>
  <string name="login_to_your_account">Bei deinem Benutzerkonto anmelden</string>
+  <string name="nearby_location_has_not_changed">Der Standort hat sich nicht geändert.</string>
+  <string name="nearby_location_not_available">Der Standort ist nicht verfügbar.</string>
 </resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -201,4 +201,6 @@
  <string name="send_log_file">Enviar archivo de registro</string>
  <string name="send_log_file_description">Enviar archivo de registro a los desarrolladores por correo electrónico</string>
  <string name="login_to_your_account">Accede a tu cuenta</string>
+  <string name="nearby_location_has_not_changed">La ubicación no ha cambiado.</string>
+  <string name="nearby_location_not_available">La ubicación no está disponible.</string>
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -201,4 +201,6 @@
  <string name="send_log_file">Envoyer le journal</string>
  <string name="send_log_file_description">Envoyer le journal aux développeurs par courriel</string>
  <string name="login_to_your_account">Connectez-vous à votre compte</string>
+  <string name="nearby_location_has_not_changed">L\'emplacement n\'a pas changé.</string>
+  <string name="nearby_location_not_available">Emplacement non disponible.</string>
 </resources>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -201,4 +201,6 @@
  <string name="send_log_file">Enviar ficheiro de rexistro</string>
  <string name="send_log_file_description">Enviar ficheiro de rexistro ós desenvolvedores por correo electrónico</string>
  <string name="login_to_your_account">Comezar sesión na súa conta</string>
+  <string name="nearby_location_has_not_changed">A localización non cambiou.</string>
+  <string name="nearby_location_not_available">A localización non está dispoñible.</string>
 </resources>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -11,9 +11,9 @@
  <string name="login_success">Sikeres bejelentkezés</string>
  <string name="login_failed">A bejelentkezés nem sikerült.</string>
  <string name="upload_failed">A fájl nem található. Próbálkozz másik fájllal.</string>
-  <string name="authentication_failed">Sikertelen azonosítás.</string>
-  <string name="uploading_started">Feltöltés indul.</string>
-  <string name="upload_completed_notification_title">%1$s feltöltve!</string>
+  <string name="authentication_failed">Sikertelen hitelesítés.</string>
+  <string name="uploading_started">Feltöltés elindult.</string>
+  <string name="upload_completed_notification_title">%1$s feltöltve.</string>
  <string name="upload_completed_notification_text">Feltöltés megtekintése</string>
  <string name="upload_progress_notification_title_start">Feltöltés indul: %1$s</string>
  <string name="upload_progress_notification_title_in_progress">%1$s feltöltése</string>
@ -105,7 +105,7 @@
  <string name="license_name_cc_by_sa_3_0_ee">CC BY-SA 3.0 (Észtország)</string>
  <string name="license_name_cc_by_sa_3_0_es">CC BY-SA 3.0 (Spanyolország)</string>
  <string name="license_name_cc_by_sa_3_0_hr">CC BY-SA 3.0 (Horvátország)</string>
-  <string name="license_name_cc_by_sa_3_0_lu">CC BY-SA 3.0 (Luxembourg)</string>
+  <string name="license_name_cc_by_sa_3_0_lu">CC BY-SA 3.0 (Luxemburg)</string>
  <string name="license_name_cc_by_sa_3_0_nl">CC BY-SA 3.0 (Hollandia)</string>
  <string name="license_name_cc_by_sa_3_0_no">CC BY-SA 3.0 (Norvégia)</string>
  <string name="license_name_cc_by_sa_3_0_pl">CC BY-SA 3.0 (Lengyelország)</string>
@ -190,9 +190,15 @@
  <string name="no_description_found">nincs leírás</string>
  <string name="nearby_info_menu_commons_article">Commons leírólap</string>
  <string name="nearby_info_menu_wikidata_article">Wikidata-elem</string>
+  <string name="error_while_cache">Hiba a képek gyorsítótárazásakor</string>
  <string name="title_info">Egy egyedi, leíró cím a fájlnak, ami fájlnévként fog szolgálni. Egyszerű nyelvezetet használhatsz szóközökkel. Ne tedd bele a kiterjesztést.</string>
  <string name="description_info">Kérlek a lehető legteljesebb módon írd le a fájlt: hol készült, mit ábrázol, mi a kontextus? Kérlek add meg az objektumokat vagy személyeket a képen, valamint a nehezen kitalálható információkat (például a kép készítésének dátumát, ha az egy tájkép). Amennyiben a média valami szokatlant ábrázol, kérlek fejtsd ki, hogy mi teszi szokatlanná.</string>
  <string name="give_permission">Engedély adása</string>
  <string name="use_external_storage">Külső tárhely használata</string>
+  <string name="use_external_storage_summary">Az alkalmazáson belüli kamerával készült képek mentése az eszközre</string>
+  <string name="send_log_file">Naplófájlok küldése</string>
+  <string name="send_log_file_description">Naplófájlok küldése e-mailben a fejlesztőknek</string>
  <string name="login_to_your_account">Bejelentkezés a fiókodba</string>
+  <string name="nearby_location_has_not_changed">A hely nem változott.</string>
+  <string name="nearby_location_not_available">A hely nem érhető el.</string>
 </resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -167,4 +167,6 @@
  <string name="nearby_info_menu_commons_article">Pagina di Commons del file</string>
  <string name="nearby_info_menu_wikidata_article">Elemento Wikidata</string>
  <string name="login_to_your_account">Accedi alla tua utenza</string>
+  <string name="nearby_location_has_not_changed">La posizione non è cambiata.</string>
+  <string name="nearby_location_not_available">Posizione non disponibile.</string>
 </resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -168,4 +168,5 @@
  <string name="no_description_found">説明がありません</string>
  <string name="nearby_info_menu_wikidata_article">ウィキデータ項目</string>
  <string name="use_external_storage">外部ストレージを使用</string>
+  <string name="nearby_location_not_available">位置が無効です。</string>
 </resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -198,4 +198,6 @@
  <string name="send_log_file">로그 파일 보내기</string>
  <string name="send_log_file_description">이메일로 개발자에게 로그 파일 보내기</string>
  <string name="login_to_your_account">자신의 계정으로 로그인</string>
+  <string name="nearby_location_has_not_changed">위치가 변경되지 않았습니다.</string>
+  <string name="nearby_location_not_available">위치를 사용할 수 없습니다.</string>
 </resources>
--- a/app/src/main/res/values-lb/strings.xml
+++ b/app/src/main/res/values-lb/strings.xml
@ -191,4 +191,6 @@
  <string name="send_log_file">Log-Fichier schécken</string>
  <string name="send_log_file_description">Log-Fichier per E-Mail un d\'Entwéckler schécken</string>
  <string name="login_to_your_account">An Äre Benotzerkont aloggen</string>
+  <string name="nearby_location_has_not_changed">De Plaz huet net geännert.</string>
+  <string name="nearby_location_not_available">Plaz ass net disponibel.</string>
 </resources>
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@ -17,7 +17,7 @@
  <string name="upload_completed_notification_text">Допрете за да го погледате подигањето</string>
  <string name="upload_progress_notification_title_start">Почнувам со подигањето на „%1$s“</string>
  <string name="upload_progress_notification_title_in_progress">Подигање на „%1$s“</string>
-  <string name="upload_progress_notification_title_finishing">Заврпувам со подигање на „%1$s“</string>
+  <string name="upload_progress_notification_title_finishing">Завршувам со подигање на „%1$s“</string>
  <string name="upload_failed_notification_title">Подигањето на „%1$s“ не успеа</string>
  <string name="upload_failed_notification_subtitle">Допрете за да погледате</string>
  <plurals name="uploads_pending_notification_indicator">
@ -73,7 +73,7 @@
  <string name="title_activity_settings">Нагодувања</string>
  <string name="title_activity_signup">Регистрација</string>
  <string name="menu_about">За извршникот</string>
-  <string name="about_license">Прилогот на Ризницата има отворен код. Негови творци и оддржувачи се примателите на наменските средства од Викимедиината заедница како и членовите на заедницата. Фондацијата Викимедија нема учество во нејзиното создавање, разработка и одржување.</string>
+  <string name="about_license">Прилогот на Ризницата има отворен код. Негови творци и одржувачи се примателите на наменските средства од Викимедиината заедница како и членовите на заедницата. Фондацијата Викимедија нема учество во нејзиното создавање, разработка и одржување.</string>
  <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Извор&lt;/a&gt; и &lt;a href=\"https://commons-app.github.io/\"&gt;мреж. место&lt;/a&gt; на GitHub&lt;/a&gt;. Создајте нов &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;случај на GitHub&lt;/a&gt; за пријавување грешки и давање предлози.</string>
  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Заштита на личните податоци&lt;/a&gt;</string>
  <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Заслуги&lt;/a&gt;</string>
@ -201,4 +201,6 @@
  <string name="send_log_file">Испрати дневничка податотека</string>
  <string name="send_log_file_description">Испрати дневничка податотека на разработувачите по е-пошта</string>
  <string name="login_to_your_account">Најавете се со вашата сметка</string>
+  <string name="nearby_location_has_not_changed">Местоположбата не е сменета.</string>
+  <string name="nearby_location_not_available">Местоположбата е недостапна.</string>
 </resources>
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@ -201,4 +201,6 @@
  <string name="send_log_file">Send loggfil</string>
  <string name="send_log_file_description">Send loggfil til utviklerne via epost</string>
  <string name="login_to_your_account">Logg inn med kontoen din</string>
+  <string name="nearby_location_has_not_changed">Stedet har ikke blitt endret.</string>
+  <string name="nearby_location_not_available">Sted ikke tilgjengelig.</string>
 </resources>
--- a/app/src/main/res/values-pms/strings.xml
+++ b/app/src/main/res/values-pms/strings.xml
@ -201,4 +201,6 @@
  <string name="send_log_file">Mandé l\'archivi d\'argistr</string>
  <string name="send_log_file_description">Mandé l\'archivi d\'argistr ai dësvlupator për pòsta eletrònica</string>
  <string name="login_to_your_account">Ch\'as colega a sò cont</string>
+  <string name="nearby_location_has_not_changed">Ël leu a l\'é nen cangià.</string>
+  <string name="nearby_location_not_available">Leu nen disponìbil.</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -201,4 +201,6 @@
  <string name="send_log_file">Enviar arquivo de registro</string>
  <string name="send_log_file_description">Enviar arquivo de log para desenvolvedores por e-mail</string>
  <string name="login_to_your_account">Faça login na sua conta</string>
+  <string name="nearby_location_has_not_changed">O local não mudou.</string>
+  <string name="nearby_location_not_available">Localização não disponível.</string>
 </resources>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -10,6 +10,7 @@
  <string name="logging_in_message">Aguarde, por favor…</string>
  <string name="login_success">Inicio de sessão bem sucedido</string>
  <string name="login_failed">O início de sessão falhou!</string>
+  <string name="upload_failed">Ficheiro não encontrado. Por favor, tente outro ficheiro.</string>
  <string name="authentication_failed">Falha de autenticação!</string>
  <string name="uploading_started">Iniciado o carregamento!</string>
  <string name="upload_completed_notification_title">%1$s enviado!</string>
@ -19,11 +20,11 @@
  <string name="upload_progress_notification_title_finishing">A terminar o carregamento de %1$s</string>
  <string name="upload_failed_notification_title">O carregamento de %1$s falhou</string>
  <string name="upload_failed_notification_subtitle">Toque para ver</string>
-  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
-    <item quantity="one">A carregar um ficheiro</item>
-    <item quantity="other">A carregar %d ficheiros</item>
+  <plurals name="uploads_pending_notification_indicator">
+    <item quantity="one">%d a carregar um ficheiro</item>
+    <item quantity="other">a carregar %d ficheiros</item>
  </plurals>
-  <string name="title_activity_contributions" fuzzy="true">Meus carregamentos</string>
+  <string name="title_activity_contributions">Meus carregamentos recentes</string>
  <string name="contribution_state_queued">Em espera</string>
  <string name="contribution_state_failed">Falhou</string>
  <string name="contribution_state_in_progress">%1$d%% concluído</string>
@ -39,8 +40,9 @@
  <string name="login_failed_network">Não foi possível iniciar sessão - falha de rede</string>
  <string name="login_failed_username">Não foi possível iniciar sessão - verifique o seu nome de utilizador(a)</string>
  <string name="login_failed_password">Não foi possível iniciar sessão - verifique a sua palavra-passe</string>
-  <string name="login_failed_throttled" fuzzy="true">Demasiadas tentativas mal sucedidas. Por favor, tente de novo dentro de alguns minutos</string>
+  <string name="login_failed_throttled">Demasiadas tentativas malsucedidas. Por favor, tente de novo dentro de alguns minutos.</string>
  <string name="login_failed_blocked">Desculpe, este utilizador foi bloqueado no Commons</string>
+  <string name="login_failed_2fa_needed">Precisa fornecer o seu código de ativação de dois fatores.</string>
  <string name="login_failed_generic">Falha ao iniciar sessão</string>
  <string name="share_upload_button">Carregar</string>
  <string name="multiple_share_base_title">Nomeie este conjunto</string>
@ -48,9 +50,13 @@
  <string name="menu_upload_single">Enviar</string>
  <string name="categories_search_text_hint">Pesquisar categorias</string>
  <string name="menu_save_categories">Gravar</string>
-  <plurals name="contributions_subtitle" fuzzy="true">
-    <item quantity="zero">Sem carregamentos ainda</item>
-    <item quantity="one">1 carregamento</item>
+  <string name="refresh_button">Atualizar</string>
+  <string name="gps_disabled">O GPS está desativado no seu dispositivo. Gostarias de ativá-lo?</string>
+  <string name="enable_gps">Ativar GPS</string>
+  <string name="contributions_subtitle_zero">Ainda não foram enviados ficheiros</string>
+  <plurals name="contributions_subtitle">
+    <item quantity="zero">\@string/contributions_subtitle_zero</item>
+    <item quantity="one">%d carregamento</item>
    <item quantity="other">%d carregamentos</item>
  </plurals>
  <plurals name="starting_multiple_uploads" fuzzy="true">
@ -65,12 +71,14 @@
  <string name="categories_skip_explanation">Adicione categorias para tornar as suas imagens mais fáceis de encontrar no Wikimedia Commons. \n\nComece a digitar para adicionar categorias.\nCarregue nesta mensagem (ou carregue para voltar) para saltar este passo</string>
  <string name="categories_activity_title">Categorias</string>
  <string name="title_activity_settings">Configurações</string>
+  <string name="title_activity_signup">Registar-se</string>
  <string name="menu_about">Sobre</string>
  <string name="about_license" fuzzy="true">Software em código aberto distribuído sob &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. O Wikimedia Commons e o seu logótipo são marcas registadas da Wikimedia Foundation e são usadas com permissão da Wikimedia Foundation. Não somos endossados ou afiliados à Wikimedia Foundation.</string>
  <string name="about_improve" fuzzy="true">Código no &lt;a href=\"https://github.com/commons-app/android-commons\"&gt;GitHub&lt;/a&gt;. Erros no &lt;a href=\" https://github.com/commons-app/apps-android-commons/issues\"&gt;Github&lt;/a&gt;.</string>
  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Política de privacidade&lt;/a&gt;</string>
  <string name="title_activity_about">Sobre</string>
  <string name="menu_feedback">Enviar comentários (por e-mail)</string>
+  <string name="no_email_client">Não foi instalado nenhum cliente de correio eletrónico</string>
  <string name="provider_categories">Categorias usadas recentemente</string>
  <string name="waiting_first_sync">A aguardar pela primeira sincronização…</string>
  <string name="no_uploads_yet">Não carregou ainda nenhuma foto.</string>
@ -118,4 +126,12 @@
  <string name="title_activity_nearby">Locais Próximos</string>
  <string name="yes">Sim</string>
  <string name="no">Não</string>
+  <string name="media_detail_title">Título</string>
+  <string name="media_detail_media_title">Título do ficheiro multimédia</string>
+  <string name="media_detail_description">Descrição</string>
+  <string name="media_detail_uploaded_date">Data de carregamento</string>
+  <string name="media_detail_license">Licença</string>
+  <string name="media_detail_coordinates">Coordenadas</string>
+  <string name="media_detail_coordinates_empty">Não fornecido</string>
+  <string name="use_wikidata">Utilizar o Wikidata</string>
 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -205,4 +205,6 @@
  <string name="send_log_file">Выслать лог-файл</string>
  <string name="send_log_file_description">Выслать лог-файл разработчикам по е-мейлу</string>
  <string name="login_to_your_account">Войдите в свою учётную запись</string>
+  <string name="nearby_location_has_not_changed">Местоположение не изменено.</string>
+  <string name="nearby_location_not_available">Местоположение недоступно.</string>
 </resources>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -201,4 +201,6 @@
  <string name="send_log_file">Skicka loggfil</string>
  <string name="send_log_file_description">Skicka loggfilen till utvecklarna via e-post</string>
  <string name="login_to_your_account">Logga in på ditt konto</string>
+  <string name="nearby_location_has_not_changed">Platsen har inte ändrats.</string>
+  <string name="nearby_location_not_available">Platsen är inte tillgänglig.</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -201,4 +201,6 @@
  <string name="send_log_file">寄送日誌檔案</string>
  <string name="send_log_file_description">經由電子郵件寄送日誌檔案給開發人員</string>
  <string name="login_to_your_account">登入您的帳號</string>
+  <string name="nearby_location_has_not_changed">位置無法更改。</string>
+  <string name="nearby_location_not_available">位置無效。</string>
 </resources>
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@ -201,4 +201,6 @@
  <string name="send_log_file">发送日志文件</string>
  <string name="send_log_file_description">通过电子邮件将日志文件发送给开发人员</string>
  <string name="login_to_your_account">登录您的账户</string>
+  <string name="nearby_location_has_not_changed">位置没有更新。</string>
+  <string name="nearby_location_not_available">位置不可用。</string>
 </resources>