Merge branch 'master' of https://github.com/commons-app/apps-android-commons

Author: misaochan

app/src/main/java/fr/free/nrw/commons/category/CategoryItem.java

@@ -3,6 +3,10 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
+/**
+ * Represents a Category Item.
+ * Implemented as Parcelable so that its object could be parsed between activity components.
+ */
 public class CategoryItem implements Parcelable {
     private final String name;
     private boolean selected;
@@ -24,28 +28,53 @@ public CategoryItem(String name, boolean selected) {
         this.selected = selected;
     }
 
+    /**
+     * Reads from the received Parcel
+     * @param in
+     */
     private CategoryItem(Parcel in) {
         name = in.readString();
         selected = in.readInt() == 1;
     }
 
+    /**
+     * Gets Name
+     * @return
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * Checks if that Category Item has been selected.
+     * @return
+     */
     public boolean isSelected() {
         return selected;
     }
 
+    /**
+     * Selects the Category Item.
+     * @param selected
+     */
     public void setSelected(boolean selected) {
         this.selected = selected;
     }
 
+    /**
+     * Used by Parcelable
+     * @return
+     */
     @Override
     public int describeContents() {
         return 0;
     }
 
+    /**
+     * Writes to the received Parcel
+     * @param parcel
+     * @param flags
+     */
     @Override
     public void writeToParcel(Parcel parcel, int flags) {
         parcel.writeString(name);
@@ -67,11 +96,17 @@ public boolean equals(Object o) {
 
     }
 
+    /**
+     * Returns hash code for current object
+     */
     @Override
     public int hashCode() {
         return name.hashCode();
     }
 
+    /**
+     * Return String form of current object
+     */
     @Override
     public String toString() {
         return "CategoryItem: '" + name + '\'';

app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java

@@ -23,8 +23,8 @@
 
 public class  Contribution extends Media {
 
-    //{{According to EXIF data|2009-01-09}}
-    private static final String TEMPLATE_DATE_ACC_TO_EXIF = "{{According to EXIF data|%s}}";
+    //{{According to Exif data|2009-01-09}}
+    private static final String TEMPLATE_DATE_ACC_TO_EXIF = "{{According to Exif data|%s}}";
 
     //2009-01-09 → 9 January 2009
     private static final String TEMPLATE_DATA_OTHER_SOURCE = "%s";

app/src/main/res/layout/filter_search_view_layout.xml

@@ -2,6 +2,7 @@
     android:layout_height="wrap_content"
     android:id="@+id/search_view_layout"
     android:paddingVertical="15dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TextView
@@ -18,7 +19,7 @@
         android:layout_height="match_parent"
         android:tint="@color/white"
         android:queryHint="@string/nearby_search_hint"
-        android:searchIcon="@drawable/ic_search_white_24dp">
-    </SearchView>
+        android:searchIcon="@drawable/ic_search_white_24dp"
+        app:theme="@style/WhiteSearchBarTheme"/>
 
 </LinearLayout>

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

@@ -274,7 +274,7 @@
   <string name="nominating_file_for_deletion">جارٍ ترشيح %1$s للحذف.</string>
   <string name="nominating_for_deletion_status">جارٍ ترشيح الملف للحذف: %1$s</string>
   <string name="view_browser">عرض في المتصفح</string>
-  <string name="skip_login">تخطي</string>
+  <string name="skip_login">تجاوز</string>
   <string name="navigation_item_login">تسجيل الدخول</string>
   <string name="skip_login_title">هل تريد حقا تخطي تسجيل الدخول؟</string>
   <string name="skip_login_message">يجب عليك تسجيل الدخول لرفع الصور في المستقبل.</string>

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

@@ -114,7 +114,7 @@
   <string name="media_upload_policy">Ved at indsende dette billeder erklærer jeg at det er mit eget arbejde, som ikke indeholder materialer med ophavsret eller selvportrætter og generelt overholder &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Commons-politikkerne&lt;/a&gt;.</string>
   <string name="menu_download">Hent</string>
   <string name="preference_license">Standardlicens</string>
-  <string name="use_previous" fuzzy="true">Brug forrige titel/beskrivelse</string>
+  <string name="use_previous">Brug forrige titel og beskrivelse</string>
   <string name="allow_gps">Hent automatisk nuværende placering</string>
   <string name="allow_gps_summary">Henter den nuværende placering for at tilbyde kategoriforslag hvis billedet ikke er geografisk mærket og geomærker billedet. Advarsel: Dette vil afsløre din nuværende placering.</string>
   <string name="preference_theme">Nat-tilstand</string>

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

@@ -5,6 +5,7 @@
 * FF11
 * Inkowik
 * Kghbln
+* Killarnee
 * Metalhead64
 * Pyscowicz
 * Sujan
@@ -120,7 +121,7 @@
   <string name="media_upload_policy">Durch das Hochladen dieses Bildes erkläre ich, dass dies mein eigenes Werk ist, das kein urheberrechtlich geschütztes Material oder Selfies enthält und das auch sonst die &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines/de\"&gt;Wikimedia-Commons-Richtlinien&lt;/a&gt; einhält.</string>
   <string name="menu_download">Herunterladen</string>
   <string name="preference_license">Standardlizenz</string>
-  <string name="use_previous" fuzzy="true">Vorherige(n) Titel/Beschreibung verwenden</string>
+  <string name="use_previous">Vorherigen Titel und Beschreibung verwenden</string>
   <string name="allow_gps">Aktuellen Standort automatisch abrufen</string>
   <string name="allow_gps_summary">Ruft den aktuellen Standort ab, falls das Bild nicht georeferenziert ist und markiert es. Warnung: Diese Aktion verrät deinen aktuellen Standort.</string>
   <string name="preference_theme">Nachtmodus</string>

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

@@ -122,7 +122,7 @@
   <string name="media_upload_policy">この画像の投稿に当たり、私はこれが自分自身の作品であり、著作権のあるコンテンツや自撮りは含まれていないと宣言します。</string>
   <string name="menu_download">ダウンロード</string>
   <string name="preference_license">既定のライセンス</string>
-  <string name="use_previous" fuzzy="true">前回のタイトルと記述を使用</string>
+  <string name="use_previous">前回のタイトルと記述を使用</string>
   <string name="allow_gps">現在の位置を自動的に取得</string>
   <string name="allow_gps_summary">Retrieves current location if image is not geotagged, \n画像にジオタグが付いていない場合、現在の位置を取得して画像に添付。ご注意: 自分の現在地が明示されます。</string>
   <string name="preference_theme">夜モード</string>
@@ -527,7 +527,7 @@
   <string name="exif_tag_name_lensModel">レンズモデル</string>
   <string name="exif_tag_name_serialNumbers">シリアル番号</string>
   <string name="exif_tag_name_software">ソフトウェア</string>
-  <string name="share_text" fuzzy="true">スマホからウィキペディア・コモンズに画像を投稿する\nコモンズアプリをダウンロード：%1$s</string>
+  <string name="share_text">スマホから直接、ウィキメディア・コモンズに画像を投稿する。\nコモンズアプリを今すぐダウンロード：%1$s</string>
   <string name="share_via">アプリの共有に使うのは…</string>
   <string name="image_info">画像情報</string>
   <string name="no_categories_found">カテゴリが見つかりません</string>

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

@@ -121,7 +121,7 @@
   <string name="media_upload_policy">이 이미지에 대해서, 이것이 본인이 창작한 저작물이며, 저작권에 위배되는 것이 포함되지 않았으며, &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;위키미디어 공용 정책&lt;/a&gt;에 위배되지 않는다는 것에 동의합니다.</string>
   <string name="menu_download">다운로드</string>
   <string name="preference_license">기본 라이선스</string>
-  <string name="use_previous" fuzzy="true">이전의 제목/설명을 사용하기</string>
+  <string name="use_previous">이전의 제목과 설명을 사용하기</string>
   <string name="allow_gps">자동으로 현재 위치 가져오기</string>
   <string name="allow_gps_summary">영상의 위치 태그가 지정되지 않은 경우 현재 위치를 검색하여 영상에 현재 위치로 위치 태그를 지정하십시오. 경고: 당신의 현재 위치가 노출됩니다.</string>
   <string name="preference_theme">야간 모드</string>

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

@@ -134,6 +134,7 @@
   <string name="nearby_wikidata">Vikidati</string>
   <string name="nearby_wikipedia">Vikipēdija</string>
   <string name="about_faq">&lt;u&gt;BUJ&lt;/u&gt;</string>
+  <string name="welcome_skip_button">Izlaist apmācību</string>
   <string name="about_translate">&lt;u&gt;Tulkot&lt;/u&gt;</string>
   <string name="about_translate_title">Valodas</string>
   <string name="about_translate_proceed">Turpināt</string>

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

@@ -21,7 +21,7 @@
   <string name="login_credential">Најавете се на бета-сметката</string>
   <string name="login">Најава</string>
   <string name="forgot_password">Ја заборавивте јавката?</string>
-  <string name="signup">Регистрација</string>
+  <string name="signup">Зачленување</string>
   <string name="logging_in_title">Најава</string>
   <string name="logging_in_message">Почекајте…</string>
   <string name="login_success">Најавата е успешна!</string>
@@ -89,7 +89,7 @@
   <string name="categories_skip_explanation">Ставете им категории на сликите, за да можат корисниците полесно да ги најдат на Ризницата.\n\nЗа да ставите категорија, почнете со пишување на нејзиното име.</string>
   <string name="categories_activity_title">Категории</string>
   <string name="title_activity_settings">Нагодувања</string>
-  <string name="title_activity_signup">Регистрација</string>
+  <string name="title_activity_signup">Зачленување</string>
   <string name="title_activity_featured_images">Избрани слики</string>
   <string name="title_activity_category_details">Категорија</string>
   <string name="title_activity_review">Оценување</string>
@@ -113,7 +113,7 @@
   <string name="media_upload_policy">Поднесувајќи ја сликава, изјавувам дека истата е мое сопствено дело, дека не содржи никаков материјал заштитен со авторски права, не содржи самослици, и дека на секој друг начин е во склад со &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines/mk?uselang=mk\"&gt;правилата на Ризницата&lt;/a&gt;.</string>
   <string name="menu_download">Преземи</string>
   <string name="preference_license">Стандардна лиценца</string>
-  <string name="use_previous" fuzzy="true">Користи претходен наслов/опис</string>
+  <string name="use_previous">Користи претходен наслов и опис</string>
   <string name="allow_gps">Автоматски давај тековна местоположба</string>
   <string name="allow_gps_summary">Става геоознака од тековната местоположба во слика (ако ја нема). Предупредување: ова ви го разоткрива наоѓалиштето.</string>
   <string name="preference_theme">Ноќен режим</string>

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

@@ -307,9 +307,8 @@
   <string name="showcase_view_plus_fab">คุณสามารถอัปโหลดรูปภาพสำหรับสถานที่ใด ๆ ได้จากแกลเลอรีหรือกล้องของคุณ</string>
   <string name="no_images_found">ไม่พบรูปภาพ!</string>
   <string name="error_loading_images">เกิดข้อผิดพลาดระหว่างการโหลดภาะ</string>
-
-  <string name="block_notification_title">ถูกบล็อก</string>
   <string name="image_uploaded_by">อัพโหลดโดย: %1$s</string>
+  <string name="block_notification_title">ถูกบล็อก</string>
   <string name="block_notification">คุณกำลังถูกบล็อคไม่ให้แก้ไขคอมมอนส์</string>
   <string name="appwidget_img">รูปภาพประจำวัน</string>
   <string name="app_widget_heading">รูปภาพประจำวัน</string>