Revert "Revert "Rebranded using Wikimedia logo and name, as authorized by contract signed between me and WIKIMEDIA FOUNDATION INC's Charles M. Roslof""

This reverts commit 1585c94559.

commons/app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources>
 
-    <string name="app_name">Upload to Commons</string>
+    <string name="app_name">Commons</string>
     <string name="menu_settings">Settings</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
@@ -75,7 +75,7 @@
     <string name="preference_tracking_summary">Send usage reports to Wikimedia to help us improve the app</string>
     <string name="title_activity_settings">Settings</string>
     <string name="menu_about">About</string>
-    <string name="about_license">Open Source software released under the &lt;a href="https://github.com/wikimedia/apps-android-commons/blob/master/COPYING">Apache License v2&lt;/a></string>
+    <string name="about_license">Open Source software released under the &lt;a href="https://github.com/wikimedia/apps-android-commons/blob/master/COPYING">Apache License v2&lt;/a>. Wikimedia Commons and its logo are trademarks of the Wikimedia Foundation and are used with the permission of the Wikimedia Foundation. We are not endorsed by or affiliated with the Wikimedia Foundation.</string>
     <string name="about_improve">Source on &lt;a href="https://github.com/nicolas-raoul/apps-android-commons/">GitHub&lt;/a>. Create a new &lt;a href="https://github.com/nicolas-raoul/apps-android-commons/issues">GitHub issue&lt;/a> for bug reports/suggestions.</string>
     <string name="about_privacy_policy">&lt;a href="https://wikimediafoundation.org/wiki/Privacy_policy">Privacy policy&lt;/a></string>
     <string name="title_activity_about">About</string>

design/icon.svg

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100cm"
-   height="100cm"
-   viewBox="0 0 3543.307 3543.307"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="logo.svg"
-   inkscape:export-filename="/home/nico/src/commons-app/commons/res/drawable-hdpi/ic_launcher.png"
-   inkscape:export-xdpi="1.83"
-   inkscape:export-ydpi="1.83">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.051144846"
-     inkscape:cx="1727.2543"
-     inkscape:cy="1587.318"
-     inkscape:document-units="m"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="m"
-     inkscape:window-width="819"
-     inkscape:window-height="918"
-     inkscape:window-x="519"
-     inkscape:window-y="68"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,2490.9449)">
-    <path
-       style="fill:#14647a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:6.7475729px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 0,520.86581 1240.1573,-1240.15734 -531.49597,-531.49597 0,354.33064 -708.66133,0 0,-1594.48804 1594.488,0 0,708.6614 -354.3307,0 531.496,531.496 c 0,0 627.8899,-550.7748 531.496,-531.496 -96.3939,19.2788 -354.3306,0 -354.3306,0 l 0,-708.6614 1594.488,0 0,1594.48804 -708.6614,0 0,-354.33064 -531.496,531.49597 531.496,531.496 0,-354.33066 708.6614,0 0,1594.48799 -1594.488,0 0,-708.66133 354.3306,-0.433 -530.7544,-531.063 L 531.496,1052.3618 0,1052.3618 Z"
-       id="path4136"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccc" />
-  </g>
-</svg>