merge conflict with strings

app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java

@@ -110,7 +110,7 @@ private boolean delete(Media media, String reason) {
             mwApi.appendEdit(editToken, logPageString + "\n",
                     "Commons:Deletion_requests/" + date, summary);
             mwApi.appendEdit(editToken, userPageString + "\n",
-                    "User_Talk:" + sessionManager.getCurrentAccount().name, summary);
+                    "User_Talk:" + media.getCreator(), summary);
         } catch (Exception e) {
             Timber.e(e);
             return false;

app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java

@@ -44,6 +44,7 @@
 import fr.free.nrw.commons.MediaDataExtractor;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.auth.AccountUtil;
 import fr.free.nrw.commons.category.CategoryDetailsActivity;
 import fr.free.nrw.commons.contributions.ContributionsFragment;
 import fr.free.nrw.commons.delete.DeleteHelper;
@@ -364,6 +365,7 @@ public void onCopyWikicodeClicked(){
 
     @OnClick(R.id.nominateDeletion)
     public void onDeleteButtonClicked(){
+        if(AccountUtil.getUserName(getContext()).equals(media.getCreator())){
         final ArrayAdapter<String> languageAdapter = new ArrayAdapter<>(getActivity(),
                 R.layout.simple_spinner_dropdown_list, reasonList);
         final Spinner spinner = new Spinner(getActivity());
@@ -381,19 +383,19 @@ public void onDeleteButtonClicked(){
         if(isDeleted) {
             dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
         }
+        }
         //Reviewer correct me if i have misunderstood something over here
         //But how does this  if (delete.getVisibility() == View.VISIBLE) {
         //            enableDeleteButton(true);   makes sense ?
+        else{
         AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
-        alert.setMessage("Why should this fileckathon-2018  be deleted?");
+        alert.setMessage(getString(R.string.dialog_box_text_nomination,media.getDisplayTitle()));
         final EditText input = new EditText(getActivity());
         alert.setView(input);
         input.requestFocus();
         alert.setPositiveButton(R.string.ok, (dialog1, whichButton) -> {
             String reason = input.getText().toString();
-
-            deleteHelper.makeDeletion(getContext(), media, reason);
-            enableDeleteButton(false);
+            onDeleteClickeddialogtext(reason);
         });
         alert.setNegativeButton(R.string.cancel, (dialog12, whichButton) -> {
         });
@@ -424,6 +426,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
         d.show();
         d.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
     }
+        }
 
     @SuppressLint("CheckResult")
     private void onDeleteClicked(Spinner spinner) {
@@ -442,6 +445,22 @@ private void onDeleteClicked(Spinner spinner) {
 
     }
 
+    @SuppressLint("CheckResult")
+    private void onDeleteClickeddialogtext(String reason) {
+        Single<Boolean> resultSingletext = reasonBuilder.getReason(media, reason)
+                .flatMap(reasonString -> deleteHelper.makeDeletion(getContext(), media, reason));
+        compositeDisposable.add(resultSingletext
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(s -> {
+                    if (getActivity() != null) {
+                        isDeleted = true;
+                        enableDeleteButton(false);
+                    }
+                }));
+
+    }
+
     @OnClick(R.id.seeMore)
     public void onSeeMoreClicked(){
         if (nominatedForDeletion.getVisibility() == VISIBLE && getActivity() != null) {

app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java

@@ -410,7 +410,7 @@ public String getWikidataCsrfToken() throws IOException {
      */
     @Nullable
     @Override
-    public String wikidatCreateClaim(String entityId, String property, String snaktype, String value) throws IOException {
+    public String wikidataCreateClaim(String entityId, String property, String snaktype, String value) throws IOException {
         Timber.d("Filename is %s", value);
         CustomApiResult result = wikidataApi.action("wbcreateclaim")
                 .param("entity", entityId)

app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java

@@ -59,7 +59,7 @@ Single<UploadResult> uploadFileFinalize(String filename, String filekey,
     String appendEdit(String editToken, String processedPageContent, String filename, String summary) throws IOException;
 
     @Nullable
-    String wikidatCreateClaim(String entityId, String property, String snaktype, String value) throws IOException;
+    String wikidataCreateClaim(String entityId, String property, String snaktype, String value) throws IOException;
 
     @Nullable
     boolean addWikidataEditTag(String revisionId) throws IOException;

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

@@ -535,8 +535,8 @@ private void setupMapView(Bundle savedInstanceState) {
                 .compassGravity(Gravity.BOTTOM | Gravity.LEFT)
                 .compassMargins(new int[]{12, 0, 0, 24})
                 .styleUrl(isDarkTheme ? Style.DARK : Style.OUTDOORS)
-                .logoEnabled(false)
-                .attributionEnabled(false)
+                .logoEnabled(true)
+                .attributionEnabled(true)
                 .camera(new CameraPosition.Builder()
                         .target(new LatLng(curLatLng.getLatitude(), curLatLng.getLongitude()))
                         .zoom(ZOOM_LEVEL)

app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java

@@ -79,7 +79,7 @@ private void editWikidataProperty(String wikidataEntityId, String fileName) {
         Timber.d("Attempting to edit Wikidata property %s", wikidataEntityId);
         Observable.fromCallable(() -> {
             String propertyValue = getFileName(fileName);
-            return mediaWikiApi.wikidatCreateClaim(wikidataEntityId, "P18", "value", propertyValue);
+            return mediaWikiApi.wikidataCreateClaim(wikidataEntityId, "P18", "value", propertyValue);
         })
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

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

@@ -179,6 +179,7 @@
   <string name="storage_permission_title">طلب إذن التخزين</string>
   <string name="read_storage_permission_rationale">صلاحية مطلوبة: قراءة وحدة التخزين الخارجية، لا يمكن للتطبيق الوصول إلى معرض الصور الخاص بك بدونها.</string>
   <string name="write_storage_permission_rationale">صلاحية مطلوبة: اكتب وحدة التخزين الخارجية، لا يمكن للتطبيق الوصول إلى معرض الصور/الكاميرا الخاصة بك بدونها.</string>
+  <string name="location_permission_title">جارٍ طلب إذن الموقع</string>
   <string name="location_permission_rationale">صلاحية اختيارية: احصل على الموقع الحالي لاقتراحات التصنيفات</string>
   <string name="ok">موافق</string>
   <string name="title_activity_nearby">الأماكن القريبة</string>

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

@@ -215,6 +215,7 @@
   <string name="preference_author_name_summary">Персонализираното авторско име, което ще се използва вместо потребителското ви име при качване</string>
   <string name="archived_notifications">Известия (архивирани)</string>
   <string name="list_sheet">Списък</string>
+  <string name="submit">Изпращане</string>
   <string name="desc_language_America">Америка</string>
   <string name="desc_language_Europe">Европа</string>
   <string name="desc_language_Africa">Африка</string>

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

@@ -15,6 +15,7 @@
   <string name="preference_category_appearance">Udseende</string>
   <string name="preference_category_general">Generelt</string>
   <string name="preference_category_feedback">Tilbagemelding</string>
+  <string name="preference_category_privacy">Privatliv</string>
   <string name="preference_category_location">Sted</string>
   <string name="app_name">Commons</string>
   <string name="bullet">•</string>
@@ -370,5 +371,8 @@
   <string name="error_occurred_in_picking_images">Der opstod en fejl under udvælgelse af billeder</string>
   <string name="please_wait">Vent venligst…</string>
   <string name="skip_image">Spring over dette billede</string>
+  <string name="exif_tag_name_copyright">Ophavsret</string>
+  <string name="exif_tag_name_cameraModel">Kameramodel</string>
+  <string name="exif_tag_name_serialNumbers">Serienumre</string>
   <string name="share_via">Del app via...</string>
 </resources>

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

@@ -339,6 +339,7 @@
   <string name="quiz_question_string">آیا این تصویر برای بارگذاری مناسب است؟</string>
   <string name="question">پرسش</string>
   <string name="result">نتیجه</string>
+  <string name="congratulatory_message_quiz">شما %1$s پاسخ درست دادید. آفرین!</string>
   <string name="warning_for_no_answer">یکی از دو گزینه را انتخاب کنید تا به سوال پاسخ دهید</string>
   <string name="user_not_logged_in">جلسه ورود به سیستم منقضی شد، لطفا دوباره وارد سیستم شوید.</string>
   <string name="quiz_result_share_message">کویز خود را با دوستان خود به اشتراک بگذارید.</string>
@@ -383,6 +384,11 @@
   <string name="next">بعدی</string>
   <string name="previous">قبلی</string>
   <string name="submit">ارسال</string>
+  <string name="upload_title_duplicate">پرونده‌ای با نام %1$s وجود دارد. آیا اطمینان دارید که می‌خواهید ادامه دهید؟</string>
+  <plurals name="upload_count_title">
+    <item quantity="one">%1$d بارگذاری</item>
+    <item quantity="other">%1$d بارگذاری</item>
+  </plurals>
   <string name="navigation_item_bookmarks">نشانک‌ها</string>
   <string name="title_activity_bookmarks">نشانک‌ها</string>
   <string name="title_page_bookmarks_pictures">تصویرها</string>
@@ -396,6 +402,7 @@
   <string name="deletion_reason_bad_for_my_privacy">فهمیدم که این برای حریم خصوصی من بد است.</string>
   <string name="deletion_reason_no_longer_want_public">من تغییر عقیده دادم، نمی‌خواهم دیگر برای همه قابل‌مشاهده باشد.</string>
   <string name="deletion_reason_not_interesting">با پوزش، این تصویر برای یک دانشنامه مناسب نیست</string>
+  <string name="uploaded_by_myself">بارگذاری‌شده توسط خودم در %1$s؛ استفاده‌شده در %2$d مقاله.</string>
   <string name="no_uploads">به کامانز خوش آمدید!\n\nاولین فایلتان را با فشردن کلید اضافه بارگذاری کنید.</string>
   <string name="desc_language_Worldwide">در سراسر جهان</string>
   <string name="desc_language_America">آمریکا</string>
@@ -423,6 +430,7 @@
   <string name="nominate_for_deletion_notify_user">به کاربر در صفحه بحثش خبر بده</string>
   <string name="notsure">مطمئن نیستم</string>
   <string name="send_thank_success_title">ارسال تشکر: موفق</string>
+  <string name="send_thank_success_message">تشکر با موفقیت برای %1$s فرستاده شد</string>
   <string name="send_thank_failure_message">تلاش برای فرستادن تشکر شکست خورد %1$s</string>
   <string name="send_thank_failure_title">ارسال تشکر: ناموفق</string>
   <string name="send_thank_send">ارسال تشکر</string>

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

@@ -189,6 +189,7 @@
   <string name="storage_permission_title">Demande d\'autorisation d\'accès au stockage</string>
   <string name="read_storage_permission_rationale">Autorisation nécessaire : Lire un stockage externe. L’application ne peut pas accéder à votre galerie sans cela.</string>
   <string name="write_storage_permission_rationale">Permission obligatoire : Écriture sur stockage externe. L’application ne peut pas accéder à votre appareil photo/galerie sans cela.</string>
+  <string name="location_permission_title">Demande d\'autorisation d\'accès au stockage</string>
   <string name="location_permission_rationale">Autorisation facultative : Obtenir l’emplacement actuel pour des suggestions de catégorie</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Endroits à proximité</string>

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

@@ -21,6 +21,7 @@
   <string name="preference_category_appearance">Aspetto</string>
   <string name="preference_category_general">Generale</string>
   <string name="preference_category_feedback">Commenti</string>
+  <string name="preference_category_privacy">Privacy</string>
   <string name="preference_category_location">Posizione</string>
   <string name="app_name">Commons</string>
   <string name="bullet">•</string>
@@ -470,6 +471,9 @@
   <string name="previous_button_tooltip_message">Clicca per riusare il titolo e la descrizione dell\'immagine precedente e adattarli all\'immagine attuale.</string>
   <string name="skip_image">SALTA QUESTA IMMAGINE</string>
   <string name="exif_tag_name_author">Autore</string>
+  <string name="exif_tag_name_cameraModel">Modello fotocamera</string>
+  <string name="exif_tag_name_serialNumbers">Numeri seriali</string>
+  <string name="exif_tag_name_software">Software</string>
   <string name="share_via">Condividi applicazione tramite...</string>
   <string name="image_info">Informazioni sull\'immagine</string>
 </resources>

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

@@ -176,6 +176,7 @@
   <string name="storage_permission_title">기억 장치 권한 요청 중</string>
   <string name="read_storage_permission_rationale">권한 필요: 외부 저장소 읽기. 이것이 없으면 앱은 갤러리에 접근할 수 없습니다.</string>
   <string name="write_storage_permission_rationale" fuzzy="true">권한 필요: 외부 저장소 쓰기. 이것이 없으면 앱은 카메라에 접근할 수 없습니다.</string>
+  <string name="location_permission_title">위치 권한 요청 중</string>
   <string name="location_permission_rationale">선택적 권한: 분류 추천을 위해 현재 위치 정보를 가져옵니다.</string>
   <string name="ok">확인</string>
   <string name="title_activity_nearby">근처의 장소</string>
@@ -458,6 +459,7 @@
   <string name="exif_tag_name_copyright">저작권</string>
   <string name="exif_tag_name_location">위치</string>
   <string name="exif_tag_name_cameraModel">카메라 모델</string>
+  <string name="exif_tag_name_lensModel">렌즈 모델</string>
   <string name="exif_tag_name_serialNumbers">일련 번호</string>
   <string name="exif_tag_name_software">소프트웨어</string>
   <string name="share_via">앱 공유...</string>

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

@@ -338,4 +338,9 @@
   <string name="image_chooser_title">Sicht Biller eraus fir eropzelueden</string>
   <string name="please_wait">Waart w.e.g. ...</string>
   <string name="skip_image">DËST BILD IWWERWSPRANGEN</string>
+  <string name="exif_tag_name_author">Auteur</string>
+  <string name="exif_tag_name_copyright">Copyright</string>
+  <string name="exif_tag_name_location">Plaz</string>
+  <string name="exif_tag_name_serialNumbers">Seriennummeren</string>
+  <string name="exif_tag_name_software">Software</string>
 </resources>

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

@@ -169,6 +169,7 @@
   <string name="storage_permission_title">Се бара дозвола за складирање</string>
   <string name="read_storage_permission_rationale">Потребна дозвола: Треба да се прочита од надворешен склад. Прилогот без ова нема пристап до вашата галерија.</string>
   <string name="write_storage_permission_rationale">Потребна дозвола: Треба да се запише на надворешен склад. Прилогот без ова нема пристап до вашата камера/галерија.</string>
+  <string name="location_permission_title">Се бара дозвола за утврдување на местоположбата</string>
   <string name="location_permission_rationale">Дозвола по желба: Утврдување на тековната местоположба за предлагање категории</string>
   <string name="ok">ОК</string>
   <string name="title_activity_nearby">Околни места</string>

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

@@ -9,6 +9,7 @@
   <string name="preference_category_appearance">ပုံပန်းသွင်ပြင်</string>
   <string name="preference_category_general">အထွေထွေ</string>
   <string name="preference_category_feedback">အကြံပေးရန်</string>
+  <string name="preference_category_privacy">ကိုယ်ရေးမူဝါဒ</string>
   <string name="preference_category_location">နေရာ</string>
   <string name="app_name">ကွန်မွန်းစ်</string>
   <string name="bullet">•</string>
@@ -129,6 +130,7 @@
   <string name="detail_discussion_empty">ဆွေးနွေးချက် မရှိပါ</string>
   <string name="detail_license_empty">အမည်မသိရသော လိုင်စင်</string>
   <string name="menu_refresh">ပြန်လည်ဆန်းသစ်ရန်</string>
+  <string name="location_permission_title">တည်နေရာ ခွင့်ပြုချက် တောင်းဆိုနေသည်</string>
   <string name="ok">အိုကေ</string>
   <string name="title_activity_nearby">အနီးအနား နေရာများ</string>
   <string name="no_nearby">အနီးအနား နေရာများ မတွေ့ပါ</string>
@@ -281,4 +283,8 @@
   <string name="nominate_for_deletion_done">ပြီးပြီ</string>
   <string name="notsure">မသေချာပါ</string>
   <string name="please_wait">ကျေးဇူးပြု၍ ခဏစောင့်ပါ...</string>
+  <string name="exif_tag_name_copyright">မူပိုင်ခွင့်</string>
+  <string name="exif_tag_name_location">တည်နေရာ</string>
+  <string name="exif_tag_name_cameraModel">ကင်မရာ မော်ဒယ်</string>
+  <string name="exif_tag_name_software">ဆော့ဝဲလ်</string>
 </resources>

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

@@ -181,6 +181,7 @@
   <string name="storage_permission_title">Solicitando permissão de armazenamento</string>
   <string name="read_storage_permission_rationale">Permissão necessária: leia o armazenamento externo. App não pode acessar sua galeria sem isso.</string>
   <string name="write_storage_permission_rationale">Permissão necessária: escreva o armazenamento externo. App não pode acessar sua câmera/galeria sem isso.</string>
+  <string name="location_permission_title">Autorização para identificar localização</string>
   <string name="location_permission_rationale">Permissão opcional: Obter a localização atual de sugestões de categoria</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Lugares próximos</string>