summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorGiteaBot <teabot@gitea.io>2017-12-31 14:47:00 +0000
committerGiteaBot <teabot@gitea.io>2017-12-31 14:47:00 +0000
commitb05a17249b41a1e202f9a616cfc74f1c2e68994e (patch)
tree0d5d6d9e2aff466a188e3f33e9140efc601e977e /options
parent8cd987af0c4669623ec350a50096433583e74828 (diff)
downloadgitea-b05a17249b41a1e202f9a616cfc74f1c2e68994e.tar.gz
gitea-b05a17249b41a1e202f9a616cfc74f1c2e68994e.zip
[skip ci] Updated translations via Crowdin
Diffstat (limited to 'options')
-rw-r--r--options/locale/locale_pl-PL.ini1
-rw-r--r--options/locale/locale_pt-BR.ini1
2 files changed, 2 insertions, 0 deletions
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
index 6b3d2802e9..17a4a74a22 100644
--- a/options/locale/locale_pl-PL.ini
+++ b/options/locale/locale_pl-PL.ini
@@ -818,6 +818,7 @@ activity.closed_issue_label=Zamknięty
activity.new_issues_count_1=Nowy problem
activity.new_issues_count_n=Nowe problemy
activity.new_issue_label=Otwarte
+activity.title.unresolved_conv_1=%d nierozstrzygnięta dyskusja
activity.unresolved_conv_label=Otwarte
activity.title.releases_1=%d Wydanie
activity.title.releases_n=%d Wydań
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
index 5050d3df05..bcde8143f8 100644
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@@ -755,6 +755,7 @@ pulls.is_checking=A verificação do conflito ainda está em progresso, por favo
pulls.can_auto_merge_desc=O merge deste pull request pode ser aplicado automaticamente.
pulls.cannot_auto_merge_desc=O merge deste pull request não pode ser aplicado automaticamente pois há conflitos.
pulls.cannot_auto_merge_helper=Por favor, aplique o merge manualmente para resolver os conflitos.
+pulls.merge_pull_request=Aplicar merge de Pull Request
pulls.open_unmerged_pull_exists=`Você não pode executar a operação de reabrir porque já existe um pull request aberto (#%d) do mesmo repositório com as mesmas informações de merge e está esperando pelo merge.`
milestones.new=Novo marco