Brion VIBBER has submitted this change and it was merged.
Change subject: Merge branch 'campaigns'
......................................................................
Merge branch 'campaigns'
Conflicts:
commons/res/values/strings.xml
commons/src/main/java/org/wikimedia/commons/Media.java
Change-Id: Ib8c74cbf88630f11b3fbfee903800e7acf7b2fd4
---
M commons/res/values/strings.xml
M commons/src/main/java/org/wikimedia/commons/Media.java
2 files changed, 2 insertions(+), 6 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/commons/res/values/strings.xml b/commons/res/values/strings.xml
index 7ff1817..8aa63f7 100644
--- a/commons/res/values/strings.xml
+++ b/commons/res/values/strings.xml
@@ -135,11 +135,8 @@
<string name="welcome_copyright_subtext">Avoid copyrighted materials you
found from the Internet as well as images of posters, book covers, etc.</string>
<string name="welcome_final_text">You think you got it?</string>
<string name="welcome_final_button_text">Yes!</string>
-<<<<<<< HEAD (b7c1f4 Localisation updates from http://translatewiki.net.)
<string name="detail_panel_cats_label">Categories</string>
<string name="detail_panel_cats_loading">Loading...</string>
<string name="detail_panel_cats_none">None selected</string>
-=======
<string name="provider_campaigns">Campaigns</string>
->>>>>>> BRANCH (4da4f7 Turn on Campaigns Sync by default)
</resources>
diff --git a/commons/src/main/java/org/wikimedia/commons/Media.java
b/commons/src/main/java/org/wikimedia/commons/Media.java
index 190a8b1..e09e00f 100644
--- a/commons/src/main/java/org/wikimedia/commons/Media.java
+++ b/commons/src/main/java/org/wikimedia/commons/Media.java
@@ -148,7 +148,6 @@
protected String creator;
-<<<<<<< HEAD (b7c1f4 Localisation updates from http://translatewiki.net.)
protected ArrayList<String> categories; // as loaded at runtime?
protected Map<String, String> descriptions; // multilingual descriptions
as loaded
@@ -184,10 +183,10 @@
// FIXME: return the first available non-English description?
return "";
}
-=======
+ }
+
public Media(String filename) {
this.filename = filename;
->>>>>>> BRANCH (4da4f7 Turn on Campaigns Sync by default)
}
public Media(Uri localUri, String imageUrl, String filename, String
description, long dataLength, Date dateCreated, Date dateUploaded, String
creator) {
--
To view, visit https://gerrit.wikimedia.org/r/89858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8c74cbf88630f11b3fbfee903800e7acf7b2fd4
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/commons
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
