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

Merge remote-tracking branch 'refs/remotes/commons-app/master'

Browse source
This commit is contained in:
misaochan 2017-05-31 19:08:45 +10:00
commit bf45b89b2e
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/fr/free/nrw/commons/nearby/NearbyViewHolder.java
View file

@ -27,7 +27,7 @@ public class NearbyViewHolder implements ViewHolder<Place> {
tvName.setText(place.name); tvName.setText(place.name);
String description = place.description; String description = place.description;
if ( description == null || description.isEmpty() || description.equals("?")) { if ( description == null || description.isEmpty() || description.equals("?")) {
description = "No Description Found"; description = context.getString(R.string.no_description_found);
} }
tvDesc.setText(description); tvDesc.setText(description);
distance.setText(place.distance); distance.setText(place.distance);

4
app/src/main/res/values-kn/strings.xml
View file

@ -21,8 +21,8 @@
<string name="upload_failed_notification_title">%1$s ಅಪ್ಲೋಡ್ ಮಾಡುವಿಕೆ ವಿಫಲವಾಗಿದೆ</string> <string name="upload_failed_notification_title">%1$s ಅಪ್ಲೋಡ್ ಮಾಡುವಿಕೆ ವಿಫಲವಾಗಿದೆ</string>
<string name="upload_failed_notification_subtitle">ನೋಡಲು ಮೆಲ್ಲಗೆ ತಟ್ಟಿ</string> <string name="upload_failed_notification_subtitle">ನೋಡಲು ಮೆಲ್ಲಗೆ ತಟ್ಟಿ</string>
<plurals name="uploads_pending_notification_indicator"> <plurals name="uploads_pending_notification_indicator">
<item quantity="one">%d file uploading\n%d ಕಡತ ಅಪ್ಲೋಡ್ ಅಗುತ್ತಿದೆ</item> <item quantity="one">%d ಕಡತ ಅಪ್ಲೋಡ್ ಅಗುತ್ತಿದೆ</item>
<item quantity="other">%d files uploading\n%d ಕಡತಗಳು ಅಪ್ಲೋಡ್ ಅಗುತ್ತಿದೆ</item> <item quantity="other">%d ಕಡತಗಳು ಅಪ್ಲೋಡ್ ಅಗುತ್ತಿದೆ</item>
</plurals> </plurals>
<string name="title_activity_contributions">ನನ್ನ ಇತ್ತಿಚಿನ ಅಪ್ಲೋಡ್ಗಳು</string> <string name="title_activity_contributions">ನನ್ನ ಇತ್ತಿಚಿನ ಅಪ್ಲೋಡ್ಗಳು</string>
<string name="contribution_state_queued">ಸರತಿಸಾಲಿನಲ್ಲಿದೆ</string> <string name="contribution_state_queued">ಸರತಿಸಾಲಿನಲ್ಲಿದೆ</string>

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

@ -192,8 +192,9 @@ Tap this message (or hit back) to skip this step.</string>
<string name="navigation_item_settings">Settings</string> <string name="navigation_item_settings">Settings</string>
<string name="navigation_item_feedback">Feedback</string> <string name="navigation_item_feedback">Feedback</string>
<string name="navigation_item_logout">Logout</string> <string name="navigation_item_logout">Logout</string>
<string name="navigation_item_info">Introduction</string> <string name="navigation_item_info">Tutorial</string>
<string name="no_description_found">no description found</string>
<string name="nearby_info_menu_commons_article">Commons Article</string> <string name="nearby_info_menu_commons_article">Commons Article</string>
<string name="nearby_info_menu_wikidata_article">WikiData Article</string> <string name="nearby_info_menu_wikidata_article">WikiData Article</string>
</resources> </resources>