From a072709505054ec6d72de52f6cfdb4460fdd639b Mon Sep 17 00:00:00 2001 From: Gary Kramlich Date: Sat, 31 Dec 2022 21:51:24 -0600 Subject: Remove a string from the Romanian translation that's breaking iconv on Windows. Testing Done: ran `make dist` and built and tested the installer on Windows. Reviewed at https://reviews.imfreedom.org/r/2157/ --- ChangeLog | 5 +++-- configure.ac | 2 +- po/ro.po | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b17f328a4..9ca220d728 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,8 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.14.12 (??/??/????): - * Nothing yet, be the first!! +version 2.14.12 (12/31/2022): + * Remove a string from the Romanian translation that's breaks the creation + of the Windows installer. (RR 2157) (Gary Kramlich) version 2.14.11 (12/31/2022): * Add Markus "ivanhoe" Fischer to the Crazy Patch Writers! Congrats Markus! diff --git a/configure.ac b/configure.ac index ffcc3f28a7..4c5d3cb691 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ m4_define([purple_lt_current], [14]) m4_define([purple_major_version], [2]) m4_define([purple_minor_version], [14]) m4_define([purple_micro_version], [12]) -m4_define([purple_version_suffix], [dev]) +m4_define([purple_version_suffix], []) m4_define([purple_version], [purple_major_version.purple_minor_version.purple_micro_version]) m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix])) diff --git a/po/ro.po b/po/ro.po index ad2c5867bd..7992242109 100644 --- a/po/ro.po +++ b/po/ro.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-31 20:43-0600\n" +"POT-Creation-Date: 2022-12-31 21:28-0600\n" "PO-Revision-Date: 2012-02-20 18:15+0000\n" "Last-Translator: Simona Iacob , 2021-2022\n" "Language-Team: Romanian (http://www.transifex.com/pidgin/pidgin/language/" @@ -12087,8 +12087,6 @@ msgid "" "Pidgin requires a compatible GTK+ Runtime (which does not appear to be " "installed).$\\rAre you sure you want to skip installing the GTK+ Runtime?" msgstr "" -"Pidgin necesită un Runtime GTK+ compatibil (care nu pare să fie instalat).$" -"\\rSunteți sigur că doriți să săriți peste instalarea Runtime-ului GTK+?" #. Installer Subsection Text msgid "URI Handlers" -- cgit v1.2.1