Skip to content

Commit 1033eb2

Browse files
FeichtmeierFeichtmeier
authored
PrivatePage: styling and localization (#276)
1 parent 3272557 commit 1033eb2

15 files changed

+479
-126
lines changed

‎lib/l10n/app_de.arb

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
{
2+
"appTitle": "Ubuntu Einstellungen",
3+
"searchHint": "Suche...",
4+
"connected": "Verbunden",
5+
"disonnected": "Nicht verbunden",
6+
"yes": "Ja",
7+
"no": "Nein",
8+
"cancel": "Abbrechen",
9+
"confirm": "Bestätigen",
10+
"paired": "Gekoppelt",
11+
"address": "Adresse",
12+
"type": "Typ",
13+
"unknown": "Unbekannt",
14+
"bluetoothOpenDeviceSettings": "Öffne Geräteeinstellungen",
15+
"bluetoothRemoveDevice" : "Entferne Gerät",
16+
"removableMediaNeverAsk" : "Niemals nachfragen oder entfernbare Medien automatisch starten",
17+
"removableMediaAudioCd" : "Audio CD",
18+
"removableMediaDvdVideo" : "DVD-Videos",
19+
"removableMediaMusicPlayer" : "Music Player",
20+
"removableMediaPhotos" : "Photos",
21+
"removableMediaApplications" : "Applications",
22+
"removableMediaAudioDvd" : "AudioDVD",
23+
"removableMediaBlankBd" : "Blank BD",
24+
"removableMediaBlankCd" : "Blank CD",
25+
"removableMediaBlankDvd" : "BlankDVD",
26+
"removableMediaBlankHdDvd" : "Blank HD DVD",
27+
"removableMediaEbookReader" : "Ebook Reader",
28+
"removableMediaImagePictureCd" : "Image Picture CD",
29+
"removableMediaOstreeRepository" : "Ostree Repository",
30+
"removableMediaSoftware" : "Software",
31+
"removableMediaVideoBlueray" : "Video Blueray",
32+
"removableMediaVideoHdDvd" : "Video HD DVD",
33+
"removableMediaVideoSvCd" : "Video SV CD",
34+
"removableMediaVideoVCd" : "Video V CD",
35+
"removableMediaWindowsSoftware" : "Windows Programm",
36+
"checkConnectivityLabel": "Überprüfung der Verbindung",
37+
"checkConnectivityDescription": "Die Konnektivitätsprüfung wird verwendet, um Verbindungsprobleme zu erkennen und Ihnen zu helfen, online zu bleiben. Wenn Ihre Netzwerkkommunikation überwacht wird, könnte sie dazu verwendet werden, technische Informationen über diesen Rechner zu sammeln.",
38+
"screenSaverDescription": "Die automatische Bildschirmsperre schützt Ihren Rechner vor dem Zugriff anderer, während Sie abwesend sind.",
39+
"screenSaverTimerLabel": "Verzögerung bis Bildschirmabschaltung",
40+
"screenSaverTimerDescription": "Dauer an Inaktivität, bis der Bildschirm abgeschaltet wird.",
41+
"screenSaverAutoScreenLockLabel": "Automatische Bildschirmsperre",
42+
"screenSaverAutoDelayLabel": "Verzögerung bis zur automatischen Bildschirmsperre",
43+
"screenSaverAutoDelayDescription": "Dauer an Inaktivität, bis der abgeschaltete Bildschirm automatisch sperrt",
44+
"screenSaverLockScreenOnSuspendLabel": "Den Bildschirm bei Bereitschaft sperren",
45+
"screenSaverNotificationsOnLockScreen": "Benachrichtigungen auf Sperrbildschirm anzeigen",
46+
"reportingHeader": "Problemberichterstattung",
47+
"reportingDescription": "Der Versand von Reports bei technischen Problemen hilft den Entwicklern Ubuntu zu verbessern. Reports sind frei von personenbezogenen Daten und werden anonym versandt.",
48+
"reportingLink": "Mehr erfahren",
49+
"reportingActionLabel": "Problemberichte an Canonical schicken",
50+
"reportingUsageActionLabel": "Software-Nutzungsdaten an Canonical schicken",
51+
"locationDescription": "Ortungsdienste ermöglichen Anwendungen, Ihre geografische Position zu kennen. Die Verwendung von WLAN oder mobilem Breitband erhöht die Genauigkeit.",
52+
"locationInfoPrefix": "Verwendet den Mozilla-Ortungsdienst:",
53+
"locationInfoLink": "Regeln zum Schutz der Privatsphäre",
54+
"locationActionLabel": "Standortdienst",
55+
"houseKeepingRecentFilesHeadline": "Dateichronik",
56+
"houseKeepingRecentFilesDescription": "Die Dateichronik merkt sich, welche Dateien Sie verwendet haben. Diese Information wird zwischen Anwendungen geteilt und erleichtert das Finden von Dateien, die Sie verwenden möchten.",
57+
"houseKeepingRecentFilesRememberAction": "Dateichronik",
58+
"houseKeepingRecentFilesRememberForeverAction": "Dateichronik für immer behalten",
59+
"houseKeepingRecentFilesDaysAction": "Zeitraum der Dateichronik",
60+
"houseKeepingTempTrashHeadline": "Papierkorb und temporäre Datelen",
61+
"houseKeepingTempTrashDescription": "Der Papierkorb sowie temporare Dateien können persönliche und sensible Informationen enthalten. Eine automatische Löschung kann dem Erhalt Ihrer Privatsphäre dienen.",
62+
"houseKeepingTrashAutoRemoveAction": "Automatisch den Papierkorb leeren",
63+
"houseKeepingTempAutoRemoveAction": "Automatisch temporäre Dateien löschen",
64+
"houseKeepingTempTrashAutoDeleteDays": "Zeitraum für automatisches Löschen",
65+
"houseKeepingTempTrashActionLabel": "Bereinigen",
66+
"houseKeepingEmptyTrash": "Papierkorb leeren",
67+
"houseKeepingRemoveTempFiles": "Temporäre Dateien löschen",
68+
"privacyPageTitle": "Datenschutz",
69+
"connectivityPageTitle": "Konnektivität",
70+
"locationPageTitle": "Standortdienste",
71+
"thunderBoltPageTitle": "Thunderbolt",
72+
"houseKeepingPageTitle": "Datenbereinigung",
73+
"screenLockPageTitle": "Bildschirmsperre",
74+
"diagnosisPageTitle": "Fehlerdiagnose"
75+
}

‎lib/l10n/app_en.arb

+42-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
"disonnected": "Disconnected",
66
"yes": "Yes",
77
"no": "No",
8+
"cancel": "Cancel",
9+
"confirm": "Confirm",
810
"paired": "Paired",
911
"address": "Address",
1012
"type": "Type",
@@ -30,5 +32,44 @@
3032
"removableMediaVideoHdDvd" : "Video HD DVD",
3133
"removableMediaVideoSvCd" : "Video SV CD",
3234
"removableMediaVideoVCd" : "Video V CD",
33-
"removableMediaWindowsSoftware" : "Windows Software"
35+
"removableMediaWindowsSoftware" : "Windows Software",
36+
"checkConnectivityLabel": "Check connectivity",
37+
"checkConnectivityDescription": "The connectivity check is used to detect connection problems and help you stay online. If your network communications are monitored, they could be used to collect technical information about this computer.",
38+
"screenSaverDescription": "The automatic screen lock protects your computer from being accessed by others while you are away.",
39+
"screenSaverTimerLabel": "Delay until screen turns off",
40+
"screenSaverTimerDescription": "Duration of inactivity before the screen turns off.",
41+
"screenSaverAutoScreenLockLabel": "Automatic screen lock",
42+
"screenSaverAutoDelayLabel": "Delay before automatic screen saver",
43+
"screenSaverAutoDelayDescription": "Duration of inactivity before the screen turns off automatically",
44+
"screenSaverLockScreenOnSuspendLabel": "Lock the screen on suspend",
45+
"screenSaverNotificationsOnLockScreen": "Show notifications on lock screen",
46+
"reportingHeader": "Issue Reporting",
47+
"reportingDescription": "Sending reports on technical problems helps the developers to improve Ubuntu. Reports are free of personal data and are sent anonymously. Learn more",
48+
"reportingLink": "Learn more",
49+
"reportingActionLabel": "Send issue reports to canonical",
50+
"reportingUsageActionLabel": "Send software usage to Ubuntu",
51+
"locationDescription": "Location services allow applications to know your geographic location. Using WiFi or mobile broadband increases accuracy.",
52+
"locationInfoPrefix": "Uses the Mozilla location service:",
53+
"locationInfoLink": "privacy protection rules",
54+
"locationActionLabel": "Location service",
55+
"houseKeepingRecentFilesHeadline": "File history",
56+
"houseKeepingRecentFilesDescription": "File history remembers which files you've used. This information is shared between applications and makes it easier to find files that you want to use.",
57+
"houseKeepingRecentFilesRememberAction": "File history",
58+
"houseKeepingRecentFilesRememberForeverAction": "Keep file history forever",
59+
"houseKeepingRecentFilesDaysAction": "Period of file history",
60+
"houseKeepingTempTrashHeadline": "Recycle bin and temporary files",
61+
"houseKeepingTempTrashDescription": "The recycle bin and temporary files can contain personal and sensitive information. Automatic deletion can serve to preserve your privacy.",
62+
"houseKeepingTrashAutoRemoveAction": "Automatically empty the recycle bin",
63+
"houseKeepingTempAutoRemoveAction": "Automatically delete temporary files",
64+
"houseKeepingTempTrashAutoDeleteDays": "Period for automatic deletion",
65+
"houseKeepingTempTrashActionLabel": "Clean up",
66+
"houseKeepingEmptyTrash": "Empty trash",
67+
"houseKeepingRemoveTempFiles": "Delete temporary files",
68+
"privacyPageTitle": "Privacy",
69+
"connectivityPageTitle": "Connectivity",
70+
"locationPageTitle": "Location Services",
71+
"thunderBoltPageTitle": "Thunderbolt",
72+
"houseKeepingPageTitle": "House Keeping",
73+
"screenLockPageTitle": "Screen Lock",
74+
"diagnosisPageTitle": "Diagnostics"
3475
}

‎lib/view/link.dart

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import 'package:flutter/material.dart';
2+
import 'package:url_launcher/url_launcher.dart';
3+
4+
class Link extends StatelessWidget {
5+
const Link({Key? key, required this.url, required this.linkText})
6+
: super(key: key);
7+
8+
final String url;
9+
final String linkText;
10+
11+
@override
12+
Widget build(BuildContext context) {
13+
return InkWell(
14+
onTap: () async => await launch(url),
15+
child: Text(
16+
linkText,
17+
style: Theme.of(context)
18+
.textTheme
19+
.caption
20+
?.copyWith(color: Theme.of(context).colorScheme.primary),
21+
),
22+
);
23+
}
24+
}

‎lib/view/pages/bluetooth/bluetooth_device_row.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class _BluetoothDeviceRowState extends State<BluetoothDeviceRow> {
5353
),
5454
)),
5555
child: Padding(
56-
padding: const EdgeInsets.all(8.0),
56+
padding: const EdgeInsets.only(bottom: 4, top: 4),
5757
child: YaruRow(
5858
enabled: true,
5959
trailingWidget: Text(model.name),

‎lib/view/pages/privacy/connectivity_page.dart

+17-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ import 'package:nm/nm.dart';
33
import 'package:provider/provider.dart';
44
import 'package:settings/constants.dart';
55
import 'package:settings/view/pages/privacy/connectivity_model.dart';
6+
import 'package:settings/view/section_description.dart';
67
import 'package:yaru_widgets/yaru_widgets.dart';
8+
import 'package:settings/l10n/l10n.dart';
79

810
class ConnectivityPage extends StatefulWidget {
911
const ConnectivityPage({Key? key}) : super(key: key);
@@ -28,13 +30,22 @@ class _ConnectivityPageState extends State<ConnectivityPage> {
2830
Widget build(BuildContext context) {
2931
final model = context.watch<ConnectivityModel>();
3032
return YaruPage(children: [
31-
YaruSwitchRow(
33+
SectionDescription(
3234
width: kDefaultWidth,
33-
enabled: model.checkConnectiviy != null,
34-
trailingWidget: const Text('Check Connectivity'),
35-
value: model.checkConnectiviy,
36-
onChanged: (v) => model.checkConnectiviy = v,
37-
)
35+
text: context.l10n.checkConnectivityDescription,
36+
),
37+
YaruSection(
38+
width: kDefaultWidth,
39+
children: [
40+
YaruSwitchRow(
41+
width: kDefaultWidth,
42+
enabled: model.checkConnectiviy != null,
43+
trailingWidget: Text(context.l10n.checkConnectivityLabel),
44+
value: model.checkConnectiviy,
45+
onChanged: (v) => model.checkConnectiviy = v,
46+
),
47+
],
48+
),
3849
]);
3950
}
4051
}

0 commit comments

Comments
 (0)