search

onionshare / onionshare-android

Android version of OnionShare
https://onionshare.org/
GNU General Public License v3.0
169 stars 19 forks source link

Weblate update #91

Closed emmapeel2 closed 1 year ago

emmapeel2 commented 1 year ago

Weblate is currently locked because it cannot rebase, gets nervous with some files that were deleted and others added and gets in conflict (https://hosted.weblate.org/projects/onionshare/onionshare-android/#repository)

This merge will solve the conflicts in weblate , so it can keep rebasing changes automatically.

I merged the weblate repo (https://hosted.weblate.org/projects/onionshare/onionshare-android/#repository) onto this one, and solved the conflicts manually.

Please review

emmapeel2 commented 1 year ago

Ey there, @grote, could you please review? The translations in weblate are not being updated because weblate cannot rebase...