diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-10-04 13:00:55 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-10-04 13:00:55 +0200 |
| commit | e9b06dcd5df3f22bc3a7acd5c57a4bfdf4ef38f5 (patch) | |
| tree | 6e9494073395f49fb3eec61d2c5ae40f5f3de2af | |
| parent | 19fe9cfe9a84ba453271d8d8e32f4aa9fe2be14e (diff) | |
| parent | 7556967bf57453d412a8f18633599f38806f8620 (diff) | |
Merge tag 'upstream/0.6.7'
Upstream version 0.6.7
30 files changed, 1128 insertions, 665 deletions
diff --git a/resources/locale/bg/LC_MESSAGES/bg.po b/resources/locale/bg/LC_MESSAGES/bg.po index a3dfa56..8042343 100644 --- a/resources/locale/bg/LC_MESSAGES/bg.po +++ b/resources/locale/bg/LC_MESSAGES/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnomepie 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-17 17:33+0100\n" +"POT-Creation-Date: 2015-09-30 18:32+0100\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -16,7 +16,7 @@ msgstr "" "Language-Team: Bulgarian\n" "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Zanata 3.7.1\n" +"X-Generator: Zanata 3.7.2\n" #: ../ui/pie_options.ui:53 msgid "Activation Settings" @@ -148,7 +148,7 @@ msgstr "Иконна тема" msgid "Custom Icon" msgstr "Собствена икона" -#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:77 +#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:78 msgid "Gnome-Pie Settings" msgstr "Гноум-Пай Сетинги" @@ -212,18 +212,22 @@ msgid "Import a theme from a file." msgstr "" #: ../ui/preferences.ui:323 +msgid "Delete the selected theme." +msgstr "" + +#: ../ui/preferences.ui:344 msgid "Export the selected theme for sharing." msgstr "" -#: ../ui/preferences.ui:371 +#: ../ui/preferences.ui:392 msgid "Open a tutorial on how to create new themes for Gnome-Pie." msgstr "" -#: ../ui/preferences.ui:421 ../../src/gui/preferencesWindow.vala:108 +#: ../ui/preferences.ui:442 ../../src/gui/preferencesWindow.vala:109 msgid "General Settings" msgstr "Общи Сетинги" -#: ../ui/preferences.ui:613 +#: ../ui/preferences.ui:634 msgid "" "<b><big>This Pie is empty!</big>\n" "\n" @@ -234,7 +238,7 @@ msgid "" "For manual and advanced configuration click on the plus sign." msgstr "" -#: ../ui/preferences.ui:634 +#: ../ui/preferences.ui:655 msgid "" "<b><big>You have no Pies!</big>\n" "\n" @@ -246,7 +250,7 @@ msgstr "" "Почнете със създаването на пай! </b> Това може да се направи със кликването " "на малкият плюс символът в долният ляв край." -#: ../ui/preferences.ui:720 ../../src/gui/preferencesWindow.vala:109 +#: ../ui/preferences.ui:741 ../../src/gui/preferencesWindow.vala:110 msgid "Pie Settings" msgstr "" @@ -286,122 +290,126 @@ msgstr "Отворете паят" msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." msgstr "Отваря нов Гноум-Пай пай. Може да направите под-менюта по този начин." -#: ../../src/gui/preferencesWindow.vala:78 +#: ../../src/gui/preferencesWindow.vala:79 msgid "bake your pies!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:227 +#: ../../src/gui/preferencesWindow.vala:235 msgid "Pies can be opened with the terminal command \"gnome-pie --open=ID\"." msgstr "" -#: ../../src/gui/preferencesWindow.vala:228 +#: ../../src/gui/preferencesWindow.vala:236 msgid "Feel free to visit Gnome-Pie's homepage at %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:229 +#: ../../src/gui/preferencesWindow.vala:237 msgid "If you want to give some feedback, please write an e-mail to %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:230 +#: ../../src/gui/preferencesWindow.vala:238 msgid "You can support the development of Gnome-Pie by donating via %s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:231 +#: ../../src/gui/preferencesWindow.vala:239 msgid "" "Translating Gnome-Pie to your language is easy. Translations are managed at " "%s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:232 +#: ../../src/gui/preferencesWindow.vala:240 msgid "" "It's easy to create new themes for Gnome-Pie. Read the <a href=" "'%s'>Tutorial</a> online." msgstr "" -#: ../../src/gui/preferencesWindow.vala:233 -msgid "It's usually a good practive to have at most twelve slices per pie." +#: ../../src/gui/preferencesWindow.vala:241 +msgid "It's usually a good practice to have at most twelve slices per pie." msgstr "" -#: ../../src/gui/preferencesWindow.vala:234 +#: ../../src/gui/preferencesWindow.vala:242 msgid "You can export themes you created and share them with the community!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:235 +#: ../../src/gui/preferencesWindow.vala:243 msgid "The source code of Gnome-Pie is available on %s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:236 +#: ../../src/gui/preferencesWindow.vala:244 msgid "Bugs can be reported at %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:237 +#: ../../src/gui/preferencesWindow.vala:245 msgid "Suggestions can be posted on %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:238 +#: ../../src/gui/preferencesWindow.vala:246 msgid "" "An awesome companion of Gnome-Pie is %s. It will make using your computer " "feel like magic!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:239 +#: ../../src/gui/preferencesWindow.vala:247 msgid "You can drag'n'drop applications from your main menu to the pie above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:240 +#: ../../src/gui/preferencesWindow.vala:248 msgid "" "You may drag'n'drop URLs and bookmarks from your internet browser to the pie " "above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:241 +#: ../../src/gui/preferencesWindow.vala:249 msgid "" "You can drag'n'drop files and folders from your file browser to the pie " "above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:242 +#: ../../src/gui/preferencesWindow.vala:250 msgid "" "You can drag'n'drop pies from the list on the left into other pies in order " "to create sub-pies." msgstr "" -#: ../../src/gui/preferencesWindow.vala:243 +#: ../../src/gui/preferencesWindow.vala:251 msgid "" "You can drag'n'drop pies from the list on the left to your desktop or dock " "to create a launcher for this pie." msgstr "" -#: ../../src/gui/preferencesWindow.vala:387 +#: ../../src/gui/preferencesWindow.vala:401 msgid "Sucessfully imported new theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:401 +#: ../../src/gui/preferencesWindow.vala:415 msgid "An error occured while importing the theme: Failed to extract theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:405 +#: ../../src/gui/preferencesWindow.vala:419 msgid "" "An error occured while importing the theme: A theme with this name does " "already exist!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:409 +#: ../../src/gui/preferencesWindow.vala:423 msgid "" "An error occured while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:413 +#: ../../src/gui/preferencesWindow.vala:427 msgid "" "An error occured while importing the theme: Failed to open theme archive!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:492 +#: ../../src/gui/preferencesWindow.vala:451 +msgid "Do you really want to delete the selected theme from %s?" +msgstr "" + +#: ../../src/gui/preferencesWindow.vala:528 msgid "New Pie" msgstr "Нов пай" -#: ../../src/gui/preferencesWindow.vala:507 +#: ../../src/gui/preferencesWindow.vala:543 msgid "" "Do you really want to delete the selected Pie with all contained Slices?" msgstr "" @@ -496,6 +504,10 @@ msgstr "" msgid "Themes" msgstr "Теми" +#: ../../src/gui/themeList.vala:108 +msgid "by" +msgstr "" + #: ../../src/gui/indicator.vala:126 msgid "_Preferences" msgstr "" @@ -566,11 +578,11 @@ msgstr "" msgid "Half pie" msgstr "" -#: ../../src/themes/theme.vala:139 +#: ../../src/themes/theme.vala:169 msgid "Successfully exported the theme \"%s\"!" msgstr "" -#: ../../src/themes/theme.vala:146 +#: ../../src/themes/theme.vala:176 msgid "" "An error occured while exporting the theme \"%s\"! Please check the console " "output." diff --git a/resources/locale/de/LC_MESSAGES/de.po b/resources/locale/de/LC_MESSAGES/de.po index 74680a8..2a51270 100644 --- a/resources/locale/de/LC_MESSAGES/de.po +++ b/resources/locale/de/LC_MESSAGES/de.po @@ -7,16 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: gnomepie 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-17 17:33+0100\n" +"POT-Creation-Date: 2015-09-30 18:32+0100\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2015-09-15 08:22-0400\n" +"PO-Revision-Date: 2015-09-30 01:39-0400\n" "Last-Translator: Simon <code@simonschneegans.de>\n" "Language-Team: German\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Zanata 3.7.1\n" +"X-Generator: Zanata 3.7.2\n" #: ../ui/pie_options.ui:53 msgid "Activation Settings" @@ -153,7 +153,7 @@ msgstr "Symbolthema" msgid "Custom Icon" msgstr "Benutzerdefiniertes Symbol" -#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:77 +#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:78 msgid "Gnome-Pie Settings" msgstr "Gnome-Pie - Einstellungen" @@ -221,19 +221,23 @@ msgid "Import a theme from a file." msgstr "Importiert ein Design." #: ../ui/preferences.ui:323 +msgid "Delete the selected theme." +msgstr "Lösche das gewählte Design." + +#: ../ui/preferences.ui:344 msgid "Export the selected theme for sharing." msgstr "Exportiert das gewählte Design um es mit anderen zu teilen." -#: ../ui/preferences.ui:371 +#: ../ui/preferences.ui:392 msgid "Open a tutorial on how to create new themes for Gnome-Pie." msgstr "" "Zeigt ein Tutorial das erklärt, wie Designs für Gnome-Pie erstellt werden." -#: ../ui/preferences.ui:421 ../../src/gui/preferencesWindow.vala:108 +#: ../ui/preferences.ui:442 ../../src/gui/preferencesWindow.vala:109 msgid "General Settings" msgstr "Allgemeine Einstellungen" -#: ../ui/preferences.ui:613 +#: ../ui/preferences.ui:634 msgid "" "<b><big>This Pie is empty!</big>\n" "\n" @@ -251,7 +255,7 @@ msgstr "" "\n" "Zur manuellen und fortgeschrittenen Konfiguration klicke auf das Symbol." -#: ../ui/preferences.ui:634 +#: ../ui/preferences.ui:655 msgid "" "<b><big>You have no Pies!</big>\n" "\n" @@ -263,7 +267,7 @@ msgstr "" "Erstelle einen neuen! </b> Klicke dazu einfach auf das kleine Pluszeichen " "unter der leeren Liste auf der linken Seite." -#: ../ui/preferences.ui:720 ../../src/gui/preferencesWindow.vala:109 +#: ../ui/preferences.ui:741 ../../src/gui/preferencesWindow.vala:110 msgid "Pie Settings" msgstr "Pie-Einstellungen" @@ -304,33 +308,33 @@ msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." msgstr "" "Öffnet einen anderen Pie. Auf diese Art können Submenüs erstellt werden." -#: ../../src/gui/preferencesWindow.vala:78 +#: ../../src/gui/preferencesWindow.vala:79 msgid "bake your pies!" msgstr "mach schöne Kuchen!" -#: ../../src/gui/preferencesWindow.vala:227 +#: ../../src/gui/preferencesWindow.vala:235 msgid "Pies can be opened with the terminal command \"gnome-pie --open=ID\"." msgstr "" "Pies können mit dem Kommandozeilenbefehl \"gnome-pie --open=ID\" geöffnet " "werden." -#: ../../src/gui/preferencesWindow.vala:228 +#: ../../src/gui/preferencesWindow.vala:236 msgid "Feel free to visit Gnome-Pie's homepage at %s!" msgstr "Besuch Gnome-Pies Homepage auf %s!" -#: ../../src/gui/preferencesWindow.vala:229 +#: ../../src/gui/preferencesWindow.vala:237 msgid "If you want to give some feedback, please write an e-mail to %s!" msgstr "" "Wenn du mir deine Meinung zu Gnome-Pie sagen willst, schick eine E-Mail an " "%s!" -#: ../../src/gui/preferencesWindow.vala:230 +#: ../../src/gui/preferencesWindow.vala:238 msgid "You can support the development of Gnome-Pie by donating via %s." msgstr "" "Du kannst die Entwicklung von Gnome-Pie unterstützen, indem du auf %s " "spendest." -#: ../../src/gui/preferencesWindow.vala:231 +#: ../../src/gui/preferencesWindow.vala:239 msgid "" "Translating Gnome-Pie to your language is easy. Translations are managed at " "%s." @@ -338,7 +342,7 @@ msgstr "" "Das Übersetzen von Gnome-Pie ist einfach. Starte eine Übersetzung in eine " "andere Sprache auf %s." -#: ../../src/gui/preferencesWindow.vala:232 +#: ../../src/gui/preferencesWindow.vala:240 msgid "" "It's easy to create new themes for Gnome-Pie. Read the <a href=" "'%s'>Tutorial</a> online." @@ -346,28 +350,28 @@ msgstr "" "Es ist einfach, neue Designs für Gnome-Pie zu erstellen. Für mehr " "Informationen lies einfach das <a href='%s'>Tutorial</a>." -#: ../../src/gui/preferencesWindow.vala:233 -msgid "It's usually a good practive to have at most twelve slices per pie." +#: ../../src/gui/preferencesWindow.vala:241 +msgid "It's usually a good practice to have at most twelve slices per pie." msgstr "Es macht sich gut, nicht mehr als zwölf Slices pro Pie zu haben." -#: ../../src/gui/preferencesWindow.vala:234 +#: ../../src/gui/preferencesWindow.vala:242 msgid "You can export themes you created and share them with the community!" msgstr "" "Du kannst selbsterstellte Designs exportieren und mit der Community teilen!" -#: ../../src/gui/preferencesWindow.vala:235 +#: ../../src/gui/preferencesWindow.vala:243 msgid "The source code of Gnome-Pie is available on %s." msgstr "Der Quellcode von Gnome-Pie ist auf %s zugänglich." -#: ../../src/gui/preferencesWindow.vala:236 +#: ../../src/gui/preferencesWindow.vala:244 msgid "Bugs can be reported at %s!" msgstr "Fehler können auf %s gemeldet werden!" -#: ../../src/gui/preferencesWindow.vala:237 +#: ../../src/gui/preferencesWindow.vala:245 msgid "Suggestions can be posted on %s!" msgstr "Verbesserungvorschläge können auf %s gemacht werden!" -#: ../../src/gui/preferencesWindow.vala:238 +#: ../../src/gui/preferencesWindow.vala:246 msgid "" "An awesome companion of Gnome-Pie is %s. It will make using your computer " "feel like magic!" @@ -375,11 +379,11 @@ msgstr "" "Eine wirklich gute Ergänzung zu Gnome-Pie ist %s. Damit fühlt sich der " "Umgang mit deinem Computer wie Magie an!" -#: ../../src/gui/preferencesWindow.vala:239 +#: ../../src/gui/preferencesWindow.vala:247 msgid "You can drag'n'drop applications from your main menu to the pie above." msgstr "Du kannst Anwendungen aus deinem Startmenü per Drag'n'Drop einfügen." -#: ../../src/gui/preferencesWindow.vala:240 +#: ../../src/gui/preferencesWindow.vala:248 msgid "" "You may drag'n'drop URLs and bookmarks from your internet browser to the pie " "above." @@ -387,7 +391,7 @@ msgstr "" "Du kannst URLs, Links und Lesezeichen aus deinem Internetbrowser per " "Drag'n'Drop einfügen." -#: ../../src/gui/preferencesWindow.vala:241 +#: ../../src/gui/preferencesWindow.vala:249 msgid "" "You can drag'n'drop files and folders from your file browser to the pie " "above." @@ -395,7 +399,7 @@ msgstr "" "Du kannst Dateien und Ordner aus deinem Dateibrowser per Drag'n'Drop " "einfügen." -#: ../../src/gui/preferencesWindow.vala:242 +#: ../../src/gui/preferencesWindow.vala:250 msgid "" "You can drag'n'drop pies from the list on the left into other pies in order " "to create sub-pies." @@ -403,7 +407,7 @@ msgstr "" "Du kannst Pies per Drag'n'Drop in andere Pies ziehen, um Untermenüs zu " "erstellen." -#: ../../src/gui/preferencesWindow.vala:243 +#: ../../src/gui/preferencesWindow.vala:251 msgid "" "You can drag'n'drop pies from the list on the left to your desktop or dock " "to create a launcher for this pie." @@ -411,17 +415,17 @@ msgstr "" "Du kannst die Pies aus der linken Liste per Drag'n'Drop auf deinen Desktop " "oder in dein Dock ziehen, um einen Starter zu erstellen!" -#: ../../src/gui/preferencesWindow.vala:387 +#: ../../src/gui/preferencesWindow.vala:401 msgid "Sucessfully imported new theme!" msgstr "Das neue Design wurde erfolgreich imprtiert!" -#: ../../src/gui/preferencesWindow.vala:401 +#: ../../src/gui/preferencesWindow.vala:415 msgid "An error occured while importing the theme: Failed to extract theme!" msgstr "" "Beim Importieren ist ein Fehler aufgetreten: Das Design konnte nicht " "entpackt werden!" -#: ../../src/gui/preferencesWindow.vala:405 +#: ../../src/gui/preferencesWindow.vala:419 msgid "" "An error occured while importing the theme: A theme with this name does " "already exist!" @@ -429,7 +433,7 @@ msgstr "" "Beim Importieren ist ein Fehler aufgetreten: Es existiert bereits ein Design " "mit diesem Namen!" -#: ../../src/gui/preferencesWindow.vala:409 +#: ../../src/gui/preferencesWindow.vala:423 msgid "" "An error occured while importing the theme: Theme archive does not contain a " "valid theme!" @@ -437,18 +441,22 @@ msgstr "" "Beim Importieren ist ein Fehler aufgetreten: Das gwählte Archiv enthält kein " "valides Gnome-Pie-Design!" -#: ../../src/gui/preferencesWindow.vala:413 +#: ../../src/gui/preferencesWindow.vala:427 msgid "" "An error occured while importing the theme: Failed to open theme archive!" msgstr "" "Beim Importieren ist ein Fehler aufgetreten: Das Archive konnte nicht " "gelesen werden!" -#: ../../src/gui/preferencesWindow.vala:492 +#: ../../src/gui/preferencesWindow.vala:451 +msgid "Do you really want to delete the selected theme from %s?" +msgstr "Soll das Design %s wirklich gelöscht werden?" + +#: ../../src/gui/preferencesWindow.vala:528 msgid "New Pie" msgstr "Neuer Pie" -#: ../../src/gui/preferencesWindow.vala:507 +#: ../../src/gui/preferencesWindow.vala:543 msgid "" "Do you really want to delete the selected Pie with all contained Slices?" msgstr "Soll dieser Pie wirklich mit allen Slices gelöscht werden?" @@ -541,6 +549,10 @@ msgstr "" msgid "Themes" msgstr "Designs" +#: ../../src/gui/themeList.vala:108 +msgid "by" +msgstr "von" + #: ../../src/gui/indicator.vala:126 msgid "_Preferences" msgstr "Einstellungen" @@ -611,11 +623,11 @@ msgstr "Viertel-Pie" msgid "Half pie" msgstr "Halb-Pie" -#: ../../src/themes/theme.vala:139 +#: ../../src/themes/theme.vala:169 msgid "Successfully exported the theme \"%s\"!" msgstr "Das Design \"%s\" wurde erfolgreich importiert!" -#: ../../src/themes/theme.vala:146 +#: ../../src/themes/theme.vala:176 msgid "" "An error occured while exporting the theme \"%s\"! Please check the console " "output." diff --git a/resources/locale/es/LC_MESSAGES/es.po b/resources/locale/es/LC_MESSAGES/es.po index f2e515e..2e55fbe 100644 --- a/resources/locale/es/LC_MESSAGES/es.po +++ b/resources/locale/es/LC_MESSAGES/es.po @@ -3,21 +3,22 @@ # This file is distributed under the same license as the gnomepie package. # Eduardo Anabalon <lalo1412@gmail.com>, 2012. # Gabriel Dubatti <gdubatti@gmail.com>, 2015. +# Gabriel Dubatti <gdubatti@gmail.com>, 2015. #zanata # Simon <code@simonschneegans.de>, 2015. #zanata msgid "" msgstr "" "Project-Id-Version: gnomepie 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-17 17:33+0100\n" +"POT-Creation-Date: 2015-09-30 18:32+0100\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2012-01-22 01:30-0500\n" -"Last-Translator: Gabriel Dubatti <gdubatti@gmail.com>\n" +"PO-Revision-Date: 2015-09-30 01:36-0400\n" +"Last-Translator: Simon <code@simonschneegans.de>\n" "Language-Team: Spanish\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Zanata 3.7.1\n" +"X-Generator: Zanata 3.7.2\n" #: ../ui/pie_options.ui:53 msgid "Activation Settings" @@ -151,7 +152,7 @@ msgstr "Tema de iconos" msgid "Custom Icon" msgstr "Icono personalizado" -#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:77 +#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:78 msgid "Gnome-Pie Settings" msgstr "Preferencias de Gnome-Pie" @@ -213,21 +214,25 @@ msgstr "Máximo de Rebanadas por Pastel" #: ../ui/preferences.ui:302 msgid "Import a theme from a file." -msgstr "" +msgstr "Importar un tema desde un archivo." #: ../ui/preferences.ui:323 -msgid "Export the selected theme for sharing." +msgid "Delete the selected theme." msgstr "" -#: ../ui/preferences.ui:371 +#: ../ui/preferences.ui:344 +msgid "Export the selected theme for sharing." +msgstr "Exportar el tema elegido para compartirlo." + +#: ../ui/preferences.ui:392 msgid "Open a tutorial on how to create new themes for Gnome-Pie." -msgstr "" +msgstr "Abrir el tutorial acerca de como crear nuevos temas para Gnome-Pie." -#: ../ui/preferences.ui:421 ../../src/gui/preferencesWindow.vala:108 +#: ../ui/preferences.ui:442 ../../src/gui/preferencesWindow.vala:109 msgid "General Settings" msgstr "Preferencias generales" -#: ../ui/preferences.ui:613 +#: ../ui/preferences.ui:634 msgid "" "<b><big>This Pie is empty!</big>\n" "\n" @@ -245,7 +250,7 @@ msgstr "" "\n" "Para configuración manual y avanzada, click en el signo más." -#: ../ui/preferences.ui:634 +#: ../ui/preferences.ui:655 msgid "" "<b><big>You have no Pies!</big>\n" "\n" @@ -257,7 +262,7 @@ msgstr "" "Empieza por crear uno! </b> Puedes hacerlo haciendo click en el pequeño " "signo más en la esquina inferior izquierda." -#: ../ui/preferences.ui:720 ../../src/gui/preferencesWindow.vala:109 +#: ../ui/preferences.ui:741 ../../src/gui/preferencesWindow.vala:110 msgid "Pie Settings" msgstr "Preferencias del Pastel" @@ -297,122 +302,152 @@ msgstr "Abrir Pastel" msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." msgstr "Abre otro Pastel de Gnome-Pie. De esta manera puedes crear submenús." -#: ../../src/gui/preferencesWindow.vala:78 +#: ../../src/gui/preferencesWindow.vala:79 msgid "bake your pies!" msgstr "cocina tus pasteles!" -#: ../../src/gui/preferencesWindow.vala:227 +#: ../../src/gui/preferencesWindow.vala:235 msgid "Pies can be opened with the terminal command \"gnome-pie --open=ID\"." msgstr "" +"Los Pasteles pueden ser abiertos desde la terminal utilizando el comando " +"\"gnome-pie --open=ID\"." -#: ../../src/gui/preferencesWindow.vala:228 +#: ../../src/gui/preferencesWindow.vala:236 msgid "Feel free to visit Gnome-Pie's homepage at %s!" -msgstr "" +msgstr "Visite el sitio web de Gnome-Pie en %s!" -#: ../../src/gui/preferencesWindow.vala:229 +#: ../../src/gui/preferencesWindow.vala:237 msgid "If you want to give some feedback, please write an e-mail to %s!" -msgstr "" +msgstr "Si quiere darnos su opinión, escríba un e-mail a %s!" -#: ../../src/gui/preferencesWindow.vala:230 +#: ../../src/gui/preferencesWindow.vala:238 msgid "You can support the development of Gnome-Pie by donating via %s." -msgstr "" +msgstr "Puede ayudar al desarrollo de Gnome-Pie donando vía %s." -#: ../../src/gui/preferencesWindow.vala:231 +#: ../../src/gui/preferencesWindow.vala:239 msgid "" "Translating Gnome-Pie to your language is easy. Translations are managed at " "%s." msgstr "" +"Es fácil traducir Gnome-Pie a su idioma. Las traducciones se realizan desde " +"%s." -#: ../../src/gui/preferencesWindow.vala:232 +#: ../../src/gui/preferencesWindow.vala:240 msgid "" "It's easy to create new themes for Gnome-Pie. Read the <a href=" "'%s'>Tutorial</a> online." msgstr "" +"Es fácil crear nuevos temas para Gnome-Pie. Leer el <a href='%s'>Tutorial</" +"a> en línea." -#: ../../src/gui/preferencesWindow.vala:233 -msgid "It's usually a good practive to have at most twelve slices per pie." +#: ../../src/gui/preferencesWindow.vala:241 +msgid "It's usually a good practice to have at most twelve slices per pie." msgstr "" +"En general es una buena práctica no utilizar más de 12 Rebanadas por Pastel." -#: ../../src/gui/preferencesWindow.vala:234 +#: ../../src/gui/preferencesWindow.vala:242 msgid "You can export themes you created and share them with the community!" msgstr "" +"Puede exportar los temas que haya creado y compartirlos con la comunidad!" -#: ../../src/gui/preferencesWindow.vala:235 +#: ../../src/gui/preferencesWindow.vala:243 msgid "The source code of Gnome-Pie is available on %s." -msgstr "" +msgstr "El código fuente de Gnome-Pie se encuentra disponible en %s." -#: ../../src/gui/preferencesWindow.vala:236 +#: ../../src/gui/preferencesWindow.vala:244 msgid "Bugs can be reported at %s!" -msgstr "" +msgstr "Los errores de software pueden reportarse en %s!" -#: ../../src/gui/preferencesWindow.vala:237 +#: ../../src/gui/preferencesWindow.vala:245 msgid "Suggestions can be posted on %s!" -msgstr "" +msgstr "Puede enviarnos sus sugerencias utilizando %s!" -#: ../../src/gui/preferencesWindow.vala:238 +#: ../../src/gui/preferencesWindow.vala:246 msgid "" "An awesome companion of Gnome-Pie is %s. It will make using your computer " "feel like magic!" msgstr "" +"Utilice %s junto con Gnome-Pie. Hará que usar su computadora sea una " +"experiencia mágica!" -#: ../../src/gui/preferencesWindow.vala:239 +#: ../../src/gui/preferencesWindow.vala:247 msgid "You can drag'n'drop applications from your main menu to the pie above." msgstr "" +"Puede arrastrar y soltar aplicaciones desde su menú principal sobre este " +"Pastel." -#: ../../src/gui/preferencesWindow.vala:240 +#: ../../src/gui/preferencesWindow.vala:248 msgid "" "You may drag'n'drop URLs and bookmarks from your internet browser to the pie " "above." msgstr "" +"Puede arrastrar y soltar direcciones URL y marcadores desde su navegador de " +"Internet sobre este Pastel." -#: ../../src/gui/preferencesWindow.vala:241 +#: ../../src/gui/preferencesWindow.vala:249 msgid "" "You can drag'n'drop files and folders from your file browser to the pie " "above." msgstr "" +"Puede arrastrar y soltar archivos y carpetas desde su navegador de archivos " +"sobre este Pastel." -#: ../../src/gui/preferencesWindow.vala:242 +#: ../../src/gui/preferencesWindow.vala:250 msgid "" "You can drag'n'drop pies from the list on the left into other pies in order " "to create sub-pies." msgstr "" +"Puede arrastrar y soltar Pasteles de la lista de la izquierda para crear sub-" +"pasteles." -#: ../../src/gui/preferencesWindow.vala:243 +#: ../../src/gui/preferencesWindow.vala:251 msgid "" "You can drag'n'drop pies from the list on the left to your desktop or dock " "to create a launcher for this pie." msgstr "" +"Puede arrastrar y soltar Pasteles de la lista de la izquierda en su " +"escritorio o en su lanzador de aplicaciones para crear un lanzador del " +"Pastel." -#: ../../src/gui/preferencesWindow.vala:387 +#: ../../src/gui/preferencesWindow.vala:401 msgid "Sucessfully imported new theme!" -msgstr "" +msgstr "El nuevo tema fue correctamente importado!" -#: ../../src/gui/preferencesWindow.vala:401 +#: ../../src/gui/preferencesWindow.vala:415 msgid "An error occured while importing the theme: Failed to extract theme!" -msgstr "" +msgstr "Ocurrió un error al importar el tema: Falló la extracción del tema!" -#: ../../src/gui/preferencesWindow.vala:405 +#: ../../src/gui/preferencesWindow.vala:419 msgid "" "An error occured while importing the theme: A theme with this name does " "already exist!" msgstr "" +"Ocurrió un error al importar el tema: Ya existe un tema con ese nombre!" -#: ../../src/gui/preferencesWindow.vala:409 +#: ../../src/gui/preferencesWindow.vala:423 msgid "" "An error occured while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" +"Ocurrió un error al importar el tema: El archivo no contiene un tema " +"válido!" -#: ../../src/gui/preferencesWindow.vala:413 +#: ../../src/gui/preferencesWindow.vala:427 msgid "" "An error occured while importing the theme: Failed to open theme archive!" msgstr "" +"Ocurrió un error al importar el tema: El archivo del tema no pudo ser " +"abierto!" -#: ../../src/gui/preferencesWindow.vala:492 +#: ../../src/gui/preferencesWindow.vala:451 +msgid "Do you really want to delete the selected theme from %s?" +msgstr "" + +#: ../../src/gui/preferencesWindow.vala:528 msgid "New Pie" msgstr "Nuevo Pastel" -#: ../../src/gui/preferencesWindow.vala:507 +#: ../../src/gui/preferencesWindow.vala:543 msgid "" "Do you really want to delete the selected Pie with all contained Slices?" msgstr "" @@ -507,6 +542,10 @@ msgstr "" msgid "Themes" msgstr "Temas" +#: ../../src/gui/themeList.vala:108 +msgid "by" +msgstr "" + #: ../../src/gui/indicator.vala:126 msgid "_Preferences" msgstr "_Preferencias" @@ -577,15 +616,16 @@ msgstr "Cuarto de Pastel" msgid "Half pie" msgstr "Medio Pastel" -#: ../../src/themes/theme.vala:139 +#: ../../src/themes/theme.vala:169 msgid "Successfully exported the theme \"%s\"!" -msgstr "" +msgstr "El tema %s fue exportado correctamente!" -#: ../../src/themes/theme.vala:146 +#: ../../src/themes/theme.vala:176 msgid "" "An error occured while exporting the theme \"%s\"! Please check the console " "output." msgstr "" +"Ocurrió un error al exportar el tema %s! Por favor verifique la consola." #: ../../src/actionGroups/windowListGroup.vala:34 msgid "Group: Window List" diff --git a/resources/locale/fr/LC_MESSAGES/fr.po b/resources/locale/fr/LC_MESSAGES/fr.po index 694761b..11bd79e 100644 --- a/resources/locale/fr/LC_MESSAGES/fr.po +++ b/resources/locale/fr/LC_MESSAGES/fr.po @@ -10,16 +10,16 @@ msgid "" msgstr "" "Project-Id-Version: gnomepie 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-17 17:33+0100\n" +"POT-Creation-Date: 2015-09-30 18:32+0100\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2015-07-29 05:19-0400\n" -"Last-Translator: Raphael Rochet <raphael@rri.fr>\n" +"PO-Revision-Date: 2015-09-30 01:35-0400\n" +"Last-Translator: Simon <code@simonschneegans.de>\n" "Language-Team: French\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Zanata 3.7.1\n" +"X-Generator: Zanata 3.7.2\n" #: ../ui/pie_options.ui:53 msgid "Activation Settings" @@ -153,7 +153,7 @@ msgstr "Thème d'icônes" msgid "Custom Icon" msgstr "Icône personnalisée" -#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:77 +#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:78 msgid "Gnome-Pie Settings" msgstr "Paramètres de Gnome-Pie" @@ -179,7 +179,7 @@ msgstr "" #: ../ui/preferences.ui:79 msgid "Select Slices by typing their names" -msgstr "" +msgstr "Sélectionner les Parts en tapant leur noms" #: ../ui/preferences.ui:85 ../ui/preferences.ui:86 msgid "" @@ -187,6 +187,9 @@ msgid "" "you can activate them with a hotkey (which can be displayed by pressing ALT " "when a Pie is openened)." msgstr "" +"Si coché, vous pouvez sélectionner les éléments d'une Tarte en tapant leur " +"noms. Sinon, vous pouvez les activer avec un raccourci clavier (qui peut " +"être affiché en maintenant ALT quand une Tarte est ouverte)." #: ../ui/preferences.ui:98 msgid "Display Slice labels" @@ -214,21 +217,27 @@ msgstr "Nombre max de parts par tarte" #: ../ui/preferences.ui:302 msgid "Import a theme from a file." -msgstr "" +msgstr "Importer un thème depuis un fichier." #: ../ui/preferences.ui:323 -msgid "Export the selected theme for sharing." +msgid "Delete the selected theme." msgstr "" -#: ../ui/preferences.ui:371 +#: ../ui/preferences.ui:344 +msgid "Export the selected theme for sharing." +msgstr "Exporter le thème pour le partager." + +#: ../ui/preferences.ui:392 msgid "Open a tutorial on how to create new themes for Gnome-Pie." msgstr "" +"Ouvrir un didacticiel expliquant la création de nouveaux thèmes pour Gnome-" +"Pie." -#: ../ui/preferences.ui:421 ../../src/gui/preferencesWindow.vala:108 +#: ../ui/preferences.ui:442 ../../src/gui/preferencesWindow.vala:109 msgid "General Settings" msgstr "Paramètres généraux" -#: ../ui/preferences.ui:613 +#: ../ui/preferences.ui:634 msgid "" "<b><big>This Pie is empty!</big>\n" "\n" @@ -247,7 +256,7 @@ msgstr "" "\n" "Pour un ajout manuel ou avancé, cliquez sur le signe plus." -#: ../ui/preferences.ui:634 +#: ../ui/preferences.ui:655 msgid "" "<b><big>You have no Pies!</big>\n" "\n" @@ -259,7 +268,7 @@ msgstr "" "Commencez par en créer une !</b> Vous pouvez le faire en cliquant sur le " "petit signe plus dans le coin en bas à gauche." -#: ../ui/preferences.ui:720 ../../src/gui/preferencesWindow.vala:109 +#: ../ui/preferences.ui:741 ../../src/gui/preferencesWindow.vala:110 msgid "Pie Settings" msgstr "Paramètres de la tarte" @@ -302,122 +311,152 @@ msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." msgstr "" "Ouvre une autre Part de Tarte. Vous pouvez ainsi créer des sous-menus." -#: ../../src/gui/preferencesWindow.vala:78 +#: ../../src/gui/preferencesWindow.vala:79 msgid "bake your pies!" msgstr "Préparez vos tartes !" -#: ../../src/gui/preferencesWindow.vala:227 +#: ../../src/gui/preferencesWindow.vala:235 msgid "Pies can be opened with the terminal command \"gnome-pie --open=ID\"." msgstr "" +"Les Tartes peuvent être ouvertes avec la ligne de commande \"gnome-pie --" +"open=ID\"." -#: ../../src/gui/preferencesWindow.vala:228 +#: ../../src/gui/preferencesWindow.vala:236 msgid "Feel free to visit Gnome-Pie's homepage at %s!" -msgstr "" +msgstr "N'hésitez pas à visiter le site de Gnome-Pie sur %s !" -#: ../../src/gui/preferencesWindow.vala:229 +#: ../../src/gui/preferencesWindow.vala:237 msgid "If you want to give some feedback, please write an e-mail to %s!" -msgstr "" +msgstr "Si vous avez des retours, merci d'écrire un courriel à %s !" -#: ../../src/gui/preferencesWindow.vala:230 +#: ../../src/gui/preferencesWindow.vala:238 msgid "You can support the development of Gnome-Pie by donating via %s." -msgstr "" +msgstr "Vous pouvez aider au développement de Gnome-Pie en donnant via %s." -#: ../../src/gui/preferencesWindow.vala:231 +#: ../../src/gui/preferencesWindow.vala:239 msgid "" "Translating Gnome-Pie to your language is easy. Translations are managed at " "%s." msgstr "" +"Traduire Gnome-Pie dans votre langue est facile. Les traductions sont gérées " +"par %s." -#: ../../src/gui/preferencesWindow.vala:232 +#: ../../src/gui/preferencesWindow.vala:240 msgid "" "It's easy to create new themes for Gnome-Pie. Read the <a href=" "'%s'>Tutorial</a> online." msgstr "" +"Il est facile de créer de nouveaux thèmes pour Gnome-Pie. Lisez le <a href=" +"'%s'>Didacticiel</a> en ligne." -#: ../../src/gui/preferencesWindow.vala:233 -msgid "It's usually a good practive to have at most twelve slices per pie." -msgstr "" +#: ../../src/gui/preferencesWindow.vala:241 +msgid "It's usually a good practice to have at most twelve slices per pie." +msgstr "Un maximum de douze Parts par Tarte est considéré comme idéal." -#: ../../src/gui/preferencesWindow.vala:234 +#: ../../src/gui/preferencesWindow.vala:242 msgid "You can export themes you created and share them with the community!" -msgstr "" +msgstr "Vous pouvez exporter vos thèmes et les partager avec la communauté !" -#: ../../src/gui/preferencesWindow.vala:235 +#: ../../src/gui/preferencesWindow.vala:243 msgid "The source code of Gnome-Pie is available on %s." -msgstr "" +msgstr "Le code source de Gnome-Pie est disponible sur %s." -#: ../../src/gui/preferencesWindow.vala:236 +#: ../../src/gui/preferencesWindow.vala:244 msgid "Bugs can be reported at %s!" -msgstr "" +msgstr "Les bugs peuvent être signalés à %s!" -#: ../../src/gui/preferencesWindow.vala:237 +#: ../../src/gui/preferencesWindow.vala:245 msgid "Suggestions can be posted on %s!" -msgstr "" +msgstr "Les suggestions peuvent être faites sur %s !" -#: ../../src/gui/preferencesWindow.vala:238 +#: ../../src/gui/preferencesWindow.vala:246 msgid "" "An awesome companion of Gnome-Pie is %s. It will make using your computer " "feel like magic!" msgstr "" +"Un excellent compagnon pour Gnome-Pie est %s. Vous aurez l'impression " +"d'ajouter de la magie à votre ordinateur !" -#: ../../src/gui/preferencesWindow.vala:239 +#: ../../src/gui/preferencesWindow.vala:247 msgid "You can drag'n'drop applications from your main menu to the pie above." msgstr "" +"Vous pouvez glisser-déposer des applications depuis votre menu principal " +"vers la Tarte ci-dessus." -#: ../../src/gui/preferencesWindow.vala:240 +#: ../../src/gui/preferencesWindow.vala:248 msgid "" "You may drag'n'drop URLs and bookmarks from your internet browser to the pie " "above." msgstr "" +"Vous pouvez glisser-déposer des URL et des favoris depuis votre navigateur " +"internet vers la Tarte ci-dessus." -#: ../../src/gui/preferencesWindow.vala:241 +#: ../../src/gui/preferencesWindow.vala:249 msgid "" "You can drag'n'drop files and folders from your file browser to the pie " "above." msgstr "" +"Vous pouvez glisser-déposer des fichiers et dossiers depuis votre " +"explorateur vers la Tarte ci-dessus." -#: ../../src/gui/preferencesWindow.vala:242 +#: ../../src/gui/preferencesWindow.vala:250 msgid "" "You can drag'n'drop pies from the list on the left into other pies in order " "to create sub-pies." msgstr "" +"Vous pouvez glisser-déposer des Tartes depuis la liste à gauche dans " +"d'autres Tartes pour créer des sous-Tartes." -#: ../../src/gui/preferencesWindow.vala:243 +#: ../../src/gui/preferencesWindow.vala:251 msgid "" "You can drag'n'drop pies from the list on the left to your desktop or dock " "to create a launcher for this pie." msgstr "" +"Vous pouvez glisser-déposer des Tartes depuis la liste à gauche vers votre " +"bureau ou votre dock pour créer un lanceur." -#: ../../src/gui/preferencesWindow.vala:387 +#: ../../src/gui/preferencesWindow.vala:401 msgid "Sucessfully imported new theme!" -msgstr "" +msgstr "Nouveau thème importé avec succès !" -#: ../../src/gui/preferencesWindow.vala:401 +#: ../../src/gui/preferencesWindow.vala:415 msgid "An error occured while importing the theme: Failed to extract theme!" msgstr "" +"Une erreur est survenue pendant l'importation du thème : impossible " +"d'extraire le thème !" -#: ../../src/gui/preferencesWindow.vala:405 +#: ../../src/gui/preferencesWindow.vala:419 msgid "" "An error occured while importing the theme: A theme with this name does " "already exist!" msgstr "" +"Une erreur est survenue pendant l'importation du thème : Un thème avec ce " +"nom existe déjà !" -#: ../../src/gui/preferencesWindow.vala:409 +#: ../../src/gui/preferencesWindow.vala:423 msgid "" "An error occured while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" +"Une erreur est survenue pendant l'importation du thème : L'archive ne " +"contient pas de thème valide !" -#: ../../src/gui/preferencesWindow.vala:413 +#: ../../src/gui/preferencesWindow.vala:427 msgid "" "An error occured while importing the theme: Failed to open theme archive!" msgstr "" +"Une erreur est survenue pendant l'importation du thème : Impossible d'ouvrir " +"l'archive !" -#: ../../src/gui/preferencesWindow.vala:492 +#: ../../src/gui/preferencesWindow.vala:451 +msgid "Do you really want to delete the selected theme from %s?" +msgstr "" + +#: ../../src/gui/preferencesWindow.vala:528 msgid "New Pie" msgstr "Nouvelle Tarte" -#: ../../src/gui/preferencesWindow.vala:507 +#: ../../src/gui/preferencesWindow.vala:543 msgid "" "Do you really want to delete the selected Pie with all contained Slices?" msgstr "Voulez-vous supprimer la Tarte sélectionnée et son contenu ?" @@ -513,6 +552,10 @@ msgstr "" msgid "Themes" msgstr "Thèmes" +#: ../../src/gui/themeList.vala:108 +msgid "by" +msgstr "" + #: ../../src/gui/indicator.vala:126 msgid "_Preferences" msgstr "_Préférences" @@ -531,7 +574,7 @@ msgstr "_Fermer" #: ../../src/gui/triggerSelectButton.vala:64 msgid "Press a hotkey ..." -msgstr "Faites un raccourci clavier" +msgstr "Faites un raccourci clavier ..." #: ../../src/utilities/key.vala:65 ../../src/utilities/bindingManager.vala:186 #: ../../src/utilities/trigger.vala:195 ../../src/utilities/trigger.vala:280 @@ -583,15 +626,17 @@ msgstr "Quart de tarte" msgid "Half pie" msgstr "Demie tarte" -#: ../../src/themes/theme.vala:139 +#: ../../src/themes/theme.vala:169 msgid "Successfully exported the theme \"%s\"!" -msgstr "" +msgstr "Thème \"%s\" exporté avec succès !" -#: ../../src/themes/theme.vala:146 +#: ../../src/themes/theme.vala:176 msgid "" "An error occured while exporting the theme \"%s\"! Please check the console " "output." msgstr "" +"Une erreur est survenue pendant l'importation du thème \"%s\" : Plus " +"d'informations sur la sortie console." #: ../../src/actionGroups/windowListGroup.vala:34 msgid "Group: Window List" @@ -609,7 +654,7 @@ msgstr "Groupe : Presse-papier" #: ../../src/actionGroups/clipboardGroup.vala:66 msgid "Manages your Clipboard." -msgstr "Gère votre Presse-papier" +msgstr "Gère votre Presse-papier." #: ../../src/actionGroups/devicesGroup.vala:35 msgid "Group: Devices" diff --git a/resources/locale/it/LC_MESSAGES/it.po b/resources/locale/it/LC_MESSAGES/it.po index 12289b2..24963ec 100644 --- a/resources/locale/it/LC_MESSAGES/it.po +++ b/resources/locale/it/LC_MESSAGES/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnomepie 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-17 17:33+0100\n" +"POT-Creation-Date: 2015-09-30 18:32+0100\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -17,7 +17,7 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: Italian\n" -"X-Generator: Zanata 3.7.1\n" +"X-Generator: Zanata 3.7.2\n" #: ../ui/pie_options.ui:53 msgid "Activation Settings" @@ -152,7 +152,7 @@ msgstr "Tema di icone" msgid "Custom Icon" msgstr "Icona personalizzata" -#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:77 +#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:78 #, fuzzy msgid "Gnome-Pie Settings" msgstr "Gnome-Pie - Impostazioni" @@ -216,19 +216,23 @@ msgid "Import a theme from a file." msgstr "" #: ../ui/preferences.ui:323 +msgid "Delete the selected theme." +msgstr "" + +#: ../ui/preferences.ui:344 msgid "Export the selected theme for sharing." msgstr "" -#: ../ui/preferences.ui:371 +#: ../ui/preferences.ui:392 msgid "Open a tutorial on how to create new themes for Gnome-Pie." msgstr "" -#: ../ui/preferences.ui:421 ../../src/gui/preferencesWindow.vala:108 +#: ../ui/preferences.ui:442 ../../src/gui/preferencesWindow.vala:109 #, fuzzy msgid "General Settings" msgstr "Gnome-Pie - Impostazioni" -#: ../ui/preferences.ui:613 +#: ../ui/preferences.ui:634 msgid "" "<b><big>This Pie is empty!</big>\n" "\n" @@ -239,7 +243,7 @@ msgid "" "For manual and advanced configuration click on the plus sign." msgstr "" -#: ../ui/preferences.ui:634 +#: ../ui/preferences.ui:655 msgid "" "<b><big>You have no Pies!</big>\n" "\n" @@ -247,7 +251,7 @@ msgid "" "plus sign in the lower left corner." msgstr "" -#: ../ui/preferences.ui:720 ../../src/gui/preferencesWindow.vala:109 +#: ../ui/preferences.ui:741 ../../src/gui/preferencesWindow.vala:110 msgid "Pie Settings" msgstr "" @@ -287,122 +291,126 @@ msgstr "Apri una Torta" msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." msgstr "" -#: ../../src/gui/preferencesWindow.vala:78 +#: ../../src/gui/preferencesWindow.vala:79 msgid "bake your pies!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:227 +#: ../../src/gui/preferencesWindow.vala:235 msgid "Pies can be opened with the terminal command \"gnome-pie --open=ID\"." msgstr "" -#: ../../src/gui/preferencesWindow.vala:228 +#: ../../src/gui/preferencesWindow.vala:236 msgid "Feel free to visit Gnome-Pie's homepage at %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:229 +#: ../../src/gui/preferencesWindow.vala:237 msgid "If you want to give some feedback, please write an e-mail to %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:230 +#: ../../src/gui/preferencesWindow.vala:238 msgid "You can support the development of Gnome-Pie by donating via %s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:231 +#: ../../src/gui/preferencesWindow.vala:239 msgid "" "Translating Gnome-Pie to your language is easy. Translations are managed at " "%s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:232 +#: ../../src/gui/preferencesWindow.vala:240 msgid "" "It's easy to create new themes for Gnome-Pie. Read the <a href=" "'%s'>Tutorial</a> online." msgstr "" -#: ../../src/gui/preferencesWindow.vala:233 -msgid "It's usually a good practive to have at most twelve slices per pie." +#: ../../src/gui/preferencesWindow.vala:241 +msgid "It's usually a good practice to have at most twelve slices per pie." msgstr "" -#: ../../src/gui/preferencesWindow.vala:234 +#: ../../src/gui/preferencesWindow.vala:242 msgid "You can export themes you created and share them with the community!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:235 +#: ../../src/gui/preferencesWindow.vala:243 msgid "The source code of Gnome-Pie is available on %s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:236 +#: ../../src/gui/preferencesWindow.vala:244 msgid "Bugs can be reported at %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:237 +#: ../../src/gui/preferencesWindow.vala:245 msgid "Suggestions can be posted on %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:238 +#: ../../src/gui/preferencesWindow.vala:246 msgid "" "An awesome companion of Gnome-Pie is %s. It will make using your computer " "feel like magic!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:239 +#: ../../src/gui/preferencesWindow.vala:247 msgid "You can drag'n'drop applications from your main menu to the pie above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:240 +#: ../../src/gui/preferencesWindow.vala:248 msgid "" "You may drag'n'drop URLs and bookmarks from your internet browser to the pie " "above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:241 +#: ../../src/gui/preferencesWindow.vala:249 msgid "" "You can drag'n'drop files and folders from your file browser to the pie " "above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:242 +#: ../../src/gui/preferencesWindow.vala:250 msgid "" "You can drag'n'drop pies from the list on the left into other pies in order " "to create sub-pies." msgstr "" -#: ../../src/gui/preferencesWindow.vala:243 +#: ../../src/gui/preferencesWindow.vala:251 msgid "" "You can drag'n'drop pies from the list on the left to your desktop or dock " "to create a launcher for this pie." msgstr "" -#: ../../src/gui/preferencesWindow.vala:387 +#: ../../src/gui/preferencesWindow.vala:401 msgid "Sucessfully imported new theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:401 +#: ../../src/gui/preferencesWindow.vala:415 msgid "An error occured while importing the theme: Failed to extract theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:405 +#: ../../src/gui/preferencesWindow.vala:419 msgid "" "An error occured while importing the theme: A theme with this name does " "already exist!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:409 +#: ../../src/gui/preferencesWindow.vala:423 msgid "" "An error occured while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:413 +#: ../../src/gui/preferencesWindow.vala:427 msgid "" "An error occured while importing the theme: Failed to open theme archive!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:492 +#: ../../src/gui/preferencesWindow.vala:451 +msgid "Do you really want to delete the selected theme from %s?" +msgstr "" + +#: ../../src/gui/preferencesWindow.vala:528 msgid "New Pie" msgstr "Nuova Torta" -#: ../../src/gui/preferencesWindow.vala:507 +#: ../../src/gui/preferencesWindow.vala:543 msgid "" "Do you really want to delete the selected Pie with all contained Slices?" msgstr "" @@ -500,6 +508,10 @@ msgstr "" msgid "Themes" msgstr "Temi" +#: ../../src/gui/themeList.vala:108 +msgid "by" +msgstr "" + #: ../../src/gui/indicator.vala:126 msgid "_Preferences" msgstr "" @@ -571,11 +583,11 @@ msgstr "" msgid "Half pie" msgstr "" -#: ../../src/themes/theme.vala:139 +#: ../../src/themes/theme.vala:169 msgid "Successfully exported the theme \"%s\"!" msgstr "" -#: ../../src/themes/theme.vala:146 +#: ../../src/themes/theme.vala:176 msgid "" "An error occured while exporting the theme \"%s\"! Please check the console " "output." diff --git a/resources/locale/ko/LC_MESSAGES/ko.po b/resources/locale/ko/LC_MESSAGES/ko.po index 11623b1..5e04f1d 100644 --- a/resources/locale/ko/LC_MESSAGES/ko.po +++ b/resources/locale/ko/LC_MESSAGES/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnomepie 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-17 17:33+0100\n" +"POT-Creation-Date: 2015-09-30 18:32+0100\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -16,7 +16,7 @@ msgstr "" "Language-Team: Korean\n" "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Zanata 3.7.1\n" +"X-Generator: Zanata 3.7.2\n" #: ../ui/pie_options.ui:53 msgid "Activation Settings" @@ -142,7 +142,7 @@ msgstr "아이콘 테마" msgid "Custom Icon" msgstr "사용자 설정 아이콘" -#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:77 +#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:78 msgid "Gnome-Pie Settings" msgstr "그놈 파이 설정" @@ -203,18 +203,22 @@ msgid "Import a theme from a file." msgstr "" #: ../ui/preferences.ui:323 +msgid "Delete the selected theme." +msgstr "" + +#: ../ui/preferences.ui:344 msgid "Export the selected theme for sharing." msgstr "" -#: ../ui/preferences.ui:371 +#: ../ui/preferences.ui:392 msgid "Open a tutorial on how to create new themes for Gnome-Pie." msgstr "" -#: ../ui/preferences.ui:421 ../../src/gui/preferencesWindow.vala:108 +#: ../ui/preferences.ui:442 ../../src/gui/preferencesWindow.vala:109 msgid "General Settings" msgstr "일반 설정" -#: ../ui/preferences.ui:613 +#: ../ui/preferences.ui:634 msgid "" "<b><big>This Pie is empty!</big>\n" "\n" @@ -225,7 +229,7 @@ msgid "" "For manual and advanced configuration click on the plus sign." msgstr "" -#: ../ui/preferences.ui:634 +#: ../ui/preferences.ui:655 msgid "" "<b><big>You have no Pies!</big>\n" "\n" @@ -236,7 +240,7 @@ msgstr "" "\n" "하나 만드는 것부터 시작하십시오! </b> 왼쪽 하단 모서리의 작은 더하기 기호를 누르면 만들 수 있습니다." -#: ../ui/preferences.ui:720 ../../src/gui/preferencesWindow.vala:109 +#: ../ui/preferences.ui:741 ../../src/gui/preferencesWindow.vala:110 msgid "Pie Settings" msgstr "" @@ -276,122 +280,126 @@ msgstr "파이 열기" msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." msgstr "그놈 파이를 하나 더 엽니다. 이 방법으로 하위 메뉴를 만들 수 있습니다." -#: ../../src/gui/preferencesWindow.vala:78 +#: ../../src/gui/preferencesWindow.vala:79 msgid "bake your pies!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:227 +#: ../../src/gui/preferencesWindow.vala:235 msgid "Pies can be opened with the terminal command \"gnome-pie --open=ID\"." msgstr "" -#: ../../src/gui/preferencesWindow.vala:228 +#: ../../src/gui/preferencesWindow.vala:236 msgid "Feel free to visit Gnome-Pie's homepage at %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:229 +#: ../../src/gui/preferencesWindow.vala:237 msgid "If you want to give some feedback, please write an e-mail to %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:230 +#: ../../src/gui/preferencesWindow.vala:238 msgid "You can support the development of Gnome-Pie by donating via %s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:231 +#: ../../src/gui/preferencesWindow.vala:239 msgid "" "Translating Gnome-Pie to your language is easy. Translations are managed at " "%s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:232 +#: ../../src/gui/preferencesWindow.vala:240 msgid "" "It's easy to create new themes for Gnome-Pie. Read the <a href=" "'%s'>Tutorial</a> online." msgstr "" -#: ../../src/gui/preferencesWindow.vala:233 -msgid "It's usually a good practive to have at most twelve slices per pie." +#: ../../src/gui/preferencesWindow.vala:241 +msgid "It's usually a good practice to have at most twelve slices per pie." msgstr "" -#: ../../src/gui/preferencesWindow.vala:234 +#: ../../src/gui/preferencesWindow.vala:242 msgid "You can export themes you created and share them with the community!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:235 +#: ../../src/gui/preferencesWindow.vala:243 msgid "The source code of Gnome-Pie is available on %s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:236 +#: ../../src/gui/preferencesWindow.vala:244 msgid "Bugs can be reported at %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:237 +#: ../../src/gui/preferencesWindow.vala:245 msgid "Suggestions can be posted on %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:238 +#: ../../src/gui/preferencesWindow.vala:246 msgid "" "An awesome companion of Gnome-Pie is %s. It will make using your computer " "feel like magic!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:239 +#: ../../src/gui/preferencesWindow.vala:247 msgid "You can drag'n'drop applications from your main menu to the pie above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:240 +#: ../../src/gui/preferencesWindow.vala:248 msgid "" "You may drag'n'drop URLs and bookmarks from your internet browser to the pie " "above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:241 +#: ../../src/gui/preferencesWindow.vala:249 msgid "" "You can drag'n'drop files and folders from your file browser to the pie " "above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:242 +#: ../../src/gui/preferencesWindow.vala:250 msgid "" "You can drag'n'drop pies from the list on the left into other pies in order " "to create sub-pies." msgstr "" -#: ../../src/gui/preferencesWindow.vala:243 +#: ../../src/gui/preferencesWindow.vala:251 msgid "" "You can drag'n'drop pies from the list on the left to your desktop or dock " "to create a launcher for this pie." msgstr "" -#: ../../src/gui/preferencesWindow.vala:387 +#: ../../src/gui/preferencesWindow.vala:401 msgid "Sucessfully imported new theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:401 +#: ../../src/gui/preferencesWindow.vala:415 msgid "An error occured while importing the theme: Failed to extract theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:405 +#: ../../src/gui/preferencesWindow.vala:419 msgid "" "An error occured while importing the theme: A theme with this name does " "already exist!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:409 +#: ../../src/gui/preferencesWindow.vala:423 msgid "" "An error occured while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:413 +#: ../../src/gui/preferencesWindow.vala:427 msgid "" "An error occured while importing the theme: Failed to open theme archive!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:492 +#: ../../src/gui/preferencesWindow.vala:451 +msgid "Do you really want to delete the selected theme from %s?" +msgstr "" + +#: ../../src/gui/preferencesWindow.vala:528 msgid "New Pie" msgstr "새 파이" -#: ../../src/gui/preferencesWindow.vala:507 +#: ../../src/gui/preferencesWindow.vala:543 msgid "" "Do you really want to delete the selected Pie with all contained Slices?" msgstr "선택한 파이와 파이 안의 모든 조각을 삭제하시겠습니까?" @@ -483,6 +491,10 @@ msgstr "이 단축키는 이미 \"%s\" 파이에 할당했습니다!\n" msgid "Themes" msgstr "테마" +#: ../../src/gui/themeList.vala:108 +msgid "by" +msgstr "" + #: ../../src/gui/indicator.vala:126 msgid "_Preferences" msgstr "" @@ -553,11 +565,11 @@ msgstr "" msgid "Half pie" msgstr "" -#: ../../src/themes/theme.vala:139 +#: ../../src/themes/theme.vala:169 msgid "Successfully exported the theme \"%s\"!" msgstr "" -#: ../../src/themes/theme.vala:146 +#: ../../src/themes/theme.vala:176 msgid "" "An error occured while exporting the theme \"%s\"! Please check the console " "output." diff --git a/resources/locale/lt/LC_MESSAGES/lt.po b/resources/locale/lt/LC_MESSAGES/lt.po index ce37393..ad1cf73 100644 --- a/resources/locale/lt/LC_MESSAGES/lt.po +++ b/resources/locale/lt/LC_MESSAGES/lt.po @@ -2,22 +2,23 @@ # Copyright (C) 2015 Simon Schneegans <code@simonschneegans.de> # This file is distributed under the same license as the gnomepie package. # Moo <hazap@hotmail.com>, 2015. +# Moo <hazap@hotmail.com>, 2015. #zanata # Simon <code@simonschneegans.de>, 2015. #zanata msgid "" msgstr "" "Project-Id-Version: gnomepie 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-17 17:33+0100\n" +"POT-Creation-Date: 2015-09-30 18:32+0100\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2015-09-09 06:36-0400\n" -"Last-Translator: Moo <hazap@hotmail.com>\n" +"PO-Revision-Date: 2015-09-30 01:36-0400\n" +"Last-Translator: Simon <code@simonschneegans.de>\n" "Language-Team: Lithuanian\n" "Language: lt\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "(n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Zanata 3.7.1\n" +"X-Generator: Zanata 3.7.2\n" #: ../ui/pie_options.ui:53 msgid "Activation Settings" @@ -154,7 +155,7 @@ msgstr "Piktogramų Tema" msgid "Custom Icon" msgstr "Pasirinktina Piktograma" -#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:77 +#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:78 msgid "Gnome-Pie Settings" msgstr "Gnome-Pie Nustatymai" @@ -218,21 +219,26 @@ msgstr "Daugiausia gabaliukų pyrage" #: ../ui/preferences.ui:302 msgid "Import a theme from a file." -msgstr "" +msgstr "Importuoti temą iš failo." #: ../ui/preferences.ui:323 -msgid "Export the selected theme for sharing." +msgid "Delete the selected theme." msgstr "" -#: ../ui/preferences.ui:371 +#: ../ui/preferences.ui:344 +msgid "Export the selected theme for sharing." +msgstr "Eksportuoti pasirinktą temą dalinimuisi." + +#: ../ui/preferences.ui:392 msgid "Open a tutorial on how to create new themes for Gnome-Pie." msgstr "" +"Atverti vadovėlį apie tai, kaip kurti naujas temas programai Gnome-Pie." -#: ../ui/preferences.ui:421 ../../src/gui/preferencesWindow.vala:108 +#: ../ui/preferences.ui:442 ../../src/gui/preferencesWindow.vala:109 msgid "General Settings" msgstr "Bendri Nustatymai" -#: ../ui/preferences.ui:613 +#: ../ui/preferences.ui:634 msgid "" "<b><big>This Pie is empty!</big>\n" "\n" @@ -251,7 +257,7 @@ msgstr "" "\n" "Rankinei ar išplėstinei konfigūracijai, spauskite pliuso ženklą." -#: ../ui/preferences.ui:634 +#: ../ui/preferences.ui:655 msgid "" "<b><big>You have no Pies!</big>\n" "\n" @@ -263,7 +269,7 @@ msgstr "" "Pradėkite, kurdami pirmą pyragą! </b> Tai galite atlikti nuspaudę, " "apatiniame kairiajame kampe esantį, mažytį pliuso ženklą." -#: ../ui/preferences.ui:720 ../../src/gui/preferencesWindow.vala:109 +#: ../ui/preferences.ui:741 ../../src/gui/preferencesWindow.vala:110 msgid "Pie Settings" msgstr "Pyrago Nustatymai" @@ -304,122 +310,147 @@ msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." msgstr "" "Atveria kitą Gnome-Pie Pyragą. Tokiu būdu galite kurti kelis submeniu." -#: ../../src/gui/preferencesWindow.vala:78 +#: ../../src/gui/preferencesWindow.vala:79 msgid "bake your pies!" msgstr "kepkite savo pyragus!" -#: ../../src/gui/preferencesWindow.vala:227 +#: ../../src/gui/preferencesWindow.vala:235 msgid "Pies can be opened with the terminal command \"gnome-pie --open=ID\"." msgstr "" +"Pyragai gali būti atverti, naudojant terminalo komandą \"gnome-pie --open=" +"ID\"." -#: ../../src/gui/preferencesWindow.vala:228 +#: ../../src/gui/preferencesWindow.vala:236 msgid "Feel free to visit Gnome-Pie's homepage at %s!" msgstr "" +"Nesivaržykite apsilankyti Gnome-Pie internetinėje svetainėje, adresu %s!" -#: ../../src/gui/preferencesWindow.vala:229 +#: ../../src/gui/preferencesWindow.vala:237 msgid "If you want to give some feedback, please write an e-mail to %s!" -msgstr "" +msgstr "Jeigu turite kažkokių atsiliepimų, prašome rašyti el. laišką į %s!" -#: ../../src/gui/preferencesWindow.vala:230 +#: ../../src/gui/preferencesWindow.vala:238 msgid "You can support the development of Gnome-Pie by donating via %s." -msgstr "" +msgstr "Jūs galite palaikyti Gnome-Pie kūrimą, aukodami per %s." -#: ../../src/gui/preferencesWindow.vala:231 +#: ../../src/gui/preferencesWindow.vala:239 msgid "" "Translating Gnome-Pie to your language is easy. Translations are managed at " "%s." msgstr "" +"Išversti Gnome-Pie į savo kalbą yra lengva. Vertimai yra tvarkomi %s " +"sistemoje." -#: ../../src/gui/preferencesWindow.vala:232 +#: ../../src/gui/preferencesWindow.vala:240 msgid "" "It's easy to create new themes for Gnome-Pie. Read the <a href=" "'%s'>Tutorial</a> online." msgstr "" +"Kurti naujas temas programai Gnome-Pie yra lengva. Skaitykite <a href=" +"'%s'>Vadovėlį</a> internete." -#: ../../src/gui/preferencesWindow.vala:233 -msgid "It's usually a good practive to have at most twelve slices per pie." +#: ../../src/gui/preferencesWindow.vala:241 +msgid "It's usually a good practice to have at most twelve slices per pie." msgstr "" +"Dažniausiai, yra gera praktika viename pyrage turėti, daugiausia, dvylika " +"gabaliukų." -#: ../../src/gui/preferencesWindow.vala:234 +#: ../../src/gui/preferencesWindow.vala:242 msgid "You can export themes you created and share them with the community!" msgstr "" +"Jūs galite eksportuoti savo sukurtas temas ir dalintis jomis su bendruomene!" -#: ../../src/gui/preferencesWindow.vala:235 +#: ../../src/gui/preferencesWindow.vala:243 msgid "The source code of Gnome-Pie is available on %s." -msgstr "" +msgstr "Gnome-Pie pirminis kodas yra prieinamas sistemoje %s." -#: ../../src/gui/preferencesWindow.vala:236 +#: ../../src/gui/preferencesWindow.vala:244 msgid "Bugs can be reported at %s!" -msgstr "" +msgstr "Apie klaidas galima pranešti sistemoje %s!" -#: ../../src/gui/preferencesWindow.vala:237 +#: ../../src/gui/preferencesWindow.vala:245 msgid "Suggestions can be posted on %s!" -msgstr "" +msgstr "Pasiūlymus galima išsiųsti sistemoje %s!" -#: ../../src/gui/preferencesWindow.vala:238 +#: ../../src/gui/preferencesWindow.vala:246 msgid "" "An awesome companion of Gnome-Pie is %s. It will make using your computer " "feel like magic!" msgstr "" +"Nuostabus Gnome-Pie draugas yra programa %s. Ji padarys jūsų naudojimąsi " +"kompiuteriu kaip pasaką!" -#: ../../src/gui/preferencesWindow.vala:239 +#: ../../src/gui/preferencesWindow.vala:247 msgid "You can drag'n'drop applications from your main menu to the pie above." -msgstr "" +msgstr "Galite tempti programas iš savo meniu į aukščiau esantį pyragą." -#: ../../src/gui/preferencesWindow.vala:240 +#: ../../src/gui/preferencesWindow.vala:248 msgid "" "You may drag'n'drop URLs and bookmarks from your internet browser to the pie " "above." msgstr "" +"Galite tempti URL ir adresyno įrašus iš savo naršyklės į aukščiau esantį " +"pyragą." -#: ../../src/gui/preferencesWindow.vala:241 +#: ../../src/gui/preferencesWindow.vala:249 msgid "" "You can drag'n'drop files and folders from your file browser to the pie " "above." msgstr "" +"Galite tempti failus ir aplankus iš savo failų tvarkytuvės į aukščiau esantį " +"pyragą." -#: ../../src/gui/preferencesWindow.vala:242 +#: ../../src/gui/preferencesWindow.vala:250 msgid "" "You can drag'n'drop pies from the list on the left into other pies in order " "to create sub-pies." msgstr "" +"Galite tempti pyragus iš sąrašo kairėje į kitus pyragus, kad sukurtumėte " +"popyragius." -#: ../../src/gui/preferencesWindow.vala:243 +#: ../../src/gui/preferencesWindow.vala:251 msgid "" "You can drag'n'drop pies from the list on the left to your desktop or dock " "to create a launcher for this pie." msgstr "" +"Galite tempti pyragus iš sąrašo kairėje į savo darbalaukį ar skydelį, kad " +"sukurtumėte šio pyrago leistuką." -#: ../../src/gui/preferencesWindow.vala:387 +#: ../../src/gui/preferencesWindow.vala:401 msgid "Sucessfully imported new theme!" -msgstr "" +msgstr "Nauja tema buvo sėkmingai importuota!" -#: ../../src/gui/preferencesWindow.vala:401 +#: ../../src/gui/preferencesWindow.vala:415 msgid "An error occured while importing the theme: Failed to extract theme!" -msgstr "" +msgstr "Importuojant temą, įvyko klaida: Nepavyko išskleisti temos!" -#: ../../src/gui/preferencesWindow.vala:405 +#: ../../src/gui/preferencesWindow.vala:419 msgid "" "An error occured while importing the theme: A theme with this name does " "already exist!" -msgstr "" +msgstr "Importuojant temą, įvyko klaida: Tema tokiu pavadinimu jau yra!" -#: ../../src/gui/preferencesWindow.vala:409 +#: ../../src/gui/preferencesWindow.vala:423 msgid "" "An error occured while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" +"Importuojant temą, įvyko klaida: Temos archyve nėra taisyklingos temos!" -#: ../../src/gui/preferencesWindow.vala:413 +#: ../../src/gui/preferencesWindow.vala:427 msgid "" "An error occured while importing the theme: Failed to open theme archive!" +msgstr "Importuojant temą, įvyko klaida: Nepavyko atverti temos archyvo!" + +#: ../../src/gui/preferencesWindow.vala:451 +msgid "Do you really want to delete the selected theme from %s?" msgstr "" -#: ../../src/gui/preferencesWindow.vala:492 +#: ../../src/gui/preferencesWindow.vala:528 msgid "New Pie" msgstr "Naujas Pyragas" -#: ../../src/gui/preferencesWindow.vala:507 +#: ../../src/gui/preferencesWindow.vala:543 msgid "" "Do you really want to delete the selected Pie with all contained Slices?" msgstr "" @@ -513,6 +544,10 @@ msgstr "" msgid "Themes" msgstr "Temos" +#: ../../src/gui/themeList.vala:108 +msgid "by" +msgstr "" + #: ../../src/gui/indicator.vala:126 msgid "_Preferences" msgstr "_Nuostatos" @@ -583,15 +618,15 @@ msgstr "Ketvirtis pyrago" msgid "Half pie" msgstr "Pusė pyrago" -#: ../../src/themes/theme.vala:139 +#: ../../src/themes/theme.vala:169 msgid "Successfully exported the theme \"%s\"!" -msgstr "" +msgstr "\"%s\" tema buvo sėkmingai eksportuota!" -#: ../../src/themes/theme.vala:146 +#: ../../src/themes/theme.vala:176 msgid "" "An error occured while exporting the theme \"%s\"! Please check the console " "output." -msgstr "" +msgstr "Eksportuojant \"%s\" temą, įvyko klaida! Prašome žiūrėti pulto išvestį." #: ../../src/actionGroups/windowListGroup.vala:34 msgid "Group: Window List" diff --git a/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po b/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po index 9da5e89..33d8a3e 100644 --- a/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po +++ b/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnomepie 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-17 17:33+0100\n" +"POT-Creation-Date: 2015-09-30 18:32+0100\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -16,7 +16,7 @@ msgstr "" "Language-Team: Brazilian Portuguese\n" "Language: pt-BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Zanata 3.7.1\n" +"X-Generator: Zanata 3.7.2\n" #: ../ui/pie_options.ui:53 msgid "Activation Settings" @@ -146,7 +146,7 @@ msgstr "Tema de Ícones" msgid "Custom Icon" msgstr "Outros Ícones" -#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:77 +#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:78 msgid "Gnome-Pie Settings" msgstr "Configurações do Gnome-Pie" @@ -211,18 +211,22 @@ msgid "Import a theme from a file." msgstr "" #: ../ui/preferences.ui:323 +msgid "Delete the selected theme." +msgstr "" + +#: ../ui/preferences.ui:344 msgid "Export the selected theme for sharing." msgstr "" -#: ../ui/preferences.ui:371 +#: ../ui/preferences.ui:392 msgid "Open a tutorial on how to create new themes for Gnome-Pie." msgstr "" -#: ../ui/preferences.ui:421 ../../src/gui/preferencesWindow.vala:108 +#: ../ui/preferences.ui:442 ../../src/gui/preferencesWindow.vala:109 msgid "General Settings" msgstr "Configurações Gerais" -#: ../ui/preferences.ui:613 +#: ../ui/preferences.ui:634 msgid "" "<b><big>This Pie is empty!</big>\n" "\n" @@ -233,7 +237,7 @@ msgid "" "For manual and advanced configuration click on the plus sign." msgstr "" -#: ../ui/preferences.ui:634 +#: ../ui/preferences.ui:655 msgid "" "<b><big>You have no Pies!</big>\n" "\n" @@ -245,7 +249,7 @@ msgstr "" "Comece criando um! </b> Isto pode ser feito ao clicar no pequeno sinal de " "mais no canto inferior esquerdo." -#: ../ui/preferences.ui:720 ../../src/gui/preferencesWindow.vala:109 +#: ../ui/preferences.ui:741 ../../src/gui/preferencesWindow.vala:110 msgid "Pie Settings" msgstr "" @@ -285,122 +289,126 @@ msgstr "Abrir Menu" msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." msgstr "Abre outro Menu do Gnome-Pie. Desta forma você pode criar submenus." -#: ../../src/gui/preferencesWindow.vala:78 +#: ../../src/gui/preferencesWindow.vala:79 msgid "bake your pies!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:227 +#: ../../src/gui/preferencesWindow.vala:235 msgid "Pies can be opened with the terminal command \"gnome-pie --open=ID\"." msgstr "" -#: ../../src/gui/preferencesWindow.vala:228 +#: ../../src/gui/preferencesWindow.vala:236 msgid "Feel free to visit Gnome-Pie's homepage at %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:229 +#: ../../src/gui/preferencesWindow.vala:237 msgid "If you want to give some feedback, please write an e-mail to %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:230 +#: ../../src/gui/preferencesWindow.vala:238 msgid "You can support the development of Gnome-Pie by donating via %s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:231 +#: ../../src/gui/preferencesWindow.vala:239 msgid "" "Translating Gnome-Pie to your language is easy. Translations are managed at " "%s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:232 +#: ../../src/gui/preferencesWindow.vala:240 msgid "" "It's easy to create new themes for Gnome-Pie. Read the <a href=" "'%s'>Tutorial</a> online." msgstr "" -#: ../../src/gui/preferencesWindow.vala:233 -msgid "It's usually a good practive to have at most twelve slices per pie." +#: ../../src/gui/preferencesWindow.vala:241 +msgid "It's usually a good practice to have at most twelve slices per pie." msgstr "" -#: ../../src/gui/preferencesWindow.vala:234 +#: ../../src/gui/preferencesWindow.vala:242 msgid "You can export themes you created and share them with the community!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:235 +#: ../../src/gui/preferencesWindow.vala:243 msgid "The source code of Gnome-Pie is available on %s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:236 +#: ../../src/gui/preferencesWindow.vala:244 msgid "Bugs can be reported at %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:237 +#: ../../src/gui/preferencesWindow.vala:245 msgid "Suggestions can be posted on %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:238 +#: ../../src/gui/preferencesWindow.vala:246 msgid "" "An awesome companion of Gnome-Pie is %s. It will make using your computer " "feel like magic!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:239 +#: ../../src/gui/preferencesWindow.vala:247 msgid "You can drag'n'drop applications from your main menu to the pie above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:240 +#: ../../src/gui/preferencesWindow.vala:248 msgid "" "You may drag'n'drop URLs and bookmarks from your internet browser to the pie " "above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:241 +#: ../../src/gui/preferencesWindow.vala:249 msgid "" "You can drag'n'drop files and folders from your file browser to the pie " "above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:242 +#: ../../src/gui/preferencesWindow.vala:250 msgid "" "You can drag'n'drop pies from the list on the left into other pies in order " "to create sub-pies." msgstr "" -#: ../../src/gui/preferencesWindow.vala:243 +#: ../../src/gui/preferencesWindow.vala:251 msgid "" "You can drag'n'drop pies from the list on the left to your desktop or dock " "to create a launcher for this pie." msgstr "" -#: ../../src/gui/preferencesWindow.vala:387 +#: ../../src/gui/preferencesWindow.vala:401 msgid "Sucessfully imported new theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:401 +#: ../../src/gui/preferencesWindow.vala:415 msgid "An error occured while importing the theme: Failed to extract theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:405 +#: ../../src/gui/preferencesWindow.vala:419 msgid "" "An error occured while importing the theme: A theme with this name does " "already exist!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:409 +#: ../../src/gui/preferencesWindow.vala:423 msgid "" "An error occured while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:413 +#: ../../src/gui/preferencesWindow.vala:427 msgid "" "An error occured while importing the theme: Failed to open theme archive!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:492 +#: ../../src/gui/preferencesWindow.vala:451 +msgid "Do you really want to delete the selected theme from %s?" +msgstr "" + +#: ../../src/gui/preferencesWindow.vala:528 msgid "New Pie" msgstr "Novo Menu" -#: ../../src/gui/preferencesWindow.vala:507 +#: ../../src/gui/preferencesWindow.vala:543 msgid "" "Do you really want to delete the selected Pie with all contained Slices?" msgstr "" @@ -494,6 +502,10 @@ msgstr "" msgid "Themes" msgstr "Temas" +#: ../../src/gui/themeList.vala:108 +msgid "by" +msgstr "" + #: ../../src/gui/indicator.vala:126 msgid "_Preferences" msgstr "" @@ -564,11 +576,11 @@ msgstr "" msgid "Half pie" msgstr "" -#: ../../src/themes/theme.vala:139 +#: ../../src/themes/theme.vala:169 msgid "Successfully exported the theme \"%s\"!" msgstr "" -#: ../../src/themes/theme.vala:146 +#: ../../src/themes/theme.vala:176 msgid "" "An error occured while exporting the theme \"%s\"! Please check the console " "output." diff --git a/resources/locale/ru/LC_MESSAGES/ru.po b/resources/locale/ru/LC_MESSAGES/ru.po index 6ae05b1..78b9fd0 100644 --- a/resources/locale/ru/LC_MESSAGES/ru.po +++ b/resources/locale/ru/LC_MESSAGES/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnomepie 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-17 17:33+0100\n" +"POT-Creation-Date: 2015-09-30 18:32+0100\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,7 +18,7 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Zanata 3.7.1\n" +"X-Generator: Zanata 3.7.2\n" #: ../ui/pie_options.ui:53 msgid "Activation Settings" @@ -154,7 +154,7 @@ msgstr "Тема значков" msgid "Custom Icon" msgstr "Настроить значок" -#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:77 +#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:78 #, fuzzy msgid "Gnome-Pie Settings" msgstr "Настройки Gnome-Pie" @@ -223,19 +223,23 @@ msgid "Import a theme from a file." msgstr "" #: ../ui/preferences.ui:323 +msgid "Delete the selected theme." +msgstr "" + +#: ../ui/preferences.ui:344 msgid "Export the selected theme for sharing." msgstr "" -#: ../ui/preferences.ui:371 +#: ../ui/preferences.ui:392 msgid "Open a tutorial on how to create new themes for Gnome-Pie." msgstr "" -#: ../ui/preferences.ui:421 ../../src/gui/preferencesWindow.vala:108 +#: ../ui/preferences.ui:442 ../../src/gui/preferencesWindow.vala:109 #, fuzzy msgid "General Settings" msgstr "Основные настройки" -#: ../ui/preferences.ui:613 +#: ../ui/preferences.ui:634 msgid "" "<b><big>This Pie is empty!</big>\n" "\n" @@ -246,7 +250,7 @@ msgid "" "For manual and advanced configuration click on the plus sign." msgstr "" -#: ../ui/preferences.ui:634 +#: ../ui/preferences.ui:655 msgid "" "<b><big>You have no Pies!</big>\n" "\n" @@ -258,7 +262,7 @@ msgstr "" "Начните с создания пая! </b> Выполните это щёлкнув на небольшом значке " "плюсав нижнем левом углу." -#: ../ui/preferences.ui:720 ../../src/gui/preferencesWindow.vala:109 +#: ../ui/preferences.ui:741 ../../src/gui/preferencesWindow.vala:110 msgid "Pie Settings" msgstr "" @@ -301,122 +305,126 @@ msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." msgstr "" "Oткрывает ещё один пай Gnome-Pie. Таким образом вы можете создавать подменю." -#: ../../src/gui/preferencesWindow.vala:78 +#: ../../src/gui/preferencesWindow.vala:79 msgid "bake your pies!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:227 +#: ../../src/gui/preferencesWindow.vala:235 msgid "Pies can be opened with the terminal command \"gnome-pie --open=ID\"." msgstr "" -#: ../../src/gui/preferencesWindow.vala:228 +#: ../../src/gui/preferencesWindow.vala:236 msgid "Feel free to visit Gnome-Pie's homepage at %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:229 +#: ../../src/gui/preferencesWindow.vala:237 msgid "If you want to give some feedback, please write an e-mail to %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:230 +#: ../../src/gui/preferencesWindow.vala:238 msgid "You can support the development of Gnome-Pie by donating via %s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:231 +#: ../../src/gui/preferencesWindow.vala:239 msgid "" "Translating Gnome-Pie to your language is easy. Translations are managed at " "%s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:232 +#: ../../src/gui/preferencesWindow.vala:240 msgid "" "It's easy to create new themes for Gnome-Pie. Read the <a href=" "'%s'>Tutorial</a> online." msgstr "" -#: ../../src/gui/preferencesWindow.vala:233 -msgid "It's usually a good practive to have at most twelve slices per pie." +#: ../../src/gui/preferencesWindow.vala:241 +msgid "It's usually a good practice to have at most twelve slices per pie." msgstr "" -#: ../../src/gui/preferencesWindow.vala:234 +#: ../../src/gui/preferencesWindow.vala:242 msgid "You can export themes you created and share them with the community!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:235 +#: ../../src/gui/preferencesWindow.vala:243 msgid "The source code of Gnome-Pie is available on %s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:236 +#: ../../src/gui/preferencesWindow.vala:244 msgid "Bugs can be reported at %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:237 +#: ../../src/gui/preferencesWindow.vala:245 msgid "Suggestions can be posted on %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:238 +#: ../../src/gui/preferencesWindow.vala:246 msgid "" "An awesome companion of Gnome-Pie is %s. It will make using your computer " "feel like magic!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:239 +#: ../../src/gui/preferencesWindow.vala:247 msgid "You can drag'n'drop applications from your main menu to the pie above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:240 +#: ../../src/gui/preferencesWindow.vala:248 msgid "" "You may drag'n'drop URLs and bookmarks from your internet browser to the pie " "above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:241 +#: ../../src/gui/preferencesWindow.vala:249 msgid "" "You can drag'n'drop files and folders from your file browser to the pie " "above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:242 +#: ../../src/gui/preferencesWindow.vala:250 msgid "" "You can drag'n'drop pies from the list on the left into other pies in order " "to create sub-pies." msgstr "" -#: ../../src/gui/preferencesWindow.vala:243 +#: ../../src/gui/preferencesWindow.vala:251 msgid "" "You can drag'n'drop pies from the list on the left to your desktop or dock " "to create a launcher for this pie." msgstr "" -#: ../../src/gui/preferencesWindow.vala:387 +#: ../../src/gui/preferencesWindow.vala:401 msgid "Sucessfully imported new theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:401 +#: ../../src/gui/preferencesWindow.vala:415 msgid "An error occured while importing the theme: Failed to extract theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:405 +#: ../../src/gui/preferencesWindow.vala:419 msgid "" "An error occured while importing the theme: A theme with this name does " "already exist!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:409 +#: ../../src/gui/preferencesWindow.vala:423 msgid "" "An error occured while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:413 +#: ../../src/gui/preferencesWindow.vala:427 msgid "" "An error occured while importing the theme: Failed to open theme archive!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:492 +#: ../../src/gui/preferencesWindow.vala:451 +msgid "Do you really want to delete the selected theme from %s?" +msgstr "" + +#: ../../src/gui/preferencesWindow.vala:528 msgid "New Pie" msgstr "Новый пай" -#: ../../src/gui/preferencesWindow.vala:507 +#: ../../src/gui/preferencesWindow.vala:543 msgid "" "Do you really want to delete the selected Pie with all contained Slices?" msgstr "" @@ -515,6 +523,10 @@ msgstr "" msgid "Themes" msgstr "Темы" +#: ../../src/gui/themeList.vala:108 +msgid "by" +msgstr "" + #: ../../src/gui/indicator.vala:126 msgid "_Preferences" msgstr "" @@ -586,11 +598,11 @@ msgstr "" msgid "Half pie" msgstr "" -#: ../../src/themes/theme.vala:139 +#: ../../src/themes/theme.vala:169 msgid "Successfully exported the theme \"%s\"!" msgstr "" -#: ../../src/themes/theme.vala:146 +#: ../../src/themes/theme.vala:176 msgid "" "An error occured while exporting the theme \"%s\"! Please check the console " "output." diff --git a/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po b/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po index 2e1ef1f..d6d7c27 100644 --- a/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po +++ b/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnomepie 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-17 17:33+0100\n" +"POT-Creation-Date: 2015-09-30 18:32+0100\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -15,7 +15,7 @@ msgstr "" "Last-Translator: Administrator <tzhou@haverford.edu>\n" "Language-Team: Chinese (simplified)\n" "Language: zh-CN\n" -"X-Generator: Zanata 3.7.1\n" +"X-Generator: Zanata 3.7.2\n" "Plural-Forms: nplurals=1; plural=0\n" #: ../ui/pie_options.ui:53 @@ -143,7 +143,7 @@ msgstr "图标主题" msgid "Custom Icon" msgstr "自定义图标" -#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:77 +#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:78 msgid "Gnome-Pie Settings" msgstr "Gnome派设置" @@ -204,18 +204,22 @@ msgid "Import a theme from a file." msgstr "" #: ../ui/preferences.ui:323 +msgid "Delete the selected theme." +msgstr "" + +#: ../ui/preferences.ui:344 msgid "Export the selected theme for sharing." msgstr "" -#: ../ui/preferences.ui:371 +#: ../ui/preferences.ui:392 msgid "Open a tutorial on how to create new themes for Gnome-Pie." msgstr "" -#: ../ui/preferences.ui:421 ../../src/gui/preferencesWindow.vala:108 +#: ../ui/preferences.ui:442 ../../src/gui/preferencesWindow.vala:109 msgid "General Settings" msgstr "常规设置" -#: ../ui/preferences.ui:613 +#: ../ui/preferences.ui:634 msgid "" "<b><big>This Pie is empty!</big>\n" "\n" @@ -226,7 +230,7 @@ msgid "" "For manual and advanced configuration click on the plus sign." msgstr "" -#: ../ui/preferences.ui:634 +#: ../ui/preferences.ui:655 msgid "" "<b><big>You have no Pies!</big>\n" "\n" @@ -236,7 +240,7 @@ msgstr "<b><big>您没有新的派！</big>\n" "\n" "开始创建您自己的派吧！</b>您可以通过点击窗口左下角的小“+”号创建新的派。" -#: ../ui/preferences.ui:720 ../../src/gui/preferencesWindow.vala:109 +#: ../ui/preferences.ui:741 ../../src/gui/preferencesWindow.vala:110 msgid "Pie Settings" msgstr "" @@ -276,122 +280,126 @@ msgstr "打开新派" msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." msgstr "打开另一张派。您可以通过这种方式来创建菜单和子菜单。" -#: ../../src/gui/preferencesWindow.vala:78 +#: ../../src/gui/preferencesWindow.vala:79 msgid "bake your pies!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:227 +#: ../../src/gui/preferencesWindow.vala:235 msgid "Pies can be opened with the terminal command \"gnome-pie --open=ID\"." msgstr "" -#: ../../src/gui/preferencesWindow.vala:228 +#: ../../src/gui/preferencesWindow.vala:236 msgid "Feel free to visit Gnome-Pie's homepage at %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:229 +#: ../../src/gui/preferencesWindow.vala:237 msgid "If you want to give some feedback, please write an e-mail to %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:230 +#: ../../src/gui/preferencesWindow.vala:238 msgid "You can support the development of Gnome-Pie by donating via %s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:231 +#: ../../src/gui/preferencesWindow.vala:239 msgid "" "Translating Gnome-Pie to your language is easy. Translations are managed at " "%s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:232 +#: ../../src/gui/preferencesWindow.vala:240 msgid "" "It's easy to create new themes for Gnome-Pie. Read the <a href=" "'%s'>Tutorial</a> online." msgstr "" -#: ../../src/gui/preferencesWindow.vala:233 -msgid "It's usually a good practive to have at most twelve slices per pie." +#: ../../src/gui/preferencesWindow.vala:241 +msgid "It's usually a good practice to have at most twelve slices per pie." msgstr "" -#: ../../src/gui/preferencesWindow.vala:234 +#: ../../src/gui/preferencesWindow.vala:242 msgid "You can export themes you created and share them with the community!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:235 +#: ../../src/gui/preferencesWindow.vala:243 msgid "The source code of Gnome-Pie is available on %s." msgstr "" -#: ../../src/gui/preferencesWindow.vala:236 +#: ../../src/gui/preferencesWindow.vala:244 msgid "Bugs can be reported at %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:237 +#: ../../src/gui/preferencesWindow.vala:245 msgid "Suggestions can be posted on %s!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:238 +#: ../../src/gui/preferencesWindow.vala:246 msgid "" "An awesome companion of Gnome-Pie is %s. It will make using your computer " "feel like magic!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:239 +#: ../../src/gui/preferencesWindow.vala:247 msgid "You can drag'n'drop applications from your main menu to the pie above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:240 +#: ../../src/gui/preferencesWindow.vala:248 msgid "" "You may drag'n'drop URLs and bookmarks from your internet browser to the pie " "above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:241 +#: ../../src/gui/preferencesWindow.vala:249 msgid "" "You can drag'n'drop files and folders from your file browser to the pie " "above." msgstr "" -#: ../../src/gui/preferencesWindow.vala:242 +#: ../../src/gui/preferencesWindow.vala:250 msgid "" "You can drag'n'drop pies from the list on the left into other pies in order " "to create sub-pies." msgstr "" -#: ../../src/gui/preferencesWindow.vala:243 +#: ../../src/gui/preferencesWindow.vala:251 msgid "" "You can drag'n'drop pies from the list on the left to your desktop or dock " "to create a launcher for this pie." msgstr "" -#: ../../src/gui/preferencesWindow.vala:387 +#: ../../src/gui/preferencesWindow.vala:401 msgid "Sucessfully imported new theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:401 +#: ../../src/gui/preferencesWindow.vala:415 msgid "An error occured while importing the theme: Failed to extract theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:405 +#: ../../src/gui/preferencesWindow.vala:419 msgid "" "An error occured while importing the theme: A theme with this name does " "already exist!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:409 +#: ../../src/gui/preferencesWindow.vala:423 msgid "" "An error occured while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:413 +#: ../../src/gui/preferencesWindow.vala:427 msgid "" "An error occured while importing the theme: Failed to open theme archive!" msgstr "" -#: ../../src/gui/preferencesWindow.vala:492 +#: ../../src/gui/preferencesWindow.vala:451 +msgid "Do you really want to delete the selected theme from %s?" +msgstr "" + +#: ../../src/gui/preferencesWindow.vala:528 msgid "New Pie" msgstr "新派" -#: ../../src/gui/preferencesWindow.vala:507 +#: ../../src/gui/preferencesWindow.vala:543 msgid "" "Do you really want to delete the selected Pie with all contained Slices?" msgstr "您真的希望删除选中的派和它所包含的所有切片吗？" @@ -483,6 +491,10 @@ msgstr "该热键已经被指派给 \"%s\"了！ \n" msgid "Themes" msgstr "主题" +#: ../../src/gui/themeList.vala:108 +msgid "by" +msgstr "" + #: ../../src/gui/indicator.vala:126 msgid "_Preferences" msgstr "" @@ -553,11 +565,11 @@ msgstr "" msgid "Half pie" msgstr "" -#: ../../src/themes/theme.vala:139 +#: ../../src/themes/theme.vala:169 msgid "Successfully exported the theme \"%s\"!" msgstr "" -#: ../../src/themes/theme.vala:146 +#: ../../src/themes/theme.vala:176 msgid "" "An error occured while exporting the theme \"%s\"! Please check the console " "output." diff --git a/resources/ui/pie_options.ui b/resources/ui/pie_options.ui index cc95f8f..0e0820b 100644 --- a/resources/ui/pie_options.ui +++ b/resources/ui/pie_options.ui @@ -49,7 +49,7 @@ </object> <object class="GtkDialog" id="window"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Activation Settings</property> <property name="modal">True</property> <property name="window_position">center-on-parent</property> @@ -60,6 +60,7 @@ <property name="width_request">350</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="can_focus">False</property> @@ -109,7 +110,6 @@ <object class="GtkBox" id="vbox2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> diff --git a/resources/ui/preferences.ui b/resources/ui/preferences.ui index cd9879e..866836d 100644 --- a/resources/ui/preferences.ui +++ b/resources/ui/preferences.ui @@ -304,7 +304,7 @@ <object class="GtkImage" id="import_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">document-open</property> + <property name="icon_name">list-add-symbolic</property> <property name="icon_size">1</property> </object> </child> @@ -316,6 +316,27 @@ </packing> </child> <child> + <object class="GtkButton" id="theme-delete-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Delete the selected theme.</property> + <child> + <object class="GtkImage" id="delete_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">list-remove-symbolic</property> + <property name="icon_size">1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkButton" id="theme-export-button"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -325,7 +346,7 @@ <object class="GtkImage" id="export_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">document-save-as</property> + <property name="icon_name">document-save-as-symbolic</property> <property name="icon_size">1</property> </object> </child> @@ -333,7 +354,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> diff --git a/resources/ui/slice_select.ui b/resources/ui/slice_select.ui index 27559ad..14f5bd3 100644 --- a/resources/ui/slice_select.ui +++ b/resources/ui/slice_select.ui @@ -16,6 +16,7 @@ <property name="height_request">450</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="can_focus">False</property> @@ -62,7 +63,6 @@ <object class="GtkBox" id="vbox2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -344,20 +344,55 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="quick-action-checkbutton"> - <property name="use_action_appearance">False</property> + <object class="GtkSwitch" id="quick-action-checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="has_tooltip">True</property> - <property name="tooltip_markup" translatable="yes">This Slice will be executed when you click in the middle of the Pie.</property> - <property name="tooltip_text" translatable="yes">This Slice will be executed when you click in the middle of the Pie.</property> + <property name="halign">end</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="GtkBox" id="clipboard-box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="label" translatable="yes">Clipboard history length</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScale" id="clipboard-scale"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="fill_level">24</property> + <property name="round_digits">1</property> + <property name="digits">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -365,7 +400,46 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="GtkBox" id="workspace-only-box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Current workspace only</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSwitch" id="workspace-only-checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">end</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> </packing> </child> </object> diff --git a/src/actionGroups/actionGroup.vala b/src/actionGroups/actionGroup.vala index 8bbcde4..85488ad 100644 --- a/src/actionGroups/actionGroup.vala +++ b/src/actionGroups/actionGroup.vala @@ -56,6 +56,20 @@ public class ActionGroup : GLib.Object { public virtual void on_remove() {} ///////////////////////////////////////////////////////////////////// + /// This one is called, when the ActionGroup is saved. + ///////////////////////////////////////////////////////////////////// + + public virtual void on_save(Xml.TextWriter writer) { + writer.write_attribute("type", GroupRegistry.descriptions[this.get_type().name()].id); + } + + ///////////////////////////////////////////////////////////////////// + /// This one is called, when the ActionGroup is loaded. + ///////////////////////////////////////////////////////////////////// + + public virtual void on_load(Xml.Node* data) {} + + ///////////////////////////////////////////////////////////////////// /// Adds a new Action to the group. ///////////////////////////////////////////////////////////////////// @@ -76,8 +90,9 @@ public class ActionGroup : GLib.Object { ///////////////////////////////////////////////////////////////////// public void disable_quickactions() { - foreach (var action in actions) + foreach (var action in actions) { action.is_quickaction = false; + } } ///////////////////////////////////////////////////////////////////// @@ -85,9 +100,11 @@ public class ActionGroup : GLib.Object { ///////////////////////////////////////////////////////////////////// public bool has_quickaction() { - foreach (var action in actions) - if (action.is_quickaction) + foreach (var action in actions) { + if (action.is_quickaction) { return true; + } + } return false; } diff --git a/src/actionGroups/clipboardGroup.vala b/src/actionGroups/clipboardGroup.vala index ad18740..58409de 100644 --- a/src/actionGroups/clipboardGroup.vala +++ b/src/actionGroups/clipboardGroup.vala @@ -25,34 +25,78 @@ namespace GnomePie { public class ClipboardGroup : ActionGroup { ///////////////////////////////////////////////////////////////////// - /// - ///////////////////////////////////////////////////////////////////// private class ClipboardItem : GLib.Object { - public string name { get; private set; } - public string icon { get; private set; } + public string name { get; protected set; } + public string icon { get; protected set; } + + protected Gtk.Clipboard clipboard { get; set; } + protected static Key paste_key = new Key.from_string("<Control>v"); + + public virtual void paste() {} + } - private Gtk.SelectionData contents; + ///////////////////////////////////////////////////////////////////// - public ClipboardItem(Gtk.SelectionData contents) { - this.contents = contents.copy(); - this.name = this.contents.get_text() ?? ""; - this.icon = "edit-paste"; + private class TextClipboardItem : ClipboardItem { + + public TextClipboardItem(Gtk.Clipboard clipboard) { + GLib.Object(clipboard : clipboard, + name : clipboard.wait_for_text(), + icon : "edit-paste"); + + // check whether a file has been copied and search for a cool icon + var first_line = this.name.substring(0, this.name.index_of("\n")); + var file = GLib.File.new_for_path(first_line); + + if (file.query_exists()) { + try { + var info = file.query_info("standard::icon", 0); + this.icon = Icon.get_icon_name(info.get_icon()); + } catch (Error e) { + warning("Failed to generate icon for ClipboardGroupItem."); + } + } } - public void paste() { - debug(name); + public override void paste() { + clipboard.set_text(name, name.length); + paste_key.press(); } } - public ClipboardGroup(string parent_id) { - GLib.Object(parent_id : parent_id); + ///////////////////////////////////////////////////////////////////// + + private class ImageClipboardItem : ClipboardItem { + + private Gdk.Pixbuf image { get; set; } + + public ImageClipboardItem(Gtk.Clipboard clipboard) { + GLib.Object(clipboard : clipboard, + name : _("Image data"), + icon : "image-viewer"); + this.image = clipboard.wait_for_image(); + } + + public override void paste() { + clipboard.set_image(image); + paste_key.press(); + } } ///////////////////////////////////////////////////////////////////// + /// The maximum remembered items of the clipboard. + ///////////////////////////////////////////////////////////////////// + + public int max_items {get; set; default=8; } + ///////////////////////////////////////////////////////////////////// + public ClipboardGroup(string parent_id) { + GLib.Object(parent_id : parent_id); + } + ///////////////////////////////////////////////////////////////////// /// Used to register this type of ActionGroup. It sets the display /// name for this ActionGroup, it's icon name and the string used in @@ -74,12 +118,7 @@ public class ClipboardGroup : ActionGroup { private Gtk.Clipboard clipboard; - - ///////////////////////////////////////////////////////////////////// - /// The maximum remembered items of the clipboard. - ///////////////////////////////////////////////////////////////////// - - private static const int max_items = 6; + private bool ignore_next_change = false; private Gee.ArrayList<ClipboardItem?> items; @@ -89,26 +128,61 @@ public class ClipboardGroup : ActionGroup { this.clipboard.owner_change.connect(this.on_change); } + ///////////////////////////////////////////////////////////////////// + /// This one is called, when the ActionGroup is saved. + ///////////////////////////////////////////////////////////////////// + + public override void on_save(Xml.TextWriter writer) { + base.on_save(writer); + writer.write_attribute("max_items", this.max_items.to_string()); + } + + ///////////////////////////////////////////////////////////////////// + /// This one is called, when the ActionGroup is loaded. + ///////////////////////////////////////////////////////////////////// + + public override void on_load(Xml.Node* data) { + for (Xml.Attr* attribute = data->properties; attribute != null; attribute = attribute->next) { + string attr_name = attribute->name.down(); + string attr_content = attribute->children->content; + + if (attr_name == "max_items") { + this.max_items = int.parse(attr_content); + } + } + } + private void on_change() { + if (ignore_next_change) { + ignore_next_change = false; + return; + } + if (this.clipboard.wait_is_text_available()) { - this.clipboard.request_contents(Gdk.Atom.intern("text/plain", false), this.add_item); + if (clipboard.wait_for_text() != null) { + add_item(new TextClipboardItem(this.clipboard)); + } + } else if (this.clipboard.wait_is_image_available()) { + add_item(new ImageClipboardItem(this.clipboard)); } } - private void add_item(Gtk.Clipboard c, Gtk.SelectionData contents) { - var new_item = new ClipboardItem(contents); + private void add_item(ClipboardItem item) { - if (this.items.size == ClipboardGroup.max_items) + // remove one item if there are too many + if (this.items.size == this.max_items) { this.items.remove_at(0); + } - this.items.add(new_item); + this.items.add(item); // update slices this.delete_all(); - for (int i=0; i<this.items.size; ++i) { + for (int i=this.items.size-1; i>=0; --i) { var action = new SigAction(items[i].name, items[i].icon, i.to_string()); action.activated.connect(() => { + ignore_next_change = true; this.items[int.parse(action.real_command)].paste(); }); this.add_action(action); diff --git a/src/actionGroups/groupRegistry.vala b/src/actionGroups/groupRegistry.vala index ebf34ba..c97cf95 100644 --- a/src/actionGroups/groupRegistry.vala +++ b/src/actionGroups/groupRegistry.vala @@ -57,6 +57,10 @@ public class GroupRegistry : GLib.Object { types.add(typeof(BookmarkGroup).name()); descriptions.set(typeof(BookmarkGroup).name(), type_description); + type_description = ClipboardGroup.register(); + types.add(typeof(ClipboardGroup).name()); + descriptions.set(typeof(ClipboardGroup).name(), type_description); + type_description = DevicesGroup.register(); types.add(typeof(DevicesGroup).name()); descriptions.set(typeof(DevicesGroup).name(), type_description); @@ -72,10 +76,6 @@ public class GroupRegistry : GLib.Object { type_description = WindowListGroup.register(); types.add(typeof(WindowListGroup).name()); descriptions.set(typeof(WindowListGroup).name(), type_description); - - type_description = WorkspaceWindowListGroup.register(); - types.add(typeof(WorkspaceWindowListGroup).name()); - descriptions.set(typeof(WorkspaceWindowListGroup).name(), type_description); } ///////////////////////////////////////////////////////////////////// @@ -84,12 +84,23 @@ public class GroupRegistry : GLib.Object { public static ActionGroup? create_group(string type_id, string parent_id) { switch (type_id) { - case "bookmarks": return new BookmarkGroup(parent_id); - case "devices": return new DevicesGroup(parent_id); - case "menu": return new MenuGroup(parent_id); - case "session": return new SessionGroup(parent_id); - case "window_list": return new WindowListGroup(parent_id); - case "workspace_window_list": return new WorkspaceWindowListGroup(parent_id); + case "bookmarks": + return new BookmarkGroup(parent_id); + case "clipboard": + return new ClipboardGroup(parent_id); + case "devices": + return new DevicesGroup(parent_id); + case "menu": + return new MenuGroup(parent_id); + case "session": + return new SessionGroup(parent_id); + case "window_list": + return new WindowListGroup(parent_id); + // deprecated + case "workspace_window_list": + var group = new WindowListGroup(parent_id); + group.current_workspace_only = true; + return group; } return null; diff --git a/src/actionGroups/windowListGroup.vala b/src/actionGroups/windowListGroup.vala index 1560f5f..69029a7 100644 --- a/src/actionGroups/windowListGroup.vala +++ b/src/actionGroups/windowListGroup.vala @@ -38,6 +38,8 @@ public class WindowListGroup : ActionGroup { return description; } + public bool current_workspace_only { get; set; default=false; } + ///////////////////////////////////////////////////////////////////// /// Two members needed to avoid useless, frequent changes of the /// stored Actions. @@ -65,22 +67,50 @@ public class WindowListGroup : ActionGroup { this.screen.window_opened.connect(reload); this.screen.window_closed.connect(reload); + this.screen.active_workspace_changed.connect(reload); - this.load(); + this.update(); + } + + ///////////////////////////////////////////////////////////////////// + /// This one is called, when the ActionGroup is saved. + ///////////////////////////////////////////////////////////////////// + + public override void on_save(Xml.TextWriter writer) { + base.on_save(writer); + writer.write_attribute("current_workspace_only", this.current_workspace_only.to_string()); + } + + ///////////////////////////////////////////////////////////////////// + /// This one is called, when the ActionGroup is loaded. + ///////////////////////////////////////////////////////////////////// + + public override void on_load(Xml.Node* data) { + for (Xml.Attr* attribute = data->properties; attribute != null; attribute = attribute->next) { + string attr_name = attribute->name.down(); + string attr_content = attribute->children->content; + + if (attr_name == "current_workspace_only") { + this.current_workspace_only = bool.parse(attr_content); + } + } } ///////////////////////////////////////////////////////////////////// /// Loads all currently opened windows and creates actions for them. ///////////////////////////////////////////////////////////////////// - private void load() { + private void update() { unowned GLib.List<Wnck.Window?> windows = this.screen.get_windows(); var matcher = Bamf.Matcher.get_default(); foreach (var window in windows) { if (window.get_window_type() == Wnck.WindowType.NORMAL - && !window.is_skip_pager() && !window.is_skip_tasklist()) { + && !window.is_skip_pager() && !window.is_skip_tasklist() + && (!current_workspace_only || (window.get_workspace() != null + && window.get_workspace() == this.screen.get_active_workspace()))) { + var application = window.get_application(); var bamf_app = matcher.get_application_for_xid((uint32)window.get_xid()); @@ -102,17 +132,18 @@ public class WindowListGroup : ActionGroup { if (win.get_workspace() != null) { //select the workspace - if (win.get_workspace() != win.get_screen().get_active_workspace()) + if (win.get_workspace() != win.get_screen().get_active_workspace()) { win.get_workspace().activate(time_stamp); + } - //select the viewport inside the wprkspace + //select the viewport inside the workspace if (!win.is_in_viewport(win.get_workspace()) ) { int xp, yp, widthp, heightp, scx, scy, nx, ny, wx, wy; win.get_geometry (out xp, out yp, out widthp, out heightp); - scx= win.get_screen().get_width(); - scy= win.get_screen().get_height(); - wx= win.get_workspace().get_viewport_x(); - wy= win.get_workspace().get_viewport_y(); + scx = win.get_screen().get_width(); + scy = win.get_screen().get_height(); + wx = win.get_workspace().get_viewport_x(); + wy = win.get_workspace().get_viewport_y(); if (scx > 0 && scy > 0) { nx= ((wx+xp) / scx) * scx; ny= ((wy+yp) / scy) * scy; @@ -121,8 +152,9 @@ public class WindowListGroup : ActionGroup { } } - if (win.is_minimized()) + if (win.is_minimized()) { win.unminimize(time_stamp); + } win.activate_transient(time_stamp); }); @@ -147,7 +179,7 @@ public class WindowListGroup : ActionGroup { // reload this.delete_all(); - this.load(); + this.update(); this.changing = false; return false; diff --git a/src/actionGroups/workspaceWindowListGroup.vala b/src/actionGroups/workspaceWindowListGroup.vala deleted file mode 100644 index 42a4863..0000000 --- a/src/actionGroups/workspaceWindowListGroup.vala +++ /dev/null @@ -1,145 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2015 by Simon Schneegans -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. -///////////////////////////////////////////////////////////////////////// - -namespace GnomePie { - -///////////////////////////////////////////////////////////////////// -/// This group displays a list of all running application windows of -/// the current workspace. -///////////////////////////////////////////////////////////////////// - -public class WorkspaceWindowListGroup : ActionGroup { - - ///////////////////////////////////////////////////////////////////// - /// Used to register this type of ActionGroup. It sets the display - /// name for this ActionGroup, it's icon name and the string used in - /// the pies.conf file for this kind of ActionGroups. - ///////////////////////////////////////////////////////////////////// - - public static GroupRegistry.TypeDescription register() { - var description = new GroupRegistry.TypeDescription(); - description.name = _("Group: Window List for current workspace"); - description.icon = "preferences-system-windows"; - description.description = _("Shows a Slice for each of your opened windows on the current workspace."); - description.id = "workspace_window_list"; - return description; - } - - ///////////////////////////////////////////////////////////////////// - /// Two members needed to avoid useless, frequent changes of the - /// stored Actions. - ///////////////////////////////////////////////////////////////////// - - private bool changing = false; - private bool changed_again = false; - - private Wnck.Screen screen; - - ///////////////////////////////////////////////////////////////////// - /// C'tor, initializes all members. - ///////////////////////////////////////////////////////////////////// - - public WorkspaceWindowListGroup(string parent_id) { - GLib.Object(parent_id : parent_id); - } - - ///////////////////////////////////////////////////////////////////// - /// Loads all windows. - ///////////////////////////////////////////////////////////////////// - - construct { - this.screen = Wnck.Screen.get_default(); - - this.screen.window_opened.connect(reload); - this.screen.window_closed.connect(reload); - this.screen.active_workspace_changed.connect(reload); - - this.load(); - } - - ///////////////////////////////////////////////////////////////////// - /// Loads all currently opened windows and creates actions for them. - ///////////////////////////////////////////////////////////////////// - - private void load() { - unowned GLib.List<Wnck.Window?> windows = this.screen.get_windows(); - - var matcher = Bamf.Matcher.get_default(); - - foreach (var window in windows) { - if (window.get_window_type() == Wnck.WindowType.NORMAL - && !window.is_skip_pager() && !window.is_skip_tasklist() - && window.get_workspace() != null - && window.get_workspace() == this.screen.get_active_workspace()) { - - var application = window.get_application(); - var bamf_app = matcher.get_application_for_xid((uint32)window.get_xid()); - - string name = window.get_name(); - - if (name.length > 30) - name = name.substring(0, 30) + "..."; - - var action = new SigAction( - name, - (bamf_app == null) ? application.get_icon_name().down() : bamf_app.get_icon(), - "%lu".printf(window.get_xid()) - ); - action.activated.connect((time_stamp) => { - Wnck.Screen.get_default().force_update(); - - var xid = (X.Window)uint64.parse(action.real_command); - var win = Wnck.Window.get(xid); - - if (win.is_minimized()) - win.unminimize(time_stamp); - - win.activate_transient(time_stamp); - }); - this.add_action(action); - } - } - } - - ///////////////////////////////////////////////////////////////////// - /// Reloads all running applications. - ///////////////////////////////////////////////////////////////////// - - private void reload() { - // avoid too frequent changes... - if (!this.changing) { - this.changing = true; - Timeout.add(500, () => { - if (this.changed_again) { - this.changed_again = false; - return true; - } - - // reload - this.delete_all(); - this.load(); - - this.changing = false; - return false; - }); - } else { - this.changed_again = true; - } - } -} - -} diff --git a/src/deamon.vala b/src/deamon.vala index f4e1aeb..5430a09 100644 --- a/src/deamon.vala +++ b/src/deamon.vala @@ -38,12 +38,18 @@ public class Deamon : GLib.Application { public static bool disable_header_bar = false; public static bool disable_stack_switcher = false; + + ///////////////////////////////////////////////////////////////////// + /// true if init_pies() has been called already + ///////////////////////////////////////////////////////////////////// + private bool initialized = false; + ///////////////////////////////////////////////////////////////////// /// The beginning of everything. ///////////////////////////////////////////////////////////////////// public static int main(string[] args) { - version = "0.6.6"; + version = "0.6.7"; // disable overlay scrollbar --- hacky workaround for black / // transparent background @@ -81,15 +87,20 @@ public class Deamon : GLib.Application { ///////////////////////////////////////////////////////////////////// private const GLib.OptionEntry[] options = { - { "open", 'o', 0, GLib.OptionArg.STRING, out open_pie, + { "open", 'o', 0, GLib.OptionArg.STRING, + out open_pie, "Open the Pie with the given ID", "ID" }, - { "reset", 'r', 0, GLib.OptionArg.NONE, out reset, + { "reset", 'r', 0, GLib.OptionArg.NONE, + out reset, "Reset all options to default values" }, - { "no-header-bar", 'b', 0, GLib.OptionArg.NONE, out disable_header_bar, + { "no-header-bar", 'b', 0, GLib.OptionArg.NONE, + out disable_header_bar, "Disables the usage of GTK.HeaderBar" }, - { "no-stack-switcher", 's', 0, GLib.OptionArg.NONE, out disable_stack_switcher, + { "no-stack-switcher", 's', 0, GLib.OptionArg.NONE, + out disable_stack_switcher, "Disables the usage of GTK.StackSwitcher" }, - { "print-ids", 'p', 0, GLib.OptionArg.NONE, out print_ids, + { "print-ids", 'p', 0, GLib.OptionArg.NONE, + out print_ids, "Prints all Pie names with their according IDs" }, { null } }; @@ -103,31 +114,27 @@ public class Deamon : GLib.Application { Object(application_id: "org.gnome.gnomepie", flags: GLib.ApplicationFlags.HANDLES_COMMAND_LINE); - message("Welcome to Gnome-Pie " + version + "!"); - // init locale support Intl.bindtextdomain("gnomepie", Paths.locales); Intl.textdomain("gnomepie"); - // init toolkits and static stuff - ActionRegistry.init(); - GroupRegistry.init(); - - PieManager.init(); - - // initialize icon cache - Icon.init(); - // connect SigHandlers Posix.signal(Posix.SIGINT, sig_handler); Posix.signal(Posix.SIGTERM, sig_handler); this.startup.connect(()=>{ + message("Welcome to Gnome-Pie " + version + "!"); + + this.init_pies(); // launch the indicator this.indicator = new Indicator(); + if (open_pie != null && open_pie != "") { + PieManager.open_pie(open_pie); + } + // finished loading... so run the prog! message("Started happily..."); hold(); @@ -138,7 +145,9 @@ public class Deamon : GLib.Application { /// Call handle_command_line on program launch. ///////////////////////////////////////////////////////////////////// - protected override bool local_command_line(ref unowned string[] args, out int exit_status) { + protected override bool local_command_line( + ref unowned string[] args, out int exit_status) { + exit_status = 0; // copy command line @@ -173,6 +182,26 @@ public class Deamon : GLib.Application { GLib.Application.get_default().release(); } + ///////////////////////////////////////////////////////////////////// + /// Print a nifty message when the prog is killed. + ///////////////////////////////////////////////////////////////////// + + private void init_pies() { + if (!this.initialized) { + + // init static stuff + ActionRegistry.init(); + GroupRegistry.init(); + + // load all pies + PieManager.init(); + + // initialize icon cache + Icon.init(); + + this.initialized = true; + } + } ///////////////////////////////////////////////////////////////////// /// Handles command line parameters. @@ -188,7 +217,9 @@ public class Deamon : GLib.Application { context.parse(ref args); } catch(GLib.OptionError error) { warning(error.message); - message("Run '%s' to launch Gnome-Pie or run '%s --help' to see a full list of available command line options.\n", args[0], args[0]); + message("Run '%s' to launch Gnome-Pie or run '%s --help' to" + + " see a full list of available command line options.\n", + args[0], args[0]); } if (reset) { @@ -199,22 +230,29 @@ public class Deamon : GLib.Application { message("Removed file \"%s\"", Paths.settings); } + // do not notify the already running instance (if any) return true; } - if (open_pie != null && open_pie != "") { - PieManager.open_pie(open_pie); - open_pie = ""; - } else if (called_from_remote) { - this.indicator.show_preferences(); - } - if (print_ids) { + this.init_pies(); PieManager.print_ids(); print_ids = false; + + // do not notify the already running instance (if any) return true; } + + if (called_from_remote) { + if (open_pie != null && open_pie != "") { + PieManager.open_pie(open_pie); + } else { + this.indicator.show_preferences(); + } + } + + // notify the already running instance (if any) return false; } } diff --git a/src/gui/aboutWindow.vala b/src/gui/aboutWindow.vala index 896d2ba..fd38c8c 100644 --- a/src/gui/aboutWindow.vala +++ b/src/gui/aboutWindow.vala @@ -47,6 +47,7 @@ public class AboutWindow: Gtk.AboutDialog { "Moo <hazap@hotmail.com> (LT)", "Gabriel Dubatti <gdubatti@gmail.com> (ES)", "Grégoire Bellon-Gervais <greggbg@gmail.com> (FR)", + "Raphaël Rochet <raphael@rri.fr> (FR)", "Alex Maxime <cad.maxime@gmail.com> (FR)", "Eugene Roskin <pams@imail.ru> (RU)", "Ting Zhou <tzhou@haverford.edu> (ZH-CN)", diff --git a/src/gui/newSliceWindow.vala b/src/gui/newSliceWindow.vala index 6066e57..89294b5 100644 --- a/src/gui/newSliceWindow.vala +++ b/src/gui/newSliceWindow.vala @@ -57,11 +57,15 @@ public class NewSliceWindow : GLib.Object { private Gtk.Box hotkey_box = null; private Gtk.Box uri_box = null; private Gtk.Box quickaction_box = null; + private Gtk.Box clipboard_box = null; + private Gtk.Box workspace_only_box = null; private Gtk.Image icon = null; private Gtk.Entry name_entry = null; private Gtk.Entry command_entry = null; private Gtk.Entry uri_entry = null; - private Gtk.CheckButton quickaction_checkbutton = null; + private Gtk.Switch quickaction_checkbutton = null; + private Gtk.Switch workspace_only_checkbutton = null; + private Gtk.Scale clipboard_slider = null; ///////////////////////////////////////////////////////////////////// /// Two custom widgets. For Pie and hotkey selection respectively. @@ -116,16 +120,25 @@ public class NewSliceWindow : GLib.Object { this.hotkey_box.hide(); this.uri_box.hide(); this.quickaction_box.hide(); + this.workspace_only_box.hide(); + this.clipboard_box.hide(); this.current_type = type; switch (type) { - case "bookmarks": case "clipboard": case "devices": - case "menu": case "session": case "window_list": - case "workspace_window_list": + case "bookmarks": case "devices": + case "menu": case "session": this.no_options_box.show(); this.set_icon(icon); break; + case "window_list": + this.workspace_only_box.show(); + this.set_icon(icon); + break; + case "clipboard": + this.clipboard_box.show(); + this.set_icon(icon); + break; case "app": this.name_box.show(); this.command_box.show(); @@ -183,11 +196,18 @@ public class NewSliceWindow : GLib.Object { this.name_entry = builder.get_object("name-entry") as Gtk.Entry; this.uri_entry = builder.get_object("uri-entry") as Gtk.Entry; this.command_entry = builder.get_object("command-entry") as Gtk.Entry; - this.quickaction_checkbutton = builder.get_object("quick-action-checkbutton") as Gtk.CheckButton; - + this.quickaction_checkbutton = builder.get_object("quick-action-checkbutton") as Gtk.Switch; this.quickaction_box = builder.get_object("quickaction-box") as Gtk.Box; this.icon = builder.get_object("icon") as Gtk.Image; + this.workspace_only_checkbutton = builder.get_object("workspace-only-checkbutton") as Gtk.Switch; + this.workspace_only_box = builder.get_object("workspace-only-box") as Gtk.Box; + + this.clipboard_box = builder.get_object("clipboard-box") as Gtk.Box; + this.clipboard_slider = (builder.get_object("clipboard-scale") as Gtk.Scale); + clipboard_slider.set_range(2, 24); + clipboard_slider.set_value(8); + this.icon_button.clicked.connect(on_icon_button_clicked); var scroll_area = builder.get_object("slice-scrolledwindow") as Gtk.ScrolledWindow; @@ -273,6 +293,15 @@ public class NewSliceWindow : GLib.Object { } else { type = GroupRegistry.descriptions[group.get_type().name()].id; + switch (type) { + case "clipboard": + this.clipboard_slider.set_value((group as ClipboardGroup).max_items); + break; + case "window_list": + this.workspace_only_checkbutton.active = (group as WindowListGroup).current_workspace_only; + break; + + } this.select_type(type); } } @@ -314,13 +343,19 @@ public class NewSliceWindow : GLib.Object { switch (this.current_type) { case "bookmarks": group = new BookmarkGroup(this.current_id); break; - case "clipboard": group = new ClipboardGroup(this.current_id); break; case "devices": group = new DevicesGroup(this.current_id); break; case "menu": group = new MenuGroup(this.current_id); break; case "session": group = new SessionGroup(this.current_id); break; - case "window_list": group = new WindowListGroup(this.current_id); break; - case "workspace_window_list": group = new WorkspaceWindowListGroup(this.current_id); break; - + case "clipboard": + var g = new ClipboardGroup(this.current_id); + g.max_items = (int)this.clipboard_slider.get_value(); + group = g; + break; + case "window_list": + var g = new WindowListGroup(this.current_id); + g.current_workspace_only = this.workspace_only_checkbutton.active; + group = g; + break; case "app": group = new ActionGroup(this.current_id); group.add_action(new AppAction(this.name_entry.text, this.current_icon, diff --git a/src/gui/preferencesWindow.vala b/src/gui/preferencesWindow.vala index d671501..09d8a3c 100644 --- a/src/gui/preferencesWindow.vala +++ b/src/gui/preferencesWindow.vala @@ -43,6 +43,7 @@ public class PreferencesWindow : GLib.Object { private Gtk.EventBox? preview_background = null; private Gtk.Button? remove_pie_button = null; private Gtk.Button? edit_pie_button = null; + private Gtk.Button? theme_delete_button = null; private ThemeList? theme_list = null; private Gtk.ToggleButton? indicator = null; @@ -149,6 +150,11 @@ public class PreferencesWindow : GLib.Object { } else { this.captions.sensitive = false; } + if (Config.global.theme.is_local()) { + this.theme_delete_button.sensitive = true; + } else { + this.theme_delete_button.sensitive = false; + } }); scroll_area = builder.get_object("theme-scrolledwindow") as Gtk.ScrolledWindow; @@ -164,6 +170,8 @@ public class PreferencesWindow : GLib.Object { (builder.get_object("theme-export-button") as Gtk.Button).clicked.connect(on_export_theme_button_clicked); (builder.get_object("theme-import-button") as Gtk.Button).clicked.connect(on_import_theme_button_clicked); + this.theme_delete_button = (builder.get_object("theme-delete-button") as Gtk.Button); + this.theme_delete_button.clicked.connect(on_delete_theme_button_clicked); this.autostart = (builder.get_object("autostart-checkbox") as Gtk.ToggleButton); this.autostart.toggled.connect(on_autostart_toggled); @@ -230,7 +238,7 @@ public class PreferencesWindow : GLib.Object { _("You can support the development of Gnome-Pie by donating via %s.").printf("<a href='https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=X65SUVC4ZTQSC'>Paypal</a>"), _("Translating Gnome-Pie to your language is easy. Translations are managed at %s.").printf("<a href='https://translate.zanata.org/zanata/iteration/view/gnome-pie/develop'>Zanata</a>"), _("It's easy to create new themes for Gnome-Pie. Read the <a href='%s'>Tutorial</a> online.").printf("http://simmesimme.github.io/lessons/2015/04/26/themes-for-gnome-pie/"), - _("It's usually a good practive to have at most twelve slices per pie."), + _("It's usually a good practice to have at most twelve slices per pie."), _("You can export themes you created and share them with the community!"), _("The source code of Gnome-Pie is available on %s.").printf("<a href='https://github.com/Simmesimme/Gnome-Pie'>Github</a>"), _("Bugs can be reported at %s!").printf("<a href='https://github.com/Simmesimme/Gnome-Pie/issues'>Github</a>"), @@ -284,6 +292,12 @@ public class PreferencesWindow : GLib.Object { this.captions.sensitive = false; } + if (Config.global.theme.is_local()) { + this.theme_delete_button.sensitive = true; + } else { + this.theme_delete_button.sensitive = false; + } + if (!Deamon.disable_stack_switcher) { this.stack.set_visible_child_full("2", Gtk.StackTransitionType.NONE); } else { @@ -427,6 +441,28 @@ public class PreferencesWindow : GLib.Object { } ///////////////////////////////////////////////////////////////////// + /// Deleted the slected theme. + ///////////////////////////////////////////////////////////////////// + + private void on_delete_theme_button_clicked(Gtk.Button button) { + + var dialog = new Gtk.MessageDialog((Gtk.Window)this.window.get_toplevel(), Gtk.DialogFlags.MODAL, + Gtk.MessageType.QUESTION, Gtk.ButtonsType.YES_NO, + _("Do you really want to delete the selected theme from %s?").printf(Config.global.theme.directory)); + + dialog.response.connect((response) => { + if (response == Gtk.ResponseType.YES) { + Paths.delete_directory(Config.global.theme.directory); + Config.global.load_themes(""); + this.theme_list.reload(); + } + }); + + dialog.run(); + dialog.destroy(); + } + + ///////////////////////////////////////////////////////////////////// /// Shows or hides the indicator. ///////////////////////////////////////////////////////////////////// diff --git a/src/gui/themeList.vala b/src/gui/themeList.vala index 46ae876..e6ecb3c 100644 --- a/src/gui/themeList.vala +++ b/src/gui/themeList.vala @@ -105,7 +105,8 @@ class ThemeList : Gtk.TreeView { data.set(current, DataPos.ICON, theme.preview_icon.to_pixbuf()); data.set(current, DataPos.NAME, GLib.Markup.escape_text(theme.name)+"\n" + "<span font-size='x-small'>" + GLib.Markup.escape_text(theme.description) - + "</span>"); + + " - <i>"+GLib.Markup.escape_text(_("by")+" "+theme.author) + + "</i></span>"); if(theme == Config.global.theme) { get_selection().select_iter(current); } diff --git a/src/pies/defaultConfig.vala b/src/pies/defaultConfig.vala index e446c2b..8763a1d 100644 --- a/src/pies/defaultConfig.vala +++ b/src/pies/defaultConfig.vala @@ -62,6 +62,10 @@ namespace Pies { window.add_action(new KeyAction(_("Maximize"), "view-fullscreen", "<Alt>F10")); window.add_action(new KeyAction(_("Restore"), "view-restore", "<Alt>F5")); + // add a pie with window list group + var alt_tab = PieManager.create_persistent_pie("Alt Tab", "dock", new Trigger.from_string("<Control><Alt>T")); + alt_tab.add_group(new WindowListGroup(alt_tab.id)); + // save the configuration to file Pies.save(); } diff --git a/src/pies/load.vala b/src/pies/load.vala index 7402094..0dfb423 100644 --- a/src/pies/load.vala +++ b/src/pies/load.vala @@ -192,17 +192,14 @@ namespace Pies { string attr_name = attribute->name.down(); string attr_content = attribute->children->content; - switch (attr_name) { - case "type": - type = attr_content; - break; - default: - warning("Invalid attribute \"" + attr_name + "\" in <group> element in pies.conf!"); - break; + if (attr_name == "type") { + type = attr_content; + break; } } ActionGroup group = GroupRegistry.create_group(type, pie.id); + group.on_load(slice); if (group != null) pie.add_group(group); } diff --git a/src/pies/save.vala b/src/pies/save.vala index 9760cce..efb3fb6 100644 --- a/src/pies/save.vala +++ b/src/pies/save.vala @@ -72,7 +72,7 @@ namespace Pies { } } else { writer.start_element("group"); - writer.write_attribute("type", GroupRegistry.descriptions[group.get_type().name()].id); + group.on_save(writer); writer.end_element(); slice_count += group.actions.size; diff --git a/src/renderers/pieWindow.vala b/src/renderers/pieWindow.vala index c1d70b7..5accb15 100755 --- a/src/renderers/pieWindow.vala +++ b/src/renderers/pieWindow.vala @@ -445,6 +445,7 @@ public class PieWindow : Gtk.Window { if (Gdk.keyval_name(key) == "Escape") this.cancel(); else if (Gdk.keyval_name(key) == "Return") this.activate_slice(time_stamp); + else if (Gdk.keyval_name(key) == "KP_Enter") this.activate_slice(time_stamp); else if (!PieManager.get_is_turbo(this.renderer.id)) { if (Gdk.keyval_name(key) == "Up") this.renderer.select_up(); else if (Gdk.keyval_name(key) == "Down") this.renderer.select_down(); diff --git a/src/themes/theme.vala b/src/themes/theme.vala index 98e8994..2e256f9 100644 --- a/src/themes/theme.vala +++ b/src/themes/theme.vala @@ -87,14 +87,44 @@ public class Theme : GLib.Object { this.active_slice_layers.clear(); this.inactive_slice_layers.clear(); + if (!GLib.File.new_for_path(this.directory).query_exists()) { + return false; + } + + string config_file = this.directory + "/theme.xml"; + + if (!GLib.File.new_for_path(config_file).query_exists()) { + try { + // detect whether theme is one directory deeper + string child; + bool success = false; + + // load global themes + var d = Dir.open(this.directory); + while ((child = d.read_name()) != null && !success) { + config_file = this.directory + "/" + child + "/theme.xml"; + if (GLib.File.new_for_path(config_file).query_exists()) { + this.directory = this.directory + "/" + child; + success = true; + } + } + + if (!success) { + return false; + } + } catch (Error e) { + warning (e.message); + return false; + } + } + this.preview_icon = new Icon(this.directory + "/preview.png", 36); Xml.Parser.init(); - string path = this.directory + "/theme.xml"; - Xml.Doc* themeXML = Xml.Parser.parse_file(path); + Xml.Doc* themeXML = Xml.Parser.parse_file(config_file); if (themeXML == null) { - warning("Failed to add theme: \"" + path + "\" not found!"); + warning("Failed to add theme: \"" + config_file + "\" not found!"); return false; } @@ -151,6 +181,7 @@ public class Theme : GLib.Object { } } + ///////////////////////////////////////////////////////////////////// /// Loads all images of the theme. ///////////////////////////////////////////////////////////////////// @@ -165,6 +196,15 @@ public class Theme : GLib.Object { } ///////////////////////////////////////////////////////////////////// + /// Returns true if the theme is installed to the local themes + /// directory. + ///////////////////////////////////////////////////////////////////// + + public bool is_local() { + return this.directory.has_prefix(Paths.local_themes); + } + + ///////////////////////////////////////////////////////////////////// /// The following methods parse specific parts of the theme file. /// Nothing special here, just some boring code. ///////////////////////////////////////////////////////////////////// diff --git a/src/utilities/config.vala b/src/utilities/config.vala index 5dedddb..74bbcbb 100644 --- a/src/utilities/config.vala +++ b/src/utilities/config.vala @@ -57,7 +57,7 @@ public class Config : GLib.Object { public int activation_range { get; set; default = 200; } public int max_visible_slices { get; set; default = 24; } public bool show_indicator { get; set; default = true; } - public bool show_captions { get; set; default = true; } + public bool show_captions { get; set; default = false; } public bool search_by_string { get; set; default = true; } public bool auto_start { get; set; default = false; } public int showed_news { get; set; default = 0; } diff --git a/src/utilities/paths.vala b/src/utilities/paths.vala index 96bce0a..7bdd642 100644 --- a/src/utilities/paths.vala +++ b/src/utilities/paths.vala @@ -108,6 +108,28 @@ public class Paths : GLib.Object { public static string executable { get; private set; default=""; } ///////////////////////////////////////////////////////////////////// + /// Deletes a directory recursively from disk. Use with care :) + ///////////////////////////////////////////////////////////////////// + + public static void delete_directory(string directory) { + try { + var d = Dir.open(directory); + string name; + while ((name = d.read_name()) != null) { + string path = Path.build_filename(directory, name); + if (FileUtils.test(path, FileTest.IS_DIR)) { + delete_directory(path); + } else { + FileUtils.remove(path); + } + } + DirUtils.remove(directory); + } catch (Error e) { + warning (e.message); + } + } + + ///////////////////////////////////////////////////////////////////// /// Initializes all values above. ///////////////////////////////////////////////////////////////////// |