summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--NEWS12
-rw-r--r--po/mageiawelcome.pot4
-rw-r--r--po/tr.po40
-rw-r--r--qml/mageiawelcome.py10
-rw-r--r--qml/mw-ui.qml4
-rwxr-xr-xusr/bin/mageiawelcome-launcher2
7 files changed, 54 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index 72905a5..a03f417 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
PACKAGE = mageiawelcome
-VERSION = 1.98
+VERSION = 1.97mga6
GITPATH = git://git.mageia.org/software/mageiawelcome
TEXT_FILES = Makefile
diff --git a/NEWS b/NEWS
index 51ac84d..d7cd1de 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,9 @@
-1.98
- Resize to maximal available space if smaller than default
- Update translations
+1.97mga6
+ Keep the old config file
-1.97
- Correction of a link in Updates
- Adjust icon application file
- Update translations
+1.96mga6
+ Correction of a link
+ Release for Mageia 6
1.96
Adapt again the window size to Gnome Wayland settings (mga#24200)
diff --git a/po/mageiawelcome.pot b/po/mageiawelcome.pot
index 1439c22..aaf163c 100644
--- a/po/mageiawelcome.pot
+++ b/po/mageiawelcome.pot
@@ -757,7 +757,7 @@ msgstr ""
#. Translate only if the link is to a specific page for your language
#: qml/mw-ui.qml:810
msgctxt "mw-ui|"
-msgid "https://wiki.mageia.org/en/Mageia_7_Release_Notes"
+msgid "https://wiki.mageia.org/en/Mageia_6_Release_Notes"
msgstr ""
#: qml/mw-ui.qml:811
@@ -784,7 +784,7 @@ msgstr ""
#. Translate only if the link is to a specific page for your language
#: qml/mw-ui.qml:817
msgctxt "mw-ui|"
-msgid "https://wiki.mageia.org/en/Mageia_7_Errata"
+msgid "https://wiki.mageia.org/en/Mageia_6_Errata"
msgstr ""
#: qml/mw-ui.qml:818
diff --git a/po/tr.po b/po/tr.po
index bd329f5..ddf8595 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,10 +8,15 @@
# tarakbumba <tarakbumba@gmail.com>, 2013-2016
# tarakbumba <tarakbumba@gmail.com>, 2013
# mahmut özcan <faradundamarti@yandex.com>, 2015
+<<<<<<< HEAD
+# Muha Aliss <muhaaliss@gmail.com>, 2019
+# tarakbumba <tarakbumba@gmail.com>, 2018
+=======
# mahmut özcan <faradundamarti@yandex.com>, 2015
# Muha Aliss <muhaaliss@gmail.com>, 2019
# Serdar Sağlam <teknomobil@msn.com>, 2019
# tarakbumba <tarakbumba@gmail.com>, 2013,2015,2018
+>>>>>>> master
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
@@ -42,6 +47,9 @@ msgstr ""
"Kullanıcıların ilk oturum açışlarında görüntülenen Mageia için bir karşılama "
"ekranı"
+msgid "mageiawelcome"
+msgstr ""
+
#: mageiawelcome.py:68
msgctxt "ConfList|"
msgid "<b>Congratulations!</b><BR />You are now running {}"
@@ -77,7 +85,11 @@ msgctxt "ConfList|"
msgid "You have no network connection"
msgstr "Ağ bağlantınız yok"
+<<<<<<< HEAD
+#: mageiawelcome.py:188
+=======
#: mageiawelcome.py:183
+>>>>>>> master
msgctxt "app|"
msgid "Welcome to Mageia"
msgstr "Mageia' ya hoş geldiniz"
@@ -401,7 +413,11 @@ msgstr "Mageia resmi depoları şunları içerir:"
#: qml/mw-ui.qml:137
msgctxt "mw-ui|"
msgid "core"
+<<<<<<< HEAD
+msgstr "core"
+=======
msgstr "çekirdek"
+>>>>>>> master
#: qml/mw-ui.qml:155
msgctxt "mw-ui|"
@@ -412,7 +428,11 @@ msgstr "- özgür-açık kaynaklı paketler"
#: qml/mw-ui.qml:168
msgctxt "mw-ui|"
msgid "nonfree"
+<<<<<<< HEAD
+msgstr "nonfree"
+=======
msgstr "özgür olmayan"
+>>>>>>> master
#: qml/mw-ui.qml:187
msgctxt "mw-ui|"
@@ -427,7 +447,7 @@ msgstr ""
#: qml/mw-ui.qml:200
msgctxt "mw-ui|"
msgid "tainted"
-msgstr ""
+msgstr "tainted"
#: qml/mw-ui.qml:218
msgctxt "mw-ui|"
@@ -549,13 +569,21 @@ msgstr "Güncelleme tavsiyeleri (en)"
#: qml/mw-ui.qml:345
msgctxt "mw-ui|"
msgid "(*) User password is needed"
+<<<<<<< HEAD
+msgstr "(*) Kullanıcı şifresi gerekli"
+=======
msgstr "(*) Kullanıcı parolası gerekli"
+>>>>>>> master
#. The button in the buttons bar, shortcut for Mageia Control Center
#: qml/mw-ui.qml:354
msgctxt "mw-ui|"
msgid "MCC"
+<<<<<<< HEAD
+msgstr "MCC"
+=======
msgstr "MDM"
+>>>>>>> master
#: qml/mw-ui.qml:363
msgctxt "mw-ui|"
@@ -563,7 +591,11 @@ msgid ""
"<b>Mageia Control Center</b> (aka drakconf) is a set of tools to help you "
"configure your system."
msgstr ""
+<<<<<<< HEAD
+"<b>Mageia Kontrol Merkezi</b> (aka drakconf), sisteminizi yapılandırmanıza "
+=======
"<b>Mageia Denetim Merkezi</b> (aka drakconf), sisteminizi yapılandırmanıza "
+>>>>>>> master
"yardımcı olacak bir araç setidir."
#: qml/mw-ui.qml:373
@@ -802,13 +834,17 @@ msgstr "https://wiki.mageia.org/en/Mageia_7_Release_Notes"
#: qml/mw-ui.qml:811
msgctxt "mw-ui|"
msgid "Forums"
-msgstr "Forumlar"
+msgstr "Forum"
#. Translate only if the link is to a specific page for your language
#: qml/mw-ui.qml:813
msgctxt "mw-ui|"
msgid "https://forums.mageia.org/en/"
+<<<<<<< HEAD
+msgstr "http://forum.mandriva-tr.org/"
+=======
msgstr "https://forums.mageia.org/en/"
+>>>>>>> master
#: qml/mw-ui.qml:814
msgctxt "mw-ui|"
diff --git a/qml/mageiawelcome.py b/qml/mageiawelcome.py
index 310d2e8..0af3612 100644
--- a/qml/mageiawelcome.py
+++ b/qml/mageiawelcome.py
@@ -47,10 +47,10 @@ class ConfList(QAbstractListModel):
if desktop == 'Gnome Wayland':
import gi
gi.require_version('Gdk', '3.0')
- from gi.repository.Gdk import Display
+ from gi.repository.Gdk import Screen
# pre-3.22, otherwise deprecated
- #factor = Gdk.Screen.get_default().get_monitor_scale_factor(0)
- self.screen_factor = Display.get_default().get_monitor(0).get_scale_factor()
+ self.screen_factor = Gdk.Screen.get_default().get_monitor_scale_factor(0)
+ #self.screen_factor = Display.get_default().get_monitor(0).get_scale_factor()
# Search active network connections
net = QNetworkConfigurationManager()
@@ -128,7 +128,7 @@ class Norun(QObject):
def __init__(self):
QObject.__init__(self)
self.home = os.getenv("HOME")
- self.conffile = self.home + "/.config/mageiawelcome/norun.flag"
+ self.conffile = self.home + "/.mageiawelcome/norun.flag"
@pyqtSlot(bool)
def setRunAtLaunch(self, checked):
@@ -137,7 +137,7 @@ class Norun(QObject):
if os.path.exists(self.conffile):
os.remove( self.conffile)
else:
- os.makedirs(self.home + "/.config/mageiawelcome", exist_ok=True)
+ os.makedirs(self.home + "/.mageiawelcome", exist_ok=True)
with open( self.conffile, 'w') :
pass
diff --git a/qml/mw-ui.qml b/qml/mw-ui.qml
index d2bf720..8a17530 100644
--- a/qml/mw-ui.qml
+++ b/qml/mw-ui.qml
@@ -808,14 +808,14 @@ This is a background process and you will be able to use your computer normally
Repeater{
model: [{'name': qsTr("Release notes"), 'url':
//: Translate only if the link is to a specific page for your language
- qsTr("https://wiki.mageia.org/en/Mageia_7_Release_Notes")},
+ qsTr("https://wiki.mageia.org/en/Mageia_6_Release_Notes")},
{'name': qsTr("Forums"),'url':
//: Translate only if the link is to a specific page for your language
qsTr("https://forums.mageia.org/en/")},
{'name': qsTr("Community Center"),'url': "https://www.mageia.org/community/"},
{'name': qsTr("Errata"), 'url':
//: Translate only if the link is to a specific page for your language
- qsTr("https://wiki.mageia.org/en/Mageia_7_Errata")},
+ qsTr("https://wiki.mageia.org/en/Mageia_6_Errata")},
{'name': qsTr("Wiki"), 'url':
//: Translate only if the link is to a specific page for your language
qsTr("https://wiki.mageia.org/en/Documentation")},
diff --git a/usr/bin/mageiawelcome-launcher b/usr/bin/mageiawelcome-launcher
index 6f84007..4a45237 100755
--- a/usr/bin/mageiawelcome-launcher
+++ b/usr/bin/mageiawelcome-launcher
@@ -3,6 +3,6 @@
import os
home = os.getenv("HOME")
-if (not os.path.exists(home + "/.config/mageiawelcome/norun.flag")):
+if (not os.path.exists(home + "/mageiawelcome/norun.flag")):
os.system("mageiawelcome")
generated by cgit v1.2.1 (git 2.21.0) at 2024-06-05 21:43:31 +0000