Merge branch '3.4'

.github/workflows/ci.yml

@@ -31,7 +31,6 @@ jobs:
             libdb++-dev \
             libboost-dev \
             libboost-system-dev \
-            libboost-regex-dev \
             libboost-thread-dev \
             libboost-iostreams-dev \
             liblucene++-dev \

NEWS

@@ -1,3 +1,12 @@
+Version 3.4.3
+-------------
+
+- Pass --no-convert to msgfmt with gettext >= 0.22 to avoid UTF-8 conversion.
+- Fixed parsing of @@locale values in ARB files.
+- Updated bundled GNU gettext to 0.22.5.
+- Assorted fixes.
+
+
 Version 3.4.2
 -------------
 

Poedit.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\Gettext.Tools.0.22.4\build\Gettext.Tools.props" Condition="Exists('packages\Gettext.Tools.0.22.4\build\Gettext.Tools.props')" />
+  <Import Project="packages\Gettext.Tools.0.22.5\build\Gettext.Tools.props" Condition="Exists('packages\Gettext.Tools.0.22.5\build\Gettext.Tools.props')" />
   <Import Project="packages\Tools.InnoSetup.6.2.2\build\Tools.InnoSetup.props" Condition="Exists('packages\Tools.InnoSetup.6.2.2\build\Tools.InnoSetup.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -339,6 +339,6 @@
     <Error Condition="!Exists('packages\MSBuildTasks.1.5.0.196\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\MSBuildTasks.1.5.0.196\build\MSBuildTasks.targets'))" />
     <Error Condition="!Exists('packages\WinSparkle.0.8.0\build\native\WinSparkle.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\WinSparkle.0.8.0\build\native\WinSparkle.targets'))" />
     <Error Condition="!Exists('packages\Tools.InnoSetup.6.2.2\build\Tools.InnoSetup.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Tools.InnoSetup.6.2.2\build\Tools.InnoSetup.props'))" />
-    <Error Condition="!Exists('packages\Gettext.Tools.0.22.4\build\Gettext.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Gettext.Tools.0.22.4\build\Gettext.Tools.props'))" />
+    <Error Condition="!Exists('packages\Gettext.Tools.0.22.5\build\Gettext.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Gettext.Tools.0.22.5\build\Gettext.Tools.props'))" />
   </Target>
 </Project>

configure.ac

@@ -58,7 +58,6 @@ esac
 
 AX_BOOST_BASE([1.60], [], [AC_MSG_ERROR([Boost libraries are required])])
 AX_BOOST_SYSTEM
-AX_BOOST_REGEX
 AX_BOOST_THREAD
 CXXFLAGS="$CXXFLAGS $BOOST_CPPFLAGS"
 

deps/build.ninja

@@ -17,12 +17,12 @@ rule download
       $url...
   pool = console
 build $
-    tarballs/gettext-0.22.4.tar.gz: $
+    tarballs/gettext-0.22.5.tar.gz: $
     download
   url = $
-      https://ftp.gnu.org/pub/gnu/gettext/gettext-0.22.4.tar.gz
+      https://ftp.gnu.org/pub/gnu/gettext/gettext-0.22.5.tar.gz
   sha256 = $
-      c1e0bb2a4427a9024390c662cd532d664c4b36b8ff444ed5e54b115fdb7a1aea
+      ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0
 rule gettext_build
   command = echo $
       'note: ⋯  $
@@ -55,15 +55,15 @@ rule gettext_build
       && echo $
       'note: ⋯  $
       tar -x -f $
-      "$top_srcdir/tarballs/gettext-0.22.4.tar.gz" $
+      "$top_srcdir/tarballs/gettext-0.22.5.tar.gz" $
       -C $
       "$workdir" $
       --strip-components $
       1' && $
       tmp=`mktemp` $
       && tar -x $
       -f $
-      "$top_srcdir/tarballs/gettext-0.22.4.tar.gz" $
+      "$top_srcdir/tarballs/gettext-0.22.5.tar.gz" $
       -C $
       "$workdir" $
       --strip-components $
@@ -397,7 +397,7 @@ build $
     gettext_build $
     gettext/gettext-macos-catalina-dont-touch-parent-dirs.patch $
     gettext/gettext-smaller-build.patch $
-    tarballs/gettext-0.22.4.tar.gz
+    tarballs/gettext-0.22.5.tar.gz
   name = gettext
   configure = $
       ./configure

deps/generate_build_ninja.py

@@ -5,9 +5,9 @@
 from glob import glob
 from ninja_syntax import Writer
 
-GETTEXT_VERSION = "0.22.4"  # use of " important for Xcode build!
+GETTEXT_VERSION = "0.22.5"  # use of " important for Xcode build!
 GETTEXT_TARBALL = 'gettext-%s.tar.gz' % GETTEXT_VERSION
-GETTEXT_SHA256 = 'c1e0bb2a4427a9024390c662cd532d664c4b36b8ff444ed5e54b115fdb7a1aea'
+GETTEXT_SHA256 = 'ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0'
 
 _exclusion_list = [
     '.DS_Store',

locales/ar.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: poedit\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2023-12-21 18:55+0100\n"
-"PO-Revision-Date: 2023-11-17 10:15\n"
+"PO-Revision-Date: 2023-12-28 10:15\n"
 "Last-Translator: \n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Crowdin-File-ID: 3\n"
 
 msgid "Hide this notification message"
-msgstr "أخفِ رسالة الإخطار هذه"
+msgstr "إخفاء رسالة التنبيه هذه"
 
 msgid "Don’t Show Again"
 msgstr "عدم العرض مجدّدًا"
@@ -48,7 +48,7 @@ msgstr "تحديث الترجمات"
 
 #, c-format
 msgid "The file “%s” couldn’t be opened."
-msgstr ""
+msgstr "لا يمكن فتح الملف \"%s\"."
 
 msgid "Invalid file"
 msgstr "الملفّ غير صالح"
@@ -67,25 +67,25 @@ msgid "XLIFF Translation Files"
 msgstr "ملفات ترجمة XLIFF"
 
 msgid "JSON Translation Files"
-msgstr ""
+msgstr "ملفات ترجمة JSON"
 
 #. TRANSLATORS: "Flutter" is proper noun, name of a developer tool
 msgid "Flutter Translation Files"
-msgstr ""
+msgstr "ملفات ترجمة Flutter"
 
 msgid "All Translation Files"
 msgstr "كلّ ملفّات التّرجمة"
 
 msgid "The file is in a format not recognized by Poedit."
-msgstr ""
+msgstr "الملف بصيغة لم يتعرف عليها Poedit."
 
 msgid ""
 "This JSON file isn’t a translations file and cannot be edited in Poedit."
-msgstr ""
+msgstr "ملف JSON هذا ليس ملف ترجمات ولا يمكن تعديله في Poedit."
 
 #, c-format
 msgid "Reading file content failed with the following error: %s"
-msgstr ""
+msgstr "فشل قراءة محتوى الملف مع الخطأ التالي: %s"
 
 #, c-format
 msgid ""
@@ -100,7 +100,7 @@ msgid "Couldn’t save file %s."
 msgstr "تعذّر حفظ الملفّ %s."
 
 msgid "Screenshots:"
-msgstr ""
+msgstr "لقطات شاشة:"
 
 #, c-format
 msgid "%i line of file “%s” was not loaded correctly."
@@ -123,7 +123,7 @@ msgid "Broken PO file: plural form msgstr used without msgid_plural"
 msgstr "ملفّ PO معطوب: استُخدمت صيغة الجمع msgstr دون msgid_plural"
 
 msgid "Couldn’t load the file, it is probably damaged."
-msgstr ""
+msgstr "تعذر تحميل الملف، ربما تالف."
 
 msgid ""
 "There were errors when loading the file. Some data may be missing or "
@@ -155,11 +155,11 @@ msgstr "الملفّ ”%s“ ليس ملفّ POT صالح."
 
 #, c-format
 msgid "Error while loading XLIFF file: %s"
-msgstr ""
+msgstr "خطأ في تحميل ملف XLIFF: %s"
 
 #, c-format
 msgid "unsupported version (%s)"
-msgstr ""
+msgstr "إصدار غير مدعوم (%s)"
 
 #. TRANSLATORS: Shown as error if a translation of XLIFF markup is not valid XML
 msgid "Broken markup in translation string."
@@ -178,38 +178,40 @@ msgid "You must restart Poedit for this change to take effect."
 msgstr "عليك إعادة تشغيل Poedit لتطبيق التّعديلات."
 
 msgid "Add Account"
-msgstr ""
+msgstr "إضافة حساب"
 
 msgid "Add account"
-msgstr ""
+msgstr "إضافة حساب"
 
 #. TRANSLATORS: %s is online service name, e.g. "Crowdin" or "Localazy"
 #, c-format
 msgid "Learn more about %s"
-msgstr ""
+msgstr "معرفة المزيد عن %s"
 
 msgid ""
 "Connect Poedit with supported cloud localization platforms to seamlessly "
 "sync translations managed on them."
 msgstr ""
+"توصيل Poedit مع منصات التوطين السحابية المدعومة لمزامنة الترجمات التي تتم "
+"إدارتها عليها بسلاسة."
 
 msgid "How does cloud sync work?"
-msgstr ""
+msgstr "كيفية عمل المزامنة السحابية؟"
 
 msgid "Account"
-msgstr ""
+msgstr "حساب"
 
 msgid "(not signed in)"
-msgstr ""
+msgstr "(لم يتم تسجيل الدخول)"
 
 msgid "File"
 msgstr "ملفّ"
 
 msgid "Open cloud translation"
-msgstr ""
+msgstr "فتح الترجمة السحابية"
 
 msgid "Manage accounts"
-msgstr ""
+msgstr "إدارة الحسابات"
 
 msgid "Project:"
 msgstr "المشروع:"
@@ -218,34 +220,34 @@ msgid "Language:"
 msgstr "اللّغة:"
 
 msgid "Sign in to Cloud Account"
-msgstr ""
+msgstr "تسجيل الدخول إلى حساب سحابي"
 
 msgid "Sign in to cloud account"
-msgstr ""
+msgstr "تسجيل الدخول إلى حساب سحابي"
 
 msgid "No translation projects listed in your account."
-msgstr ""
+msgstr "لا توجد مشروعات ترجمة مدرجة في حسابك."
 
 msgid "Downloading latest translations…"
 msgstr "ينزّل أحدث التّرجمات…"
 
 #. TRANSLATORS: "%s" is a name of online service, e.g. "Crowdin" or "Localazy"
 #, c-format
 msgid "Sign in to %s"
-msgstr ""
+msgstr "تسجيل الدخول إلى %s"
 
 msgid "Syncing"
 msgstr "جارٍ المزامنة"
 
 #. TRANSLATORS: %s is a cloud destination, e.g. "Crowdin" or ftp.wordpress.com etc.
 #, c-format
 msgid "Uploading translations to %s…"
-msgstr ""
+msgstr "تحميل الترجمات إلى %s…"
 
 #. TRANSLATORS: %s is a cloud destination, e.g. "Crowdin" or ftp.wordpress.com etc.
 #, c-format
 msgid "Uploading translations to %s failed."
-msgstr ""
+msgstr "فشل تحميل الترجمات إلى %s."
 
 msgid "Syncing error"
 msgstr "خطأ في المزامنة"