summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gvcore/jpegformattype.cpp4
-rw-r--r--src/gvcore/mngformattype.cpp7
-rw-r--r--src/gvcore/thumbnailloadjob.cpp3
-rw-r--r--src/imageutils/jpegerrormanager.h5
-rw-r--r--src/imageutils/transupp.c1
-rw-r--r--src/tools/gimp.desktop2
-rw-r--r--src/tsthread/tsthread.h2
-rw-r--r--translations/desktop_files/it.po19
-rw-r--r--translations/desktop_files/ka.po29
-rw-r--r--translations/desktop_files/ru.po4
-rw-r--r--translations/desktop_files/uk.po20
11 files changed, 41 insertions, 55 deletions
diff --git a/src/gvcore/jpegformattype.cpp b/src/gvcore/jpegformattype.cpp
index 81f9edb..ea5cdaa 100644
--- a/src/gvcore/jpegformattype.cpp
+++ b/src/gvcore/jpegformattype.cpp
@@ -29,11 +29,7 @@
// System
#include <stdio.h>
#include <setjmp.h>
-extern "C" {
-#define XMD_H
#include <jpeglib.h>
-#undef const
-}
// TQt
#include <tqdatetime.h>
diff --git a/src/gvcore/mngformattype.cpp b/src/gvcore/mngformattype.cpp
index 2ce2f1c..b3b37a5 100644
--- a/src/gvcore/mngformattype.cpp
+++ b/src/gvcore/mngformattype.cpp
@@ -85,13 +85,6 @@
#include "tqasyncimageio.h"
#include "tqiodevice.h"
-// Define XMD_H prohibits the included headers of libmng.h to typedef INT32.
-// This is needed for Borland with STL support, since in that case, INT32 is
-// already defined by some Borland header.
-#define XMD_H
-#if defined(TQ_OS_UNIXWARE)
-# define HAVE_BOOLEAN // libjpeg under Unixware seems to need this
-#endif
#include <libmng.h>
#include <stdlib.h>
diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp
index 826d641..7d3a11f 100644
--- a/src/gvcore/thumbnailloadjob.cpp
+++ b/src/gvcore/thumbnailloadjob.cpp
@@ -48,10 +48,7 @@
// libjpeg
#include <setjmp.h>
-#define XMD_H
-extern "C" {
#include <jpeglib.h>
-}
// Local
#include "cache.h"
diff --git a/src/imageutils/jpegerrormanager.h b/src/imageutils/jpegerrormanager.h
index 49a0e80..00898bc 100644
--- a/src/imageutils/jpegerrormanager.h
+++ b/src/imageutils/jpegerrormanager.h
@@ -21,12 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define JPEGERRORMANAGER_H
#include <setjmp.h>
-
-extern "C" {
-#define XMD_H
#include <jpeglib.h>
-#undef const
-}
namespace ImageUtils {
diff --git a/src/imageutils/transupp.c b/src/imageutils/transupp.c
index 8003c48..3805646 100644
--- a/src/imageutils/transupp.c
+++ b/src/imageutils/transupp.c
@@ -1,4 +1,5 @@
#include <stdlib.h>
+#include <stdint.h>
#include <stdio.h>
#include <jpeglib.h>
#include <jpegint.h>
diff --git a/src/tools/gimp.desktop b/src/tools/gimp.desktop
index b5c54c6..be26126 100644
--- a/src/tools/gimp.desktop
+++ b/src/tools/gimp.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
Name=The GIMP
Icon=gimp
-Exec=gimp-remote %F
+Exec=gimp %F
X-TDE-ServiceTypes=image/*
diff --git a/src/tsthread/tsthread.h b/src/tsthread/tsthread.h
index bd8e48d..15ac57b 100644
--- a/src/tsthread/tsthread.h
+++ b/src/tsthread/tsthread.h
@@ -30,7 +30,7 @@ DEALINGS IN THE SOFTWARE.
#include <tqwaitcondition.h>
#include <tqdeepcopy.h>
#include <tqmutex.h>
-#include <tqucomextra_p.h>
+#include <private/tqucomextra_p.h>
#ifdef TS_TQTHREADSTORAGE
#include <tqthreadstorage.h>
diff --git a/translations/desktop_files/it.po b/translations/desktop_files/it.po
index e986191..bafe17d 100644
--- a/translations/desktop_files/it.po
+++ b/translations/desktop_files/it.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2024.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-13 14:33+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-09-26 03:10+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/gwenview-desktop-files/it/>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
#. Name
#: desktopfiles/gwenview.desktop:4
msgid "Gwenview"
-msgstr ""
+msgstr "Gwenview"
#. GenericName
#: desktopfiles/gwenview.desktop:6
@@ -54,12 +55,12 @@ msgstr "GIMP"
#. Name
#: tools/kolourpaint.desktop:2
msgid "KolourPaint"
-msgstr ""
+msgstr "KolourPaint"
#. Name
#: tools/konqueror.desktop:2
msgid "Konqueror"
-msgstr ""
+msgstr "Konqueror"
#. Name
#: tools/tiledwallpaper.desktop:2
diff --git a/translations/desktop_files/ka.po b/translations/desktop_files/ka.po
index d4f81ec..104ef62 100644
--- a/translations/desktop_files/ka.po
+++ b/translations/desktop_files/ka.po
@@ -1,35 +1,36 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-13 14:33+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-11-03 14:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/gwenview-desktop-files/ka/>\n"
"Language: ka\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
#. Name
#: desktopfiles/gwenview.desktop:4
msgid "Gwenview"
-msgstr ""
+msgstr "Gwenview"
#. GenericName
#: desktopfiles/gwenview.desktop:6
msgid "Image Viewer"
-msgstr "სურათების დამთვალიერებელი"
+msgstr "სურათების გალერეა"
#. Comment
#: desktopfiles/gwenview.desktop:8
msgid "A simple image viewer"
-msgstr "სურათების მარტივი დამთვალიერებელი"
+msgstr "სურათების მარტივი გალერეა"
#. Name
#: desktopfiles/konqgwenview.desktop:6
@@ -44,22 +45,22 @@ msgstr "სურათების ნახვა"
#. Name
#: gvimagepart/gvimagepart.desktop:3
msgid "Gwenview Image Viewer"
-msgstr "Gwenview სურათების დამთვალიერებელი"
+msgstr "სურათების დამთვალიერებელი Gwenview"
#. Name
#: tools/gimp.desktop:2
msgid "The GIMP"
-msgstr ""
+msgstr "GIMP"
#. Name
#: tools/kolourpaint.desktop:2
msgid "KolourPaint"
-msgstr ""
+msgstr "KolourPaint"
#. Name
#: tools/konqueror.desktop:2
msgid "Konqueror"
-msgstr ""
+msgstr "Konqueror"
#. Name
#: tools/tiledwallpaper.desktop:2
@@ -69,4 +70,4 @@ msgstr "მოზაიკურ ფონად დაყენება"
#. Name
#: tools/wallpaper.desktop:2
msgid "Set as Wallpaper"
-msgstr "ფონად მითითება"
+msgstr "ფონად დაყენება"
diff --git a/translations/desktop_files/ru.po b/translations/desktop_files/ru.po
index 4705500..7059444 100644
--- a/translations/desktop_files/ru.po
+++ b/translations/desktop_files/ru.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.17\n"
#. Name
diff --git a/translations/desktop_files/uk.po b/translations/desktop_files/uk.po
index d154059..981541f 100644
--- a/translations/desktop_files/uk.po
+++ b/translations/desktop_files/uk.po
@@ -1,25 +1,27 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Roman Savochenko <roman@oscada.org>, 2024.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-13 14:33+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-10-02 18:11+0000\n"
+"Last-Translator: Roman Savochenko <roman@oscada.org>\n"
+"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/gwenview-desktop-files/uk/>\n"
"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
#. Name
#: desktopfiles/gwenview.desktop:4
msgid "Gwenview"
-msgstr ""
+msgstr "Gwenview"
#. GenericName
#: desktopfiles/gwenview.desktop:6
@@ -54,12 +56,12 @@ msgstr "GIMP"
#. Name
#: tools/kolourpaint.desktop:2
msgid "KolourPaint"
-msgstr ""
+msgstr "KolourPaint"
#. Name
#: tools/konqueror.desktop:2
msgid "Konqueror"
-msgstr ""
+msgstr "Konqueror"
#. Name
#: tools/tiledwallpaper.desktop:2
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 04:58:37 +0000