diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0faeb87b5..07930b80b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -273,7 +273,7 @@
-
+
diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern
index c96b50d4e..81ea0ac82 100644
--- a/AndroidManifest.xml.pattern
+++ b/AndroidManifest.xml.pattern
@@ -273,7 +273,7 @@
-
+
diff --git a/assets/resources/application/be.xml b/assets/resources/application/be.xml
index 57ffbb15b..2def69804 100644
--- a/assets/resources/application/be.xml
+++ b/assets/resources/application/be.xml
@@ -100,7 +100,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -793,7 +793,7 @@
-
+
diff --git a/assets/resources/application/bg.xml b/assets/resources/application/bg.xml
index 49f636132..9d6f6e12d 100644
--- a/assets/resources/application/bg.xml
+++ b/assets/resources/application/bg.xml
@@ -100,7 +100,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -792,7 +792,7 @@
-
+
diff --git a/assets/resources/application/ca.xml b/assets/resources/application/ca.xml
index 02e5235ee..ade4f9023 100644
--- a/assets/resources/application/ca.xml
+++ b/assets/resources/application/ca.xml
@@ -106,7 +106,7 @@
-
+
@@ -167,7 +167,7 @@
-
+
@@ -804,7 +804,7 @@
-
+
diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml
index 1807c26fb..dc81e4d1b 100644
--- a/assets/resources/application/cs.xml
+++ b/assets/resources/application/cs.xml
@@ -100,7 +100,7 @@
-
+
@@ -167,7 +167,7 @@
-
+
@@ -796,7 +796,7 @@
-
+
diff --git a/assets/resources/application/da.xml b/assets/resources/application/da.xml
index 362b770a2..d15a95839 100644
--- a/assets/resources/application/da.xml
+++ b/assets/resources/application/da.xml
@@ -100,7 +100,7 @@
-
+
@@ -161,7 +161,7 @@
-
+
@@ -798,7 +798,7 @@
-
+
diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml
index 82b405099..915cb2fc7 100644
--- a/assets/resources/application/de.xml
+++ b/assets/resources/application/de.xml
@@ -105,7 +105,7 @@
-
+
@@ -162,7 +162,7 @@
-
+
@@ -790,7 +790,7 @@
-
+
diff --git a/assets/resources/application/el.xml b/assets/resources/application/el.xml
index 9941a2308..f1e80fb20 100644
--- a/assets/resources/application/el.xml
+++ b/assets/resources/application/el.xml
@@ -100,7 +100,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
@@ -785,7 +785,7 @@
-
+
diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml
index bee3d8f8e..36121fe3c 100644
--- a/assets/resources/application/en.xml
+++ b/assets/resources/application/en.xml
@@ -100,7 +100,7 @@
-
+
@@ -161,7 +161,7 @@
-
+
@@ -787,7 +787,7 @@
-
+
diff --git a/assets/resources/application/es.xml b/assets/resources/application/es.xml
index d1433bb6b..d08aebccb 100644
--- a/assets/resources/application/es.xml
+++ b/assets/resources/application/es.xml
@@ -105,7 +105,7 @@
-
+
@@ -166,7 +166,7 @@
-
+
@@ -792,7 +792,7 @@
-
+
diff --git a/assets/resources/application/eu.xml b/assets/resources/application/eu.xml
index dd8bd4dc1..94d7dc71f 100644
--- a/assets/resources/application/eu.xml
+++ b/assets/resources/application/eu.xml
@@ -100,7 +100,7 @@
-
+
@@ -161,7 +161,7 @@
-
+
@@ -798,7 +798,7 @@
-
+
diff --git a/assets/resources/application/fa.xml b/assets/resources/application/fa.xml
index e32e8c1ff..faf5de0fb 100644
--- a/assets/resources/application/fa.xml
+++ b/assets/resources/application/fa.xml
@@ -100,7 +100,7 @@
-
+
@@ -161,7 +161,7 @@
-
+
@@ -787,7 +787,7 @@
-
+
diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml
index 2f1c2c2aa..81e580fe7 100644
--- a/assets/resources/application/fr.xml
+++ b/assets/resources/application/fr.xml
@@ -103,7 +103,7 @@
-
+
@@ -160,7 +160,7 @@
-
+
@@ -780,7 +780,7 @@
-
+
diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml
index e3bca2887..105d15128 100644
--- a/assets/resources/application/gl.xml
+++ b/assets/resources/application/gl.xml
@@ -100,7 +100,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
@@ -777,7 +777,7 @@
-
+
diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml
index 49e622808..e4cf8b20c 100644
--- a/assets/resources/application/hu.xml
+++ b/assets/resources/application/hu.xml
@@ -100,7 +100,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
@@ -777,7 +777,7 @@
-
+
diff --git a/assets/resources/application/hy.xml b/assets/resources/application/hy.xml
index ff2fd2367..eb26c851d 100644
--- a/assets/resources/application/hy.xml
+++ b/assets/resources/application/hy.xml
@@ -100,7 +100,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -792,7 +792,7 @@
-
+
diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml
index 245824533..ffb3d7462 100644
--- a/assets/resources/application/it.xml
+++ b/assets/resources/application/it.xml
@@ -101,7 +101,7 @@
-
+
@@ -158,7 +158,7 @@
-
+
@@ -778,7 +778,7 @@
-
+
diff --git a/assets/resources/application/ka.xml b/assets/resources/application/ka.xml
index 8d2cb7337..9b690b10c 100644
--- a/assets/resources/application/ka.xml
+++ b/assets/resources/application/ka.xml
@@ -100,7 +100,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -792,7 +792,7 @@
-
+
diff --git a/assets/resources/application/nb.xml b/assets/resources/application/nb.xml
index 8140f61c9..79fb040e3 100644
--- a/assets/resources/application/nb.xml
+++ b/assets/resources/application/nb.xml
@@ -100,7 +100,7 @@
-
+
@@ -161,7 +161,7 @@
-
+
@@ -787,7 +787,7 @@
-
+
diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml
index c9e2ec481..df3495050 100644
--- a/assets/resources/application/nl.xml
+++ b/assets/resources/application/nl.xml
@@ -100,7 +100,7 @@
-
+
@@ -161,7 +161,7 @@
-
+
@@ -787,7 +787,7 @@
-
+
diff --git a/assets/resources/application/pl.xml b/assets/resources/application/pl.xml
index fc347e0eb..99051e349 100644
--- a/assets/resources/application/pl.xml
+++ b/assets/resources/application/pl.xml
@@ -100,7 +100,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
@@ -777,7 +777,7 @@
-
+
diff --git a/assets/resources/application/pt.xml b/assets/resources/application/pt.xml
index 5a149cc82..109ad7fa1 100644
--- a/assets/resources/application/pt.xml
+++ b/assets/resources/application/pt.xml
@@ -100,7 +100,7 @@
-
+
@@ -163,7 +163,7 @@
-
+
@@ -789,7 +789,7 @@
-
+
diff --git a/assets/resources/application/ro.xml b/assets/resources/application/ro.xml
index b4a0dc128..4251d7dcd 100644
--- a/assets/resources/application/ro.xml
+++ b/assets/resources/application/ro.xml
@@ -100,7 +100,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
@@ -777,7 +777,7 @@
-
+
diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml
index d4d26c60b..c9141152c 100644
--- a/assets/resources/application/ru.xml
+++ b/assets/resources/application/ru.xml
@@ -100,7 +100,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -792,7 +792,7 @@
-
+
diff --git a/assets/resources/application/sr.xml b/assets/resources/application/sr.xml
index c60cb1ab8..b8f377886 100644
--- a/assets/resources/application/sr.xml
+++ b/assets/resources/application/sr.xml
@@ -100,7 +100,7 @@
-
+
@@ -161,7 +161,7 @@
-
+
@@ -787,7 +787,7 @@
-
+
diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml
index e6adf7d85..061a5dfb9 100644
--- a/assets/resources/application/th.xml
+++ b/assets/resources/application/th.xml
@@ -100,7 +100,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
@@ -777,7 +777,7 @@
-
+
diff --git a/assets/resources/application/tr.xml b/assets/resources/application/tr.xml
index 4f4e08049..04715f9cf 100644
--- a/assets/resources/application/tr.xml
+++ b/assets/resources/application/tr.xml
@@ -100,7 +100,7 @@
-
+
@@ -161,7 +161,7 @@
-
+
@@ -787,7 +787,7 @@
-
+
diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml
index 243522243..907d2451c 100644
--- a/assets/resources/application/uk.xml
+++ b/assets/resources/application/uk.xml
@@ -100,7 +100,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
@@ -777,7 +777,7 @@
-
+
diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml
index b0ad4ee08..5937b729d 100644
--- a/assets/resources/application/vi.xml
+++ b/assets/resources/application/vi.xml
@@ -100,7 +100,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
@@ -777,7 +777,7 @@
-
+
diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml
index b484c1442..3bcd2c120 100644
--- a/assets/resources/application/zh.xml
+++ b/assets/resources/application/zh.xml
@@ -100,7 +100,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
@@ -777,7 +777,7 @@
-
+
diff --git a/assets/resources/application/zh_TW.xml b/assets/resources/application/zh_TW.xml
index 0978b05cd..a6d5a888a 100644
--- a/assets/resources/application/zh_TW.xml
+++ b/assets/resources/application/zh_TW.xml
@@ -100,7 +100,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
@@ -777,7 +777,7 @@
-
+
diff --git a/src/org/geometerplus/android/fbreader/network/AuthorizationMenuActivity.java b/src/org/geometerplus/android/fbreader/network/AuthorisationMenuActivity.java
similarity index 84%
rename from src/org/geometerplus/android/fbreader/network/AuthorizationMenuActivity.java
rename to src/org/geometerplus/android/fbreader/network/AuthorisationMenuActivity.java
index 6f8488ab9..fb09b3019 100644
--- a/src/org/geometerplus/android/fbreader/network/AuthorizationMenuActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/AuthorisationMenuActivity.java
@@ -32,16 +32,16 @@ import org.geometerplus.android.util.PackageUtil;
import org.geometerplus.android.fbreader.api.PluginApi;
-public class AuthorizationMenuActivity extends MenuActivity {
+public class AuthorisationMenuActivity extends MenuActivity {
public static void runMenu(Context context, INetworkLink link) {
context.startActivity(
- Util.intentByLink(new Intent(context, AuthorizationMenuActivity.class), link)
+ Util.intentByLink(new Intent(context, AuthorisationMenuActivity.class), link)
);
}
public static void runMenu(Activity activity, INetworkLink link, int code) {
activity.startActivityForResult(
- Util.intentByLink(new Intent(activity, AuthorizationMenuActivity.class), link), code
+ Util.intentByLink(new Intent(activity, AuthorisationMenuActivity.class), link), code
);
}
@@ -49,7 +49,7 @@ public class AuthorizationMenuActivity extends MenuActivity {
@Override
protected void init() {
- setTitle(NetworkLibrary.resource().getResource("authorizationMenuTitle").getValue());
+ setTitle(NetworkLibrary.resource().getResource("authorisationMenuTitle").getValue());
final String url = getIntent().getData().toString();
myLink = NetworkLibrary.Instance().getLinkByUrl(url);
@@ -72,10 +72,10 @@ public class AuthorizationMenuActivity extends MenuActivity {
try {
final NetworkAuthenticationManager mgr = myLink.authenticationManager();
if (info.getId().toString().endsWith("/signIn")) {
- Util.runAuthenticationDialog(AuthorizationMenuActivity.this, myLink, null);
+ Util.runAuthenticationDialog(AuthorisationMenuActivity.this, myLink, null);
} else {
- final Intent intent = Util.authorizationIntent(myLink, info.getId());
- if (PackageUtil.canBeStarted(AuthorizationMenuActivity.this, intent, true)) {
+ final Intent intent = Util.authorisationIntent(myLink, info.getId());
+ if (PackageUtil.canBeStarted(AuthorisationMenuActivity.this, intent, true)) {
startActivity(intent);
}
}
diff --git a/src/org/geometerplus/android/fbreader/network/BuyBooksActivity.java b/src/org/geometerplus/android/fbreader/network/BuyBooksActivity.java
index f0a6307fa..4668b254b 100644
--- a/src/org/geometerplus/android/fbreader/network/BuyBooksActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/BuyBooksActivity.java
@@ -107,7 +107,7 @@ public class BuyBooksActivity extends Activity implements NetworkLibrary.ChangeL
try {
if (!mgr.isAuthorised(true)) {
findViewById(R.id.buy_book_buttons).setVisibility(View.GONE);
- AuthorizationMenuActivity.runMenu(this, myLink, 1);
+ AuthorisationMenuActivity.runMenu(this, myLink, 1);
}
} catch (ZLNetworkException e) {
}
@@ -121,7 +121,7 @@ public class BuyBooksActivity extends Activity implements NetworkLibrary.ChangeL
myAccount = mgr.currentAccount();
- setupUI(AuthorizationState.Authorized);
+ setupUI(AuthorisationState.Authorised);
NetworkLibrary.Instance().addChangeListener(this);
}
@@ -132,12 +132,12 @@ public class BuyBooksActivity extends Activity implements NetworkLibrary.ChangeL
super.onActivityResult(requestCode, resultCode, data);
}
- private static enum AuthorizationState {
- Authorized,
- NotAuthorized
+ private static enum AuthorisationState {
+ Authorised,
+ NotAuthorised
};
- private void setupUI(final AuthorizationState state) {
+ private void setupUI(final AuthorisationState state) {
runOnUiThread(new Runnable() {
public void run() {
setupUIInternal(state);
@@ -145,7 +145,7 @@ public class BuyBooksActivity extends Activity implements NetworkLibrary.ChangeL
});
}
- private void setupUIInternal(AuthorizationState state) {
+ private void setupUIInternal(AuthorisationState state) {
final ZLResource dialogResource = ZLResource.resource("dialog");
final ZLResource buttonResource = dialogResource.getResource("button");
@@ -163,13 +163,13 @@ public class BuyBooksActivity extends Activity implements NetworkLibrary.ChangeL
}
switch (state) {
- case NotAuthorized:
- textArea.setText(resource.getResource("notAuthorized").getValue());
- okButton.setText(buttonResource.getResource("authorize").getValue());
+ case NotAuthorised:
+ textArea.setText(resource.getResource("notAuthorised").getValue());
+ okButton.setText(buttonResource.getResource("authorise").getValue());
cancelButton.setText(buttonResource.getResource("cancel").getValue());
okButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
- AuthorizationMenuActivity.runMenu(BuyBooksActivity.this, myLink);
+ AuthorisationMenuActivity.runMenu(BuyBooksActivity.this, myLink);
}
});
cancelButton.setOnClickListener(new View.OnClickListener() {
@@ -178,7 +178,7 @@ public class BuyBooksActivity extends Activity implements NetworkLibrary.ChangeL
}
});
break;
- case Authorized:
+ case Authorised:
if (myAccount == null) {
textArea.setText(resource.getResource("noAccountInformation").getValue());
okButton.setText(buttonResource.getResource("refresh").getValue());
@@ -261,7 +261,7 @@ public class BuyBooksActivity extends Activity implements NetworkLibrary.ChangeL
@Override
protected void onResume() {
super.onResume();
- updateAuthorizationState();
+ updateAuthorisationState();
}
private Money calculateCost() {
@@ -312,7 +312,7 @@ public class BuyBooksActivity extends Activity implements NetworkLibrary.ChangeL
if (updated) {
runOnUiThread(new Runnable() {
public void run() {
- setupUI(AuthorizationState.Authorized);
+ setupUI(AuthorisationState.Authorised);
}
});
}
@@ -371,25 +371,25 @@ public class BuyBooksActivity extends Activity implements NetworkLibrary.ChangeL
public void onLibraryChanged(final NetworkLibrary.ChangeListener.Code code, final Object[] params) {
switch (code) {
case SignedIn:
- updateAuthorizationState();
+ updateAuthorisationState();
break;
}
}
- private void updateAuthorizationState() {
+ private void updateAuthorisationState() {
new Thread(new Runnable() {
public void run() {
final NetworkAuthenticationManager mgr = myLink.authenticationManager();
try {
if (mgr.isAuthorised(true)) {
- setupUI(AuthorizationState.Authorized);
+ setupUI(AuthorisationState.Authorised);
refreshAccountInformation();
} else {
- setupUI(AuthorizationState.NotAuthorized);
+ setupUI(AuthorisationState.NotAuthorised);
}
} catch (ZLNetworkException e) {
e.printStackTrace();
- setupUI(AuthorizationState.NotAuthorized);
+ setupUI(AuthorisationState.NotAuthorised);
}
}
}).start();
diff --git a/src/org/geometerplus/android/fbreader/network/Util.java b/src/org/geometerplus/android/fbreader/network/Util.java
index 05024bc64..4635d4eb8 100644
--- a/src/org/geometerplus/android/fbreader/network/Util.java
+++ b/src/org/geometerplus/android/fbreader/network/Util.java
@@ -71,7 +71,7 @@ public abstract class Util implements UserRegistrationConstants {
});
}
- static Intent authorizationIntent(INetworkLink link, Uri id) {
+ static Intent authorisationIntent(INetworkLink link, Uri id) {
final Intent intent = new Intent(AUTHORIZATION_ACTION, id);
intent.putExtra(CATALOG_URL, link.getUrl(UrlInfo.Type.Catalog));
intent.putExtra(SIGNIN_URL, link.getUrl(UrlInfo.Type.SignIn));
@@ -81,7 +81,7 @@ public abstract class Util implements UserRegistrationConstants {
}
private static Intent registrationIntent(INetworkLink link) {
- return authorizationIntent(link, Uri.parse(link.getUrl(UrlInfo.Type.Catalog) + "/register"));
+ return authorisationIntent(link, Uri.parse(link.getUrl(UrlInfo.Type.Catalog) + "/register"));
}
public static boolean isRegistrationSupported(Activity activity, INetworkLink link) {