diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index e842d61a..c59b061b 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -10,4 +10,5 @@
## 99l CONTRIBUTORS
Abhijith Balan (abhijithb21 AT openmailbox DOT org): Malayalam translation
Airon90 (https://diasp.eu/u/airon90): Italian translation
+Martín Vukovic (martinvukovic@protonmail.com): Android Native WebApp
SansPseudoFix (https://github.com/SansPseudoFix): French translation
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b4d7d10c..e7386c55 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -247,6 +247,7 @@
+
diff --git a/app/src/main/res/raw/podlist.json b/app/src/main/res/raw/podlist.json
index bd8457bd..6d5ae23d 100644
--- a/app/src/main/res/raw/podlist.json
+++ b/app/src/main/res/raw/podlist.json
@@ -1,7 +1,7 @@
{
"pods": [
{
- "active6": 12251,
+ "active6": 12442,
"score": 20,
"podUrls": [
{"host": "joindiaspora.com"},
@@ -16,7 +16,7 @@
"id": 38077
},
{
- "active6": 7143,
+ "active6": 7170,
"score": 20,
"podUrls": [{"host": "pod.geraspora.de"}],
"name": "Geraspora",
@@ -32,7 +32,7 @@
"id": 12688
},
{
- "active6": 10233,
+ "active6": 10298,
"score": 20,
"podUrls": [{"host": "framasphere.org"}],
"name": "Framasphere",
@@ -40,7 +40,7 @@
"id": 38776
},
{
- "active6": 511,
+ "active6": 507,
"score": 20,
"podUrls": [{"host": "nerdpol.ch"}],
"name": "nerdpol.ch*",
@@ -48,7 +48,7 @@
"id": 17343
},
{
- "active6": 852,
+ "active6": 853,
"score": 20,
"podUrls": [{"host": "despora.de"}],
"name": "Despora*",
@@ -87,7 +87,7 @@
"id": 25432
},
{
- "active6": 182,
+ "active6": 181,
"score": 20,
"podUrls": [{"host": "berlinspora.de"}],
"name": "berlinspora.de",
@@ -119,7 +119,7 @@
"id": 46568
},
{
- "active6": 71,
+ "active6": 72,
"score": 20,
"podUrls": [{"host": "d.consumium.org"}],
"name": "d.consumium.org",
@@ -127,7 +127,7 @@
"id": 2107
},
{
- "active6": 18,
+ "active6": 17,
"score": 20,
"podUrls": [{"host": "dia.manuelbichler.at"}],
"name": "dia.manuelbichler.at",
@@ -159,7 +159,7 @@
"id": 13926
},
{
- "active6": 136,
+ "active6": 133,
"score": 20,
"podUrls": [{"host": "diasp.ca"}],
"name": "diasp.ca",
@@ -199,7 +199,7 @@
"id": 4343
},
{
- "active6": 216,
+ "active6": 196,
"score": 20,
"podUrls": [{"host": "diasp.nl"}],
"name": "diasp.nl",
@@ -207,7 +207,7 @@
"id": 33262
},
{
- "active6": 194,
+ "active6": 185,
"score": 20,
"podUrls": [{"host": "diaspod.de"}],
"name": "diaspod.de",
@@ -303,7 +303,7 @@
"id": 12684
},
{
- "active6": 96,
+ "active6": 94,
"score": 20,
"podUrls": [{"host": "diaspora.hzsogood.net"}],
"name": "hzsogood.net",
@@ -319,7 +319,7 @@
"id": 40765
},
{
- "active6": 141,
+ "active6": 140,
"score": 20,
"podUrls": [{"host": "diaspora.koehn.com"}],
"name": "koehn.com",
@@ -375,8 +375,8 @@
"id": 9863
},
{
- "active6": 261,
- "score": 19,
+ "active6": 257,
+ "score": 20,
"podUrls": [{"host": "diaspora.permutationsofchaos.com"}],
"name": "permutationsofchaos.com",
"mainLangs": [],
@@ -407,7 +407,7 @@
"id": 12139
},
{
- "active6": 56,
+ "active6": 55,
"score": 20,
"podUrls": [{"host": "diaspora.poleni.com"}],
"name": "poleni.com",
@@ -415,7 +415,7 @@
"id": 1154
},
{
- "active6": 178,
+ "active6": 179,
"score": 20,
"podUrls": [{"host": "diaspora.psyco.fr"}],
"name": "psyco.fr",
@@ -423,7 +423,7 @@
"id": 31397
},
{
- "active6": 291,
+ "active6": 283,
"score": 20,
"podUrls": [{"host": "diaspora.punkbeer.me"}],
"name": "punkbeer.me",
@@ -431,7 +431,7 @@
"id": 44751
},
{
- "active6": 27,
+ "active6": 26,
"score": 20,
"podUrls": [{"host": "diaspora.raven-ip.com"}],
"name": "raven-ip.com",
@@ -495,7 +495,7 @@
"id": 46672
},
{
- "active6": 34,
+ "active6": 35,
"score": 20,
"podUrls": [{"host": "diaspora.u4u.org"}],
"name": "u4u.org",
@@ -535,7 +535,7 @@
"id": 27412
},
{
- "active6": 1179,
+ "active6": 1169,
"score": 20,
"podUrls": [{"host": "diasporabr.com.br"}],
"name": "diasporabr.com.br",
@@ -543,7 +543,7 @@
"id": 18248
},
{
- "active6": 367,
+ "active6": 365,
"score": 20,
"podUrls": [{"host": "diasporabrazil.org"}],
"name": "diasporabrazil.org",
@@ -575,7 +575,7 @@
"id": 46740
},
{
- "active6": 25,
+ "active6": 29,
"score": 20,
"podUrls": [{"host": "diasporing.ch"}],
"name": "Diasporing.ch",
@@ -623,7 +623,7 @@
"id": 11247
},
{
- "active6": 231,
+ "active6": 233,
"score": 20,
"podUrls": [{"host": "espora.social"}],
"name": "espora.social",
@@ -639,7 +639,7 @@
"id": 41690
},
{
- "active6": 169,
+ "active6": 168,
"score": 20,
"podUrls": [{"host": "flokk.no"}],
"name": "flokk.no",
@@ -647,7 +647,7 @@
"id": 45658
},
{
- "active6": 179,
+ "active6": 169,
"score": 20,
"podUrls": [{"host": "freehuman.fr"}],
"name": "freehuman.fr",
@@ -703,7 +703,7 @@
"id": 32786
},
{
- "active6": 73,
+ "active6": 72,
"score": 20,
"podUrls": [{"host": "karmasphe.re"}],
"name": "karmasphe.re",
@@ -719,7 +719,7 @@
"id": 46869
},
{
- "active6": 26,
+ "active6": 27,
"score": 20,
"podUrls": [{"host": "laba.mba"}],
"name": "laba.mba",
@@ -727,7 +727,7 @@
"id": 32393
},
{
- "active6": 141,
+ "active6": 140,
"score": 20,
"podUrls": [{"host": "liberdade.digital"}],
"name": "liberdade.digital",
@@ -751,7 +751,7 @@
"id": 14862
},
{
- "active6": 178,
+ "active6": 175,
"score": 20,
"podUrls": [{"host": "librenet.gr"}],
"name": "librenet.gr",
@@ -775,7 +775,7 @@
"id": 16366
},
{
- "active6": 622,
+ "active6": 616,
"score": 20,
"podUrls": [{"host": "mondiaspora.net"}],
"name": "mondiaspora.net",
@@ -871,7 +871,7 @@
"id": 887
},
{
- "active6": 16,
+ "active6": 17,
"score": 20,
"podUrls": [{"host": "pod.dapor.net"}],
"name": "dapor.net",
@@ -911,7 +911,7 @@
"id": 39828
},
{
- "active6": 0,
+ "active6": 72,
"score": 20,
"podUrls": [{"host": "pod.dobs.at"}],
"name": "dobs.at",
@@ -935,7 +935,7 @@
"id": 45384
},
{
- "active6": 9955,
+ "active6": 98,
"score": 20,
"podUrls": [{"host": "pod.gedankenausbruch.com"}],
"name": "gedankenausbruch.com",
@@ -959,7 +959,7 @@
"id": 36615
},
{
- "active6": 56,
+ "active6": 57,
"score": 20,
"podUrls": [{"host": "pod.hashtagueule.fr"}],
"name": "hashtagueule.fr",
@@ -1015,7 +1015,7 @@
"id": 32151
},
{
- "active6": 62,
+ "active6": 63,
"score": 20,
"podUrls": [{"host": "pod.liebeleu.de"}],
"name": "liebeleu.de",
@@ -1031,7 +1031,7 @@
"id": 9248
},
{
- "active6": 100,
+ "active6": 98,
"score": 20,
"podUrls": [{"host": "pod.nomorestars.com"}],
"name": "nomorestars.com",
@@ -1039,7 +1039,7 @@
"id": 31958
},
{
- "active6": 401,
+ "active6": 404,
"score": 20,
"podUrls": [{"host": "pod.orkz.net"}],
"name": "orkz.net",
@@ -1096,7 +1096,7 @@
},
{
"active6": 92,
- "score": 20,
+ "score": 19,
"podUrls": [{"host": "pod.ros-it.ch"}],
"name": "ros-it.ch",
"mainLangs": ["de"],
@@ -1143,7 +1143,7 @@
"id": 20115
},
{
- "active6": 52,
+ "active6": 54,
"score": 20,
"podUrls": [{"host": "pod.thomasdalichow.de"}],
"name": "thomasdalichow.de",
@@ -1191,7 +1191,7 @@
"id": 6398
},
{
- "active6": 88,
+ "active6": 85,
"score": 20,
"podUrls": [{"host": "pubpod.alqualonde.org"}],
"name": "pubpod.alqualonde.org",
@@ -1215,7 +1215,7 @@
"id": 41788
},
{
- "active6": 102,
+ "active6": 100,
"score": 20,
"podUrls": [{"host": "ruhrspora.de"}],
"name": "ruhrspora.de",
@@ -1223,7 +1223,7 @@
"id": 46198
},
{
- "active6": 445,
+ "active6": 449,
"score": 20,
"podUrls": [{"host": "russiandiaspora.org"}],
"name": "russiandiaspora.org",
@@ -1239,7 +1239,7 @@
"id": 39003
},
{
- "active6": 4,
+ "active6": 5,
"score": 20,
"podUrls": [{"host": "social.acclaro.digital"}],
"name": "acclaro.digital",
@@ -1295,7 +1295,7 @@
"id": 8983
},
{
- "active6": 179,
+ "active6": 180,
"score": 20,
"podUrls": [{"host": "socializer.cc"}],
"name": "socializer.cc",
@@ -1319,7 +1319,7 @@
"id": 29359
},
{
- "active6": 41,
+ "active6": 39,
"score": 20,
"podUrls": [{"host": "sysad.org"}],
"name": "sysad.org",
@@ -1335,7 +1335,7 @@
"id": 5276
},
{
- "active6": 4031,
+ "active6": 3982,
"score": 20,
"podUrls": [{"host": "therealtalk.org"}],
"name": "therealtalk.org",
@@ -1343,7 +1343,7 @@
"id": 26786
},
{
- "active6": 42,
+ "active6": 41,
"score": 20,
"podUrls": [{"host": "thinkopen.net"}],
"name": "thinkopen.net",
@@ -1351,7 +1351,7 @@
"id": 7366
},
{
- "active6": 97,
+ "active6": 98,
"score": 20,
"podUrls": [{"host": "tippentappen.de"}],
"name": "tippentappen.de",
@@ -1375,7 +1375,7 @@
"id": 5842
},
{
- "active6": 314,
+ "active6": 312,
"score": 20,
"podUrls": [{"host": "wk3.org"}],
"name": "wk3.org",
@@ -1431,7 +1431,7 @@
"id": 8574
},
{
- "active6": 45,
+ "active6": 46,
"score": 20,
"podUrls": [{"host": "diaspote.org"}],
"name": "diaspote.org",
@@ -1439,13 +1439,21 @@
"id": 33317
},
{
- "active6": 5,
+ "active6": 11,
"score": 20,
"podUrls": [{"host": "diaspora.zone"}],
"name": "zone",
"mainLangs": [],
"id": 41976
+ },
+ {
+ "active6": 1,
+ "score": 20,
+ "podUrls": [{"host": "pod.userzap.de"}],
+ "name": "userzap.de",
+ "mainLangs": ["de"],
+ "id": 12816
}
],
- "timestamp": 1477156746197
+ "timestamp": 1477430185319
}
diff --git a/app/src/main/res/values-cs/strings-preferences.xml b/app/src/main/res/values-cs/strings-preferences.xml
index 8d05ea29..7be06570 100644
--- a/app/src/main/res/values-cs/strings-preferences.xml
+++ b/app/src/main/res/values-cs/strings-preferences.xml
@@ -19,4 +19,5 @@
+
diff --git a/app/src/main/res/values-de/strings-preferences.xml b/app/src/main/res/values-de/strings-preferences.xml
index 8451c4d2..43fcd2ce 100644
--- a/app/src/main/res/values-de/strings-preferences.xml
+++ b/app/src/main/res/values-de/strings-preferences.xml
@@ -45,7 +45,6 @@
Persönliche Einstellungen
Öffne die Einstellungen deines Diaspora Accounts
- Kontakte
Bearbeite deine Kontaktliste
Tags verwalten
Verwalte die Liste der Hashtags, denen du folgst
@@ -60,4 +59,5 @@
Füge beim Teilen von Texten einen Verweis auf diese App an (\"geteilt durch…\")
+
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7c2de065..17844326 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -19,6 +19,7 @@
Erwähnungen
Öffentliche Aktivitäten
Suchen
+ Kontakte
Alle Benachrichtigungen
Auch kommentiert
diff --git a/app/src/main/res/values-el/strings-preferences.xml b/app/src/main/res/values-el/strings-preferences.xml
index 8d05ea29..7be06570 100644
--- a/app/src/main/res/values-el/strings-preferences.xml
+++ b/app/src/main/res/values-el/strings-preferences.xml
@@ -19,4 +19,5 @@
+
diff --git a/app/src/main/res/values-es/strings-preferences.xml b/app/src/main/res/values-es/strings-preferences.xml
index 08ed7620..bb28066f 100644
--- a/app/src/main/res/values-es/strings-preferences.xml
+++ b/app/src/main/res/values-es/strings-preferences.xml
@@ -28,7 +28,6 @@
Configuración personal
- Contactos
Administrar tu lista de contactos
Administrar Etiquetas
Agregar y eliminar la etiqueta que estas siguendo
@@ -43,4 +42,5 @@
Agregar una referencia a esta aplicación (\"compartida por…\") a los textos compartidos
+
diff --git a/app/src/main/res/values-fr/strings-preferences.xml b/app/src/main/res/values-fr/strings-preferences.xml
index 18fd4a2d..dabe599a 100644
--- a/app/src/main/res/values-fr/strings-preferences.xml
+++ b/app/src/main/res/values-fr/strings-preferences.xml
@@ -45,7 +45,6 @@
Paramètres personnels
Ouvrir vos paramètres de compte diaspora
- Contacts
Gérer votre liste de contacts
Gérer les Hashtags
Ajouter et supprimer les hashtags que vous suivez
@@ -60,4 +59,5 @@
Ajoutez une référence à l\'application (« partagée via …\") aux textes partagés
+
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 07b65d19..a734f873 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -19,6 +19,7 @@
Mentions
Publique
Rechercher
+ Contacts
Toutes les notifications
Aussi commenté
diff --git a/app/src/main/res/values-hi/strings-preferences.xml b/app/src/main/res/values-hi/strings-preferences.xml
index 8d05ea29..7be06570 100644
--- a/app/src/main/res/values-hi/strings-preferences.xml
+++ b/app/src/main/res/values-hi/strings-preferences.xml
@@ -19,4 +19,5 @@
+
diff --git a/app/src/main/res/values-hu/strings-preferences.xml b/app/src/main/res/values-hu/strings-preferences.xml
index 8d05ea29..7be06570 100644
--- a/app/src/main/res/values-hu/strings-preferences.xml
+++ b/app/src/main/res/values-hu/strings-preferences.xml
@@ -19,4 +19,5 @@
+
diff --git a/app/src/main/res/values-it/strings-preferences.xml b/app/src/main/res/values-it/strings-preferences.xml
index a85ff340..c63da269 100644
--- a/app/src/main/res/values-it/strings-preferences.xml
+++ b/app/src/main/res/values-it/strings-preferences.xml
@@ -45,7 +45,6 @@
Impostazioni personali
Apri le impostazioni del tuo account Diaspora
- Contatti
Gestisci il tuo elenco di contatti
Gestisci hashtag
Aggiungi ed elimina gli hashtag che stai seguendo
@@ -60,4 +59,5 @@
Aggiunge un riferimento a quest\'app (\"Condiviso da…\") nei testi condivisi
+
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 78b3cfeb..3f22927f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -19,6 +19,7 @@
Menzioni
Pubblico
Cerca
+ Contatti
Tutte le notifiche
Inoltre ha commentato
diff --git a/app/src/main/res/values-ja/strings-preferences.xml b/app/src/main/res/values-ja/strings-preferences.xml
index 57cea9b6..69a8f15a 100644
--- a/app/src/main/res/values-ja/strings-preferences.xml
+++ b/app/src/main/res/values-ja/strings-preferences.xml
@@ -45,7 +45,6 @@
個人用設定
Diaspora アカウント設定を開きます
- 連絡先
連絡先リストを管理します
ハッシュタグを管理
フォローしているハッシュタグを追加および削除します
@@ -60,4 +59,5 @@
シェアしたテキストに、このアプリへの参照 (\"…でシェア\") を追加します
+
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 80c83bc2..8892c0aa 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -19,6 +19,7 @@
メンション
公開
検索
+ 連絡先
すべての通知
コメントもしました
diff --git a/app/src/main/res/values-kn/strings-preferences.xml b/app/src/main/res/values-kn/strings-preferences.xml
index 8d05ea29..7be06570 100644
--- a/app/src/main/res/values-kn/strings-preferences.xml
+++ b/app/src/main/res/values-kn/strings-preferences.xml
@@ -19,4 +19,5 @@
+
diff --git a/app/src/main/res/values-ml/strings-preferences.xml b/app/src/main/res/values-ml/strings-preferences.xml
index d1cc6496..915109cd 100644
--- a/app/src/main/res/values-ml/strings-preferences.xml
+++ b/app/src/main/res/values-ml/strings-preferences.xml
@@ -28,7 +28,6 @@
സ്വകാര്യ സജ്ജീകരണങ്ങൾ
- ബന്ധങ്ങൾ
ബന്ധങ്ങളുടെ ക്രമം നിയന്ത്രികൂ
ഹാഷ്ടാഗുകളെ നിയന്ത്രിക്കൂ
താങ്കൾ പിന്തുടരുന്ന ഹാഷ്ടാഗുകളെ ചേർക്കുകയോ നീക്കുകയോ ചെയ്യൂ
@@ -43,4 +42,5 @@
പങ്കുവയ്ക്കുന്ന വാചകങ്ങളിൽ ഈ പ്രയോഗത്തിന്റെ അവലംബം(\"…പങ്കുവച്ചത്\") എന്ന് കൂട്ടിച്ചേർക്കുക
+
diff --git a/app/src/main/res/values-nl/strings-preferences.xml b/app/src/main/res/values-nl/strings-preferences.xml
index f1f7af7f..f5b9495e 100644
--- a/app/src/main/res/values-nl/strings-preferences.xml
+++ b/app/src/main/res/values-nl/strings-preferences.xml
@@ -27,7 +27,6 @@
Persoonlijke instellingen
- Contacten
Uw lijst met contactpersonen beheren
Beheren van Hashtags
Toevoegen en verwijderen van de hashtags die u volgt
@@ -42,4 +41,5 @@
Een verwijzing naar dit app (\"gedeeld door…\") toevoegen aan gedeelde teksten
+
diff --git a/app/src/main/res/values-no/strings-preferences.xml b/app/src/main/res/values-no/strings-preferences.xml
index 8d05ea29..7be06570 100644
--- a/app/src/main/res/values-no/strings-preferences.xml
+++ b/app/src/main/res/values-no/strings-preferences.xml
@@ -19,4 +19,5 @@
+
diff --git a/app/src/main/res/values-pl/strings-preferences.xml b/app/src/main/res/values-pl/strings-preferences.xml
index 253e1ae5..b5a23a56 100644
--- a/app/src/main/res/values-pl/strings-preferences.xml
+++ b/app/src/main/res/values-pl/strings-preferences.xml
@@ -24,7 +24,6 @@
Ustawienia osobiste
- Kontakty
Zarządzanie listą kontaktów
Zarządzanie znacznikami
Zmień konto
@@ -34,4 +33,5 @@
Automatycznie ukryj paski narzędzi na górze i na dole podczas przewijania
+
diff --git a/app/src/main/res/values-pt-rBR/strings-preferences.xml b/app/src/main/res/values-pt-rBR/strings-preferences.xml
index 79d17356..4636ea16 100644
--- a/app/src/main/res/values-pt-rBR/strings-preferences.xml
+++ b/app/src/main/res/values-pt-rBR/strings-preferences.xml
@@ -28,7 +28,6 @@
Configurações pessoais
- Contatos
Gerenciar sua lista de contatos
Gerenciar Hashtags
Adicionar ou excluir as hashtags que você está seguindo
@@ -43,4 +42,5 @@
Acrescentar uma referência (\"compartilhado por…\") a este app para textos compartilhados
+
diff --git a/app/src/main/res/values-pt/strings-preferences.xml b/app/src/main/res/values-pt/strings-preferences.xml
index 8d05ea29..7be06570 100644
--- a/app/src/main/res/values-pt/strings-preferences.xml
+++ b/app/src/main/res/values-pt/strings-preferences.xml
@@ -19,4 +19,5 @@
+
diff --git a/app/src/main/res/values-ru/strings-preferences.xml b/app/src/main/res/values-ru/strings-preferences.xml
index 0a9ee409..9de048c7 100644
--- a/app/src/main/res/values-ru/strings-preferences.xml
+++ b/app/src/main/res/values-ru/strings-preferences.xml
@@ -28,7 +28,6 @@
Личные настройки
- Контакты
Управление списком контактов
Управление хэштегами
Добавление и удаление хэштегов, на которые вы подписаны
@@ -43,4 +42,5 @@
Присоединять ссылку на приложение (\"Опубликовано из…\") к размещенным записям
+
diff --git a/app/src/main/res/values-sv/strings-preferences.xml b/app/src/main/res/values-sv/strings-preferences.xml
index 8d05ea29..7be06570 100644
--- a/app/src/main/res/values-sv/strings-preferences.xml
+++ b/app/src/main/res/values-sv/strings-preferences.xml
@@ -19,4 +19,5 @@
+
diff --git a/app/src/main/res/values-tr/strings-preferences.xml b/app/src/main/res/values-tr/strings-preferences.xml
index 8d05ea29..7be06570 100644
--- a/app/src/main/res/values-tr/strings-preferences.xml
+++ b/app/src/main/res/values-tr/strings-preferences.xml
@@ -19,4 +19,5 @@
+
diff --git a/app/src/main/res/values/strings-preferences.xml b/app/src/main/res/values/strings-preferences.xml
index 45a6bccd..d08d4de1 100644
--- a/app/src/main/res/values/strings-preferences.xml
+++ b/app/src/main/res/values/strings-preferences.xml
@@ -123,7 +123,7 @@
Personal settings
Open your Diaspora account settings
- Contacts
+ @string/contacts
Manage your contact list
Manage Hashtags