diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f39b72864..cdcfc7417 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,6 @@ build: - sed -i "s/git@/gitlab@/" /usr/lib/python3/dist-packages/fdroidserver/index.py - export versionName=`printf '%s-%05d' $(git describe --tag --abbrev=0) $(date '+%s'| cut -b4-8)` - sed -i "s,^\(\s*versionName\) *[0-9].*,\1 versionName," build.gradle - - sed -i "s/eu.siacs.conversations/eu.sum7.conversations/" build.gradle - ./gradlew assembleFreeCompat - fdroid nightly artifacts: diff --git a/art/ic_launcher.svg b/art/ic_launcher.svg index 96b17d2b4..7d489d502 100644 --- a/art/ic_launcher.svg +++ b/art/ic_launcher.svg @@ -147,15 +147,15 @@ inkscape:export-xdpi="100" transform="matrix(0.3835576,0,0,0.3835576,-246.60108,-156.11013)" id="g5317" - style="display:inline;fill:#00a000;fill-opacity:1"> + style="display:inline;fill:#EF6C00;fill-opacity:1"> + style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> @@ -313,7 +313,7 @@ style="display:inline" transform="translate(-4,2.6816164)"> + style="fill:#EF6C00;fill-opacity:1;stroke:none;stroke-opacity:0.53333336;stroke-width:1.70000002;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:#FF9800;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)"> + style="fill:#BF360C;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)"> implements CopyTextVie private OnContactPictureClicked mOnContactPictureClickedListener; private OnContactPictureLongClicked mOnContactPictureLongClickedListener; private boolean mIndicateReceived = false; - private boolean mUseGreenBackground = false; private OnQuoteListener onQuoteListener; public MessageAdapter(XmppActivity activity, List messages) { super(activity, 0, messages); @@ -372,7 +371,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie body.setSpan(new DividerSpan(false), end, end + 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); } int color = darkBackground ? this.getMessageTextColor(darkBackground, false) - : ContextCompat.getColor(activity, R.color.green700_desaturated); + : ContextCompat.getColor(activity, R.color.orange700_desaturated); DisplayMetrics metrics = getContext().getResources().getDisplayMetrics(); body.setSpan(new QuoteSpan(color, metrics), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); } @@ -441,7 +440,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie viewHolder.messageBody.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Body1); } viewHolder.messageBody.setHighlightColor(ContextCompat.getColor(activity, darkBackground - ? (type == SENT || !mUseGreenBackground ? R.color.black26 : R.color.grey800) : R.color.grey500)); + ? (type == SENT ? R.color.black26 : R.color.grey800) : R.color.grey500)); viewHolder.messageBody.setTypeface(null, Typeface.NORMAL); if (message.getBody() != null) { @@ -679,7 +678,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie } } - boolean darkBackground = type == RECEIVED && (!isInValidSession || mUseGreenBackground) || activity.isDarkTheme(); + boolean darkBackground = type == RECEIVED && !isInValidSession || activity.isDarkTheme(); if (type == DATE_SEPARATOR) { if (UIHelper.today(message.getTimeSent())) { @@ -808,13 +807,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie if (type == RECEIVED) { if (isInValidSession) { - int bubble; - if (!mUseGreenBackground) { - bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome, R.drawable.message_bubble_received_white); - } else { - bubble = activity.getThemeResource(R.attr.message_bubble_received_green, R.drawable.message_bubble_received); - } - viewHolder.message_box.setBackgroundResource(bubble); + viewHolder.message_box.setBackgroundResource(activity.getThemeResource(R.attr.message_bubble_received_monochrome, R.drawable.message_bubble_received_white)); viewHolder.encryption.setVisibility(View.GONE); } else { viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning); @@ -921,7 +914,6 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie public void updatePreferences() { SharedPreferences p = PreferenceManager.getDefaultSharedPreferences(activity); this.mIndicateReceived = p.getBoolean("indicate_received", activity.getResources().getBoolean(R.bool.indicate_received)); - this.mUseGreenBackground = p.getBoolean("use_green_background", activity.getResources().getBoolean(R.bool.use_green_background)); } public void loadAvatar(Message message, ImageView imageView, int size) { diff --git a/src/main/java/eu/siacs/conversations/ui/service/AudioPlayer.java b/src/main/java/eu/siacs/conversations/ui/service/AudioPlayer.java index 33f475812..c60f8fd7b 100644 --- a/src/main/java/eu/siacs/conversations/ui/service/AudioPlayer.java +++ b/src/main/java/eu/siacs/conversations/ui/service/AudioPlayer.java @@ -102,7 +102,7 @@ public class AudioPlayer implements View.OnClickListener, MediaPlayer.OnCompleti } viewHolder.progress.setOnSeekBarChangeListener(this); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - ColorStateList color = ContextCompat.getColorStateList(messageAdapter.getContext(), viewHolder.darkBackground ? R.color.white70 : R.color.green700_desaturated); + ColorStateList color = ContextCompat.getColorStateList(messageAdapter.getContext(), viewHolder.darkBackground ? R.color.white70 : R.color.orange700_desaturated); viewHolder.progress.setThumbTintList(color); viewHolder.progress.setProgressTintList(color); } diff --git a/src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java b/src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java index f981fcf7a..b61fee1e2 100644 --- a/src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java @@ -37,7 +37,7 @@ public class UnreadCountCustomView extends View { private void initXMLAttrs(Context context, AttributeSet attrs) { TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.UnreadCountCustomView); - setBackgroundColor(a.getColor(a.getIndex(0), ContextCompat.getColor(context, R.color.green700_desaturated))); + setBackgroundColor(a.getColor(a.getIndex(0), ContextCompat.getColor(context, R.color.orange700_desaturated))); a.recycle(); } diff --git a/src/main/new_launcher-web.png b/src/main/new_launcher-web.png index 6d9c493d6..4352eac04 100644 Binary files a/src/main/new_launcher-web.png and b/src/main/new_launcher-web.png differ diff --git a/src/main/res/drawable-hdpi/date_bubble_grey.9.png b/src/main/res/drawable-hdpi/date_bubble_grey.9.png index 1b8d67520..ce620486f 100644 Binary files a/src/main/res/drawable-hdpi/date_bubble_grey.9.png and b/src/main/res/drawable-hdpi/date_bubble_grey.9.png differ diff --git a/src/main/res/drawable-hdpi/date_bubble_white.9.png b/src/main/res/drawable-hdpi/date_bubble_white.9.png index 090af33a9..fcf254f3d 100644 Binary files a/src/main/res/drawable-hdpi/date_bubble_white.9.png and b/src/main/res/drawable-hdpi/date_bubble_white.9.png differ diff --git a/src/main/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 000000000..25cbd8b03 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/src/main/res/drawable-hdpi/main_logo.png b/src/main/res/drawable-hdpi/main_logo.png index 42d553dd7..422c9dd64 100644 Binary files a/src/main/res/drawable-hdpi/main_logo.png and b/src/main/res/drawable-hdpi/main_logo.png differ diff --git a/src/main/res/drawable-hdpi/marker.png b/src/main/res/drawable-hdpi/marker.png index d9f9c493a..58229927a 100644 Binary files a/src/main/res/drawable-hdpi/marker.png and b/src/main/res/drawable-hdpi/marker.png differ diff --git a/src/main/res/drawable-hdpi/message_bubble_received.9.png b/src/main/res/drawable-hdpi/message_bubble_received.9.png index 4e4329f91..2c32de292 100644 Binary files a/src/main/res/drawable-hdpi/message_bubble_received.9.png and b/src/main/res/drawable-hdpi/message_bubble_received.9.png differ diff --git a/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png index 714568183..3cc09f3f7 100644 Binary files a/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png and b/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png differ diff --git a/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png index f54f43235..2bebe4d33 100644 Binary files a/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png and b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png differ diff --git a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png index 69d08da2b..3f7fd2de2 100644 Binary files a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png differ diff --git a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png index 4c1196b9f..d684165bb 100644 Binary files a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png differ diff --git a/src/main/res/drawable-hdpi/message_bubble_sent.9.png b/src/main/res/drawable-hdpi/message_bubble_sent.9.png index 4179c9d79..d8a8b500c 100644 Binary files a/src/main/res/drawable-hdpi/message_bubble_sent.9.png and b/src/main/res/drawable-hdpi/message_bubble_sent.9.png differ diff --git a/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png index d9450969d..3f9d5234b 100644 Binary files a/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png and b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png differ diff --git a/src/main/res/drawable-hdpi/splash_logo.png b/src/main/res/drawable-hdpi/splash_logo.png index d8efc71af..991002707 100644 Binary files a/src/main/res/drawable-hdpi/splash_logo.png and b/src/main/res/drawable-hdpi/splash_logo.png differ diff --git a/src/main/res/drawable-mdpi/date_bubble_grey.9.png b/src/main/res/drawable-mdpi/date_bubble_grey.9.png index eb36a1c03..6e959f861 100644 Binary files a/src/main/res/drawable-mdpi/date_bubble_grey.9.png and b/src/main/res/drawable-mdpi/date_bubble_grey.9.png differ diff --git a/src/main/res/drawable-mdpi/date_bubble_white.9.png b/src/main/res/drawable-mdpi/date_bubble_white.9.png index 71d7293b0..909184193 100644 Binary files a/src/main/res/drawable-mdpi/date_bubble_white.9.png and b/src/main/res/drawable-mdpi/date_bubble_white.9.png differ diff --git a/src/main/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 000000000..f13ec88d0 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/src/main/res/drawable-mdpi/main_logo.png b/src/main/res/drawable-mdpi/main_logo.png index d81b73638..84df701cb 100644 Binary files a/src/main/res/drawable-mdpi/main_logo.png and b/src/main/res/drawable-mdpi/main_logo.png differ diff --git a/src/main/res/drawable-mdpi/marker.png b/src/main/res/drawable-mdpi/marker.png index 331acbf4d..bfa394ce3 100644 Binary files a/src/main/res/drawable-mdpi/marker.png and b/src/main/res/drawable-mdpi/marker.png differ diff --git a/src/main/res/drawable-mdpi/message_bubble_received.9.png b/src/main/res/drawable-mdpi/message_bubble_received.9.png index b619b017d..31dd9a3e3 100644 Binary files a/src/main/res/drawable-mdpi/message_bubble_received.9.png and b/src/main/res/drawable-mdpi/message_bubble_received.9.png differ diff --git a/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png index 4b2f47c9f..7dff5d0ee 100644 Binary files a/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png and b/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png differ diff --git a/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png index 1c1f98c0d..8e34331ec 100644 Binary files a/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png and b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png differ diff --git a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png index 3e6c5f620..a653638aa 100644 Binary files a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png differ diff --git a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png index 981dbd2cc..4bca444c5 100644 Binary files a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png differ diff --git a/src/main/res/drawable-mdpi/message_bubble_sent.9.png b/src/main/res/drawable-mdpi/message_bubble_sent.9.png index dc946156c..dfb197cdd 100644 Binary files a/src/main/res/drawable-mdpi/message_bubble_sent.9.png and b/src/main/res/drawable-mdpi/message_bubble_sent.9.png differ diff --git a/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png index bcb340f84..e74fd297a 100644 Binary files a/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png and b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png differ diff --git a/src/main/res/drawable-mdpi/splash_logo.png b/src/main/res/drawable-mdpi/splash_logo.png index 1b10d1f91..fd1bd91c2 100644 Binary files a/src/main/res/drawable-mdpi/splash_logo.png and b/src/main/res/drawable-mdpi/splash_logo.png differ diff --git a/src/main/res/drawable-xhdpi/date_bubble_grey.9.png b/src/main/res/drawable-xhdpi/date_bubble_grey.9.png index f55428d98..cfc6c2001 100644 Binary files a/src/main/res/drawable-xhdpi/date_bubble_grey.9.png and b/src/main/res/drawable-xhdpi/date_bubble_grey.9.png differ diff --git a/src/main/res/drawable-xhdpi/date_bubble_white.9.png b/src/main/res/drawable-xhdpi/date_bubble_white.9.png index c62901af5..5efa8d099 100644 Binary files a/src/main/res/drawable-xhdpi/date_bubble_white.9.png and b/src/main/res/drawable-xhdpi/date_bubble_white.9.png differ diff --git a/src/main/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 000000000..cf162e9de Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/src/main/res/drawable-xhdpi/main_logo.png b/src/main/res/drawable-xhdpi/main_logo.png index 19fbe70b8..52221bdf2 100644 Binary files a/src/main/res/drawable-xhdpi/main_logo.png and b/src/main/res/drawable-xhdpi/main_logo.png differ diff --git a/src/main/res/drawable-xhdpi/marker.png b/src/main/res/drawable-xhdpi/marker.png index 614badda3..9b3a614fd 100644 Binary files a/src/main/res/drawable-xhdpi/marker.png and b/src/main/res/drawable-xhdpi/marker.png differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_received.9.png b/src/main/res/drawable-xhdpi/message_bubble_received.9.png index 742194f17..90f9516fb 100644 Binary files a/src/main/res/drawable-xhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received.9.png differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png index d3f5f7e58..8fc24b62e 100644 Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png index 2d4e6af33..a904b05eb 100644 Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png index 50e522032..25af19dde 100644 Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png index 50584eaac..616de18bf 100644 Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png index 0f0c0c579..be26839df 100644 Binary files a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png index ede14e1c5..625b3da6c 100644 Binary files a/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png and b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png differ diff --git a/src/main/res/drawable-xhdpi/splash_logo.png b/src/main/res/drawable-xhdpi/splash_logo.png index 9458b791c..9586f078d 100644 Binary files a/src/main/res/drawable-xhdpi/splash_logo.png and b/src/main/res/drawable-xhdpi/splash_logo.png differ diff --git a/src/main/res/drawable-xxhdpi/date_bubble_grey.9.png b/src/main/res/drawable-xxhdpi/date_bubble_grey.9.png index a434778b8..6c4df2a62 100644 Binary files a/src/main/res/drawable-xxhdpi/date_bubble_grey.9.png and b/src/main/res/drawable-xxhdpi/date_bubble_grey.9.png differ diff --git a/src/main/res/drawable-xxhdpi/date_bubble_white.9.png b/src/main/res/drawable-xxhdpi/date_bubble_white.9.png index 9b5646040..5c6ef8cae 100644 Binary files a/src/main/res/drawable-xxhdpi/date_bubble_white.9.png and b/src/main/res/drawable-xxhdpi/date_bubble_white.9.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..fd1bd91c2 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/src/main/res/drawable-xxhdpi/main_logo.png b/src/main/res/drawable-xxhdpi/main_logo.png index cc091c437..ae84ce164 100644 Binary files a/src/main/res/drawable-xxhdpi/main_logo.png and b/src/main/res/drawable-xxhdpi/main_logo.png differ diff --git a/src/main/res/drawable-xxhdpi/marker.png b/src/main/res/drawable-xxhdpi/marker.png index 2c21e67f0..a39d2d942 100644 Binary files a/src/main/res/drawable-xxhdpi/marker.png and b/src/main/res/drawable-xxhdpi/marker.png differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png index fda98dcec..a650ae60e 100644 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png index 5a88c0d91..5f0a5e80f 100644 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png index 6ecb82886..909271564 100644 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png index acc18615c..615ada9c5 100644 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png index bfd2b9319..8a3c339c5 100644 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png index 5fde2041a..146520010 100644 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png index 8a30c3a08..d5cde65a7 100644 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png differ diff --git a/src/main/res/drawable-xxhdpi/splash_logo.png b/src/main/res/drawable-xxhdpi/splash_logo.png index 83c2abe6a..65445092f 100644 Binary files a/src/main/res/drawable-xxhdpi/splash_logo.png and b/src/main/res/drawable-xxhdpi/splash_logo.png differ diff --git a/src/main/res/drawable-xxxhdpi/date_bubble_grey.9.png b/src/main/res/drawable-xxxhdpi/date_bubble_grey.9.png index 988c84bd3..3b753ec1c 100644 Binary files a/src/main/res/drawable-xxxhdpi/date_bubble_grey.9.png and b/src/main/res/drawable-xxxhdpi/date_bubble_grey.9.png differ diff --git a/src/main/res/drawable-xxxhdpi/date_bubble_white.9.png b/src/main/res/drawable-xxxhdpi/date_bubble_white.9.png index 5c8e380d8..0b1af7df5 100644 Binary files a/src/main/res/drawable-xxxhdpi/date_bubble_white.9.png and b/src/main/res/drawable-xxxhdpi/date_bubble_white.9.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..ff8e1a913 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/src/main/res/drawable-xxxhdpi/main_logo.png b/src/main/res/drawable-xxxhdpi/main_logo.png index 3e6ddd877..5982a5329 100644 Binary files a/src/main/res/drawable-xxxhdpi/main_logo.png and b/src/main/res/drawable-xxxhdpi/main_logo.png differ diff --git a/src/main/res/drawable-xxxhdpi/marker.png b/src/main/res/drawable-xxxhdpi/marker.png index f0866327f..adc354335 100644 Binary files a/src/main/res/drawable-xxxhdpi/marker.png and b/src/main/res/drawable-xxxhdpi/marker.png differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png index 63c8b041c..d9c85da92 100644 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png index f7ac36723..bada3b891 100644 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png index 9980ba6c4..629b759e8 100644 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png index 7aa8cb13c..b6cae4911 100644 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png index aa7348d84..34d6df9b6 100644 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png index 3caa0af43..8a263ffa3 100644 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png index 2a8d950d8..141437d6d 100644 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png differ diff --git a/src/main/res/drawable-xxxhdpi/splash_logo.png b/src/main/res/drawable-xxxhdpi/splash_logo.png index 349070ba2..1946a08ca 100644 Binary files a/src/main/res/drawable-xxxhdpi/splash_logo.png and b/src/main/res/drawable-xxxhdpi/splash_logo.png differ diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml index e08dd84c8..240aa5b3f 100644 --- a/src/main/res/layout/magic_create.xml +++ b/src/main/res/layout/magic_create.xml @@ -81,17 +81,6 @@ android:padding="8dp" android:src="@drawable/main_logo"/> - diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml index 1c23119f7..e33c1abe8 100644 --- a/src/main/res/layout/welcome.xml +++ b/src/main/res/layout/welcome.xml @@ -73,17 +73,6 @@ android:padding="8dp" android:src="@drawable/main_logo"/> - \ No newline at end of file diff --git a/src/main/res/mipmap-anydpi-v26/new_launcher.xml b/src/main/res/mipmap-anydpi-v26/new_launcher.xml deleted file mode 100644 index 6f2acb4f0..000000000 --- a/src/main/res/mipmap-anydpi-v26/new_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/res/mipmap-anydpi-v26/new_launcher_round.xml b/src/main/res/mipmap-anydpi-v26/new_launcher_round.xml deleted file mode 100644 index 6f2acb4f0..000000000 --- a/src/main/res/mipmap-anydpi-v26/new_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/res/mipmap-hdpi/ic_launcher_background.png b/src/main/res/mipmap-hdpi/ic_launcher_background.png deleted file mode 100644 index 9fc237597..000000000 Binary files a/src/main/res/mipmap-hdpi/ic_launcher_background.png and /dev/null differ diff --git a/src/main/res/mipmap-hdpi/new_launcher.png b/src/main/res/mipmap-hdpi/new_launcher.png deleted file mode 100644 index 400171d4c..000000000 Binary files a/src/main/res/mipmap-hdpi/new_launcher.png and /dev/null differ diff --git a/src/main/res/mipmap-hdpi/new_launcher_round.png b/src/main/res/mipmap-hdpi/new_launcher_round.png deleted file mode 100644 index c79e3de75..000000000 Binary files a/src/main/res/mipmap-hdpi/new_launcher_round.png and /dev/null differ diff --git a/src/main/res/mipmap-mdpi/ic_launcher_background.png b/src/main/res/mipmap-mdpi/ic_launcher_background.png deleted file mode 100644 index e15a5c98d..000000000 Binary files a/src/main/res/mipmap-mdpi/ic_launcher_background.png and /dev/null differ diff --git a/src/main/res/mipmap-mdpi/new_launcher.png b/src/main/res/mipmap-mdpi/new_launcher.png deleted file mode 100644 index 9e88d856e..000000000 Binary files a/src/main/res/mipmap-mdpi/new_launcher.png and /dev/null differ diff --git a/src/main/res/mipmap-mdpi/new_launcher_round.png b/src/main/res/mipmap-mdpi/new_launcher_round.png deleted file mode 100644 index 8e507e761..000000000 Binary files a/src/main/res/mipmap-mdpi/new_launcher_round.png and /dev/null differ diff --git a/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/src/main/res/mipmap-xhdpi/ic_launcher_background.png deleted file mode 100644 index 02e2693e7..000000000 Binary files a/src/main/res/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ diff --git a/src/main/res/mipmap-xhdpi/new_launcher.png b/src/main/res/mipmap-xhdpi/new_launcher.png deleted file mode 100644 index 5970148eb..000000000 Binary files a/src/main/res/mipmap-xhdpi/new_launcher.png and /dev/null differ diff --git a/src/main/res/mipmap-xhdpi/new_launcher_round.png b/src/main/res/mipmap-xhdpi/new_launcher_round.png deleted file mode 100644 index ec3319e28..000000000 Binary files a/src/main/res/mipmap-xhdpi/new_launcher_round.png and /dev/null differ diff --git a/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/src/main/res/mipmap-xxhdpi/ic_launcher_background.png deleted file mode 100644 index d099bcd16..000000000 Binary files a/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ diff --git a/src/main/res/mipmap-xxhdpi/new_launcher.png b/src/main/res/mipmap-xxhdpi/new_launcher.png deleted file mode 100644 index 91b23c3a8..000000000 Binary files a/src/main/res/mipmap-xxhdpi/new_launcher.png and /dev/null differ diff --git a/src/main/res/mipmap-xxhdpi/new_launcher_round.png b/src/main/res/mipmap-xxhdpi/new_launcher_round.png deleted file mode 100644 index e3210f44a..000000000 Binary files a/src/main/res/mipmap-xxhdpi/new_launcher_round.png and /dev/null differ diff --git a/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png deleted file mode 100644 index 52166eae8..000000000 Binary files a/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ diff --git a/src/main/res/mipmap-xxxhdpi/new_launcher.png b/src/main/res/mipmap-xxxhdpi/new_launcher.png deleted file mode 100644 index 6f7620306..000000000 Binary files a/src/main/res/mipmap-xxxhdpi/new_launcher.png and /dev/null differ diff --git a/src/main/res/mipmap-xxxhdpi/new_launcher_round.png b/src/main/res/mipmap-xxxhdpi/new_launcher_round.png deleted file mode 100644 index d006aeef9..000000000 Binary files a/src/main/res/mipmap-xxxhdpi/new_launcher_round.png and /dev/null differ diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index e886542b0..8fc1541c6 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -473,8 +473,6 @@ إختر اللون المناسب سمة فاتحة سمة مظلمة - خلفية خضراء - إستخدم خلفية خضراء للرسائل المُستَلَمة تعذر الربط بأوبن كي تشاين لم يعُد هذا الجهاز مُستعمَلًا كمبيوتر diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index 6813b52e4..f3b342e0a 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -512,7 +512,7 @@ Грешка в сигурността: неправилен достъп до файл Няма намерено приложение за споделяне на адреса Споделяне на адреса с… - Jabber е мрежа за общуване чрез мигновени съобщения, която не е обвързана с конкретен доставчик. Можете да използвате клиента с всеки сървър, който работи с Jabber.\nЗа Ваше удобство, ние предоставяме лесен начин да си създадете профил в conversations.im¹ — сървър, пригоден да работи добре с Conversations. + Jabber е мрежа за общуване чрез мигновени съобщения, която не е обвързана с конкретен доставчик. Можете да използвате клиента с всеки сървър, който работи с Jabber.\nЗа Ваше удобство, ние предоставяме лесен начин да си създадете профил в chat.sum7.eu — сървър, пригоден да работи добре с Conversations. Ще преминем заедно с Вас през процеса за създаване на профил в conversations.im.¹\nАко изберете да използвате conversations.im, ще можете да общувате с потребители, използващи други сървъри, като им дадете своя пълен Jabber идентификатор. Вашият пълен Jabber идентификатор ще бъде: %s Създаване на профил @@ -545,8 +545,6 @@ Изберете цветовата схема Светла тема Тъмна тема - Зелен фон - Получените съобщения ще бъдат на зелен фон Неуспешно свързване с OpenKeychain Това устройство вече не се използва Компютър diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 4c5c5c0c5..379098939 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -551,8 +551,6 @@ d\'altres proveïdors donant-los la vostra ID Jabber completa. Seleccioneu la paleta de colors Tema clar Tema fosc - Fons verd - Utilitzeu fons verd per als missatges rebuts No es pot connectar a OpenKeychain Aquest dispositiu ja no està en ús Ordinador diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index e9bd1fca2..8e40bd806 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -456,8 +456,6 @@ Vybrat paletu barev Světlý vzhled Tmavý vzhled - Zelené pozadí - Použít zelené pozadí pro přijaté zprávy Nelze se spojit s OpenKeychain Tento přístoj již není používán Počítač diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 44b5c371f..b980942a7 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -510,7 +510,7 @@ Sicherheitsfehler: Dateizugriff nicht erlaubt Keine Anwendung zum Teilen der URI gefunden Teile URI mit… - Jabber ist ein anbieterunabhängiges Instant Messaging Netzwerk. Du kannst diesen Client mit jedem beliebigen Jabber-Server nutzen.\nUm es dir leicht zu machen, haben wir die Möglichkeit geschaffen, ein Konto auf conversations.im¹ anzulegen; ein Anbieter, der speziell für die Verwendung mit Conversations geeignet ist. + Jabber ist ein anbieterunabhängiges Instant Messaging Netzwerk. Du kannst diesen Client mit jedem beliebigen Jabber-Server nutzen.\nUm es dir leicht zu machen, haben wir die Möglichkeit geschaffen, ein Konto auf chat.sum7.eu anzulegen; ein Anbieter, der speziell für die Verwendung mit Conversations geeignet ist. Wir führen dich durch den Prozess der Kontoerstellung auf conversations.im.¹\nWenn du conversations.im als Provider wählst, kannst du mit Nutzern anderer Anbieter kommunizieren, indem du ihnen deine vollständige Jabber-ID gibst. Deine vollständige Jabber ID lautet: %s Konto erstellen @@ -543,8 +543,6 @@ Wähle die Farbpalette aus Helles Design Dunkles Design - Grüner Hintergrund - Für empfangene Nachrichten grünen Hintergrund verwenden Verbindung zu OpenKeychain nicht möglich Dieses Gerät ist nicht länger in Benutzung Computer diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 97eed5804..064a4459c 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -510,7 +510,7 @@ Error de seguridad: Acceso a fichero inválido No se ha encontrado ninguna aplicación para compartir la URI Compartir URI con... - Jabber es una red de mensajería instantánea independiente del proveedor. Puedes usar este cliente con cualquier servidor Jabber que elijas.\nSin embargo, para tu conveniencia, hacemos de forma sencilla la creación de una cuenta en conversations.im¹; un proveedor especialmente especializado para el uso con Conversations. + Jabber es una red de mensajería instantánea independiente del proveedor. Puedes usar este cliente con cualquier servidor Jabber que elijas.\nSin embargo, para tu conveniencia, hacemos de forma sencilla la creación de una cuenta en chat.sum7.eu; un proveedor especialmente especializado para el uso con Conversations. Te guiaremos durante el proceso de creación de la cuenta en conversations.im.¹\nCuando selecciones conversations.im como proveedor podrás comunicarte con usuarios de otros servidores mediante tu identificador Jabber. Tu identificador Jabber será: %s Crear cuenta @@ -543,8 +543,6 @@ Selecciona el color de la paleta Tema claro Tema oscuro - Fondo verde - Usar fondo verde para mensajes recibidos No se ha podido conectar a OpenKeychain Este dispositivo ya no está en uso Ordenador diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 1bb246a13..bb9b51d11 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -510,8 +510,8 @@ Segurtasun akatsa: fitxategi sarrera baliogabea Ez da aplikaziorik aurkitu URIa partekatzeko URIa honekin partekatu... - Jabber hornitzaleez independiente den protokolo bat da. Bezero hau aukeratzen duzun edozein Jabber zerbitzariarekin erabili dezakezu.\nHala ere zure erosotasunerako conversations.im¹-en, Conversationsekin bereziki erabiltzeko egokia den hornitzaile batean, kontu bat sortzea erraz egin dugu. - conversations.im-en kontu bat sortzeko prozesuan zehar gidatuko zaitugu.\nconversations.im¹ hornitzaile bezala aukeratzerakoan beste hornitzaileen erabiltzaileekin komunikatzeko gai izango zara haiei zure Jabber ID osoa emanez. + Jabber hornitzaleez independiente den protokolo bat da. Bezero hau aukeratzen duzun edozein Jabber zerbitzariarekin erabili dezakezu.\nHala ere zure erosotasunerako chat.sum7.eu-en, Conversationsekin bereziki erabiltzeko egokia den hornitzaile batean, kontu bat sortzea erraz egin dugu. + conversations.im-en kontu bat sortzeko prozesuan zehar gidatuko zaitugu.\nchat.sum7.eu hornitzaile bezala aukeratzerakoan beste hornitzaileen erabiltzaileekin komunikatzeko gai izango zara haiei zure Jabber ID osoa emanez. Zure Jabber ID osoa %s izango da Kontua sortu Nire hornitzale propioa erabili @@ -543,8 +543,6 @@ Kolore paleta hautatu Gai argia Gai iluna - Atzealde berdea - Atzealde berdea erabili jasotako mezuentzat Ezin izan da OpenKeychainekin konektatu Gailu hau ez da gehiago erabiltzen Ordenagailua diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index e440816fb..3d7949256 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -510,7 +510,7 @@ Erreur de sécurité : accès fichier non-valide Aucune application trouvée pour partager l\'URI Partager l\'URI avec... - Jabber est un réseau de messagerie instantanée indépendant du fournisseur. Vous pouvez utiliser ce client avec n\'importe quel serveur Jabber que vous choisissez.\nToutefois, pour votre commodité, nous avons facilité la création d\'un compte sur conversations.im¹ ; un fournisseur spécialement adapté à l\'utilisation avec Conversations. + Jabber est un réseau de messagerie instantanée indépendant du fournisseur. Vous pouvez utiliser ce client avec n\'importe quel serveur Jabber que vous choisissez.\nToutefois, pour votre commodité, nous avons facilité la création d\'un compte sur chat.sum7.eu ; un fournisseur spécialement adapté à l\'utilisation avec Conversations. Nous vous guiderons pendant toute la procédure de création d\'un compte utilisateur sur conversations.im.¹\nEn choisissant conversations.im comme fournisseur, vous pourrez communiquer avec les utilisateurs d\'autres fournisseurs en leur transmettant votre Jabber ID complet. Votre Jabber ID complet sera : %s Créer un compte @@ -543,8 +543,6 @@ Choisir la palette de couleurs Thème Clair Thème Sombre - Fond Vert - Utiliser un fond vert pour les messages reçus Connection à OpenKeychain impossible Cet appareil n\'est plus utilisé Ordinateur diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 0158e8464..d15a3d431 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -510,7 +510,7 @@ Fallo na seguridade: Acceso non válido ao ficheiro Non se atopou un aplicativo para compartir URI Compartir URI con... - Jabber é una rede de mensajería instantánea independente do proveedor. Podes usar este cliente con calquera servidor Jabber que elixas.\nCon todo, para a túa comodidade facilitamos a creación dunha conta en conversations.im¹; un proveedor especialmente adecuado para o uso con Conversations. + Jabber é una rede de mensajería instantánea independente do proveedor. Podes usar este cliente con calquera servidor Jabber que elixas.\nCon todo, para a túa comodidade facilitamos a creación dunha conta en chat.sum7.eu; un proveedor especialmente adecuado para o uso con Conversations. Guiarémola a través do proceso de crear unha conta en conversations.im.\nCando escolla conversations.im como proveedor poderá comunicarse con outras usuarias de outros proveedores que lle proporcionen un ID Jabber completo. O seu ID Jabber será: %s Crear conta @@ -543,8 +543,6 @@ Escolla a gama de cores Decorado claro Decorado oscuro - Fondo verde - Utilizar fondo verde para mensaxes recibidas Non se puido conectar con OpenKeychain Este dispositivo xa non está en uso Computadora diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index 561b0c87f..4696fb66a 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -510,7 +510,7 @@ Biztonsági hiba: Érvénytelen fájl hozzáférés Nem találtunk URI-t használó alkalmazást Megosztás URI-ként - A Jabber egy szolgáltató független, azonnali üzenetküldő hálózat. Ezt az ügyfél programot bármelyik Jabber szerverhez használhatja.\nDe a könnyebbség kedvéért létrehozhat egy fiókot a conversations.im¹ szolgáltatón is; ami kifejezetten a Conversations programmal való használatra lett tervezve. + A Jabber egy szolgáltató független, azonnali üzenetküldő hálózat. Ezt az ügyfél programot bármelyik Jabber szerverhez használhatja.\nDe a könnyebbség kedvéért létrehozhat egy fiókot a chat.sum7.eu szolgáltatón is; ami kifejezetten a Conversations programmal való használatra lett tervezve. Végigvezetjük a fiók létrehozás folyamatán a conversations.im-en.¹ \ nHa a conversations.im-et választja szolgáltatójának, akkor képes lesz kommunikálni a más szolgáltatóknál lévő felhasználókkal, ha megadja nekik a teljes Jabber azonosítóját. A teljes Jabber azonosítód ez lesz: %s Fiók létrehozása @@ -543,8 +543,6 @@ Színséma kiválasztása Világos téma Sötét téma - Zöld háttér - Használjon zöld hátteret a kapott üzenetek kiemelésére Nem sikerült csatlakozni a OpenKeychain-hez Ez az eszköz már nincs használatban Számítógép diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml index ad9d4d8d0..6db275cd3 100644 --- a/src/main/res/values-id/strings.xml +++ b/src/main/res/values-id/strings.xml @@ -364,6 +364,4 @@ Tema Tema Terang Tema Gelap - Latar Hijau - Gunakan latar hijau untuk pesan masuk diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 3fd722277..03112e8bb 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -510,7 +510,7 @@ Errore di sicurezza: accesso file non valido Nessuna applicazione trovata per condividere l\'URI Condividi l\'URI con... - Jabber è una rete di messaggeria istantanea indipendente dal provider. Puoi usare questo client con qualsiasi server Jabber scelto.\nComunque, per tua comodità, abbiamo semplificato la creazione di un account su conversations.im¹; un provider particolarmente adatto all\'uso con Conversations. + Jabber è una rete di messaggeria istantanea indipendente dal provider. Puoi usare questo client con qualsiasi server Jabber scelto.\nComunque, per tua comodità, abbiamo semplificato la creazione di un account su chat.sum7.eu; un provider particolarmente adatto all\'uso con Conversations. Ti guideremo nel processo di creazione di un account su conversations.im.¹\nQuando scegli conversations.im come provider potrai comunicare con utenti di altri provider dando il tuo ID Jabber completo. Il tuo ID Jabber completo sarà: %s Crea account @@ -543,8 +543,6 @@ Seleziona il colore Tema chiaro Tema scuro - Sfondo verde - Usa sfondo verde per messaggi ricevuti Impossibile connettersi a OpenKeychain Questo dispositivo non è più in uso Computer diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index b10164043..95f04ae3f 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -505,8 +505,6 @@ カラーパレットの選択 ライトテーマ ダークテーマ - 緑の背景 - 受信したメッセージに緑の背景を使用します OpenKeychain に接続できません このデバイスは、現在使用されていません コンピューター diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 46cd807a8..76ef27c81 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -457,8 +457,6 @@ 색상 팔레트를 선택 라이트 테마 다크 테마 - 초록색 배경 - 받은 메시지에 녹색 배경을 사용합니다 OpenKeychain 에 연결할 수 없습니다 이 장치는 현재 사용되고 있지 않습니다 컴퓨터 diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml index ea0a994c0..a12659e04 100644 --- a/src/main/res/values-nb-rNO/strings.xml +++ b/src/main/res/values-nb-rNO/strings.xml @@ -513,8 +513,6 @@ Velg fargepalett Lys drakt Mørk drakt - Grønn bakgrunn - Bruk grønn bakgrunn for mottatte meldinger Kunne ikke koble til OpenKeychain Denne enheten er ikke lenger i bruk Datamaskin diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 2fd7b8746..0d25a387e 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -512,8 +512,8 @@ Beveiligingsfout: Ongeldige bestandstoegang Geen applicatie om URI te delen URI delen met… - Jabber is een provider-onafhankelijk berichtennetwerk. Je kan deze cliënt gebruiken met elke willekeurige Jabber-server.\nOm het je gemakkelijker te maken kun je simpelweg een account aanmaken conversations.im¹; een provider speciaal geschikt voor Conversations. - We zullen je helpen een account op conversations.im¹ aan te maken.\nWanneer je conversations.im als je provider kiest kan je met gebruikers van andere providers communiceren door hen je volledige Jabber-ID te geven. + Jabber is een provider-onafhankelijk berichtennetwerk. Je kan deze cliënt gebruiken met elke willekeurige Jabber-server.\nOm het je gemakkelijker te maken kun je simpelweg een account aanmaken chat.sum7.eu; een provider speciaal geschikt voor Conversations. + We zullen je helpen een account op chat.sum7.eu aan te maken.\nWanneer je conversations.im als je provider kiest kan je met gebruikers van andere providers communiceren door hen je volledige Jabber-ID te geven. Je volledige Jabber-ID zal %s zijn Account aanmaken Gebruik mijn eigen provider @@ -545,8 +545,6 @@ Kies het kleurenpalet Licht thema Donker thema - Groene achtergrond - Gebruik groene achtergrond voor ontvangen berichten Verbinden met OpenKeychain mislukt Dit apparaat wordt niet meer gebruikt Computer diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index edb78981a..ddd6de5cd 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -548,8 +548,6 @@ Dla twojej wygody ułatwiliśmy stworzenie konta na conversations.im; serwerze d Wybierz paletę kolorów Jasna skórka Ciemna skórka - Zielone tło - Używaj zielonego tła dla otrzymanych wiadomości Nie można połączyć się z OpenKeychain Urządzenie to nie jest już używane Komputer diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 7b135d0c1..51de27d6f 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -510,7 +510,7 @@ Erro de segurança: Acesso inválido ao arquivo Não foi encontrado nenhum aplicativo para compartilhar a URI Compartilhar a URI com... - Jabber é uma rede de mensageria instantânea independente de provedor. Você pode usar este cliente com qualquer servidor Jabber que você escolher.\nEntretanto, para sua conveniência, nós simplificamos o processo de criação de uma conta no conversations.im¹; um provedor especialmente configurado para ser usado com o Conversations. + Jabber é uma rede de mensageria instantânea independente de provedor. Você pode usar este cliente com qualquer servidor Jabber que você escolher.\nEntretanto, para sua conveniência, nós simplificamos o processo de criação de uma conta no chat.sum7.eu; um provedor especialmente configurado para ser usado com o Conversations. Nós guiaremos você ao longo do processo de criar uma conta em conversations.im.¹\nAo usar esse provedor você também poderá se comunicar com usuários de outros provedores. Basta fornecê-los a sua identificação Jabber completa. Sua ID Jabber será: %s Criar conta @@ -543,8 +543,6 @@ Selecione a paleta de cores Tema claro Tema escuro - Fundo verde - Usa um fundo verde no recebimento de mensagens. Não foi possível conectar ao OpenKeychain Este dispositivo não está mais em uso Computador diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index fc8df55d0..67b296332 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -501,8 +501,6 @@ Escolher a palete de cores Tema Claro Tema Escuro - Fundo Verde - Usar fundo verde para mensagens recebidas Não foi possível ligar ao OpenKeychain Este dispositivo já não está em uso Computador diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml index 35d53307f..a30a49488 100644 --- a/src/main/res/values-ro-rRO/strings.xml +++ b/src/main/res/values-ro-rRO/strings.xml @@ -514,7 +514,7 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați Eroare de securitate.: Acces fișier invalid Nu s-a găsit nici o aplicație care să partajeze adresa Partajează adresa cu... - Jabber este o rețea de mesagerie instant ce nu depinde de un anumit furnizor. Aveți posibilitatea să utilizați acest client cu orice server Jabber doriți.\nTotuși, pentru confortul dumneavoastră, am facilitat crearea unui cont pe conversations.im¹; un furnizor potrivit pentru utilizarea cu aplicația Conversations. + Jabber este o rețea de mesagerie instant ce nu depinde de un anumit furnizor. Aveți posibilitatea să utilizați acest client cu orice server Jabber doriți.\nTotuși, pentru confortul dumneavoastră, am facilitat crearea unui cont pe chat.sum7.eu; un furnizor potrivit pentru utilizarea cu aplicația Conversations. Vă vom ghida prin procesul de creare al unui cont pe conversations.im.¹\nCând alegeți conversations.im ca furnizor veți putea comunica cu utilizatorii altor furnizori oferindu-le ID-ul dumneavoastră Jabber. ID-ul Jabber va fi: %s Creează cont @@ -547,8 +547,6 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați Selecție paletă culori interfață Tema luminoasă Tema întunecată - Fundal verde - Pentru mesajele primite Nu s-a putut contacta OpenKeychain Acest dispozitiv nu mai este in uz PC diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 10876e189..0a104a98d 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -508,7 +508,7 @@ Ошибка безопасности: недействительный доступ к файлу Не найдено приложения для отправки Отправить URI… - Мы поможем Вам создать аккаунт на conversations.im¹.\nВыбрав conversations.im в качестве провайдера, вы сможете общаться с пользователями других провайдеров, сообщив им свой полный Jabber ID. + Мы поможем Вам создать аккаунт на chat.sum7.eu.\nВыбрав conversations.im в качестве провайдера, вы сможете общаться с пользователями других провайдеров, сообщив им свой полный Jabber ID. Ваш полный Jabber ID: %s Создать аккаунт Использовать свой провайдер @@ -537,8 +537,6 @@ Выбрать цветовую палитру Светлая тема Тёмная тема - Зелёный фон - Использовать зелёный фон для полученных сообщений Не удалось подключиться к OpenKeychain Данное устройство больше не используется Компьютер diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index 094b031ee..ff98dbb02 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -529,8 +529,6 @@ Избор палете боја Светла тема Тамна тема - Зелена позадина - Зелена позадина за примљене поруке Не могу да се повежем са Отвореним кључарником Овај уређај више није у употреби Рачунар diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 27f268505..fd840476b 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -464,8 +464,6 @@ Välj färgschema Ljust tema Mörkt tema - Grön bakgrund - Använd grön bakgrund för mottagna meddelanden Kan inte ansluta till OpenKeychain Denna enhet används inte längre Dator diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml index 7aaf4ea87..8f822c759 100644 --- a/src/main/res/values-tr-rTR/strings.xml +++ b/src/main/res/values-tr-rTR/strings.xml @@ -460,8 +460,6 @@ Renk paletini seçin Açık gövde Koyu gövde - Yeşil arka plan - Gelen iletiler için yeşil arka plan kullan OpenKeychain\'e bağlanılamıyor Bu aygıt artık kullanılmıyor Bilgisayar diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index d39f6f687..4a8125edc 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -474,8 +474,6 @@ Вибрати палітру кольорів Світла тема Темна тема - Зелене тло - Використовувати зелене тло для отриманих повідомлень Не можу зв\'язатися з OpenKeychain Цей пристрій більше не використовується Комп\'ютер diff --git a/src/main/res/values-w360dp/fineprint.xml b/src/main/res/values-w360dp/fineprint.xml deleted file mode 100644 index fa28fbed4..000000000 --- a/src/main/res/values-w360dp/fineprint.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - ¹ Optional conversations.im account €8/year. First 6 month free. - \ No newline at end of file diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index a46722e84..1fcc5fdf0 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -508,8 +508,8 @@ 安全错误：文件访问权限无效 未找到可以分享此链接的应用 分享链接…… - Jabber 是一个独立即时通讯网络服务商。无论您选择何种 Jabber 服务器，您都可使用本客户端\n但是为了让您更方便些，我们希望您在 conversations.im¹ 创建账号，它专门为 Conversations 服务。 - 我们将会引导你完成在 conversations.im¹ 上注册账号的过程。\n当获得了 conversations.im 提供的账号以后，你可以通过添加使用其他提供商的好友的完整 Jabber ID 来与他们联络。 + Jabber 是一个独立即时通讯网络服务商。无论您选择何种 Jabber 服务器，您都可使用本客户端\n但是为了让您更方便些，我们希望您在 chat.sum7.eu 创建账号，它专门为 Conversations 服务。 + 我们将会引导你完成在 chat.sum7.eu 上注册账号的过程。\n当获得了 conversations.im 提供的账号以后，你可以通过添加使用其他提供商的好友的完整 Jabber ID 来与他们联络。 您完整的 Jabble ID 是：%s 创建账户 使用我自己的服务端 @@ -541,8 +541,6 @@ 选择调色板 明亮主题 黑暗主题 - 绿色背景 - 接收到的消息使用绿色背景 无法连接到 OpenKeychain 此设备不再使用 计算机 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 5332a05a4..b45dfeb32 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -437,7 +437,7 @@ 安全錯誤：檔案存取無效 找不到可以分享網址(URI)的應用程式 分享網址(URI)… - 我們將會引導你完成在 conversations.im¹ 上註冊帳號的過程。\n當獲得了 conversations.im 提供的帳號以後，你可以通過添加使用其他提供商的好友的完整 Jabber ID 來與他們聯絡。 + 我們將會引導你完成在 chat.sum7.eu 上註冊帳號的過程。\n當獲得了 conversations.im 提供的帳號以後，你可以通過添加使用其他提供商的好友的完整 Jabber ID 來與他們聯絡。 您完整的 Jabble ID 是：%s 創建帳戶 使用我自己的服務端 @@ -464,8 +464,6 @@ 選擇調色板 明亮主題 黑暗主題 - 綠色背景 - 接收到的訊息使用綠色背景 無法連接到 OpenKeychain 此設備不再使用 電腦 diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 69474a4b4..532dfe5ef 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -20,20 +20,20 @@ #ffd50000 #ffff8a80 #ffc62828 - #ffff9800 + #ff4CAF50 #ff82B1FF #ff448AFF - #ff4CAF50 - #ff43A047 - #ff388E3C - #ff2E7D32 - #ff1B5E20 + #ffff9800 + #fffb8c00 + #ffF57C00 + #ffef6c00 + #ffe65100 - #ff4d8e50 - #ff295e2d + #ffF57C50 + #ffe65150 #c04CAF50 #ff2196f3 - \ No newline at end of file + diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 8e289f9c8..cc6da0c01 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -18,7 +18,6 @@ 524288 auto light - true false recent false diff --git a/src/main/res/values/fineprint.xml b/src/main/res/values/fineprint.xml deleted file mode 100644 index 55eeccb6d..000000000 --- a/src/main/res/values/fineprint.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - ¹ Optional conversations.im account €8/year. 6 month free. - \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 9403e5e28..c5c595f72 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -513,8 +513,8 @@ No application found to share URI Share URI with… Join the Conversation - Jabber is a provider independent instant messaging network. You can use this client with what ever Jabber server you choose.\nHowever for your convenience we made it easy to create an account on conversations.im¹; a provider specially suited for the use with Conversations. - We will guide you through the process of creating an account on conversations.im.¹\nWhen picking conversations.im as a provider you will be able to communicate with users of other providers by giving them your full Jabber ID. + Jabber is a provider independent instant messaging network. You can use this client with what ever Jabber server you choose.\nHowever for your convenience we made it easy to create an account on chat.sum7.eu; a provider specially suited for the use with Conversations. + We will guide you through the process of creating an account on chat.sum7.eu.\nWhen picking chat.sum7.eu as a provider you will be able to communicate with users of other providers by giving them your full Jabber ID. Your full Jabber ID will be: %s Create Account Use my own provider @@ -546,8 +546,6 @@ Select the color palette Light theme Dark theme - Green Background - Use green background for received messages Unable to connect to OpenKeychain This device is no longer in use Computer diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 054a66e83..c3dcfb1a1 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -2,8 +2,8 @@ - \ No newline at end of file + diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index c7f4b159c..c64be534b 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -158,11 +158,6 @@ android:key="theme" android:summary="@string/pref_theme_options_summary" android:title="@string/pref_theme_options" /> -