From 332f640f1ca94b4d49d1ac81124a60f490ddb30b Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Apr 25 2017 15:41:18 +0000 Subject: [PATCH 1/3] Spins: Cinnamon: Add dnfdragora to Utilities --- diff --git a/spins.fedoraproject.org/data/content/cinnamon/index.html b/spins.fedoraproject.org/data/content/cinnamon/index.html index dd622de..21449f9 100644 --- a/spins.fedoraproject.org/data/content/cinnamon/index.html +++ b/spins.fedoraproject.org/data/content/cinnamon/index.html @@ -75,6 +75,11 @@

${Markup(_('Utilities & Configuration'))}

+ dnfdragora +

${_('dnfdragora')}

+

${_('Need to install additional packages? Want keep your system up-to-date? dnfdragora gives you an easy and safe way to get it done in graphical or terminal (text-mode) environments.')}

+
+
Gnome Terminal

${_('GNOME Terminal')}

${_('Fedora Cinnamon ships Gnome Terminal, the gateway to the real power of any UNIX/Linux machine.')}

diff --git a/spins.fedoraproject.org/po/LINGUAS b/spins.fedoraproject.org/po/LINGUAS index adee647..208d5e5 100644 --- a/spins.fedoraproject.org/po/LINGUAS +++ b/spins.fedoraproject.org/po/LINGUAS @@ -29,6 +29,7 @@ it ja ka ko +lt lv ml mr diff --git a/spins.fedoraproject.org/po/spins.fedoraproject.org.pot b/spins.fedoraproject.org/po/spins.fedoraproject.org.pot index 3ffe75c..12245bc 100644 --- a/spins.fedoraproject.org/po/spins.fedoraproject.org.pot +++ b/spins.fedoraproject.org/po/spins.fedoraproject.org.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-04-01 23:54+0200\n" +"POT-Creation-Date: 2017-04-22 00:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -260,16 +260,15 @@ msgstr "" #: data/content/prerelease.html:50 data/content/prerelease.html:54 #: data/content/prerelease.html:72 data/content/prerelease.html:76 -#: data/content/prerelease.html:98 data/content/prerelease.html:232 -#: data/content/prerelease.html:236 data/content/prerelease.html:254 -#: data/content/prerelease.html:258 +#: data/content/prerelease.html:98 data/content/prerelease.html:120 +#: data/content/prerelease.html:232 data/content/prerelease.html:236 +#: data/content/prerelease.html:254 data/content/prerelease.html:258 #, python-format msgid "%s GB ISO Image" msgstr "" #: data/content/prerelease.html:94 data/content/prerelease.html:116 -#: data/content/prerelease.html:120 data/content/prerelease.html:184 -#: data/content/prerelease.html:188 +#: data/content/prerelease.html:184 data/content/prerelease.html:188 #, python-format msgid "%s MB ISO Image" msgstr "" @@ -368,52 +367,48 @@ msgid "" msgstr "" #: data/content/verify.html:52 -msgid "Fedora 26" +msgid "Fedora 27" msgstr "" #: data/content/verify.html:53 -msgid "Fedora 26 secondary arches (AArch64, PPC64, PPC64le, s390 and s390x)" +msgid "Fedora 26" msgstr "" #: data/content/verify.html:54 -msgid "Fedora 25" +msgid "Fedora 26 secondary arches (AArch64, PPC64, PPC64le, s390 and s390x)" msgstr "" #: data/content/verify.html:55 -msgid "Fedora 25 secondary arches (AArch64, PPC64, PPC64le, s390 and s390x)" +msgid "Fedora 25" msgstr "" #: data/content/verify.html:56 -msgid "Fedora 24" +msgid "Fedora 25 secondary arches (AArch64, PPC64, PPC64le, s390 and s390x)" msgstr "" #: data/content/verify.html:57 -msgid "Fedora 24 secondary arches (AArch64, PPC64, PPC64le, s390 and s390x)" +msgid "Fedora 24" msgstr "" #: data/content/verify.html:58 -msgid "Fedora 23" -msgstr "" - -#: data/content/verify.html:59 -msgid "Fedora 23 secondary arches (AArch64, PPC64, PPC64le, s390 and s390x)" +msgid "Fedora 24 secondary arches (AArch64, PPC64, PPC64le, s390 and s390x)" msgstr "" -#: data/content/verify.html:61 +#: data/content/verify.html:60 msgid "" "Finally, now that the CHECKSUM file has been verified, check that the " "image's checksum matches:" msgstr "" -#: data/content/verify.html:63 +#: data/content/verify.html:62 msgid "If the output states that the file is valid, then it's ready to use!" msgstr "" -#: data/content/verify.html:64 +#: data/content/verify.html:63 msgid "How do I verify my downloaded image on another operating system?" msgstr "" -#: data/content/verify.html:65 +#: data/content/verify.html:64 msgid "Read these instructions to validate your image." msgstr "" @@ -436,7 +431,7 @@ msgid "" "provides the option to quickly try and install this desktop." msgstr "" -#: data/content/cinnamon/index.html:33 data/content/cinnamon/index.html:137 +#: data/content/cinnamon/index.html:33 data/content/cinnamon/index.html:142 #: data/content/kde/index.html:34 data/content/kde/index.html:171 #: data/content/lxde/index.html:33 data/content/lxde/index.html:137 #: data/content/mate-compiz/index.html:33 @@ -500,85 +495,96 @@ msgid "Utilities & Configuration" msgstr "" #: data/content/cinnamon/index.html:79 -msgid "GNOME Terminal" +msgid "dnfdragora" msgstr "" #: data/content/cinnamon/index.html:80 msgid "" +"Need to install additional packages? Want keep your system up-to-date? " +"dnfdragora gives you an easy and safe way to get it done in graphical or " +"terminal (text-mode) environments." +msgstr "" + +#: data/content/cinnamon/index.html:84 +msgid "GNOME Terminal" +msgstr "" + +#: data/content/cinnamon/index.html:85 +msgid "" "Fedora Cinnamon ships Gnome Terminal, the gateway to the real power of " "any UNIX/Linux machine." msgstr "" -#: data/content/cinnamon/index.html:84 +#: data/content/cinnamon/index.html:89 msgid "Cinnamon Settings" msgstr "" -#: data/content/cinnamon/index.html:85 data/content/kde/index.html:86 +#: data/content/cinnamon/index.html:90 data/content/kde/index.html:86 #: data/content/mate-compiz/index.html:85 data/content/xfce/index.html:80 msgid "" "No need to know cryptic commands and config files. Click the options you " "like to change and choose the settings that make you happy." msgstr "" -#: data/content/cinnamon/index.html:89 data/content/kde/index.html:90 +#: data/content/cinnamon/index.html:94 data/content/kde/index.html:90 #: data/content/lxde/index.html:89 data/content/mate-compiz/index.html:89 #: data/content/xfce/index.html:84 msgid "Office & Productivity Suite" msgstr "" -#: data/content/cinnamon/index.html:92 data/content/mate-compiz/index.html:92 +#: data/content/cinnamon/index.html:97 data/content/mate-compiz/index.html:92 msgid "LibreOffice" msgstr "" -#: data/content/cinnamon/index.html:93 data/content/mate-compiz/index.html:93 +#: data/content/cinnamon/index.html:98 data/content/mate-compiz/index.html:93 msgid "" "LibreOffice is an integrated office suite. It utilizes free and open " "standards for its document formats and components." msgstr "" -#: data/content/cinnamon/index.html:97 +#: data/content/cinnamon/index.html:102 msgid "Thunderbird" msgstr "" -#: data/content/cinnamon/index.html:98 +#: data/content/cinnamon/index.html:103 msgid "" "Mozilla Thunderbird is a standalone mail and newsgroup client. Organize " "your schedule with the included Lightning calendar application." msgstr "" -#: data/content/cinnamon/index.html:109 data/content/kde/index.html:110 +#: data/content/cinnamon/index.html:114 data/content/kde/index.html:110 #: data/content/lxde/index.html:109 data/content/mate-compiz/index.html:109 #: data/content/soas/index.html:110 data/content/xfce/index.html:104 msgid "Multimedia" msgstr "" -#: data/content/cinnamon/index.html:115 data/content/mate-compiz/index.html:120 +#: data/content/cinnamon/index.html:120 data/content/mate-compiz/index.html:120 #: data/content/xfce/index.html:115 msgid "Parole" msgstr "" -#: data/content/cinnamon/index.html:116 data/content/mate-compiz/index.html:121 +#: data/content/cinnamon/index.html:121 data/content/mate-compiz/index.html:121 msgid "A modern media player, using gtk3 and the gstreamer plugin framework." msgstr "" -#: data/content/cinnamon/index.html:120 +#: data/content/cinnamon/index.html:125 msgid "Shotwell" msgstr "" -#: data/content/cinnamon/index.html:121 +#: data/content/cinnamon/index.html:126 msgid "Shotwell is an easy-to-use, fast photo organizer, viewer, and editor." msgstr "" -#: data/content/cinnamon/index.html:125 +#: data/content/cinnamon/index.html:130 msgid "Brasero" msgstr "" -#: data/content/cinnamon/index.html:126 +#: data/content/cinnamon/index.html:131 msgid "Brasero is a simple and easy to use CD/DVD burning application." msgstr "" #: data/content/cinnamon/download/index.html:146 -#: data/content/cinnamon/index.html:148 +#: data/content/cinnamon/index.html:153 #: data/content/kde/download/index.html:145 data/content/kde/index.html:182 #: data/content/lxde/download/index.html:146 data/content/lxde/index.html:148 #: data/content/mate-compiz/download/index.html:146 @@ -589,7 +595,7 @@ msgid "Support Resources" msgstr "" #: data/content/cinnamon/download/index.html:151 -#: data/content/cinnamon/index.html:153 +#: data/content/cinnamon/index.html:158 #: data/content/kde/download/index.html:150 data/content/kde/index.html:187 #: data/content/lxde/download/index.html:151 data/content/lxde/index.html:153 #: data/content/mate-compiz/download/index.html:151 @@ -601,7 +607,7 @@ msgid "Chat" msgstr "" #: data/content/cinnamon/download/index.html:152 -#: data/content/cinnamon/index.html:154 +#: data/content/cinnamon/index.html:159 #, python-format msgid "" "Users and developers are available in the #fedora-" @@ -610,7 +616,7 @@ msgid "" msgstr "" #: data/content/cinnamon/download/index.html:155 -#: data/content/cinnamon/index.html:157 +#: data/content/cinnamon/index.html:162 #: data/content/kde/download/index.html:154 data/content/kde/index.html:191 #: data/content/lxde/download/index.html:155 data/content/lxde/index.html:157 #: data/content/mate-compiz/download/index.html:155 @@ -621,7 +627,7 @@ msgid "Email" msgstr "" #: data/content/cinnamon/download/index.html:156 -#: data/content/cinnamon/index.html:158 +#: data/content/cinnamon/index.html:163 #: data/content/mate-compiz/download/index.html:156 #: data/content/mate-compiz/index.html:163 #, python-format @@ -631,7 +637,7 @@ msgid "" msgstr "" #: data/content/cinnamon/download/index.html:159 -#: data/content/cinnamon/index.html:161 +#: data/content/cinnamon/index.html:166 #: data/content/kde/download/index.html:158 data/content/kde/index.html:195 #: data/content/lxde/download/index.html:159 data/content/lxde/index.html:161 #: data/content/mate-compiz/download/index.html:159 @@ -642,7 +648,7 @@ msgid "Documentation" msgstr "" #: data/content/cinnamon/download/index.html:160 -#: data/content/cinnamon/index.html:162 +#: data/content/cinnamon/index.html:167 #, python-format msgid "" "Specific documentation and tutorials are available at the websites team." +"Please send any comments or corrections to the websites team." msgstr "" -#: data/templates/footer.html:95 +#: data/templates/footer.html:94 msgid "Change Language" msgstr "" -#: data/templates/footer.html:99 +#: data/templates/footer.html:98 msgid "OK" msgstr "" diff --git a/spins.fedoraproject.org/static/images/cinnamon/dnfdragora.png b/spins.fedoraproject.org/static/images/cinnamon/dnfdragora.png new file mode 100644 index 0000000..ef163b2 Binary files /dev/null and b/spins.fedoraproject.org/static/images/cinnamon/dnfdragora.png differ From 3cbad89f48d14f3624d7af1121b3f34f70611f40 Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Apr 25 2017 15:41:18 +0000 Subject: [PATCH 2/3] Spins: Cinnamon: Add Redshift to Office --- diff --git a/spins.fedoraproject.org/data/content/cinnamon/index.html b/spins.fedoraproject.org/data/content/cinnamon/index.html index 21449f9..67385f7 100644 --- a/spins.fedoraproject.org/data/content/cinnamon/index.html +++ b/spins.fedoraproject.org/data/content/cinnamon/index.html @@ -102,6 +102,11 @@

${_('Thunderbird')}

${_('Mozilla Thunderbird is a standalone mail and newsgroup client. Organize your schedule with the included Lightning calendar application.')}

+
+ Redshift +

${_('Redshift')}

+

${_('Got sore eyes from working after dawn? Redshift automatically adjusts the color temperature of your screen, depending on your current time and location.')}

+
diff --git a/spins.fedoraproject.org/po/spins.fedoraproject.org.pot b/spins.fedoraproject.org/po/spins.fedoraproject.org.pot index 12245bc..7b40fb1 100644 --- a/spins.fedoraproject.org/po/spins.fedoraproject.org.pot +++ b/spins.fedoraproject.org/po/spins.fedoraproject.org.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-04-22 00:05+0200\n" +"POT-Creation-Date: 2017-04-22 18:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -431,7 +431,7 @@ msgid "" "provides the option to quickly try and install this desktop." msgstr "" -#: data/content/cinnamon/index.html:33 data/content/cinnamon/index.html:142 +#: data/content/cinnamon/index.html:33 data/content/cinnamon/index.html:147 #: data/content/kde/index.html:34 data/content/kde/index.html:171 #: data/content/lxde/index.html:33 data/content/lxde/index.html:137 #: data/content/mate-compiz/index.html:33 @@ -552,39 +552,50 @@ msgid "" "your schedule with the included Lightning calendar application." msgstr "" -#: data/content/cinnamon/index.html:114 data/content/kde/index.html:110 +#: data/content/cinnamon/index.html:107 +msgid "Redshift" +msgstr "" + +#: data/content/cinnamon/index.html:108 +msgid "" +"Got sore eyes from working after dawn? Redshift automatically adjusts the" +" color temperature of your screen, depending on your current time and " +"location." +msgstr "" + +#: data/content/cinnamon/index.html:119 data/content/kde/index.html:110 #: data/content/lxde/index.html:109 data/content/mate-compiz/index.html:109 #: data/content/soas/index.html:110 data/content/xfce/index.html:104 msgid "Multimedia" msgstr "" -#: data/content/cinnamon/index.html:120 data/content/mate-compiz/index.html:120 +#: data/content/cinnamon/index.html:125 data/content/mate-compiz/index.html:120 #: data/content/xfce/index.html:115 msgid "Parole" msgstr "" -#: data/content/cinnamon/index.html:121 data/content/mate-compiz/index.html:121 +#: data/content/cinnamon/index.html:126 data/content/mate-compiz/index.html:121 msgid "A modern media player, using gtk3 and the gstreamer plugin framework." msgstr "" -#: data/content/cinnamon/index.html:125 +#: data/content/cinnamon/index.html:130 msgid "Shotwell" msgstr "" -#: data/content/cinnamon/index.html:126 +#: data/content/cinnamon/index.html:131 msgid "Shotwell is an easy-to-use, fast photo organizer, viewer, and editor." msgstr "" -#: data/content/cinnamon/index.html:130 +#: data/content/cinnamon/index.html:135 msgid "Brasero" msgstr "" -#: data/content/cinnamon/index.html:131 +#: data/content/cinnamon/index.html:136 msgid "Brasero is a simple and easy to use CD/DVD burning application." msgstr "" #: data/content/cinnamon/download/index.html:146 -#: data/content/cinnamon/index.html:153 +#: data/content/cinnamon/index.html:158 #: data/content/kde/download/index.html:145 data/content/kde/index.html:182 #: data/content/lxde/download/index.html:146 data/content/lxde/index.html:148 #: data/content/mate-compiz/download/index.html:146 @@ -595,7 +606,7 @@ msgid "Support Resources" msgstr "" #: data/content/cinnamon/download/index.html:151 -#: data/content/cinnamon/index.html:158 +#: data/content/cinnamon/index.html:163 #: data/content/kde/download/index.html:150 data/content/kde/index.html:187 #: data/content/lxde/download/index.html:151 data/content/lxde/index.html:153 #: data/content/mate-compiz/download/index.html:151 @@ -607,7 +618,7 @@ msgid "Chat" msgstr "" #: data/content/cinnamon/download/index.html:152 -#: data/content/cinnamon/index.html:159 +#: data/content/cinnamon/index.html:164 #, python-format msgid "" "Users and developers are available in the #fedora-" @@ -616,7 +627,7 @@ msgid "" msgstr "" #: data/content/cinnamon/download/index.html:155 -#: data/content/cinnamon/index.html:162 +#: data/content/cinnamon/index.html:167 #: data/content/kde/download/index.html:154 data/content/kde/index.html:191 #: data/content/lxde/download/index.html:155 data/content/lxde/index.html:157 #: data/content/mate-compiz/download/index.html:155 @@ -627,7 +638,7 @@ msgid "Email" msgstr "" #: data/content/cinnamon/download/index.html:156 -#: data/content/cinnamon/index.html:163 +#: data/content/cinnamon/index.html:168 #: data/content/mate-compiz/download/index.html:156 #: data/content/mate-compiz/index.html:163 #, python-format @@ -637,7 +648,7 @@ msgid "" msgstr "" #: data/content/cinnamon/download/index.html:159 -#: data/content/cinnamon/index.html:166 +#: data/content/cinnamon/index.html:171 #: data/content/kde/download/index.html:158 data/content/kde/index.html:195 #: data/content/lxde/download/index.html:159 data/content/lxde/index.html:161 #: data/content/mate-compiz/download/index.html:159 @@ -648,7 +659,7 @@ msgid "Documentation" msgstr "" #: data/content/cinnamon/download/index.html:160 -#: data/content/cinnamon/index.html:167 +#: data/content/cinnamon/index.html:172 #, python-format msgid "" "Specific documentation and tutorials are available at the Date: Apr 25 2017 15:41:19 +0000 Subject: [PATCH 3/3] Spins: Cinnamon: Update Screenshot --- diff --git a/spins.fedoraproject.org/static/images/screenshots/screenshot-cinnamon.jpg b/spins.fedoraproject.org/static/images/screenshots/screenshot-cinnamon.jpg index 2034706..3a9d537 100644 Binary files a/spins.fedoraproject.org/static/images/screenshots/screenshot-cinnamon.jpg and b/spins.fedoraproject.org/static/images/screenshots/screenshot-cinnamon.jpg differ