[
https://issues.apache.org/jira/browse/SYNCOPE-828?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15411456#comment-15411456
]
ASF GitHub Bot commented on SYNCOPE-828:
----------------------------------------
Github user ilgrosso commented on the issue:
https://github.com/apache/syncope/pull/32
Hi @securny, thanks for your work!
There are unfortunately some issues in merging this PR, due to some nasty
conflicts.
I would suggest to:
1. close this PR
2. align your own fork's master branch with latest changes from syncope
master branch
3. create new branch from your now-aligned master branch
4. unzip
[patch-32.zip](https://github.com/apache/syncope/files/406325/patch-32.zip) and
apply the contained diff via `patch -p1 < 32.diff`
5. open new PR from this newly created branch
I can naturally apply the elaborated diff by myself (and thus you could
skip all such procedure), but this way I will lost your commit authorship (I
could name you in the commit log, but anyway...)
> Russian translation for admin console
> -------------------------------------
>
> Key: SYNCOPE-828
> URL: https://issues.apache.org/jira/browse/SYNCOPE-828
> Project: Syncope
> Issue Type: New Feature
> Components: console
> Reporter: Francesco Chicchiriccò
> Assignee: Dmitry Berezkin
> Fix For: 2.0.0-M3
>
>
> Add Russian to the list of available translations for admin console UI.
> Relevant mail thread: http://markmail.org/message/wrftlbrpswyeeivu
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
