summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitmodules3
-rw-r--r--CMakeL10n.txt3
-rw-r--r--CMakeLists.txt9
m---------admin0
m---------cmake0
-rw-r--r--knetworkconf/knetworkconf/tdeselectdistrodlg.ui6
-rw-r--r--ksysv/pathconfig.ui10
-rw-r--r--translations/desktop_files/kcron.desktop/pt_BR.po15
-rw-r--r--translations/desktop_files/kdat.desktop/pt_BR.po15
-rw-r--r--translations/desktop_files/kpackage.desktop/pt_BR.po16
-rw-r--r--translations/desktop_files/kpackage.desktop/tr.po16
-rw-r--r--translations/desktop_files/ksysv-desktops/pt_BR.po15
-rw-r--r--translations/desktop_files/kuser.desktop/pt_BR.po15
13 files changed, 57 insertions, 66 deletions
diff --git a/.gitmodules b/.gitmodules
index bdec8fc..934def7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule "admin"]
path = admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
- path = cmake
- url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index 509e50e..59e062a 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -9,12 +9,11 @@
#
#################################################
-cmake_minimum_required( VERSION 2.8 )
+cmake_minimum_required( VERSION 3.1 )
##### include our cmake modules #################
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEL10n )
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 586fbeb..af8cd18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,13 +6,12 @@
#
###############################################
-cmake_minimum_required( VERSION 2.8.12 )
+cmake_minimum_required( VERSION 3.1 )
#### general package setup
project( tdeadmin )
-set( VERSION R14.0.10 )
#### include essential cmake modules
@@ -28,10 +27,14 @@ include( CheckCXXSourceCompiles )
#### include our cmake modules
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros )
+##### set version number ########################
+
+tde_set_project_version( )
+
+
##### setup install paths
include( TDESetupPaths )
diff --git a/admin b/admin
-Subproject 709ea75c2c6bc299ad0469b9f5e0fb27dd300f8
+Subproject a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3
diff --git a/cmake b/cmake
deleted file mode 160000
-Subproject 356a15955cd717c20e4f8de29f7c36a6f38883e
diff --git a/knetworkconf/knetworkconf/tdeselectdistrodlg.ui b/knetworkconf/knetworkconf/tdeselectdistrodlg.ui
index daa59b3..8dcb8d8 100644
--- a/knetworkconf/knetworkconf/tdeselectdistrodlg.ui
+++ b/knetworkconf/knetworkconf/tdeselectdistrodlg.ui
@@ -37,9 +37,6 @@
<property name="text">
<string>&amp;OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -54,9 +51,6 @@
<property name="text">
<string>&amp;Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
diff --git a/ksysv/pathconfig.ui b/ksysv/pathconfig.ui
index 0273f2b..adc0988 100644
--- a/ksysv/pathconfig.ui
+++ b/ksysv/pathconfig.ui
@@ -278,8 +278,9 @@
<tabstop>mBrowseRunlevel</tabstop>
</tabstops>
<includes>
- <include location="global" impldecl="in declaration">tdelocale.h</include>
<include location="global" impldecl="in declaration">kdialog.h</include>
+ <include location="global" impldecl="in declaration">tdelocale.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
</includes>
<Q_SLOTS>
<slot access="protected">browseServices()</slot>
@@ -287,11 +288,4 @@
<slot access="protected">slotChanged()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
-</includehints>
-<includes>
- <include location="global" impldecl="in implementation">klineedit.h</include>
-</includes>
</UI>
diff --git a/translations/desktop_files/kcron.desktop/pt_BR.po b/translations/desktop_files/kcron.desktop/pt_BR.po
index bcae495..10c4b8b 100644
--- a/translations/desktop_files/kcron.desktop/pt_BR.po
+++ b/translations/desktop_files/kcron.desktop/pt_BR.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-31 18:05+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: 2021-12-18 00:01+0000\n"
+"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdeadmin/kcron-kcrondesktop/pt_BR/>\n"
"Language: pt_BR\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.9.1\n"
#. Name
#: kcron.desktop:6
msgid "KCron"
-msgstr ""
+msgstr "KCron"
#. GenericName
#: kcron.desktop:7
diff --git a/translations/desktop_files/kdat.desktop/pt_BR.po b/translations/desktop_files/kdat.desktop/pt_BR.po
index 556350b..c6cd6d8 100644
--- a/translations/desktop_files/kdat.desktop/pt_BR.po
+++ b/translations/desktop_files/kdat.desktop/pt_BR.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-31 18:07+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: 2021-12-18 00:01+0000\n"
+"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdeadmin/kdat-kdatdesktop/pt_BR/>\n"
"Language: pt_BR\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.9.1\n"
#. Name
#: kdat.desktop:2
msgid "KDat"
-msgstr ""
+msgstr "KDat"
#. GenericName
#: kdat.desktop:3
diff --git a/translations/desktop_files/kpackage.desktop/pt_BR.po b/translations/desktop_files/kpackage.desktop/pt_BR.po
index 591a740..7be2e01 100644
--- a/translations/desktop_files/kpackage.desktop/pt_BR.po
+++ b/translations/desktop_files/kpackage.desktop/pt_BR.po
@@ -1,26 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-31 18:16+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: 2021-12-18 00:01+0000\n"
+"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdeadmin/kpackage-kpackagedesktop/pt_BR/>\n"
"Language: pt_BR\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.9.1\n"
#. Name
#: kpackage.desktop:2
-#, fuzzy
msgid "KPackage"
-msgstr "Gerenciador de Pacotes"
+msgstr "KPackage"
#. GenericName
#: kpackage.desktop:4
diff --git a/translations/desktop_files/kpackage.desktop/tr.po b/translations/desktop_files/kpackage.desktop/tr.po
index d24efad..e4bfa3d 100644
--- a/translations/desktop_files/kpackage.desktop/tr.po
+++ b/translations/desktop_files/kpackage.desktop/tr.po
@@ -1,26 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Mehmet Dokuz <madanadam@gmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-31 18:16+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: 2021-04-12 19:00+0000\n"
+"Last-Translator: Mehmet Dokuz <madanadam@gmail.com>\n"
+"Language-Team: Turkish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdeadmin/kpackage-kpackagedesktop/tr/>\n"
"Language: tr\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.5.3\n"
#. Name
#: kpackage.desktop:2
-#, fuzzy
msgid "KPackage"
-msgstr "Paket Yöneticisi"
+msgstr "KPaket"
#. GenericName
#: kpackage.desktop:4
diff --git a/translations/desktop_files/ksysv-desktops/pt_BR.po b/translations/desktop_files/ksysv-desktops/pt_BR.po
index 4cbacec..87dc0a6 100644
--- a/translations/desktop_files/ksysv-desktops/pt_BR.po
+++ b/translations/desktop_files/ksysv-desktops/pt_BR.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-31 18:21+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: 2021-12-18 00:01+0000\n"
+"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdeadmin/ksysv-desktop-files/pt_BR/>\n"
"Language: pt_BR\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.9.1\n"
#. Name
#: ksysv.desktop:2
msgid "KSysV"
-msgstr ""
+msgstr "KSysV"
#. GenericName
#: ksysv.desktop:4
diff --git a/translations/desktop_files/kuser.desktop/pt_BR.po b/translations/desktop_files/kuser.desktop/pt_BR.po
index 9538045..b844d32 100644
--- a/translations/desktop_files/kuser.desktop/pt_BR.po
+++ b/translations/desktop_files/kuser.desktop/pt_BR.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-31 19:17+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: 2021-12-18 00:01+0000\n"
+"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdeadmin/kuser-kuserdesktop/pt_BR/>\n"
"Language: pt_BR\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.9.1\n"
#. Name
#: kuser.desktop:2
msgid "KUser"
-msgstr ""
+msgstr "KUser"
#. GenericName
#: kuser.desktop:3
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 02:44:47 +0000