diff --git a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java index ca3251ed..8205f9e9 100644 --- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java @@ -403,14 +403,14 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList .setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())) .setCancelable(true) .setIcon(R.drawable.ic_warning) - .setNegativeButton(getString(R.string.versionAlertDialogCopyNegative), new DialogInterface.OnClickListener() { + .setNegativeButton(getString(R.string.cancelButton), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); enableProcessButton(); } }) - .setPositiveButton(getString(R.string.versionAlertDialogCopyPositive), new DialogInterface.OnClickListener() { + .setPositiveButton(getString(R.string.textContinue), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index f0a3415d..a46c62d7 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -52,7 +52,7 @@ android:id="@+id/loginToken" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/loginViaToken" + android:text="@string/copyToken" android:textColor="@color/white"/> @@ -166,7 +166,7 @@ android:drawablePadding="10dp" android:textColor="@color/white" android:textColorHint="@color/colorAccent" - android:hint="@string/loginViaToken" + android:hint="@string/copyToken" android:inputType="text" android:visibility="gone" android:textColorHighlight="@color/white"/> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 43229b09..d7b393b9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -503,6 +503,8 @@ Location Max 255 characters All fields are required + Continue + Token Translate GitNex with Crowdin @@ -525,11 +527,8 @@ No Gitea detected! Version Alert Unsupported Version of Gitea - Cancel - Continue Username / Password - Token Choose your preferred login method to access your account. Token is more secure! Instance has returned an error - Unauthorized. Check your credentials and try again Please enter the correct token