Branch: master

8a5adc44 2014-09-17 15:25:22 François Andriot
RPM package: update tde-i18n
A redhat/tde-i18n/tde-i18n-14.0.0-updates.patch
M redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch
M redhat/tde-i18n/tde-i18n-14.0.0.spec
R redhat/tde-i18n/tde-i18n-14.0.0-fr-openterminalhere.patch
R redhat/tde-i18n/tde-i18n-14.0.0-fr-tdesu_no_ignore_button.patch
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch b/redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch
index 07691ab..447f09b 100644
--- a/redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch
+++ b/redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch
@@ -1,6 +1,6 @@
-diff -Nuar fr.p2/messages/tdebase/kcmbackground.po fr.p3/messages/tdebase/kcmbackground.po
---- fr.p2/messages/tdebase/kcmbackground.po	2014-06-07 15:36:34.455347661 +0200
-+++ fr.p3/messages/tdebase/kcmbackground.po	2014-06-07 16:44:15.728310955 +0200
+diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kcmbackground.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kcmbackground.po
+--- tde-i18n/tde-i18n-fr/messages/tdebase/kcmbackground.po.ori	2014-06-07 15:36:34.455347661 +0200
++++ tde-i18n/tde-i18n-fr/messages/tdebase/kcmbackground.po	2014-06-07 16:44:15.728310955 +0200
 @@ -920,3 +920,9 @@
  #, no-c-format
  msgid "Move &Up"
@@ -11,9 +11,9 @@
 +
 +msgid "Enables a smooth fading effect when changing background image."
 +msgstr "Activer un effet de fondu lors du changement de fond d'��cran."
-diff -Nuar fr.p2/messages/tdebase/kcmenergy.po fr.p3/messages/tdebase/kcmenergy.po
---- fr.p2/messages/tdebase/kcmenergy.po	2014-06-07 15:36:34.455347661 +0200
-+++ fr.p3/messages/tdebase/kcmenergy.po	2014-06-07 16:44:21.892169693 +0200
+diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kcmenergy.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kcmenergy.po
+--- tde-i18n/tde-i18n-fr/messages/tdebase/kcmenergy.po.ori	2014-06-07 15:36:34.455347661 +0200
++++ tde-i18n/tde-i18n-fr/messages/tdebase/kcmenergy.po	2014-06-07 16:44:21.892169693 +0200
 @@ -102,3 +102,10 @@
  "Choisissez la p��riode d'inactivit�� apr��s laquelle l'affichage doit ��tre ��teint. "
  "Ceci est le plus haut niveau d'��conomie d'��nergie qui puisse ��tre utilis�� "
@@ -25,9 +25,9 @@
 +msgid "Configure KPowersave..."
 +msgstr "Configurer KPowersave..."
 +
-diff -Nuar fr.p2/messages/tdebase/kcmkonq.po fr.p3/messages/tdebase/kcmkonq.po
---- fr.p2/messages/tdebase/kcmkonq.po	2014-06-07 15:52:30.603936867 +0200
-+++ fr.p3/messages/tdebase/kcmkonq.po	2014-06-07 16:44:27.234047255 +0200
+diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kcmkonq.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kcmkonq.po
+--- tde-i18n/tde-i18n-fr/messages/tdebase/kcmkonq.po.ori	2014-06-07 15:52:30.603936867 +0200
++++ tde-i18n/tde-i18n-fr/messages/tdebase/kcmkonq.po	2014-06-07 16:44:27.234047255 +0200
 @@ -877,3 +877,43 @@
  #: rootopts.cpp:276
  msgid "Confirmation Required"
@@ -72,9 +72,9 @@
 +
 +msgid "&Show free space overlay on device icons"
 +msgstr "&Afficher l'espace libre sur les ic��nes"
-diff -Nuar fr.p2/messages/tdebase/kcmscreensaver.po fr.p3/messages/tdebase/kcmscreensaver.po
---- fr.p2/messages/tdebase/kcmscreensaver.po	2014-06-07 15:53:13.977782717 +0200
-+++ fr.p3/messages/tdebase/kcmscreensaver.po	2014-06-07 16:44:38.180796311 +0200
+diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po
+--- tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po.ori	2014-06-07 15:53:13.977782717 +0200
++++ tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po	2014-06-07 16:44:38.180796311 +0200
 @@ -362,3 +362,9 @@
  
  msgid "Hide all active windows from the screen saver and use the desktop background as the screen saver input."
@@ -85,9 +85,9 @@
 +
 +msgid "Makes the unlock dialog box vibrate when entering an incorrect password."
 +msgstr "Faire vibrer la fen��tre de d��verrouillage lorsqu'un mauvais mot de passe est saisi."
-diff -Nuar fr.p2/messages/tdebase/kdesktop.po fr.p3/messages/tdebase/kdesktop.po
---- fr.p2/messages/tdebase/kdesktop.po	2014-06-07 15:49:50.020212889 +0200
-+++ fr.p3/messages/tdebase/kdesktop.po	2014-06-07 16:44:58.546329306 +0200
+diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po
+--- tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po.ori	2014-06-07 15:49:50.020212889 +0200
++++ tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po	2014-06-07 16:44:58.546329306 +0200
 @@ -250,6 +250,10 @@
  msgid "Open Terminal Here..."
  msgstr "Ouvrir un Terminal..."
@@ -99,9 +99,9 @@
  #: krootwm.cc:137
  msgid "Configure Desktop..."
  msgstr "Configurer le bureau..."
-diff -Nuar fr.p2/messages/tdebase/kicker.po fr.p3/messages/tdebase/kicker.po
---- fr.p2/messages/tdebase/kicker.po	2014-06-07 16:41:47.636699669 +0200
-+++ fr.p3/messages/tdebase/kicker.po	2014-06-07 16:45:04.820185402 +0200
+diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kicker.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kicker.po
+--- tde-i18n/tde-i18n-fr/messages/tdebase/kicker.po.ori	2014-06-07 16:41:47.636699669 +0200
++++ tde-i18n/tde-i18n-fr/messages/tdebase/kicker.po	2014-06-07 16:45:04.820185402 +0200
 @@ -889,6 +889,18 @@
  msgid "My Documents"
  msgstr "Mes Documents"
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-fr-openterminalhere.patch b/redhat/tde-i18n/tde-i18n-14.0.0-fr-openterminalhere.patch
deleted file mode 100644
index 86c1ab9..0000000
--- a/redhat/tde-i18n/tde-i18n-14.0.0-fr-openterminalhere.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -rcb kde-i18n-fr-3.5.10.ori/messages/kdebase/kdesktop.po kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po
-*** tde-i18n-fr-3.5.10.ori/messages/tdebase/kdesktop.po	2011-07-21 10:02:12.261100210 +0200
---- tde-i18n-fr-3.5.10/messages/tdebase/kdesktop.po	2011-07-21 10:05:55.365975529 +0200
-***************
-*** 246,251 ****
---- 246,255 ----
-  msgid "Run Command..."
-  msgstr "Ex��cuter une commande..."
-  
-+ #: krootwm.cc:135 (Trinity Specific)
-+ msgid "Open Terminal..."
-+ msgstr "Ouvrir un Terminal..."
-+ 
-  #: krootwm.cc:137
-  msgid "Configure Desktop..."
-  msgstr "Configurer le bureau..."
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-fr-tdesu_no_ignore_button.patch b/redhat/tde-i18n/tde-i18n-14.0.0-fr-tdesu_no_ignore_button.patch
deleted file mode 100644
index 4aed514..0000000
--- a/redhat/tde-i18n/tde-i18n-14.0.0-fr-tdesu_no_ignore_button.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -rcb kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesu.po kde-i18n-fr-3.5.10/messages/kdebase/kdesu.po
-*** kde-i18n-fr-3.5.10.ORI/messages/tdebase/tdesu.po	2010-12-19 01:32:05.649657741 +0100
---- kde-i18n-fr-3.5.10/messages/tdebase/tdesu.po	2010-12-19 01:33:50.416539931 +0100
-***************
-*** 132,151 ****
-  #: sudlg.cpp:36
-  msgid ""
-  "The action you requested needs root privileges. Please enter root's password "
-! "below or click Ignore to continue with your current privileges."
-  msgstr ""
-  "L'action requise n��cessite les droits du superutilisateur. Veuillez saisir "
-! "ci-dessous le mot de passe du superutilisateur ou cliquez sur ����Ignorer���� pour "
-! "continuer avec vos droits actuels."
-  
-  #: sudlg.cpp:40
-  msgid ""
-  "The action you requested needs additional privileges. Please enter the password "
-! "for \"%1\" below or click Ignore to continue with your current privileges."
-  msgstr ""
-  "L'action requise n��cessite des droits suppl��mentaires. Veuillez saisir "
-! "ci-dessous le mot de passe de ����%1���� ou cliquez sur ����Ignorer���� pour continuer "
-! "avec vos droits actuels."
-  
-  #: sudlg.cpp:48
-  msgid "&Ignore"
---- 132,149 ----
-  #: sudlg.cpp:36
-  msgid ""
-  "The action you requested needs root privileges. Please enter root's password "
-! "below."
-  msgstr ""
-  "L'action requise n��cessite les droits du superutilisateur. Veuillez saisir "
-! "ci-dessous le mot de passe du superutilisateur."
-  
-  #: sudlg.cpp:40
-  msgid ""
-  "The action you requested needs additional privileges. Please enter the password "
-! "for \"%1\" below."
-  msgstr ""
-  "L'action requise n��cessite des droits suppl��mentaires. Veuillez saisir "
-! "ci-dessous le mot de passe de ����%1����."
-  
-  #: sudlg.cpp:48
-  msgid "&Ignore"
-Seulement dans kde-i18n-fr-3.5.10/messages/kdebase: kdesu.po~
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-updates.patch b/redhat/tde-i18n/tde-i18n-14.0.0-updates.patch
new file mode 100644
index 0000000..2113cb2
--- /dev/null
+++ b/redhat/tde-i18n/tde-i18n-14.0.0-updates.patch
@@ -0,0 +1,125 @@
+--- trinity-tde-i18n-14.0.0~pre253+9fe98288/tde-i18n-fr/messages/tdelibs/tdelibs.po.orig	2014-08-22 22:50:18.774213510 +0200
++++ trinity-tde-i18n-14.0.0~pre253+9fe98288/tde-i18n-fr/messages/tdelibs/tdelibs.po	2014-08-22 23:04:26.927794495 +0200
+@@ -5557,24 +5557,34 @@
+ 
+ #: tdeui/tdeabouttde.cpp:34
+ msgid ""
+-"The <b>Trinity Desktop Environment</b> is a fork of the "
++"The <b>Trinity Desktop Environment</b> was born as a fork of the "
+ "K Desktop Environment version 3.5, which was originally written by the KDE Team, "
+ "a world-wide network of software engineers committed to <a "
+ "href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
+-"development.<br><br>No single group, company or organization controls the "
++"development. The name <i>Trinity</i> was chosen because the word means "
++"<i>Three</i> as in <i>continuation of KDE 3</i>.<br>Since then, TDE has evolved to be "
++"an indipendent and standalone computer desktop environment project. The developers "
++"have molded the code to its own identity without giving up on the efficiency, "
++"productivity and traditional user interface experience characteristic of the "
++"original KDE 3 series.<br><br>No single group, company or organization controls the "
+ "Trinity source code. Everyone is welcome to contribute to Trinity.<br><br>Visit <A "
+-"HREF=\"http://www.trinitydesktop.org/\">http://www.trinitydesktop.org</A> for more information "
+-"about Trinity, and <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
++"HREF=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</A> for more information "
++"about Trinity, and <A HREF=\"http://www.kde.org\">http://www.kde.org</A> "
+ "for more information on the KDE project. "
+ msgstr ""
+-"L'<b>Environnement Bureautique Trinity</b> est un clone de l'environnement "
+-"TDE version 3.5, originellement ��crit par l'��quipe KDE, des informaticiens "
+-"du monde entier travaillant sur Internet au d��veloppement de <a "
+-"href=\"http://www.gnu.org/philosophy/free-sw.fr.html\">logiciels libres</a>."
+-"<br><br>Aucune soci��t�� ni organisation ne contr��le le code source de Trinity, et chacun "
+-"est invit�� �� y contribuer.<br><br>Visitez <A HREF=\"http://www.trinitydesktop.org/\">"
+-"http://www.trinitydesktop.org</A> pour plus d'informations sur Trinity, et <a "
+-"href=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> "
++"L'<b>Environnement Bureautique Trinity</b> est n�� par un fork de "
++"l'environnement KDE version 3.5, qui fut initialement cr���� par l'��quipe KDE, "
++"des informaticiens du monde entier travaillant sur Internet au "
++"d��veloppement de <a href=\"http://www.gnu.org/philosophy/free-sw.fr.html\">"
++"logiciels libres</a>. Le nom <i>Trinity</i> a ��t�� choisi car ce mot signifie "
++"<i>trois</i>, indiquant la <i>continuit�� de KDE 3</i>.<br>Depuis, Trinity a ��volu�� "
++"pour devenir un environnement de bureau ind��pendant. Les d��veloppeurs ont "
++"fa��onn�� le code pour lui donner une identit�� sans sacrifier les performances, "
++"la productivit��, et l'exp��rience de l'interface utilisateur classique de "
++"KDE 3.<br>Aucune soci��t�� ni organisation ne contr��le le code source de Trinity, "
++"et chacun est invit�� �� y contribuer.<br><br>Visitez <a "
++"HREF=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</A> pour plus d'informations "
++"sur Trinity, et <A HREF=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> "
+ "pour plus d'informations sur le projet KDE."
+ 
+ #: tdeui/tdeabouttde.cpp:43
+@@ -5583,7 +5593,7 @@
+ "do so. However, you - the user - must tell us when "
+ "something does not work as expected or could be done better.<br><br>"
+ "The Trinity Desktop Environment has a bug tracking system. Visit "
+-"<A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> or "
++"<A HREF=\"http://bugs.pearsoncomputing.net\">http://bugs.pearsoncomputing.net</A> or "
+ "use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.<br><br>"
+ "If you have a suggestion for improvement then you are welcome to use "
+ "the bug tracking system to register your wish. Make sure you use the "
+@@ -5593,9 +5603,9 @@
+ "faire. Cependant, vous - l'utilisateur(trice) - devez nous signaler ce qui ne "
+ "fonctionne pas correctement ou pourrait ��tre perfectionn��.<br><br>"
+ "L'Environnement de Bureau Trinity poss��de un syst��me de suivi des bogues. Allez "
+-"sur <A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> "
+-"ou utilisez la bo��te de dialogue ����Rapport de bogue���� du menu ����Aide���� pour signaler les "
+-"erreurs.<br><br>Si vous voulez sugg��rer une am��lioration, vous ��tes invit��(e) �� utiliser le "
++"sur <A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net/</A> "
++"ou utilisez la bo��te de dialogue ����Rapport de bogue���� du menu ����Aide���� pour signaler les erreurs.<br><br>"
++"Si vous voulez sugg��rer une am��lioration, vous ��tes invit��(e) �� utiliser le "
+ "syst��me de suivi des bogues pour enregistrer votre souhait. Assurez-vous "
+ "d'avoir utilis�� l'option ����Souhait���� (wish)."
+ 
+@@ -5606,12 +5616,13 @@
+ "program interfaces. You can provide graphics, themes, sounds, and "
+ "improved documentation. You decide!"
+ "<br><br>"
+-"Visit "
+-"<A HREF=\"http://www.trinitydesktop.org/jobs/\">http://www.trinitydesktop.org/jobs/</A> "
+-"for information on some projects in which you can participate."
++"Visit the "
++"<A HREF=\"http://www.trinitydesktop.org/jobs\">TDE Development</A> "
++"webpage to find out how you can contribute or mail us using one of the "
++"available <A HREF=\"http://www.trinitydesktop.org/mailinglist.php\">mailing lists</A>."
+ "<br><br>"
+ "If you need more information or documentation, then a visit to "
+-"<A HREF=\"http://www.trinitydesktop.org/docs/\">http://www.trinitydesktop.org/docs/</A> "
++"<A HREF=\"http://www.trinitydesktop.org/docs\">http://www.trinitydesktop.org/docs</A> "
+ "will provide you with what you need."
+ msgstr ""
+ "Il n'est pas n��cessaire d'��tre programmeur pour ��tre membre de l'��quipe de Trinity. "
+@@ -5629,23 +5640,21 @@
+ 
+ #: tdeui/tdeabouttde.cpp:67
 ** Diff limit reached (max: 250 lines) **
f75d43fd 2014-09-17 15:26:42 François Andriot
Fix 3.5.13.2 qt3 in makefile
M redhat/Makefile.v3.5.13-sru
 ** Diff limit reached (max: 250 lines) **
3d08f62f 2014-09-17 15:29:18 François Andriot
RPM Packaging: update R14 packages
M redhat/applications/adept/adept-14.0.0.spec
M redhat/applications/fusion-icon/fusion-icon.spec
M redhat/applications/kbarcode/kbarcode-14.0.0.spec
M redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
M redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
M redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
M redhat/packages.el7
M redhat/tdeartwork/tdeartwork-14.0.0.spec
M redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch
 ** Diff limit reached (max: 250 lines) **
24d35ee3 2014-09-17 15:44:00 François Andriot
update tqca
A redhat/build/jpegint.h.el5
A redhat/build/jpegint.h.el6
A redhat/tdebase/tdebase-14.0.0-mandriva_use_drakclock.patch
M redhat/dependencies/tqca/tqca-3.5.13.2.spec
R redhat/dependencies/tqca/qca-1.0-mach.patch
R redhat/dependencies/tqca/tqca-1.0-fix_qt3_detection.patch
R redhat/extras/jpegint.h.el5
R redhat/extras/jpegint.h.el6
 ** Diff limit reached (max: 250 lines) **
b630ff2d 2014-09-17 15:51:07 François Andriot
RPM Packacing: update qca-tls
M redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
R redhat/dependencies/tqca-tls/qca-tls-1.0-mach.patch
R redhat/dependencies/tqca-tls/qca-tls-1.0-ossl098.patch
R redhat/dependencies/tqca-tls/qca-tls-1.0-ossl10.patch
R redhat/dependencies/tqca-tls/tqca-tls-qt3.patch
 ** Diff limit reached (max: 250 lines) **
27561d83 2014-09-17 16:25:29 François Andriot
Update Akode
M redhat/extras/akode/akode-14.0.0.spec
R redhat/extras/akode/akode-14.0.0-ftbfs.patch
R redhat/extras/akode/akode-2.0.2-fix_ffmpeg_include.patch
R redhat/extras/akode/akode-2.0.2-fix_ftbfs.patch
R redhat/extras/akode/akode-2.0.2-flac113-portable.patch
R redhat/extras/akode/akode-2.0.2-gcc43.patch
R redhat/extras/akode/akode-2.0.2-multilib.patch
R redhat/extras/akode/akode-2.0.2.tar.bz2
R redhat/extras/akode/akode-autotools.patch
R redhat/extras/akode/akode-pulseaudio.patch
 ** Diff limit reached (max: 250 lines) **
113b3c85 2014-09-18 13:19:07 François Andriot
add fusion icon
A redhat/applications/fusion-icon/fusion-icon-14.0.0.spec
 ** Diff limit reached (max: 250 lines) **
e5f968aa 2014-09-18 13:19:20 François Andriot
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
M debian/lenny/tdebase/debian/tdebase-data-trinity.install
M debian/squeeze/tdebase/debian/tdebase-data-trinity.install
M ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
 ** Diff limit reached (max: 250 lines) **