Mastodon/Shitter-android-app
1
0
Fork 0
mirror of https://github.com/nuclearfog/Shitter.git synced 2025-01-30 19:05:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

renamed strings, layout fix

Browse Source
This commit is contained in:
nuclearfog 2020-04-15 12:33:02 +02:00
parent 8472bab662
commit d52bc3453f
No known key found for this signature in database
GPG Key ID: ED35E22099354A64
32 changed files with 207 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java
View File

@ -201,7 +201,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
if (intent.resolveActivity(getPackageManager()) != null)
startActivity(intent);
else
Toast.makeText(this, R.string.connection_failed, LENGTH_SHORT).show();
Toast.makeText(this, R.string.error_connection, LENGTH_SHORT).show();
}
return super.onOptionsItemSelected(item);
}
@ -212,9 +212,9 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
switch (v.getId()) {
case R.id.delete_db:
new Builder(this, R.style.InfoDialog)
.setMessage(R.string.delete_database_popup)
.setNegativeButton(R.string.no_confirm, null)
.setPositiveButton(R.string.yes_confirm, new DialogInterface.OnClickListener() {
.setMessage(R.string.confirm_delete_database)
.setNegativeButton(R.string.confirm_no, null)
.setPositiveButton(R.string.confirm_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
DatabaseAdapter.deleteDatabase(getApplicationContext());
@ -227,8 +227,8 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
case R.id.logout:
new Builder(this, R.style.InfoDialog)
.setMessage(R.string.confirm_log_lout)
.setNegativeButton(R.string.no_confirm, null)
.setPositiveButton(R.string.yes_confirm, new DialogInterface.OnClickListener() {
.setNegativeButton(R.string.confirm_no, null)
.setPositiveButton(R.string.confirm_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
settings.logout();

4
app/src/main/java/org/nuclearfog/twidda/activity/LoginPage.java
View File

@ -120,7 +120,7 @@ public class LoginPage extends AppCompatActivity implements OnClickListener {
registerAsync = new Registration(this);
registerAsync.execute(twitterPin);
} else {
Toast.makeText(this, R.string.enter_pin, LENGTH_LONG).show();
Toast.makeText(this, R.string.error_enter_pin, LENGTH_LONG).show();
}
}
break;
@ -134,6 +134,6 @@ public class LoginPage extends AppCompatActivity implements OnClickListener {
if (loginIntent.resolveActivity(getPackageManager()) != null)
startActivity(loginIntent);
else
Toast.makeText(this, R.string.connection_failed, LENGTH_SHORT).show();
Toast.makeText(this, R.string.error_connection, LENGTH_SHORT).show();
}
}

4
app/src/main/java/org/nuclearfog/twidda/activity/MediaViewer.java
View File

@ -248,9 +248,9 @@ public class MediaViewer extends AppCompatActivity implements OnImageClickListen
String name = "shitter_" + formatter.format(new Date());
try {
MediaStore.Images.Media.insertImage(getContentResolver(), image, name, "");
Toast.makeText(this, R.string.image_saved, Toast.LENGTH_LONG).show();
Toast.makeText(this, R.string.info_image_saved, Toast.LENGTH_LONG).show();
} catch (Exception err) {
Toast.makeText(this, R.string.image_store_failure, Toast.LENGTH_SHORT).show();
Toast.makeText(this, R.string.error_image_save, Toast.LENGTH_SHORT).show();
}
}
}

6
app/src/main/java/org/nuclearfog/twidda/activity/MessagePopup.java
View File

@ -77,9 +77,9 @@ public class MessagePopup extends AppCompatActivity implements OnClickListener {
super.onBackPressed();
} else {
Builder closeDialog = new Builder(this, R.style.InfoDialog);
closeDialog.setMessage(R.string.cancel_message);
closeDialog.setNegativeButton(R.string.no_confirm, null);
closeDialog.setPositiveButton(R.string.yes_confirm, new DialogInterface.OnClickListener() {
closeDialog.setMessage(R.string.confirm_cancel_message);
closeDialog.setNegativeButton(R.string.confirm_no, null);
closeDialog.setPositiveButton(R.string.confirm_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
finish();

8
app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
View File

@ -101,9 +101,9 @@ public class ProfileEditor extends AppCompatActivity implements OnClickListener
@Override
public void onBackPressed() {
Builder closeDialog = new Builder(this, R.style.InfoDialog);
closeDialog.setMessage(R.string.exit_confirm);
closeDialog.setNegativeButton(R.string.no_confirm, null);
closeDialog.setPositiveButton(R.string.yes_confirm, new DialogInterface.OnClickListener() {
closeDialog.setMessage(R.string.confirm_discard);
closeDialog.setNegativeButton(R.string.confirm_no, null);
closeDialog.setPositiveButton(R.string.confirm_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
finish();
@ -130,7 +130,7 @@ public class ProfileEditor extends AppCompatActivity implements OnClickListener
String userBio = bio.getText().toString();
String imgLink = txtImg.getText().toString();
if (username.trim().isEmpty()) {
Toast.makeText(this, R.string.edit_empty_name, LENGTH_SHORT).show();
Toast.makeText(this, R.string.error_empty_name, LENGTH_SHORT).show();
} else {
UserHolder userHolder = new UserHolder(username, userLink, userLoc, userBio, imgLink);
editorAsync = new ProfileUpdater(this, userHolder);

2
app/src/main/java/org/nuclearfog/twidda/activity/SearchPage.java
View File

@ -169,7 +169,7 @@ public class SearchPage extends AppCompatActivity implements OnTabSelectedListen
}
}
if (search.isEmpty() || !settings.getLogin()) {
Toast.makeText(this, R.string.failed_open_link, LENGTH_SHORT).show();
Toast.makeText(this, R.string.error_open_link, LENGTH_SHORT).show();
Intent intent = new Intent(this, MainActivity.class);
startActivity(intent);
finish();

18
app/src/main/java/org/nuclearfog/twidda/activity/TweetDetail.java
View File

@ -185,15 +185,15 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
switch (item.getItemId()) {
case R.id.delete_tweet:
Builder deleteDialog = new Builder(this, R.style.InfoDialog);
deleteDialog.setMessage(R.string.delete_tweet);
deleteDialog.setPositiveButton(R.string.yes_confirm, new DialogInterface.OnClickListener() {
deleteDialog.setMessage(R.string.confirm_delete_tweet);
deleteDialog.setPositiveButton(R.string.confirm_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
statusAsync = new StatusLoader(TweetDetail.this, Action.DELETE);
statusAsync.execute(tweetID);
}
});
deleteDialog.setNegativeButton(R.string.no_confirm, null);
deleteDialog.setNegativeButton(R.string.confirm_no, null);
deleteDialog.show();
break;
@ -203,7 +203,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
if (intent.resolveActivity(getPackageManager()) != null)
startActivity(intent);
else
Toast.makeText(this, R.string.connection_failed, LENGTH_SHORT).show();
Toast.makeText(this, R.string.error_connection, LENGTH_SHORT).show();
break;
case R.id.link_copy:
@ -212,7 +212,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
if (clip != null) {
ClipData linkClip = ClipData.newPlainText("tweet link", tweetLink);
clip.setPrimaryClip(linkClip);
Toast.makeText(this, R.string.copied_to_clipboard, LENGTH_SHORT).show();
Toast.makeText(this, R.string.info_clipboard, LENGTH_SHORT).show();
} else {
Toast.makeText(this, R.string.error_cant_copy_clipboard, LENGTH_SHORT).show();
}
@ -310,13 +310,13 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
case R.id.tweet_retweet:
statusAsync = new StatusLoader(this, Action.RETWEET);
statusAsync.execute(tweetID);
Toast.makeText(this, R.string.loading, LENGTH_SHORT).show();
Toast.makeText(this, R.string.info_loading, LENGTH_SHORT).show();
return true;
case R.id.tweet_favorit:
statusAsync = new StatusLoader(this, Action.FAVORITE);
statusAsync.execute(tweetID);
Toast.makeText(this, R.string.loading, LENGTH_SHORT).show();
Toast.makeText(this, R.string.info_loading, LENGTH_SHORT).show();
return true;
}
}
@ -380,7 +380,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
tweetDate.setText(SimpleDateFormat.getDateTimeInstance().format(tweet.getTime()));
favButton.setText(buttonNumber.format(tweet.getFavorCount()));
rtwButton.setText(buttonNumber.format(tweet.getRetweetCount()));
tweet_api.setText(R.string.sent_from);
tweet_api.setText(R.string.tweet_sent_from);
tweet_api.append(tweet.getSource());
if (header.getVisibility() != VISIBLE) {
@ -445,7 +445,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
path = path.substring(0, end);
tweetID = Long.parseLong(path);
} else {
Toast.makeText(this, R.string.failed_open_link, LENGTH_SHORT).show();
Toast.makeText(this, R.string.error_open_link, LENGTH_SHORT).show();
Intent intent = new Intent(this, MainActivity.class);
startActivity(intent);
finish();

12
app/src/main/java/org/nuclearfog/twidda/activity/TweetPopup.java
View File

@ -212,7 +212,7 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
case R.id.tweet_send:
String tweetStr = tweetText.getText().toString();
if (tweetStr.trim().isEmpty() && mediaPath.isEmpty()) {
Toast.makeText(this, R.string.empty_tweet, LENGTH_SHORT).show();
Toast.makeText(this, R.string.error_empty_tweet, LENGTH_SHORT).show();
} else if (locationProg.getVisibility() == INVISIBLE) {
TweetHolder tweet = new TweetHolder(tweetStr, inReplyId);
if (!mediaPath.isEmpty())
@ -296,15 +296,15 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
*/
public void showErrorMsg(final TweetHolder tweet) {
AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.InfoDialog);
builder.setTitle(R.string.error).setMessage(R.string.error_sending_tweet)
.setPositiveButton(R.string.retry, new DialogInterface.OnClickListener() {
builder.setTitle(R.string.info_error).setMessage(R.string.error_sending_tweet)
.setPositiveButton(R.string.confirm_retry, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
uploaderAsync = new StatusUploader(TweetPopup.this, tweet);
uploaderAsync.execute();
}
})
.setNegativeButton(R.string.cancel, null).show();
.setNegativeButton(android.R.string.cancel, null).show();
}
@ -315,8 +315,8 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
if (!addition.equals(tweetText.getText().toString()) || !mediaPath.isEmpty()) {
Builder closeDialog = new Builder(this, R.style.InfoDialog);
closeDialog.setMessage(R.string.confirm_cancel_tweet);
closeDialog.setNegativeButton(R.string.no_confirm, null);
closeDialog.setPositiveButton(R.string.yes_confirm, new DialogInterface.OnClickListener() {
closeDialog.setNegativeButton(R.string.confirm_no, null);
closeDialog.setPositiveButton(R.string.confirm_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
finish();

24
app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java
View File

@ -136,6 +136,8 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
favorTabTxt.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.favorite_profile, 0, 0);
tweetTabTxt.setGravity(CENTER);
favorTabTxt.setGravity(CENTER);
tweetTabTxt.setSingleLine();
favorTabTxt.setSingleLine();
tweetTabTxt.setTextSize(10);
favorTabTxt.setTextSize(10);
tweetTabTxt.setTypeface(settings.getFontFace());
@ -228,16 +230,16 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
MenuItem followIcon = m.findItem(R.id.profile_follow);
MenuItem listItem = m.findItem(R.id.profile_lists);
followIcon.setIcon(R.drawable.follow_enabled);
followIcon.setTitle(R.string.unfollow);
followIcon.setTitle(R.string.user_unfollow);
listItem.setVisible(true);
}
if (properties.isBlocked()) {
MenuItem blockIcon = m.findItem(R.id.profile_block);
blockIcon.setTitle(R.string.unblock);
blockIcon.setTitle(R.string.user_unblock);
}
if (properties.isMuted()) {
MenuItem muteIcon = m.findItem(R.id.profile_mute);
muteIcon.setTitle(R.string.unmute);
muteIcon.setTitle(R.string.user_unmute);
}
if (properties.canDm()) {
MenuItem dmIcon = m.findItem(R.id.profile_message);
@ -277,8 +279,8 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
profileAsync.execute(userId);
} else {
new Builder(this).setMessage(R.string.confirm_unfollow)
.setNegativeButton(R.string.no_confirm, null)
.setPositiveButton(R.string.yes_confirm, new DialogInterface.OnClickListener() {
.setNegativeButton(R.string.confirm_no, null)
.setPositiveButton(R.string.confirm_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
profileAsync.execute(userId);
@ -295,8 +297,8 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
profileAsync.execute(userId);
} else {
new Builder(this).setMessage(R.string.confirm_mute)
.setNegativeButton(R.string.no_confirm, null)
.setPositiveButton(R.string.yes_confirm, new DialogInterface.OnClickListener() {
.setNegativeButton(R.string.confirm_no, null)
.setPositiveButton(R.string.confirm_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
profileAsync.execute(userId);
@ -313,8 +315,8 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
profileAsync.execute(userId);
} else {
new Builder(this).setMessage(R.string.confirm_block)
.setNegativeButton(R.string.no_confirm, null)
.setPositiveButton(R.string.yes_confirm, new DialogInterface.OnClickListener() {
.setNegativeButton(R.string.confirm_no, null)
.setPositiveButton(R.string.confirm_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
profileAsync.execute(userId);
@ -377,7 +379,7 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
if (intent.resolveActivity(getPackageManager()) != null)
startActivity(intent);
else
Toast.makeText(this, R.string.connection_failed, LENGTH_SHORT).show();
Toast.makeText(this, R.string.error_connection, LENGTH_SHORT).show();
}
}
@ -414,7 +416,7 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
if (browserIntent.resolveActivity(getPackageManager()) != null)
startActivity(browserIntent);
else
Toast.makeText(this, R.string.connection_failed, LENGTH_SHORT).show();
Toast.makeText(this, R.string.error_connection, LENGTH_SHORT).show();
}
break;

4
app/src/main/java/org/nuclearfog/twidda/adapter/ListAdapter.java
View File

@ -164,9 +164,9 @@ public class ListAdapter extends Adapter<ListAdapter.ListHolder> {
if (settings.getImageLoad())
Picasso.get().load(owner.getImageLink() + "_mini").into(vh.pb_image);
if (item.isFollowing())
vh.followList.setText(R.string.unfollow);
vh.followList.setText(R.string.user_unfollow);
else
vh.followList.setText(R.string.follow);
vh.followList.setText(R.string.user_follow);
if (item.isListOwner()) {
vh.followList.setVisibility(VISIBLE);
vh.deleteList.setVisibility(GONE);

2
app/src/main/java/org/nuclearfog/twidda/backend/ImageLoader.java
View File

@ -92,7 +92,7 @@ public class ImageLoader extends AsyncTask<String, Bitmap, Boolean> {
if (success) {
imageAdapter.disableLoading();
} else {
Toast.makeText(ui.get(), R.string.image_download_fail, Toast.LENGTH_SHORT).show();
Toast.makeText(ui.get(), R.string.error_image_download, Toast.LENGTH_SHORT).show();
ui.get().finish();
}
}

2
app/src/main/java/org/nuclearfog/twidda/backend/ListLoader.java
View File

@ -83,7 +83,7 @@ public class ListLoader extends AsyncTask<Long, Void, List<TwitterList>> {
TwitterList list = result.get(0);
adapter.updateItem(list);
if (list.isFollowing())
Toast.makeText(ui.get().getContext(), R.string.followed, LENGTH_SHORT).show();
Toast.makeText(ui.get().getContext(), R.string.info_followed, LENGTH_SHORT).show();
else
Toast.makeText(ui.get().getContext(), R.string.info_unfollowed, LENGTH_SHORT).show();
break;

4
app/src/main/java/org/nuclearfog/twidda/backend/MessageUploader.java
View File

@ -64,7 +64,7 @@ public class MessageUploader extends AsyncTask<Void, Void, Boolean> {
@Override
public void onDismiss(DialogInterface dialog) {
if (getStatus() == Status.RUNNING) {
Toast.makeText(ui.get(), R.string.abort, Toast.LENGTH_SHORT).show();
Toast.makeText(ui.get(), android.R.string.cancel, Toast.LENGTH_SHORT).show();
cancel(true);
}
}
@ -93,7 +93,7 @@ public class MessageUploader extends AsyncTask<Void, Void, Boolean> {
protected void onPostExecute(Boolean success) {
if (ui.get() != null && popup.get() != null) {
if (success) {
Toast.makeText(ui.get(), R.string.dmsend, Toast.LENGTH_SHORT).show();
Toast.makeText(ui.get(), R.string.info_dm_send, Toast.LENGTH_SHORT).show();
ui.get().finish();
} else {
if (twException != null)

10
app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java
View File

@ -125,21 +125,21 @@ public class ProfileLoader extends AsyncTask<Long, TwitterUser, UserProperties>
switch (action) {
case ACTION_FOLLOW:
if (properties.isFriend())
Toast.makeText(ui.get(), R.string.followed, Toast.LENGTH_SHORT).show();
Toast.makeText(ui.get(), R.string.info_followed, Toast.LENGTH_SHORT).show();
break;
case ACTION_BLOCK:
if (properties.isBlocked())
Toast.makeText(ui.get(), R.string.blocked, Toast.LENGTH_SHORT).show();
Toast.makeText(ui.get(), R.string.info_user_blocked, Toast.LENGTH_SHORT).show();
else
Toast.makeText(ui.get(), R.string.unblocked, Toast.LENGTH_SHORT).show();
Toast.makeText(ui.get(), R.string.info_user_unblocked, Toast.LENGTH_SHORT).show();
break;
case ACTION_MUTE:
if (properties.isMuted())
Toast.makeText(ui.get(), R.string.muted, Toast.LENGTH_SHORT).show();
Toast.makeText(ui.get(), R.string.info_user_muted, Toast.LENGTH_SHORT).show();
else
Toast.makeText(ui.get(), R.string.unmuted, Toast.LENGTH_SHORT).show();
Toast.makeText(ui.get(), R.string.info_user_unmuted, Toast.LENGTH_SHORT).show();
break;
}
}

2
app/src/main/java/org/nuclearfog/twidda/backend/ProfileUpdater.java
View File

@ -108,7 +108,7 @@ public class ProfileUpdater extends AsyncTask<Void, Void, TwitterUser> {
} else if (user != null) {
ui.get().setUser(user);
} else if (userHolder != null) {
Toast.makeText(ui.get(), R.string.profile_updated, Toast.LENGTH_SHORT).show();
Toast.makeText(ui.get(), R.string.info_profile_updated, Toast.LENGTH_SHORT).show();
ui.get().setResult(RETURN_PROFILE_CHANGED);
ui.get().finish();
}

2
app/src/main/java/org/nuclearfog/twidda/backend/Registration.java
View File

@ -63,7 +63,7 @@ public class Registration extends AsyncTask<String, Void, String> {
} else if (twException != null) {
Toast.makeText(ui.get(), twException.getMessageResource(), LENGTH_SHORT).show();
} else {
Toast.makeText(ui.get(), R.string.pin_verification_failed, Toast.LENGTH_SHORT).show();
Toast.makeText(ui.get(), R.string.error_pin_verification, Toast.LENGTH_SHORT).show();
}
}
}

10
app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
View File

@ -113,20 +113,20 @@ public class StatusLoader extends AsyncTask<Long, Tweet, Tweet> {
switch (action) {
case RETWEET:
if (tweet.retweeted())
Toast.makeText(ui.get(), R.string.tweet_retweeted, LENGTH_SHORT).show();
Toast.makeText(ui.get(), R.string.info_tweet_retweeted, LENGTH_SHORT).show();
else
Toast.makeText(ui.get(), R.string.tweet_unretweeted, LENGTH_SHORT).show();
Toast.makeText(ui.get(), R.string.info_tweet_unretweeted, LENGTH_SHORT).show();
break;
case FAVORITE:
if (tweet.favored())
Toast.makeText(ui.get(), R.string.tweet_favored, LENGTH_SHORT).show();
Toast.makeText(ui.get(), R.string.info_tweet_favored, LENGTH_SHORT).show();
else
Toast.makeText(ui.get(), R.string.tweet_unfavored, LENGTH_SHORT).show();
Toast.makeText(ui.get(), R.string.info_tweet_unfavored, LENGTH_SHORT).show();
break;
case DELETE:
Toast.makeText(ui.get(), R.string.tweet_removed, LENGTH_SHORT).show();
Toast.makeText(ui.get(), R.string.info_tweet_removed, LENGTH_SHORT).show();
ui.get().setResult(RETURN_TWEET_CHANGED);
ui.get().finish();
break;

4
app/src/main/java/org/nuclearfog/twidda/backend/StatusUploader.java
View File

@ -68,7 +68,7 @@ public class StatusUploader extends AsyncTask<Void, Void, Boolean> {
@Override
public void onDismiss(DialogInterface dialog) {
if (ui.get() != null && getStatus() == RUNNING) {
Toast.makeText(ui.get(), R.string.abort, Toast.LENGTH_SHORT).show();
Toast.makeText(ui.get(), android.R.string.cancel, Toast.LENGTH_SHORT).show();
cancel(true);
}
}
@ -97,7 +97,7 @@ public class StatusUploader extends AsyncTask<Void, Void, Boolean> {
protected void onPostExecute(Boolean success) {
if (ui.get() != null && popup.get() != null) {
if (success) {
Toast.makeText(ui.get(), R.string.tweet_sent, LENGTH_LONG).show();
Toast.makeText(ui.get(), R.string.info_tweet_sent, LENGTH_LONG).show();
ui.get().finish();
} else {
if (twException != null)

20
app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java
View File

@ -1028,13 +1028,13 @@ public class TwitterEngine {
case 17:
case 50: // USER not found
case 63: // USER suspended
messageResource = R.string.user_not_found;
messageResource = R.string.error_user_not_found;
statusNotFound = true;
hardFault = true;
break;
case 32:
messageResource = R.string.request_token_error;
messageResource = R.string.error_request_token;
break;
case 34: //
@ -1045,29 +1045,29 @@ public class TwitterEngine {
break;
case 150:
messageResource = R.string.cant_send_dm;
messageResource = R.string.error_send_dm;
break;
case 136:
case 179:
messageResource = R.string.not_authorized;
messageResource = R.string.info_not_authorized;
hardFault = true;
break;
case 186:
messageResource = R.string.status_too_long;
messageResource = R.string.error_status_too_long;
break;
case 187:
messageResource = R.string.duplicate_status;
messageResource = R.string.error_duplicate_status;
break;
case 349:
messageResource = R.string.error_cant_send_to_user;
messageResource = R.string.error_dm_send;
break;
case 354:
messageResource = R.string.directmessage_too_long;
messageResource = R.string.error_dm_length;
break;
case 89:
@ -1076,7 +1076,7 @@ public class TwitterEngine {
default:
if (error.getStatusCode() == 401)
messageResource = R.string.not_authorized;
messageResource = R.string.info_not_authorized;
else
messageResource = R.string.error_connection_failed;
break;
@ -1099,7 +1099,7 @@ public class TwitterEngine {
break;
default:
messageResource = R.string.error;
messageResource = R.string.info_error;
break;
}
}

8
app/src/main/java/org/nuclearfog/twidda/fragment/ListFragment.java
View File

@ -110,8 +110,8 @@ public class ListFragment extends Fragment implements OnRefreshListener, ListCli
if (getContext() != null) {
Builder confirmDialog = new Builder(getContext(), R.style.InfoDialog);
confirmDialog.setMessage(R.string.confirm_unfollow_list);
confirmDialog.setNegativeButton(R.string.no_confirm, null);
confirmDialog.setPositiveButton(R.string.yes_confirm, new DialogInterface.OnClickListener() {
confirmDialog.setNegativeButton(R.string.confirm_no, null);
confirmDialog.setPositiveButton(R.string.confirm_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
listTask = new ListLoader(ListFragment.this, FOLLOW);
@ -144,8 +144,8 @@ public class ListFragment extends Fragment implements OnRefreshListener, ListCli
if (getContext() != null) {
Builder confirmDialog = new Builder(getContext(), R.style.InfoDialog);
confirmDialog.setMessage(R.string.confirm_delete_list);
confirmDialog.setNegativeButton(R.string.no_confirm, null);
confirmDialog.setPositiveButton(R.string.yes_confirm, new DialogInterface.OnClickListener() {
confirmDialog.setNegativeButton(R.string.confirm_no, null);
confirmDialog.setPositiveButton(R.string.confirm_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
listTask = new ListLoader(ListFragment.this, DELETE);

6
app/src/main/java/org/nuclearfog/twidda/fragment/MessageFragment.java
View File

@ -108,7 +108,7 @@ public class MessageFragment extends Fragment implements OnRefreshListener, OnIt
if (intent.resolveActivity(getContext().getPackageManager()) != null)
startActivity(intent);
else
Toast.makeText(getContext(), R.string.connection_failed, LENGTH_SHORT).show();
Toast.makeText(getContext(), R.string.error_connection, LENGTH_SHORT).show();
}
}
}
@ -128,8 +128,8 @@ public class MessageFragment extends Fragment implements OnRefreshListener, OnIt
if (getContext() != null) {
Builder confirmDialog = new Builder(getContext(), R.style.InfoDialog);
confirmDialog.setMessage(R.string.confirm_delete_message);
confirmDialog.setNegativeButton(R.string.no_confirm, null);
confirmDialog.setPositiveButton(R.string.yes_confirm, new DialogInterface.OnClickListener() {
confirmDialog.setNegativeButton(R.string.confirm_no, null);
confirmDialog.setPositiveButton(R.string.confirm_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
messageTask = new MessageLoader(MessageFragment.this, Mode.DEL);

2
app/src/main/res/layout/item_dm.xml
View File

@ -115,7 +115,7 @@
android:layout_marginEnd="@dimen/padding_side"
android:layout_marginRight="@dimen/padding_side"
android:background="@drawable/button"
android:text="@string/answer"
android:text="@string/dm_answer"
android:textSize="@dimen/textsize_button" />
<Button

2
app/src/main/res/layout/item_list.xml
View File

@ -118,7 +118,7 @@
android:background="@drawable/button"
android:drawablePadding="@dimen/padding_drawable"
android:singleLine="true"
android:text="@string/follow"
android:text="@string/user_follow"
android:textSize="12sp" />
<Button

4
app/src/main/res/layout/item_load.xml
View File

@ -11,13 +11,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageButton
<ImageView
android:id="@+id/kill_button"
android:layout_width="@dimen/button_load"
android:layout_height="@dimen/button_load"
android:layout_gravity="center"
android:background="@android:color/transparent"
android:contentDescription="@string/progress_kill"
android:contentDescription="@android:string/cancel"
app:srcCompat="@drawable/cross" />
</FrameLayout>

6
app/src/main/res/layout/page_settings.xml
View File

@ -71,7 +71,7 @@
android:layout_weight="1"
android:includeFontPadding="false"
android:singleLine="true"
android:text="@string/font" />
android:text="@string/settings_font" />
</LinearLayout>
@ -170,7 +170,7 @@
android:layout_height="@dimen/button_dm"
android:layout_weight="4"
android:singleLine="true"
android:text="@string/image"
android:text="@string/settings_image"
android:textSize="@dimen/textsize_settings_small" />
<CheckBox
@ -245,7 +245,7 @@
android:layout_weight="1"
android:background="@drawable/button"
android:singleLine="true"
android:text="@string/logout" />
android:text="@string/settings_logout" />
</LinearLayout>
</LinearLayout>

4
app/src/main/res/layout/popup_dm.xml
View File

@ -37,7 +37,7 @@
android:layout_marginStart="@dimen/margin_dm_icon"
android:layout_marginLeft="@dimen/margin_dm_icon"
android:background="@drawable/button"
android:contentDescription="@string/add_image"
android:contentDescription="@string/tweet_add_image"
app:srcCompat="@drawable/image_add" />
<ImageButton
@ -58,7 +58,7 @@
android:layout_height="@dimen/text_input_height"
android:background="@android:color/transparent"
android:gravity="start"
android:hint="@string/dmessage"
android:hint="@string/dm_message"
android:inputType="textMultiLine" />
</LinearLayout>

2
app/src/main/res/layout/popup_tweet.xml
View File

@ -56,7 +56,7 @@
android:layout_marginStart="@dimen/margin_tweet_icon"
android:layout_marginLeft="@dimen/margin_tweet_icon"
android:background="@drawable/button"
android:contentDescription="@string/add_image"
android:contentDescription="@string/tweet_add_image"
app:srcCompat="@drawable/image_add" />
<FrameLayout

6
app/src/main/res/menu/profile.xml
View File

@ -10,16 +10,16 @@
<item
android:id="@+id/profile_follow"
android:icon="@drawable/follow"
android:title="@string/follow"
android:title="@string/user_follow"
android:visible="false"
app:showAsAction="ifRoom" />
<item
android:id="@+id/profile_block"
android:title="@string/block"
android:title="@string/user_block"
android:visible="false" />
<item
android:id="@+id/profile_mute"
android:title="@string/mute"
android:title="@string/user_mute"
android:visible="false" />
<item
android:id="@+id/profile_message"

2
app/src/main/res/menu/tweet.xml
View File

@ -3,7 +3,7 @@
<item
android:id="@+id/tweet_link"
android:title="@string/get_tweetlink" />
android:title="@string/tweet_open_browser" />
<item
android:id="@+id/link_copy"

111
app/src/main/res/values-de-rDE/strings.xml
View File

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="font">Schrift</string>
<string name="settings_font">Schrift</string>
<string name="highlight">Hervorhebung</string>
<string name="settings_load_count">Listengröße</string>
<string name="follow">folgen</string>
<string name="retry">wiederholen</string>
<string name="cancel">abbrechen</string>
<string name="user_follow">folgen</string>
<string name="confirm_retry">wiederholen</string>
<string name="color_settings">Farbeinstellungen</string>
<string name="data_consumption">Datenverbrauch</string>
<string name="trend_setting">Trendeinstellung</string>
@ -13,91 +12,89 @@
<string name="register_link">PIN aufrufen</string>
<string name="profile_image">Profilbild</string>
<string name="settings">Einstellungen</string>
<string name="image">Bilder laden</string>
<string name="settings_image">Bilder laden</string>
<string name="delete_database">Datenbank Löschen</string>
<string name="twitter_search">Suche</string>
<string name="userlist_retweet">Tweet retweetet von</string>
<string name="userlist_favorite">Tweet favorisiert von</string>
<string name="background">Hintergrund</string>
<string name="delete_tweet">Tweet löschen?</string>
<string name="connection_failed">Keine Internetverbindung!</string>
<string name="enter_pin">PIN eingeben!</string>
<string name="delete_database_popup">Datenbank löschen?</string>
<string name="confirm_delete_tweet">Tweet löschen?</string>
<string name="error_connection">Keine Internetverbindung!</string>
<string name="error_enter_pin">PIN eingeben!</string>
<string name="confirm_delete_database">Datenbank löschen?</string>
<string name="error_limit_exceeded">Anfragelimit erreicht!</string>
<string name="error_sending_tweet">Fehler beim Senden!</string>
<string name="tweet_sent">Tweet gesendet</string>
<string name="error">Fehler!</string>
<string name="info_tweet_sent">Tweet gesendet</string>
<string name="info_error">Fehler!</string>
<string name="tweet_delete">Tweet löschen</string>
<string name="get_tweetlink">Im Browser öffnen</string>
<string name="tweet_open_browser">Im Browser öffnen</string>
<string name="error_not_found">night gefunden!</string>
<string name="unfollow">entfolgen</string>
<string name="block">blocken</string>
<string name="unblock">entblocken</string>
<string name="followed">gefolgt!</string>
<string name="blocked">geblockt!</string>
<string name="unblocked">entblockt!</string>
<string name="tweet_removed">Tweet gelöscht!</string>
<string name="user_unfollow">entfolgen</string>
<string name="user_block">blocken</string>
<string name="user_unblock">entblocken</string>
<string name="info_followed">gefolgt!</string>
<string name="info_user_blocked">geblockt!</string>
<string name="info_user_unblocked">entblockt!</string>
<string name="info_tweet_removed">Tweet gelöscht!</string>
<string name="tweet_answering">"antwort "</string>
<string name="sent_from">"gesendet von: "</string>
<string name="progress_kill">abbrechen</string>
<string name="mute">Stummschalten</string>
<string name="unmute">Stummschaltung aufheben</string>
<string name="muted">stummgeschaltet!</string>
<string name="unmuted">Stummschaltung aufgehoben!</string>
<string name="tweet_sent_from">"gesendet von: "</string>
<string name="user_mute">Stummschalten</string>
<string name="user_unmute">Stummschaltung aufheben</string>
<string name="info_user_muted">stummgeschaltet!</string>
<string name="info_user_unmuted">Stummschaltung aufgehoben!</string>
<string name="directmessage">Direktnachrichten</string>
<string name="username">Username</string>
<string name="dmessage">Nachricht</string>
<string name="dmsend">Direktnachricht gesendet!</string>
<string name="dm_message">Nachricht</string>
<string name="info_dm_send">Direktnachricht gesendet!</string>
<string name="error_dm">Nutzername oder Nachricht eingeben!</string>
<string name="abort">Abgebrochen!</string>
<string name="cancel_message">Nachricht verwerfen?</string>
<string name="empty_tweet">Tweet leer!</string>
<string name="logout">ausloggen</string>
<string name="pin_verification_failed">PIN verifizierung fehlgeschlagen!</string>
<string name="answer">Antworten</string>
<string name="confirm_cancel_message">Nachricht verwerfen?</string>
<string name="error_empty_tweet">Tweet leer!</string>
<string name="settings_logout">ausloggen</string>
<string name="error_pin_verification">PIN verifizierung fehlgeschlagen!</string>
<string name="dm_answer">Antworten</string>
<string name="delete_dm">löschen</string>
<string name="yes_confirm">Ja</string>
<string name="no_confirm">Nein</string>
<string name="confirm_yes">Ja</string>
<string name="confirm_no">Nein</string>
<string name="confirm_cancel_tweet">Tweet verwerfen?</string>
<string name="confirm_log_lout">ausloggen?</string>
<string name="confirm_unfollow">User entfolgen?</string>
<string name="confirm_block">user sperren?</string>
<string name="image_saved">Bild gespeichert!</string>
<string name="info_image_saved">Bild gespeichert!</string>
<string name="tweet_close">Tweetfenster schließen</string>
<string name="send_tweet">Tweet senden</string>
<string name="add_image">Bild hinzufügen</string>
<string name="tweet_add_image">Bild hinzufügen</string>
<string name="image_preview">Bildvorschau</string>
<string name="link_to_clipboard">Link in Zwischenablage kopieren</string>
<string name="copied_to_clipboard">Link in Zwischenablage kopiert!</string>
<string name="info_clipboard">Link in Zwischenablage kopiert!</string>
<string name="profile_link">Link</string>
<string name="image_preview_button">Bildvorschau Button</string>
<string name="close_dm">Direktnachricht schließen</string>
<string name="user_not_found">Nutzer nicht gefunden!</string>
<string name="cant_send_dm">Nachricht kann nicht an den User gesendet werden!</string>
<string name="error_user_not_found">Nutzer nicht gefunden!</string>
<string name="error_send_dm">Nachricht kann nicht an den User gesendet werden!</string>
<string name="error_accesstoken">ungültiger Zugangsschlüssel!</string>
<string name="status_too_long">Status ist zu lang!</string>
<string name="duplicate_status">Tweet wurde schon versendet!</string>
<string name="directmessage_too_long">Direktnachricht länge überschritten!</string>
<string name="error_status_too_long">Status ist zu lang!</string>
<string name="error_duplicate_status">Tweet wurde schon versendet!</string>
<string name="error_dm_length">Direktnachricht länge überschritten!</string>
<string name="follow_requested">warten auf Bestätigung</string>
<string name="loading">lädt..</string>
<string name="info_loading">lädt..</string>
<string name="profile_location">Standort</string>
<string name="profile_bio">Bio</string>
<string name="edit_profile">Profil bearbeiten</string>
<string name="edit_save">speichern</string>
<string name="profile_updated">Profile aktualisiert!</string>
<string name="edit_empty_name">Name leer!</string>
<string name="exit_confirm">Änderungen verwerfen?</string>
<string name="info_profile_updated">Profile aktualisiert!</string>
<string name="error_empty_name">Name leer!</string>
<string name="confirm_discard">Änderungen verwerfen?</string>
<string name="user_data">Nutzerdaten</string>
<string name="request_token_error">Request Token abgelaufen, bitte App aktualisieren!</string>
<string name="error_request_token">Request Token abgelaufen, bitte App aktualisieren!</string>
<string name="follows_you">folgt dir</string>
<string name="image_store_failure">Fehler beim Speichern!</string>
<string name="not_authorized">Keine Berechtigung!</string>
<string name="error_image_save">Fehler beim Speichern!</string>
<string name="info_not_authorized">Keine Berechtigung!</string>
<string name="error_file_format">Dateiformat nicht unterstützt!</string>
<string name="load_answer">Antworten laden</string>
<string name="tweet_retweeted">Tweet retweeted!</string>
<string name="tweet_unretweeted">Retweet entfernt!</string>
<string name="tweet_favored">Tweet favorisiert!</string>
<string name="tweet_unfavored">tweet aus den favoriten entfernt!</string>
<string name="info_tweet_retweeted">Tweet retweeted!</string>
<string name="info_tweet_unretweeted">Retweet entfernt!</string>
<string name="info_tweet_favored">Tweet favorisiert!</string>
<string name="info_tweet_unfavored">tweet aus den favoriten entfernt!</string>
<string name="proxy_port">Port</string>
<string name="proxy_settings">Proxy Einstellung</string>
<string name="login_verifier">Login</string>
@ -115,9 +112,9 @@
<string name="error_empty_port">Proxy port muss gesetzt werden!</string>
<string name="error_empty_pass">Proxy Passort darf nicht leer sein!</string>
<string name="video_preview_button">Videovorschau Button</string>
<string name="failed_open_link">Fehler beim Öffnen des links!</string>
<string name="image_download_fail">Bild konnte nicht geladen werden!</string>
<string name="error_cant_send_to_user">Direktnachricht konnte nicht an diesen Nutzer gesendet werden!</string>
<string name="error_open_link">Fehler beim Öffnen des links!</string>
<string name="error_image_download">Bild konnte nicht geladen werden!</string>
<string name="error_dm_send">Direktnachricht konnte nicht an diesen Nutzer gesendet werden!</string>
<string name="confirm_mute">User stummschalten?</string>
<string name="error_location">Standort konnte nicht ermittelt werden!</string>
<string name="info_not_implemented">Diese Funktion wurde noch nicht hinzugefügt!</string>

2
app/src/main/res/values/dimens.xml
View File

@ -44,7 +44,7 @@
<dimen name="button_dm">40dp</dimen>
<dimen name="button_settings_color">40dp</dimen>
<dimen name="button_settings">30dp</dimen>
<dimen name="button_load">48dp</dimen>
<dimen name="button_load">36dp</dimen>
<dimen name="button_margin">5dp</dimen>
<dimen name="button_padding">5dp</dimen>
<dimen name="button_height">20dp</dimen>

113
app/src/main/res/values/strings.xml
View File

@ -11,101 +11,98 @@
<string name="userlist_retweet">Tweet retweeted by</string>
<string name="userlist_favorite">Tweet favored by</string>
<string name="background">Background</string>
<string name="font">Font</string>
<string name="settings_font">Font</string>
<string name="popup">Popup</string>
<string name="highlight">Highlight</string>
<string name="settings_load_count">List size</string>
<string name="block">Block</string>
<string name="follow">follow</string>
<string name="retry">retry</string>
<string name="cancel">cancel</string>
<string name="user_block">Block</string>
<string name="user_follow">follow</string>
<string name="confirm_retry">retry</string>
<string name="color_settings">Color settings</string>
<string name="data_consumption">data consumption</string>
<string name="trend_setting">trend setting</string>
<string name="profile">profile</string>
<string name="register_link">get PIN!</string>
<string name="image">load images</string>
<string name="register_link">get PIN</string>
<string name="settings_image">load images</string>
<string name="delete_database">delete database</string>
<string name="twitter_search">search</string>
<string name="delete_tweet">delete tweet?</string>
<string name="connection_failed">connection failed</string>
<string name="enter_pin">Enter PIN</string>
<string name="delete_database_popup">delete database?</string>
<string name="confirm_delete_tweet">delete tweet?</string>
<string name="error_connection">connection failed</string>
<string name="error_enter_pin">Enter PIN!</string>
<string name="confirm_delete_database">delete database?</string>
<string name="error_limit_exceeded">"Rate limit exceeded!"</string>
<string name="error_sending_tweet">error while sending</string>
<string name="tweet_sent">tweet sent</string>
<string name="error">Error!</string>
<string name="info_tweet_sent">tweet sent</string>
<string name="info_error">Error!</string>
<string name="tweet_delete">Delete</string>
<string name="get_tweetlink">Open in Browser</string>
<string name="tweet_open_browser">Open in Browser</string>
<string name="error_not_found">not found!</string>
<string name="unfollow">unfollow</string>
<string name="unblock">unblock</string>
<string name="followed">followed</string>
<string name="blocked">blocked!</string>
<string name="unblocked">unblocked</string>
<string name="tweet_removed">Tweet removed!</string>
<string name="user_unfollow">unfollow</string>
<string name="user_unblock">unblock</string>
<string name="info_followed">followed!</string>
<string name="info_user_blocked">blocked!</string>
<string name="info_user_unblocked">unblocked</string>
<string name="info_tweet_removed">Tweet removed!</string>
<string name="tweet_answering">answering </string>
<string name="sent_from">sent from: </string>
<string name="progress_kill">stop loading</string>
<string name="mute">mute</string>
<string name="unmute">un-mute</string>
<string name="muted">muted</string>
<string name="unmuted">un-muted</string>
<string name="tweet_sent_from">sent from: </string>
<string name="user_mute">mute</string>
<string name="user_unmute">un-mute</string>
<string name="info_user_muted">muted</string>
<string name="info_user_unmuted">un-muted</string>
<string name="directmessage">Direct Message</string>
<string name="username">username</string>
<string name="dmessage">Message</string>
<string name="dmsend">Directmessage sent!</string>
<string name="dm_message">Message</string>
<string name="info_dm_send">Directmessage sent!</string>
<string name="error_dm">enter username or message!</string>
<string name="abort">canceled!</string>
<string name="cancel_message">cancel message?</string>
<string name="empty_tweet">empty tweet!</string>
<string name="logout">log out!</string>
<string name="pin_verification_failed">PIN verification failed!</string>
<string name="answer">answer</string>
<string name="confirm_cancel_message">cancel message?</string>
<string name="error_empty_tweet">empty tweet!</string>
<string name="settings_logout">log out!</string>
<string name="error_pin_verification">PIN verification failed!</string>
<string name="dm_answer">answer</string>
<string name="delete_dm">delete</string>
<string name="yes_confirm">Yes</string>
<string name="no_confirm">No</string>
<string name="confirm_yes">Yes</string>
<string name="confirm_no">No</string>
<string name="confirm_unfollow">unfollow user?</string>
<string name="confirm_block">block user?</string>
<string name="confirm_log_lout">log out?</string>
<string name="confirm_cancel_tweet">cancel tweet?</string>
<string name="image_saved">image saved!</string>
<string name="info_image_saved">image saved!</string>
<string name="image_preview">Image preview</string>
<string name="add_image">add new image</string>
<string name="tweet_add_image">add new image</string>
<string name="send_tweet">send Tweet</string>
<string name="tweet_close">close tweet</string>
<string name="link_to_clipboard">copy link to clipboard</string>
<string name="copied_to_clipboard">Link copied to clipboard!</string>
<string name="info_clipboard">Link copied to clipboard!</string>
<string name="profile_link">link</string>
<string name="image_preview_button">image preview button</string>
<string name="video_preview_button">video preview button</string>
<string name="close_dm">close direct message</string>
<string name="user_not_found">user not found!</string>
<string name="cant_send_dm">cannot send dm to user!</string>
<string name="error_user_not_found">user not found!</string>
<string name="error_send_dm">cannot send dm to user!</string>
<string name="error_accesstoken">Invalid or expired token!</string>
<string name="status_too_long">Tweet needs to be shorter!</string>
<string name="duplicate_status">Duplicate Status!</string>
<string name="directmessage_too_long">direct message text is over the limit!</string>
<string name="error_status_too_long">Tweet needs to be shorter!</string>
<string name="error_duplicate_status">Duplicate Status!</string>
<string name="error_dm_length">direct message text is over the limit!</string>
<string name="follow_requested">follow requested</string>
<string name="loading">loading..</string>
<string name="info_loading">loading..</string>
<string name="profile_location">location</string>
<string name="profile_bio">bio</string>
<string name="edit_profile">Edit Profile</string>
<string name="edit_save">save</string>
<string name="profile_updated">Profile updated!</string>
<string name="edit_empty_name">Empty user name!</string>
<string name="exit_confirm">discard changes?</string>
<string name="info_profile_updated">Profile updated!</string>
<string name="error_empty_name">Empty user name!</string>
<string name="confirm_discard">discard changes?</string>
<string name="user_data">User data</string>
<string name="request_token_error">request token expired! please update app.</string>
<string name="error_request_token">request token expired! please update app.</string>
<string name="follows_you">follows you</string>
<string name="image_store_failure">image save failed!</string>
<string name="not_authorized">Not authorized!</string>
<string name="error_image_save">image save failed!</string>
<string name="info_not_authorized">Not authorized!</string>
<string name="error_file_format">file format not supported!</string>
<string name="load_answer">answer load</string>
<string name="tweet_retweeted">tweet retweeted!</string>
<string name="tweet_unretweeted">retweet removed!</string>
<string name="tweet_favored">tweet_favored</string>
<string name="tweet_unfavored">tweet removed from favors!</string>
<string name="info_tweet_retweeted">tweet retweeted!</string>
<string name="info_tweet_unretweeted">retweet removed!</string>
<string name="info_tweet_favored">tweet_favored</string>
<string name="info_tweet_unfavored">tweet removed from favors!</string>
<string name="proxy_settings">Proxy settings</string>
<string name="enter_proxy">Proxy IP address</string>
<string name="proxy_port">Port</string>
@ -115,9 +112,9 @@
<string name="proxy_authentication">Proxy login</string>
<string name="error_empty_port">Port must be set!</string>
<string name="error_empty_pass">Proxy password should not be empty!</string>
<string name="failed_open_link">Failed to open link!</string>
<string name="image_download_fail">Image could not be loaded!</string>
<string name="error_cant_send_to_user">Cannot send directmessage to this user!</string>
<string name="error_open_link">Failed to open link!</string>
<string name="error_image_download">Image could not be loaded!</string>
<string name="error_dm_send">Cannot send directmessage to this user!</string>
<string name="information_link" translatable="false">https://github.com/nuclearfog/Shitter</string>
<string name="confirm_mute">mute user?</string>
<string name="error_location">could not fetch location!</string>