diff --git a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java b/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java index 346a65e78..984e2869a 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java @@ -132,7 +132,7 @@ public class MainActivityEspressoTest { @Test public void bottomNavFlavorCheck() { - onView(withText(R.string.updates)).check(matches(isDisplayed())); + onView(withText(R.string.main_menu__updates)).check(matches(isDisplayed())); onView(withText(R.string.menu_settings)).check(matches(isDisplayed())); onView(withText("THIS SHOULD NOT SHOW UP ANYWHERE!!!")).check(doesNotExist()); @@ -170,9 +170,9 @@ public class MainActivityEspressoTest { @Test public void showUpdates() { - ViewInteraction updatesBottonNavButton = onView(allOf(withText(R.string.updates), isDisplayed())); + ViewInteraction updatesBottonNavButton = onView(allOf(withText(R.string.main_menu__updates), isDisplayed())); updatesBottonNavButton.perform(click()); - onView(withText(R.string.updates)).check(matches(isDisplayed())); + onView(withText(R.string.main_menu__updates)).check(matches(isDisplayed())); } @Test diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java index 26b506e99..d108c85e4 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java @@ -138,7 +138,8 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationB .setInActiveColor(R.color.bottom_nav_items) .setActiveColor(android.R.color.white) .setMode(BottomNavigationBar.MODE_FIXED) - .addItem(new BottomNavigationItem(R.drawable.ic_updates, R.string.updates).setBadgeItem(updatesBadge)) + .addItem(new BottomNavigationItem(R.drawable.ic_updates, R.string.main_menu__updates) + .setBadgeItem(updatesBadge)) .addItem(new BottomNavigationItem(R.drawable.ic_settings, R.string.menu_settings)) .setAnimationDuration(0) .initialise(); diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 65fe4f2f3..2385773f9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -6,7 +6,7 @@ Löschen NFC-Transfer aktivieren … Zwischengespeicherte Apps behalten - Aufgaben + Aktualisierungen Andere Automatisches Aktualisierungsintervall Aktualisierungsbenachrichtigung @@ -345,8 +345,7 @@ Neueste Kategorien - - + Aufgaben Tausch Version %1$s (Empfohlen) Neu diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f85b4273a..9a7869280 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -205,6 +205,7 @@ This often occurs with apps installed via Google Play or other sources, if they Latest Categories Nearby + Updates No recent apps found Once your list of apps has been updated, the latest apps should