rebase to master + resolve some conflicts

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Miska Kaipiainen authored and Jari Kolehmainen committed 2020-04-10 10:47:25 +03:00
1 parent 8b3acf2ded
commit dc3e3d90cc
32 files changed
+47 -47

No files matched your search

+2 -2
View File
@@ -26,8 +26,8 @@ msgid "<0>Filtered</0>: {itemsCount} / {allItemsCount}"
msgstr "<0>Filtered</0>: {itemsCount} / {allItemsCount}"
#: client/browser-check.tsx:11
msgid "<0>Your browser does not support all Kontena Lens features. </0> Please consider using another browser."
msgstr "<0>Your browser does not support all Kontena Lens features. </0> Please consider using another browser."
msgid "<0>Your browser does not support all Lens features. </0> Please consider using another browser."
msgstr "<0>Your browser does not support all Lens features. </0> Please consider using another browser."
#: client/components/dock/create-resource.tsx:56
msgid "<0>{0}</0> successfully created"