Commit Graph

14308 Commits

Author SHA1 Message Date
tom79 d70e9b07b7 Merge branch 'develop' into pixelfed_stories
# Conflicts:
#	app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
#	app/src/main/java/app/fedilab/android/client/PixelfedAPI.java
#	app/src/main/java/app/fedilab/android/helper/Helper.java
#	app/src/main/res/values/strings.xml
2019-11-15 16:39:45 +01:00
tom79 d7574ebfc4 Improve activity for bookmarks 2019-11-15 16:32:25 +01:00
tom79 0767a69af8 Improve activity for bookmarks 2019-11-15 15:55:48 +01:00
tom79 b7f14397e0 Import/export 2019-11-15 15:06:02 +01:00
tom79 a1e0951cbf Bookmark API support 2019-11-14 18:58:58 +01:00
tom79 c780d1d016 Merge branch 'develop' of framagit.org:tom79/fedilab into develop 2019-11-13 17:04:31 +01:00
Thomas 4a012bf1e1 Merge branch 'l10n_develop' into 'develop'
New Crowdin translations

See merge request tom79/fedilab!927
2019-11-13 17:03:24 +01:00
tom79 860cc8cf81 Fix Peertube colors 2019-11-13 15:32:33 +01:00
Thomas 4c0cccfc51 New translations strings.xml (French) 2019-11-13 15:29:33 +01:00
Thomas c3b539b402 New translations strings.xml (Chinese Simplified) 2019-11-13 15:29:13 +01:00
Thomas 4ae01e4c0f New translations strings.xml (Chinese Simplified) 2019-11-13 15:07:11 +01:00
tom79 5f3cbde13e Fix Peertube colors 2019-11-13 13:23:45 +01:00
tom79 3bf64a0bb9 Fix top bar Android 4 2019-11-13 12:54:01 +01:00
Thomas cb9508a93a New translations strings.xml (Malayalam) 2019-11-13 12:49:20 +01:00
Thomas ffce908b64 New translations strings.xml (Malayalam) 2019-11-13 11:46:11 +01:00
Thomas fbcb0f97a4 Merge branch 'l10n_develop' into 'develop'
New Crowdin translations

See merge request tom79/fedilab!925
2019-11-13 11:13:01 +01:00
Thomas 0c500f9288 New translations strings.xml (Malayalam) 2019-11-13 10:59:14 +01:00
Thomas 7877b12226 New translations strings.xml (Hindi) 2019-11-13 10:58:57 +01:00
Thomas 3f31b4715b New translations strings.xml (Greek) 2019-11-13 10:58:41 +01:00
Thomas b2757cef69 New translations strings.xml (Galician) 2019-11-13 10:58:31 +01:00
Thomas 4153dc2886 New translations strings.xml (French) 2019-11-13 10:58:21 +01:00
Thomas c0508a55ec New translations strings.xml (Esperanto) 2019-11-13 10:58:09 +01:00
Thomas 75541008ac New translations strings.xml (Dutch) 2019-11-13 10:57:56 +01:00
Thomas 9a70d5dc24 New translations strings.xml (Danish) 2019-11-13 10:57:48 +01:00
Thomas 0f3c85d58f New translations strings.xml (Czech) 2019-11-13 10:57:34 +01:00
Thomas 3a679b2ea6 New translations strings.xml (Hungarian) 2019-11-13 10:57:27 +01:00
Thomas bd82a0c573 New translations strings.xml (Chinese Traditional) 2019-11-13 10:57:18 +01:00
Thomas 4fe47a821a New translations strings.xml (Catalan) 2019-11-13 10:57:04 +01:00
Thomas 078f54301e New translations strings.xml (Breton) 2019-11-13 10:56:53 +01:00
Thomas 22691f58df New translations strings.xml (Bengali, India) 2019-11-13 10:56:44 +01:00
Thomas 2aebcf9f47 New translations strings.xml (Basque) 2019-11-13 10:56:32 +01:00
Thomas 4812a6da6c New translations strings.xml (Armenian) 2019-11-13 10:56:20 +01:00
Thomas 5244bac3b7 New translations strings.xml (Arabic) 2019-11-13 10:56:08 +01:00
Thomas 38bebdfa78 New translations strings.xml (Turkish) 2019-11-13 10:55:58 +01:00
Thomas af225803de New translations strings.xml (Chinese Simplified) 2019-11-13 10:55:46 +01:00
Thomas 032ab0e2b1 New translations strings.xml (German) 2019-11-13 10:55:31 +01:00
Thomas 9064cc5b6e New translations strings.xml (Indonesian) 2019-11-13 10:55:17 +01:00
Thomas 310e5205a9 New translations strings.xml (Kabyle) 2019-11-13 10:55:06 +01:00
Thomas 24953999fb New translations strings.xml (Welsh) 2019-11-13 10:54:58 +01:00
Thomas 39ff1b7bd1 New translations strings.xml (Vietnamese) 2019-11-13 10:54:46 +01:00
Thomas 53a37b7ef7 New translations strings.xml (Ukrainian) 2019-11-13 10:54:36 +01:00
Thomas 85a025e43f New translations strings.xml (Swedish) 2019-11-13 10:54:26 +01:00
Thomas 3ceb689dcf New translations strings.xml (Spanish) 2019-11-13 10:54:18 +01:00
Thomas 86a24276f6 New translations strings.xml (Slovenian) 2019-11-13 10:54:07 +01:00
Thomas 49da7e228b New translations strings.xml (Sinhala) 2019-11-13 10:53:55 +01:00
Thomas 64135608bf New translations strings.xml (Serbian (Cyrillic)) 2019-11-13 10:53:41 +01:00
Thomas 37230f9753 New translations strings.xml (Italian) 2019-11-13 10:53:31 +01:00
Thomas ab4a801f08 New translations strings.xml (Russian) 2019-11-13 10:53:17 +01:00
Thomas 6ade0d5358 New translations strings.xml (Portuguese, Brazilian) 2019-11-13 10:53:03 +01:00
Thomas 406ed86d11 New translations strings.xml (Portuguese) 2019-11-13 10:52:46 +01:00