Update Russian Translations #2798

Merged
merged 3 commits into from Mar 14, 2017

Conversation

3 participants
@oleg-nenashev
Member

oleg-nenashev commented Mar 12, 2017

Description

The change integrates #2657 into the core

  • Squash the original commits
  • Resolve merge conflicts
  • Ensure that the introduced hyperlinks use redirectors (like in #2756)

Changelog entries

Proposed changelog entries:

  • Update Russian Translations
  • ...

Submitter checklist

  • JIRA issue is well described
  • Link to JIRA ticket in description, if appropriate
  • Appropriate autotests or explanation to why this change has no tests
  • For new API and extension points: Link to the reference implementation in open-source (or example in Javadoc)

Desired reviewers

@mention

bigscoop and others added some commits Mar 12, 2017

Merge branch 'master' into translations/russian_bigscoop
Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>

Conflicts:
	core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ru.properties
	core/src/main/resources/jenkins/model/Jenkins/systemInfo_ru.properties

@oleg-nenashev oleg-nenashev changed the title from Translations/russian bigscoop to Update Russian Translations Mar 12, 2017

Russian translations: Use redirectors
Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
@oleg-nenashev

This comment has been minimized.

Show comment
Hide comment
@oleg-nenashev

This comment has been minimized.

Show comment
Hide comment
@oleg-nenashev

oleg-nenashev Mar 12, 2017

Member

The text itself has been reviewed and approved by me in #2657 .
I rather seek an approval for the merge after the minor changes

Member

oleg-nenashev commented Mar 12, 2017

The text itself has been reviewed and approved by me in #2657 .
I rather seek an approval for the merge after the minor changes

@daniel-beck

This comment has been minimized.

Show comment
Hide comment
@daniel-beck

daniel-beck Mar 12, 2017

Member

Assuming this is just about commits attributed to Oleg, 👍

Member

daniel-beck commented Mar 12, 2017

Assuming this is just about commits attributed to Oleg, 👍

@oleg-nenashev oleg-nenashev merged commit acb6724 into jenkinsci:master Mar 14, 2017

2 checks passed

Jenkins This pull request looks good
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
@@ -20,7 +20,3 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

This comment has been minimized.

@daniel-beck

daniel-beck Mar 18, 2017

Member

@oleg-nenashev This is why I now have a merge conflict in #2777? 😢

@daniel-beck

daniel-beck Mar 18, 2017

Member

@oleg-nenashev This is why I now have a merge conflict in #2777? 😢

This comment has been minimized.

@oleg-nenashev

oleg-nenashev Mar 18, 2017

Member

@daniel-beck Why would you edit the Russian translation there? :)

@oleg-nenashev

oleg-nenashev Mar 18, 2017

Member

@daniel-beck Why would you edit the Russian translation there? :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment