From 6f319114976972e87c5f9c29f79f64bbdcfb9e44 Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Tue, 22 May 2018 18:12:10 +0200 Subject: [PATCH 1/2] Add $GOPATH/bin to PATH for make releases (#4020) Needed to access go tool gxz --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 1fd42fa4ec..011d4fefdf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -197,6 +197,7 @@ pipeline: environment: TAGS: bindata sqlite commands: + - export PATH=$PATH:$GOPATH/bin - make release when: event: [ push, tag ] From 2c4b54dcccb849f97f555317a735c63eaf51c973 Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Tue, 22 May 2018 23:10:02 +0000 Subject: [PATCH 2/2] [skip ci] Updated translations via Crowdin --- options/locale/locale_uk-UA.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index 29ed123176..e140446cfe 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -648,6 +648,8 @@ pulls.reopen_to_merge=Будь ласка перевідкрийте цей за pulls.merged=Злито pulls.has_merged=Запит на злиття було об'єднано. pulls.can_auto_merge_desc=Цей запит можна об'єднати автоматично. +pulls.cannot_auto_merge_desc=Цей запит на злиття не може бути злитий автоматично через конфлікти. +pulls.cannot_auto_merge_helper=Злити вручну для вирішення конфліктів. pulls.merge_pull_request=Об'єднати запит на злиття pulls.rebase_merge_pull_request=Зробити Rebase і злити pulls.squash_merge_pull_request=Об'єднати (Squash) і злити