Merge branch 'master' of https://github.com/kriztan/Pix-Art-Messenger

26 files changed, 11 insertions, 10 deletions

diff --git a/README.md b/README.md
index 6dcaa8f61..d6ddd5ad0 100644
--- a/README.md
+++ b/README.md
@@ -17,12 +17,13 @@ Alternativ kannst du den Messenger direkt aus hier von GitHub unter [Releases](h
 #### Ich habe Probleme, was soll ich tun?
 Am einfachsten ist es, wenn du unserer Support-Gruppe beitrittst, dort werden deine Probleme mit Sicherheit schnell gelöst. 
 
-[![Users in muc](https://inverse.chat/badge.svg?room=support@room.pix-art.de)](https://jabber.pix-art.de/j/support@room.pix-art.de?join): [support@room.pix-art.de](https://jabber.pix-art.de/j/support@room.pix-art.de?join) 
+[![Users in muc](https://inverse.chat/badge.svg?room=support@room.pix-art.de)](https://jabber.pix-art.de/j/support@room.pix-art.de?join): [support@room.pix-art.de](https://jabber.pix-art.de/j/support@room.pix-art.de?join) oder für Themen die sich um Development drehen, bitte hier schreiben: [development@room.pix-art.de](https://jabber.pix-art.de/j/development@room.pix-art.de?join) 
+
+oder scanne den QR-Code (für den Support-Chat):
+
+<img src="art/qr-code_suport_small.png" width="220">
 
-oder scanne den QR-Code:
-<img src="art/qr-code_suport_small.png" width="400">
 
-Für Themen die sich um Development drehen, bitte hier schreiben: [development@room.pix-art.de](https://jabber.pix-art.de/j/development@room.pix-art.de?join) 
 
 Solltest du dort nicht weiter kommen kannst du hier ein Issue erstellen, in welchem du dein Problem genau beschreibst und welche Schritte erforderlich sind, um zu dem Problem zu gelangen. 
 
diff --git a/fastlane/metadata/android/en-US/featureGraphic.png b/fastlane/metadata/android/en-US/featureGraphic.png
deleted file mode 100644
index ac470098a..000000000
--- a/fastlane/metadata/android/en-US/featureGraphic.png
+++ /dev/null
diff --git a/fastlane/metadata/android/en-US/phoneScreenshots/00.jpg b/fastlane/metadata/android/en-US/phoneScreenshots/00.jpg
deleted file mode 100644
index b84d9dca0..000000000
--- a/fastlane/metadata/android/en-US/phoneScreenshots/00.jpg
+++ /dev/null
diff --git a/fastlane/metadata/android/en-US/phoneScreenshots/01.jpg b/fastlane/metadata/android/en-US/phoneScreenshots/01.jpg
deleted file mode 100644
index cdce1410e..000000000
--- a/fastlane/metadata/android/en-US/phoneScreenshots/01.jpg
+++ /dev/null
diff --git a/fastlane/metadata/android/en-US/phoneScreenshots/02.jpg b/fastlane/metadata/android/en-US/phoneScreenshots/02.jpg
deleted file mode 100644
index 69f3824a4..000000000
--- a/fastlane/metadata/android/en-US/phoneScreenshots/02.jpg
+++ /dev/null
diff --git a/fastlane/metadata/android/en-US/phoneScreenshots/03.jpg b/fastlane/metadata/android/en-US/phoneScreenshots/03.jpg
deleted file mode 100644
index a83725397..000000000
--- a/fastlane/metadata/android/en-US/phoneScreenshots/03.jpg
+++ /dev/null
diff --git a/fastlane/metadata/android/en-US/phoneScreenshots/04.jpg b/fastlane/metadata/android/en-US/phoneScreenshots/04.jpg
deleted file mode 100644
index ffd4a8982..000000000
--- a/fastlane/metadata/android/en-US/phoneScreenshots/04.jpg
+++ /dev/null
diff --git a/fastlane/metadata/android/en-US/phoneScreenshots/05.jpg b/fastlane/metadata/android/en-US/phoneScreenshots/05.jpg
deleted file mode 100644
index 6393f6e13..000000000
--- a/fastlane/metadata/android/en-US/phoneScreenshots/05.jpg
+++ /dev/null
diff --git a/fastlane/metadata/android/en-US/phoneScreenshots/06.jpg b/fastlane/metadata/android/en-US/phoneScreenshots/06.jpg
deleted file mode 100644
index ecf39c8e2..000000000
--- a/fastlane/metadata/android/en-US/phoneScreenshots/06.jpg
+++ /dev/null
diff --git a/fastlane/metadata/android/en-US/sevenInchScreenshots/01.jpg b/fastlane/metadata/android/en-US/sevenInchScreenshots/01.jpg
deleted file mode 100644
index 8e3c90037..000000000
--- a/fastlane/metadata/android/en-US/sevenInchScreenshots/01.jpg
+++ /dev/null
diff --git a/fastlane/metadata/android/en-US/sevenInchScreenshots/02.jpg b/fastlane/metadata/android/en-US/sevenInchScreenshots/02.jpg
deleted file mode 100644
index 73964659c..000000000
--- a/fastlane/metadata/android/en-US/sevenInchScreenshots/02.jpg
+++ /dev/null
diff --git a/fastlane/metadata/android/de/description.txt b/metadata/de/description.txt
index 4e76dd408..695fb1115 100644
--- a/fastlane/metadata/android/de/description.txt
+++ b/metadata/de/description.txt
@@ -1,4 +1,4 @@
-Pix-Art Messenger ist ein Fork der offiziellen Android-App Conversations mit
+Pix-Art Messenger ist ein Fork der offiziellen Android-App <a href="https://f-droid.org/packages/eu.siacs.conversations/">Conversations</a> mit
 einigen Änderungen, insbesondere zur Verbesserung der Benutzerfreundlichkeit,
 um den Umstieg von oftmals vorinstallierten Messengern zu erleichtern.
 
@@ -14,7 +14,7 @@ Seit Version 1.20.0 wird ein Hinweis direkt im Chat angezeigt, sofern du
 unverschlüsselt schreibst und eine Verschlüsselung möglich ist.
 
 Features:
-* Ende-zu-Ende Verschlüsselung entweder mit [http://conversations.im/omemo/ OMEMO], [https://otr.cypherpunks.ca/ OTR] oder [http://openpgp.org/about/ OpenPGP]
+* Ende-zu-Ende Verschlüsselung entweder mit <a href="http://conversations.im/omemo/">OMEMO</a>, <a href="https://otr.cypherpunks.ca/">OTR</a> oder <a href="http://openpgp.org/about/">OpenPGP</a>
 * Austausch von Bildern sowie anderen Dateien
 * Standorte senden und empfangen
 * Sprachnachrichten senden und empfangen
@@ -26,4 +26,4 @@ Features:
 * Status Nachrichten
 * tägliches Backup der Datenbank auf den lokalen Speicher
 
-Benötigst du Hilfe? Bitte tritt doch einfach dem Support Gruppenchat [xmpp:support@room.pix-art.de?join support@room.pix-art.de] bei.
+Benötigst du Hilfe? Bitte tritt doch einfach dem Support Gruppenchat <a href="xmpp:support@room.pix-art.de?join">support@room.pix-art.de</a> bei.
diff --git a/fastlane/metadata/android/de/summary.txt b/metadata/de/summary.txt
index 139c398ec..139c398ec 100644
--- a/fastlane/metadata/android/de/summary.txt
+++ b/metadata/de/summary.txt
diff --git a/fastlane/metadata/android/en-US/description.txt b/metadata/en-US/description.txt
index 62ecaef3f..0e7f9ab08 100644
--- a/fastlane/metadata/android/en-US/description.txt
+++ b/metadata/en-US/description.txt
@@ -1,4 +1,4 @@
-Pix-Art Messenger is a fork of [[eu.siacs.conversations]] with some changes,
+Pix-Art Messenger is a fork of <a href="https://f-droid.org/packages/eu.siacs.conversations/">Conversations</a> with some changes,
 to improve usability.
 
 Connection security and the protection of personal data are very important for
@@ -11,7 +11,7 @@ Since version 1.20.0, a hint is displayed directly in the chat, as long as you
 write unencrypted and encryption is possible.
 
 Features:
-* End-to-end encryption with either [http://conversations.im/omemo/ OMEMO], [https://otr.cypherpunks.ca/ OTR] or [http://openpgp.org/about/ OpenPGP]
+* End-to-end encryption with either <a href="http://conversations.im/omemo/">OMEMO</a>, <a href="https://otr.cypherpunks.ca/">OTR</a> or <a href="http://openpgp.org/about/">OpenPGP</a>
 * Send and receive images as well as other files
 * Send and receive locations
 * Send and receive voice messages
@@ -23,4 +23,4 @@ Features:
 * Status messages
 * Daily backup of database to local storage
 
-You need help? Please join our support group chat [xmpp:support@room.pix-art.de?join support@room.pix-art.de].
+You need help? Please join our support group chat <a href="xmpp:support@room.pix-art.de?join">support@room.pix-art.de</a>.
diff --git a/metadata/en-US/featureGraphic.png b/metadata/en-US/featureGraphic.png
new file mode 100644
index 000000000..c1b1d69aa
--- /dev/null
+++ b/metadata/en-US/featureGraphic.png
diff --git a/metadata/en-US/phoneScreenshots/00.jpg b/metadata/en-US/phoneScreenshots/00.jpg
new file mode 100644
index 000000000..331561290
--- /dev/null
+++ b/metadata/en-US/phoneScreenshots/00.jpg
diff --git a/metadata/en-US/phoneScreenshots/01.jpg b/metadata/en-US/phoneScreenshots/01.jpg
new file mode 100644
index 000000000..0667c3b1d
--- /dev/null
+++ b/metadata/en-US/phoneScreenshots/01.jpg
diff --git a/metadata/en-US/phoneScreenshots/02.jpg b/metadata/en-US/phoneScreenshots/02.jpg
new file mode 100644
index 000000000..b1fe7a8df
--- /dev/null
+++ b/metadata/en-US/phoneScreenshots/02.jpg
diff --git a/metadata/en-US/phoneScreenshots/03.jpg b/metadata/en-US/phoneScreenshots/03.jpg
new file mode 100644
index 000000000..0d5df8afc
--- /dev/null
+++ b/metadata/en-US/phoneScreenshots/03.jpg
diff --git a/metadata/en-US/phoneScreenshots/04.jpg b/metadata/en-US/phoneScreenshots/04.jpg
new file mode 100644
index 000000000..0ff5d6abc
--- /dev/null
+++ b/metadata/en-US/phoneScreenshots/04.jpg
diff --git a/metadata/en-US/phoneScreenshots/05.jpg b/metadata/en-US/phoneScreenshots/05.jpg
new file mode 100644
index 000000000..1288d0f92
--- /dev/null
+++ b/metadata/en-US/phoneScreenshots/05.jpg
diff --git a/metadata/en-US/phoneScreenshots/06.jpg b/metadata/en-US/phoneScreenshots/06.jpg
new file mode 100644
index 000000000..59c3b875b
--- /dev/null
+++ b/metadata/en-US/phoneScreenshots/06.jpg
diff --git a/metadata/en-US/phoneScreenshots/07.jpg b/metadata/en-US/phoneScreenshots/07.jpg
new file mode 100644
index 000000000..c5e091fce
--- /dev/null
+++ b/metadata/en-US/phoneScreenshots/07.jpg
diff --git a/metadata/en-US/sevenInchScreenshots/01.jpg b/metadata/en-US/sevenInchScreenshots/01.jpg
new file mode 100644
index 000000000..d7c8378bb
--- /dev/null
+++ b/metadata/en-US/sevenInchScreenshots/01.jpg
diff --git a/metadata/en-US/sevenInchScreenshots/02.jpg b/metadata/en-US/sevenInchScreenshots/02.jpg
new file mode 100644
index 000000000..7085026b6
--- /dev/null
+++ b/metadata/en-US/sevenInchScreenshots/02.jpg
diff --git a/fastlane/metadata/android/en-US/summary.txt b/metadata/en-US/summary.txt
index 91e2842b3..91e2842b3 100644
--- a/fastlane/metadata/android/en-US/summary.txt
+++ b/metadata/en-US/summary.txt