msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Updated text

Browse Source
pull/162/head
M66B 6 years ago
parent 35341ad0f7
commit 11712cc15f
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/java/eu/faircode/email/AdapterAccount.java
Unescape View File

@ -213,7 +213,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
popupMenu.getMenu().add(Menu.NONE, 0, 0, account.name).setEnabled(false); popupMenu.getMenu().add(Menu.NONE, 0, 0, account.name).setEnabled(false);
popupMenu.getMenu().add(Menu.NONE, R.string.title_synchronize_enabled, 1, R.string.title_synchronize_enabled) popupMenu.getMenu().add(Menu.NONE, R.string.title_enabled, 1, R.string.title_enabled)
.setCheckable(true).setChecked(account.synchronize); .setCheckable(true).setChecked(account.synchronize);
if (account.notify && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (account.notify && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@ -231,7 +231,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
@Override @Override
public boolean onMenuItemClick(MenuItem item) { public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.string.title_synchronize_enabled: case R.string.title_enabled:
onActionSync(!item.isChecked()); onActionSync(!item.isChecked());
return true; return true;

4
app/src/main/java/eu/faircode/email/AdapterIdentity.java
Unescape View File

@ -164,7 +164,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
popupMenu.getMenu().add(Menu.NONE, 0, 0, identity.email).setEnabled(false); popupMenu.getMenu().add(Menu.NONE, 0, 0, identity.email).setEnabled(false);
popupMenu.getMenu().add(Menu.NONE, R.string.title_synchronize_enabled, 1, R.string.title_synchronize_enabled) popupMenu.getMenu().add(Menu.NONE, R.string.title_enabled, 1, R.string.title_enabled)
.setCheckable(true).setChecked(identity.synchronize); .setCheckable(true).setChecked(identity.synchronize);
popupMenu.getMenu().add(Menu.NONE, R.string.title_copy, 2, R.string.title_copy); popupMenu.getMenu().add(Menu.NONE, R.string.title_copy, 2, R.string.title_copy);
@ -173,7 +173,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
@Override @Override
public boolean onMenuItemClick(MenuItem item) { public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.string.title_synchronize_enabled: case R.string.title_enabled:
onActionSync(!item.isChecked()); onActionSync(!item.isChecked());
return true; return true;

2
app/src/main/res/layout/fragment_account.xml
Unescape View File

@ -411,7 +411,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@string/title_synchronize_account" android:text="@string/title_enabled"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnAdvanced" /> app:layout_constraintTop_toBottomOf="@id/btnAdvanced" />

2
app/src/main/res/layout/fragment_identity.xml
Unescape View File

@ -480,7 +480,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@string/title_synchronize_identity" android:text="@string/title_enabled"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvUseIpHint" /> app:layout_constraintTop_toBottomOf="@id/tvUseIpHint" />

3
app/src/main/res/values/strings.xml
Unescape View File

@ -381,8 +381,6 @@
<string name="title_password">Password</string> <string name="title_password">Password</string>
<string name="title_realm">Realm</string> <string name="title_realm">Realm</string>
<string name="title_use_ip">Use local IP address instead of host name</string> <string name="title_use_ip">Use local IP address instead of host name</string>
<string name="title_synchronize_account">Synchronize (receive messages)</string>
<string name="title_synchronize_identity">Synchronize (send messages)</string>
<string name="title_primary_account">Primary (default account)</string> <string name="title_primary_account">Primary (default account)</string>
<string name="title_primary_identity">Primary (default identity)</string> <string name="title_primary_identity">Primary (default identity)</string>
<string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string> <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
@ -804,6 +802,7 @@
<string name="title_report">Report</string> <string name="title_report">Report</string>
<string name="title_fix">Fix</string> <string name="title_fix">Fix</string>
<string name="title_enable">Enable</string> <string name="title_enable">Enable</string>
<string name="title_enabled">Enabled</string>
<string name="title_executing">Executing</string> <string name="title_executing">Executing</string>
<string name="title_completed">Completed</string> <string name="title_completed">Completed</string>
<string name="title_ask_what">Ask what to do</string> <string name="title_ask_what">Ask what to do</string>

Write Preview
Loading…
Cancel
Save