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.

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

Translations update from Hosted Weblate #442

Merged
merged 40 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
c883a48
fix typos
stavares843 Sep 9, 2024
a68c55c
Translated using Weblate (Chinese (Simplified Han script))
ziqiangao Sep 13, 2024
9b41f2a
Merge remote-tracking branch 'origin/master'
weblate Sep 16, 2024
50b57a0
Merge remote-tracking branch 'origin/master'
weblate Sep 17, 2024
9ed4fb4
Merge remote-tracking branch 'origin/master'
weblate Sep 17, 2024
c151b0a
Merge remote-tracking branch 'origin/master'
weblate Sep 17, 2024
b09715a
Merge remote-tracking branch 'origin/master'
weblate Sep 18, 2024
da21719
Translated using Weblate (Spanish)
gallegonovato Sep 18, 2024
85c7f0d
Merge remote-tracking branch 'origin/master'
weblate Sep 18, 2024
a8df1a1
Merge remote-tracking branch 'origin/master'
weblate Sep 25, 2024
24a96de
Merge remote-tracking branch 'origin/master'
weblate Sep 30, 2024
37f49f4
Merge remote-tracking branch 'origin/master'
weblate Oct 1, 2024
83886d7
Translated using Weblate (Spanish)
gallegonovato Oct 1, 2024
5aef8ed
Merge remote-tracking branch 'origin/master'
weblate Oct 1, 2024
f46cae5
Merge remote-tracking branch 'origin/master'
weblate Oct 7, 2024
e4eed35
Merge remote-tracking branch 'origin/master'
weblate Oct 7, 2024
4af2920
Translated using Weblate (Spanish)
gallegonovato Oct 7, 2024
c55c029
Merge remote-tracking branch 'origin/master'
weblate Oct 8, 2024
ac77361
Merge remote-tracking branch 'origin/master'
weblate Oct 9, 2024
7450e68
Merge remote-tracking branch 'origin/master'
weblate Oct 9, 2024
fd60eb7
Merge remote-tracking branch 'origin/master'
weblate Oct 9, 2024
f55da33
Merge remote-tracking branch 'origin/master'
weblate Oct 10, 2024
70f6d86
Merge remote-tracking branch 'origin/master'
weblate Oct 16, 2024
f9c2d0a
Merge remote-tracking branch 'origin/master'
weblate Oct 17, 2024
2db983c
Merge remote-tracking branch 'origin/master'
weblate Oct 21, 2024
839c8b4
Merge remote-tracking branch 'origin/master'
weblate Oct 21, 2024
7fa86c9
Translated using Weblate (Persian)
mehdi-eq Oct 23, 2024
abf01a5
Merge remote-tracking branch 'origin/master'
weblate Oct 24, 2024
2582232
Merge remote-tracking branch 'origin/master'
weblate Oct 29, 2024
71267f4
Merge remote-tracking branch 'origin/master'
weblate Nov 4, 2024
17e1860
Translated using Weblate (Persian)
mehdi-eq Nov 4, 2024
ea75917
Merge remote-tracking branch 'origin/master'
weblate Nov 5, 2024
184dfd4
Merge remote-tracking branch 'origin/master'
weblate Nov 5, 2024
c651e56
Merge pull request #436 from stavares843/master
J-Pabon Nov 5, 2024
fef78cd
Merge branch 'master' into weblate-ouisync-android-strings
J-Pabon Nov 5, 2024
3c44ed1
Merge pull request #437 from weblate/weblate-ouisync-android-strings
J-Pabon Nov 5, 2024
52a9aa1
Update localized strings
J-Pabon Nov 5, 2024
31d2a75
Fix imports conflict
J-Pabon Nov 5, 2024
d1bfe9c
Translated using Weblate (Spanish)
gallegonovato Nov 5, 2024
0471016
Merge remote-tracking branch 'origin/master'
weblate Nov 5, 2024
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
2 changes: 1 addition & 1 deletion docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ The previous command would look like this:

`sudo docker build --build-arg build_name=<build-name> --build-arg build_number=<build-number> --build-arg keystore=<keystore-name> --build-arg keystore_password_file=<password-file-name> --build-arg ndk_version=<ndk-version> --build-arg branch=<branch> -f <dockerfile-location> -t <tag> .`

**Note:** By default, docker will run using **BuildKit**. If you want to dissable it, just add `DOCKER_BUILDKIT=0` at the beginning of the command, right
**Note:** By default, docker will run using **BuildKit**. If you want to disable it, just add `DOCKER_BUILDKIT=0` at the beginning of the command, right
between `sudo` and `docker`
2 changes: 1 addition & 1 deletion docker/dev/linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ADD https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3.tar.
# Extract into /home/TEMP/cmake-3.26.3
RUN tar -zxvf cmake-3.26.3.tar.gz

# Boostrap CMake
# Bootstrap CMake
RUN cd cmake-3.26.3 && \
./bootstrap

Expand Down
2 changes: 1 addition & 1 deletion docker/dev/windows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ RUN cd C:\code\ouisync-app\ouisync-plugin && \
RUN cd C:\code\ouisync-app && \
flutter pub get

# If you want the hability to SSH into this container, uncomment the following section
# If you want the ability to SSH into this container, uncomment the following section

# FROM ouisync-code as SSHLogLevel

Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ end

# post install
post_install do |installer|
# fix xcode 15 DT_TOOLCHAIN_DIR - remove after fix oficially - https://github.com/CocoaPods/CocoaPods/issues/12065
# fix xcode 15 DT_TOOLCHAIN_DIR - remove after fix officially - https://github.com/CocoaPods/CocoaPods/issues/12065
installer.aggregate_targets.each do |target|
target.xcconfigs.each do |variant, xcconfig|
xcconfig_path = target.client_root + target.xcconfig_relative_path(variant)
Expand Down
2 changes: 1 addition & 1 deletion lib/app/cubits/repo.dart
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ class RepoCubit extends Cubit<RepoState> with CubitActions, AppLogger {
}
}

/// Returns null if the authMode is AuthModeBlindOrManual or if decrytion fails.
/// Returns null if the authMode is AuthModeBlindOrManual or if decryption fails.
/// TODO: If decryption fails, we should throw and catch that above to inform
/// the user about the fact.
Future<LocalSecret?> getLocalSecret(MasterKey masterKey) async {
Expand Down
2 changes: 1 addition & 1 deletion lib/app/cubits/repos.dart
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ class ReposCubit extends WatchSelf<ReposCubit> with AppLogger {

await repo.setSyncEnabled(true);

// Check for the situation where we alredy have an entry for the repository
// Check for the situation where we already have an entry for the repository
// but it's location has changed. If so, reuse the existing stored secrets
// (if any).
final databaseId = DatabaseId(await repo.hexDatabaseId());
Expand Down
4 changes: 2 additions & 2 deletions lib/app/pages/main_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ class _MainPageState extends State<MainPage>
void checkForDokan() {
final dokanCheck = DokanCheck(
requiredMayor: Constants.dokanMayorRequired,
minimumRequiredVersion: Constants.dokanMinimunVersion,
minimumRequiredVersion: Constants.dokanMinimumVersion,
);

final dokanCheckResult = dokanCheck.checkDokanInstallation();
Expand Down Expand Up @@ -409,7 +409,7 @@ class _MainPageState extends State<MainPage>
// final sortDirection =
// _sortListCubit?.state.direction ?? SortDirection.asc;

/// Usiing the "back" arrow causes the app settings icon (gear) to get
/// Using the "back" arrow causes the app settings icon (gear) to get
/// the focus, even if we explicitly ask for it to losse it.
/// So for now we request focus for the FAB, then unfocused it.
_fabFocus.requestFocus();
Expand Down
2 changes: 1 addition & 1 deletion lib/app/session.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Future<Session> createSession({
defaultLocalDiscoveryEnabled: true,
);

// Add cache servers as user defined peers so we immediatelly connect to them.
// Add cache servers as user defined peers so we immediately connect to them.
for (final host in Constants.cacheServers) {
unawaited(addCacheServerAsPeer(session, host, logger: logger));
}
Expand Down
2 changes: 1 addition & 1 deletion lib/app/utils/constants.dart
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,5 @@ class Constants {
static const int android12SDK = 32;

static const String dokanMayorRequired = '2';
static const String dokanMinimunVersion = '2.1.0.1000';
static const String dokanMinimumVersion = '2.1.0.1000';
}
2 changes: 1 addition & 1 deletion lib/app/utils/password_hasher.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:ouisync/ouisync.dart';

// This class exists mainly to avoid passing the ouisync Session througout the
// This class exists mainly to avoid passing the ouisync Session throughout the
// code where only it's password hashing functionality is needed.
class PasswordHasher {
final Session _ouisyncSession;
Expand Down
14 changes: 7 additions & 7 deletions lib/app/utils/platform/platform_webview_mobile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ class PlatformWebViewMobile implements PlatformWebView {

final controller = WebViewController.fromPlatformCreationParams(params);

final initalizations = <Future>[];
final initializations = <Future>[];

initalizations
initializations
.add(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
initalizations.add(controller.setBackgroundColor(Colors.white));
initalizations.add(controller.loadRequest(Uri.parse(url)));
initializations.add(controller.setBackgroundColor(Colors.white));
initializations.add(controller.loadRequest(Uri.parse(url)));

if (controller.platform is AndroidWebViewController) {
initalizations.add(AndroidWebViewController.enableDebugging(true));
initalizations.add((controller.platform as AndroidWebViewController)
initializations.add(AndroidWebViewController.enableDebugging(true));
initializations.add((controller.platform as AndroidWebViewController)
.setMediaPlaybackRequiresUserGesture(false));
}

await Future.wait(initalizations);
await Future.wait(initializations);

return WebViewWidget(controller: controller);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class PlatformWindowManagerDesktop
/// For some reason, if we use a constant value for the title in the
/// WindowsOptions, the app hangs. This is true for the localized strings,
/// or a regular constant value in Constants.
/// So we use a harcoded string to start, then we use the localized string
/// So we use a hardcoded string to start, then we use the localized string
/// in app.dart -for now.

// Make it usable on older HD displays.
Expand Down
8 changes: 4 additions & 4 deletions lib/app/widgets/dialogs/modal_actions_bottom_sheet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class DirectoryActions extends StatelessWidget with AppLogger {
required IconData icon,
required Function()? action,
}) {
Color? dissabledColor = action == null ? Colors.grey : null;
Color? disabledColor = action == null ? Colors.grey : null;

return Padding(
padding: Dimensions.paddingBottomSheetActions,
Expand All @@ -82,12 +82,12 @@ class DirectoryActions extends StatelessWidget with AppLogger {
Icon(
icon,
size: Dimensions.sizeIconBig,
color: dissabledColor,
color: disabledColor,
),
Dimensions.spacingVertical,
Text(
name,
style: TextStyle(color: dissabledColor),
style: TextStyle(color: disabledColor),
)
],
),
Expand All @@ -101,7 +101,7 @@ class DirectoryActions extends StatelessWidget with AppLogger {
builder: (context, state) {
/// If we are not using the modal bottom sheet, this is, we
/// are not moving entries or adding media from the device,
/// we dissable the add File button.
/// we disable the add File button.
final enable = state is HideSheetState;

return Row(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class _ShareRepositoryState extends State<ShareRepository> with AppLogger {
labelStyle = context.theme.appTextStyle.bodyMicro
.copyWith(color: Constants.inputLabelForeColor);

// On certain resolutions (higer) the constrain set on this dialog when called
// On certain resolutions (higher) the constrain set on this dialog when called
// causes the content to scroll, giving the appearance of a smaller padding
// at the bottom of the content.
//
Expand Down
2 changes: 1 addition & 1 deletion lib/app/widgets/eq_values.dart
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class EqValues extends StatelessWidget {
fontSize: subtitleFontSize),
TextSpan(text: '${S.current.messageEqValuesP10}\n\n'),
Fields.boldTextSpan(
'· ${S.current.titleFreedomExpresionAccessInfo}\n\n',
'· ${S.current.titleFreedomExpressionAccessInfo}\n\n',
fontSize: subtitleFontSize),
TextSpan(text: '${S.current.messageEqValuesP11}.\n\n'),
Fields.boldTextSpan('· ${S.current.titleJustLegalSociety}\n\n',
Expand Down
2 changes: 1 addition & 1 deletion lib/app/widgets/holder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import '../utils/extensions.dart';

/// Helper widget that maintains a lifecycle of some resource and explicitly provides it to the
/// descendant widgets. This is similar to `Provider` from the `provider` package but it passes the
/// resource expicitly via the `builder` callback instead of implicitly via `context`. This means
/// resource explicitly via the `builder` callback instead of implicitly via `context`. This means
/// that it's impossible to forget to pass the resource as it would lead to compile time error,
/// unlike `Provider` which would cause runtime error in such case.
class ObjectHolder<T> extends StatefulWidget {
Expand Down
2 changes: 1 addition & 1 deletion lib/app/widgets/repo_creation.dart
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ class RepoCreation extends StatelessWidget {
case RepoCreationFailure(location: final location, error: final error):
await Dialogs.simpleAlertDialog(
context: context,
title: S.current.messsageFailedCreateRepository(location.path),
title: S.current.messageFailedCreateRepository(location.path),
message: error,
);
}
Expand Down
27 changes: 13 additions & 14 deletions lib/generated/intl/messages_all.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import 'dart:async';

import 'package:flutter/foundation.dart';
import 'package:intl/intl.dart';
import 'package:intl/message_lookup_by_library.dart';
import 'package:intl/src/intl_helpers.dart';
Expand All @@ -28,15 +27,15 @@ import 'messages_zh-TW.dart' as messages_zh_tw;

typedef Future<dynamic> LibraryLoader();
Map<String, LibraryLoader> _deferredLibraries = {
'en': () => new SynchronousFuture(null),
'es': () => new SynchronousFuture(null),
'fa': () => new SynchronousFuture(null),
'fr': () => new SynchronousFuture(null),
'my': () => new SynchronousFuture(null),
'ru': () => new SynchronousFuture(null),
'uk': () => new SynchronousFuture(null),
'zh_CN': () => new SynchronousFuture(null),
'zh_TW': () => new SynchronousFuture(null),
'en': () => new Future.value(null),
'es': () => new Future.value(null),
'fa': () => new Future.value(null),
'fr': () => new Future.value(null),
'my': () => new Future.value(null),
'ru': () => new Future.value(null),
'uk': () => new Future.value(null),
'zh_CN': () => new Future.value(null),
'zh_TW': () => new Future.value(null),
};

MessageLookupByLibrary? _findExact(String localeName) {
Expand Down Expand Up @@ -65,18 +64,18 @@ MessageLookupByLibrary? _findExact(String localeName) {
}

/// User programs should call this before using [localeName] for messages.
Future<bool> initializeMessages(String localeName) {
Future<bool> initializeMessages(String localeName) async {
var availableLocale = Intl.verifiedLocale(
localeName, (locale) => _deferredLibraries[locale] != null,
onFailure: (_) => null);
if (availableLocale == null) {
return new SynchronousFuture(false);
return new Future.value(false);
}
var lib = _deferredLibraries[availableLocale];
lib == null ? new SynchronousFuture(false) : lib();
await (lib == null ? new Future.value(false) : lib());
initializeInternalMessageLookup(() => new CompositeMessageLookup());
messageLookup.addLocale(availableLocale, _findGeneratedMessagesFor);
return new SynchronousFuture(true);
return new Future.value(true);
}

bool _messagesExistFor(String locale) {
Expand Down
Loading
Loading