Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' into webview-activity

This commit is contained in:
misaochan 2016-08-05 18:07:40 +12:00
commit d44d3d84c3
52 changed files with 4 additions and 5824 deletions

View file

@ -52,7 +52,7 @@ public class CommonsApplication extends Application {
public static final String API_URL = "https://commons.wikimedia.org/w/api.php";
public static final String IMAGE_URL_BASE = "https://upload.wikimedia.org/wikipedia/commons";
public static final String HOME_URL = "https://commons.wikimedia.org/wiki/";
public static final String EVENTLOG_URL = "https://bits.wikimedia.org/event.gif";
public static final String EVENTLOG_URL = "https://www.wikimedia.org/beacon/event";
public static final String EVENTLOG_WIKI = "commonswiki";
public static final Object[] EVENT_UPLOAD_ATTEMPT = {"MobileAppUploadAttempts", 5334329L};

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">ウィキメディア・コモンズ</string>
<string name="app_name_beta">ウィキメディア・コモンズ ベータ版</string>
<string name="app_name">Commons</string>
<string name="app_name_beta">Commons ベータ版</string>
<string name="menu_settings">設定</string>
<string name="username">利用者名</string>
<string name="password">パスワード</string>