mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Suchit Kar 2018-02-27 19:08:30 +05:30
commit de9bb89ff2
38 changed files with 1045 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/build.gradle
View file

@ -18,7 +18,7 @@ dependencies {
implementation 'com.google.code.gson:gson:2.8.1' implementation 'com.google.code.gson:gson:2.8.1'
implementation 'com.jakewharton.timber:timber:4.5.1' implementation 'com.jakewharton.timber:timber:4.5.1'
implementation 'info.debatty:java-string-similarity:0.24' implementation 'info.debatty:java-string-similarity:0.24'
implementation ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.2.1@aar'){ implementation ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.4.1@aar'){
transitive=true transitive=true
} }
@ -26,6 +26,7 @@ dependencies {
implementation "com.android.support:support-v4:$SUPPORT_LIB_VERSION" implementation "com.android.support:support-v4:$SUPPORT_LIB_VERSION"
implementation "com.android.support:appcompat-v7:$SUPPORT_LIB_VERSION" implementation "com.android.support:appcompat-v7:$SUPPORT_LIB_VERSION"
implementation "com.android.support:design:$SUPPORT_LIB_VERSION" implementation "com.android.support:design:$SUPPORT_LIB_VERSION"
implementation "com.android.support:customtabs:$SUPPORT_LIB_VERSION"
implementation "com.android.support:cardview-v7:$SUPPORT_LIB_VERSION" implementation "com.android.support:cardview-v7:$SUPPORT_LIB_VERSION"
@ -48,7 +49,7 @@ dependencies {
compile 'com.facebook.stetho:stetho:1.5.0' compile 'com.facebook.stetho:stetho:1.5.0'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile 'org.robolectric:robolectric:3.4' testCompile 'org.robolectric:robolectric:3.7.1'
testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1' testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.8.1' androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
@ -77,7 +78,7 @@ dependencies {
androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
testImplementation 'org.robolectric:robolectric:3.4' testImplementation 'org.robolectric:robolectric:3.7.1'
testImplementation 'org.mockito:mockito-all:1.10.19' testImplementation 'org.mockito:mockito-all:1.10.19'
testImplementation 'com.squareup.okhttp3:mockwebserver:3.8.1' testImplementation 'com.squareup.okhttp3:mockwebserver:3.8.1'

25
app/src/main/java/fr/free/nrw/commons/AboutActivity.java
View file

@ -3,6 +3,8 @@ package fr.free.nrw.commons;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.customtabs.CustomTabsIntent;
import android.support.v4.content.ContextCompat;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
@ -47,22 +49,29 @@ public class AboutActivity extends NavigationBaseActivity {
intent.setPackage("com.facebook.katana"); intent.setPackage("com.facebook.katana");
startActivity(intent); startActivity(intent);
} catch (Exception e) { } catch (Exception e) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.facebook.com/" + "1921335171459985"))); Utils.handleWebUrl(this,Uri.parse("https://www.facebook.com/" + "1921335171459985"));
} }
} }
@OnClick(R.id.github_launch_icon) @OnClick(R.id.github_launch_icon)
public void launchGithub(View view) { public void launchGithub(View view) {
Utils.handleWebUrl(this,Uri.parse("https://commons-app.github.io/\\"));
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/commons-app/apps-android-commons\\"));
startActivity(browserIntent);
} }
@OnClick(R.id.website_launch_icon) @OnClick(R.id.website_launch_icon)
public void launchWebsite(View view) { public void launchWebsite(View view) {
Utils.handleWebUrl(this,Uri.parse("https://commons-app.github.io/\\"));
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://commons-app.github.io/\\"));
startActivity(browserIntent);
} }
@OnClick(R.id.about_credits)
public void launchCredits(View view) {
Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/blob/master/CREDITS/\\"));
}
@OnClick(R.id.about_privacy_policy)
public void launchPrivacyPolicy(View view) {
Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\\"));
}
} }

16
app/src/main/java/fr/free/nrw/commons/Utils.java
View file

@ -1,8 +1,12 @@
package fr.free.nrw.commons; package fr.free.nrw.commons;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.customtabs.CustomTabsIntent;
import android.support.v4.content.ContextCompat;
import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.binary.Hex;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;
@ -11,6 +15,7 @@ import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.Locale; import java.util.Locale;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -159,4 +164,15 @@ public class Utils {
return stringBuilder.toString(); return stringBuilder.toString();
} }
public static void handleWebUrl(Context context,Uri url){
CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
builder.setToolbarColor(ContextCompat.getColor(context, R.color.primaryColor));
builder.setSecondaryToolbarColor(ContextCompat.getColor(context, R.color.primaryDarkColor));
builder.setExitAnimations(context, android.R.anim.slide_in_left, android.R.anim.slide_out_right);
CustomTabsIntent customTabsIntent = builder.build();
customTabsIntent.intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
customTabsIntent.launchUrl(context, url);
}
} }

29
app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
View file

@ -4,6 +4,7 @@ import android.accounts.Account;
import android.accounts.AccountAuthenticatorActivity; import android.accounts.AccountAuthenticatorActivity;
import android.accounts.AccountAuthenticatorResponse; import android.accounts.AccountAuthenticatorResponse;
import android.accounts.AccountManager; import android.accounts.AccountManager;
import android.app.Activity;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@ -17,10 +18,12 @@ import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatDelegate; import android.support.v7.app.AppCompatDelegate;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.Log;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TextView; import android.widget.TextView;
@ -69,6 +72,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
@BindView(R.id.loginTwoFactor) EditText twoFactorEdit; @BindView(R.id.loginTwoFactor) EditText twoFactorEdit;
@BindView(R.id.error_message_container) ViewGroup errorMessageContainer; @BindView(R.id.error_message_container) ViewGroup errorMessageContainer;
@BindView(R.id.error_message) TextView errorMessage; @BindView(R.id.error_message) TextView errorMessage;
@BindView(R.id.login_credentials) TextView loginCredentials;
@BindView(R.id.two_factor_container)TextInputLayout twoFactorContainer; @BindView(R.id.two_factor_container)TextInputLayout twoFactorContainer;
ProgressDialog progressDialog; ProgressDialog progressDialog;
private AppCompatDelegate delegate; private AppCompatDelegate delegate;
@ -91,14 +95,39 @@ public class LoginActivity extends AccountAuthenticatorActivity {
ButterKnife.bind(this); ButterKnife.bind(this);
usernameEdit.addTextChangedListener(textWatcher); usernameEdit.addTextChangedListener(textWatcher);
usernameEdit.setOnFocusChangeListener((v, hasFocus) -> {
if (!hasFocus) {
hideKeyboard(v);
}
});
passwordEdit.addTextChangedListener(textWatcher); passwordEdit.addTextChangedListener(textWatcher);
passwordEdit.setOnFocusChangeListener((v, hasFocus) -> {
if (!hasFocus) {
hideKeyboard(v);
}
});
twoFactorEdit.addTextChangedListener(textWatcher); twoFactorEdit.addTextChangedListener(textWatcher);
passwordEdit.setOnEditorActionListener(newLoginInputActionListener()); passwordEdit.setOnEditorActionListener(newLoginInputActionListener());
loginButton.setOnClickListener(view -> performLogin()); loginButton.setOnClickListener(view -> performLogin());
signupButton.setOnClickListener(view -> signUp()); signupButton.setOnClickListener(view -> signUp());
if(BuildConfig.FLAVOR == "beta"){
loginCredentials.setText(getString(R.string.login_credential));
} else {
loginCredentials.setVisibility(View.GONE);
}
} }
public void hideKeyboard(View view) {
InputMethodManager inputMethodManager =(InputMethodManager)this.getSystemService(Activity.INPUT_METHOD_SERVICE);
inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
}
@Override @Override
protected void onPostCreate(Bundle savedInstanceState) { protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState); super.onPostCreate(savedInstanceState);

46
app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
View file

@ -1,17 +1,23 @@
package fr.free.nrw.commons.category; package fr.free.nrw.commons.category;
import android.app.Activity;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
@ -37,6 +43,7 @@ import fr.free.nrw.commons.R;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.mwapi.MediaWikiApi; import fr.free.nrw.commons.mwapi.MediaWikiApi;
import fr.free.nrw.commons.upload.MwVolleyApi; import fr.free.nrw.commons.upload.MwVolleyApi;
import fr.free.nrw.commons.upload.SingleUploadFragment;
import fr.free.nrw.commons.utils.StringSortingUtils; import fr.free.nrw.commons.utils.StringSortingUtils;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
@ -72,6 +79,7 @@ public class CategorizationFragment extends CommonsDaggerSupportFragment {
private OnCategoriesSaveHandler onCategoriesSaveHandler; private OnCategoriesSaveHandler onCategoriesSaveHandler;
private HashMap<String, ArrayList<String>> categoriesCache; private HashMap<String, ArrayList<String>> categoriesCache;
private List<CategoryItem> selectedCategories = new ArrayList<>(); private List<CategoryItem> selectedCategories = new ArrayList<>();
private TitleTextWatcher textWatcher = new TitleTextWatcher();
private final CategoriesAdapterFactory adapterFactory = new CategoriesAdapterFactory(item -> { private final CategoriesAdapterFactory adapterFactory = new CategoriesAdapterFactory(item -> {
if (item.isSelected()) { if (item.isSelected()) {
@ -102,6 +110,15 @@ public class CategorizationFragment extends CommonsDaggerSupportFragment {
categoriesAdapter = adapterFactory.create(items); categoriesAdapter = adapterFactory.create(items);
categoriesList.setAdapter(categoriesAdapter); categoriesList.setAdapter(categoriesAdapter);
categoriesFilter.addTextChangedListener(textWatcher);
categoriesFilter.setOnFocusChangeListener((v, hasFocus) -> {
if (!hasFocus) {
hideKeyboard(v);
}
});
RxTextView.textChanges(categoriesFilter) RxTextView.textChanges(categoriesFilter)
.takeUntil(RxView.detaches(categoriesFilter)) .takeUntil(RxView.detaches(categoriesFilter))
.debounce(500, TimeUnit.MILLISECONDS) .debounce(500, TimeUnit.MILLISECONDS)
@ -110,6 +127,18 @@ public class CategorizationFragment extends CommonsDaggerSupportFragment {
return rootView; return rootView;
} }
public void hideKeyboard(View view) {
InputMethodManager inputMethodManager =(InputMethodManager)getActivity().getSystemService(Activity.INPUT_METHOD_SERVICE);
inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
}
@Override
public void onDestroyView() {
categoriesFilter.removeTextChangedListener(textWatcher);
super.onDestroyView();
}
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.clear(); menu.clear();
@ -351,4 +380,21 @@ public class CategorizationFragment extends CommonsDaggerSupportFragment {
.create() .create()
.show(); .show();
} }
private class TitleTextWatcher implements TextWatcher {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i2, int i3) {
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i2, int i3) {
}
@Override
public void afterTextChanged(Editable editable) {
if (getActivity() != null) {
getActivity().invalidateOptionsMenu();
}
}
}
} }

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

@ -10,6 +10,7 @@ import android.preference.PreferenceManager;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
@ -60,7 +61,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
private NearbyActivityMode viewMode; private NearbyActivityMode viewMode;
private Disposable placesDisposable; private Disposable placesDisposable;
private boolean lockNearbyView; //Determines if the nearby places needs to be refreshed private boolean lockNearbyView; //Determines if the nearby places needs to be refreshed
@BindView(R.id.swipe_container) SwipeRefreshLayout swipeLayout;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -70,6 +71,13 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
bundle = new Bundle(); bundle = new Bundle();
initDrawer(); initDrawer();
initViewState(); initViewState();
swipeLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
lockNearbyView(false);
refreshView(true);
}
});
} }
private void initViewState() { private void initViewState() {
@ -309,7 +317,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
} else { } else {
setListFragment(); setListFragment();
} }
swipeLayout.setRefreshing(false);
hideProgressBar(); hideProgressBar();
} }

6
app/src/main/java/fr/free/nrw/commons/nearby/NearbyInfoDialog.java
View file

@ -3,7 +3,9 @@ package fr.free.nrw.commons.nearby;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.customtabs.CustomTabsIntent;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.PopupMenu; import android.support.v7.widget.PopupMenu;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
@ -17,6 +19,7 @@ import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import butterknife.Unbinder; import butterknife.Unbinder;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.location.LatLng; import fr.free.nrw.commons.location.LatLng;
import fr.free.nrw.commons.ui.widget.OverlayDialog; import fr.free.nrw.commons.ui.widget.OverlayDialog;
import fr.free.nrw.commons.utils.DialogUtil; import fr.free.nrw.commons.utils.DialogUtil;
@ -141,8 +144,7 @@ public class NearbyInfoDialog extends OverlayDialog {
} }
private void openWebView(Uri link) { private void openWebView(Uri link) {
Intent browserIntent = new Intent(Intent.ACTION_VIEW, link); Utils.handleWebUrl(getContext(),link);
startActivity(browserIntent);
} }
@OnClick(R.id.emptyLayout) @OnClick(R.id.emptyLayout)

6
app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
View file

@ -5,11 +5,13 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.DividerItemDecoration;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import com.pedrogomez.renderers.RVRendererAdapter; import com.pedrogomez.renderers.RVRendererAdapter;
import java.util.Collections;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
@ -45,8 +47,9 @@ public class NotificationActivity extends NavigationBaseActivity {
} }
private void initListView() { private void initListView() {
recyclerView = findViewById(R.id.listView);
recyclerView.setLayoutManager(new LinearLayoutManager(this)); recyclerView.setLayoutManager(new LinearLayoutManager(this));
DividerItemDecoration itemDecor = new DividerItemDecoration(recyclerView.getContext(), DividerItemDecoration.VERTICAL);
recyclerView.addItemDecoration(itemDecor);
addNotifications(); addNotifications();
} }
@ -58,6 +61,7 @@ public class NotificationActivity extends NavigationBaseActivity {
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(notificationList -> { .subscribe(notificationList -> {
Collections.reverse(notificationList);
Timber.d("Number of notifications is %d", notificationList.size()); Timber.d("Number of notifications is %d", notificationList.size());
setAdapter(notificationList); setAdapter(notificationList);
}, throwable -> Timber.e(throwable, "Error occurred while loading notifications")); }, throwable -> Timber.e(throwable, "Error occurred while loading notifications"));

4
app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
View file

@ -5,6 +5,7 @@ import android.accounts.AccountManager;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.design.widget.NavigationView; import android.support.design.widget.NavigationView;
import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.DrawerLayout;
@ -119,8 +120,9 @@ public abstract class NavigationBaseActivity extends BaseActivity
return true; return true;
case R.id.action_feedback: case R.id.action_feedback:
drawerLayout.closeDrawer(navigationView); drawerLayout.closeDrawer(navigationView);
Intent feedbackIntent = new Intent(Intent.ACTION_SEND); Intent feedbackIntent = new Intent(Intent.ACTION_SENDTO);
feedbackIntent.setType("message/rfc822"); feedbackIntent.setType("message/rfc822");
feedbackIntent.setData(Uri.parse("mailto:"));
feedbackIntent.putExtra(Intent.EXTRA_EMAIL, feedbackIntent.putExtra(Intent.EXTRA_EMAIL,
new String[]{CommonsApplication.FEEDBACK_EMAIL}); new String[]{CommonsApplication.FEEDBACK_EMAIL});
feedbackIntent.putExtra(Intent.EXTRA_SUBJECT, feedbackIntent.putExtra(Intent.EXTRA_SUBJECT,

14
app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java
View file

@ -1,5 +1,6 @@
package fr.free.nrw.commons.upload; package fr.free.nrw.commons.upload;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.graphics.Point; import android.graphics.Point;
import android.net.Uri; import android.net.Uri;
@ -10,6 +11,7 @@ import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
@ -177,9 +179,21 @@ public class MultipleUploadListFragment extends Fragment {
photosGrid.setColumnWidth(photoSize.x); photosGrid.setColumnWidth(photoSize.x);
baseTitle.addTextChangedListener(textWatcher); baseTitle.addTextChangedListener(textWatcher);
baseTitle.setOnFocusChangeListener((v, hasFocus) -> {
if (!hasFocus) {
hideKeyboard(v);
}
});
return view; return view;
} }
public void hideKeyboard(View view) {
InputMethodManager inputMethodManager =(InputMethodManager)getActivity().getSystemService(Activity.INPUT_METHOD_SERVICE);
inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
}
@Override @Override
public void onDestroyView() { public void onDestroyView() {
baseTitle.removeTextChangedListener(textWatcher); baseTitle.removeTextChangedListener(textWatcher);

42
app/src/main/res/layout-land/activity_login.xml
View file

@ -13,12 +13,12 @@
<android.support.v7.widget.CardView <android.support.v7.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/large_gap"
android:layout_marginBottom="@dimen/standard_gap" android:layout_marginBottom="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap" android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap" android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap" android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap" android:layout_marginStart="@dimen/standard_gap"
android:layout_marginTop="@dimen/large_gap"
app:cardCornerRadius="4dp" app:cardCornerRadius="4dp"
app:cardElevation="4dp"> app:cardElevation="4dp">
@ -40,11 +40,26 @@
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="@dimen/heading_text_size" /> android:textSize="@dimen/heading_text_size" />
<TextView
android:id="@+id/login_credentials"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:paddingBottom="@dimen/standard_gap"
android:paddingTop="@dimen/small_gap"
android:textAlignment="center"
android:textColor="@color/secondaryDarkColor"
tools:text="@string/login_credential" />
<FrameLayout <FrameLayout
android:id="@+id/error_message_container" android:id="@+id/error_message_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/title" android:layout_below="@id/login_credentials"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
@ -56,6 +71,7 @@
android:layout_marginLeft="@dimen/standard_gap" android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap" android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap" android:layout_marginStart="@dimen/standard_gap"
android:gravity="center"
android:paddingBottom="@dimen/small_gap" android:paddingBottom="@dimen/small_gap"
android:paddingTop="@dimen/small_gap" android:paddingTop="@dimen/small_gap"
android:textColor="@color/secondaryDarkColor" android:textColor="@color/secondaryDarkColor"
@ -149,8 +165,8 @@
<Button <Button
android:id="@+id/signupButton" android:id="@+id/signupButton"
android:layout_width="0dp"
style="@style/Widget.AppCompat.Button.Borderless.Colored" style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginEnd="@dimen/small_gap" android:layout_marginEnd="@dimen/small_gap"
@ -160,8 +176,8 @@
<Button <Button
android:id="@+id/loginButton" android:id="@+id/loginButton"
android:layout_width="0dp"
style="@style/Widget.AppCompat.Button.Colored" style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/small_gap" android:layout_marginLeft="@dimen/small_gap"
android:layout_marginStart="@dimen/small_gap" android:layout_marginStart="@dimen/small_gap"
@ -174,13 +190,13 @@
<fr.free.nrw.commons.ui.widget.HtmlTextView <fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_privacy_policy" android:id="@+id/about_privacy_policy"
style="?android:textAppearanceSmall" style="?android:textAppearanceSmall"
android:layout_below="@id/buttonFrame"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/standard_gap" android:layout_below="@id/buttonFrame"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/about_privacy_policy" android:layout_marginBottom="@dimen/standard_gap"
android:layout_centerHorizontal="true"/> android:text="@string/about_privacy_policy" />
</RelativeLayout> </RelativeLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
@ -188,19 +204,19 @@
<android.support.v7.widget.AppCompatImageView <android.support.v7.widget.AppCompatImageView
android:layout_width="64dp" android:layout_width="64dp"
android:layout_height="64dp" android:layout_height="64dp"
android:elevation="8dp"
tools:ignore="UnusedAttribute"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
app:srcCompat="@drawable/blue_rinse_circle" /> android:elevation="8dp"
app:srcCompat="@drawable/blue_rinse_circle"
tools:ignore="UnusedAttribute" />
<android.support.v7.widget.AppCompatImageView <android.support.v7.widget.AppCompatImageView
android:layout_width="42dp" android:layout_width="42dp"
tools:ignore="UnusedAttribute"
android:layout_height="42dp" android:layout_height="42dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:elevation="8dp" android:elevation="8dp"
app:srcCompat="@drawable/commons_logo_large" /> app:srcCompat="@drawable/commons_logo_large"
tools:ignore="UnusedAttribute" />
</FrameLayout> </FrameLayout>

81
app/src/main/res/layout-land/welcome_do_upload.xml
View file

@ -73,16 +73,91 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textColor="@android:color/white"/> android:textColor="@android:color/white"/>
<TextView <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:layout_gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp"
android:textSize="16sp"
android:paddingTop="@dimen/standard_gap"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="240dp" android:maxWidth="240dp"
android:text="@string/tutorial_2_subtext" android:text="@string/tutorial_2_subtext_1"
android:layout_gravity="center" android:layout_gravity="center"
android:textAlignment="textStart" android:textAlignment="textStart"
android:paddingTop="@dimen/standard_gap" android:paddingTop="@dimen/standard_gap"
android:gravity="start" android:gravity="start"
android:textColor="@android:color/white" android:textColor="@android:color/white"
/> />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:layout_gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp"
android:textSize="16sp"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_2_subtext_2"
android:layout_gravity="center"
android:textAlignment="textStart"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:layout_gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp"
android:textSize="16sp"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_2_subtext_3"
android:layout_gravity="center"
android:textAlignment="textStart"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

88
app/src/main/res/layout-land/welcome_dont_upload.xml
View file

@ -55,16 +55,90 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textColor="@android:color/white"/> android:textColor="@android:color/white"/>
<TextView <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp"
android:textSize="16sp"
android:paddingTop="@dimen/standard_gap"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_3_subtext_1"
android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="@dimen/standard_gap"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="240dp" android:maxWidth="240dp"
android:text="@string/tutorial_3_subtext"
android:layout_gravity="center" android:layout_gravity="center"
android:textAlignment="textStart" android:orientation="horizontal">
android:paddingTop="@dimen/standard_gap"
android:gravity="start" <TextView
android:textColor="@android:color/white" android:layout_width="wrap_content"
/> android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp"
android:textSize="16sp"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_3_subtext_2"
android:layout_gravity="center"
android:textAlignment="textStart"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp"
android:textSize="16sp"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_3_subtext_3"
android:layout_gravity="center"
android:textAlignment="textStart"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

89
app/src/main/res/layout-land/welcome_image_details.xml
View file

@ -38,16 +38,89 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textColor="@android:color/white"/> android:textColor="@android:color/white"/>
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="240dp" android:maxWidth="240dp"
android:text="@string/tutorial_4_subtext" android:orientation="horizontal">
android:layout_gravity="center"
android:textAlignment="textStart" <TextView
android:paddingTop="@dimen/standard_gap" android:layout_width="wrap_content"
android:gravity="start" android:layout_height="wrap_content"
android:textColor="@android:color/white" android:text="@string/bullet"
/> android:paddingRight="4dp"
android:textSize="16sp"
android:paddingTop="@dimen/standard_gap"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_4_subtext_1"
android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="@dimen/standard_gap"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp"
android:textSize="16sp"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_4_subtext_2"
android:layout_gravity="center"
android:textAlignment="textStart"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp"
android:textSize="16sp"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_4_subtext_3"
android:layout_gravity="center"
android:textAlignment="textStart"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

36
app/src/main/res/layout-xlarge/activity_login.xml
View file

@ -13,12 +13,12 @@
<android.support.v7.widget.CardView <android.support.v7.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/large_gap"
android:layout_marginBottom="@dimen/standard_gap" android:layout_marginBottom="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap" android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap" android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap" android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap" android:layout_marginStart="@dimen/standard_gap"
android:layout_marginTop="@dimen/large_gap"
app:cardCornerRadius="4dp" app:cardCornerRadius="4dp"
app:cardElevation="4dp"> app:cardElevation="4dp">
@ -40,6 +40,21 @@
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="@dimen/heading_text_size" /> android:textSize="@dimen/heading_text_size" />
<TextView
android:id="@+id/login_credentials"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:paddingBottom="@dimen/small_gap"
android:paddingTop="@dimen/small_gap"
android:textAlignment="center"
android:textColor="@color/secondaryDarkColor"
tools:text="@string/login_credential" />
<FrameLayout <FrameLayout
android:id="@+id/error_message_container" android:id="@+id/error_message_container"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -56,6 +71,7 @@
android:layout_marginLeft="@dimen/standard_gap" android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap" android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap" android:layout_marginStart="@dimen/standard_gap"
android:gravity="center"
android:paddingBottom="@dimen/small_gap" android:paddingBottom="@dimen/small_gap"
android:paddingTop="@dimen/small_gap" android:paddingTop="@dimen/small_gap"
android:textColor="@color/secondaryDarkColor" android:textColor="@color/secondaryDarkColor"
@ -149,8 +165,8 @@
<Button <Button
android:id="@+id/signupButton" android:id="@+id/signupButton"
android:layout_width="0dp"
style="@style/Widget.AppCompat.Button.Borderless.Colored" style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginEnd="@dimen/small_gap" android:layout_marginEnd="@dimen/small_gap"
@ -160,8 +176,8 @@
<Button <Button
android:id="@+id/loginButton" android:id="@+id/loginButton"
android:layout_width="0dp"
style="@style/Widget.AppCompat.Button.Colored" style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/small_gap" android:layout_marginLeft="@dimen/small_gap"
android:layout_marginStart="@dimen/small_gap" android:layout_marginStart="@dimen/small_gap"
@ -174,13 +190,13 @@
<fr.free.nrw.commons.ui.widget.HtmlTextView <fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_privacy_policy" android:id="@+id/about_privacy_policy"
style="?android:textAppearanceSmall" style="?android:textAppearanceSmall"
android:layout_below="@id/buttonFrame"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/standard_gap" android:layout_below="@id/buttonFrame"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/about_privacy_policy" android:layout_marginBottom="@dimen/standard_gap"
android:layout_centerHorizontal="true"/> android:text="@string/about_privacy_policy" />
</RelativeLayout> </RelativeLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
@ -188,8 +204,8 @@
<android.support.v7.widget.AppCompatImageView <android.support.v7.widget.AppCompatImageView
android:layout_width="64dp" android:layout_width="64dp"
android:layout_height="64dp" android:layout_height="64dp"
android:elevation="8dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:elevation="8dp"
app:srcCompat="@drawable/blue_rinse_circle" app:srcCompat="@drawable/blue_rinse_circle"
tools:ignore="UnusedAttribute" /> tools:ignore="UnusedAttribute" />
@ -198,9 +214,9 @@
android:layout_height="42dp" android:layout_height="42dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
tools:ignore="UnusedAttribute"
android:elevation="8dp" android:elevation="8dp"
app:srcCompat="@drawable/commons_logo_large" /> app:srcCompat="@drawable/commons_logo_large"
tools:ignore="UnusedAttribute" />
</FrameLayout> </FrameLayout>

229
app/src/main/res/layout/activity_about.xml
View file

@ -5,134 +5,135 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<RelativeLayout <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content">
<include <RelativeLayout
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content">
<LinearLayout <include
android:layout_width="match_parent" android:id="@+id/toolbar"
android:layout_height="match_parent" layout="@layout/toolbar"
android:layout_below="@id/toolbar" android:layout_width="match_parent"
android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginStart="@dimen/activity_margin_horizontal"
android:layout_marginRight="@dimen/activity_margin_horizontal"
android:layout_marginEnd="@dimen/activity_margin_horizontal"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_launcher"
android:contentDescription= "@string/commons_logo"
/>
<TextView
style="?android:textAppearanceLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name" />
<TextView
android:id="@+id/about_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_license"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_gap"
android:gravity="center"
android:text="@string/about_license" />
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_improve"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/small_gap"
android:gravity="center"
android:text="@string/about_improve" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:gravity="center" android:layout_below="@id/toolbar"
android:orientation="horizontal"
android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginStart="@dimen/activity_margin_horizontal"
android:layout_marginRight="@dimen/activity_margin_horizontal"
android:layout_marginTop="@dimen/activity_margin_horizontal"
android:layout_marginEnd="@dimen/activity_margin_horizontal" android:layout_marginEnd="@dimen/activity_margin_horizontal"
> android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginRight="@dimen/activity_margin_horizontal"
android:layout_marginStart="@dimen/activity_margin_horizontal"
android:layout_marginTop="@dimen/activity_margin_vertical"
android:gravity="center"
android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/website_launch_icon" android:layout_width="wrap_content"
android:layout_width="@dimen/overflow_icon_dimen" android:layout_height="wrap_content"
android:layout_height="@dimen/overflow_icon_dimen" android:contentDescription="@string/commons_logo"
app:srcCompat="@drawable/ic_action_website" android:src="@drawable/ic_launcher" />
android:contentDescription= "@string/commons_website"
android:layout_margin="@dimen/activity_margin_horizontal"
/>
<ImageView <TextView
android:id="@+id/facebook_launch_icon" style="?android:textAppearanceLarge"
android:layout_width="@dimen/overflow_icon_dimen" android:layout_width="wrap_content"
android:layout_height="@dimen/overflow_icon_dimen" android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_action_facebook" android:text="@string/app_name" />
android:contentDescription= "@string/commons_facebook"
android:layout_margin="@dimen/activity_margin_horizontal"
/>
<ImageView <TextView
android:id="@+id/github_launch_icon" android:id="@+id/about_version"
android:layout_width="@dimen/overflow_icon_dimen" android:layout_width="wrap_content"
android:layout_height="@dimen/overflow_icon_dimen" android:layout_height="wrap_content" />
app:srcCompat="@drawable/ic_action_github"
android:contentDescription= "@string/commons_github" <fr.free.nrw.commons.ui.widget.HtmlTextView
android:layout_margin="@dimen/activity_margin_horizontal" android:id="@+id/about_license"
/> style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_gap"
android:gravity="center"
android:text="@string/about_license" />
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_improve"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/small_gap"
android:gravity="center"
android:text="@string/about_improve" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/activity_margin_horizontal"
android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginRight="@dimen/activity_margin_horizontal"
android:layout_marginStart="@dimen/activity_margin_horizontal"
android:layout_marginTop="@dimen/activity_margin_horizontal"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/website_launch_icon"
android:layout_width="@dimen/overflow_icon_dimen"
android:layout_height="@dimen/overflow_icon_dimen"
android:layout_margin="@dimen/activity_margin_horizontal"
android:contentDescription="@string/commons_website"
app:srcCompat="@drawable/ic_action_website" />
<ImageView
android:id="@+id/facebook_launch_icon"
android:layout_width="@dimen/overflow_icon_dimen"
android:layout_height="@dimen/overflow_icon_dimen"
android:layout_margin="@dimen/activity_margin_horizontal"
android:contentDescription="@string/commons_facebook"
app:srcCompat="@drawable/ic_action_facebook" />
<ImageView
android:id="@+id/github_launch_icon"
android:layout_width="@dimen/overflow_icon_dimen"
android:layout_height="@dimen/overflow_icon_dimen"
android:layout_margin="@dimen/activity_margin_horizontal"
android:contentDescription="@string/commons_github"
app:srcCompat="@drawable/ic_action_github" />
</LinearLayout>
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_privacy_policy"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_gap"
android:gravity="center"
android:text="@string/about_privacy_policy" />
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_credits"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_gap"
android:gravity="center"
android:text="@string/about_credits" />
<TextView
android:id="@+id/about_uploads_to"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/large_gap"
android:alpha="0.2"
android:gravity="center" />
</LinearLayout> </LinearLayout>
</RelativeLayout>
<fr.free.nrw.commons.ui.widget.HtmlTextView </ScrollView>
android:id="@+id/about_privacy_policy"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_gap"
android:gravity="center"
android:text="@string/about_privacy_policy" />
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_credits"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_gap"
android:gravity="center"
android:text="@string/about_credits" />
<TextView
android:id="@+id/about_uploads_to"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/large_gap"
android:alpha="0.2"
android:gravity="center" />
</LinearLayout>
</RelativeLayout>
<android.support.design.widget.NavigationView <android.support.design.widget.NavigationView
android:id="@+id/navigation_view" android:id="@+id/navigation_view"
@ -140,6 +141,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="start" android:layout_gravity="start"
app:headerLayout="@layout/drawer_header" app:headerLayout="@layout/drawer_header"
app:menu="@menu/drawer"/> app:menu="@menu/drawer" />
</android.support.v4.widget.DrawerLayout> </android.support.v4.widget.DrawerLayout>

37
app/src/main/res/layout/activity_login.xml
View file

@ -19,12 +19,16 @@
android:layout_marginRight="@dimen/standard_gap" android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap" android:layout_marginStart="@dimen/standard_gap"
android:layout_marginTop="@dimen/large_gap" android:layout_marginTop="@dimen/large_gap"
android:clickable="true"
android:focusableInTouchMode="true"
app:cardCornerRadius="4dp" app:cardCornerRadius="4dp"
app:cardElevation="4dp"> app:cardElevation="4dp">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true"
android:focusableInTouchMode="true"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
@ -40,11 +44,27 @@
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="@dimen/heading_text_size" /> android:textSize="@dimen/heading_text_size" />
<TextView
android:id="@+id/login_credentials"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:paddingBottom="@dimen/small_gap"
android:paddingTop="@dimen/small_gap"
android:textAlignment="center"
android:textColor="@color/secondaryDarkColor"
tools:text="@string/login_credential" />
<FrameLayout <FrameLayout
android:id="@+id/error_message_container" android:id="@+id/error_message_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/title" android:layout_below="@id/login_credentials"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
@ -56,6 +76,7 @@
android:layout_marginLeft="@dimen/standard_gap" android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap" android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap" android:layout_marginStart="@dimen/standard_gap"
android:gravity="center"
android:paddingBottom="@dimen/small_gap" android:paddingBottom="@dimen/small_gap"
android:paddingTop="@dimen/small_gap" android:paddingTop="@dimen/small_gap"
android:textColor="@color/secondaryDarkColor" android:textColor="@color/secondaryDarkColor"
@ -149,8 +170,8 @@
<Button <Button
android:id="@+id/signupButton" android:id="@+id/signupButton"
android:layout_width="0dp"
style="@style/Widget.AppCompat.Button.Borderless.Colored" style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginEnd="@dimen/small_gap" android:layout_marginEnd="@dimen/small_gap"
@ -160,8 +181,8 @@
<Button <Button
android:id="@+id/loginButton" android:id="@+id/loginButton"
android:layout_width="0dp"
style="@style/Widget.AppCompat.Button.Colored" style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/small_gap" android:layout_marginLeft="@dimen/small_gap"
android:layout_marginStart="@dimen/small_gap" android:layout_marginStart="@dimen/small_gap"
@ -188,19 +209,19 @@
<android.support.v7.widget.AppCompatImageView <android.support.v7.widget.AppCompatImageView
android:layout_width="64dp" android:layout_width="64dp"
android:layout_height="64dp" android:layout_height="64dp"
android:elevation="8dp"
tools:ignore="UnusedAttribute"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
app:srcCompat="@drawable/blue_rinse_circle" /> android:elevation="8dp"
app:srcCompat="@drawable/blue_rinse_circle"
tools:ignore="UnusedAttribute" />
<android.support.v7.widget.AppCompatImageView <android.support.v7.widget.AppCompatImageView
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
tools:ignore="UnusedAttribute"
android:elevation="8dp" android:elevation="8dp"
app:srcCompat="@drawable/commons_logo_large" /> app:srcCompat="@drawable/commons_logo_large"
tools:ignore="UnusedAttribute" />
</FrameLayout> </FrameLayout>

8
app/src/main/res/layout/activity_nearby.xml
View file

@ -21,17 +21,19 @@
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_below="@id/toolbar"> android:layout_below="@id/toolbar">
<ProgressBar <ProgressBar
android:id="@+id/progressBar" android:id="@+id/progressBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipe_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout <FrameLayout
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
</android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

53
app/src/main/res/layout/fragment_categorization.xml
View file

@ -1,70 +1,67 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/fragmentCategorisationBackground" android:background="?attr/fragmentCategorisationBackground"
android:clickable="true"
android:focusableInTouchMode="true"
android:orientation="vertical"
android:paddingBottom="@dimen/small_gap" android:paddingBottom="@dimen/small_gap"
android:paddingLeft="@dimen/standard_gap"
android:paddingStart="@dimen/standard_gap"
android:paddingRight="@dimen/standard_gap"
android:paddingEnd="@dimen/standard_gap" android:paddingEnd="@dimen/standard_gap"
android:paddingLeft="@dimen/standard_gap"
android:paddingRight="@dimen/standard_gap"
android:paddingStart="@dimen/standard_gap"
android:paddingTop="@dimen/small_gap" android:paddingTop="@dimen/small_gap"
android:theme="@style/DarkAppTheme" android:theme="@style/DarkAppTheme">
>
<FrameLayout <FrameLayout
android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
> android:layout_height="wrap_content"
android:clickable="true"
android:focusableInTouchMode="true">
<EditText <EditText
android:id="@+id/categoriesSearchBox" android:id="@+id/categoriesSearchBox"
android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/categories_search_text_hint" android:hint="@string/categories_search_text_hint"
android:maxLines="1"
android:inputType="textCapWords"
android:imeOptions="flagNoExtractUi" android:imeOptions="flagNoExtractUi"
/> android:inputType="textCapWords"
android:maxLines="1" />
<ProgressBar <ProgressBar
android:id="@+id/categoriesSearchInProgress" android:id="@+id/categoriesSearchInProgress"
style="?android:progressBarStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="@dimen/tiny_gap"
android:layout_marginRight="@dimen/tiny_gap"
android:indeterminate="true" android:indeterminate="true"
android:indeterminateOnly="true" android:indeterminateOnly="true"
android:layout_marginRight="@dimen/tiny_gap" android:visibility="gone" />
android:layout_marginEnd="@dimen/tiny_gap"
android:layout_gravity="center_vertical|end"
style="?android:progressBarStyleSmall"
android:visibility="gone"
/>
</FrameLayout> </FrameLayout>
<TextView <TextView
android:id="@+id/categoriesNotFound" android:id="@+id/categoriesNotFound"
android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:visibility="gone" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
/> android:visibility="gone" />
<TextView <TextView
android:id="@+id/categoriesExplanation" android:id="@+id/categoriesExplanation"
android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/huge_gap" android:layout_marginTop="@dimen/huge_gap"
android:gravity="center"
android:focusable="true" android:focusable="true"
android:gravity="center"
android:text="@string/categories_skip_explanation" android:text="@string/categories_skip_explanation"
android:visibility="gone" android:visibility="gone" />
/>
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/categoriesListBox" android:id="@+id/categoriesListBox"
android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:fadingEdge="none" android:layout_height="wrap_content"
/> android:fadingEdge="none" />
</LinearLayout> </LinearLayout>

4
app/src/main/res/layout/fragment_media_detail.xml
View file

@ -149,6 +149,10 @@
tools:text="License link" /> tools:text="License link" />
</LinearLayout> </LinearLayout>
<fr.free.nrw.commons.media.MediaDetailSpacer
android:layout_width="match_parent"
android:layout_height="@dimen/small_gap" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

3
app/src/main/res/layout/fragment_multiple_uploads_list.xml
View file

@ -3,6 +3,8 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clickable="true"
android:focusableInTouchMode="true"
> >
<EditText <EditText
@ -23,4 +25,5 @@
android:fadingEdge="none" android:fadingEdge="none"
android:fastScrollEnabled="false" android:fastScrollEnabled="false"
/> />
</LinearLayout> </LinearLayout>

100
app/src/main/res/layout/welcome_do_upload.xml
View file

@ -67,15 +67,95 @@
android:textColor="@android:color/white" android:textColor="@android:color/white"
/> />
<TextView <LinearLayout
android:layout_width="295dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="240dp" android:gravity="center"
android:text="@string/tutorial_2_subtext" android:orientation="horizontal">
android:layout_gravity="center"
android:textAlignment="textStart" <TextView
android:paddingTop="@dimen/standard_gap" android:layout_width="wrap_content"
android:gravity="start" android:layout_height="wrap_content"
android:textColor="@android:color/white" android:text="@string/bullet"
/> android:paddingRight="4dp"
android:textSize="16sp"
android:paddingTop="@dimen/standard_gap"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="295dp"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_2_subtext_1"
android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="@dimen/standard_gap"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp"
android:textSize="16sp"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="295dp"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_2_subtext_2"
android:layout_gravity="center"
android:textAlignment="textStart"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp"
android:textSize="16sp"
android:textColor="@android:color/white"/>
</LinearLayout>
<TextView
android:layout_width="295dp"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_2_subtext_3"
android:layout_gravity="center"
android:textAlignment="textStart"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout> </LinearLayout>

92
app/src/main/res/layout/welcome_dont_upload.xml
View file

@ -48,15 +48,87 @@
android:textColor="@android:color/white" android:textColor="@android:color/white"
/> />
<TextView <LinearLayout
android:layout_width="295dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="240dp" android:gravity="center"
android:text="@string/tutorial_3_subtext" android:orientation="horizontal">
android:layout_gravity="center"
android:textAlignment="textStart" <TextView
android:paddingTop="@dimen/standard_gap" android:layout_width="wrap_content"
android:gravity="start" android:layout_height="wrap_content"
android:textColor="@android:color/white" android:text="@string/bullet"
/> android:paddingRight="4dp"
android:textSize="16sp"
android:paddingTop="@dimen/standard_gap"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="295dp"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_3_subtext_1"
android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="@dimen/standard_gap"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp"
android:textSize="16sp"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="295dp"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_3_subtext_2"
android:layout_gravity="center"
android:textAlignment="textStart"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp"
android:textSize="16sp"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="295dp"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_3_subtext_3"
android:layout_gravity="center"
android:textAlignment="textStart"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout> </LinearLayout>

106
app/src/main/res/layout/welcome_image_details.xml
View file

@ -32,15 +32,101 @@
android:textColor="@android:color/white" android:textColor="@android:color/white"
/> />
<TextView <LinearLayout
android:layout_width="278dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="240dp" android:gravity="center"
android:text="@string/tutorial_4_subtext" android:orientation="horizontal">
android:layout_gravity="center"
android:textAlignment="textStart" <TextView
android:paddingTop="@dimen/standard_gap" android:layout_width="wrap_content"
android:gravity="start" android:layout_height="wrap_content"
android:textColor="@android:color/white" android:text="@string/bullet"
/> android:paddingRight="4dp"
android:textSize="16sp"
android:paddingTop="@dimen/standard_gap"
android:textColor="@android:color/white"/>
<TextView
android:layout_width="295dp"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_4_subtext_1"
android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="@dimen/standard_gap"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp"
android:textSize="16sp"
android:textColor="@android:color/white"/>
</LinearLayout>
<TextView
android:layout_width="295dp"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_4_subtext_2"
android:layout_gravity="center"
android:textAlignment="textStart"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp"
android:textSize="16sp"
android:textColor="@android:color/white"/>
</LinearLayout>
<TextView
android:layout_width="295dp"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_4_subtext_3"
android:layout_gravity="center"
android:textAlignment="textStart"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout> </LinearLayout>

10
app/src/main/res/menu/drawer.xml
View file

@ -10,6 +10,11 @@
android:icon="@drawable/ic_location_black_24dp" android:icon="@drawable/ic_location_black_24dp"
android:title="@string/navigation_item_nearby"/> android:title="@string/navigation_item_nearby"/>
<item
android:id="@+id/action_notifications"
android:icon="@drawable/ic_notifications_black_24dp"
android:title="@string/navigation_item_notification"/>
<item <item
android:id="@+id/action_about" android:id="@+id/action_about"
android:icon="@drawable/ic_info_outline_black_24dp" android:icon="@drawable/ic_info_outline_black_24dp"
@ -35,9 +40,4 @@
android:icon="@drawable/ic_exit_to_app_black_24dp" android:icon="@drawable/ic_exit_to_app_black_24dp"
android:title="@string/navigation_item_logout"/> android:title="@string/navigation_item_logout"/>
<item
android:id="@+id/action_notifications"
android:icon="@drawable/ic_notifications_black_24dp"
android:title="@string/navigation_item_notification"/>
</menu> </menu>

24
app/src/main/res/values-diq/strings.xml
View file

@ -7,7 +7,7 @@
<string name="login">Cı kewe</string> <string name="login">Cı kewe</string>
<string name="signup">Qeyd be</string> <string name="signup">Qeyd be</string>
<string name="logging_in_title">Cıkewtış</string> <string name="logging_in_title">Cıkewtış</string>
<string name="logging_in_message" fuzzy="true">Tay bıpawe</string> <string name="logging_in_message">Kerem kerên, bıpawên...</string>
<string name="login_success">Cıkewtış hewl bi.</string> <string name="login_success">Cıkewtış hewl bi.</string>
<string name="login_failed">Nidekeweya de</string> <string name="login_failed">Nidekeweya de</string>
<string name="upload_failed">Dosya nêvineya. Dosyê da bine bıcerebnê.</string> <string name="upload_failed">Dosya nêvineya. Dosyê da bine bıcerebnê.</string>
@ -20,9 +20,9 @@
<string name="upload_progress_notification_title_finishing">Barkerdışe %1$s qedya</string> <string name="upload_progress_notification_title_finishing">Barkerdışe %1$s qedya</string>
<string name="upload_failed_notification_title">%1$s bar nêbeno.</string> <string name="upload_failed_notification_title">%1$s bar nêbeno.</string>
<string name="upload_failed_notification_subtitle">pıpawane xo bıvin</string> <string name="upload_failed_notification_subtitle">pıpawane xo bıvin</string>
<plurals name="uploads_pending_notification_indicator" fuzzy="true"> <plurals name="uploads_pending_notification_indicator">
<item quantity="one">1 dosye selagnayış</item> <item quantity="one">1 dosya bar bena</item>
<item quantity="other">%1$d dosye Selagnayışi</item> <item quantity="other">%1$d dosyeyi bar benê</item>
</plurals> </plurals>
<string name="title_activity_contributions">Barkerdışê mınê peyêni</string> <string name="title_activity_contributions">Barkerdışê mınê peyêni</string>
<string name="contribution_state_queued">Ratneya</string> <string name="contribution_state_queued">Ratneya</string>
@ -49,18 +49,18 @@
<string name="menu_upload_single">Bar ke</string> <string name="menu_upload_single">Bar ke</string>
<string name="categories_search_text_hint">Kategoriyan dı cı geyr</string> <string name="categories_search_text_hint">Kategoriyan dı cı geyr</string>
<string name="menu_save_categories">Star ke</string> <string name="menu_save_categories">Star ke</string>
<plurals name="contributions_subtitle" fuzzy="true"> <plurals name="contributions_subtitle">
<item quantity="zero">Theba bar nêbı</item> <item quantity="zero">\@string/contributions_subtitle_zero</item>
<item quantity="one">1 bar kerdış</item> <item quantity="one">Yew barbiyayış</item>
<item quantity="other">%1$d bar kerdışi</item> <item quantity="other">%1$d barbiyayışi</item>
</plurals> </plurals>
<plurals name="starting_multiple_uploads" fuzzy="true"> <plurals name="starting_multiple_uploads" fuzzy="true">
<item quantity="one">Sergendış 1 bar kerdış</item> <item quantity="one">Sergendış 1 bar kerdış</item>
<item quantity="other">Sergendış %1$d bar kerdışi </item> <item quantity="other">Sergendış %1$d bar kerdışi </item>
</plurals> </plurals>
<plurals name="multiple_uploads_title" fuzzy="true"> <plurals name="multiple_uploads_title">
<item quantity="one">1 bar kerdış</item> <item quantity="one">%1$d barkerdış</item>
<item quantity="other">%1$d bar kerdışi </item> <item quantity="other">%1$d barkerdışi</item>
</plurals> </plurals>
<string name="categories_not_found">Kategoriyan de %1$s deye theba çıniyo</string> <string name="categories_not_found">Kategoriyan de %1$s deye theba çıniyo</string>
<string name="categories_skip_explanation" fuzzy="true">Kategori cı kerdışi rê nusnayış bıkeré. Ena gamer ravêrdışi rê mesaci bıpıloğnê yana peyd şırê.</string> <string name="categories_skip_explanation" fuzzy="true">Kategori cı kerdışi rê nusnayış bıkeré. Ena gamer ravêrdışi rê mesaci bıpıloğnê yana peyd şırê.</string>
@ -69,7 +69,7 @@
<string name="title_activity_signup">Qeyd be</string> <string name="title_activity_signup">Qeyd be</string>
<string name="menu_about">Heq te cı</string> <string name="menu_about">Heq te cı</string>
<string name="about_improve" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Çıme&lt;/a&gt; u &lt;a href=\"https://commons-app.github.io/\"&gt;website&lt;/a&gt; on GitHub&lt;/a&gt;. Newe vıraz &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub mewzu &lt;/a&gt; U rapor bıweseynê</string> <string name="about_improve" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Çıme&lt;/a&gt; u &lt;a href=\"https://commons-app.github.io/\"&gt;website&lt;/a&gt; on GitHub&lt;/a&gt;. Newe vıraz &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub mewzu &lt;/a&gt; U rapor bıweseynê</string>
<string name="about_privacy_policy" fuzzy="true">/</string> <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Politikay nımıtışi&lt;/a&gt;</string>
<string name="title_activity_about">Heq te cı</string> <string name="title_activity_about">Heq te cı</string>
<string name="menu_feedback">Peyd rışten bırış (E-posta ra)</string> <string name="menu_feedback">Peyd rışten bırış (E-posta ra)</string>
<string name="no_email_client">E-posta eyar nêbi</string> <string name="no_email_client">E-posta eyar nêbi</string>

2
app/src/main/res/values-es/strings.xml
View file

@ -199,6 +199,8 @@
<string name="error_while_cache">Error al almacenar imágenes en la antememoria</string> <string name="error_while_cache">Error al almacenar imágenes en la antememoria</string>
<string name="title_info">Un título único descriptivo para el archivo, que servirá como un nombre de archivo. Puede usar un lenguaje claro con espacios. No incluya la extensión del archivo.</string> <string name="title_info">Un título único descriptivo para el archivo, que servirá como un nombre de archivo. Puede usar un lenguaje claro con espacios. No incluya la extensión del archivo.</string>
<string name="description_info">Por favor, describa el elemento multimedia tanto como sea posible: ¿dónde fue tomado?, ¿qué muestra?, ¿cuál es el contexto? Por favor, describa los objetos o personas. Ofrezca la información que no puede ser inferida tan fácilmente, por ejemplo el momento del día si es un paisaje. Si el medio muestra algo inusual, explique qué lo hace insual.</string> <string name="description_info">Por favor, describa el elemento multimedia tanto como sea posible: ¿dónde fue tomado?, ¿qué muestra?, ¿cuál es el contexto? Por favor, describa los objetos o personas. Ofrezca la información que no puede ser inferida tan fácilmente, por ejemplo el momento del día si es un paisaje. Si el medio muestra algo inusual, explique qué lo hace insual.</string>
<string name="upload_image_too_dark">Esta imagen es demasiado oscura. ¿Confirmas que quieres cargarla? Wikimedia Commons solo acepta imágenes con valor enciclopédico.</string>
<string name="upload_image_blurry">Esta imagen se ve borrosa. ¿Confirmas que quieres cargarla? Wikimedia Commons solo acepta imágenes con valor enciclopédico.</string>
<string name="give_permission">Otorgar permiso</string> <string name="give_permission">Otorgar permiso</string>
<string name="use_external_storage">Utilizar almacenamiento externo</string> <string name="use_external_storage">Utilizar almacenamiento externo</string>
<string name="use_external_storage_summary">Guardar en el dispositivo imágenes capturadas con la cámara de la aplicación</string> <string name="use_external_storage_summary">Guardar en el dispositivo imágenes capturadas con la cámara de la aplicación</string>

2
app/src/main/res/values-fr/strings.xml
View file

@ -199,6 +199,8 @@
<string name="error_while_cache">Erreur en mettant les images en cache</string> <string name="error_while_cache">Erreur en mettant les images en cache</string>
<string name="title_info">Un titre descriptif unique pour le fichier, qui servira de nom de fichier. Vous pouvez utiliser un langage simple avec des espaces. N’incluez pas l’extension du fichier</string> <string name="title_info">Un titre descriptif unique pour le fichier, qui servira de nom de fichier. Vous pouvez utiliser un langage simple avec des espaces. N’incluez pas l’extension du fichier</string>
<string name="description_info">Veuillez décrire le média autant que possible : Où a-t-il été enregistré ? Que montre-t-il ? Quel est le contexte ? Veuillez décrire les objets ou les personnes. Révélez les informations qui ne peuvent pas être devinées facilement, par exemple l’heure de la journée si c’est un paysage. Si le média montre quelque chose d’inhabituel, veuillez expliquer ce qui le rend exceptionnel.</string> <string name="description_info">Veuillez décrire le média autant que possible : Où a-t-il été enregistré ? Que montre-t-il ? Quel est le contexte ? Veuillez décrire les objets ou les personnes. Révélez les informations qui ne peuvent pas être devinées facilement, par exemple l’heure de la journée si c’est un paysage. Si le média montre quelque chose d’inhabituel, veuillez expliquer ce qui le rend exceptionnel.</string>
<string name="upload_image_too_dark">Cette image est trop sombre, êtes-vous sûr de vouloir la télécharger ? Wikimédia Communs n’est que pour les images avec une valeur encyclopédique.</string>
<string name="upload_image_blurry">Cette image est floue, êtes-vous sûr de vouloir la télécharger ? Wikimédia Communs n’est que pour les images ayant une valeur encyclopédique.</string>
<string name="give_permission">Accorder le droit</string> <string name="give_permission">Accorder le droit</string>
<string name="use_external_storage">Utiliser le stockage externe</string> <string name="use_external_storage">Utiliser le stockage externe</string>
<string name="use_external_storage_summary">Enregistrer les images prises avec l’appareil photo de votre appareil</string> <string name="use_external_storage_summary">Enregistrer les images prises avec l’appareil photo de votre appareil</string>

13
app/src/main/res/values-is/strings.xml
View file

@ -54,16 +54,16 @@
<string name="gps_disabled">GPS er óvirkt í tækinu þínu. Viltu virkja það?</string> <string name="gps_disabled">GPS er óvirkt í tækinu þínu. Viltu virkja það?</string>
<string name="enable_gps">Virkja GPS</string> <string name="enable_gps">Virkja GPS</string>
<string name="contributions_subtitle_zero">Engar innsendingar ennþá</string> <string name="contributions_subtitle_zero">Engar innsendingar ennþá</string>
<plurals name="contributions_subtitle" fuzzy="true"> <plurals name="contributions_subtitle">
<item quantity="zero">\@string/contributions_subtitle_zero</item> <item quantity="zero">\@string/contributions_subtitle_zero</item>
<item quantity="one">%1$d innsending</item> <item quantity="one">%1$d innsending</item>
<item quantity="other">%1$d innsendingar</item> <item quantity="other">%1$d innsendingar</item>
</plurals> </plurals>
<plurals name="starting_multiple_uploads" fuzzy="true"> <plurals name="starting_multiple_uploads">
<item quantity="one">Byrja %1$d innsendingu</item> <item quantity="one">Byrja %1$d innsendingu</item>
<item quantity="other">Byrja %1$d innsendingar</item> <item quantity="other">Byrja %1$d innsendingar</item>
</plurals> </plurals>
<plurals name="multiple_uploads_title" fuzzy="true"> <plurals name="multiple_uploads_title">
<item quantity="one">%1$d innsending</item> <item quantity="one">%1$d innsending</item>
<item quantity="other">%1$d innsendingar</item> <item quantity="other">%1$d innsendingar</item>
</plurals> </plurals>
@ -199,6 +199,8 @@
<string name="error_while_cache">Villa kom upp í skyndiminni mynda</string> <string name="error_while_cache">Villa kom upp í skyndiminni mynda</string>
<string name="title_info">Einstakur og lýsandi titill, sem mun verða skráarheiti. Þú mátt nota einfaldan texta með bilum. Ekki hafa með neina skráarendingu</string> <string name="title_info">Einstakur og lýsandi titill, sem mun verða skráarheiti. Þú mátt nota einfaldan texta með bilum. Ekki hafa með neina skráarendingu</string>
<string name="description_info">Lýstu gögnunum eins vel og auðið er: Hvar er myndin tekin? Hvað sýnir hún? Hvert er samhengið? Lýstu fólki og fyrirbærum. Gefðu upp þær upplýsingar sem ekki er auðvelt að giska á, til dæmis á hvaða tíma dags myndin er tekin ef hún sýnir landslag. Ef gögnin sýna eitthvað óvenjulegt, útskýrðu þá hvað það er sem sé sérstakt.</string> <string name="description_info">Lýstu gögnunum eins vel og auðið er: Hvar er myndin tekin? Hvað sýnir hún? Hvert er samhengið? Lýstu fólki og fyrirbærum. Gefðu upp þær upplýsingar sem ekki er auðvelt að giska á, til dæmis á hvaða tíma dags myndin er tekin ef hún sýnir landslag. Ef gögnin sýna eitthvað óvenjulegt, útskýrðu þá hvað það er sem sé sérstakt.</string>
<string name="upload_image_too_dark">Þessi mynd er of dökk, ertu viss um að þú viljir senda hana inn? Wikimedia Commons er aðeins fyrir myndir sem hafa eitthvað fræðslugildi.</string>
<string name="upload_image_blurry">Þessi mynd er ekki skörp, ertu viss um að þú viljir senda hana inn? Wikimedia Commons er aðeins fyrir myndir sem hafa eitthvað fræðslugildi.</string>
<string name="give_permission">Gefa heimild</string> <string name="give_permission">Gefa heimild</string>
<string name="use_external_storage">Nota ytri gagnageymslu</string> <string name="use_external_storage">Nota ytri gagnageymslu</string>
<string name="use_external_storage_summary">Vistaðu myndir sem teknar hafa verið með innbyggðu myndavélinni í tækinu þínu</string> <string name="use_external_storage_summary">Vistaðu myndir sem teknar hafa verið með innbyggðu myndavélinni í tækinu þínu</string>
@ -210,8 +212,9 @@
<string name="location_permission_rationale_nearby">Heimild þarf til að birta lista yfir staði í nágrenninu</string> <string name="location_permission_rationale_nearby">Heimild þarf til að birta lista yfir staði í nágrenninu</string>
<string name="get_directions">FÁ LEIÐSÖGN</string> <string name="get_directions">FÁ LEIÐSÖGN</string>
<string name="read_article">LESA GREIN</string> <string name="read_article">LESA GREIN</string>
<string name="notifications_welcome" fuzzy="true">Velkomin á Wikimedia Commons, %1$s! Við erum ánægð með að þú skulir vera hérna.</string> <string name="notifications_welcome">Velkomin á Wikimedia Commons, %1$s! Við erum ánægð með að þú skulir vera hérna.</string>
<string name="notifications_talk_page_message">%1$s skildi eftir skilaboð á spjallsíðunni þinni</string> <string name="notifications_talk_page_message">%1$s skildi eftir skilaboð á spjallsíðunni þinni</string>
<string name="notifications_thank_you_edit">Takk fyrir að hafa gert breytingar</string> <string name="notifications_thank_you_edit">Takk fyrir að hafa gert breytingar</string>
<string name="notifications_mention" fuzzy="true">%1$s minntist á þig á %2$s.</string> <string name="notifications_mention">%1$s minntist á þig á %2$s.</string>
<string name="toggle_view_button">Víxla sýn</string>
</resources> </resources>

3
app/src/main/res/values-ja/strings.xml
View file

@ -41,6 +41,7 @@
<string name="login_failed_password">ログインできません - パスワードを確認してください</string> <string name="login_failed_password">ログインできません - パスワードを確認してください</string>
<string name="login_failed_throttled">失敗した回数が多すぎます。数分でもう一度お試しください。</string> <string name="login_failed_throttled">失敗した回数が多すぎます。数分でもう一度お試しください。</string>
<string name="login_failed_blocked">申し訳ありませんが、この利用者はコモンズでブロックされています。</string> <string name="login_failed_blocked">申し訳ありませんが、この利用者はコモンズでブロックされています。</string>
<string name="login_failed_2fa_needed">2 要素認証コードを提供する必要があります。</string>
<string name="login_failed_generic">ログイン失敗</string> <string name="login_failed_generic">ログイン失敗</string>
<string name="share_upload_button">アップロード</string> <string name="share_upload_button">アップロード</string>
<string name="multiple_share_base_title">このセットに名前をつけてください</string> <string name="multiple_share_base_title">このセットに名前をつけてください</string>
@ -150,8 +151,10 @@
<string name="become_a_tester_description">Google Playのベータ版チャンネルにオプトインして、新機能やバグ修正プログラムに早期にアクセス</string> <string name="become_a_tester_description">Google Playのベータ版チャンネルにオプトインして、新機能やバグ修正プログラムに早期にアクセス</string>
<string name="use_wikidata">ウィキデータを使用してください</string> <string name="use_wikidata">ウィキデータを使用してください</string>
<string name="use_wikidata_summary">（警告：これを無効にすると、モバイルデータを大量に消費する可能性があります）</string> <string name="use_wikidata_summary">（警告：これを無効にすると、モバイルデータを大量に消費する可能性があります）</string>
<string name="_2fa_code">2FA コード</string>
<string name="number_of_uploads">最近のアップロードファイルに表示する最大件数</string> <string name="number_of_uploads">最近のアップロードファイルに表示する最大件数</string>
<string name="maximum_limit">最大限</string> <string name="maximum_limit">最大限</string>
<string name="maximum_limit_alert">500 以上の項目を表示できません</string>
<string name="set_limit">最近のアップロードファイルに表示する最大件数</string> <string name="set_limit">最近のアップロードファイルに表示する最大件数</string>
<string name="login_failed_2fa_not_supported">2段階認証は現在サポートされていません。</string> <string name="login_failed_2fa_not_supported">2段階認証は現在サポートされていません。</string>
<string name="logout_verification">ログアウトしてもよろしいですか？</string> <string name="logout_verification">ログアウトしてもよろしいですか？</string>

89
app/src/main/res/values-mr/strings.xml
View file

@ -73,17 +73,29 @@
<string name="title_activity_settings">मांडण्या</string> <string name="title_activity_settings">मांडण्या</string>
<string name="title_activity_signup">नोंदणी करा</string> <string name="title_activity_signup">नोंदणी करा</string>
<string name="menu_about">आमच्याबद्दल</string> <string name="menu_about">आमच्याबद्दल</string>
<string name="about_license">विकीमिडीया कॉमन्स अॅप हे एक मुक्तस्त्रोत अॅप असून ते विकीमिडीया समुदायातील स्वयंसेवकांनी आणि अनुदानित सदस्यांकडून निर्माण आणि सांभाळले जाते. विकीमिडीया फ़ांउंडेशनचा ह्या अॅपच्या निर्मिती,सांभाळामध्ये सहभाग नाही.</string>
<string name="about_improve">नव्याने तयार करा &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub issue&lt;/a&gt; त्रुटी अहवालांसाठी आणि सुचनांसाठी.</string>
<string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Privacy policy&lt;/a&gt;</string>
<string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Credits&lt;/a&gt;</string>
<string name="title_activity_about">च्या विषयी</string> <string name="title_activity_about">च्या विषयी</string>
<string name="menu_feedback">प्रतिसाद पाठवा (विपत्राद्वारे)</string> <string name="menu_feedback">प्रतिसाद पाठवा (विपत्राद्वारे)</string>
<string name="no_email_client">कोणतेही ईमेल क्लायंट स्थापित नाहीत</string>
<string name="provider_categories">अलीकडे वापरलेले वर्ग</string> <string name="provider_categories">अलीकडे वापरलेले वर्ग</string>
<string name="waiting_first_sync">प्रथम संकालनाची प्रतीक्षा करीत आहे ...</string>
<string name="no_uploads_yet">आपण अद्याप काहीच चित्रे अपभारीत केली नाहीत.</string> <string name="no_uploads_yet">आपण अद्याप काहीच चित्रे अपभारीत केली नाहीत.</string>
<string name="menu_retry_upload">पुन्हा प्रयत्न करा</string> <string name="menu_retry_upload">पुन्हा प्रयत्न करा</string>
<string name="menu_cancel_upload">रद्द करा</string> <string name="menu_cancel_upload">रद्द करा</string>
<string name="share_license_summary">ही संचिका %1$s या परवान्यांतर्गत राहील</string> <string name="share_license_summary">ही संचिका %1$s या परवान्यांतर्गत राहील</string>
<string name="media_upload_policy">हे चित्र इथे चढवत असताना, मी हे घोषीत करतो की हे माझेच काम आहे आणि ह्या कामावर इतर कुणाचाही प्रताधिकार नाही तसेच हे सेल्फ़ी नाहीये, म्हणून हे काम ह्या संकेतांचे पालन करेल &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Commons policies&lt;/a&gt;.</string>
<string name="menu_download">अधिभारण करा</string> <string name="menu_download">अधिभारण करा</string>
<string name="preference_license">परवाना</string> <string name="preference_license">परवाना</string>
<string name="use_previous">मागील शीर्षक/वर्णन वापरा</string> <string name="use_previous">मागील शीर्षक/वर्णन वापरा</string>
<string name="allow_gps">आपोआप सध्याचे स्थान मिळवा</string> <string name="allow_gps">आपोआप सध्याचे स्थान मिळवा</string>
<string name="allow_gps_summary">जर छायाचित्राला जिओटॅग नसल्यास तुम्ही तुमच्या स्थानाची निश्चिती करा जेणे करुन संबंधीत वर्ग सुचवले जातील</string>
<string name="preference_theme">रात्रीच्या वेळेच्या व्यवस्था</string>
<string name="preference_theme_summary">गडद त्वचा वापरा</string>
<string name="license_name_cc_by_sa_four"> Attribution-ShareAlike 3.0</string>
<string name="license_name_cc_by_four"> Attribution 3.0</string>
<string name="license_name_cc_by_sa"> Attribution-ShareAlike 3.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_cc_by"> Attribution 3.0</string>
<string name="license_name_cc0">CC0</string> <string name="license_name_cc0">CC0</string>
@ -109,7 +121,7 @@
<string name="tutorial_3_text">कृपया अपभारण करू \'\'\'नका\'\'\':</string> <string name="tutorial_3_text">कृपया अपभारण करू \'\'\'नका\'\'\':</string>
<string name="tutorial_3_subtext">-आपल्या किंवा मित्रांच्या सेल्फी\n-आपण आंतरजाल (इंटरनेट) वरुन अधिभारण केलेली चित्रे\n-प्रोप्रायटरी अॅप्सचे स्क्रिनशॉट</string> <string name="tutorial_3_subtext">-आपल्या किंवा मित्रांच्या सेल्फी\n-आपण आंतरजाल (इंटरनेट) वरुन अधिभारण केलेली चित्रे\n-प्रोप्रायटरी अॅप्सचे स्क्रिनशॉट</string>
<string name="tutorial_4_text">उदाहरणादाखल अपभारण:</string> <string name="tutorial_4_text">उदाहरणादाखल अपभारण:</string>
<string name="tutorial_4_subtext" fuzzy="true">- शीर्षक: Sydney Opera House\n- वर्णन: Sydney Opera House as viewed from across the bay\n- वर्ग: Sydney Opera House, Sydney Opera House from the west, Sydney Opera House remote views</string> <string name="tutorial_4_subtext">- शीर्षक: Sydney Opera House\n- वर्णन: Sydney Opera House as viewed from across the bay\n- वर्ग: Sydney Opera House, Sydney Opera House from the west, Sydney Opera House remote views</string>
<string name="welcome_wikipedia_text">आपली चित्रे जोडा. विकिपीडियावरील लेखात जीवंतपणा आणा!</string> <string name="welcome_wikipedia_text">आपली चित्रे जोडा. विकिपीडियावरील लेखात जीवंतपणा आणा!</string>
<string name="welcome_wikipedia_subtext">विकिपीडियावरची चित्रे विकिमिडिया कॉमन्सवरुन येतात.</string> <string name="welcome_wikipedia_subtext">विकिपीडियावरची चित्रे विकिमिडिया कॉमन्सवरुन येतात.</string>
<string name="welcome_copyright_text">जगातल्या अनेक लोकांना आपल्या चित्राद्वारे शिकता येते.</string> <string name="welcome_copyright_text">जगातल्या अनेक लोकांना आपल्या चित्राद्वारे शिकता येते.</string>
@ -123,11 +135,86 @@
<string name="detail_license_empty">अनोळखी परवाना</string> <string name="detail_license_empty">अनोळखी परवाना</string>
<string name="menu_refresh">ताजेतवाने करा</string> <string name="menu_refresh">ताजेतवाने करा</string>
<string name="read_storage_permission_rationale">परवानगी आवश्यक:बाह्य भंडारण वाचन. याशिवाय अॅप काम करू शकत नाही.</string> <string name="read_storage_permission_rationale">परवानगी आवश्यक:बाह्य भंडारण वाचन. याशिवाय अॅप काम करू शकत नाही.</string>
<string name="write_storage_permission_rationale">परवानगी आवश्यक:बाह्य भंडारण वाचन. याशिवाय अॅप काम करू शकत नाही.</string>
<string name="location_permission_rationale">ऐच्छिक परवानगी:वर्ग सुचवण्यांसाठी सध्याचे स्थान मिळवा</string> <string name="location_permission_rationale">ऐच्छिक परवानगी:वर्ग सुचवण्यांसाठी सध्याचे स्थान मिळवा</string>
<string name="ok">ठीक आहे</string> <string name="ok">ठीक आहे</string>
<string name="title_activity_nearby">जवळपासची स्थाने</string> <string name="title_activity_nearby">जवळपासची स्थाने</string>
<string name="no_nearby">आसपास काहीही सापडले नाही</string>
<string name="warning">इशारा</string> <string name="warning">इशारा</string>
<string name="file_exists">ही संचिका पूर्वीच कॉमन्सवर उपलब्ध आहे. आपणास पुढे जायचे याची निश्चिती करता काय?</string> <string name="file_exists">ही संचिका पूर्वीच कॉमन्सवर उपलब्ध आहे. आपणास पुढे जायचे याची निश्चिती करता काय?</string>
<string name="yes">होय</string> <string name="yes">होय</string>
<string name="no">नाही</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="media_detail_uploaded_date">चढवल्याची तारिख</string>
<string name="media_detail_license">परवाना</string>
<string name="media_detail_coordinates">अक्षांश-रेखांश</string>
<string name="media_detail_coordinates_empty">दिलेले नाही</string>
<string name="become_a_tester_title">बिटा आवृत्तीचे तपासक बना</string>
<string name="become_a_tester_description">गुगल प्ले वरील आमच्या बिटा चॅनलचा पाठलाग करा आणि आमच्या नव्या सेवा-सुविधांचा तसाच त्रुटी-निरसनांचा फ़ायदा घ्या.</string>
<string name="use_wikidata">विकीडाटा वापरा</string>
<string name="use_wikidata_summary">(ताकीद: हे बंद केल्यामुळे तुम्हांला मोठ्याप्रमाणात डेटा खर्च करावा लागेल)</string>
<string name="_2fa_code">2FA कोड</string>
<string name="number_of_uploads">माझ्या अलिकडच्या अपभरणाची मर्यादा</string>
<string name="maximum_limit">जास्तीची मर्यादा</string>
<string name="maximum_limit_alert">५०० पेक्षा जास्त दाखवण्यास असमर्थ</string>
<string name="set_limit">माझ्या अलिकडच्या अपभरणाची मर्यादा</string>
<string name="login_failed_2fa_not_supported">दोन पायऱ्यांची वैधता तपासणी सध्या उपलब्ध नाही.</string>
<string name="logout_verification">काय आपणास खरेच बंद करायचे आहे?</string>
<string name="commons_logo">कॉमन्सचे चिन्ह</string>
<string name="commons_website">कॉमन्सचे संकेतस्थळ</string>
<string name="commons_facebook">कॉमन्सचे फ़ेसबुक पान</string>
<string name="commons_github">कॉमन्सचे गिटहब स्त्रोत कोड</string>
<string name="background_image">पार्श्वभूमी चित्र</string>
<string name="mediaimage_failed"> चित्र माध्यमे कोसळली</string>
<string name="no_image_found">कोणतेही चित्र सापडले नाही</string>
<string name="upload_image">चित्र अपभारीत करा</string>
<string name="welcome_image_mount_zao">जाओ जान पर्वत</string>
<string name="welcome_image_llamas">लामा</string>
<string name="welcome_image_rainbow_bridge">रेनबो पूल</string>
<string name="welcome_image_tulip">टुलिप</string>
<string name="welcome_image_no_selfies">सेल्फ़ी चालणार नाहीत</string>
<string name="welcome_image_proprietary">मालकी हक्क प्रतिमा</string>
<string name="welcome_image_welcome_wikipedia">विकीपिडीयात स्वागत आहे</string>
<string name="welcome_image_welcome_copyright">प्रताधिकार स्वागत आहे</string>
<string name="welcome_image_sydney_opera_house">सिडनीचे ओपेरा हाऊस</string>
<string name="cancel">रद्द करा</string>
<string name="navigation_drawer_open">उघडा</string>
<string name="navigation_drawer_close">बंद करा</string>
<string name="navigation_item_home">मुख्य</string>
<string name="navigation_item_upload">अपभारण करा</string>
<string name="navigation_item_nearby">जवळपास</string>
<string name="navigation_item_about">आमच्याबद्दल</string>
<string name="navigation_item_settings">सेटिंग्स</string>
<string name="navigation_item_feedback">प्रतिक्रिया</string>
<string name="navigation_item_logout">बाहेर पडा</string>
<string name="navigation_item_info">माहिती पुस्तिका</string>
<string name="navigation_item_notification">अधिसूचना</string>
<string name="nearby_needs_permissions">लोकेशन सेवा वापराची परवानगी दिल्याशिवाय जवळपासची ठिकाणे दाखवली जाउ शकत नाहीत.</string>
<string name="no_description_found">कोणतीही माहिती सापडली नाही</string>
<string name="nearby_info_menu_commons_article">कॉमन्स फ़ाईलचे पान</string>
<string name="nearby_info_menu_wikidata_article">विकिबेस कलम</string>
<string name="error_while_cache">चित्र दाखवताना त्रुटी आढळली</string>
<string name="title_info">फ़ाईलला असे नाव द्या जे सुयोग्य असेल,चित्राविषयी त्यामधून माहिती कळेल अशी साधी भाषा वापरा,नावामध्ये फ़ाईलचे एक्सटेन्शन लिहू नका.</string>
<string name="description_info">माध्यमांची शक्य तितकी जास्त माहिती द्या:छायाचित्र/चलचित्र/ध्वनिमुद्रण कोठे घेतले आहे? त्यात काय दाखवले आहे? त्या माध्यमांचा संदर्भ काय? त्यातील वस्तू,व्यक्ति व इतर माहिती द्या? अशी सगळी माहिती जी त्या माध्यमाकडे पाहून लक्षात येणार नाही पण ती महत्वाचे आहे ती सर्व पुरवा. जर त्या माध्यमामध्ये काहीही वेगळे दिसत असेल तर ते वेगळे का आहे याची माहिती पुरवा.</string>
<string name="upload_image_too_dark">हे छायाचित्र खुप अंधारलेले आहे, तुम्ही खरच हे छायाचित्र येथे चढवू इच्छीता का? विकीमिडीया कॉमन्सवर नेहमी विश्वकोषात महत्त्वाची असलेलीच चित्रे चढवली जाऊ शकतात.</string>
<string name="upload_image_blurry">हे छायाचित्र खुप फ़िकट आलेले आहे, तुम्ही खरच हे छायाचित्र येथे चढवू इच्छीता का? विकीमिडीया कॉमन्सवर नेहमी विश्वकोषात महत्त्वाची असलेलीच चित्रे चढवली जाऊ शकतात.</string>
<string name="give_permission">परवानगी द्या</string>
<string name="use_external_storage">बाहेरील स्टोरेज वापरा</string>
<string name="use_external_storage_summary">आपल्या डिव्हाइसवरील इन-अॅप्स कॅमेर्यासह घेतलेली चित्रे जतन करा</string>
<string name="login_to_your_account">तुमच्या खात्यावरुन सनोंद प्रवेश करा</string>
<string name="send_log_file">लॉग फ़ाईल पाठवा</string>
<string name="send_log_file_description">विकसकांना लॉग फ़ाईल विपत्राने पाठवा</string>
<string name="nearby_location_has_not_changed">लोकेशन बदलली नाहीये.</string>
<string name="nearby_location_not_available">ही लोकेशन उपलब्ध नाही</string>
<string name="location_permission_rationale_nearby">जवळपासच्या ठिकाणांची यादी दाखवण्यासाठी आपली परवानगी आवश्यक आहे</string>
<string name="get_directions">दिशानिर्देश मिळवा</string>
<string name="read_article">लेख वाचा</string>
<string name="notifications_welcome">विकीमिडीया कॉमन्समध्ये आपले स्वागत आहे,%1$s! आम्हांला आनंद आहे आपण इथे आलात.</string>
<string name="notifications_talk_page_message">%1$s यांनी तुमच्या चर्चापानावर संदेश टाकला</string>
<string name="notifications_thank_you_edit">तुमच्या संपादनासाठी तुमचे आभार !</string>
<string name="notifications_mention">%1$s यांनी तुमचा उल्लेख %2$s येथे केला.</string>
<string name="toggle_view_button">टॉगल दृश्य</string>
</resources> </resources>

9
app/src/main/res/values-nb/strings.xml
View file

@ -20,7 +20,7 @@
<string name="upload_progress_notification_title_finishing">Avslutter opplasting av %1$s</string> <string name="upload_progress_notification_title_finishing">Avslutter opplasting av %1$s</string>
<string name="upload_failed_notification_title">Opplastingen av %1$s feilet</string> <string name="upload_failed_notification_title">Opplastingen av %1$s feilet</string>
<string name="upload_failed_notification_subtitle">Trykk for å vise</string> <string name="upload_failed_notification_subtitle">Trykk for å vise</string>
<plurals name="uploads_pending_notification_indicator" fuzzy="true"> <plurals name="uploads_pending_notification_indicator">
<item quantity="one">%1$d fil lastes opp</item> <item quantity="one">%1$d fil lastes opp</item>
<item quantity="other">%1$d filer lastes opp</item> <item quantity="other">%1$d filer lastes opp</item>
</plurals> </plurals>
@ -54,7 +54,7 @@
<string name="gps_disabled">GPS er slått av på denne enheten. Ønsker du å slå den på?</string> <string name="gps_disabled">GPS er slått av på denne enheten. Ønsker du å slå den på?</string>
<string name="enable_gps">Slå på GPS</string> <string name="enable_gps">Slå på GPS</string>
<string name="contributions_subtitle_zero">Ingen opplastinger ennå</string> <string name="contributions_subtitle_zero">Ingen opplastinger ennå</string>
<plurals name="contributions_subtitle" fuzzy="true"> <plurals name="contributions_subtitle">
<item quantity="zero">\@string/contributions_subtitle_zero</item> <item quantity="zero">\@string/contributions_subtitle_zero</item>
<item quantity="one">%1$d opplasting</item> <item quantity="one">%1$d opplasting</item>
<item quantity="other">%1$d opplastinger</item> <item quantity="other">%1$d opplastinger</item>
@ -63,7 +63,7 @@
<item quantity="one">Starter %1$d opplasting</item> <item quantity="one">Starter %1$d opplasting</item>
<item quantity="other">Starter %1$d opplastinger</item> <item quantity="other">Starter %1$d opplastinger</item>
</plurals> </plurals>
<plurals name="multiple_uploads_title" fuzzy="true"> <plurals name="multiple_uploads_title">
<item quantity="one">%1$d opplasting</item> <item quantity="one">%1$d opplasting</item>
<item quantity="other">%1$d opplastinger</item> <item quantity="other">%1$d opplastinger</item>
</plurals> </plurals>
@ -199,6 +199,8 @@
<string name="error_while_cache">Feil under mellomlagring av bilder</string> <string name="error_while_cache">Feil under mellomlagring av bilder</string>
<string name="title_info">En unik beskrivende tittel for fila, som vil fungere som filnavn. Du kan bruke vanlig språk med mellomrom. Ikke ta med filendelsen</string> <string name="title_info">En unik beskrivende tittel for fila, som vil fungere som filnavn. Du kan bruke vanlig språk med mellomrom. Ikke ta med filendelsen</string>
<string name="description_info">Beskriv bidraget så mye som mulig: Hvor ble det tatt? Hva viser det? Hva er konteksten? Beskriv objektene eller personene. Gi informasjon som ikke kan gjettes lett, for eksempel når på dagen bildet ble tatt om det er et landskapsbilde. Om bildet viser noe uvanlig, forklar hva som gjør det uvanlig.</string> <string name="description_info">Beskriv bidraget så mye som mulig: Hvor ble det tatt? Hva viser det? Hva er konteksten? Beskriv objektene eller personene. Gi informasjon som ikke kan gjettes lett, for eksempel når på dagen bildet ble tatt om det er et landskapsbilde. Om bildet viser noe uvanlig, forklar hva som gjør det uvanlig.</string>
<string name="upload_image_too_dark">Dette bildet er for mørkt, er du sikker på at du ønsker å laste det opp? Wikimedia Commons er kun for bilder med ensyklopedisk verdi.</string>
<string name="upload_image_blurry">Dette bildet er uklart, er du sikker på at du ønsker å laste det opp? Wikimedia Commons er bare for bilder med ensyklopedisk verdi.</string>
<string name="give_permission">Gi tillatelse</string> <string name="give_permission">Gi tillatelse</string>
<string name="use_external_storage">Bruk ekstern lagring</string> <string name="use_external_storage">Bruk ekstern lagring</string>
<string name="use_external_storage_summary">Lagre bilder som er tatt med kameraet i appen på enheten din</string> <string name="use_external_storage_summary">Lagre bilder som er tatt med kameraet i appen på enheten din</string>
@ -214,4 +216,5 @@
<string name="notifications_talk_page_message">%1$s la igjen en beskjed på diskusjonssiden din</string> <string name="notifications_talk_page_message">%1$s la igjen en beskjed på diskusjonssiden din</string>
<string name="notifications_thank_you_edit">Takk for at du har gjort en redigering</string> <string name="notifications_thank_you_edit">Takk for at du har gjort en redigering</string>
<string name="notifications_mention">%1$s nevnte deg på %2$s.</string> <string name="notifications_mention">%1$s nevnte deg på %2$s.</string>
<string name="toggle_view_button">Skift visning</string>
</resources> </resources>

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

@ -199,6 +199,8 @@
<string name="error_while_cache">Erro durante o cache de imagens</string> <string name="error_while_cache">Erro durante o cache de imagens</string>
<string name="title_info">Um título descritivo exclusivo para o arquivo, que servirá como um nome de arquivo. Você pode usar linguagem simples com espaços. Não inclua a extensão do arquivo</string> <string name="title_info">Um título descritivo exclusivo para o arquivo, que servirá como um nome de arquivo. Você pode usar linguagem simples com espaços. Não inclua a extensão do arquivo</string>
<string name="description_info">Por favor, descreva a mídia tanto quanto possível: onde foi tomada? O que isso mostra? Qual é o contexto? Descreva os objetos ou pessoas. Revelar informações que não podem ser facilmente adivinhadas, por exemplo, a hora do dia, se for uma paisagem. Se a mídia mostrar algo incomum, explique o que torna incomum.</string> <string name="description_info">Por favor, descreva a mídia tanto quanto possível: onde foi tomada? O que isso mostra? Qual é o contexto? Descreva os objetos ou pessoas. Revelar informações que não podem ser facilmente adivinhadas, por exemplo, a hora do dia, se for uma paisagem. Se a mídia mostrar algo incomum, explique o que torna incomum.</string>
<string name="upload_image_too_dark">Esta foto está muito escura, você tem certeza de que deseja enviá-la? O Wikimedia Commons é apenas para imagens com valor enciclopédico.</string>
<string name="upload_image_blurry">Esta foto está embaçada, tem certeza de que deseja enviá-la? O Wikimedia Commons é apenas para imagens com valor enciclopédico.</string>
<string name="give_permission">Dar permissão</string> <string name="give_permission">Dar permissão</string>
<string name="use_external_storage">Usar o armazenamento externo</string> <string name="use_external_storage">Usar o armazenamento externo</string>
<string name="use_external_storage_summary">Salvar as fotos tiradas com a câmera no aplicativo no seu dispositivo</string> <string name="use_external_storage_summary">Salvar as fotos tiradas com a câmera no aplicativo no seu dispositivo</string>

2
app/src/main/res/values-ru/strings.xml
View file

@ -203,7 +203,7 @@
<string name="error_while_cache">Ошибка при кэшировании картинок</string> <string name="error_while_cache">Ошибка при кэшировании картинок</string>
<string name="title_info">Уникальное описание, которое будет сохранено как имя файла. Вы можете использовать естественный язык, разделяя слова пробелами. Пожалуйста, не указывайте расширение файла.</string> <string name="title_info">Уникальное описание, которое будет сохранено как имя файла. Вы можете использовать естественный язык, разделяя слова пробелами. Пожалуйста, не указывайте расширение файла.</string>
<string name="description_info">Пожалуйста, подробно опишите загружаемый файл: где он был снят? что на нём изображено? каков его контекст? Пожалуйста опишите изображённых персон или объекты. Добавьте информацию, о которой нельзя легко догадаться, например, время суток, когда снимался файл. Если снято что-то необычное, постарайтесь пояснить, что именно в этом необычного.</string> <string name="description_info">Пожалуйста, подробно опишите загружаемый файл: где он был снят? что на нём изображено? каков его контекст? Пожалуйста опишите изображённых персон или объекты. Добавьте информацию, о которой нельзя легко догадаться, например, время суток, когда снимался файл. Если снято что-то необычное, постарайтесь пояснить, что именно в этом необычного.</string>
<string name="upload_image_too_dark">Это изображение слишком темное. Вы уверены, что хотите его загрузить? Викисклад подходит только для фотографий, имеющих энциклопедическую ценность.</string> <string name="upload_image_too_dark">Это изображение слишком тёмное. Вы уверены, что хотите его загрузить? Викисклад подходит только для фотографий, имеющих энциклопедическую ценность.</string>
<string name="upload_image_blurry">Это изображение размыто. Вы уверены, что хотите его загрузить? Викисклад подходит только для фотографий, имеющих энциклопедическую ценность.</string> <string name="upload_image_blurry">Это изображение размыто. Вы уверены, что хотите его загрузить? Викисклад подходит только для фотографий, имеющих энциклопедическую ценность.</string>
<string name="give_permission">Дать разрешение</string> <string name="give_permission">Дать разрешение</string>
<string name="use_external_storage">Использовать внешнее хранилище</string> <string name="use_external_storage">Использовать внешнее хранилище</string>

2
app/src/main/res/values-sv/strings.xml
View file

@ -199,6 +199,8 @@
<string name="error_while_cache">Fel uppstod när bilder cachelagras</string> <string name="error_while_cache">Fel uppstod när bilder cachelagras</string>
<string name="title_info">En unik beskrivande titel för filen, som kommer att fungera som ett filnamn. Du kan använda klarspråk med mellanslag. Ta inte med filändelsen</string> <string name="title_info">En unik beskrivande titel för filen, som kommer att fungera som ett filnamn. Du kan använda klarspråk med mellanslag. Ta inte med filändelsen</string>
<string name="description_info">Beskriv mediafilen så mycket som möjligt. Var togs den? Vad visar den? Vad är sammanhanget? Beskriv föremålen eller personerna. Ge information som inte kan gissas fram, t.ex. tidpunkten om det är ett landskap. Om mediafilen visar någonting ovanligt, förklara vad som gör den ovanlig.</string> <string name="description_info">Beskriv mediafilen så mycket som möjligt. Var togs den? Vad visar den? Vad är sammanhanget? Beskriv föremålen eller personerna. Ge information som inte kan gissas fram, t.ex. tidpunkten om det är ett landskap. Om mediafilen visar någonting ovanligt, förklara vad som gör den ovanlig.</string>
<string name="upload_image_too_dark">Denna bild är för mörk, är du säker på att du vill ladda upp den? Wikimedia Commons är endast till för bilder med encyklopediskt värde.</string>
<string name="upload_image_blurry">Denna bild är suddig, är du säker på att du vill ladda upp den? Wikimedia Commons är endast till för bilder med encyklopediskt värde.</string>
<string name="give_permission">Ge behörighet</string> <string name="give_permission">Ge behörighet</string>
<string name="use_external_storage">Använd extern lagring</string> <string name="use_external_storage">Använd extern lagring</string>
<string name="use_external_storage_summary">Spara bilder som tas med kameran i appen på din enhet</string> <string name="use_external_storage_summary">Spara bilder som tas med kameran i appen på din enhet</string>

2
app/src/main/res/values-uk/strings.xml
View file

@ -207,6 +207,8 @@
<string name="error_while_cache">Помилка кешування зображень</string> <string name="error_while_cache">Помилка кешування зображень</string>
<string name="title_info">Унікальна описова назва файлу. Ви можете використовувати простий текст з пробілами. Не вказуйте розширення файлу</string> <string name="title_info">Унікальна описова назва файлу. Ви можете використовувати простий текст з пробілами. Не вказуйте розширення файлу</string>
<string name="description_info">Будь ласка, докладно опишіть файл: де його було зроблено? що на ньому зображено? який контекст? Будь ласка, опишіть об\'єкти чи осіб. Додайте інформацію, яку не можна легко здогадатися, наприклад, пору доби для фотографії пейзажу. Якщо зображено щось незвичайне, постарайтеся пояснити, що робить його незвичайним.</string> <string name="description_info">Будь ласка, докладно опишіть файл: де його було зроблено? що на ньому зображено? який контекст? Будь ласка, опишіть об\'єкти чи осіб. Додайте інформацію, яку не можна легко здогадатися, наприклад, пору доби для фотографії пейзажу. Якщо зображено щось незвичайне, постарайтеся пояснити, що робить його незвичайним.</string>
<string name="upload_image_too_dark">Це зображення надто темне. Ви упевнені, що хочете його завантажити? Вікісховище призначене лише для зображень, що мають енциклопедичну цінність.</string>
<string name="upload_image_blurry">Це зображення розмите. Ви упевнені, що хочете його завантажити? Вікісховище призначене лише для зображень, що мають енциклопедичну цінність.</string>
<string name="give_permission">Надати дозвіл</string> <string name="give_permission">Надати дозвіл</string>
<string name="use_external_storage">Використовувати зовнішнє сховище</string> <string name="use_external_storage">Використовувати зовнішнє сховище</string>
<string name="use_external_storage_summary">Зберігати зображення, виконані вбудованою камерою Вашого пристрою</string> <string name="use_external_storage_summary">Зберігати зображення, виконані вбудованою камерою Вашого пристрою</string>

6
app/src/main/res/values-yue/error.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="crash_dialog_title">同享壞咗</string>
<string name="crash_dialog_text">哎呀。出咗錯！</string>
<string name="crash_dialog_ok_toast">多謝你！</string>
</resources>

17
app/src/main/res/values/strings.xml
View file

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Commons</string> <string name="app_name">Commons</string>
<string name="bullet">&#8226; </string>
<string name="menu_settings">Settings</string> <string name="menu_settings">Settings</string>
<string name="username">Username</string> <string name="username">Username</string>
<string name="password">Password</string> <string name="password">Password</string>
<string name="login_credential">Log in to your Commons Beta account</string>
<string name="login">Log in</string> <string name="login">Log in</string>
<string name="signup">Sign up</string> <string name="signup">Sign up</string>
<string name="logging_in_title">Logging in</string> <string name="logging_in_title">Logging in</string>
@ -77,8 +79,8 @@
<string name="about_license">The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. </string> <string name="about_license">The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. </string>
<string name="trademarked_name" translatable="false">Wikimedia Commons</string> <string name="trademarked_name" translatable="false">Wikimedia Commons</string>
<string name="about_improve">Create a new &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub issue&lt;/a&gt; for bug reports and suggestions.</string> <string name="about_improve">Create a new &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub issue&lt;/a&gt; for bug reports and suggestions.</string>
<string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Privacy policy&lt;/a&gt;</string> <string name="about_privacy_policy"><u>Privacy policy</u></string>
<string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Credits&lt;/a&gt;</string> <string name="about_credits"><u>Credits</u></string>
<string name="title_activity_about">About</string> <string name="title_activity_about">About</string>
<string name="menu_feedback">Send Feedback (via Email)</string> <string name="menu_feedback">Send Feedback (via Email)</string>
<string name="no_email_client">No email client installed</string> <string name="no_email_client">No email client installed</string>
@ -119,11 +121,20 @@
<string name="tutorial_1_text">Wikimedia Commons hosts most of the images that are used in Wikipedia.</string> <string name="tutorial_1_text">Wikimedia Commons hosts most of the images that are used in Wikipedia.</string>
<string name="tutorial_1_subtext">Your images help educate people around the world!</string> <string name="tutorial_1_subtext">Your images help educate people around the world!</string>
<string name="tutorial_2_text">Please upload pictures that are taken or created entirely by yourself:</string> <string name="tutorial_2_text">Please upload pictures that are taken or created entirely by yourself:</string>
<string name="tutorial_2_subtext">- Natural objects (flowers, animals, mountains)\n- Useful objects (bicycles, train stations)\n- Famous people (your mayor, Olympic athletes you met)</string> <string name="tutorial_2_subtext">Natural objects (flowers, animals, mountains)\n&#8226; Useful objects (bicycles, train stations)\n&#8226; Famous people (your mayor, Olympic athletes you met)</string>
<string name="tutorial_2_subtext_1">Natural objects (flowers, animals, mountains)</string>
<string name="tutorial_2_subtext_2">Useful objects (bicycles, train stations)</string>
<string name="tutorial_2_subtext_3">Famous people (your mayor, Olympic athletes you met)</string>
<string name="tutorial_3_text">Please do NOT upload:</string> <string name="tutorial_3_text">Please do NOT upload:</string>
<string name="tutorial_3_subtext">- Selfies or pictures of your friends\n- Pictures you downloaded from the Internet\n- Screenshots of proprietary apps</string> <string name="tutorial_3_subtext">- Selfies or pictures of your friends\n- Pictures you downloaded from the Internet\n- Screenshots of proprietary apps</string>
<string name="tutorial_3_subtext_1">Selfies or pictures of your friends</string>
<string name="tutorial_3_subtext_2">Pictures you downloaded from the Internet</string>
<string name="tutorial_3_subtext_3">Screenshots of proprietary apps</string>
<string name="tutorial_4_text">Example upload:</string> <string name="tutorial_4_text">Example upload:</string>
<string name="tutorial_4_subtext">- Title: Sydney Opera House\n- Description: Sydney Opera House as viewed from across the bay\n- Categories: Sydney Opera House from the west, Sydney Opera House remote views</string> <string name="tutorial_4_subtext">- Title: Sydney Opera House\n- Description: Sydney Opera House as viewed from across the bay\n- Categories: Sydney Opera House from the west, Sydney Opera House remote views</string>
<string name="tutorial_4_subtext_1">Title: Sydney Opera House</string>
<string name="tutorial_4_subtext_2">Description: Sydney Opera House as viewed from across the bay</string>
<string name="tutorial_4_subtext_3">Categories: Sydney Opera House from the west, Sydney Opera House remote views</string>
<string name="welcome_wikipedia_text">Contribute your images. Help Wikipedia articles come to life!</string> <string name="welcome_wikipedia_text">Contribute your images. Help Wikipedia articles come to life!</string>
<string name="welcome_wikipedia_subtext">Images on Wikipedia come from Wikimedia Commons.</string> <string name="welcome_wikipedia_subtext">Images on Wikipedia come from Wikimedia Commons.</string>
<string name="welcome_copyright_text">Your images help educate people around the world.</string> <string name="welcome_copyright_text">Your images help educate people around the world.</string>