aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2019-07-13 20:57:51 +0200
committersteckbrief <steckbrief@chefmail.de>2019-07-13 20:57:51 +0200
commitf23453c0a76219b71094214c95fef674de6ce4e2 (patch)
tree22de3cd6b7fd83f4e589a210f7c0c97f8cbcc56f
parentd288d6bb16164b5dca36e3559fde7220d3878e90 (diff)
implements FS#276: Remove 'Invite to Pix-Art Messenger'
-rw-r--r--src/main/java/de/pixart/messenger/services/NotificationService.java13
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationsActivity.java10
-rw-r--r--src/main/java/de/pixart/messenger/ui/XmppActivity.java66
-rw-r--r--src/main/res/menu/activity_conversations.xml5
-rw-r--r--src/main/res/values-ar/strings.xml4
-rw-r--r--src/main/res/values-bg/strings.xml6
-rw-r--r--src/main/res/values-ca/strings.xml6
-rw-r--r--src/main/res/values-ceb/strings.xml6
-rw-r--r--src/main/res/values-de/strings.xml6
-rw-r--r--src/main/res/values-es/strings.xml6
-rw-r--r--src/main/res/values-fil/strings.xml6
-rw-r--r--src/main/res/values-fr/strings.xml6
-rw-r--r--src/main/res/values-id/strings.xml6
-rw-r--r--src/main/res/values-it/strings.xml6
-rw-r--r--src/main/res/values-nl/strings.xml2
-rw-r--r--src/main/res/values-pl/strings.xml6
-rw-r--r--src/main/res/values-ru/strings.xml6
-rw-r--r--src/main/res/values-tr/strings.xml6
-rw-r--r--src/main/res/values/defaults.xml18
-rw-r--r--src/main/res/values/strings.xml6
20 files changed, 9 insertions, 187 deletions
diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java
index af205dbe6..7a2ec9a44 100644
--- a/src/main/java/de/pixart/messenger/services/NotificationService.java
+++ b/src/main/java/de/pixart/messenger/services/NotificationService.java
@@ -1035,19 +1035,6 @@ public class NotificationService {
cancel(FOREGROUND_NOTIFICATION_ID);
}
- Notification AppUpdateNotification(PendingIntent intent, String version, String filesize) {
- Notification.Builder mBuilder = new Notification.Builder(mXmppConnectionService);
- mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.app_name));
- mBuilder.setContentText(String.format(mXmppConnectionService.getString(R.string.update_available), version, filesize));
- mBuilder.setSmallIcon(R.drawable.ic_update_notification);
- mBuilder.setContentIntent(intent);
- mBuilder.setOngoing(true);
- if (Compatibility.runsTwentySix()) {
- mBuilder.setChannelId(UPDATE_CHANNEL_ID);
- }
- return mBuilder.build();
- }
-
private void notify(String tag, int id, Notification notification) {
final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(mXmppConnectionService);
try {
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
index 88a3b2509..9ac59cd34 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
@@ -443,7 +443,6 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
getMenuInflater().inflate(R.menu.activity_conversations, menu);
final MenuItem qrCodeScanMenuItem = menu.findItem(R.id.action_scan_qr_code);
final MenuItem menuEditProfiles = menu.findItem(R.id.action_accounts);
- final MenuItem inviteUser = menu.findItem(R.id.action_invite_user);
if (qrCodeScanMenuItem != null) {
if (isCameraFeatureAvailable()) {
Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
@@ -460,11 +459,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
} else {
menuEditProfiles.setTitle(R.string.action_accounts);
}
- if (xmppConnectionServiceBound && xmppConnectionService.getAccounts().size() > 0) {
- inviteUser.setVisible(true);
- } else {
- inviteUser.setVisible(false);
- }
+
return super.onCreateOptionsMenu(menu);
}
@@ -565,9 +560,6 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
case R.id.action_scan_qr_code:
UriHandlerActivity.scan(this);
return true;
- case R.id.action_invite_user:
- inviteUser();
- break;
}
return super.onOptionsItemSelected(item);
}
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 7b1f9d0f2..c938dcff2 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -950,72 +950,6 @@ public abstract class XmppActivity extends ActionBarActivity {
return null;
}
- public void inviteUser() {
- if (!xmppConnectionServiceBound) {
- Toast.makeText(this, R.string.not_connected_try_again, Toast.LENGTH_SHORT).show();
- return;
- }
- if (xmppConnectionService.getAccounts() == null){
- Toast.makeText(this, R.string.no_accounts, Toast.LENGTH_SHORT).show();
- return;
- }
- if (!xmppConnectionService.multipleAccounts()) {
- Account mAccount = xmppConnectionService.getAccounts().get(0);
- String user = Jid.of(mAccount.getJid()).getLocal();
- String domain = Jid.of(mAccount.getJid()).getDomain();
- String inviteURL = AdHocInviteUri(mAccount);
- if (inviteURL == null) {
- inviteURL = Config.inviteUserURL + user + "/" + domain;
- }
- Log.d(Config.LOGTAG, "Invite uri = " + inviteURL);
- String inviteText = getString(R.string.InviteText, user);
- Intent intent = new Intent(android.content.Intent.ACTION_SEND);
- intent.setType("text/plain");
- intent.putExtra(Intent.EXTRA_SUBJECT, user + " " + getString(R.string.inviteUser_Subject) + " " + getString(R.string.app_name));
- intent.putExtra(Intent.EXTRA_TEXT, inviteText + "\n\n" + inviteURL);
- startActivity(Intent.createChooser(intent, getString(R.string.invite_contact)));
- overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
- } else {
- final AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setTitle(R.string.chooce_account);
- final View dialogView = this.getLayoutInflater().inflate(R.layout.choose_account_dialog, null);
- final Spinner spinner = dialogView.findViewById(R.id.account);
- builder.setView(dialogView);
- List<String> mActivatedAccounts = new ArrayList<>();
- for (Account account : xmppConnectionService.getAccounts()) {
- if (account.getStatus() != Account.State.DISABLED) {
- if (Config.DOMAIN_LOCK != null) {
- mActivatedAccounts.add(account.getJid().getLocal());
- } else {
- mActivatedAccounts.add(account.getJid().asBareJid().toString());
- }
- }
- }
- StartConversationActivity.populateAccountSpinner(this, mActivatedAccounts, spinner);
- builder.setPositiveButton(R.string.ok,
- (dialog, id) -> {
- String selection = spinner.getSelectedItem().toString();
- Account mAccount = xmppConnectionService.findAccountByJid(Jid.of(selection).asBareJid());
- String user = Jid.of(mAccount.getJid()).getLocal();
- String domain = Jid.of(mAccount.getJid()).getDomain();
- String inviteURL = AdHocInviteUri(mAccount);
- if (inviteURL == null) {
- inviteURL = Config.inviteUserURL + user + "/" + domain;
- }
- Log.d(Config.LOGTAG, "Invite uri = " + inviteURL);
- String inviteText = getString(R.string.InviteText, user);
- Intent intent = new Intent(Intent.ACTION_SEND);
- intent.setType("text/plain");
- intent.putExtra(Intent.EXTRA_SUBJECT, user + " " + getString(R.string.inviteUser_Subject) + " " + getString(R.string.app_name));
- intent.putExtra(Intent.EXTRA_TEXT, inviteText + "\n\n" + inviteURL);
- startActivity(Intent.createChooser(intent, getString(R.string.invite_contact)));
- overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
- });
- builder.setNegativeButton(R.string.cancel, null);
- builder.create().show();
- }
- }
-
private boolean AdHocInvite(Account account) {
if (!xmppConnectionServiceBound) {
return false;
diff --git a/src/main/res/menu/activity_conversations.xml b/src/main/res/menu/activity_conversations.xml
index aa25cea66..c4439c56b 100644
--- a/src/main/res/menu/activity_conversations.xml
+++ b/src/main/res/menu/activity_conversations.xml
@@ -18,10 +18,5 @@
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never" />
- <item
- android:id="@+id/action_invite_user"
- android:orderInCategory="100"
- android:title="@string/invite_user"
- app:showAsAction="never" />
</menu> \ No newline at end of file
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 71cfc7f31..6d4b926cd 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -302,7 +302,6 @@
<string name="title_activity_updater">خدمة التحديث</string>
<string name="remind_later">لاحقا</string>
<string name="update">تحديث</string>
- <string name="no_update_available">لا يوجد تحديثات</string>
<string name="download_started">بدأ التنزيل</string>
<string name="account_status_tor_unavailable">شبكة تور غير متوفرة</string>
<string name="pref_presence_settings">التوفر</string>
@@ -370,8 +369,6 @@
<string name="creating_conference">عملية انشاء فريق المحادثة جارية…</string>
<string name="import_database">استيراد نسخة احتياطية</string>
<string name="invite_again">إعادة دعوته مجددا</string>
- <string name="inviteUser_Subject">قام بدعوتك عبر</string>
- <string name="invite_user">الدعوة إلى بيكس آرت ماسنجر</string>
<string name="please_wait">يُرجى الانتظار…</string>
<string name="payment_required">الدفع مطلوب</string>
<string name="me">أنا</string>
@@ -433,7 +430,6 @@
<string name="pref_validate_hostname">تأكيد اسم المضيف عبر DNSSEC</string>
<string name="mark_as_read">اعتبرها مقروءة</string>
<string name="server_info_partial">جزئيا</string>
- <string name="update_service">خدمة التحديث لـ Pix-Art Messenger</string>
<string name="install_update">تنصيب التحديث؟</string>
<string name="no_application_found_to_open_link">تعذر العثور على تطبيق يمكنه فتح هذا الرابط</string>
<string name="pref_warn_unencrypted_chat">التنبيه إن كانت المحادثة غير مشفّرة</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index d95793ddc..9bc9f6c90 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -430,10 +430,8 @@
<string name="download_failed_could_not_write_file">Неуспешно изтегляне: Файлът не можа да бъде записан</string>
<string name="action_check_update">Провери за Подновеване</string>
<string name="title_activity_updater">Услуга за подновеване</string>
- <string name="update_available">Налична е версия на %1$s.\n\nРазмер на файла: %2$s\n\nПодновеване на версия %1$s сега?</string>
<string name="remind_later">по късно</string>
<string name="update">поднови</string>
- <string name="no_update_available">Нема налично подновение</string>
<string name="download_started">Изтеглянето започна</string>
<string name="account_status_tor_unavailable">Tor мрежата е недостъпна</string>
<string name="account_status_bind_failure">Отказ на свързване</string>
@@ -443,7 +441,6 @@
<string name="pref_away_when_screen_off">Kогато си отсъстващ изключи екрана</string>
<string name="pref_away_when_screen_off_summary">Маркира вашия ресурс когато сте отсъстващ когато екранът е изключен</string>
<string name="pref_dnd_on_silent_mode">\"Не безпокойте\" в безшумен режим</string>
- <string name="update_info">Pix-Art Messenger автоматично изтегля и инсталира новата версия.\n\nЧакай…</string>
<string name="pref_dnd_on_silent_mode_summary">Маркира вашия ресурс като \"Не безпокойте\", когато устройството е в безшумен режим</string>
<string name="pref_treat_vibrate_as_silent">Третирайте вибрацията като безшумен режим</string>
<string name="pref_treat_vibrate_as_dnd_summary">Маркира вашия ресурс като \"Не ме безпокойте\", когато устройството е на вибрaция</string>
@@ -538,11 +535,9 @@
<string name="creating_conference">Създаване на групов чат...</string>
<string name="import_database">Възтановеване на резервно копие</string>
<string name="invite_again">Покани отново</string>
- <string name="inviteUser_Subject">те покани чрез</string>
<string name="InviteText">Здравей,\n\nпотребителя %s ви покани на Messenger Messenger. Ако използвате Android, опитайте го и кликнете върху следната връзка, за да започнете отначало...</string>
<string name="pref_broadcast_last_activity">Излъчване на Последното Взаимодействие с Потребителя</string>
<string name="pref_broadcast_last_activity_summary">Нека всичките ви контакти знаят, когато използвате Pix-Art Messenger</string>
- <string name="invite_user">Поканете в Pix-Art Messenger</string>
<string name="request_permissions_message">Pix-Art Messenger ще ви помоли да разрешите няколко разрешения. Важно е да разрешите на всички тези разрешения да използват всички функции на този пратеник. Ако отхвърлите някое от тези разрешения, приложението ще се затвори.</string>
<string name="request_permissions_message_again">Отказахте някои или всички разрешения, необходими за Pix-Art Messenger. Искате ли да преминете към настройките и да разрешите тези разрешения? Ако отхвърлите някое от тези разрешения, приложението ще се затвори.</string>
<string name="unable_to_connect_to_keychain">Не може да се свърже с OpenKeychain</string>
@@ -675,7 +670,6 @@
<string name="server_info_partial">частично</string>
<string name="pref_show_foreground_service_summary">Някои устройства с Android ще затворят някои приложения след определен период от време и няма да можете да получавате нови съобщения. Ако имате такива проблеми, опитайте да активирате услугата на преден план. Но имайте предвид, че ще имате постоянно уведомление с тази опция.</string>
<string name="pref_show_foreground_service">Използвай услугата на преден план</string>
- <string name="update_service">Услугата за подновеване на Pix-Art Messenger</string>
<string name="install_update">Инсталирай подножението?</string>
<string name="highlight_in_muc">маркирай потребителя</string>
<string name="no_application_found_to_open_link">Не е намерена програма за отваряне на адреса</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 5e4dab450..790c4978d 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -434,10 +434,8 @@
<string name="download_failed_could_not_write_file"> Error a la descarga: No es pot escriure al fitxer</string>
<string name="action_check_update">Comprovar actualizacions</string>
<string name="title_activity_updater">Servei d\'actualizació</string>
- <string name="update_available">Versió %1$s està disponible.\n\nTamany arxiu: %2$s\n\nActualizació a la versió %1$s ara?</string>
<string name="remind_later">Després</string>
<string name="update">Actualizar</string>
- <string name="no_update_available">No hi ha actualizacions disponibles</string>
<string name="download_started">S\'ha iniciat la descarrèga</string>
<string name="account_status_tor_unavailable">Red Tor no disponible</string>
<string name="account_status_bind_failure">Error de enllaç</string>
@@ -447,7 +445,6 @@
<string name="pref_away_when_screen_off">Absent amb pantalla apagada</string>
<string name="pref_away_when_screen_off_summary">Canviar el teu estat a absent quant la pantalla està apagada</string>
<string name="pref_dnd_on_silent_mode">\"No molestar\" en mode silenci</string>
- <string name="update_info">Pix-Art Messenger està descarregant i instal·lant la nova versió automàticament.\n\nSi us plau, espera…</string>
<string name="pref_dnd_on_silent_mode_summary">Canvia el teu estat a \"no molestar\" quant el dispositiu està en mode silenci</string>
<string name="pref_treat_vibrate_as_silent">Mode vibració como a mode silenci</string>
<string name="pref_treat_vibrate_as_dnd_summary">Canvia el teu estat a \"no molestar\" quant el dispositiu està en mode vibració</string>
@@ -543,11 +540,9 @@
<string name="creating_conference">Crear xat de grup…</string>
<string name="import_database">Importar còpia de seguretat</string>
<string name="invite_again">Convidar de nou</string>
- <string name="inviteUser_Subject">t\'ha convidat a través de</string>
<string name="InviteText">Hola,\n\n%s t\'ha convidat a una conversa amb Pix-Art Messenger. Si ets un usuar d\'Android, prova\'l i fes click en el següent enllaç...</string>
<string name="pref_broadcast_last_activity">Informar de la teva última interacció</string>
<string name="pref_broadcast_last_activity_summary">Informar als teus contactes quant utilitzes Pix-Art Messenger</string>
- <string name="invite_user">Convidar a Pix-Art Messenger</string>
<string name="request_permissions_message">Pix-Art Messenger li demanarà que concedeix alguns permissos. És important que permetis que tots aquest permissos utilitzen totes les característíques d\'aquest missatger Si vosté nega qualsevol d\'aquests permissos, l\'aplicació es tancarà sola.</string>
<string name="request_permissions_message_again">Vosté ha negat un o tots els permissos requerits per a Pix-Art Messenger. ¿Desitja anar a la configuració per a permetre aquests permissos? Si refuses un d\'aquests permissos, l\'aplicació es tancarà.</string>
<string name="unable_to_connect_to_keychain">No s\'ha pogut connectar a OpenKeychain</string>
@@ -680,7 +675,6 @@
<string name="server_info_partial">Parcial</string>
<string name="pref_show_foreground_service_summary">Alguns dispositius Android tancaràn algunes aplicacions després d\'un temps i no podràs rebre nous missatges. Si tens aquests problemes, intenta activar el servei de primer pla. Però tingues en compte que tindrà una notificació permanent amb aquesta opció marcada.</string>
<string name="pref_show_foreground_service">Utilitzar servei en primer pla</string>
- <string name="update_service">Servei d\'actualizació de Pix-Art Messenger</string>
<string name="install_update">Instal·lar actualizació?</string>
<string name="highlight_in_muc">anomena usuari</string>
<string name="no_application_found_to_open_link">No s\'ha trobat aplicació per a obrir la pàgina web</string>
diff --git a/src/main/res/values-ceb/strings.xml b/src/main/res/values-ceb/strings.xml
index a1e9a7ba8..acb57ee6d 100644
--- a/src/main/res/values-ceb/strings.xml
+++ b/src/main/res/values-ceb/strings.xml
@@ -358,10 +358,8 @@
<string name="download_failed_could_not_write_file">Napkayas pag-download: Dili makasuwat sa file</string>
<string name="action_check_update">Susiha ang mga Kausaban</string>
<string name="title_activity_updater">Kausaban sa serbisyo</string>
- <string name="update_available">Bersiyon %1$s kay wala.\n\n Sukod sa File:%2$s\n\nKausaban sa bersiyon %1$s karun?</string>
<string name="remind_later">taud-taud</string>
<string name="update">kabaguhan</string>
- <string name="no_update_available">Walay kanag-uhan ang anaa</string>
<string name="download_started">Nagsugod na ug download</string>
<string name="account_status_tor_unavailable">Tor network wa wala</string>
<string name="account_status_bind_failure">Pugong kapakyasan</string>
@@ -370,7 +368,6 @@
<string name="pref_away_when_screen_off">Layo kung ang screen kay gepalong</string>
<string name="pref_away_when_screen_off_summary">Markahe ang imung gepanguhaan ingon nga layo kong ang screen gipalong</string>
<string name="pref_dnd_on_silent_mode">\"Ayaw ug samoka\" sa hilom nga mode</string>
- <string name="update_info">Ang Pix-Art Messenger kay nag-download ug nag-install sa bag-o nga bersiyon awtomatik.\n\nPalihug paabot…</string>
<string name="pref_dnd_on_silent_mode_summary">Markahi imung gepanguhaan sa \"Ayaw ug Samoka\" kung ang device kay naa sa hilum nga mode</string>
<string name="pref_treat_vibrate_as_silent">Tratuha ang pag-vibrate ingun nga hilum nga mode</string>
<string name="pref_treat_vibrate_as_dnd_summary">Markahi ang imung gepanguhaan as \"Ayaw ug samoka\" kung ang device naka vibrate</string>
@@ -462,11 +459,9 @@
<string name="creating_conference">Nagbuhat ug grupo sa chat…</string>
<string name="import_database">Import nga tabang</string>
<string name="invite_again">Pagdapit pag-usab</string>
- <string name="inviteUser_Subject">nagdapit kanimo pinaagi sa</string>
<string name="InviteText">Hello,\n\n ang user %s nag-imbitar sa imuha nga sa Pix-Art Messenger. kung ikaw naggamit ug Android, suwayi dayun ug pislite ang mga nagsunod nga link para sugod ug balik...</string>
<string name="pref_broadcast_last_activity">Broadcast Last Interaction sa Gumagamit</string>
<string name="pref_broadcast_last_activity_summary">Hibal-i ang tanan nimong contact kung gamiton ang Pix-Art Messenger</string>
- <string name="invite_user">Pagdapit sa Pix-Art Messenger</string>
<string name="request_permissions_message">Pix-Art Messenger mangutana sa imuha kung musugyot ka gayud sa pipila ka mga permiso. Importante nga imong tugotan ang tanan nga mga permiso nga gamiton ang tanang bahin niini nga mensahero. Kung imu ilimod bisag asa niini nga mga permiso ang app musira sa iyang kaugalingon.</string>
<string name="request_permissions_message_again">Imuhang gelimod ang uban o tanang permisong kinahanglanun para sa Pix-Art Messenger. Gusto ka bang moambak sa mga setting ug tugotan kini nga mga permiso? Kung imu ilimod bisag unsa ining mag permiso, ang app mismo musira sa iyang kaugalingun.</string>
<string name="unable_to_connect_to_keychain">Dili maka konek sa OpenKeychain</string>
@@ -559,7 +554,6 @@
<string name="server_info_partial">parsyal</string>
<string name="pref_show_foreground_service_summary">Ang ubang mga device sa Android magsarado sa pipila ka mga oras ug dili naka makadawat ug mga bag-o nga mensahe. Kung naa kay ing ana nga problema, suwayi ug pag-aktibo sa foreground nga serbisyo. Pero timan-e, nga maana-a kay permamente nga pagpahibalo kauban niini nga opsiyong gitan-aw.</string>
<string name="pref_show_foreground_service">Gamit ug serbisyo sa foreground</string>
- <string name="update_service">Pix-Art Messenger nabag-o nga serbisyo</string>
<string name="install_update">I-install ang pagbag-o?</string>
<string name="highlight_in_muc">ipaklaro ang user</string>
<string name="no_application_found_to_open_link">Walay aplikasyon nakita para ablihan ang link</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 7f0f3a185..19de96aa0 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -434,10 +434,8 @@
<string name="download_failed_could_not_write_file">Download fehlgeschlagen: Datei kann nicht gespeichert werden</string>
<string name="action_check_update">Auf Updates prüfen</string>
<string name="title_activity_updater">Update Dienst</string>
- <string name="update_available">Version %1$s ist verfügbar.\n\nDateigröße: %2$s\n\nJetzt auf Version %1$s aktualisieren?</string>
<string name="remind_later">später</string>
<string name="update">aktualisieren</string>
- <string name="no_update_available">Kein Update verfügbar</string>
<string name="download_started">Download gestartet</string>
<string name="account_status_tor_unavailable">Tor-Netzwerk nicht verfügbar</string>
<string name="account_status_bind_failure">Bindungsfehler</string>
@@ -447,7 +445,6 @@
<string name="pref_away_when_screen_off">Abwesend bei abgeschaltetem Bildschirm</string>
<string name="pref_away_when_screen_off_summary">Setze deinen Status auf \"abwesend\", solange dein Bildschirm abgeschaltet ist</string>
<string name="pref_dnd_on_silent_mode">Bitte nicht stören bei Stummschaltung</string>
- <string name="update_info">Pix-Art Messenger lädt und installiert die neue Version automatisch.\n\nBitte warten…</string>
<string name="pref_dnd_on_silent_mode_summary">Setze deinen Status auf \"Bitte nicht stören\", solange dein Gerät stummgeschaltet ist</string>
<string name="pref_treat_vibrate_as_silent">Vibration als Lautlos behandeln</string>
<string name="pref_treat_vibrate_as_dnd_summary">Setze deinen Status auf \"Bitte nicht stören\", solange das Gerät auf Vibration geschaltet ist</string>
@@ -544,11 +541,9 @@
<string name="import_text">Falls ein Backup verfügbar ist, kannst du es über den unten stehenden Button importieren.</string>
<string name="import_database">Backup importieren</string>
<string name="invite_again">Erneut hinzufügen</string>
- <string name="inviteUser_Subject">hat dich eingeladen über</string>
<string name="InviteText">Hallo,\n\n%s hat dich zu einem Gespräch mit Pix-Art Messenger eingeladen. Falls du Android Nutzer bist, probiere es aus und klicke folgenden Link…</string>
<string name="pref_broadcast_last_activity">Zuletzt gesehen senden</string>
<string name="pref_broadcast_last_activity_summary">Lasse deine Kontakte wissen, wann du Pix-Art Messenger nutzt</string>
- <string name="invite_user">Zu Pix-Art Messenger einladen</string>
<string name="request_permissions_message">Pix-Art Messenger wird dich nach ein paar Berechtigungen fragen. Es ist wichtig, dass du alle Berechtigungen erlaubst, um alle Funktionen nutzen zu können. Falls du eine dieser Berechtigungen ablehnst wird sich die App schließen.</string>
<string name="request_permissions_message_again">Du hast eine oder alle Berechtigungen, welche für Pix-Art Messenger benötigt werden abgelehnt. Willst du zu den Einstellungen springen, um diese Berechtigungen zu erlauben? Falls du eine dieser Berechtigungen ablehnst wird sich die App schließen.</string>
<string name="unable_to_connect_to_keychain">Keine Verbindung zu OpenKeychain</string>
@@ -681,7 +676,6 @@
<string name="server_info_partial">teilweise</string>
<string name="pref_show_foreground_service_summary">Einige Android Geräte schließen manche Apps nach einer gewissen Zeitspanne automatisch und du wirst keine neuen Nachrichten mehr empfangen können. Falls du solche Probleme hast, versuche den Vordergrunddienst zu aktivieren. Bitte beachte, dass dadurch ein permanenter Eintrag in der Benachrichtigungsleiste erscheint.</string>
<string name="pref_show_foreground_service">Nutze Vordergrunddienst</string>
- <string name="update_service">Pix-Art Messenger Update Dienst</string>
<string name="install_update">Update installieren?</string>
<string name="highlight_in_muc">Benutzer erwähnen</string>
<string name="no_application_found_to_open_link">Keine Anwendung zum Öffnen von Webseiten gefunden</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 3d46d233f..be2565cfe 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -434,10 +434,8 @@
<string name="download_failed_could_not_write_file">Falló la descarga: No se puede escribir el fichero</string>
<string name="action_check_update">Comprobar actualizaciones</string>
<string name="title_activity_updater">Servicio de actualización</string>
- <string name="update_available">Versión %1$s está disponible.\n\nTamaño archivo: %2$s\n\nActualización a la versión %1$s ahora?</string>
<string name="remind_later">después</string>
<string name="update">Actualizar</string>
- <string name="no_update_available">No hay actualizaciones disponibles</string>
<string name="download_started">Se ha iniciado la descarga</string>
<string name="account_status_tor_unavailable">Red Tor no disponible</string>
<string name="account_status_bind_failure">Fallo de enlace</string>
@@ -447,7 +445,6 @@
<string name="pref_away_when_screen_off">Ausente con pantalla apagada</string>
<string name="pref_away_when_screen_off_summary">Cambia tu estado a ausente cuando la pantalla está apagada</string>
<string name="pref_dnd_on_silent_mode">\"No molestar\" en modo silencio</string>
- <string name="update_info">Pix-Art Messenger está descargando e instalando la nueva versión automáticamente.\n\nPor favor, espere…</string>
<string name="pref_dnd_on_silent_mode_summary">Cambia tu estado a \"no molestar\" cuando el dispositivo está en modo silencio</string>
<string name="pref_treat_vibrate_as_silent">Modo vibración como modo silencio</string>
<string name="pref_treat_vibrate_as_dnd_summary">Cambia tu estado a \"no molestar\" cuando el dispositivo está en modo vibración</string>
@@ -544,11 +541,9 @@
<string name="import_text">Si hay una copia de seguridad disponible, puedes importarla pulsando el botón de debajo.</string>
<string name="import_database">Importar copia de seguridad</string>
<string name="invite_again">Invitar de nuevo</string>
- <string name="inviteUser_Subject">te ha invitado a través de</string>
<string name="InviteText">Hola,\n\n%s te ha invitado a una conversación con Pix-Art Messenger. Si eres usuario de Android, pruébalo y haz clic en el siguiente enlace...</string>
<string name="pref_broadcast_last_activity">Informar de tu última interacción</string>
<string name="pref_broadcast_last_activity_summary">Informar a tus contactos cuando usas Pix-Art Messenger</string>
- <string name="invite_user">Invitar a Pix-Art Messenger</string>
<string name="request_permissions_message">Pix-Art Messenger le pedirá que conceda algunos permisos. Es importante que permitas que todos estos permisos usen todas las características de este mensajero. Si usted niega cualquiera de estos permisos, la aplicación se cerrará sola.</string>
<string name="request_permissions_message_again">Usted ha negado uno o todos los permisos requeridos para Pix-Art Messenger. ¿Desea ir a la configuración para permitir estos permisos? Si rechaza uno de estos permisos, la aplicación se cerrará.</string>
<string name="unable_to_connect_to_keychain">No se ha podido conectar a OpenKeychain</string>
@@ -681,7 +676,6 @@
<string name="server_info_partial">Parcial</string>
<string name="pref_show_foreground_service_summary">Algunos dispositivos Android cerrarán algunas aplicaciones al cabo de un tiempo y no podrás recibir nuevos mensajes. Si tiene estos problemas, intente activar el servicio de primer plano. Pero tenga en cuenta que tendrá una notificación permanente con esta opción marcada.</string>
<string name="pref_show_foreground_service">Usar servicio en primer plano</string>
- <string name="update_service">Servicio de actualización de Pix-Art Messenger</string>
<string name="install_update">¿Instalar actualización?</string>
<string name="highlight_in_muc">menciona usuario</string>
<string name="no_application_found_to_open_link">No se ha encontrado aplicación para abrir la página web</string>
diff --git a/src/main/res/values-fil/strings.xml b/src/main/res/values-fil/strings.xml
index 2d4e451ec..ffd7e9e09 100644
--- a/src/main/res/values-fil/strings.xml
+++ b/src/main/res/values-fil/strings.xml
@@ -390,10 +390,8 @@
<string name="download_failed_could_not_write_file">Nabigo ang pag-download: Hindi ma-isulat ang file</string>
<string name="action_check_update">Tingnan ang Mga Update</string>
<string name="title_activity_updater">I-update ang serbisyo</string>
- <string name="update_available">Ang bersyon na %1$s ay magagamit. \n\nFilipino:%2$s\n\nUpdate sa bersyon na %1$s ngayon?</string>
<string name="remind_later">mamaya</string>
<string name="update">magpabago</string>
- <string name="no_update_available">Walang available na update</string>
<string name="download_started">Nagsimula ang pag-download</string>
<string name="account_status_tor_unavailable">Hindi magagamit ang network ng Tor</string>
<string name="account_status_bind_failure">Bind failure</string>
@@ -402,7 +400,6 @@
<string name="pref_away_when_screen_off">Lumayo kapag naka-off ang screen</string>
<string name="pref_away_when_screen_off_summary">Tinitiyak ang iyong mapagkukunan bilang malayo kapag naka-off ang screen</string>
<string name="pref_dnd_on_silent_mode">\"Huwag abalahin\" sa tahimik na mode</string>
- <string name="update_info">Ang Pix-Art Messenger ay awtomatikong nagda-download at nag-install ng bagong bersyon. \n\nMangyari lamang na maghintay…</string>
<string name="pref_dnd_on_silent_mode_summary">Markahan ang iyong mapagkukunan bilang \"Huwag abalahin\" kapag ang aparato ay nasa tahimik na mode</string>
<string name="pref_treat_vibrate_as_silent">Tratuhin ang vibrate bilang silent mode</string>
<string name="pref_treat_vibrate_as_dnd_summary">Binibigyang marka ang iyong mapagkukunan bilang \"Huwag mang-istorbo\" kapag ang aparato ay nasa vibrate</string>
@@ -490,11 +487,9 @@
<string name="creating_conference">Paglikha ng grupo ng chat…</string>
<string name="import_database">Mag-import ng backup</string>
<string name="invite_again">Mag-imbita muli</string>
- <string name="inviteUser_Subject">ay inanyayahan ka sa pamamagitan ng</string>
<string name="InviteText">Kumusta, \n\ninanyayahan ka ng user %s sa Pix-Art Messenger. Kung gumagamit ka ng Android, subukan ito at i-click ang sumusunod na link upang magsimula...</string>
<string name="pref_broadcast_last_activity">Broadcast Last User Interaction</string>
<string name="pref_broadcast_last_activity_summary">Hayaan ang lahat ng iyong mga contact malaman kapag gumagamit ng Pix-Art Messenger</string>
- <string name="invite_user">Mag-imbita sa Pix-Art Messenger</string>
<string name="request_permissions_message">Hinihiling ka ng Pix-Art Messenger na pahintulutan ang ilang mga pahintulot. Mahalaga na payagan mo ang lahat ng mga pahintulot na gamitin ang lahat ng mga tampok ng sugo na ito. Kung tinatanggihan mo ang alinman sa mga pahintulot na ito ay sarhan ang app mismo.</string>
<string name="request_permissions_message_again">Tinanggihan mo ang ilan o lahat ng mga pahintulot na kinakailangan para sa Pix-Art Messenger. Gusto mo bang tumalon sa mga setting at payagan ang mga pahintulot na ito? Kung tinanggihan mo ang alinman sa mga pahintulot na ito, tutuparin ng app ang sarili nito.</string>
<string name="unable_to_connect_to_keychain">Hindi makakonekta sa OpenKeychain</string>
@@ -595,7 +590,6 @@
<string name="server_info_partial">bahagyang</string>
<string name="pref_show_foreground_service_summary">Isasara ng ilang mga Android device ang ilang mga app pagkatapos ng isang matagal na panahon at hindi ka makakakuha ng mga bagong mensahe. Kung mayroon kayong mga problema, subukang gawing aktibo ang serbisyo sa harapan. Ngunit tandaan, na magkakaroon ka ng isang permanenteng abiso sa naka-check na opsiyon na ito.</string>
<string name="pref_show_foreground_service">Gumamit ng serbisyo sa harapan</string>
- <string name="update_service">Serbisyo sa pag-update ng Pix-Art Messenger</string>
<string name="install_update">I-install ang update?</string>
<string name="highlight_in_muc">i-highlight ang user</string>
<string name="no_application_found_to_open_link">Walang nakitang application upang buksan ang link</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 3c07ed4e3..1f5c7038c 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -427,10 +427,8 @@
<string name="download_failed_could_not_write_file">Échec du téléchargement : Écriture impossible</string>
<string name="action_check_update">Vérifier les mises à jour</string>
<string name="title_activity_updater">Mise à jour du service</string>
- <string name="update_available">Version %1$s est disponible.\n\nTaille du fichier : %2$s\n\nMettre à jour maintenant vers %1$s ?</string>
<string name="remind_later">ultérieurement</string>
<string name="update">mettre à jour</string>
- <string name="no_update_available">Aucune mise à jour disponible</string>
<string name="download_started">Le téléchargement a commencé</string>
<string name="account_status_tor_unavailable">Réseau Tor inaccessible</string>
<string name="account_status_bind_failure">La liaison a échoué</string>
@@ -440,7 +438,6 @@
<string name="pref_away_when_screen_off">Absent lorsque l’écran est éteint</string>
<string name="pref_away_when_screen_off_summary">Marquer votre ressource comme absente lorsque l’écran est éteint</string>
<string name="pref_dnd_on_silent_mode">Indisponible en mode silencieux</string>
- <string name="update_info">Pix-Art Messenger est entrain de télécharger et d’installer la nouvelle version automatiquement.\n\nVeuillez patienter …</string>
<string name="pref_dnd_on_silent_mode_summary">Marquer votre ressource comme « Ne pas déranger » lorsque l’appareil est en mode silencieux</string>
<string name="pref_treat_vibrate_as_silent">Indisponible en mode vibreur</string>
<string name="pref_treat_vibrate_as_dnd_summary">Marquer votre ressource comme « Ne pas déranger » lorsque l’appareil est en mode vibreur</string>
@@ -535,11 +532,9 @@
<string name="creating_conference">Création de la conférence …</string>
<string name="import_database">Importer une sauvegarde</string>
<string name="invite_again">Inviter à nouveau</string>
- <string name="inviteUser_Subject">vous a invité via</string>
<string name="InviteText">Bonjour,\n\nl’utilisateur·rice %s vous a invité sur Pix-Art Messenger. Si vous utilisez Android, essayez-le en cliquant sur le lien suivant pour continuer …</string>
<string name="pref_broadcast_last_activity">Diffuser la dernière action utilisateur</string>
<string name="pref_broadcast_last_activity_summary">Informer tous vos contacts lorsque vous utilisez Pix-Art Messenger</string>
- <string name="invite_user">Inviter à Pix-Art Messenger</string>
<string name="request_permissions_message">Pix-Art Messenger vous demandera quelques permissions. Il est important que vous autorisiez toutes ces permissions afin de pouvoir utiliser toutes les fonctionnalités de ce messager. Si vous refusez l\'une de ces permissions, l\'application se fermera d\'elle-même.</string>
<string name="request_permissions_message_again">Vous avez refusé tout ou partie des permissions requises pour Pix-Art Messenger. Souhaitez-vous passer aux paramètres et autoriser ces permissions ? Si vous refusez l\'une de ces permissions, l\'application se fermera d\'elle-même.</string>
<string name="unable_to_connect_to_keychain">Connection à OpenKeychain impossible</string>
@@ -672,7 +667,6 @@
<string name="server_info_partial">partiel</string>
<string name="pref_show_foreground_service_summary">Certains appareils Android fermeront certaines applications après un certain temps et vous ne pourrez plus recevoir de nouveaux messages. Si vous rencontrez de tels problèmes, essayez d\'activer le service en avant-plan. Mais gardez à l\'esprit que vous aurez une notification permanente avec cette option cochée.</string>
<string name="pref_show_foreground_service">Utiliser le service en premier plan</string>
- <string name="update_service">Service de mise à jour de Pix-Art Messenger</string>
<string name="install_update">Installer la mise à jour ?</string>
<string name="highlight_in_muc">mettre en évidence l’utilisateur·rice</string>
<string name="no_application_found_to_open_link">Aucune application disponible pour ouvrir le lien</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 0f46c264a..23b28bed1 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -389,10 +389,8 @@
<string name="download_failed_could_not_write_file">Unduh gagal: tidak bisa menulis berkas</string>
<string name="action_check_update">Periksa pembaruan</string>
<string name="title_activity_updater">Perbaruan layanan</string>
- <string name="update_available">Versi %1$s tersedia.\n\nUkuran berkas: %2$s\n\nPerbarui ke versi %1$s sekarang?</string>
<string name="remind_later">kemudian</string>
<string name="update">memperbarui</string>
- <string name="no_update_available">Tidak ada pembaruan yang tersedia</string>
<string name="download_started">Unduhan dimulai</string>
<string name="account_status_tor_unavailable">Jaringan Tor tidak tersedia</string>
<string name="account_status_bind_failure">Bind failure</string>
@@ -401,7 +399,6 @@
<string name="pref_away_when_screen_off">Jauh saat layar mati</string>
<string name="pref_away_when_screen_off_summary">Tandai sumber daya Anda saat tidak aktif saat layar dimatikan</string>
<string name="pref_dnd_on_silent_mode">\"Jangan diganggu\" dalam mode diam</string>
- <string name="update_info">Pix-Art Messenger sedang di unduh dan memasang versi baru secara otomatis.\n\nHarap tunggu…</string>
<string name="pref_dnd_on_silent_mode_summary">Tandai sumber Anda sebagai \"Jangan diganggu\" saat perangkat dalam mode senyap</string>
<string name="pref_treat_vibrate_as_silent">Perlakukan getar sebagai mode senyap</string>
<string name="pref_treat_vibrate_as_dnd_summary">Tandai sumber Anda sebagai \"Jangan diganggu\" saat perangkat bergetar</string>
@@ -487,11 +484,9 @@
<string name="creating_conference">Membuat obrolan kelompok…</string>
<string name="import_database">Impor cadangan</string>
<string name="invite_again">Undang lagi</string>
- <string name="inviteUser_Subject">telah mengundang Anda melalui</string>
<string name="InviteText">Halo, \n\n pengguna %s telah mengundang Anda ke Pix-Art Messenger. Jika Anda menggunakan Android, cobalah dan klik tautan berikut untuk memulai kembali...</string>
<string name="pref_broadcast_last_activity">Siaran Interaksi Pengguna Terakhir</string>
<string name="pref_broadcast_last_activity_summary">Biarkan semua kontak Anda tahu saat menggunakan Pix-Art Messenger</string>
- <string name="invite_user">Mengundang ke Pix-Art Messenger</string>
<string name="request_permissions_message">Pix-Art Messenger akan meminta Anda mengizinkan beberapa izin. Penting bahwa Anda mengizinkan semua hak akses ini untuk menggunakan semua fitur messenger ini. Jika Anda menolak izin ini, aplikasi akan menutup dengan sendiri.</string>
<string name="request_permissions_message_again">Anda telah menolak beberapa atau semua izin yang dibutuhkan untuk Pix-Art Messenger. Apakah Anda ingin beralih ke pengaturan dan mengizinkan izin ini? Jika Anda menolak semua izin ini, aplikasi akan menutup dengan sendiri.</string>
<string name="unable_to_connect_to_keychain">Tidak dapat terhubung ke OpenKeychain</string>
@@ -591,7 +586,6 @@
<string name="server_info_partial">sebagian</string>
<string name="pref_show_foreground_service_summary">Beberapa perangkat Android akan menutup beberapa aplikasi setelah jangka waktu tertentu dan Anda tidak akan dapat menerima pesan baru. Jika Anda memiliki masalah seperti itu, cobalah untuk mengaktifkan layanan latar depan. Namun perlu diingat, bahwa Anda akan memiliki pemberitahuan permanen dengan pilihan ini dicentang.</string>
<string name="pref_show_foreground_service">Gunakan layanan latar depan</string>
- <string name="update_service">Layanan memperbarui Pix-Art Messenger</string>
<string name="install_update">Memasang pembaharuan?</string>
<string name="highlight_in_muc">sorot pengguna</string>
<string name="no_application_found_to_open_link">Tidak ada aplikasi yang ditemukan untuk membuka tautan</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 7a822ab4b..7eb2373c5 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -434,10 +434,8 @@
<string name="download_failed_could_not_write_file">Scaricamento fallito: scrittura del file impossibile</string>
<string name="action_check_update">Controlla Aggiornamenti</string>
<string name="title_activity_updater">Servizio di aggiornamento</string>
- <string name="update_available">La versione %1$s è disponibile.\n\nDimensione: %2$s\n\nAggiornare alla versione %1$s ora?</string>
<string name="remind_later">più tardi</string>
<string name="update">aggiorna</string>
- <string name="no_update_available">Nessun aggiornamento disponibile</string>
<string name="download_started">Scaricamento iniziato</string>
<string name="account_status_tor_unavailable">Rete Tor non disponibile</string>
<string name="account_status_bind_failure">Bind fallito</string>
@@ -447,7 +445,6 @@
<string name="pref_away_when_screen_off">\"Non disponibile\" a schermo spento</string>
<string name="pref_away_when_screen_off_summary">Imposta la tua risorsa come non disponibile quando lo schermo è spento</string>
<string name="pref_dnd_on_silent_mode">\"Non disturbare\" in modalità silenziosa</string>
- <string name="update_info">Pix-Art Messenger sta scaricando e installando la nuova versione automaticamente.\n\nAttendere prego…</string>
<string name="pref_dnd_on_silent_mode_summary">Segna la tua risorsa come \"Non disturbare\" quando il dispositivo è in modalità silenziosa</string>
<string name="pref_treat_vibrate_as_silent">Tratta vibrazione come modalità silenziosa</string>
<string name="pref_treat_vibrate_as_dnd_summary">Segna la tua risorsa come \"Non disturbare\" quando il dispositivo ha solo la vibrazione</string>
@@ -544,11 +541,9 @@
<string name="import_text">Se un backup fosse disponibile puoi importarlo premendo il pulsante qui sotto.</string>
<string name="import_database">Importa backup</string>
<string name="invite_again">Invita di nuovo</string>
- <string name="inviteUser_Subject">ti ha invitato via</string>
<string name="InviteText">Ciao,\n\nl\'utente %s ti ha invitato su Pix-Art Messenger. Se utilizzi Android, puoi provarlo cliccando il seguente collegamento per iniziare...</string>
<string name="pref_broadcast_last_activity">Trasmetti ultima interazione utente</string>
<string name="pref_broadcast_last_activity_summary">Fai sapere ai tuoi contatti quando usi Pix-Art Messenger</string>
- <string name="invite_user">Invita su Pix-Art Messenger</string>
<string name="request_permissions_message">Pix-Art Messenger ti chiederà di concedere solo poche autorizzazioni. È importante che tu permetta tutte queste richieste per utilizzare tutte le funzionalità di questa app. Se neghi alcune di queste l\'app si chiuderà da sola.</string>
<string name="request_permissions_message_again">Hai negato alcune o tutte le autorizzazioni richieste da Pix-Art Messenger. Vuoi andare nelle impostazioni e concedere questi permessi? Se neghi qualsiasi di queste autorizzazioni, l\'app si chiuderà da sola.</string>
<string name="unable_to_connect_to_keychain">Impossibile connettersi a OpenKeychain</string>
@@ -681,7 +676,6 @@
<string name="server_info_partial">parziale</string>
<string name="pref_show_foreground_service_summary">Alcuni dispositivi Android terminano alcune applicazioni dopo un certo periodo di tempo e non sarai in grado di ricevere nuovi messaggi. Se hai questi problemi, prova ad attivare il servizio in primo piano. Tieni conto che avrai una notifica permanente con questa opzione attiva.</string>
<string name="pref_show_foreground_service">Usa servizio in primo piano</string>
- <string name="update_service">Servizio di aggiornamento Pix-Art Messenger</string>
<string name="install_update">Installare l\'aggiornamento?</string>
<string name="highlight_in_muc">evidenzia utente</string>
<string name="no_application_found_to_open_link">Nessuna applicazione trovata per aprire il link</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 39d785e0b..b79b003e0 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -498,7 +498,6 @@
<string name="invite_again">Opnieuw uitnodigen</string>
<string name="pref_broadcast_last_activity">Laatste gebruikersinteractie uitzenden</string>
<string name="pref_broadcast_last_activity_summary">Laat al je contacten weten wanneer je Pix-Art Messenger gebruikt</string>
- <string name="invite_user">Uitnodigen voor Pix-Art Messenger</string>
<string name="unable_to_connect_to_keychain">Verbinden met OpenKeychain mislukt</string>
<string name="this_device_is_no_longer_in_use">Dit apparaat wordt niet meer gebruikt</string>
<string name="please_wait">Even geduld…</string>
@@ -617,7 +616,6 @@
<string name="error_no_keys_to_trust_presence">Er zijn geen bruikbare sleutels beschikbaar voor dit contact.\nZorg dat je allebei op elkaars aanwezigheidsupdates bent geabonneerd.</string>
<string name="mark_as_read">Als gelezen markeren</string>
<string name="server_info_partial">gedeeltelijk</string>
- <string name="update_service">Pix-Art Messenger update dienst</string>
<string name="no_application_found_to_open_link">Geen applicatie om verwijzing te openen</string>
<string name="contacts_have_read_up_to_this_point">%s hebben tot hier gelezen</string>
<string name="contact_has_read_up_to_this_point">%s heeft tot hier gelezen</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index dc311b9b1..489e98aeb 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -421,10 +421,8 @@ Nie spowoduje to usunięcia kopii wiadomości przechowywanych na innych urządze
<string name="download_failed_could_not_write_file">Pobieranie niepowiodło się: brak możliwości zapisu pliku</string>
<string name="action_check_update">Sprawdź aktualizacje</string>
<string name="title_activity_updater">Usługa aktualizacji</string>
- <string name="update_available">Wersja %1$s jest udostępniona.\n\nWielkość pliku: %2$s\n\nZaktualizować na wersje %1$s?</string>
<string name="remind_later">później</string>
<string name="update">aktualizacja</string>
- <string name="no_update_available">Brak dostępnych aktualizacji</string>
<string name="download_started">Rozpoczęto pobieranie</string>
<string name="account_status_tor_unavailable">Sieć TOR jest niedostepna</string>
<string name="account_status_bind_failure">Błąd połączenia (zasób)</string>
@@ -434,7 +432,6 @@ Nie spowoduje to usunięcia kopii wiadomości przechowywanych na innych urządze
<string name="pref_away_when_screen_off">Status \"Oddalony\" gdy wyświetlacz jest wyłączony</string>
<string name="pref_away_when_screen_off_summary">Oznacza Twój zasób jako \"Oddalony\", gdy wyświetlacz jest wyłączony</string>
<string name="pref_dnd_on_silent_mode">\"Nie przeszkadzać\" w trybie cichym</string>
- <string name="update_info">Pix-Art Messenger pobiera i instaluje automatycznie nową wersję.\n\nPotrwa to chwilkę…</string>
<string name="pref_dnd_on_silent_mode_summary">Oznacza Twój zasób jako \"Nie przeszkadzać\", gdy urządzenie jest w trybie cichym</string>
<string name="pref_treat_vibrate_as_silent">Traktuj tryb wibracji jak tryb cichy</string>
<string name="pref_treat_vibrate_as_dnd_summary">Oznacza Twój zasób jako \"Nie przeszkadzać\", gdy urządzenie jest w trybie wibracji</string>
@@ -523,10 +520,8 @@ Nie spowoduje to usunięcia kopii wiadomości przechowywanych na innych urządze
<string name="creating_conference">Utwórz czat grupowy…</string>
<string name="import_database">Importować backup</string>
<string name="invite_again">Zaproś ponownie</string>
- <string name="inviteUser_Subject">zaprosił/a Cie poprzez</string>
<string name="pref_broadcast_last_activity">Dziel się ostatnią interakcją.</string>
<string name="pref_broadcast_last_activity_summary">Powiadamiaj kontakty, że używasz Pix-Art Messenger</string>
- <string name="invite_user">Zaproś do Pix-Art Messengera</string>
<string name="request_permissions_message">Pix-Art Messenger poprosi o zezwolenie na kilka uprawnień. Ważne jest, zezwolenie wszystkich uprawnień aby korzystać ze wszystkich funkcji tego komunikatora. Jeśli odmówisz któreś z tych uprawnień, aplikacja zamknie się.</string>
<string name="unable_to_connect_to_keychain">Nie można połączyć się z OpenKeychain</string>
<string name="this_device_is_no_longer_in_use">Urządzenie to nie jest już używane</string>
@@ -664,7 +659,6 @@ Pix-Art Messenger będzie wciąż ograniczał transfer danych, kiedy tylko to je
<string name="error_no_keys_to_trust_presence">Brak dostępnych kluczy dla tego kontaktu.\nUpewnij się, że wzajemnie powiadamiacie się o obecności.</string>
<string name="mark_as_read">oznacz jako przeczytane</string>
<string name="server_info_partial">częściowo</string>
- <string name="update_service">Usługa aktualizacji Messengera Pix-Art</string>
<string name="install_update">Zainstalować aktualizację?</string>
<string name="highlight_in_muc">wymień użytkownika</string>
<string name="contacts_have_read_up_to_this_point">%s przeczytał do tego miejsca</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 2f0fd737a..4252f2d91 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -427,17 +427,14 @@
<string name="download_failed_could_not_write_file">Загрузка прервана: невозможно записать файл</string>
<string name="action_check_update">Проверить наличие обновлений</string>
<string name="title_activity_updater">Служба обновления</string>
- <string name="update_available">Доступна версия %1$s.\n\nРазмер: %2$s\n\nОбновить до версии %1$s сейчас?</string>
<string name="remind_later">позже</string>
<string name="update">обновить</string>
- <string name="no_update_available">Нет доступных обновлений</string>
<string name="download_started">Загрузка начата</string>
<string name="account_status_tor_unavailable">Сеть Tor недоступна</string>
<string name="pref_presence_settings">Доступность</string>
<string name="pref_away_when_screen_off">Статус \"Отошел\", когда экран выключен</string>
<string name="pref_away_when_screen_off_summary">Статус \"Отошел\" при гашении экрана</string>
<string name="pref_dnd_on_silent_mode">Статус \"Не беспокоить\" в беззвучном режиме</string>
- <string name="update_info">Pix-Art Messenger скачивает и устанавливает новую версию.\n\nПожалуйста, подождите…</string>
<string name="pref_dnd_on_silent_mode_summary">Статус \"Не беспокоить\", когда устройство в беззвучном режиме</string>
<string name="pref_treat_vibrate_as_silent">Считать режим вибрации беззвучным режимом</string>
<string name="pref_treat_vibrate_as_dnd_summary">Статус \"Не беспокоить\", когда устройство в режиме вибрации</string>
@@ -535,11 +532,9 @@
<string name="creating_conference">Создание группового чата...</string>
<string name="import_database">Импортировать резервную копию</string>
<string name="invite_again">Пригласить снова</string>
- <string name="inviteUser_Subject">приглашает вас присоединиться через</string>
<string name="InviteText">Здравствуйте! \n\n Пользователь %s приглашает вас использовать Pix-Art Messenger. Если вы используете Android - нажмите на ссылку, чтобы попробовать...</string>
<string name="pref_broadcast_last_activity">Отображать последнюю активность пользователя</string>
<string name="pref_broadcast_last_activity_summary">Позволяет вашим контактам видеть, когда вы пользуетесь Pix-Art Messenger</string>
- <string name="invite_user">Пригласить в Pix-Art Messenger</string>
<string name="request_permissions_message">Pix-Art Messenger запросит у вас несколько разрешений. Чтобы пользоваться всеми возможностями этого мессенджера, нужно дать эти разрешения. Если какое-то разрешение не будет получено - приложение будет закрыто.</string>
<string name="request_permissions_message_again">Вы не дали некоторых разрешений, нужных для работы Pix-Art Messenger. Хотите перейти в настройки разрешений сейчас? Если вы не дадите какого-либо из этих разрешений - приложение будет закрыто.</string>
<string name="unable_to_connect_to_keychain">Не удается подключиться к OpenKeychain</string>
@@ -672,7 +667,6 @@
<string name="mark_as_read">Отметить как прочитанное</string>
<string name="pref_show_foreground_service_summary">Некоторые устройства Android закрывают приложения по прошествии некоторого времени, и вы теряете возможность получать новые сообщения. Если вы столкнулись с такой проблемой - попробуйте активировать фоновую службу. Имейте ввиду, что если эта опция включена - значок уведомления будет отображаться постоянно.</string>
<string name="pref_show_foreground_service">Использовать фоновую службу</string>
- <string name="update_service">Служба обновления Pix-Art Messenger</string>
<string name="install_update">Установить обновление?</string>
<string name="highlight_in_muc">отметить пользователя</string>
<string name="no_application_found_to_open_link">Не удалось найти подходящее приложение для открытия ссылки</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 55a84e5db..ee6c8b412 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -390,10 +390,8 @@
<string name="download_failed_could_not_write_file">İndirme başarısız: Dosya yazılamadı</string>
<string name="action_check_update">Güncellemeleri kontrol et</string>
<string name="title_activity_updater">Servisi güncelle</string>
- <string name="update_available">Sürüm% 1 $ s mevcut. \ N \ nFilesize:% 2 $ s \ n \ n% 1 $ s sürümüne şimdi mi güncelleştiniz?</string>
<string name="remind_later">sonra</string>
<string name="update">güncelle</string>
- <string name="no_update_available">Güncelleme mevcut değil</string>
<string name="download_started">İndirme başlatıldı</string>
<string name="account_status_tor_unavailable">Tor ağ kullanılamıyor</string>
<string name="account_status_bind_failure">Bağlanma hatası</string>
@@ -402,7 +400,6 @@
<string name="pref_away_when_screen_off">Uzakta ekran kapalıyken</string>
<string name="pref_away_when_screen_off_summary">Ekran kapalıyken kaynağını uzakta olarak işaretler</string>
<string name="pref_dnd_on_silent_mode">Sessiz modda \'\'Rahatsız etme\'\'</string>
- <string name="update_info">Pix-Art Messenger yeni sürümü otomatik olarak indiriyor ve yükleniliyor. \n\nLütfen bekleyin…</string>
<string name="pref_dnd_on_silent_mode_summary">Cihaz sessiz moddayken kaynağınızı \"Rahatsız etmeyin\" olarak işaretler</string>
<string name="pref_treat_vibrate_as_silent">Titreşimsiz mod olarak işlem yap</string>
<string name="pref_treat_vibrate_as_dnd_summary">Cihaz titrediğinde kaynağı \"Rahatsız etmeyin\" olarak işaretler</string>
@@ -490,11 +487,9 @@
<string name="creating_conference">Grup sohbeti oluşturuluyor…</string>
<string name="import_database">Yedeği içeri aktar</string>
<string name="invite_again">Tekrar davet et</string>
- <string name="inviteUser_Subject">sizi davet etti</string>
<string name="InviteText">Merhaba, \n\n kullanıcı %s sizi Pix-Art Messenger\'a davet etti. Android kullanıyorsanız, bir deneme yapın ve baştan başlamak için aşağıdaki bağlantıyı tıklayın...</string>
<string name="pref_broadcast_last_activity">Son kullanıcı etkileşimlerini yayınla</string>
<string name="pref_broadcast_last_activity_summary">Pix-Art Messenger\'ı kullanırken tüm kişilerinize haber verin</string>
- <string name="invite_user">Pix-Art Messenger\'a davet et</string>
<string name="request_permissions_message">Pix-Art Messenger birkaç izin vermenizi isteyecektir. Tüm bu izinlerin bu mesajlaşma aracının tüm özelliklerine sahip olmasına izin vermeniz önemlidir. Bu izinlerden herhangi birini reddederseniz, uygulama kendiliğinden kapanacaktır.</string>
<string name="request_permissions_message_again">Pix-Art Messenger için gerekli bazı veya tüm izinleri reddettiniz. Ayarlara atlamak ve bu izinlere izin vermek ister misiniz? Bu izinlerden herhangi birine siz karar verirseniz, uygulama kendiliğinden kapanacaktır.</string>
<string name="unable_to_connect_to_keychain">OpenKeyChain\'e bağlanılamıyor</string>
@@ -595,7 +590,6 @@
<string name="server_info_partial">kısmi</string>
<string name="pref_show_foreground_service_summary">Bazı Android cihazlar belirli bir süre sonra bazı uygulamaları kapatacak ve yeni mesajlar alamayacaksınız. Bu tür sorunlarınız varsa, ön plan hizmetini etkinleştirmeyi deneyin. Fakat, bu seçeneği işaretleyerek kalıcı bir bildirimde bulunacağınızı unutmayın.</string>
<string name="pref_show_foreground_service">Ön plan hizmetini kullan</string>
- <string name="update_service">Pix-Art Messenger güncelleme servisi</string>
<string name="install_update">Güncellemeyi yükle?</string>
<string name="highlight_in_muc">kullanıcıyı vurgula</string>
<string name="no_application_found_to_open_link">Link\'i açmak için uyguluma bulunamadı</string>
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 040f0185e..e1534905b 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -6,9 +6,9 @@
<string name="type_tablet" translatable="false">Tablet</string>
<string name="type_web" translatable="false">Web browser</string>
<string name="type_console" translatable="false">Console</string>
- <string name="pref_about_message" translatable="false"><b>Pix-Art Messenger</b>
- \n\nCopyright © 2014-2019 Christian Schneppe
- \n\nhttp://jabber.pix-art.de
+ <string name="pref_about_message" translatable="false"><b>PiratX Messenger</b>
+ PiratX is a privacy focused and improved version of Pix-Art Messenger which is based on Conversations.
+ \n\nThe extensions are designed and developed by thedevstack.de
\n\nThis program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
@@ -19,10 +19,6 @@
GNU General Public License for more details.
\n\nYou should have received a copy of the GNU General Public License
along with this program. If not, see https://www.gnu.org/licenses
- \n\nDownload the full original source code at https://github.com/siacs/Conversations (Copyright © 2014-2019 Daniel Gultsch)
- \n\nDownload the modified source code at https://github.com/kriztan/Pix-Art-Messenger
- \n\nPix-Art Messenger recommends blabber.im as provider. More information can be found at https://blabber.im
- \n\nYou can support me by making a donation in form of a gift in sense of § 516 ff BGB i.e. a gratuitous donation.
</string>
<string name="pref_about_libraries" translatable="false"><b>Libraries</b>
\n\nhttps://www.bouncycastle.org\n(The MIT License (MIT))
@@ -116,12 +112,12 @@
<bool name="prefer_xmpp_avatar">true</bool>
<bool name="show_links_inside">true</bool>
<bool name="show_maps_inside">true</bool>
- <bool name="use_internal_updater">true</bool>
+ <bool name="use_internal_updater">false</bool>
<bool name="show_own_accounts">true</bool>
<string-array name="domains">
- <item>pix-art.de</item>
- <item>conversations.im</item>
+ <item>jabber.thedevstack.de</item>
+ <item>jabber.thehappy.de</item>
<item>jabber.cat</item>
<item>jabbers.one</item>
<item>jabjab.de</item>
@@ -240,6 +236,8 @@
<item>nsa.li</item>
<item>blabber.im</item>
<item>buzon.uy</item>
+ <item>pix-art.de</item>
+ <item>conversations.im</item>
</string-array>
<string-array name="support_domains">
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ba865ca52..dcc68a415 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -434,10 +434,8 @@
<string name="download_failed_could_not_write_file">Download failed: Could not write file</string>
<string name="action_check_update">Check for Updates</string>
<string name="title_activity_updater">Update service</string>
- <string name="update_available">Version %1$s is available.\n\nFilesize: %2$s\n\nUpdate to version %1$s now?</string>
<string name="remind_later">later</string>
<string name="update">update</string>
- <string name="no_update_available">No update available</string>
<string name="download_started">Download started</string>
<string name="account_status_tor_unavailable">Tor network unavailable</string>
<string name="account_status_bind_failure">Bind failure</string>
@@ -447,7 +445,6 @@
<string name="pref_away_when_screen_off">Away when screen is off</string>
<string name="pref_away_when_screen_off_summary">Marks your resource as away when the screen is turned off</string>
<string name="pref_dnd_on_silent_mode">\"Do not disturb\" in silent mode</string>
- <string name="update_info">Pix-Art Messenger is downloading and installing the new version automatically.\n\nPlease wait…</string>
<string name="pref_dnd_on_silent_mode_summary">Marks your resource as \"Do not disturb\" when device is in silent mode</string>
<string name="pref_treat_vibrate_as_silent">Treat vibrate as silent mode</string>
<string name="pref_treat_vibrate_as_dnd_summary">Marks your resource as \"Do not disturb\" when device is on vibrate</string>
@@ -544,11 +541,9 @@
<string name="import_text">If there is a backup available you can import this by pressing the button below.</string>
<string name="import_database">Import backup</string>
<string name="invite_again">Invite again</string>
- <string name="inviteUser_Subject">has invited you via</string>
<string name="InviteText">Hello,\n\nthe user %s has invited you to Pix-Art Messenger. If you are using Android, give it a try and click the following link to start over...</string>
<string name="pref_broadcast_last_activity">Broadcast Last User Interaction</string>
<string name="pref_broadcast_last_activity_summary">Let all your contacts know when use Pix-Art Messenger</string>
- <string name="invite_user">Invite to Pix-Art Messenger</string>
<string name="request_permissions_message">Pix-Art Messenger will ask you to allow a few permissions. It is important that you allow all these permissions to use all features of this messenger. If you deny any of these permissions the app will close itself.</string>
<string name="request_permissions_message_again">You have denied some or all permissions needed for Pix-Art Messenger. Would you like to jump to the settings and allow these permissions? If you denie any of these permissions, the app will close itself.</string>
<string name="unable_to_connect_to_keychain">Unable to connect to OpenKeychain</string>
@@ -681,7 +676,6 @@
<string name="server_info_partial">partial</string>
<string name="pref_show_foreground_service_summary">Some Android devices will close some apps after a period of time and you won’t be able to receive new messages. If you have such problems, try to activate the foreground service. But keep in mind, that you will have a permanent notification with this option checked.</string>
<string name="pref_show_foreground_service">Use foreground service</string>
- <string name="update_service">Pix-Art Messenger update service</string>
<string name="install_update">Install update?</string>
<string name="highlight_in_muc">highlight user</string>
<string name="no_application_found_to_open_link">No application found to open link</string>