search

trebleshot / android

An open-source app that allows you to transfer files one to one securely or using a browser, all without the internet
GNU General Public License v2.0
144 stars 42 forks source link

2.0 strings reworked #185

Closed comradekingu closed 3 years ago

comradekingu commented 3 years ago

Will be back later

comradekingu commented 3 years ago

I don't think it is half-bad now. Makes sense to look at more minute things in a new PR and let translators have these changes to work with for now IMO.

velitasali commented 3 years ago

Thanks for the help @comradekingu. I will merge this after you rebase the commit :+1:

comradekingu commented 3 years ago

@velitasali Thank you for all the help :) Not at home, so I don't have my setup available, but I put everything in https://github.com/trebleshot/android/pull/186 Or did you mean rebase against another branch?

mubashir-rehman commented 3 years ago

@comradekingu rebase to latest commits of upstream, I think

comradekingu commented 3 years ago

@mubashir-rehman It isn't out of date with master. Does that mean "alpha-release"? It has been master before.

mubashir-rehman commented 3 years ago

@comradekingu then i might be wrong. i think Veli is asleep and will respond when awake

velitasali commented 3 years ago

I meant combining them into a single commit :) GitHub has that option but I don't know how it behaves. Anyways, I am going to do that here, and close #186.

Again thanks for the help!

velitasali commented 3 years ago

Actually, it worked really well :+1: