Merge translation files from master branch.

There was probably the intention that it was a two-line text,
not that the formatted string served as a context of translation.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit c67315e06c)

src/addalternativesui.ui

@@ -248,10 +248,12 @@
     <slot access="protected">slotAddSlaveClicked()</slot>
 </slots>
 <layoutdefaults spacing="6" margin="11"/>
-<includes>
+<includehints>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <includehint>kurlrequester.h</includehint>
-    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <includehint>knuminput.h</includehint>
-    <include location="global" impldecl="in implementation">ktextedit.h</include>
+    <includehint>ktextedit.h</includehint>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <includehint>kpushbutton.h</includehint>
-</includes>
+    <includehint>kpushbutton.h</includehint>
+    <includehint>kpushbutton.h</includehint>
+</includehints>
 </UI>

src/addslavesui.ui

@@ -159,8 +159,9 @@
     <slot access="protected">slotOkClicked()</slot>
 </slots>
 <layoutdefaults spacing="6" margin="11"/>
-<includes>
+<includehints>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <includehint>kurlrequester.h</includehint>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <includehint>kpushbutton.h</includehint>
-</includes>
+    <includehint>kpushbutton.h</includehint>
+</includehints>
 </UI>

src/altitemelement.h

@@ -24,7 +24,7 @@
 #include <tqlistview.h>
 #include <tdelistview.h>
 #include <tqstring.h>
-#include <tdeprocess.h>
+#include <kprocess.h>
 
 class Alternative;
 class AltController;

src/main.cpp

@@ -22,13 +22,13 @@
  ***************************************************************************/
 
 #include "tdealternatives.h"
-#include <tdeuniqueapplication.h>
+#include <kuniqueapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 
-TDEUniqueApplication *app = 0; // Global
+KUniqueApplication *app = 0; // Global
 
 static const char description[] =
 	I18N_NOOP("A TDE Manager for the Debian/Mandrake alternatives system");
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
 	
 	TDECmdLineArgs::init(argc, argv, &about);
 	TDECmdLineArgs::addCmdLineOptions( options );
-	TDEUniqueApplication rapp;
+	KUniqueApplication rapp;
 	app = &rapp;
 	TDEAlternatives *mainWin = 0;
 

src/mainwindow.ui

@@ -381,9 +381,12 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includes>
+<includehints>
-    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <includehint>tdelistview.h</includehint>
-    <include location="global" impldecl="in implementation">tdelistview.h</include>
+    <includehint>kcombobox.h</includehint>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <includehint>tdelistview.h</includehint>
-</includes>
+    <includehint>kpushbutton.h</includehint>
+    <includehint>kpushbutton.h</includehint>
+    <includehint>kpushbutton.h</includehint>
+</includehints>
 </UI>

src/propertieswindow.ui

@@ -99,8 +99,8 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includes>
+<includehints>
-    <include location="global" impldecl="in implementation">ktextedit.h</include>
+    <includehint>ktextedit.h</includehint>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <includehint>kpushbutton.h</includehint>
-</includes>
+</includehints>
 </UI>

translations/desktop_files/ru.po

@@ -1,39 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Andrei Stepanov <adem4ik@gmail.com>, 2025.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-01 18:21+0000\n"
-"PO-Revision-Date: 2025-06-28 04:16+0000\n"
-"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
-"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
-"projects/applications/tdealternatives-desktop-files/ru/>\n"
-"Language: ru\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.18.2\n"
-
-#. Name
-#: tdealternatives.desktop:13
-msgid "Alternatives"
-msgstr "Альтернативы"
-
-#. Comment
-#: tdealternatives.desktop:14
-msgid "TDEAlternatives - DPKG/RPM alternatives manager for TDE"
-msgstr "TDEAlternatives — менеджер альтернатив DPKG/RPM для TDE"
-
-#. Keywords
-#: tdealternatives.desktop:16
-msgid ""
-"applications;alternative;alternatives;tdealternative;tdealternatives;dpkg;"
-"rpm;debian;devuan;ubuntu;redhat;fedora;mageia"
-msgstr ""
-"applications;alternative;alternatives;tdealternative;tdealternatives;dpkg;rpm"
-";debian;devuan;ubuntu;redhat;fedora;mageia;приложения;альтернатива;альтернати"
-"вы"

translations/desktop_files/tdealternatives-desktops.pot

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-01 18:21+0000\n"
+"POT-Creation-Date: 2025-04-01 20:21+0000\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"