From d45bbd807bd598e9fceb86e2f185424f82bf8218 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 8 May 2016 16:24:25 -0600 Subject: [PATCH 1/3] Update translations from zanata. Fixes 1329908 --- po/de.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/po/de.po b/po/de.po index db6688d1..54f7eae4 100644 --- a/po/de.po +++ b/po/de.po @@ -21,6 +21,7 @@ # Verena Fuehrer , 2004 # FloH. , 2016. #zanata # Kevin Fenzi , 2016. #zanata +# Raphael Groner , 2016. #zanata msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -29,13 +30,13 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2016-04-24 12:15-0400\n" -"Last-Translator: FloH. \n" +"PO-Revision-Date: 2016-05-08 03:19-0400\n" +"Last-Translator: Raphael Groner \n" "Language-Team: German (http://www.transifex.com/projects/p/comps/language/de/" ")\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Zanata 3.8.3\n" +"X-Generator: Zanata 3.8.4\n" #: ../comps-f22.xml.in.h:1 ../comps-f23.xml.in.h:274 ../comps-f24.xml.in.h:287 #: ../comps-f25.xml.in.h:287 @@ -313,13 +314,12 @@ msgstr "Kritischer Pfad (LXQt)" #: ../comps-f22.xml.in.h:48 ../comps-f23.xml.in.h:46 ../comps-f24.xml.in.h:50 #: ../comps-f25.xml.in.h:50 -#, fuzzy msgid "" "A set of packages that provide the Critical Path functionality for the LXQt " "desktop" msgstr "" "Eine Sammlung von Paketen, welche die Funktionalität des kritischen Pfades " -"für die LXDE-Arbeitsumgebung bereitstellt." +"für die LXQt-Arbeitsumgebung bereitstellt." #: ../comps-f22.xml.in.h:49 ../comps-f23.xml.in.h:47 ../comps-f24.xml.in.h:51 #: ../comps-f25.xml.in.h:51 @@ -1077,18 +1077,18 @@ msgstr "Office-Suite für LXDE" #: ../comps-f22.xml.in.h:179 ../comps-f23.xml.in.h:177 #: ../comps-f24.xml.in.h:190 ../comps-f25.xml.in.h:190 msgid "Applications for the LXQt Desktop" -msgstr "Anwendungen für die LXDE-Benutzeroberfläche" +msgstr "Anwendungen für die LXQt-Benutzeroberfläche" #: ../comps-f22.xml.in.h:180 ../comps-f23.xml.in.h:178 #: ../comps-f24.xml.in.h:191 ../comps-f25.xml.in.h:191 msgid "A set of commonly used applications for the LXQt Desktop" msgstr "" -"Eine Sammlung häufig verwendeter Anwendungen für die LXDE-Benutzeroberfläche" +"Eine Sammlung häufig verwendeter Anwendungen für die LXQt-Benutzeroberfläche" #: ../comps-f22.xml.in.h:181 ../comps-f23.xml.in.h:179 #: ../comps-f24.xml.in.h:192 ../comps-f25.xml.in.h:192 msgid "LXQt" -msgstr "LXDE" +msgstr "LXQt" #: ../comps-f22.xml.in.h:182 ../comps-f23.xml.in.h:180 #: ../comps-f24.xml.in.h:193 ../comps-f25.xml.in.h:193 @@ -1097,24 +1097,24 @@ msgid "" "low hardware specifications like netbooks, mobile devices or older computers." "" msgstr "" -"LXDE ist eine schlanke X11-Arbeitsumgebung, welche für Rechner mit " +"LXQt ist eine schlanke X11-Arbeitsumgebung, welche für Rechner mit " "leistungsschwacher Hardware, wie Netbooks, mobile Geräte oder ältere Rechner " "entwickelt wurde." #: ../comps-f22.xml.in.h:183 ../comps-f23.xml.in.h:181 #: ../comps-f24.xml.in.h:194 ../comps-f25.xml.in.h:194 msgid "Multimedia support for LXQt" -msgstr "Multimedia-Unterstützung für LXDE" +msgstr "Multimedia-Unterstützung für LXQt" #: ../comps-f22.xml.in.h:184 ../comps-f23.xml.in.h:182 #: ../comps-f24.xml.in.h:195 ../comps-f25.xml.in.h:195 msgid "LXQt Office" -msgstr "LXDE-Office" +msgstr "LXQt-Office" #: ../comps-f22.xml.in.h:185 ../comps-f23.xml.in.h:183 #: ../comps-f24.xml.in.h:196 ../comps-f25.xml.in.h:196 msgid "Office suite for LXQt" -msgstr "Office-Suite für LXDE" +msgstr "Office-Suite für LXQt" #: ../comps-f22.xml.in.h:186 ../comps-f23.xml.in.h:184 #: ../comps-f24.xml.in.h:197 ../comps-f25.xml.in.h:197 ../comps-el5.xml.in.h:49 @@ -1883,7 +1883,7 @@ msgstr "LXDE-Benutzeroberfläche" #: ../comps-f22.xml.in.h:322 ../comps-f23.xml.in.h:324 #: ../comps-f24.xml.in.h:340 ../comps-f25.xml.in.h:340 msgid "LXQt Desktop" -msgstr "LXDE-Benutzeroberfläche" +msgstr "LXQt-Benutzeroberfläche" #: ../comps-f22.xml.in.h:323 ../comps-f23.xml.in.h:325 #: ../comps-f24.xml.in.h:341 ../comps-f25.xml.in.h:341 From 95668c6bc4521caeeb6761fe3729b05805246485 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Tue, 10 May 2016 10:56:58 +0200 Subject: [PATCH 2/3] Mate f24/25: use f24-backgrounds-extras-base --- comps-f24.xml.in | 2 +- comps-f25.xml.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/comps-f24.xml.in b/comps-f24.xml.in index e313cda1..45470b98 100644 --- a/comps-f24.xml.in +++ b/comps-f24.xml.in @@ -4345,7 +4345,7 @@ engrampa eom exaile - f23-backgrounds-extras-base + f24-backgrounds-extras-base f24-backgrounds-base f24-backgrounds-mate filezilla diff --git a/comps-f25.xml.in b/comps-f25.xml.in index 75bbb1eb..7eba65f2 100644 --- a/comps-f25.xml.in +++ b/comps-f25.xml.in @@ -4347,7 +4347,7 @@ engrampa eom exaile - f23-backgrounds-extras-base + f24-backgrounds-extras-base f24-backgrounds-base f24-backgrounds-mate filezilla From f5cf9b2f94450acfc6a0955b4283dc66f8f782ea Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 10 May 2016 21:12:40 -0500 Subject: [PATCH 3/3] gnome-desktop: Remove vinagre It's not in GNOME core and is superceded by Boxes, which is in core. Too late to be removing stuff for F24, so do it for F25 only. --- comps-f25.xml.in | 1 - 1 file changed, 1 deletion(-) diff --git a/comps-f25.xml.in b/comps-f25.xml.in index 7eba65f2..8e4c240a 100644 --- a/comps-f25.xml.in +++ b/comps-f25.xml.in @@ -2629,7 +2629,6 @@ sushi totem totem-nautilus - vinagre xdg-user-dirs-gtk yelp