Update upstream source from tag 'upstream/1.6.2'

Update to upstream version '1.6.2' with Debian dir 01d194fe3a77aa3f938c11fab425b9e5e8cb45df
fvcr · May 25, 2023 · 99532a6 · 99532a6
2 parents 3f7977c + 3272609
commit 99532a6
Show file tree

Hide file tree

Showing 20 changed files with 610 additions and 251 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12)
 project(
         whatsapp-for-linux
-        VERSION 1.6.0
+        VERSION 1.6.2
         DESCRIPTION "An unofficial WhatsApp desktop application for Linux"
         HOMEPAGE_URL "https://github.com/eneshecan/whatsapp-for-linux"
         LANGUAGES C CXX

diff --git a/README.md b/README.md
@@ -30,6 +30,7 @@ An unofficial WhatsApp desktop application for Linux.
 [![Action Status](https://github.com/eneshecan/whatsapp-for-linux/workflows/Build/badge.svg)](https://github.com/eneshecan/whatsapp-for-linux/actions/workflows/build.yml)
 [![Action Status](https://github.com/eneshecan/whatsapp-for-linux/workflows/Install/badge.svg)](https://github.com/eneshecan/whatsapp-for-linux/actions/workflows/install.yml)
 [![Action Status](https://github.com/eneshecan/whatsapp-for-linux/workflows/Release/badge.svg)](https://github.com/eneshecan/whatsapp-for-linux/actions/workflows/release.yml)
+[![POEditor](https://img.shields.io/badge/Translations-POEditor-brightgreen)](https://poeditor.com/join/project/jMGkxVn3vN)
 
 ![App Window](screenshot/app.png)
 
@@ -42,9 +43,11 @@ Check out [wiki](https://github.com/eneshecan/whatsapp-for-linux/wiki) for furth
 
 ## Features
 
-* Features come with whatsapp web except audio and image capture
+* Features come with WhatsApp Web
+  * WhatsApp specific keyboard shortcuts work with *Alt* key instead of *Cmd*
 * Zoom in/out
 * System tray icon
+* Notification sounds
 * Autostart with system
 * Fullscreen mode
 * Show/Hide headerbar by pressing *Alt+H*

diff --git a/appimage/AppImageBuilder.yml b/appimage/AppImageBuilder.yml
@@ -87,6 +87,7 @@ AppDir:
       - /lib/x86_64-linux-gnu/libcairo-gobject.so.2
       - /lib/x86_64-linux-gnu/libcairo.so.2
       - /lib/x86_64-linux-gnu/libcairomm-1.0.so.1
+      - /lib/x86_64-linux-gnu/libcanberra.so.0
       - /lib/x86_64-linux-gnu/libchromaprint.so.1
       - /lib/x86_64-linux-gnu/libcodec2.so.0.9
       - /lib/x86_64-linux-gnu/libcrypto.so.1.1

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
@@ -2,12 +2,12 @@ file(GLOB PO_FILES *.po)
 
 add_custom_command(
         OUTPUT ${CMAKE_PROJECT_NAME}.pot
-        COMMAND intltool-update -g ${CMAKE_PROJECT_NAME} -p
+        COMMAND intltool-update -g ${CMAKE_PROJECT_NAME} -p && intltool-update --dist --gettext-package=whatsapp-for-linux --output-file=en.po en
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        COMMENT "Updating default translation file"
+        COMMENT "Updating default translation files"
     )
 
-add_custom_target(update-translation DEPENDS ${CMAKE_PROJECT_NAME}.pot)
+add_custom_target(update-translations DEPENDS ${CMAKE_PROJECT_NAME}.pot en.po)
 
 foreach (LANG ${PO_FILES})
     get_filename_component(LANG ${LANG} NAME)

diff --git a/po/LINGUAS b/po/LINGUAS
@@ -1,8 +1,9 @@
 # Keep this file sorted alphabetically, one language code per line
+es
+fr
 it
 ka
 nl
 pt-br
 ru
 tr
-es
diff --git a/po/en.po b/po/en.po
@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: WhatsApp for Linux\n"
 "Language: en\n"
 
-#: ../src/ui/MainWindow.cpp:300 ../src/ui/TrayIcon.cpp:46
+#: ../src/ui/MainWindow.cpp:344 ../src/ui/TrayIcon.cpp:46
 #: ../resource/ui/MainWindow.ui.h:4
 msgid "About"
 msgstr "About"
 
-#: ../src/ui/MainWindow.cpp:302 ../resource/ui/MainWindow.ui.h:6
+#: ../src/ui/MainWindow.cpp:346 ../resource/ui/MainWindow.ui.h:6
 msgid "WhatsApp for Linux"
 msgstr "WhatsApp for Linux"
 
-#: ../src/ui/MainWindow.cpp:303
+#: ../src/ui/MainWindow.cpp:347
 msgid "An unofficial WhatsApp desktop application for Linux"
 msgstr "An unofficial WhatsApp desktop application for Linux"
 
@@ -37,35 +37,27 @@ msgid "Show"
 msgstr "Show"
 
 #: ../src/ui/TrayIcon.cpp:47 ../resource/ui/MainWindow.ui.h:5
-#: ../resource/ui/ShortcutsWindow.ui.h:8
+#: ../resource/ui/ShortcutsWindow.ui.h:10
 msgid "Quit"
 msgstr "Quit"
 
-#: ../src/ui/WebView.cpp:34
-msgid "Notification Request"
-msgstr "Notification Request"
-
-#: ../src/ui/WebView.cpp:35
-msgid "Would you like to allow notifications?"
-msgstr "Would you like to allow notifications?"
-
-#: ../src/ui/WebView.cpp:69
+#: ../src/ui/WebView.cpp:75
 msgid "Save File"
 msgstr "Save File"
 
-#: ../src/ui/WebView.cpp:70
+#: ../src/ui/WebView.cpp:76
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/ui/WebView.cpp:71
+#: ../src/ui/WebView.cpp:77
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../src/ui/WebView.cpp:322
+#: ../src/ui/WebView.cpp:328
 msgid "Unresponsive"
 msgstr "Unresponsive"
 
-#: ../src/ui/WebView.cpp:323
+#: ../src/ui/WebView.cpp:329
 msgid "The application is not responding. Would you like to reload?"
 msgstr "The application is not responding. Would you like to reload?"
 
@@ -77,7 +69,7 @@ msgstr "Fullscreen"
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:7
+#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:9
 msgid "Keyboard Shortcuts"
 msgstr "Keyboard Shortcuts"
 
@@ -170,19 +162,19 @@ msgstr "Shortcuts"
 msgid "Refresh Page"
 msgstr "Refresh Page"
 
-#: ../resource/ui/ShortcutsWindow.ui.h:4
+#: ../resource/ui/ShortcutsWindow.ui.h:6
 msgid "Enter/Exit Fullscreen"
 msgstr "Enter/Exit Fullscreen"
 
-#: ../resource/ui/ShortcutsWindow.ui.h:5
+#: ../resource/ui/ShortcutsWindow.ui.h:7
 msgid "Show/Hide Header Bar"
 msgstr "Show/Hide Header Bar"
 
-#: ../resource/ui/ShortcutsWindow.ui.h:6
+#: ../resource/ui/ShortcutsWindow.ui.h:8
 msgid "Open Preferences"
 msgstr "Open Preferences"
 
-#: ../src/ui/MainWindow.cpp:305
+#: ../src/ui/MainWindow.cpp:349
 msgid "GitHub Repository"
 msgstr "GitHub Repository"
 
@@ -202,3 +194,19 @@ msgstr "Minimum Font Size"
 msgid "Minimum font size used to display text, values other than 0 can potentially break page layouts"
 msgstr "Minimum font size used to display text, values other than 0 can potentially break page layouts"
 
+#: ../resource/ui/ShortcutsWindow.ui.h:4
+msgid "Zoom In"
+msgstr "Zoom In"
+
+#: ../resource/ui/ShortcutsWindow.ui.h:5
+msgid "Zoom Out"
+msgstr "Zoom Out"
+
+#: ../src/ui/WebView.cpp:40
+msgid "Permission Request"
+msgstr "Permission Request"
+
+#: ../src/ui/WebView.cpp:41
+msgid "Would you like to allow permissions?"
+msgstr "Would you like to allow permissions?"
+
diff --git a/po/es.po b/po/es.po
@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: WhatsApp for Linux\n"
 "Language: es\n"
 
-#: ../src/ui/MainWindow.cpp:300 ../src/ui/TrayIcon.cpp:46
+#: ../src/ui/MainWindow.cpp:344 ../src/ui/TrayIcon.cpp:46
 #: ../resource/ui/MainWindow.ui.h:4
 msgid "About"
 msgstr "Acerca de"
 
-#: ../src/ui/MainWindow.cpp:302 ../resource/ui/MainWindow.ui.h:6
+#: ../src/ui/MainWindow.cpp:346 ../resource/ui/MainWindow.ui.h:6
 msgid "WhatsApp for Linux"
 msgstr "WhatsApp para Linux"
 
-#: ../src/ui/MainWindow.cpp:303
+#: ../src/ui/MainWindow.cpp:347
 msgid "An unofficial WhatsApp desktop application for Linux"
 msgstr "Aplicación no oficial de WhatsApp para Linux"
 
@@ -37,35 +37,27 @@ msgid "Show"
 msgstr "Mostrar"
 
 #: ../src/ui/TrayIcon.cpp:47 ../resource/ui/MainWindow.ui.h:5
-#: ../resource/ui/ShortcutsWindow.ui.h:8
+#: ../resource/ui/ShortcutsWindow.ui.h:10
 msgid "Quit"
 msgstr "Salir"
 
-#: ../src/ui/WebView.cpp:34
-msgid "Notification Request"
-msgstr "Solicitud de notificaciones"
-
-#: ../src/ui/WebView.cpp:35
-msgid "Would you like to allow notifications?"
-msgstr "¿Desea permitir las notificaciones?"
-
-#: ../src/ui/WebView.cpp:69
+#: ../src/ui/WebView.cpp:75
 msgid "Save File"
 msgstr "Guardar archivo"
 
-#: ../src/ui/WebView.cpp:70
+#: ../src/ui/WebView.cpp:76
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/ui/WebView.cpp:71
+#: ../src/ui/WebView.cpp:77
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/ui/WebView.cpp:322
+#: ../src/ui/WebView.cpp:328
 msgid "Unresponsive"
 msgstr "No responde"
 
-#: ../src/ui/WebView.cpp:323
+#: ../src/ui/WebView.cpp:329
 msgid "The application is not responding. Would you like to reload?"
 msgstr "La aplicación no responde. ¿Desea recargarla?"
 
@@ -77,7 +69,7 @@ msgstr "Pantalla completa"
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:7
+#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:9
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
 
@@ -170,19 +162,19 @@ msgstr "Atajos"
 msgid "Refresh Page"
 msgstr "Actualizar página"
 
-#: ../resource/ui/ShortcutsWindow.ui.h:4
+#: ../resource/ui/ShortcutsWindow.ui.h:6
 msgid "Enter/Exit Fullscreen"
 msgstr "Entrar/Salir de pantalla completa"
 
-#: ../resource/ui/ShortcutsWindow.ui.h:5
+#: ../resource/ui/ShortcutsWindow.ui.h:7
 msgid "Show/Hide Header Bar"
 msgstr "Mostrar/Ocultar barra de encabezado"
 
-#: ../resource/ui/ShortcutsWindow.ui.h:6
+#: ../resource/ui/ShortcutsWindow.ui.h:8
 msgid "Open Preferences"
 msgstr "Abrir Preferencias"
 
-#: ../src/ui/MainWindow.cpp:305
+#: ../src/ui/MainWindow.cpp:349
 msgid "GitHub Repository"
 msgstr "Repositorio GitHub"
 
@@ -202,3 +194,19 @@ msgstr "Minimum Font Size"
 msgid "Minimum font size used to display text, values other than 0 can potentially break page layouts"
 msgstr "Minimum font size used to display text, values other than 0 can potentially break page layouts"
 
+#: ../resource/ui/ShortcutsWindow.ui.h:4
+msgid "Zoom In"
+msgstr "Zoom In"
+
+#: ../resource/ui/ShortcutsWindow.ui.h:5
+msgid "Zoom Out"
+msgstr "Zoom Out"
+
+#: ../src/ui/WebView.cpp:40
+msgid "Permission Request"
+msgstr "Permission Request"
+
+#: ../src/ui/WebView.cpp:41
+msgid "Would you like to allow permissions?"
+msgstr "Would you like to allow permissions?"
+