Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update data stores, translations and bitcoinj checkpoints #3748

Merged
merged 3 commits into from
Dec 4, 2019
Merged

Update data stores, translations and bitcoinj checkpoints #3748

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fd99a6
Update bitcoinj checkpoint file
ripcurlx Dec 4, 2019
305a720
Update translations
ripcurlx Dec 4, 2019
2c9287e
Update data stores
ripcurlx Dec 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,7 +1961,7 @@ showWalletDataWindow.includePrivKeys=Private Schlüssel einbeziehen
tacWindow.headline=Nutzervereinbarung
tacWindow.agree=Ich stimme zu
tacWindow.disagree=Ich stimme nicht zu und beende
tacWindow.arbitrationSystem=Vermittlersystem
tacWindow.arbitrationSystem=Dispute resolution
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is the German translation (and others, see below) reverted to English?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked into this briefly in Transifex and the string did change from "Vermittlersystem" to "Streitbeilegung" about a month ago but it seems that something went wrong when importing the new strings into the git repo.


tradeDetailsWindow.headline=Handel
tradeDetailsWindow.disputedPayoutTxId=Transaktions-ID der strittigen Auszahlung:
Expand Down Expand Up @@ -2152,7 +2152,7 @@ systemTray.show=Anwendungsfenster anzeigen
systemTray.hide=Anwendungsfenster verstecken
systemTray.info=Informationen zu Bisq
systemTray.exit=Beenden
systemTray.tooltip=Bisq: Das dezentrale Handelsnetzwerk
systemTray.tooltip=Bisq: A decentralized bitcoin exchange network


####################################################################
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/resources/i18n/displayStrings_el.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,9 +1247,9 @@ dao.param.REIMBURSEMENT_MAX_AMOUNT=Μέγιστο ποσό BSQ για αίτημ
# suppress inspection "UnusedProperty"
dao.param.QUORUM_GENERIC=Ελάχιστη συμμετοχή σε BSQ για γενική πρόταση
# suppress inspection "UnusedProperty"
dao.param.QUORUM_COMP_REQUEST=Ελάχιστη συμμετοχή σε BSQ για αίτημα αποπληρωμής
dao.param.QUORUM_COMP_REQUEST=Ελάχιστη συμμετοχή σε BSQ για αίτημα αποπληρωμής
# suppress inspection "UnusedProperty"
dao.param.QUORUM_REIMBURSEMENT=Ελάχιστη συμμετοχή σε BSQ για αίτημα αποζημίωσης
dao.param.QUORUM_REIMBURSEMENT=Ελάχιστη συμμετοχή σε BSQ για αίτημα αποζημίωσης
# suppress inspection "UnusedProperty"
dao.param.QUORUM_CHANGE_PARAM=Ελάχιστη συμμετοχή σε BSQ για αλλαγή παραμέτρου
# suppress inspection "UnusedProperty"
Expand Down Expand Up @@ -1961,7 +1961,7 @@ showWalletDataWindow.includePrivKeys=Επισύναψη ιδιωτικού κλ
tacWindow.headline=Συμφωνητικό χρήσης
tacWindow.agree=Συμφωνώ
tacWindow.disagree=Διαφωνώ και έξοδος
tacWindow.arbitrationSystem=Σύστημα διαμεσολάβησης
tacWindow.arbitrationSystem=Dispute resolution

tradeDetailsWindow.headline=Συναλλαγή
tradeDetailsWindow.disputedPayoutTxId=Ταυτότητα αμφισβητούμενης συναλλαγής αποπληρωμής:
Expand Down Expand Up @@ -2152,7 +2152,7 @@ systemTray.show=Εμφάνιση παραθύρου εφαρμογής
systemTray.hide=Απόκρυψη παραθύρου εφαρμογής
systemTray.info=Πληροφορίες σχετικά με το Bisq
systemTray.exit=Έξοδος
systemTray.tooltip=Bisq: Αποκεντρωμένο χρηματιστηριακό δίκτυο
systemTray.tooltip=Bisq: A decentralized bitcoin exchange network


####################################################################
Expand Down
10 changes: 5 additions & 5 deletions core/src/main/resources/i18n/displayStrings_es.properties
View file
Open in desktop

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions core/src/main/resources/i18n/displayStrings_fa.properties
View file
Open in desktop

Large diffs are not rendered by default.

208 changes: 104 additions & 104 deletions core/src/main/resources/i18n/displayStrings_fr.properties
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_ja.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,7 +1961,7 @@ showWalletDataWindow.includePrivKeys=プライベートキーを含む
tacWindow.headline=ユーザー規約
tacWindow.agree=同意します
tacWindow.disagree=同意せずにに終了
tacWindow.arbitrationSystem=調停システム
tacWindow.arbitrationSystem=Dispute resolution

tradeDetailsWindow.headline=トレード
tradeDetailsWindow.disputedPayoutTxId=係争中の支払い取引ID:
Expand Down Expand Up @@ -2152,7 +2152,7 @@ systemTray.show=アプリケーションウィンドウを表示
systemTray.hide=アプリケーションウィンドウを隠す
systemTray.info=Bisqについての情報
systemTray.exit=終了
systemTray.tooltip=Bisq: 非中央集権の交換ネットワーク
systemTray.tooltip=Bisq: A decentralized bitcoin exchange network


####################################################################
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_pt-br.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,7 +1961,7 @@ showWalletDataWindow.includePrivKeys=Incluir chaves privadas
tacWindow.headline=Acordo de usuário
tacWindow.agree=Eu concordo
tacWindow.disagree=Eu não concordo e desisto
tacWindow.arbitrationSystem=Sistema de arbitragem
tacWindow.arbitrationSystem=Dispute resolution

tradeDetailsWindow.headline=Negociação
tradeDetailsWindow.disputedPayoutTxId=ID de transação do pagamento disputado:
Expand Down Expand Up @@ -2152,7 +2152,7 @@ systemTray.show=Mostrar janela do applicativo
systemTray.hide=Esconder janela do applicativo
systemTray.info=Informações sobre Bisq
systemTray.exit=Sair
systemTray.tooltip=Bisq: A exchange descentralizada
systemTray.tooltip=Bisq: A decentralized bitcoin exchange network


####################################################################
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_pt.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,7 +1961,7 @@ showWalletDataWindow.includePrivKeys=Incluir chaves privadas
tacWindow.headline=Acordo de utilizador
tacWindow.agree=Eu concordo
tacWindow.disagree=Eu não concordo e desisto
tacWindow.arbitrationSystem=Sistema de arbitragem
tacWindow.arbitrationSystem=Dispute resolution

tradeDetailsWindow.headline=Negócio
tradeDetailsWindow.disputedPayoutTxId=ID de transação do pagamento disputado:
Expand Down Expand Up @@ -2152,7 +2152,7 @@ systemTray.show=Mostrar janela do programa
systemTray.hide=Esconder janela do programa
systemTray.info=Informação sobre Bisq
systemTray.exit=Sair
systemTray.tooltip=Bisq: A rede de mercado de câmbio descentralizada
systemTray.tooltip=Bisq: A decentralized bitcoin exchange network


####################################################################
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/resources/i18n/displayStrings_ru.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,7 +1961,7 @@ showWalletDataWindow.includePrivKeys=Добавить приватные клю
tacWindow.headline=Пользовательское соглашение
tacWindow.agree=Подтверждаю
tacWindow.disagree=Не согласен (-сна) и выхожу
tacWindow.arbitrationSystem=Арбитражная система
tacWindow.arbitrationSystem=Dispute resolution

tradeDetailsWindow.headline=Сделка
tradeDetailsWindow.disputedPayoutTxId=Идент. оспоренной транзакции выплаты:
Expand Down Expand Up @@ -2152,7 +2152,7 @@ systemTray.show=Показать окно приложения
systemTray.hide=Скрыть окно приложения
systemTray.info=Информация о Bisq
systemTray.exit=Выход
systemTray.tooltip=Bisq: децентрализованная биржа криптовалюты
systemTray.tooltip=Bisq: A decentralized bitcoin exchange network


####################################################################
Expand All @@ -2172,7 +2172,7 @@ guiUtil.accountExport.exportFailed=Экспорт в CSV не удался из-
guiUtil.accountExport.selectExportPath=Выбрать директорию для экспорта
guiUtil.accountImport.imported=Торговый счёт импортирован из:\n{0}\n\nИмпортированные счета:\n{1}
guiUtil.accountImport.noAccountsFound=Экспортированные торговые счета не найдены в: {0}.\nИмя файла {1}.
guiUtil.openWebBrowser.warning=Вы собираетесь открыть веб-страницу в веб-браузере.\nСделать это сейчас? \n\nЕсли вы не используете \«Tor\» в качестве веб-браузера по умолчанию, вы откроете веб-страницу в клирнете.\n\nURL: \«{0}\»
guiUtil.openWebBrowser.warning=Вы собираетесь открыть веб-страницу в веб-браузере.\nСделать это сейчас? \n\nЕсли вы не используете \«Tor\» в качестве веб-браузера по умолчанию, вы откроете веб-страницу в клирнете.\n\nURL: \«{0}\»
guiUtil.openWebBrowser.doOpen=Открыть веб-страницу и не спрашивать снова
guiUtil.openWebBrowser.copyUrl=Скопировать URL и отменить
guiUtil.ofTradeAmount=от суммы сделки
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_th.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,7 +1961,7 @@ showWalletDataWindow.includePrivKeys=รวมคีย์ส่วนตัว
tacWindow.headline=ข้อตกลงการใช้
tacWindow.agree=ฉันเห็นด้วย
tacWindow.disagree=ฉันไม่เห็นด้วยและออก
tacWindow.arbitrationSystem=ระบบอนุญาโตตุลาการ (การไกล่เกลี่ยข้อพิพาท)
tacWindow.arbitrationSystem=Dispute resolution

tradeDetailsWindow.headline=ซื้อขาย
tradeDetailsWindow.disputedPayoutTxId=รหัส ID ธุรกรรมการจ่ายเงินที่พิพาท:
Expand Down Expand Up @@ -2152,7 +2152,7 @@ systemTray.show=แสดงหน้าต่างแอ็พพลิเค
systemTray.hide=ซ่อนหน้าต่างแอ็พพลิเคชั่น
systemTray.info=ข้อมูลเกี่ยวกับ Bisq
systemTray.exit=ออก
systemTray.tooltip=Bisq: เครือข่ายการแลกเปลี่ยนแบบกระจายอำนาจ
systemTray.tooltip=Bisq: A decentralized bitcoin exchange network


####################################################################
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_vi.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,7 +1961,7 @@ showWalletDataWindow.includePrivKeys=Bao gồm khóa cá nhân
tacWindow.headline=Thỏa thuận người dùng
tacWindow.agree=Tôi đồng ý
tacWindow.disagree=Tôi không đồng ý và thoát
tacWindow.arbitrationSystem=Hệ thống trọng tài
tacWindow.arbitrationSystem=Dispute resolution

tradeDetailsWindow.headline=giao dịch
tradeDetailsWindow.disputedPayoutTxId=ID giao dịch hoàn tiền khiếu nại:
Expand Down Expand Up @@ -2152,7 +2152,7 @@ systemTray.show=Hiển thị cửa sổ ứng dung
systemTray.hide=Ẩn cửa sổ ứng dụng
systemTray.info=Thông tin về Bisq
systemTray.exit=Thoát
systemTray.tooltip=Bisq: Mạng trao đổi phân quyền
systemTray.tooltip=Bisq: A decentralized bitcoin exchange network


####################################################################
Expand Down
Loading