Merge remote-tracking branch 'upstream/master' into addThemeToggle

app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java

@@ -8,6 +8,9 @@ import android.location.LocationManager;
 import android.os.Bundle;
 import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 
 import fr.free.nrw.commons.BaseAppCompatActivity;
 import fr.free.nrw.commons.R;
@@ -40,12 +43,33 @@ public class NearbyActivity extends BaseAppCompatActivity {
         ft.add(R.id.container, fragment);
         ft.commit();
     }
-
+    @Override
+    public boolean onCreateOptionsMenu (Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu_nearby, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle item selection
+        switch (item.getItemId()) {
+            case R.id.action_refresh:
+                refreshView();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
     @Override
     protected void onResume(){
         super.onResume();
     }
 
+    protected void refreshView()
+    {
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.container, new NearbyListFragment()).commit();
+    }
     protected LatLng getmLatestLocation() {
         return mLatestLocation;
     }

app/src/main/res/menu/activity_share.xml

@@ -2,7 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_upload_single"
         android:title="@string/menu_upload_single"
-        android:icon="@drawable/social_send_now"
+        android:icon="@drawable/ic_send_white_24dp"
         android:enabled="false"
         app:showAsAction="always" />
 </menu>

app/src/main/res/menu/fragment_categorization.xml

@@ -4,6 +4,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_save_categories"
           android:title="@string/menu_save_categories"
-          android:icon="@android:drawable/ic_menu_save"
+          android:icon="@drawable/ic_save_white_24dp"
           app:showAsAction="always" />
 </menu>

app/src/main/res/menu/fragment_contributions_list.xml

@@ -4,13 +4,13 @@
           android:title="@string/menu_from_camera"
           android:orderInCategory="100"
           app:showAsAction="ifRoom|withText"
-          android:icon="@android:drawable/ic_menu_camera"
+          android:icon="@drawable/ic_photo_camera_white_24dp"
             />
     <item android:id="@+id/menu_from_gallery"
         android:title="@string/menu_from_gallery"
         android:orderInCategory="200"
         app:showAsAction="ifRoom|withText"
-        android:icon="@android:drawable/ic_menu_gallery"
+        android:icon="@drawable/ic_photo_white_24dp"
             />
     <item android:id="@+id/menu_settings"
           android:title="@string/menu_settings"

app/src/main/res/menu/fragment_image_detail.xml

@@ -18,7 +18,7 @@
     <item
         android:id="@+id/menu_retry_current_image"
         android:enabled="false"
-        android:icon="@android:drawable/ic_menu_revert"
+        android:icon="@drawable/ic_undo_white_24dp"
         android:title="@string/menu_retry_upload"
         android:visible="false"
         app:showAsAction="ifRoom|withText" />

app/src/main/res/menu/fragment_multiple_upload_list.xml

@@ -6,6 +6,6 @@
     <item android:id="@+id/menu_upload_multiple"
           android:title="@string/share_upload_button"
           app:showAsAction="always|withText"
-          android:icon="@android:drawable/ic_menu_send"
+          android:icon="@drawable/ic_send_white_24dp"
         />
 </menu>

app/src/main/res/menu/menu_nearby.xml

@@ -0,0 +1,13 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"      tools:context=".MainActivity">
+
+    <item
+        android:id="@+id/action_refresh"
+        android:title="@string/refresh_button"
+        android:icon="@drawable/ic_action_refresh"
+        android:orderInCategory="1"
+        app:showAsAction="ifRoom"
+        />
+
+</menu>

app/src/main/res/values-br/strings.xml

@@ -164,4 +164,7 @@ Pouezit war ar c\'hemenn-mañ (pe distroit en a-raok) evit mont dreist ar bazenn
   <string name="media_detail_media_title">Titl ar media</string>
   <string name="media_detail_description">Deskrivadur</string>
   <string name="media_detail_description_explanation">Amañ e lakaer titl ar media. Gallout a ra bezañ hir-mat ha mont dre meur a linenn. Spi hon eus e vo bravik an disoc\'h koulskoude.</string>
+  <string name="become_a_tester_title">Deuit da vezañ un amprouer beta</string>
+  <string name="become_a_tester_description">En em enskrivañ en hor c\'hanol beta war Google Play ha kaout ur rakmoned d\'an arc\'hwelioù nevez d\'an drein difaziet</string>
+  <string name="beta_opt_in_link">https://play.google.com/apps/testing/fr.free.nrw.commons</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -160,4 +160,11 @@ Appuyez sur ce message (ou retournez en arrière) pour sauter cette étape.</str
   <string name="file_exists">Ce fichier existe déjà sur Communs. Êtes-vous sûr de vouloir continuer ?</string>
   <string name="yes">Oui</string>
   <string name="no">Non</string>
+  <string name="media_detail_title">Titre</string>
+  <string name="media_detail_media_title">Titre du média</string>
+  <string name="media_detail_description">Description</string>
+  <string name="media_detail_description_explanation">La description du média va ici. Cela peut être potentiellement assez long, et devra être réparti sur plusieurs lignes. Nous espérons que cela reste ^quand même joli.</string>
+  <string name="become_a_tester_title">Devenir un bêta-testeur</string>
+  <string name="become_a_tester_description">S’inscrire à notre canal bêta sur Google Play et obtenir un accès anticipé aux nouvelles fonctionnalités et corrections de bogue</string>
+  <string name="beta_opt_in_link">https://play.google.com/apps/testing/fr.free.nrw.commons</string>
 </resources>

app/src/main/res/values-frr/strings.xml

@@ -72,7 +72,7 @@
   <string name="menu_about">Auer</string>
   <string name="about_license">Open Source software ütjden oner det lisens &lt;a href=\"https://github.com/wikimedia/android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;.
 Wikimedia Commons an det Wikimedia-Commons-Logo san markintiaken faan\'t Wikimedia Foundation an wurd mä ferloof faan\'t Wikimedia Foundation brükt. Wi hiar ei tu\'t Wikimedia Foundation.</string>
-  <string name="about_improve" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Code&lt;/a&gt; an &lt;a href=\"https://commons-app.github.io/\"&gt;Wääbsteed&lt;/a&gt; üüb GitHub. En neien &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-iindrach&lt;/a&gt; för feelern of föörslacher maage.</string>
+  <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Code&lt;/a&gt; an &lt;a href=\"https://commons-app.github.io/\"&gt;Wääbsteed&lt;/a&gt; üüb GitHub&lt;/a&gt;. En neien &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-iindrach&lt;/a&gt; för feelern of föörslacher maage.</string>
   <string name="about_privacy_policy">Brükerreegeln</string>
   <string name="title_activity_about">Auer</string>
   <string name="menu_feedback">Wat wel dü üs sai ? (auer e-mail)</string>
@@ -88,6 +88,8 @@ Wikimedia Commons an det Wikimedia-Commons-Logo san markintiaken faan\'t Wikimed
   <string name="use_previous">Ual tiitel/beskriiwang brük</string>
   <string name="allow_gps">Aktuel plak automaatisk ufrep</string>
   <string name="allow_gps_summary">Rept di aktuel plak uf, am kategoriin föörtuslauen, wan det bil nian geotags hää.</string>
+  <string name="license_name_cc_by_sa_four">Attribution-ShareAlike 4.0</string>
+  <string name="license_name_cc_by_four">Attribution 4.0</string>
   <string name="license_name_cc_by_sa"> Attribution-ShareAlike 3.0</string>
   <string name="license_name_cc_by">Attribution 3.0</string>
   <string name="license_name_cc0">CC0</string>
@@ -156,4 +158,11 @@ Wikimedia Commons an det Wikimedia-Commons-Logo san markintiaken faan\'t Wikimed
   <string name="file_exists">Detdiar datei jaft det al üüb Commons. Beest dü seeker, dat dü widjer maage wel?</string>
   <string name="yes">Ja</string>
   <string name="no">Naan</string>
+  <string name="media_detail_title">Tiitel</string>
+  <string name="media_detail_media_title">Tiitel faan\'t meedium</string>
+  <string name="media_detail_description">Beskriiwang</string>
+  <string name="media_detail_description_explanation">Beskriiwang faan\'t meedium.</string>
+  <string name="become_a_tester_title">Beta-Tester wurd</string>
+  <string name="become_a_tester_description">Melde di bi üüs beta-kanool üüb Google Play uun, an fu ääder tugang tu nei funktjuunen.</string>
+  <string name="beta_opt_in_link">https://play.google.com/apps/testing/fr.free.nrw.commons</string>
 </resources>

app/src/main/res/values-hi/strings.xml

@@ -158,4 +158,6 @@
   <string name="file_exists">यह फ़ाइल कॉमन्स पर पहले से है। क्या आप फिर भी आगे बढ़ना चाहते हैं?</string>
   <string name="yes">हाँ</string>
   <string name="no">नहीं</string>
+  <string name="media_detail_title">शीर्षक</string>
+  <string name="media_detail_description">विवरण</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -146,4 +146,7 @@ Tocca questo messaggio (o premi Indietro) per saltare l\'aggiunta di categorie.<
   <string name="file_exists">Questo file esiste già su Commons. Sei sicuro di voler continuare?</string>
   <string name="yes">Sì</string>
   <string name="no">No</string>
+  <string name="media_detail_title">Titolo</string>
+  <string name="media_detail_media_title">Titolo del file multimediale</string>
+  <string name="media_detail_description">Descrizione</string>
 </resources>

app/src/main/res/values-iw/strings.xml

@@ -164,4 +164,6 @@
   <string name="media_detail_media_title">כותרת המדיה</string>
   <string name="media_detail_description">תיאור</string>
   <string name="media_detail_description_explanation">תיאור המדיה יהיה כאן. זה יכול להיות ארוך למדי, ולהתפרס על מספר שורות. אנחנו מקווים שזה נראה טוב.</string>
+  <string name="become_a_tester_title">להפוך לבודק בטא</string>
+  <string name="become_a_tester_description">להירשם לערוץ הבטא שלנו בחנות גוגל Play ולקבל גישה מוקדמת לאפשרויות חדשות ותיקוני באגים</string>
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -154,4 +154,6 @@
   <string name="media_detail_title">제목</string>
   <string name="media_detail_media_title">미디어 제목</string>
   <string name="media_detail_description">설명</string>
+  <string name="become_a_tester_title">베타 테스터가 되세요</string>
+  <string name="beta_opt_in_link">https://play.google.com/apps/testing/fr.free.nrw.commons</string>
 </resources>

app/src/main/res/values-lb/strings.xml

@@ -160,6 +160,7 @@ Leet w.e.g. <a href=\"https://github.com/commons-app/apps-android-commons/iss
   <string name="yes">Jo</string>
   <string name="no">Neen</string>
   <string name="media_detail_title">Titel</string>
+  <string name="media_detail_media_title">Titel vum Medium</string>
   <string name="media_detail_description">Beschreiwung</string>
   <string name="become_a_tester_title">Beta-Tester ginn</string>
 </resources>

app/src/main/res/values-mg/strings.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_settings">Fanafahana</string>
+  <string name="username">Anaram-pikambana</string>
+  <string name="password">Tenimiafina</string>
+  <string name="login">Hiditra</string>
+  <string name="logging_in_title">Am-pidirana...</string>
+  <string name="share_title_hint">Lohateny</string>
+  <string name="share_description_hint">Visavisa</string>
+  <string name="categories_activity_title">Sokajy</string>
+  <string name="title_activity_settings">Fanafahana</string>
+  <string name="title_activity_signup">Hisoratra anarana</string>
+  <string name="menu_about">Mombamomba</string>
+  <string name="title_activity_about">Mombamomba</string>
+  <string name="menu_retry_upload">Andramana indray</string>
+  <string name="menu_cancel_upload">Avela</string>
+  <string name="menu_download">Hampidina</string>
+  <string name="preference_license">Fahazoan-dalana</string>
+  <string name="use_previous">Hampiasa ny lohateny/visavisa niaviana</string>
+  <string name="allow_gps">Haka ny toeram-pisiana ho azy</string>
+  <string name="license_name_cc0">CC0</string>
+  <string name="license_name_cc_by_sa_3_0">CC BY-SA 3.0</string>
+  <string name="license_name_cc_by_sa_3_0_at">CC BY-SA 3.0 (Aotrisy)</string>
+  <string name="license_name_cc_by_sa_3_0_de">CC BY-SA 3.0 (Alemaina)</string>
+  <string name="license_name_cc_by_sa_3_0_ee">CC BY-SA 3.0 (Estonia)</string>
+  <string name="license_name_cc_by_sa_3_0_es">CC BY-SA 3.0 (Espaina)</string>
+  <string name="license_name_cc_by_sa_3_0_hr">CC BY-SA 3.0 (Krôasia)</string>
+  <string name="license_name_cc_by_sa_3_0_lu">CC BY-SA 3.0 (Loksamborga)</string>
+  <string name="license_name_cc_by_sa_3_0_nl">CC BY-SA 3.0 (Nederlandy)</string>
+  <string name="license_name_cc_by_sa_3_0_no">CC BY-SA 3.0 (Nôrvezy)</string>
+  <string name="license_name_cc_by_sa_3_0_pl">CC BY-SA 3.0 (Polonia)</string>
+  <string name="license_name_cc_by_sa_3_0_ro">CC BY-SA 3.0 (Romania)</string>
+  <string name="license_name_cc_by_3_0">CC BY 3.0</string>
+  <string name="license_name_cc_by_sa_4_0">CC BY-SA 4.0</string>
+  <string name="license_name_cc_by_4_0">CC BY 4.0</string>
+  <string name="license_name_cc_zero">CC Aotra</string>
+  <string name="license_name_own_pd">own-pd</string>
+  <string name="license_name_cc_by_sa_2_5">CC BY-SA 2.5</string>
+  <string name="license_name_cc_by_2_5">CC BY 2.5</string>
+  <string name="license_name_cc_by_sa_2_0">CC BY-SA 2.0</string>
+  <string name="license_name_cc_by_2_0">CC BY-SA 2.0</string>
+  <string name="license_name_cc_2_0">CC BY 2.0</string>
+  <string name="license_name_fal">Lisansa Kanto Malalaka</string>
+  <string name="license_name_pd_old_100">Valam-bahoaka (maty efa 100 taona lasa ny tompon\'asa)</string>
+  <string name="license_name_pd_old">Valam-bahoaka (nitsahatra ny fiharan\'ny zom-pamorona)</string>
+  <string name="license_name_pd_art">Valam-bahoaka (kanto)</string>
+  <string name="license_name_pd_us">Valam-bahoaka (Etazonia)</string>
+  <string name="license_name_pd_usgov">Valam-bahoaka (Governemantan\'i Etazonia)</string>
+  <string name="license_name_pd_usgov_nasa">Valam-bahoaka (NASA)</string>
+  <string name="license_name_pd_ineligible">Valam-bahoaka (tsy azo iharan\'ny zom-pamorona)</string>
+  <string name="license_name_attribution">Fampatsiahivana</string>
+  <string name="license_name_gfdl">GNU Free Documentation License</string>
+  <string name="welcome_final_button_text">Eny!</string>
+  <string name="detail_panel_cats_label">Sokajy</string>
+  <string name="detail_panel_cats_loading">Am-pakàna…</string>
+  <string name="detail_panel_cats_none">Tsy misy safidy</string>
+  <string name="detail_description_empty">Tsy misy visavisa</string>
+  <string name="detail_license_empty">Lisansa tsy fantatra</string>
+  <string name="menu_refresh">Vaozina</string>
+  <string name="ok">OK</string>
+  <string name="warning">Fampitandremana</string>
+  <string name="yes">Eny</string>
+  <string name="no">Tsia</string>
+  <string name="media_detail_title">Lohateny</string>
+  <string name="media_detail_description">Visavisa</string>
+</resources>

app/src/main/res/values-pl/strings.xml

@@ -162,4 +162,5 @@ Kliknij ten komunikat lub naciśnij „cofnij”, aby pominąć ten krok.</strin
   <string name="no">Nie</string>
   <string name="media_detail_title">Tytuł</string>
   <string name="media_detail_description">Opis</string>
+  <string name="become_a_tester_title">Zostań beta-testerem</string>
 </resources>

app/src/main/res/values-pms/strings.xml

@@ -49,6 +49,7 @@
   <string name="menu_upload_single">Carié</string>
   <string name="categories_search_text_hint">Sërché dle categorìe</string>
   <string name="menu_save_categories">Argistré</string>
+  <string name="refresh_button">Agiorné</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">Ancor gnun cariament</item>
     <item quantity="one">1 cariament</item>
@@ -86,4 +87,15 @@ Ch\'a sgnaca an s\'ën mëssage (o ch\'a sgnaca ël boton andaré) për sauté \
   <string name="menu_cancel_upload">Anulé</string>
   <string name="share_license_summary">Costa plancia a sarà sota la licensa %1$s</string>
   <string name="menu_download">Dëscarié</string>
+  <string name="preference_license">Licensa</string>
+  <string name="use_previous">Dovré ël tìtol o la descrission precedent</string>
+  <string name="allow_gps">Oten-e an automàtich la posission atual</string>
+  <string name="allow_gps_summary">Arcuperé la posission atual për propon-e dij sugeriment ëd categorìa si la plancia a l\'é nen marcà da na mira geogràfica</string>
+  <string name="license_name_cc_by_sa_four">Atribussion-Partagi ugual 4.0</string>
+  <string name="license_name_cc_by_four">Atribussion 4.0</string>
+  <string name="license_name_cc_by_sa">Atribussion-partagi ugual 3.0</string>
+  <string name="license_name_cc_by">Atribussion 3.0</string>
+  <string name="license_name_cc0">CC0</string>
+  <string name="license_name_cc_by_sa_3_0">CC BY-SA 3.0</string>
+  <string name="license_name_cc_by_sa_3_0_at">CC BY-SA 3.0 (Àustria)</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -158,4 +158,9 @@ Aperte nesta mensagem (ou aperte para voltar) para pular este passo</string>
   <string name="file_exists">Este arquivo já existe no Commons. Tem certeza de que deseja continuar?</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 da mídia</string>
+  <string name="media_detail_description">Descrição</string>
+  <string name="media_detail_description_explanation">Descrição da mídia aqui. Isso pode ser potencialmente longo e precisará envolver múltiplas linhas. Esperamos que seja agradável.</string>
+  <string name="become_a_tester_title">Seja um Testador Beta</string>
 </resources>

app/src/main/res/values-ro/strings.xml

@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name" fuzzy="true">Wikimedia Commons</string>
+  <string name="app_name">Commons</string>
   <string name="menu_settings">Setări</string>
   <string name="username">Nume de utilizator</string>
   <string name="password">Parolă</string>
   <string name="login">Autentificare</string>
+  <string name="signup">Înregistrare</string>
   <string name="logging_in_title">Se conectează</string>
   <string name="logging_in_message">Așteptați...</string>
   <string name="login_success">Autentificare reușită!</string>
   <string name="login_failed">Autentificare nereușită!</string>
+  <string name="upload_failed">Fișierul nu a fost găsit. Încercați cu un alt fișier.</string>
   <string name="authentication_failed">Certificare nereușită!</string>
   <string name="uploading_started">Încărcarea a început!</string>
   <string name="upload_completed_notification_title">%1$s s-a încărcat!</string>
@@ -18,7 +20,9 @@
   <string name="upload_progress_notification_title_finishing">Se finalizează încărcarea fișierului %1$s</string>
   <string name="upload_failed_notification_title">Încărcarea fișierului %1$s nu a reușit</string>
   <string name="upload_failed_notification_subtitle">Atingeți pentru a vizualiza</string>
-  <string name="uploads_pending_notification_indicator" fuzzy="true">%d fișiere se încarcă</string>
+  <plurals name="uploads_pending_notification_indicator">
+    <item quantity="other">1 fișier se încarcă</item>
+  </plurals>
   <string name="title_activity_contributions">Încărcările mele</string>
   <string name="contribution_state_queued">În așteptare</string>
   <string name="contribution_state_failed">Nu a reușit</string>
@@ -26,6 +30,7 @@
   <string name="contribution_state_starting">Se încarcă</string>
   <string name="menu_from_gallery">Din galerie</string>
   <string name="menu_from_camera">Faceți o poză</string>
+  <string name="menu_nearby">În apropiere</string>
   <string name="provider_contributions">Încărcările mele</string>
   <string name="menu_share">Partajare</string>
   <string name="menu_open_in_browser">Afișează în navigator</string>
@@ -68,6 +73,7 @@ Atingeți acest mesaj (sau mergeți înapoi) pentru a omite acest pas.</string>
   <string name="preference_tracking">Rapoarte de utilizare</string>
   <string name="preference_tracking_summary">Trimiteți rapoarte de utilizare către Wikimedia pentru a ajuta la îmbunătățirea aplicației</string>
   <string name="title_activity_settings">Setări</string>
+  <string name="title_activity_signup">Înregistrare</string>
   <string name="menu_about">Despre</string>
   <string name="about_license" fuzzy="true">Software cu sursă deschisă lansat sub &lt;a href=\"https://github.com/wikimedia/apps-android-commons/blob/master/COPYING\"&gt;Licența Apache v2&lt;/a&gt;</string>
   <string name="about_improve" fuzzy="true">Sursa la &lt;a href=\"https://github.com/wikimedia/apps-android-commons\"&gt;GitHub&lt;/a&gt;. Buguri la &lt;a href=\"https://github.com/nicolas-raoul/apps-android-commons/issues\"&gt;Github&lt;/a&gt;.</string>
@@ -82,8 +88,11 @@ Atingeți acest mesaj (sau mergeți înapoi) pentru a omite acest pas.</string>
   <string name="share_license_summary">Această imagine va fi licențiată sub %1$s</string>
   <string name="menu_download">Descarcă</string>
   <string name="preference_license">Licență</string>
-  <string name="license_name_cc_by_sa" fuzzy="true">CCu00A0Atribuireu00A0șiu00A0distribuireu00A0înu00A0condițiiu00A0identiceu00A03.0</string>
-  <string name="license_name_cc_by" fuzzy="true">CCu00A0Atribuireu00A03.0</string>
+  <string name="allow_gps">Obține în mod automat locația curentă</string>
+  <string name="license_name_cc_by_sa_four">Atribuire și distribuire în condiții identice 4.0</string>
+  <string name="license_name_cc_by_four">Atribuire 4.0</string>
+  <string name="license_name_cc_by_sa">Atribuire și distribuire în condiții identice 3.0</string>
+  <string name="license_name_cc_by">Atribuire 3.0</string>
   <string name="license_name_cc0">CC0</string>
   <string name="license_name_cc_by_sa_3_0">CC BY-SA 3.0</string>
   <string name="license_name_cc_by_sa_3_0_at">CC BY-SA 3.0 (Austria)</string>
@@ -97,6 +106,8 @@ Atingeți acest mesaj (sau mergeți înapoi) pentru a omite acest pas.</string>
   <string name="license_name_cc_by_sa_3_0_pl">CC BY-SA 3.0 (Polonia)</string>
   <string name="license_name_cc_by_sa_3_0_ro">CC BY-SA 3.0 (România)</string>
   <string name="license_name_cc_by_3_0">CC BY 3.0</string>
+  <string name="license_name_cc_by_sa_4_0">CC BY-SA 4.0</string>
+  <string name="license_name_cc_by_4_0">CC BY 4.0</string>
   <string name="license_name_cc_zero">CC Zero</string>
   <string name="license_name_own_pd">own-pd</string>
   <string name="license_name_cc_by_sa_2_5">CC BY-SA 2.5</string>
@@ -114,6 +125,11 @@ Atingeți acest mesaj (sau mergeți înapoi) pentru a omite acest pas.</string>
   <string name="license_name_pd_ineligible">Domeniul public (nu intră sub protecția drepturilor de autor)</string>
   <string name="license_name_attribution">Atribuire</string>
   <string name="license_name_gfdl">Licența GNU pentru Documentare Liberă</string>
+  <string name="tutorial_3_text">Vă rugăm să NU încărcați:</string>
+  <string name="tutorial_3_subtext">— Selfies sau poze cu prietenii
+— Fotografii descărcate de pe Internet
+— Capturi de ecran din programe sau aplicații proprietare</string>
+  <string name="tutorial_4_text">Exemplu de încărcare:</string>
   <string name="welcome_wikipedia_text">Contribuiți cu imagini personale. Faceți ca articolele Wikipediei să prindă viață!</string>
   <string name="welcome_wikipedia_subtext">Imaginile de pe Wikipedia provin de la Wikimedia Commons.</string>
   <string name="welcome_copyright_text">Imaginile dumneavoastră ajută la educarea oamenilor din întreaga lume.</string>
@@ -126,4 +142,15 @@ Atingeți acest mesaj (sau mergeți înapoi) pentru a omite acest pas.</string>
   <string name="detail_description_empty">Fără descriere</string>
   <string name="detail_license_empty">Licență necunoscută</string>
   <string name="menu_refresh">Reîncarcă</string>
+  <string name="ok">OK</string>
+  <string name="warning">Avertisment</string>
+  <string name="yes">Da</string>
+  <string name="no">Nu</string>
+  <string name="media_detail_title">Titlu</string>
+  <string name="media_detail_media_title">Titlul fișierului</string>
+  <string name="media_detail_description">Descriere</string>
+  <string name="media_detail_description_explanation">Descrierea fișierului vine aici. Aceasta poate fi destul de lungă și va trebuie distribuită pe mai multe linii. Sperăm totuși că arată bine.</string>
+  <string name="become_a_tester_title">Deveniți beta-tester</string>
+  <string name="become_a_tester_description">Abonați-vă la canalul nostru beta pe Google Play și a obține acces rapid la noi caracteristici și corecții de erori</string>
+  <string name="beta_opt_in_link">https://play.google.com/apps/testing/fr.free.nrw.commons</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -164,6 +164,10 @@
   <string name="yes">Да</string>
   <string name="no">Нет</string>
   <string name="media_detail_title">Название</string>
+  <string name="media_detail_media_title">Заголовок носителя информации</string>
   <string name="media_detail_description">Описание</string>
+  <string name="media_detail_description_explanation">Здесь располагается описание носителя информации. Оно потенциально может быть весьма длинным и даже располагаться в несколько строк. Однако мы надеемся, что это выглядит симпатично</string>
   <string name="become_a_tester_title">Стать бета-тестером</string>
+  <string name="become_a_tester_description">Подпишитесь на наш канал бета-версии на Google Play и получите ранний доступ к новым функциям и исправлениям ошибок</string>
+  <string name="beta_opt_in_link">https://play.google.com/apps/testing/fr.free.nrw.commons</string>
 </resources>

app/src/main/res/values-te/strings.xml

@@ -110,4 +110,6 @@
   <string name="warning">హెచ్చరిక</string>
   <string name="yes">అవును</string>
   <string name="no">కాదు</string>
+  <string name="media_detail_title">శీర్షిక</string>
+  <string name="media_detail_description">వివరణ</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -164,4 +164,7 @@
   <string name="media_detail_media_title">多媒體標體</string>
   <string name="media_detail_description">描述</string>
   <string name="media_detail_description_explanation">描述使用在此的多媒體。若內容可能會很長的話請斷開換行。我們希望這樣可以讓內容看起來較好些。</string>
+  <string name="become_a_tester_title">成為測試人員</string>
+  <string name="become_a_tester_description">選擇加入我們在 Google Play 上的 beta channel 來早期獲得新功能並修正程式臭蟲</string>
+  <string name="beta_opt_in_link">https://play.google.com/apps/testing/fr.free.nrw.commons</string>
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -163,4 +163,7 @@
   <string name="media_detail_media_title">媒体的标题</string>
   <string name="media_detail_description">说明</string>
   <string name="media_detail_description_explanation">在此填写媒体的说明。这可能会相当长，并将需要包裹在多行中。我们希望它看起来很好。</string>
+  <string name="become_a_tester_title">成为测试版的测试者</string>
+  <string name="become_a_tester_description">加入我们在Google Play上的测试频道，并更早获取新功能以及错误修复</string>
+  <string name="beta_opt_in_link">https://play.google.com/apps/testing/fr.free.nrw.commons</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -50,6 +50,7 @@
   <string name="menu_upload_single">Upload</string>
   <string name="categories_search_text_hint">Search categories</string>
   <string name="menu_save_categories">Save</string>
+  <string name="refresh_button">Refresh</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">No uploads yet</item>
     <item quantity="one">1 upload</item>

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Wed Mar 08 18:04:14 GMT 2017
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME