updating strings xml for share dialog and share podcast

3 files changed, 7 insertions, 13 deletions

diff --git a/app/src/androidTest/java/de/test/antennapod/dialogs/ShareDialogTest.java b/app/src/androidTest/java/de/test/antennapod/dialogs/ShareDialogTest.java
index 6cecd2180..1aecfb8db 100644
--- a/app/src/androidTest/java/de/test/antennapod/dialogs/ShareDialogTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/dialogs/ShareDialogTest.java
@@ -4,8 +4,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.view.View;
 
+import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
+import org.hamcrest.TypeSafeMatcher;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -84,13 +86,6 @@ public class ShareDialogTest {
     }
 
     @Test
-    public void testShareDialogShareButton() throws InterruptedException {
-        onView(withText(R.string.share_label)).perform(scrollTo()).perform(click());
-        onView(allOf(isDisplayed(), withText(R.string.share_label)));
-        onView(withText(R.string.share_episode_positive_label_button)).perform(scrollTo()).perform(click());
-    }
-
-    @Test
     public void testShareDialogCancelButton() {
         onView(withText(R.string.share_label)).perform(scrollTo()).perform(click());
         onView(withText(R.string.cancel_label)).check(matches(isDisplayed())).perform(scrollTo()).perform(click());
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java
index 7e3fe91d0..af602fbf2 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java
@@ -59,7 +59,7 @@ public class ShareDialog extends DialogFragment {
         setupOptions();
 
         builder
-                .setPositiveButton(R.string.share_episode_positive_label_button, new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.share_label, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int id) {
                         if (radioEpisodeWebsite.isChecked()) {
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index a06a8aa8c..060e02c25 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -136,12 +136,12 @@
     <string name="feed_settings_label">Podcast settings</string>
     <string name="rename_feed_label">Rename podcast</string>
     <string name="remove_feed_label">Remove podcast</string>
-    <string name="share_label">Share&#8230;</string>
+    <string name="share_label">Share</string>
     <string name="share_link_label">Share Episode URL</string>
     <string name="share_link_with_position_label">Share Episode URL with Position</string>
     <string name="share_file_label">Share File</string>
-    <string name="share_website_url_label">Share Website URL</string>
-    <string name="share_feed_url_label">Share Podcast URL</string>
+    <string name="share_website_url_label">Website address</string>
+    <string name="share_feed_url_label">Podcast feed URL</string>
     <string name="share_item_url_label">Share Media File URL</string>
     <string name="share_item_url_with_position_label">Share Media File URL with Position</string>
     <string name="feed_delete_confirmation_msg">Please confirm that you want to delete the podcast \"%1$s\" and ALL its episodes (including downloaded episodes).</string>
@@ -766,11 +766,10 @@
     <string name="rating_now_label">Sure, let\'s do this!</string>
 
     <!-- Share episode dialog -->
-    <string name="share_episode_positive_label_button">Share</string>
     <string name="share_dialog_include_label">Include:</string>
     <string name="share_playback_position_dialog_label">Playback position</string>
     <string name="share_dialog_media_file_label">Media file URL</string>
-    <string name="share_dialog_episode_website_label">Episode website</string>
+    <string name="share_dialog_episode_website_label">Episode webpage</string>
 
     <!-- Audio controls -->
     <string name="audio_controls">Audio controls</string>