Release - #2413 & #2531

[marstaj]

I have altered the "Login failed" message for English language so that it has correct structure. You can see this when you try to log in with wrong user name or password.

Secondly I fixed cache log auto-save. List of stored caches now displays that a cas has offline log, which was made by auto-save.

[buildhive]

c:geo » c-geo-opensource #1124 SUCCESS
This pull request looks good
(what's this?)

[marstaj]

#2413 , #2531

[SammysHP]

This pull request cannot be merged because it deals with two different issues. Please use separate feature branches instead. Also f80ef7f should go to master because it is no regression fix or important fix. The same for the translation update IMHO.

If there are no objections to any of the commit they can be cherry picked manually.

[marstaj]

So is there a way to separate these, or should I fix it in master and commit it again and then make 2 pull requests? Also I cannot find a "delete" button for a pull request, so I guess only you guys can delete this after?

[Lineflyer]

In my opinion it would be OK to fix both of these issues in master only as they are not critical.

[SammysHP]

@marstaj
Create two branches from master and cherry pick your commits into them. Then push both to your fork and send a pull request for both.

$ git checkout master
$ git branch feature-2413
$ git branch feature-2531
$ git checkout feature-2413
$ git cherry-pick 6210c6b48bf27addbc0a4aa404e4bd8093439431
$ git checkout feature-2531
$ git cherry-pick f80ef7fd844a6255029f0cb9ae5c4910295c2793
$ git push origin feature-2413
$ git push origin feature-2531

(untested)

[rsudev]

It looks OK to me and seems to work, so I'll pick locally to master and push

[rsudev]

merged to master manually and pushed. Thanks for your contribution!