diff --git a/README.md b/README.md index 2f00ce89a..c757f47e3 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,25 @@ -

Conversations

+

Conversations for Sum7

Conversations: the very last word in instant messaging

- - + chat on our conference room - - + build status - - Bountysource -

-

- - Google Play - - - Amazon App Store - -

+![screenshots](screenshots.png) -![screenshots](https://raw.githubusercontent.com/siacs/Conversations/master/screenshots.png) +[Get it on F-Droid](https://git.sum7.eu/sum7/Conversations-nightly/raw/master/fdroid/repo) + +[![https://git.sum7.eu/sum7/Conversations-nightly/raw/master/fdroid/repo](https://git.sum7.eu/sum7/Conversations-nightly/raw/master/icon.png)](https://git.sum7.eu/sum7/Conversations-nightly/raw/master/fdroid/repo) ## Design principles @@ -92,38 +84,8 @@ Conversations is entirely open source and licensed under GPLv3. So if you are a software developer you can check out the sources from GitHub and use Gradle to build your apk file. -The more convenient way — which not only gives you automatic updates but also -supports the further development of Conversations — is to buy the App in the -Google [Play Store](https://play.google.com/store/apps/details?id=eu.siacs.conversations&referrer=utm_source%3Dgithub). - -Buying the App from the Play Store will also give you access to our [beta test](#beta). - -#### I don't have a Google Account but I would still like to make a contribution - -I accept donations over PayPal, bank transfer and various crypto currencies. For donations via PayPal you -can use the email address `donate@siacs.eu` or the button below. - -[![Donate with PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=CW3SYT3KG5PDL) - -**Disclaimer:** I'm not a huge fan of PayPal and their business policies. For -larger contributions please get in touch with me beforehand and we can talk -about bank transfer (SEPA). - -##### Crypto currencies - -Bitcoin: `1AeqNAcg85APAZj9BZfAjdFCC5zesqXp2B` - -Bitcoin Cash: `16ABkXzYAwWz8Y5DcWFfbBRqL63g3hzEaU` - -Ether: `0x5c4e5239cd9c6f4a909e4e8361526e2e3c8ba9fa` - #### How do I create an account? -XMPP, like email, is a federated protocol, which means that there is not one company you can create an *official XMPP account* with. Instead there are hundreds, or even thousands, of providers out there. One of those providers is our very own [conversations.im](https://account.conversations.im). If you don’t like to use *conversations.im* use a web search engine of your choice to find another provider. Or maybe your university has one. Or you can run your own. Or ask a friend to run one. Once you've found one, you can use Conversations to create an account. Just select *register new account* on server within the create account dialog. - -##### Domain hosting -Using your own domain not only gives you a more recognizable Jabber ID, it also gives you the flexibility to migrate your account between different XMPP providers. This is a good compromise between the responsibilities of having to operate your own server and the downsides of being dependent on a single provider. - -Learn more about [conversations.im Jabber/XMPP domain hosting](https://account.conversations.im/domain/). +XMPP, like email, is a federated protocol, which means that there is not one company you can create an *official XMPP account* with. Instead there are hundreds, or even thousands, of providers out there. One of those providers is our very own [chat.sum7.eu](https://chat.sum7.eu). If you don’t like to use *chat.sum7.eu* use a web search engine of your choice to find another provider. Or maybe your university has one. Or you can run your own. Or ask a friend to run one. Once you've found one, you can use Conversations to create an account. Just select *register new account* on server within the create account dialog. ##### Running your own If you already have a server somewhere and are willing and able to put the necessary work in, one alternative-in the spirit of federation-is to run your own. We recommend either [Prosody](https://prosody.im/) or [ejabberd](https://www.ejabberd.im/). Both of which have their own strengths. Ejabberd is slightly more mature nowadays but Prosody is arguably easier to set up. @@ -195,16 +157,12 @@ If you don’t want this simply pick a server which does not offer Push Notifica #### Conversations doesn’t work for me. Where can I get help? -You can join our conference room on `conversations@conference.siacs.eu`. +You can join our conference room on `support@conference.chat.sum7.eu`. A lot of people in there are able to answer basic questions about the usage of Conversations or can provide you with tips on running your own XMPP server. If you found a bug or your app crashes please read the Developer / Report Bugs section of this document. -#### I need professional support with Conversations or setting up my server - -I'm available for hire. Contact me at `inputmice@siacs.eu`. - #### How does the address book integration work? The address book integration was designed to protect your privacy. Conversations @@ -303,10 +261,6 @@ will it accelerate the development. Just write it yourself and send me a pull request. If I like it I will happily merge it if I don't at least you and like minded people get to enjoy it. -#### I need a feature and I need it now! - -I am available for hire. Contact me via XMPP: `inputmice@siacs.eu` - ### Security #### Why are there two end-to-end encryption methods and which one should I choose? @@ -383,11 +337,6 @@ Unfortunately we don‘t have a recommendation for iPhones right now. There are ### Development - -#### Beta testing -If you bought the App on [Google Play](https://play.google.com/store/apps/details?id=eu.siacs.conversations) -you can get access to the the latest beta version by signing up using [this link](https://play.google.com/apps/testing/eu.siacs.conversations). - #### How do I build Conversations Make sure to have ANDROID_HOME point to your Android SDK. Use the Android SDK Manager to install missing dependencies. @@ -399,7 +348,7 @@ Make sure to have ANDROID_HOME point to your Android SDK. Use the Android SDK Ma There are two build flavors available. *free* and *playstore*. Unless you know what you are doing you only need *free*. -[![Build Status](https://travis-ci.org/siacs/Conversations.svg?branch=development)](https://travis-ci.org/siacs/Conversations) +[![Build Status](https://git.sum7.eu/sum7/Conversations/badges/develop/build.svg](https://git.sum7.eu/sum7/Conversations/pipelines) #### How do I update/add external libraries? @@ -450,4 +399,4 @@ Play Store version or the current HEAD. If you are having problems connecting to your XMPP server your file transfer doesn’t work as expected please always include a logcat debug output with your issue (see above). -[issues]: https://github.com/siacs/Conversations/issues +[issues]: https://git.sum7.eu/sum7/Conversations/issues 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)"> - diff --git a/src/conversations/res/layout/welcome.xml b/src/conversations/res/layout/welcome.xml index 1c23119f7..e33c1abe8 100644 --- a/src/conversations/res/layout/welcome.xml +++ b/src/conversations/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/AndroidManifest.xml b/src/main/AndroidManifest.xml index b0623dd76..84a24dd5e 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -52,7 +52,7 @@ 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())) { @@ -810,13 +809,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); @@ -915,7 +908,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 new file mode 100644 index 000000000..4352eac04 Binary files /dev/null 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 eb64a1e22..c22689eb3 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 23789900d..4a997c145 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/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 4fb7faeb3..dc8d1e529 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 9bb617fa5..6c07d304d 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 9b7ce26c3..bc9d39cdf 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 7130402e9..482aa020d 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 933f6a52e..1f7204479 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 1bcd6e0d7..0bd119c59 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 a2db7445c..3cfa4ed51 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-mdpi/date_bubble_grey.9.png b/src/main/res/drawable-mdpi/date_bubble_grey.9.png index 0a0ebb220..6b7edbbc2 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 40f26d399..201bfe4e0 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/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 f56284415..b2a709412 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 ecfb9f427..084b55805 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 f2d79acee..83907e15e 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 2a81873ff..48b5b790e 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 5e9cb12a6..ba7a3138b 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 b7cc611fa..3c3a5814f 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 57819cbae..6773fe7e6 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-xhdpi/date_bubble_grey.9.png b/src/main/res/drawable-xhdpi/date_bubble_grey.9.png index 4c06bdf80..a17f24441 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 2a96b9bfb..6b0e0c141 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/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 e479bfb39..f0f0bba24 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 6ab302b2c..9ae6dfc09 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 03d423b87..afc465708 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 ef2cc4fce..d88955845 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 4404bcfd4..87c10f25b 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 5db6951e1..e273ae16b 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 5c28d1caa..0c1dee948 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-xxhdpi/date_bubble_grey.9.png b/src/main/res/drawable-xxhdpi/date_bubble_grey.9.png index b7e9b500e..61987d898 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 82d25540e..67a0e1a2e 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/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 4670b8296..1a6fa9b91 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 415fd1573..c91bd98dc 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 76bff006c..ce54eb8d5 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 e24a829be..836f13008 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 16548c294..1ec8e672f 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 521e027f6..6c1f3c0a7 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 822344041..c1927323b 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-xxxhdpi/date_bubble_grey.9.png b/src/main/res/drawable-xxxhdpi/date_bubble_grey.9.png index 2eda42882..f8bf8c38a 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 dfc24fadc..520aa11bd 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/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 eccc90077..d20485e17 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 fa3ca2035..d74d7734c 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 acfa862d6..80e307258 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 555719ee6..6498b4179 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 9758293a7..56d0707dd 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 55fa42798..007ad3151 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 af45346c4..59e9c21cf 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/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/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index 39e98cfc9..e44cc6e80 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -467,8 +467,6 @@ إختر اللون المناسب سمة فاتحة سمة مظلمة - خلفية خضراء - إستخدم خلفية خضراء للرسائل المُستَلَمة تعذر الربط بأوبن كي تشاين لم يعُد هذا الجهاز مُستعمَلًا كمبيوتر diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index a6693c7db..e16f3e107 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -516,10 +516,10 @@ Грешка в сигурността: неправилен достъп до файл Няма намерено приложение за споделяне на адреса Споделяне на адреса с… - Jabber е мрежа за общуване чрез мигновени съобщения, която не е обвързана с конкретен доставчик. Можете да използвате клиента с всеки сървър, който работи с Jabber.\nЗа Ваше удобство, ние предоставяме лесен начин да си създадете профил в conversations.im¹ — сървър, пригоден да работи добре с Conversations. + Jabber е мрежа за общуване чрез мигновени съобщения, която не е обвързана с конкретен доставчик. Можете да използвате клиента с всеки сървър, който работи с Jabber.\nЗа Ваше удобство, ние предоставяме лесен начин да си създадете профил в chat.sum7.eu — сървър, пригоден да работи добре с Conversations.
След като се впишете чрез телефонния си номер, Quicksy ще използва телефонните номера в адресния Ви указател, за да Ви предложи възможни контакти.

Регистрирайки се, Вие се съгласявате с нашата декларация за поверителност.]]> Съгласяване и продължаване - Ще преминем заедно с Вас през процеса за създаване на профил в conversations.im.¹\nАко изберете да използвате conversations.im, ще можете да общувате с потребители, използващи други сървъри, като им дадете своя пълен Jabber идентификатор. + Ще преминем заедно с Вас през процеса за създаване на профил в chat.sum7.eu.\nАко изберете да използвате chat.sum7.eu, ще можете да общувате с потребители, използващи други сървъри, като им дадете своя пълен Jabber идентификатор. Вашият пълен Jabber идентификатор ще бъде: %s Създаване на профил Използване на собствен сървър @@ -551,8 +551,6 @@ Изберете цветовата схема Светла тема Тъмна тема - Зелен фон - Получените съобщения ще бъдат на зелен фон Неуспешно свързване с OpenKeychain Това устройство вече не се използва Компютър diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 25adf6b5a..dc60a2b59 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -522,8 +522,8 @@ missatges.\n\nAra se us demanarà que desactiveu-las. utilitzar aquest client amb el servidor de Jabber que trieu.\nPerò per a la seva comoditat hem facilitat crear un compte a converses.im¹; un proveïdor especialment indicat per a l\'ús amb Conversations.
Vostè es registra amb el seu número de telèfon i Quicksy es basarà automàticament en els números de telèfon de la seva llibreta d\'adreces per suggerir-li possibles contactes.

En registrar-se vostè accepta la nostra política de privadesa . ]]> - Us guiarem pel procés de creació d\'un compte a conversations.im.¹\nQuan -trieu conversations.im com a proveïdor, podreu comunicar-vos amb els usuaris + Us guiarem pel procés de creació d\'un compte a chat.sum7.eu.\nQuan +trieu chat.sum7.eu com a proveïdor, podreu comunicar-vos amb els usuaris d\'altres proveïdors donant-los la vostra ID Jabber completa. La vostra Jabber ID completa serà: %s Crear compte @@ -556,8 +556,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 9cc4dd93e..ab883a182 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -423,7 +423,7 @@ Chyba zabezpečení: Neplatný přístup k souboru Nebyla nalezena aplikace pro sdílení URI Sdílet URI s... - Provedeme vás procesem založení uživatelského účtu u conversations.im.¹\nVybráním conversations.im za svého poskytovatele budete moci komunikovat s uživateli u jiných poskytovatelů, poté co jim sdělíte své Jabber ID. + Provedeme vás procesem založení uživatelského účtu u chat.sum7.eu.¹\nVybráním chat.sum7.eu za svého poskytovatele budete moci komunikovat s uživateli u jiných poskytovatelů, poté co jim sdělíte své Jabber ID. Vaše celé Jabber ID bude: %s Vytvořit účet Použít vlastního provozovatele @@ -450,8 +450,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 6608c962e..105bc8a63 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -516,10 +516,10 @@ 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.
Du registrierst dich mit deiner Telefonnummer und Quicksy wird automatisch auf der Grundlage der Telefonnummern in deinem Adressbuch mögliche Kontakte vorschlagen.

Mit der Anmeldung erklärst du dich mit unserer Datenschutzerklärung einverstanden.]]> Zustimmen & fortfahren - 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. + Wir führen dich durch den Prozess der Kontoerstellung auf chat.sum7.eu.\nWenn du chat.sum7.eu 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 Nutze eigenen Provider @@ -551,8 +551,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 4cb34b065..4e66e6bad 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -516,10 +516,10 @@ 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.
El registro se realiza con tu número de teléfono y Quicksy automáticamente—basado en los teléfonos de tu agenda de contactos—te sugerirá posibles contactos.

Registrándote en Quicksy aceptas nuestra política de privacidad.]]> Aceptar & continuar - 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. + Te guiaremos durante el proceso de creación de la cuenta en chat.sum7.eu.¹\nCuando selecciones chat.sum7.eu como proveedor podrás comunicarte con usuarios de otros servidores mediante tu identificador Jabber. Tu identificador Jabber será: %s Crear cuenta Usar otro proveedor de mi elección @@ -551,8 +551,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 a609ff92f..929bf58bb 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -511,9 +511,9 @@ 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. + 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. Onartu eta jarraitu - 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. + chat.sum7.eu-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 @@ -545,8 +545,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 4fb86e6f5..b5f89b768 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -502,8 +502,8 @@ 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. - 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. + 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 chat.sum7.eu.¹\nEn choisissant chat.sum7.eu 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 Utiliser votre propre fournisseur @@ -535,8 +535,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 7a506091e..672e3ae6a 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -516,10 +516,10 @@ 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.
Vostede rexístrase co seu número de teléfono e Quicksy suxerirá automáticamente —baseándose nos números de teléfono da súa axenda— posibles contactos para vostede.

Ao rexistrarse vostede acepta a nosa política de intimidade.]]> Aceptar & continuar - 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. + Guiarémola a través do proceso de crear unha conta en chat.sum7.eu.\nCando escolla chat.sum7.eu 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 Utilizar o meu propio proveedor @@ -551,8 +551,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 8e2eb2e3c..27968db4d 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -509,10 +509,10 @@ 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.
Regisztrál a telefonszámával, és a Quicksy automatikusan - a címjegyzékben szereplő telefonszámok alapján - jelzi a lehetséges kapcsolatokat.

A feliratkozással elfogadja azadatvédelmi irányelvet.]]> Egyetért & folytatás - 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. + Végigvezetjük a fiók létrehozás folyamatán a chat.sum7.eu-en.¹ \ nHa a chat.sum7.eu-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 Saját szolgáltató használata @@ -544,8 +544,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 a24d838a0..537ee35fe 100644 --- a/src/main/res/values-id/strings.xml +++ b/src/main/res/values-id/strings.xml @@ -360,6 +360,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 9fff497a2..086fb76d5 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -516,10 +516,10 @@ 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 registri con il tuo numero di telefono e Quicksy ti suggerirà—in base ai numeri di telefono nella tua rubrica—automaticamente i possibili contatti.

Registrandoti accetti la nostra politica sulla privacy.]]> Accetta e continua - 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. + Ti guideremo nel processo di creazione di un account su chat.sum7.eu.¹\nQuando scegli chat.sum7.eu come provider potrai comunicare con utenti di altri provider dando il tuo ID Jabber completo. Il tuo ID Jabber completo sarà: %s Crea account Usa un altro provider @@ -551,8 +551,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 0938fe8b8..04df98a76 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -473,7 +473,7 @@ セキュリティエラー: 不正なファイルアクセス URI を共有するアプリケーションが見つかりません …で URI を共有 - conversations.imのアカウントを作成する手順をガイドします。\nプロバイダーとしてconversations.imを選択すると、あなたの完全なJabber IDを指定することによって、他のプロバイダーのユーザと通信することができるようになります。 + chat.sum7.euのアカウントを作成する手順をガイドします。\nプロバイダーとしてchat.sum7.euを選択すると、あなたの完全なJabber IDを指定することによって、他のプロバイダーのユーザと通信することができるようになります。 あなたの完全な Jabber ID は: %s アカウントを作成 独自のプロバイダーを使用する @@ -502,8 +502,6 @@ カラーパレットの選択 ライトテーマ ダークテーマ - 緑の背景 - 受信したメッセージに緑の背景を使用します OpenKeychain に接続できません このデバイスは、現在使用されていません コンピューター diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index d4ab33d8a..df457af13 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -451,8 +451,6 @@ 색상 팔레트를 선택 라이트 테마 다크 테마 - 초록색 배경 - 받은 메시지에 녹색 배경을 사용합니다 OpenKeychain 에 연결할 수 없습니다 이 장치는 현재 사용되고 있지 않습니다 컴퓨터 diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml index 7d3719ace..b356c5959 100644 --- a/src/main/res/values-nb-rNO/strings.xml +++ b/src/main/res/values-nb-rNO/strings.xml @@ -476,7 +476,7 @@ Sikkerhetsfeil: Ugyldig filtilgang Fant inget program til deling av URI Del URI med… - Vi geleider deg gjennom prosessen med å opprette en konto på conversations.im.¹\nNår du velger conversations.im som tilbyder vil du kunne snakke med brukere fra andre tilbyder ved å gi dem din fulle XMPP-ID. + Vi geleider deg gjennom prosessen med å opprette en konto på chat.sum7.eu.¹\nNår du velger chat.sum7.eu som tilbyder vil du kunne snakke med brukere fra andre tilbyder ved å gi dem din fulle XMPP-ID. Din fulle Jabber-ID vil være: %s Opprett konto Bruk min egen tilbyder @@ -505,8 +505,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 82c26f081..d2bd84038 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -515,9 +515,9 @@ 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. + 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. Akkoord gaan & doorgaan - 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. + We zullen je helpen een account op chat.sum7.eu aan te maken.\nWanneer je chat.sum7.eu 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 @@ -549,8 +549,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 7a0b117ae..0184d69bb 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -521,10 +521,10 @@ Nie odnaleziono aplikacji skojarzonej z URI Udostępnij URI za pomocą... Jabber to niezależna sieć komunikacji natychmiastowej. Możesz użyć tego klienta z dowolnym serwerem który wybierzesz. -Dla twojej wygody ułatwiliśmy stworzenie konta na conversations.im; serwerze dostosowanym do Conversations. +Dla twojej wygody ułatwiliśmy stworzenie konta na chat.sum7.eu; serwerze dostosowanym do Conversations.
Zapisujesz się swoim numerem telefonu i Quicksy automatycznie — na podstawie numerów telefonów w twojej książce adresowej — zasugeruje możliwe kontakty.

Zapisując się zgadzasz się na naszą politykę prywatności.]]> Zgoda i kontynuuj - Przeprowadzimy Cię przez proces tworzenia konta na conversations.im.\nKiedy wybierzesz konto na serwerze conversations.im, będziesz mógł komunikować się z użytkownikami na innych serwerach podając im swój pełen Jabber ID. + Przeprowadzimy Cię przez proces tworzenia konta na chat.sum7.eu.\nKiedy wybierzesz konto na serwerze chat.sum7.eu, będziesz mógł komunikować się z użytkownikami na innych serwerach podając im swój pełen Jabber ID. Twój pełen Jabber ID będzie następujący: %s Utwórz konto Użyj innego serwera @@ -556,8 +556,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 45c49addd..30e30f3d2 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -516,10 +516,10 @@ 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.
Você se registra com o seu número de telefone e o Quicksy sugere automaticamente - baseado nos números de telefone do seu livro de endereços - possíveis contatos para você..

Ao se registrar você concorda com nossa política de privacidade.]]> Concordar & continuar - 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. + Nós guiaremos você ao longo do processo de criar uma conta em chat.sum7.eu.\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 Usar meu próprio provedor @@ -551,8 +551,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 d23030488..238968946 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -493,8 +493,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 77e31cf1a..c0acbf201 100644 --- a/src/main/res/values-ro-rRO/strings.xml +++ b/src/main/res/values-ro-rRO/strings.xml @@ -520,10 +520,10 @@ 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ă înscrieți cu numărul de telefon și Quicksy—pe baza numerelor de telefon din agenda dumneavoastră—vă va sugera automat posibile contacte.

Înscriindu-vă sunteți de acord cu politica noastră de confidențialitate.]]> De acord & continuă - 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. + Vă vom ghida prin procesul de creare al unui cont pe chat.sum7.eu.\nCând alegeți chat.sum7.eu ca furnizor veți putea comunica cu utilizatorii altor furnizori oferindu-le ID-ul dumneavoastră Jabber. ID-ul Jabber va fi: %s Creează cont Folosește furnizorul meu @@ -555,8 +555,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 c9c66fac9..48346c4a6 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -499,7 +499,7 @@ Ошибка безопасности: недействительный доступ к файлу Не найдено приложения для отправки Отправить URI… - Мы поможем Вам создать аккаунт на conversations.im¹.\nВыбрав conversations.im в качестве провайдера, вы сможете общаться с пользователями других провайдеров, сообщив им свой полный Jabber ID. + Мы поможем Вам создать аккаунт на chat.sum7.eu.\nВыбрав chat.sum7.eu в качестве провайдера, вы сможете общаться с пользователями других провайдеров, сообщив им свой полный Jabber ID. Ваш полный Jabber ID: %s Создать аккаунт Использовать свой провайдер @@ -528,8 +528,6 @@ Выбрать цветовую палитру Светлая тема Тёмная тема - Зелёный фон - Использовать зелёный фон для полученных сообщений Не удалось подключиться к OpenKeychain Данное устройство больше не используется Компьютер diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index db6de076c..7db027373 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -491,7 +491,7 @@ Безбедносна грешка: неисправан приступ фајлу Нема апликације за дељење веза Подели везу помоћу… - Водићемо вас кроз процес прављења налога на conversations.im.¹\nАко изаберете conversations.im за даваоца услуге моћи ћете да комуницирате са корисницима других сервера ако им дате ваш Џабер ИД. + Водићемо вас кроз процес прављења налога на chat.sum7.eu.¹\nАко изаберете chat.sum7.eu за даваоца услуге моћи ћете да комуницирате са корисницима других сервера ако им дате ваш Џабер ИД. Ваш пуни Џабер ИД ће бити: %s Направи налог Користићу сопствени провајдер @@ -520,8 +520,6 @@ Избор палете боја Светла тема Тамна тема - Зелена позадина - Зелена позадина за примљене поруке Не могу да се повежем са Отвореним кључарником Овај уређај више није у употреби Рачунар diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 1e06cd957..3e2968825 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -431,7 +431,7 @@ Säkerhetsfel: Ogiltig filaccess Ingen applikation kunde hittas för att dela URI Dela URI med... - Du kommer nu att få hjälp med att skapa ett konto på conversations.im.¹\nNär conversations.im väljs som leverantör kommer du kunna kommunicera med användare hos andra leverantörer genom att ge dem ditt Jabber ID. + Du kommer nu att få hjälp med att skapa ett konto på chat.sum7.eu.¹\nNär chat.sum7.eu väljs som leverantör kommer du kunna kommunicera med användare hos andra leverantörer genom att ge dem ditt Jabber ID. Ditt jabber ID blir: %s Skapa konto Använd min egen leverantör @@ -458,8 +458,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 214e18a2b..c66d4f9fc 100644 --- a/src/main/res/values-tr-rTR/strings.xml +++ b/src/main/res/values-tr-rTR/strings.xml @@ -454,8 +454,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 8277c3273..50db57f18 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -517,10 +517,10 @@ Помилка безпеки: Недійсний доступ до файлу Не знайдено програми, щоб поділитися URI Поділитися URI з… - Jabber забезпечує незалежну мережу обміну миттєвими повідомленнями. Ви можете використовувати цю програму з будь-яким сервером Jabber на Ваш вибір.\nЗадля Вашої зручності ми зробили простим створити обліковий запис на conversations.im¹; це один із серверів, який спеціально налаштований для цієї програми. + Jabber забезпечує незалежну мережу обміну миттєвими повідомленнями. Ви можете використовувати цю програму з будь-яким сервером Jabber на Ваш вибір.\nЗадля Вашої зручності ми зробили простим створити обліковий запис на chat.sum7.eu; це один із серверів, який спеціально налаштований для цієї програми.
Ви реєструєтеся зі своїм номером телефону, а програма автоматично, виходячи з номерів телефонів у Вашій книзі контактів, пропонує Вам можливі контакти.

Реєструючись, Ви надаєте згоду з нашою політикою конфіденційності.]]> Прийняти й продовжити - Ми допоможемо вам крок за кроком створити обліковий запис на conversations.im.¹\nОбравши conversations.im постачальником послуг, ви зможете спілкуватися з користувачами інших постачальників, надавши їм ваш повний Jabber ID. + Ми допоможемо вам крок за кроком створити обліковий запис на chat.sum7.eu.\nОбравши chat.sum7.eu постачальником послуг, ви зможете спілкуватися з користувачами інших постачальників, надавши їм ваш повний Jabber ID. Ваш повний Jabber ID буде: %s Створити обліковий запис Використати мого власного провайдера @@ -552,8 +552,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 e7b615271..2499db317 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -502,8 +502,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当获得了 chat.sum7.eu 提供的账号以后，你可以通过添加使用其他提供商的好友的完整 Jabber ID 来与他们联络。 您完整的 Jabble ID 是：%s 创建账户 使用我自己的服务端 @@ -535,8 +535,6 @@ 选择调色板 明亮主题 黑暗主题 - 绿色背景 - 接收到的消息使用绿色背景 无法连接到 OpenKeychain 此设备不再使用 计算机 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 3aefac558..5d3b108db 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -431,7 +431,7 @@ 安全錯誤：檔案存取無效 找不到可以分享網址(URI)的應用程式 分享網址(URI)… - 我們將會引導你完成在 conversations.im¹ 上註冊帳號的過程。\n當獲得了 conversations.im 提供的帳號以後，你可以通過添加使用其他提供商的好友的完整 Jabber ID 來與他們聯絡。 + 我們將會引導你完成在 chat.sum7.eu 上註冊帳號的過程。\n當獲得了 chat.sum7.eu 提供的帳號以後，你可以通過添加使用其他提供商的好友的完整 Jabber ID 來與他們聯絡。 您完整的 Jabble ID 是：%s 創建帳戶 使用我自己的服務端 @@ -458,8 +458,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 b5e32a639..b7a9adf1f 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 3b5d5e5e2..481af25b4 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -517,11 +517,11 @@ 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. + 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. Have some Quick Conversations
You sign up with your phone number and Quicksy will automatically—based on the phone numbers in your address book—suggest possible contacts to you.

By signing up you agree to our privacy policy.]]> Agree & continue - 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. + 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 @@ -553,8 +553,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 70841d057..c0e663337 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 ab5d21263..a3abe5969 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" /> -