diff options
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/drawable-hdpi/ic_action_cancel.png | bin | 232 -> 0 bytes | |||
| -rw-r--r-- | src/main/res/drawable-hdpi/ic_update_notification.png | bin | 0 -> 879 bytes | |||
| -rw-r--r-- | src/main/res/drawable-mdpi/ic_action_cancel.png | bin | 177 -> 0 bytes | |||
| -rw-r--r-- | src/main/res/drawable-mdpi/ic_update_notification.png | bin | 0 -> 496 bytes | |||
| -rw-r--r-- | src/main/res/drawable-xhdpi/ic_action_cancel.png | bin | 272 -> 0 bytes | |||
| -rw-r--r-- | src/main/res/drawable-xhdpi/ic_update_notification.png | bin | 0 -> 982 bytes | |||
| -rw-r--r-- | src/main/res/drawable-xxhdpi/ic_action_cancel.png | bin | 355 -> 0 bytes | |||
| -rw-r--r-- | src/main/res/drawable-xxhdpi/ic_update_notification.png | bin | 0 -> 1837 bytes | |||
| -rw-r--r-- | src/main/res/drawable-xxxhdpi/ic_notification.png | bin | 1266 -> 3852 bytes | |||
| -rw-r--r-- | src/main/res/drawable-xxxhdpi/ic_update_notification.png | bin | 0 -> 2035 bytes | |||
| -rw-r--r-- | src/main/res/layout/activity_updater.xml | 2 | ||||
| -rw-r--r-- | src/main/res/values-de/strings.xml | 10 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 14 |
13 files changed, 11 insertions, 15 deletions
diff --git a/src/main/res/drawable-hdpi/ic_action_cancel.png b/src/main/res/drawable-hdpi/ic_action_cancel.png Binary files differdeleted file mode 100644 index 5572c5248..000000000 --- a/src/main/res/drawable-hdpi/ic_action_cancel.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_update_notification.png b/src/main/res/drawable-hdpi/ic_update_notification.png Binary files differnew file mode 100644 index 000000000..b54ff5e20 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_update_notification.png diff --git a/src/main/res/drawable-mdpi/ic_action_cancel.png b/src/main/res/drawable-mdpi/ic_action_cancel.png Binary files differdeleted file mode 100644 index 3de614668..000000000 --- a/src/main/res/drawable-mdpi/ic_action_cancel.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_update_notification.png b/src/main/res/drawable-mdpi/ic_update_notification.png Binary files differnew file mode 100644 index 000000000..3ebf650fb --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_update_notification.png diff --git a/src/main/res/drawable-xhdpi/ic_action_cancel.png b/src/main/res/drawable-xhdpi/ic_action_cancel.png Binary files differdeleted file mode 100644 index 1e871a52c..000000000 --- a/src/main/res/drawable-xhdpi/ic_action_cancel.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_update_notification.png b/src/main/res/drawable-xhdpi/ic_update_notification.png Binary files differnew file mode 100644 index 000000000..fd29feb75 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_update_notification.png diff --git a/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/src/main/res/drawable-xxhdpi/ic_action_cancel.png Binary files differdeleted file mode 100644 index 8f1441277..000000000 --- a/src/main/res/drawable-xxhdpi/ic_action_cancel.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_update_notification.png b/src/main/res/drawable-xxhdpi/ic_update_notification.png Binary files differnew file mode 100644 index 000000000..b58ea3c2b --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_update_notification.png diff --git a/src/main/res/drawable-xxxhdpi/ic_notification.png b/src/main/res/drawable-xxxhdpi/ic_notification.png Binary files differindex 614c85534..095522505 100644 --- a/src/main/res/drawable-xxxhdpi/ic_notification.png +++ b/src/main/res/drawable-xxxhdpi/ic_notification.png diff --git a/src/main/res/drawable-xxxhdpi/ic_update_notification.png b/src/main/res/drawable-xxxhdpi/ic_update_notification.png Binary files differnew file mode 100644 index 000000000..2edf85941 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_update_notification.png diff --git a/src/main/res/layout/activity_updater.xml b/src/main/res/layout/activity_updater.xml index 8613b978a..2d8538537 100644 --- a/src/main/res/layout/activity_updater.xml +++ b/src/main/res/layout/activity_updater.xml @@ -22,7 +22,7 @@ style="?android:attr/progressBarStyleLarge" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/progressBar" + android:id="@+id/UpdateProgressBar" android:layout_centerVertical="true" android:layout_centerHorizontal="true" /> diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 35baf7fb2..9d8293c3b 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -191,7 +191,6 @@ <string name="otr_fingerprint">OTR-Fingerabdruck</string> <string name="omemo_fingerprint">OMEMO-Fingerabdruck</string> <string name="omemo_fingerprint_selected_message">OMEMO-Fingerabdruck der Nachricht</string> - <string name="this_device_omemo_fingerprint">Eigener OMEMO-Fingerabdruck</string> <string name="other_devices">Andere Geräte</string> <string name="trust_omemo_fingerprints">OMEMO-Fingerabdruck vertrauen</string> <string name="fetching_keys">Fingerabdrücke werden abgerufen …</string> @@ -389,7 +388,6 @@ <string name="vcard">Kontakt</string> <string name="received_x_file">%s empfangen</string> <string name="touch_to_open_conversations">Antippen, um Pix-Art Messenger zu öffnen</string> - <string name="disable_foreground_service">Vordergrund-Dienst deaktivieren</string> <string name="avatar_has_been_published">Profilbild wurde gespeichert</string> <string name="sending_x_file">%s wird gesendet</string> <string name="offering_x_file">%s wird angeboten</string> @@ -439,17 +437,16 @@ <string name="pref_use_white_background_summary">Empfangene Nachrichten als schwarzen Text auf weißem Hintergrund anzeigen</string> <string name="action_check_update">Auf Updates prüfen</string> <string name="remind_later">später</string> - <string name="checking_for_updates">Auf Pix-Art Messenger Updates prüfen</string> <string name="title_activity_updater">Update Dienst</string> <string name="update">aktualisieren</string> - <string name="update_available">Version %1$s ist verfügbar.\n\nDateigröße: %2$s\n\nJetzt auf Version %1$s aktualisieren?\n\n\n%4$s</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="download_started">Download gestartet</string> <string name="no_update_available">Kein Update verfügbar</string> <string name="account_status_tor_unavailable">Tor-Netzwerk nicht verfügbar</string> <string name="account_status_bind_failure">Bindungsfehler</string> <string name="account_status_host_unknown">Host unbekannt</string> <string name="server_info_broken">Fehlerhaft</string> - <string name="update_info">Pix-Art Messenger prüft auf eine neuere Version. Wenn ein Update verfügbar ist, wirst du gefragt, ob du deine Version aktualisieren möchtest. Der Update Dienst lädt und installiert die neue Version automatisch.\n\nBitte warten…</string> + <string name="update_info">Pix-Art Messenger lädt und installiert die neue Version automatisch.\n\nBitte warten…</string> <string name="pref_presence_settings">Status</string> <string name="pref_away_when_screen_off">Abwesend bei abgeschaltetem Bildschirm</string> <string name="pref_away_when_screen_off_summary">Setzt deinen Status auf "abwesend", solange dein Bildschirm abgeschaltet ist</string> @@ -676,7 +673,6 @@ <string name="timeout_6_months">6 Monate</string> <string name="timeout_7_days">7 Tage</string> <string name="today">Heute</string> - <string name="start_chatting">Fange an zu schreiben…</string> <string name="pref_use_max_brightness">Maximale Helligkeit</string> <string name="pref_use_max_brightness_summary">Maximale Helligkeit aktivieren, wenn Videos oder Bilder im Vollbild betracht werden.</string> <string name="pref_video_compression">Videos komprimieren</string> @@ -738,5 +734,7 @@ <string name="server_info_partial">teilweise</string> <string name="pref_show_foreground_service">Nutze Vordergrunddienst</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 permanente Eintrag in der Benachrichtigungsleiste erscheint.</string> + <string name="update_service">Pix-Art Messenger Update Dienst</string> + <string name="install_update">Update installieren?</string> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 86502dac1..d772c11a8 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -210,7 +210,6 @@ <string name="omemo_fingerprint_x509">v\\OMEMO fingerprint</string> <string name="omemo_fingerprint_selected_message">OMEMO fingerprint of message</string> <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO fingerprint of message</string> - <string name="this_device_omemo_fingerprint">Own OMEMO fingerprint</string> <string name="other_devices">Other devices</string> <string name="trust_omemo_fingerprints">Trust OMEMO Fingerprints</string> <string name="fetching_keys">Fetching keys…</string> @@ -465,7 +464,6 @@ <string name="apk">Android App</string> <string name="vcard">Contact</string> <string name="received_x_file">Received %s</string> - <string name="disable_foreground_service">Disable foreground service</string> <string name="touch_to_open_conversations">Touch to open Pix-Art Messenger</string> <string name="avatar_has_been_published">Avatar has been published!</string> <string name="sending_x_file">Sending %s</string> @@ -516,9 +514,8 @@ <string name="pref_use_white_background">Use white background</string> <string name="pref_use_white_background_summary">Show received messages as black text on a white background</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?\n\n\n%4$s</string> - <string name="checking_for_updates">Checking for Pix-Art Messenger 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> @@ -531,7 +528,7 @@ <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 checking for an update. If an update is available you will be asked, if you want to update your version. The update process is downloading and installing the new version automatically.\n\nPlease wait…</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> @@ -595,7 +592,7 @@ <string name="battery_optimizations_enabled_dialog">Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string> <string name="disable">Disable</string> <string name="selection_too_large">The selected area is too large</string> - <string name="cancel_update">Cancel update check?</string> + <string name="cancel_update">Cancel update?</string> <string name="yes">Yes</string> <string name="no">No</string> <string name="no_accounts">(No activated accounts)</string> @@ -739,7 +736,6 @@ <string name="timeout_6_months">6 months</string> <string name="timeout_12_months">12 months</string> <string name="today">Today</string> - <string name="start_chatting">Start chatting…</string> <string name="pref_use_max_brightness_summary">Switch to maximum brightness while watching videos or images in fullscreen.</string> <string name="pref_use_max_brightness">Maximum brightness</string> <string name="block_jabber_id">Block Jabber-ID</string> @@ -788,4 +784,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 wont 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> </resources> |
