diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-15 13:29:28 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-15 14:15:41 +1100 |
| commit | 8d8bdb948b089250c22f3ac4f549152a209dcdb2 (patch) | |
| tree | 3687ba082abe7322fe5c77c452b618c7b5e6e2e2 /pkg/i18n | |
| parent | cdcfeb396fda1e61dee9b6d88ab4659152a10948 (diff) | |
avoid deadlock in merge panel
Diffstat (limited to 'pkg/i18n')
| -rw-r--r-- | pkg/i18n/chinese.go | 1 | ||||
| -rw-r--r-- | pkg/i18n/dutch.go | 1 | ||||
| -rw-r--r-- | pkg/i18n/english.go | 2 | ||||
| -rw-r--r-- | pkg/i18n/polish.go | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go index 3167e0bf8..585d77b38 100644 --- a/pkg/i18n/chinese.go +++ b/pkg/i18n/chinese.go @@ -73,7 +73,6 @@ func chineseTranslationSet() TranslationSet { PullWait: "拉取中……", PushWait: "推送中……", FetchWait: "正在抓取……", - FileNoMergeCons: "该文件没有合并冲突", LcSoftReset: "软重置", AlreadyCheckedOutBranch: "您已经检出了这个分支", SureForceCheckout: "您确定要强制检出吗？您将丢失所有本地更改", diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go index 914d558fe..7e8b2dcec 100644 --- a/pkg/i18n/dutch.go +++ b/pkg/i18n/dutch.go @@ -44,7 +44,6 @@ func dutchTranslationSet() TranslationSet { PullWait: "Pullen...", PushWait: "Pushen...", FetchWait: "Fetchen...", - FileNoMergeCons: "Dit bestand heeft geen merge conflicten", LcSoftReset: "zacht reset", AlreadyCheckedOutBranch: "Je hebt deze branch al uitgecheckt", SureForceCheckout: "Weet je zeker dat je het uitchecken wil forceren? Al je lokale verandering zullen worden verwijdert", diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 2defb4ae6..4ff6c3555 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -58,7 +58,6 @@ type TranslationSet struct { PullWait string PushWait string FetchWait string - FileNoMergeCons string LcSoftReset string AlreadyCheckedOutBranch string SureForceCheckout string @@ -608,7 +607,6 @@ func EnglishTranslationSet() TranslationSet { PullWait: "Pulling...", PushWait: "Pushing...", FetchWait: "Fetching...", - FileNoMergeCons: "This file has no inline merge conflicts", LcSoftReset: "soft reset", AlreadyCheckedOutBranch: "You have already checked out this branch", SureForceCheckout: "Are you sure you want force checkout? You will lose all local changes", diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go index 5994a59e9..f378fa08b 100644 --- a/pkg/i18n/polish.go +++ b/pkg/i18n/polish.go @@ -39,7 +39,6 @@ func polishTranslationSet() TranslationSet { PullWait: "Pobieranie zmian...", PushWait: "Wysyłanie zmian...", FetchWait: "Pobieram...", - FileNoMergeCons: "Brak konfliktów scalania w pliku", AlreadyCheckedOutBranch: "Już przęłączono na tą gałąź", SureForceCheckout: "Jesteś pewny, że chcesz wymusić przełączenie? Stracisz wszystkie lokalne zmiany", ForceCheckoutBranch: "Wymuś przełączenie gałęzi", |