diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index 147b66c..3d69f1e 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -1564,7 +1564,7 @@ "type": "String", "placeholders": {} }, - "passwordForgotten": "Password forgotten", + "passwordForgotten": "Forgot password", "@passwordForgotten": { "type": "String", "placeholders": {} diff --git a/lib/generated/l10n/l10n.dart b/lib/generated/l10n/l10n.dart index b5c4004..d2162ce 100644 --- a/lib/generated/l10n/l10n.dart +++ b/lib/generated/l10n/l10n.dart @@ -2076,7 +2076,7 @@ abstract class L10n { /// No description provided for @passwordForgotten. /// /// In en, this message translates to: - /// **'Password forgotten'** + /// **'Forgot password'** String get passwordForgotten; /// No description provided for @passwordHasBeenChanged. diff --git a/lib/generated/l10n/l10n_be.dart b/lib/generated/l10n/l10n_be.dart index 372051b..3d36180 100644 --- a/lib/generated/l10n/l10n_be.dart +++ b/lib/generated/l10n/l10n_be.dart @@ -1093,7 +1093,7 @@ class L10nBe extends L10n { String get password => 'Password'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/lib/generated/l10n/l10n_bn.dart b/lib/generated/l10n/l10n_bn.dart index 7d3cee6..7f9810f 100644 --- a/lib/generated/l10n/l10n_bn.dart +++ b/lib/generated/l10n/l10n_bn.dart @@ -1093,7 +1093,7 @@ class L10nBn extends L10n { String get password => 'Password'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/lib/generated/l10n/l10n_bo.dart b/lib/generated/l10n/l10n_bo.dart index 70e2325..2d1f011 100644 --- a/lib/generated/l10n/l10n_bo.dart +++ b/lib/generated/l10n/l10n_bo.dart @@ -1093,7 +1093,7 @@ class L10nBo extends L10n { String get password => 'Password'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/lib/generated/l10n/l10n_el.dart b/lib/generated/l10n/l10n_el.dart index 07b77cf..e3667f7 100644 --- a/lib/generated/l10n/l10n_el.dart +++ b/lib/generated/l10n/l10n_el.dart @@ -1094,7 +1094,7 @@ class L10nEl extends L10n { String get password => 'Password'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/lib/generated/l10n/l10n_en.dart b/lib/generated/l10n/l10n_en.dart index c06013e..6da8e58 100644 --- a/lib/generated/l10n/l10n_en.dart +++ b/lib/generated/l10n/l10n_en.dart @@ -1093,7 +1093,7 @@ class L10nEn extends L10n { String get password => 'Password'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/lib/generated/l10n/l10n_fil.dart b/lib/generated/l10n/l10n_fil.dart index d2867ad..9a4a63a 100644 --- a/lib/generated/l10n/l10n_fil.dart +++ b/lib/generated/l10n/l10n_fil.dart @@ -1099,7 +1099,7 @@ class L10nFil extends L10n { String get password => 'Password'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/lib/generated/l10n/l10n_hi.dart b/lib/generated/l10n/l10n_hi.dart index f5b3b21..f1bb6b5 100644 --- a/lib/generated/l10n/l10n_hi.dart +++ b/lib/generated/l10n/l10n_hi.dart @@ -1093,7 +1093,7 @@ class L10nHi extends L10n { String get password => 'Password'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/lib/generated/l10n/l10n_ia.dart b/lib/generated/l10n/l10n_ia.dart index 40e509b..bf1c8dc 100644 --- a/lib/generated/l10n/l10n_ia.dart +++ b/lib/generated/l10n/l10n_ia.dart @@ -1093,7 +1093,7 @@ class L10nIa extends L10n { String get password => 'Password'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/lib/generated/l10n/l10n_ka.dart b/lib/generated/l10n/l10n_ka.dart index 1125c7b..e54236b 100644 --- a/lib/generated/l10n/l10n_ka.dart +++ b/lib/generated/l10n/l10n_ka.dart @@ -1095,7 +1095,7 @@ class L10nKa extends L10n { String get password => 'Password'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/lib/generated/l10n/l10n_pt.dart b/lib/generated/l10n/l10n_pt.dart index 8850e00..66af4de 100644 --- a/lib/generated/l10n/l10n_pt.dart +++ b/lib/generated/l10n/l10n_pt.dart @@ -1093,7 +1093,7 @@ class L10nPt extends L10n { String get password => 'Password'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/lib/generated/l10n/l10n_sk.dart b/lib/generated/l10n/l10n_sk.dart index e3a39fe..187387a 100644 --- a/lib/generated/l10n/l10n_sk.dart +++ b/lib/generated/l10n/l10n_sk.dart @@ -1095,7 +1095,7 @@ class L10nSk extends L10n { String get password => 'Heslo'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/lib/generated/l10n/l10n_sl.dart b/lib/generated/l10n/l10n_sl.dart index a4dd18c..8b4556c 100644 --- a/lib/generated/l10n/l10n_sl.dart +++ b/lib/generated/l10n/l10n_sl.dart @@ -1097,7 +1097,7 @@ class L10nSl extends L10n { String get password => 'Password'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/lib/generated/l10n/l10n_te.dart b/lib/generated/l10n/l10n_te.dart index f5a046a..e716f81 100644 --- a/lib/generated/l10n/l10n_te.dart +++ b/lib/generated/l10n/l10n_te.dart @@ -1093,7 +1093,7 @@ class L10nTe extends L10n { String get password => 'Password'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/lib/generated/l10n/l10n_th.dart b/lib/generated/l10n/l10n_th.dart index c532cda..85c747b 100644 --- a/lib/generated/l10n/l10n_th.dart +++ b/lib/generated/l10n/l10n_th.dart @@ -1095,7 +1095,7 @@ class L10nTh extends L10n { String get password => 'Password'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/lib/generated/l10n/l10n_vi.dart b/lib/generated/l10n/l10n_vi.dart index f6d0568..8b7c921 100644 --- a/lib/generated/l10n/l10n_vi.dart +++ b/lib/generated/l10n/l10n_vi.dart @@ -1093,7 +1093,7 @@ class L10nVi extends L10n { String get password => 'Password'; @override - String get passwordForgotten => 'Password forgotten'; + String get passwordForgotten => 'Forgot password'; @override String get passwordHasBeenChanged => 'Password has been changed'; diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index ecb5b87..b1a7b59 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -6,10 +6,10 @@ project(runner LANGUAGES CXX) set(OPENSSL_USE_STATIC_LIBS OFF) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "fluffychat") +set(BINARY_NAME "extera_next") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "chat.fluffy.fluffychat") +set(APPLICATION_ID "xyz.extera.next") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. @@ -43,7 +43,7 @@ endif() # of modifying this function. function(APPLY_STANDARD_SETTINGS TARGET) target_compile_features(${TARGET} PUBLIC cxx_std_14) - target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE -Wall -Wno-deprecated-literal-operator -Werror) target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") endfunction() diff --git a/linux/my_application.cc b/linux/my_application.cc index 446ceea..e781e9b 100644 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -56,6 +56,7 @@ static void my_application_activate(GApplication* application) { gtk_header_bar_set_title(header_bar, "Extera Next"); gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { gtk_window_set_title(window, "Extera Next"); }