diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/theme/Theme.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/theme/Theme.kt index e5fcb4f58203d5f0b43976e8df522b824b451b36..8cde594dab99b31a82525080fd8ea5071fef55b4 100644 --- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/theme/Theme.kt +++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/theme/Theme.kt @@ -61,6 +61,7 @@ val Colors.sendButton: Color get() = if (isLight) Lime700 else Lime500 val Colors.passwordStrengthWeak: Color get() = Red500 val Colors.passwordStrengthMiddle: Color get() = if (isLight) Orange700 else Orange500 val Colors.passwordStrengthStrong: Color get() = if (isLight) Lime700 else Lime500 +val Colors.tabs: Color get() = if (isLight) Color.White else materialDarkBg val DarkColors = darkColors( primary = Blue500, diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/AboutScreen.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/AboutScreen.kt index 2290afd19f00f6b1aff8f9dc348edbf283290b77..85c6518e735bb6820a6f0c98220dbd0b7e7bd8db 100644 --- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/AboutScreen.kt +++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/AboutScreen.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height @@ -18,11 +19,17 @@ import androidx.compose.foundation.rememberScrollbarAdapter import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.material.IconButton import androidx.compose.material.MaterialTheme +import androidx.compose.material.Tab +import androidx.compose.material.TabRow import androidx.compose.material.Text import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.ContentCopy import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalClipboardManager @@ -35,6 +42,8 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import org.briarproject.briar.desktop.BuildData import org.briarproject.briar.desktop.Strings +import org.briarproject.briar.desktop.about.Artifact +import org.briarproject.briar.desktop.theme.tabs import org.briarproject.briar.desktop.utils.InternationalizationUtils.i18n import org.briarproject.briar.desktop.utils.PreviewUtils.preview import java.time.Instant @@ -69,8 +78,45 @@ fun AboutScreen( @OptIn(ExperimentalFoundationApi::class) @Composable fun AboutScreen(modifier: Modifier = Modifier.padding(16.dp)) { + Column(modifier) { + Row( + modifier = Modifier.padding(bottom = 16.dp).fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Center + ) { + BriarLogo(modifier = Modifier.height(48.dp)) + Text( + Strings.APP_NAME, + style = MaterialTheme.typography.h4, + modifier = Modifier.padding(start = 16.dp), + overflow = TextOverflow.Ellipsis, + maxLines = 1, + ) + } + var state by remember { mutableStateOf(0) } + val titles = listOf(i18n("about.category.general"), i18n("about.category.dependencies")) + Column { + TabRow(selectedTabIndex = state, backgroundColor = MaterialTheme.colors.tabs) { + titles.forEachIndexed { index, title -> + Tab( + text = { Text(title) }, + selected = state == index, + onClick = { state = index } + ) + } + } + when (state) { + 0 -> GeneralInfo() + 1 -> Libraries() + } + } + } +} + +@Composable +private fun GeneralInfo() { // format date - val buildTime = Instant.ofEpochMilli(BuildData.GIT_TIME).atZone(ZoneId.systemDefault()).toLocalDateTime() + val commitTime = Instant.ofEpochMilli(BuildData.GIT_TIME).atZone(ZoneId.systemDefault()).toLocalDateTime() // rows displayed in table val lines = buildList { @@ -83,58 +129,42 @@ fun AboutScreen(modifier: Modifier = Modifier.padding(16.dp)) { if (BuildData.GIT_BRANCH == null && BuildData.GIT_TAG == null) add(Entry("Git branch/tag", "None detected")) // NON-NLS add(Entry("Git hash", BuildData.GIT_HASH)) // NON-NLS - add(Entry("Commit time", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(buildTime))) // NON-NLS + add(Entry("Commit time", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(commitTime))) // NON-NLS add(Entry(i18n("about.website"), Strings.WEBSITE, true)) add(Entry(i18n("about.contact"), Strings.EMAIL, true)) } - Column(modifier) { - Row( - modifier = Modifier.padding(bottom = 16.dp).fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.Center + val scrollState = rememberLazyListState() + Box { + LazyColumn( + modifier = Modifier.semantics { + contentDescription = i18n("access.about.list.general") + }, + state = scrollState ) { - BriarLogo(modifier = Modifier.height(48.dp)) - Text( - Strings.APP_NAME, - style = MaterialTheme.typography.h4, - modifier = Modifier.padding(start = 16.dp), - overflow = TextOverflow.Ellipsis, - maxLines = 1, - ) - } - val scrollState = rememberLazyListState() - Box { - LazyColumn( - modifier = Modifier.semantics { - contentDescription = i18n("access.about.list") - }, - state = scrollState - ) { - item { - HorizontalDivider() - } - items(lines) { - AboutEntry(it) - HorizontalDivider() - } + item { + HorizontalDivider() + } + items(lines) { + AboutEntry(it) + HorizontalDivider() } - VerticalScrollbar( - adapter = rememberScrollbarAdapter(scrollState), - modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight() - ) } + VerticalScrollbar( + adapter = rememberScrollbarAdapter(scrollState), + modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight() + ) } } private data class Entry( val label: String, val value: String, - val showCopy: Boolean = false + val showCopy: Boolean = false, ) -// sizes of the two columns -private val colSizes = listOf(0.3f, 0.7f) +// sizes of the two columns in the general tab +private val colSizesGeneral = listOf(0.3f, 0.7f) @Composable private fun AboutEntry(entry: Entry) = @@ -149,14 +179,9 @@ private fun AboutEntry(entry: Entry) = text = buildAnnotatedString { append("${entry.label}: ${entry.value}") } } ) { - Box(modifier = Modifier.weight(colSizes[0]).fillMaxHeight()) { - Text( - text = entry.label, - modifier = Modifier.padding(8.dp).align(Alignment.CenterStart) - ) - } + Cell(colSizesGeneral[0], entry.label) VerticalDivider() - Box(modifier = Modifier.weight(colSizes[1]).fillMaxHeight()) { + Box(modifier = Modifier.weight(colSizesGeneral[1]).fillMaxHeight()) { Row( modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, @@ -181,3 +206,54 @@ private fun AboutEntry(entry: Entry) = } } } + +@Composable +private fun Libraries() { + val scrollState = rememberLazyListState() + Box { + LazyColumn( + modifier = Modifier.semantics { + contentDescription = i18n("access.about.list.dependencies") + }, + state = scrollState + ) { + item { + HorizontalDivider() + } + items(BuildData.ARTIFACTS) { artifact -> + LibraryEntry(artifact) + HorizontalDivider() + } + } + VerticalScrollbar( + adapter = rememberScrollbarAdapter(scrollState), + modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight() + ) + } +} + +// sizes of the four columns in the dependencies tab +val colSizesLibraries = listOf(0.3f, 0.3f, 0.15f, 0.25f) + +@Composable +private fun LibraryEntry(artifact: Artifact) = + SelectionContainer { + Row(Modifier.fillMaxWidth().height(IntrinsicSize.Min)) { + Cell(colSizesLibraries[0], artifact.group) + VerticalDivider() + Cell(colSizesLibraries[1], artifact.artifact) + VerticalDivider() + Cell(colSizesLibraries[2], artifact.version) + VerticalDivider() + Cell(colSizesLibraries[3], artifact.license) + } + } + +@Composable +private fun RowScope.Cell(size: Float, text: String) = + Box(modifier = Modifier.weight(size).fillMaxHeight()) { + Text( + text = text, + modifier = Modifier.fillMaxWidth().padding(8.dp).align(Alignment.CenterStart) + ) + } diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop.properties b/briar-desktop/src/main/resources/strings/BriarDesktop.properties index 3ca62d2bb7c139ed7bb44bae3409b2833fe22408..2d58ee66890b2f7b6f4464403870cff2c3cf3324 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop.properties @@ -67,7 +67,8 @@ access.mode.transports=Transport Settings access.mode.mailbox=Mailbox access.mode.settings=Settings access.mode.about=About Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.dependencies=Information about the software libraries that Briar is using access.password.show=Show password access.password.hide=Hide password access.settings.current_value=Current value @@ -313,6 +314,8 @@ welcome.title=Welcome to Briar welcome.text=You don't have any contacts yet. Tap the + icon to add a contact: # About +about.category.general=General +about.category.dependencies=Dependencies about.copyright=Copyright about.license=License about.version=Version diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_ar.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_ar.properties index 457d9bc481d08a2c7434b1d18233e893e03ec82a..474685e7778fbfbeb0164da1021e42b6eb050c25 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_ar.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_ar.properties @@ -67,7 +67,7 @@ access.mode.transports=إعدادات النقل access.mode.mailbox=صندوق الرسائل access.mode.settings=الإعدادات access.mode.about=ØÙˆÙ„ الموقع Briar -access.about.list=معلومات ØÙˆÙ„ نسختك من Briar ومشروع Briar بشكل عام وكيÙية التواصل معا +access.about.list.general=معلومات ØÙˆÙ„ نسختك من Briar ومشروع Briar بشكل عام وكيÙية التواصل معا access.password.show=إظهار كلمة السر access.password.hide=Ø¥Ø®ÙØ§Ø¡ كلمة السر access.settings.current_value=Current value diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_bg.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_bg.properties index f0c9ac428750b338ca311432d83fd5b6e6968616..fa0a731e2284aaf2b9e67617c9bc4107e8848411 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_bg.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_bg.properties @@ -67,7 +67,7 @@ access.mode.transports=ÐаÑтройки на начина на Ð¿Ñ€ÐµÐ½Ð¾Ñ access.mode.mailbox=ПощенÑка ÐºÑƒÑ‚Ð¸Ñ access.mode.settings=ÐаÑтройки access.mode.about=ОтноÑно Briar -access.about.list=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° изданието на Briar, най-общо за проекта Briar и как да Ñе Ñвържете Ñ Ð½Ð°Ñ +access.about.list.general=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° изданието на Briar, най-общо за проекта Briar и как да Ñе Ñвържете Ñ Ð½Ð°Ñ access.password.show=Показване на паролата access.password.hide=Скриване на паролата access.settings.current_value=Текуща ÑтойноÑÑ‚ diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_ca.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_ca.properties index b089dcd426f739a10fdfb77c7ff44b54709905f6..132de8495864ce1c6081e374dcd5b40194a086a4 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_ca.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_ca.properties @@ -67,7 +67,7 @@ access.mode.transports=Configuració de transport access.mode.mailbox=Bústia access.mode.settings=Configuració access.mode.about=Quant a Briar -access.about.list=Informació sobre la teva versió de Briar, el projecte Briar en general i com posar-te en contacte +access.about.list.general=Informació sobre la teva versió de Briar, el projecte Briar en general i com posar-te en contacte access.password.show=Mostra la contrasenya access.password.hide=Oculta la contrasenya access.settings.current_value=Valor actual diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_cs.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_cs.properties index 0a14db43ab3a72a7f5407b815e166b9277815fdf..0f0e80cd4dc1decf1a521b70923120492e7e0be5 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_cs.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_cs.properties @@ -67,7 +67,7 @@ access.mode.transports=Nastavenà pÅ™enosu access.mode.mailbox=Mailbox access.mode.settings=Nastavenà access.mode.about=O Briaru -access.about.list=Informace o vašà verzi Briaru, o projektu Briar a kontakt +access.about.list.general=Informace o vašà verzi Briaru, o projektu Briar a kontakt access.password.show=Zobrazit heslo access.password.hide=Skrýt heslo access.settings.current_value=Aktuálnà hodnota diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_de.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_de.properties index 5b679ac97940867bbf84be9f74366a4ab63515cc..66c073e3c30c419899959cbcd881c0ce0f091401 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_de.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_de.properties @@ -67,7 +67,7 @@ access.mode.transports=Transporteinstellungen access.mode.mailbox=Mailbox access.mode.settings=Einstellungen access.mode.about=Über Briar -access.about.list=Information über deine Version von Briar, das Briar-Projekt im Allgemeinen und Kontaktmöglichkeiten +access.about.list.general=Information über deine Version von Briar, das Briar-Projekt im Allgemeinen und Kontaktmöglichkeiten access.password.show=Passwort anzeigen access.password.hide=Passwort verstecken access.settings.current_value=Aktueller Wert diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_es.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_es.properties index 0415ad47a9f6fbacec46c59995211a37d0a789ca..4516fd673ce1bc44055b182e20404acf241fec12 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_es.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_es.properties @@ -67,7 +67,7 @@ access.mode.transports=Ajustes de transporte access.mode.mailbox=Buzón access.mode.settings=Configuración access.mode.about=Acerca de Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=Mostrar contraseña access.password.hide=Ocultar contraseña access.settings.current_value=Valor actual diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_fa.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_fa.properties index 3d649a45fa59989fb97f959cc5deb587922bf5ae..918dfad10788d0b1bb6bfe7d36a3c9b05d197426 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_fa.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_fa.properties @@ -67,7 +67,7 @@ access.mode.transports=تنظیمات ØØ§Ù…Ù„ access.mode.mailbox=Mailbox access.mode.settings=تنظیمات access.mode.about=About Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=نمایش رمز عبور access.password.hide=مخÙÛŒ کردن رمز عبور access.settings.current_value=مقدار ÙØ¹Ù„ÛŒ diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_fr.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_fr.properties index 8ef0fca6fc1bf53f5c813019c5fdfc28dddedb2c..3134a63410b178d960c46904c4bf5a60804e1760 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_fr.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_fr.properties @@ -67,7 +67,7 @@ access.mode.transports=Transport Settings access.mode.mailbox=Boîte de courriel access.mode.settings=Paramètres access.mode.about=About Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=Afficher le mot de passe access.password.hide=Cacher le mot de passe access.settings.current_value=Valeur actuelle diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_gl.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_gl.properties index 6babefec60fdb1581e2ec80ab9db99acf30199f8..4713b43d608db3b533b01afa18df1e60de2ada37 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_gl.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_gl.properties @@ -67,7 +67,7 @@ access.mode.transports=Transport Settings access.mode.mailbox=Mailbox access.mode.settings=Axustes access.mode.about=About Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=Mostar contrasinal access.password.hide=Agochar contrasinal access.settings.current_value=Current value diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_he.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_he.properties index 52099201f4bdf1aaacdd5d5106c27b6466dd2b7f..831f5c7d0489d93d6cd84a38c26134b9698778ad 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_he.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_he.properties @@ -67,7 +67,7 @@ access.mode.transports=Transport Settings access.mode.mailbox=Mailbox access.mode.settings=הגדרות access.mode.about=About Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=Show password access.password.hide=Hide password access.settings.current_value=Current value diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_hu.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_hu.properties index f3b8b121d6c96b5ae16b8f6245fa8ee1f6db9a1c..230b451725098c44ab04c734027bfe706155cb9d 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_hu.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_hu.properties @@ -67,7 +67,7 @@ access.mode.transports=Ãtviteli beállÃtások access.mode.mailbox=Mailbox access.mode.settings=BeállÃtások access.mode.about=A Briar névjegye -access.about.list=Információk a Briar verziódról, a Briar ProjektrÅ‘l általánoságban és a kapcsolatfelvétel lehetÅ‘ségeirÅ‘l +access.about.list.general=Információk a Briar verziódról, a Briar ProjektrÅ‘l általánoságban és a kapcsolatfelvétel lehetÅ‘ségeirÅ‘l access.password.show=Jelszó megjelenÃtése access.password.hide=Jelszó elrejtése access.settings.current_value=Aktuális érték diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_is.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_is.properties index 45c071f4961a7e29ff36635687f056fda01c09aa..478f5694c108f2741bbd8f6a315fff04d482a7c7 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_is.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_is.properties @@ -67,7 +67,7 @@ access.mode.transports=Transport Settings access.mode.mailbox=Pósthólf access.mode.settings=Stillingar access.mode.about=About Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=Birta lykilorð access.password.hide=Fela lykilorð access.settings.current_value=Current value diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_it.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_it.properties index ea680df4c0b611189ef8148d607f692eb795629b..96b755e6aa70c451e823c954345019e423843546 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_it.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_it.properties @@ -67,7 +67,7 @@ access.mode.transports=Impostazioni di trasporto access.mode.mailbox=Casella postale access.mode.settings=Impostazioni access.mode.about=Riguardo Briar -access.about.list=Informazioni sulla tua versione di Briar, sul Progetto Briar in generale e su come contattarci +access.about.list.general=Informazioni sulla tua versione di Briar, sul Progetto Briar in generale e su come contattarci access.password.show=Mostra password access.password.hide=Nascondi password access.settings.current_value=Valore attuale diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_ja.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_ja.properties index b8f3cfab52960273e14e7e724911ed8b954b633b..6f3246fc6d704f016a5b3392cbd39babaa3d3905 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_ja.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_ja.properties @@ -67,7 +67,7 @@ access.mode.transports=トランスãƒãƒ¼ãƒˆè¨å®š access.mode.mailbox=メールボックス access.mode.settings=è¨å®š access.mode.about=Briarã«ã¤ã„㦠-access.about.list=Briarã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã€Briarプãƒã‚¸ã‚§ã‚¯ãƒˆå…¨èˆ¬ã€é€£çµ¡æ–¹æ³•ã«é–¢ã™ã‚‹æƒ…å ± +access.about.list.general=Briarã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã€Briarプãƒã‚¸ã‚§ã‚¯ãƒˆå…¨èˆ¬ã€é€£çµ¡æ–¹æ³•ã«é–¢ã™ã‚‹æƒ…å ± access.password.show=パスワードを表示 access.password.hide=ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’éš ã™ access.settings.current_value=ç¾åœ¨å€¤ diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_ka.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_ka.properties index 1e32d0a4d071a6a8f652b5190521353b7afc7fbc..7a8f498ddf2f4fa7cca5ae77e3639bfd90c54bcd 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_ka.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_ka.properties @@ -67,7 +67,7 @@ access.mode.transports=ტრáƒáƒœáƒ¡áƒžáƒáƒ ტირების პáƒáƒ access.mode.mailbox=სáƒáƒ¤áƒáƒ¡áƒ¢áƒ ყუთი access.mode.settings=პáƒáƒ áƒáƒ›áƒ”ტრები access.mode.about=About Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=პáƒáƒ áƒáƒšáƒ˜áƒ¡ ჩვენებრaccess.password.hide=პáƒáƒ áƒáƒšáƒ˜áƒ¡ დáƒáƒ›áƒáƒšáƒ•რaccess.settings.current_value=მიმდინáƒáƒ ე მნიშვნელáƒáƒ‘რdiff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_ko.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_ko.properties index 6428b5be5df2b2e780ac878960a4927973eec1a5..9499fb45a3559bbafadd44450fd0a078d2872afb 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_ko.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_ko.properties @@ -67,7 +67,7 @@ access.mode.transports=Transport Settings access.mode.mailbox=Mailbox access.mode.settings=ì„¤ì • access.mode.about=About Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=Show password access.password.hide=Hide password access.settings.current_value=Current value diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_lt.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_lt.properties index e032fb0f3854ac786a20c5cb27fac00830ae14a1..3f26d48cf3627a8a9405ae276d6f04d455051d8d 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_lt.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_lt.properties @@ -67,7 +67,7 @@ access.mode.transports=Transport Settings access.mode.mailbox=PaÅ¡to dėžutÄ— access.mode.settings=Nustatymai access.mode.about=Apie Briar -access.about.list=Informacija apie jÅ«sų Briar versijÄ…, bendrai apie Briar projektÄ… bei apie tai, kaip susisiekti +access.about.list.general=Informacija apie jÅ«sų Briar versijÄ…, bendrai apie Briar projektÄ… bei apie tai, kaip susisiekti access.password.show=Rodyti slaptažodį access.password.hide=SlÄ—pti slaptažodį access.settings.current_value=DabartinÄ— reikÅ¡mÄ— diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_my.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_my.properties index d275fc061d8db39080bb7c4f9add4640afda039b..c5d0ea9c4c2e4be8ece3ca4efa6ecf13435010a1 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_my.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_my.properties @@ -67,7 +67,7 @@ access.mode.transports=ဆက်á€á€„်များ ပá€á€¯á€·á€†á€±á€¬á€„ access.mode.mailbox=စာá€á€á€¯á€€á€ºá€•ုံး access.mode.settings=ဆက်á€á€„်များ access.mode.about=Briar အကြောင်း -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=စကားá€á€¾á€€á€º ပြရန် access.password.hide=စကားá€á€¾á€€á€º á€á€¾á€€á€ºá€›á€”် access.settings.current_value=လက်ရှဠá€á€”်ဖá€á€¯á€¸ diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_nb.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_nb.properties index 9dad09e1581d91548a2afc45e66127999e734c0a..bec03da65970eb099ae499bf305c32ad7e0037ab 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_nb.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_nb.properties @@ -67,7 +67,7 @@ access.mode.transports=Transportinnstillinger access.mode.mailbox=Mailboks access.mode.settings=Innstillinger access.mode.about=About Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=Vise passord access.password.hide=Skjule passord access.settings.current_value=Gjeldende verdi diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_nl.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_nl.properties index 07ce63c437965b8035f9961a3e04878b10bb4b10..e2e05c14c75c854e08406da50787b6f5bf9921bd 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_nl.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_nl.properties @@ -67,7 +67,7 @@ access.mode.transports=Transport Settings access.mode.mailbox=Mailbox access.mode.settings=Instellingen access.mode.about=About Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=Show password access.password.hide=Hide password access.settings.current_value=Current value diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_pl.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_pl.properties index 8e2af72077f9947294c4ef5e5beb659b93bd4080..55ce2e110fcfc4e44d3a66721f1c12b42ce73f5e 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_pl.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_pl.properties @@ -67,7 +67,7 @@ access.mode.transports=Ustawienia transportu access.mode.mailbox=Mailbox access.mode.settings=Ustawienia access.mode.about=O aplikacji Briar -access.about.list=Informacje o twojej wersji Briar, ogólnie o projekcie Briar i o tym, jak siÄ™ z nami skontaktować +access.about.list.general=Informacje o twojej wersji Briar, ogólnie o projekcie Briar i o tym, jak siÄ™ z nami skontaktować access.password.show=Pokaż hasÅ‚o access.password.hide=Ukryj hasÅ‚o access.settings.current_value=Wartość aktualna diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_pt_BR.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_pt_BR.properties index 6ba1c6d7305888b855a8937f662be851ca359bf3..18575e94d72307cbffa2fed0e7aa0e3c9a01e2be 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_pt_BR.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_pt_BR.properties @@ -67,7 +67,7 @@ access.mode.transports=Transport Settings access.mode.mailbox=Mailbox access.mode.settings=Definições access.mode.about=About Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=Mostrar senha access.password.hide=Ocultar senha access.settings.current_value=Current value diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_ro.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_ro.properties index 82ad82f3266fcf253cb149321545982f03fb8c05..9cc435ceee09ef0b770623fce2c7888f20a63422 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_ro.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_ro.properties @@ -67,7 +67,7 @@ access.mode.transports=Setări de transport access.mode.mailbox=Cutia poÈ™tală access.mode.settings=Setări access.mode.about=Despre Briar -access.about.list=InformaÈ›ii despre versiunea dvs. de Briar, proiectul Briar în general È™i cum să ne contactaÈ›i +access.about.list.general=InformaÈ›ii despre versiunea dvs. de Briar, proiectul Briar în general È™i cum să ne contactaÈ›i access.password.show=AfiÈ™aÈ›i parola access.password.hide=AscundeÈ›i parola access.settings.current_value=Valoarea curentă diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_ru.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_ru.properties index 628b3c687b2c25a9cd54ee4ccee5b0dc1340df7b..69ac9bc209460bd23d10c41b7563c7dbaa70715a 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_ru.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_ru.properties @@ -67,7 +67,7 @@ access.mode.transports=ÐаÑтройки транÑпорта access.mode.mailbox=Mailbox access.mode.settings=ÐаÑтройки access.mode.about=О Briar -access.about.list=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ вашей верÑии Briar, проекте Briar в целом и о том, как Ñ Ð½Ð°Ð¼Ð¸ ÑвÑзатьÑÑ +access.about.list.general=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ вашей верÑии Briar, проекте Briar в целом и о том, как Ñ Ð½Ð°Ð¼Ð¸ ÑвÑзатьÑÑ access.password.show=Показать пароль access.password.hide=Скрыть пароль access.settings.current_value=Текущее значение diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_sk.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_sk.properties index cddcb91c5adf180394733875d23b9adce63463fd..2169a2388e49318748881e1a00cab062f807f560 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_sk.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_sk.properties @@ -67,7 +67,7 @@ access.mode.transports=Nastavenia prenosu access.mode.mailbox=Mailbox access.mode.settings=Nastavenia access.mode.about=O aplikácii Briar -access.about.list=Informácie o vaÅ¡ej verzii Briar, o projekte Briar vo vÅ¡eobecnosti a o tom, ako sa s nami spojiÅ¥ +access.about.list.general=Informácie o vaÅ¡ej verzii Briar, o projekte Briar vo vÅ¡eobecnosti a o tom, ako sa s nami spojiÅ¥ access.password.show=ZobraziÅ¥ heslo access.password.hide=SkryÅ¥ heslo access.settings.current_value=SúÄasná hodnota diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_sq.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_sq.properties index 92a45042b41e81bb6089f546a0f0bdc225f4826b..ffd1c21f5ce9ba195f36a024513893e728a8bdcf 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_sq.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_sq.properties @@ -67,7 +67,7 @@ access.mode.transports=Rregullime Transporti access.mode.mailbox=Kuti postare access.mode.settings=Rregullime access.mode.about=Mbi Briar-in -access.about.list=Hollësi rreth versionit tuaj të Briar-it, Projektit Briar në përgjithësi dhe se si të lidheni +access.about.list.general=Hollësi rreth versionit tuaj të Briar-it, Projektit Briar në përgjithësi dhe se si të lidheni access.password.show=Shfaq fjalëkalimin access.password.hide=Fshihe fjalëkalimin access.settings.current_value=Vlerë e tanishme diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_sv.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_sv.properties index c6ee91b76b012c41a559b49b5083eff67d467e96..d1ea5c8c168f8826f9e5ed1d6bbdcb580082f7e9 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_sv.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_sv.properties @@ -67,7 +67,7 @@ access.mode.transports=Transport Settings access.mode.mailbox=Mailbox access.mode.settings=Inställningar access.mode.about=About Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=Visa lösenord access.password.hide=Göm lösenord access.settings.current_value=Current value diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_tr.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_tr.properties index 6f0c979eda93a036fdadc6957a26549d97d0e186..12bbb0a339ed11795da0ce1a0b8691e687cf2780 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_tr.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_tr.properties @@ -67,7 +67,7 @@ access.mode.transports=Taşıyıcı Ayarları access.mode.mailbox=Mailbox access.mode.settings=Ayarlar access.mode.about=About Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=Parolayı görüntüle access.password.hide=Parolayı gizle access.settings.current_value=Geçerli deÄŸer diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_uk.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_uk.properties index 04f4370224a064dc9c5d11fe8501eccc0f7a1bb7..6df3e92f9194eb4b605498c66bea8d3195a1ee2e 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_uk.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_uk.properties @@ -67,7 +67,7 @@ access.mode.transports=Transport Settings access.mode.mailbox=Mailbox access.mode.settings=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ access.mode.about=About Briar -access.about.list=Information about your version of Briar, the Briar Project in general and how to get in touch +access.about.list.general=Information about your version of Briar, the Briar Project in general and how to get in touch access.password.show=Показати пароль access.password.hide=Сховати пароль access.settings.current_value=Current value diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_zh_CN.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_zh_CN.properties index d18f651e9d59eef36715d7bda8b9100675d2dc10..a71f3bb034c628abcf152bfab1ee0e84506be503 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_zh_CN.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_zh_CN.properties @@ -67,7 +67,7 @@ access.mode.transports=ä¼ è¾“è®¾ç½® access.mode.mailbox=Mailbox access.mode.settings=设置 access.mode.about=关于 Briar -access.about.list=å…³äºŽä½ çš„ Briar 版本,Briar 项目概况åŠå¦‚何å–å¾—è”ç³»çš„ä¿¡æ¯ +access.about.list.general=å…³äºŽä½ çš„ Briar 版本,Briar 项目概况åŠå¦‚何å–å¾—è”ç³»çš„ä¿¡æ¯ access.password.show=显示密ç access.password.hide=éšè—密ç access.settings.current_value=当å‰å€¼ diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop_zh_TW.properties b/briar-desktop/src/main/resources/strings/BriarDesktop_zh_TW.properties index 1a20b08a43e657877f631744f6bb4d890e94f590..7489a454acd7fe7a0fffd3b911e2c8e8d703959d 100644 --- a/briar-desktop/src/main/resources/strings/BriarDesktop_zh_TW.properties +++ b/briar-desktop/src/main/resources/strings/BriarDesktop_zh_TW.properties @@ -67,7 +67,7 @@ access.mode.transports=通訊è¨å®š access.mode.mailbox=Mailbox access.mode.settings=è¨ç½® access.mode.about=關於 Briar -access.about.list=有關 Briar 版本ã€ç”¢å“專案介紹ã€èˆ‡è¯çµ¡ç‰è³‡è¨Š +access.about.list.general=有關 Briar 版本ã€ç”¢å“專案介紹ã€èˆ‡è¯çµ¡ç‰è³‡è¨Š access.password.show=顯示密碼 access.password.hide=é®è”½å¯†ç¢¼ access.settings.current_value=ç›®å‰å€¼