mirror/AntennaPod
3
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-12-01 12:31:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
daniel oeh
2012-10-22 19:11:07 +02:00
parent d192652eed 61f0f47133
commit dbfd1fca26
9 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values-de/strings.xml
View File

@ -74,7 +74,6 @@
<string name="download_report_title">Download abgeschlossen</string>
<string name="download_error_malformed_url">Fehler in URL</string>
<string name="download_error_io_error">IO Error</string>
<string name="download_error_device_not_found">Speichermedium nicht gefunden</string>
<string name="download_error_request_error">Anfragefehler</string>
<string name="downloads_left">\u0020Downloads übrig</string>
<string name="download_notification_title">Lade Podcast-Daten</string>

1
res/values-ru/strings.xml
View File

@ -74,7 +74,6 @@
<string name="download_report_title">Закачки завершены</string>
<string name="download_error_malformed_url">Некорректная ссылка</string>
<string name="download_error_io_error">Ошибка ввода-вывода</string>
<string name="download_error_device_not_found">Устройство хранения не найдено</string>
<string name="download_error_request_error">Ошибка запроса</string>
<string name="downloads_left">\u0020закачек осталось</string>
<string name="download_notification_title">Получение данных подкаста</string>

3
res/values/strings.xml
View File

@ -81,7 +81,6 @@
<string name="download_report_title">Downloads completed</string>
<string name="download_error_malformed_url">Malformed URL</string>
<string name="download_error_io_error">IO Error</string>
<string name="download_error_device_not_found">External storage unavailable</string>
<string name="download_error_request_error">Request error</string>
<string name="downloads_left">\u0020Downloads left</string>
<string name="download_notification_title">Downloading podcast data</string>
@ -214,4 +213,4 @@
<string name="add_feed_label">Add feed</string>
<string name="miro_feed_added">Feed is being added</string>
</resources>
</resources>

4
src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java
View File

@ -26,8 +26,8 @@ import de.danoeh.antennapod.adapter.MiroGuideItemlistAdapter;
import de.danoeh.antennapod.dialog.DownloadRequestErrorDialogCreator;
import de.danoeh.antennapod.feed.Feed;
import de.danoeh.antennapod.feed.FeedManager;
import de.danoeh.antennapod.miroguide.con.MiroGuideException;
import de.danoeh.antennapod.miroguide.con.MiroGuideService;
import de.danoeh.antennapod.miroguide.conn.MiroGuideException;
import de.danoeh.antennapod.miroguide.conn.MiroGuideService;
import de.danoeh.antennapod.miroguide.model.MiroGuideChannel;
import de.danoeh.antennapod.storage.DownloadRequestException;
import de.danoeh.antennapod.storage.DownloadRequester;

4
src/de/danoeh/antennapod/activity/MiroGuideMainActivity.java
View File

@ -16,8 +16,8 @@ import com.actionbarsherlock.view.MenuItem;
import de.danoeh.antennapod.AppConfig;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.miroguide.con.MiroGuideException;
import de.danoeh.antennapod.miroguide.con.MiroGuideService;
import de.danoeh.antennapod.miroguide.conn.MiroGuideException;
import de.danoeh.antennapod.miroguide.conn.MiroGuideService;
/**
* Shows a list of available categories and offers a search button. If the user

4
src/de/danoeh/antennapod/fragment/MiroGuideChannellistFragment.java
View File

@ -23,8 +23,8 @@ import de.danoeh.antennapod.AppConfig;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.MiroGuideChannelViewActivity;
import de.danoeh.antennapod.adapter.MiroGuideChannelListAdapter;
import de.danoeh.antennapod.miroguide.con.MiroGuideException;
import de.danoeh.antennapod.miroguide.con.MiroGuideService;
import de.danoeh.antennapod.miroguide.conn.MiroGuideException;
import de.danoeh.antennapod.miroguide.conn.MiroGuideService;
import de.danoeh.antennapod.miroguide.model.MiroGuideChannel;
/**

2
src/de/danoeh/antennapod/miroguide/con/MiroGuideConnector.java → src/de/danoeh/antennapod/miroguide/conn/MiroGuideConnector.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.miroguide.con;
package de.danoeh.antennapod.miroguide.conn;
import java.io.BufferedReader;
import java.io.IOException;

2
src/de/danoeh/antennapod/miroguide/con/MiroGuideException.java → src/de/danoeh/antennapod/miroguide/conn/MiroGuideException.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.miroguide.con;
package de.danoeh.antennapod.miroguide.conn;
public class MiroGuideException extends Exception {
private static final long serialVersionUID = -8834656185748713194L;

2
src/de/danoeh/antennapod/miroguide/con/MiroGuideService.java → src/de/danoeh/antennapod/miroguide/conn/MiroGuideService.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.miroguide.con;
package de.danoeh.antennapod.miroguide.conn;
import java.text.ParseException;
import java.text.SimpleDateFormat;