From 724cfd0e5e524c1c709deaaa561e8bb582f0f00f Mon Sep 17 00:00:00 2001 From: Georg Koppen Date: Sat, 12 Jun 2021 19:25:39 +0000 Subject: [PATCH 1/2] Revert "Pick up cstate changes for #6" This reverts commit bfa36dd506b4a616c170706a4ddc30237bbb169e. --- .gitmodules | 2 +- themes/cstate | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index dd943d4..7a9fc42 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "themes/cstate"] path = themes/cstate - url = https://gitlab.torproject.org/gk/cstate + url = https://github.com/cstate/cstate diff --git a/themes/cstate b/themes/cstate index b848dc3..b5d0763 160000 --- a/themes/cstate +++ b/themes/cstate @@ -1 +1 @@ -Subproject commit b848dc3f32d3336a74695921cc20f2a7bcf436ab +Subproject commit b5d07632d40437bb87c3faf7b9ece7ca412dce9f -- GitLab From fdd95b32b906b130658b8f680735f129c34b3db3 Mon Sep 17 00:00:00 2001 From: Georg Koppen Date: Sat, 12 Jun 2021 19:31:17 +0000 Subject: [PATCH 2/2] Bug 7: Remove our cstate fork We can actually overlay the i18n folder, too, and just add our own new strings there. Thus, no need to maintain a cstate fork or bother upstream with adding strings only we need. Closes: #7. --- i18n/en.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 i18n/en.yaml diff --git a/i18n/en.yaml b/i18n/en.yaml new file mode 100644 index 0000000..cfc9501 --- /dev/null +++ b/i18n/en.yaml @@ -0,0 +1,7 @@ +# English language file for cState - custom Tor Project strings +- id: thisIsOngoing + translation: Ongoing +- id: thisIsNone + translation: None +- id: experimentOngoing + translation: This experiment is still ongoing -- GitLab