From f9222971b10ef1b81d8447770c13b84991c2a27b Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 5 Aug 2011 22:06:35 +0000 Subject: [PATCH] Also display the "monitors" tab on older Gtk+ versions --- po/de.po | 82 +++++++++++++++++++++++--------------------- po/es.po | 82 +++++++++++++++++++++++--------------------- po/fr.po | 86 +++++++++++++++++++++++++---------------------- po/it.po | 82 +++++++++++++++++++++++--------------------- src/desktop.c | 32 +++++++++++++----- src/plugins/cvs.c | 2 ++ 6 files changed, 199 insertions(+), 167 deletions(-) diff --git a/po/de.po b/po/de.po index 13aee9c..ddcdf82 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-05 23:14+0200\n" +"POT-Creation-Date: 2011-08-06 00:01+0200\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: English\n" @@ -206,7 +206,7 @@ msgstr "" msgid "Shell scripts" msgstr "" -#: ../src/browser.c:963 ../src/desktop.c:1717 ../src/view.c:436 +#: ../src/browser.c:963 ../src/desktop.c:1715 ../src/view.c:436 msgid "All files" msgstr "Alle Dateien" @@ -415,7 +415,7 @@ msgstr "" msgid "Copying: " msgstr "" -#: ../src/copy.c:152 ../src/desktop.c:1700 +#: ../src/copy.c:152 ../src/desktop.c:1698 msgid "Filename: " msgstr "" @@ -508,86 +508,90 @@ msgstr "" msgid "Could not load preferences" msgstr "" -#: ../src/desktop.c:1655 +#: ../src/desktop.c:1653 msgid "Desktop preferences" msgstr "Desktop Einstellungen" -#: ../src/desktop.c:1692 +#: ../src/desktop.c:1690 msgid "Default color: " msgstr "" -#: ../src/desktop.c:1704 ../src/desktop.c:1746 +#: ../src/desktop.c:1702 ../src/desktop.c:1744 msgid "Background" msgstr "Hintergrund" -#: ../src/desktop.c:1707 +#: ../src/desktop.c:1705 msgid "Picture files" msgstr "Bilder" -#: ../src/desktop.c:1725 +#: ../src/desktop.c:1723 msgid "Position: " msgstr "" -#: ../src/desktop.c:1731 +#: ../src/desktop.c:1729 msgid "Centered" msgstr "" -#: ../src/desktop.c:1733 +#: ../src/desktop.c:1731 msgid "Scaled" msgstr "" -#: ../src/desktop.c:1735 +#: ../src/desktop.c:1733 msgid "Scaled (keep ratio)" msgstr "" -#: ../src/desktop.c:1737 +#: ../src/desktop.c:1735 msgid "Tiled" msgstr "" -#: ../src/desktop.c:1742 +#: ../src/desktop.c:1740 msgid "E_xtend background to all monitors" msgstr "" -#: ../src/desktop.c:1766 +#: ../src/desktop.c:1765 msgid "Monitor: " msgstr "Bildschirm: " -#: ../src/desktop.c:1774 +#: ../src/desktop.c:1771 +msgid "Whole screen" +msgstr "" + +#: ../src/desktop.c:1776 #, c-format msgid "Monitor %d" msgstr "Bildschirm %d" -#: ../src/desktop.c:1784 +#: ../src/desktop.c:1787 msgid "Resolution: " msgstr "Auflösung: " -#: ../src/desktop.c:1795 +#: ../src/desktop.c:1798 msgid "Size: " msgstr "Größe: " -#: ../src/desktop.c:1809 +#: ../src/desktop.c:1812 msgid "Monitors" msgstr "Bildschirme" -#: ../src/desktop.c:1824 +#: ../src/desktop.c:1826 msgid "Desktop font: " msgstr "" -#: ../src/desktop.c:1833 +#: ../src/desktop.c:1835 msgid "Theme" msgstr "" -#: ../src/desktop.c:1856 +#: ../src/desktop.c:1871 #, c-format msgid "%dx%d (at %d,%d)" msgstr "" -#: ../src/desktop.c:1859 +#: ../src/desktop.c:1874 #, c-format msgid "%dx%d mm (%.0lfx%.0lf DPI)" msgstr "" -#: ../src/desktop.c:1971 +#: ../src/desktop.c:1985 msgid "" "Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n" " -H\tPlace icons horizontally\n" @@ -737,68 +741,68 @@ msgstr "" msgid "Usage: view file...\n" msgstr "" -#: ../src/plugins/cvs.c:121 ../src/plugins/cvs.c:513 +#: ../src/plugins/cvs.c:123 ../src/plugins/cvs.c:515 msgid "CVS" msgstr "CVS" -#: ../src/plugins/cvs.c:168 +#: ../src/plugins/cvs.c:170 msgid "Root:" msgstr "" -#: ../src/plugins/cvs.c:170 +#: ../src/plugins/cvs.c:172 msgid "Repository:" msgstr "Repository:" -#: ../src/plugins/cvs.c:172 +#: ../src/plugins/cvs.c:174 msgid "Tag:" msgstr "" -#: ../src/plugins/cvs.c:174 ../src/plugins/cvs.c:194 +#: ../src/plugins/cvs.c:176 ../src/plugins/cvs.c:196 msgid "Request diff" msgstr "" -#: ../src/plugins/cvs.c:177 ../src/plugins/cvs.c:197 +#: ../src/plugins/cvs.c:179 ../src/plugins/cvs.c:199 msgid "View log" msgstr "" -#: ../src/plugins/cvs.c:180 ../src/plugins/cvs.c:200 +#: ../src/plugins/cvs.c:182 ../src/plugins/cvs.c:202 msgid "Update" msgstr "" -#: ../src/plugins/cvs.c:183 ../src/plugins/cvs.c:203 +#: ../src/plugins/cvs.c:185 ../src/plugins/cvs.c:205 msgid "Commit" msgstr "" -#: ../src/plugins/cvs.c:192 +#: ../src/plugins/cvs.c:194 msgid "Revision:" msgstr "" -#: ../src/plugins/cvs.c:210 +#: ../src/plugins/cvs.c:212 msgid "Add to CVS" msgstr "" -#: ../src/plugins/cvs.c:213 +#: ../src/plugins/cvs.c:215 msgid "Run make" msgstr "" -#: ../src/plugins/cvs.c:343 ../src/plugins/cvs.c:412 +#: ../src/plugins/cvs.c:345 ../src/plugins/cvs.c:414 msgid "Not a CVS repository" msgstr "Kein CVS Inhalt" -#: ../src/plugins/cvs.c:435 +#: ../src/plugins/cvs.c:437 msgid "Not managed by CVS" msgstr "" -#: ../src/plugins/cvs.c:557 +#: ../src/plugins/cvs.c:559 msgid "Running command..." msgstr "" -#: ../src/plugins/cvs.c:773 +#: ../src/plugins/cvs.c:775 #, c-format msgid "Command exited with error code %d" msgstr "" -#: ../src/plugins/cvs.c:779 +#: ../src/plugins/cvs.c:781 #, c-format msgid "Command exited with signal %d" msgstr "" diff --git a/po/es.po b/po/es.po index e498320..73bef44 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-05 23:14+0200\n" +"POT-Creation-Date: 2011-08-06 00:01+0200\n" "PO-Revision-Date: 2010-03-30 01:04+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -206,7 +206,7 @@ msgstr "" msgid "Shell scripts" msgstr "" -#: ../src/browser.c:963 ../src/desktop.c:1717 ../src/view.c:436 +#: ../src/browser.c:963 ../src/desktop.c:1715 ../src/view.c:436 msgid "All files" msgstr "" @@ -415,7 +415,7 @@ msgstr "" msgid "Copying: " msgstr "" -#: ../src/copy.c:152 ../src/desktop.c:1700 +#: ../src/copy.c:152 ../src/desktop.c:1698 msgid "Filename: " msgstr "" @@ -508,86 +508,90 @@ msgstr "" msgid "Could not load preferences" msgstr "" -#: ../src/desktop.c:1655 +#: ../src/desktop.c:1653 msgid "Desktop preferences" msgstr "Desktop preferencias" -#: ../src/desktop.c:1692 +#: ../src/desktop.c:1690 msgid "Default color: " msgstr "" -#: ../src/desktop.c:1704 ../src/desktop.c:1746 +#: ../src/desktop.c:1702 ../src/desktop.c:1744 msgid "Background" msgstr "" -#: ../src/desktop.c:1707 +#: ../src/desktop.c:1705 msgid "Picture files" msgstr "" -#: ../src/desktop.c:1725 +#: ../src/desktop.c:1723 msgid "Position: " msgstr "" -#: ../src/desktop.c:1731 +#: ../src/desktop.c:1729 msgid "Centered" msgstr "" -#: ../src/desktop.c:1733 +#: ../src/desktop.c:1731 msgid "Scaled" msgstr "" -#: ../src/desktop.c:1735 +#: ../src/desktop.c:1733 msgid "Scaled (keep ratio)" msgstr "" -#: ../src/desktop.c:1737 +#: ../src/desktop.c:1735 msgid "Tiled" msgstr "" -#: ../src/desktop.c:1742 +#: ../src/desktop.c:1740 msgid "E_xtend background to all monitors" msgstr "" -#: ../src/desktop.c:1766 +#: ../src/desktop.c:1765 msgid "Monitor: " msgstr "" -#: ../src/desktop.c:1774 +#: ../src/desktop.c:1771 +msgid "Whole screen" +msgstr "" + +#: ../src/desktop.c:1776 #, c-format msgid "Monitor %d" msgstr "" -#: ../src/desktop.c:1784 +#: ../src/desktop.c:1787 msgid "Resolution: " msgstr "" -#: ../src/desktop.c:1795 +#: ../src/desktop.c:1798 msgid "Size: " msgstr "" -#: ../src/desktop.c:1809 +#: ../src/desktop.c:1812 msgid "Monitors" msgstr "" -#: ../src/desktop.c:1824 +#: ../src/desktop.c:1826 msgid "Desktop font: " msgstr "" -#: ../src/desktop.c:1833 +#: ../src/desktop.c:1835 msgid "Theme" msgstr "" -#: ../src/desktop.c:1856 +#: ../src/desktop.c:1871 #, c-format msgid "%dx%d (at %d,%d)" msgstr "" -#: ../src/desktop.c:1859 +#: ../src/desktop.c:1874 #, c-format msgid "%dx%d mm (%.0lfx%.0lf DPI)" msgstr "" -#: ../src/desktop.c:1971 +#: ../src/desktop.c:1985 msgid "" "Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n" " -H\tPlace icons horizontally\n" @@ -737,68 +741,68 @@ msgstr "" msgid "Usage: view file...\n" msgstr "" -#: ../src/plugins/cvs.c:121 ../src/plugins/cvs.c:513 +#: ../src/plugins/cvs.c:123 ../src/plugins/cvs.c:515 msgid "CVS" msgstr "CVS" -#: ../src/plugins/cvs.c:168 +#: ../src/plugins/cvs.c:170 msgid "Root:" msgstr "" -#: ../src/plugins/cvs.c:170 +#: ../src/plugins/cvs.c:172 msgid "Repository:" msgstr "" -#: ../src/plugins/cvs.c:172 +#: ../src/plugins/cvs.c:174 msgid "Tag:" msgstr "" -#: ../src/plugins/cvs.c:174 ../src/plugins/cvs.c:194 +#: ../src/plugins/cvs.c:176 ../src/plugins/cvs.c:196 msgid "Request diff" msgstr "" -#: ../src/plugins/cvs.c:177 ../src/plugins/cvs.c:197 +#: ../src/plugins/cvs.c:179 ../src/plugins/cvs.c:199 msgid "View log" msgstr "" -#: ../src/plugins/cvs.c:180 ../src/plugins/cvs.c:200 +#: ../src/plugins/cvs.c:182 ../src/plugins/cvs.c:202 msgid "Update" msgstr "" -#: ../src/plugins/cvs.c:183 ../src/plugins/cvs.c:203 +#: ../src/plugins/cvs.c:185 ../src/plugins/cvs.c:205 msgid "Commit" msgstr "" -#: ../src/plugins/cvs.c:192 +#: ../src/plugins/cvs.c:194 msgid "Revision:" msgstr "" -#: ../src/plugins/cvs.c:210 +#: ../src/plugins/cvs.c:212 msgid "Add to CVS" msgstr "" -#: ../src/plugins/cvs.c:213 +#: ../src/plugins/cvs.c:215 msgid "Run make" msgstr "" -#: ../src/plugins/cvs.c:343 ../src/plugins/cvs.c:412 +#: ../src/plugins/cvs.c:345 ../src/plugins/cvs.c:414 msgid "Not a CVS repository" msgstr "" -#: ../src/plugins/cvs.c:435 +#: ../src/plugins/cvs.c:437 msgid "Not managed by CVS" msgstr "" -#: ../src/plugins/cvs.c:557 +#: ../src/plugins/cvs.c:559 msgid "Running command..." msgstr "" -#: ../src/plugins/cvs.c:773 +#: ../src/plugins/cvs.c:775 #, c-format msgid "Command exited with error code %d" msgstr "" -#: ../src/plugins/cvs.c:779 +#: ../src/plugins/cvs.c:781 #, c-format msgid "Command exited with signal %d" msgstr "" diff --git a/po/fr.po b/po/fr.po index 58f2458..2f80ceb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-05 23:14+0200\n" +"POT-Creation-Date: 2011-08-06 00:01+0200\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: French\n" @@ -206,7 +206,7 @@ msgstr "Fichiers exécutables" msgid "Shell scripts" msgstr "Scripts shell" -#: ../src/browser.c:963 ../src/desktop.c:1717 ../src/view.c:436 +#: ../src/browser.c:963 ../src/desktop.c:1715 ../src/view.c:436 msgid "All files" msgstr "Tous les fichiers" @@ -415,7 +415,7 @@ msgstr "Copie de fichier(s)" msgid "Copying: " msgstr "Copie de : " -#: ../src/copy.c:152 ../src/desktop.c:1700 +#: ../src/copy.c:152 ../src/desktop.c:1698 msgid "Filename: " msgstr "Nom de fichier : " @@ -528,86 +528,90 @@ msgstr "Applications" msgid "Could not load preferences" msgstr "Impossible de charger les préférences" -#: ../src/desktop.c:1655 +#: ../src/desktop.c:1653 msgid "Desktop preferences" msgstr "Préférences du bureau" -#: ../src/desktop.c:1692 +#: ../src/desktop.c:1690 msgid "Default color: " msgstr "Couleur par défaut :" -#: ../src/desktop.c:1704 ../src/desktop.c:1746 +#: ../src/desktop.c:1702 ../src/desktop.c:1744 msgid "Background" msgstr "Arrière-plan" -#: ../src/desktop.c:1707 +#: ../src/desktop.c:1705 msgid "Picture files" msgstr "Images" -#: ../src/desktop.c:1725 +#: ../src/desktop.c:1723 msgid "Position: " msgstr "Position : " -#: ../src/desktop.c:1731 +#: ../src/desktop.c:1729 msgid "Centered" msgstr "Centré" -#: ../src/desktop.c:1733 +#: ../src/desktop.c:1731 msgid "Scaled" msgstr "Étiré" -#: ../src/desktop.c:1735 +#: ../src/desktop.c:1733 msgid "Scaled (keep ratio)" msgstr "Étiré (sans déformer)" -#: ../src/desktop.c:1737 +#: ../src/desktop.c:1735 msgid "Tiled" msgstr "Mosaïque" -#: ../src/desktop.c:1742 +#: ../src/desktop.c:1740 msgid "E_xtend background to all monitors" msgstr "Étendre l'arrière-plan à tous les moniteurs" -#: ../src/desktop.c:1766 +#: ../src/desktop.c:1765 msgid "Monitor: " msgstr "Moniteur : " -#: ../src/desktop.c:1774 +#: ../src/desktop.c:1771 +msgid "Whole screen" +msgstr "Écran complet" + +#: ../src/desktop.c:1776 #, c-format msgid "Monitor %d" msgstr "Moniteur %d" -#: ../src/desktop.c:1784 +#: ../src/desktop.c:1787 msgid "Resolution: " msgstr "Résolution : " -#: ../src/desktop.c:1795 +#: ../src/desktop.c:1798 msgid "Size: " msgstr "Taille: " -#: ../src/desktop.c:1809 +#: ../src/desktop.c:1812 msgid "Monitors" msgstr "Moniteurs" -#: ../src/desktop.c:1824 +#: ../src/desktop.c:1826 msgid "Desktop font: " msgstr "Police du bureau : " -#: ../src/desktop.c:1833 +#: ../src/desktop.c:1835 msgid "Theme" msgstr "Thème" -#: ../src/desktop.c:1856 +#: ../src/desktop.c:1871 #, c-format msgid "%dx%d (at %d,%d)" -msgstr "" +msgstr "%dx%d (à %d,%d)" -#: ../src/desktop.c:1859 +#: ../src/desktop.c:1874 #, c-format msgid "%dx%d mm (%.0lfx%.0lf DPI)" -msgstr "" +msgstr "%dx%d mm (%.0lfx%.0lf DPI)" -#: ../src/desktop.c:1971 +#: ../src/desktop.c:1985 msgid "" "Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n" " -H\tPlace icons horizontally\n" @@ -771,68 +775,68 @@ msgstr "Impossible d'éditer le fichier" msgid "Usage: view file...\n" msgstr "Usage: view fichier...\n" -#: ../src/plugins/cvs.c:121 ../src/plugins/cvs.c:513 +#: ../src/plugins/cvs.c:123 ../src/plugins/cvs.c:515 msgid "CVS" msgstr "CVS" -#: ../src/plugins/cvs.c:168 +#: ../src/plugins/cvs.c:170 msgid "Root:" msgstr "Racine :" -#: ../src/plugins/cvs.c:170 +#: ../src/plugins/cvs.c:172 msgid "Repository:" msgstr "Dépôt :" -#: ../src/plugins/cvs.c:172 +#: ../src/plugins/cvs.c:174 msgid "Tag:" msgstr "Tag :" -#: ../src/plugins/cvs.c:174 ../src/plugins/cvs.c:194 +#: ../src/plugins/cvs.c:176 ../src/plugins/cvs.c:196 msgid "Request diff" msgstr "Différences" -#: ../src/plugins/cvs.c:177 ../src/plugins/cvs.c:197 +#: ../src/plugins/cvs.c:179 ../src/plugins/cvs.c:199 msgid "View log" msgstr "Journal" -#: ../src/plugins/cvs.c:180 ../src/plugins/cvs.c:200 +#: ../src/plugins/cvs.c:182 ../src/plugins/cvs.c:202 msgid "Update" msgstr "Actualiser" -#: ../src/plugins/cvs.c:183 ../src/plugins/cvs.c:203 +#: ../src/plugins/cvs.c:185 ../src/plugins/cvs.c:205 msgid "Commit" msgstr "Soumettre" -#: ../src/plugins/cvs.c:192 +#: ../src/plugins/cvs.c:194 msgid "Revision:" msgstr "Révision :" -#: ../src/plugins/cvs.c:210 +#: ../src/plugins/cvs.c:212 msgid "Add to CVS" msgstr "Ajouter à CVS" -#: ../src/plugins/cvs.c:213 +#: ../src/plugins/cvs.c:215 msgid "Run make" msgstr "Exécuter make" -#: ../src/plugins/cvs.c:343 ../src/plugins/cvs.c:412 +#: ../src/plugins/cvs.c:345 ../src/plugins/cvs.c:414 msgid "Not a CVS repository" msgstr "Pas un dépôt CVS" -#: ../src/plugins/cvs.c:435 +#: ../src/plugins/cvs.c:437 msgid "Not managed by CVS" msgstr "Pas maintenu par CVS" -#: ../src/plugins/cvs.c:557 +#: ../src/plugins/cvs.c:559 msgid "Running command..." msgstr "Exécution en cours..." -#: ../src/plugins/cvs.c:773 +#: ../src/plugins/cvs.c:775 #, c-format msgid "Command exited with error code %d" msgstr "La commande a terminé avec le code d'erreur %d" -#: ../src/plugins/cvs.c:779 +#: ../src/plugins/cvs.c:781 #, c-format msgid "Command exited with signal %d" msgstr "La commande a été terminée par le signal %d" diff --git a/po/it.po b/po/it.po index dc4d211..3b725da 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-05 23:14+0200\n" +"POT-Creation-Date: 2011-08-06 00:01+0200\n" "PO-Revision-Date: 2010-04-07 23:18+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -206,7 +206,7 @@ msgstr "" msgid "Shell scripts" msgstr "" -#: ../src/browser.c:963 ../src/desktop.c:1717 ../src/view.c:436 +#: ../src/browser.c:963 ../src/desktop.c:1715 ../src/view.c:436 msgid "All files" msgstr "" @@ -415,7 +415,7 @@ msgstr "" msgid "Copying: " msgstr "" -#: ../src/copy.c:152 ../src/desktop.c:1700 +#: ../src/copy.c:152 ../src/desktop.c:1698 msgid "Filename: " msgstr "" @@ -508,86 +508,90 @@ msgstr "" msgid "Could not load preferences" msgstr "" -#: ../src/desktop.c:1655 +#: ../src/desktop.c:1653 msgid "Desktop preferences" msgstr "" -#: ../src/desktop.c:1692 +#: ../src/desktop.c:1690 msgid "Default color: " msgstr "" -#: ../src/desktop.c:1704 ../src/desktop.c:1746 +#: ../src/desktop.c:1702 ../src/desktop.c:1744 msgid "Background" msgstr "" -#: ../src/desktop.c:1707 +#: ../src/desktop.c:1705 msgid "Picture files" msgstr "" -#: ../src/desktop.c:1725 +#: ../src/desktop.c:1723 msgid "Position: " msgstr "" -#: ../src/desktop.c:1731 +#: ../src/desktop.c:1729 msgid "Centered" msgstr "" -#: ../src/desktop.c:1733 +#: ../src/desktop.c:1731 msgid "Scaled" msgstr "" -#: ../src/desktop.c:1735 +#: ../src/desktop.c:1733 msgid "Scaled (keep ratio)" msgstr "" -#: ../src/desktop.c:1737 +#: ../src/desktop.c:1735 msgid "Tiled" msgstr "" -#: ../src/desktop.c:1742 +#: ../src/desktop.c:1740 msgid "E_xtend background to all monitors" msgstr "" -#: ../src/desktop.c:1766 +#: ../src/desktop.c:1765 msgid "Monitor: " msgstr "" -#: ../src/desktop.c:1774 +#: ../src/desktop.c:1771 +msgid "Whole screen" +msgstr "" + +#: ../src/desktop.c:1776 #, c-format msgid "Monitor %d" msgstr "" -#: ../src/desktop.c:1784 +#: ../src/desktop.c:1787 msgid "Resolution: " msgstr "" -#: ../src/desktop.c:1795 +#: ../src/desktop.c:1798 msgid "Size: " msgstr "" -#: ../src/desktop.c:1809 +#: ../src/desktop.c:1812 msgid "Monitors" msgstr "" -#: ../src/desktop.c:1824 +#: ../src/desktop.c:1826 msgid "Desktop font: " msgstr "" -#: ../src/desktop.c:1833 +#: ../src/desktop.c:1835 msgid "Theme" msgstr "" -#: ../src/desktop.c:1856 +#: ../src/desktop.c:1871 #, c-format msgid "%dx%d (at %d,%d)" msgstr "" -#: ../src/desktop.c:1859 +#: ../src/desktop.c:1874 #, c-format msgid "%dx%d mm (%.0lfx%.0lf DPI)" msgstr "" -#: ../src/desktop.c:1971 +#: ../src/desktop.c:1985 msgid "" "Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n" " -H\tPlace icons horizontally\n" @@ -737,68 +741,68 @@ msgstr "" msgid "Usage: view file...\n" msgstr "" -#: ../src/plugins/cvs.c:121 ../src/plugins/cvs.c:513 +#: ../src/plugins/cvs.c:123 ../src/plugins/cvs.c:515 msgid "CVS" msgstr "CVS" -#: ../src/plugins/cvs.c:168 +#: ../src/plugins/cvs.c:170 msgid "Root:" msgstr "" -#: ../src/plugins/cvs.c:170 +#: ../src/plugins/cvs.c:172 msgid "Repository:" msgstr "" -#: ../src/plugins/cvs.c:172 +#: ../src/plugins/cvs.c:174 msgid "Tag:" msgstr "" -#: ../src/plugins/cvs.c:174 ../src/plugins/cvs.c:194 +#: ../src/plugins/cvs.c:176 ../src/plugins/cvs.c:196 msgid "Request diff" msgstr "" -#: ../src/plugins/cvs.c:177 ../src/plugins/cvs.c:197 +#: ../src/plugins/cvs.c:179 ../src/plugins/cvs.c:199 msgid "View log" msgstr "" -#: ../src/plugins/cvs.c:180 ../src/plugins/cvs.c:200 +#: ../src/plugins/cvs.c:182 ../src/plugins/cvs.c:202 msgid "Update" msgstr "" -#: ../src/plugins/cvs.c:183 ../src/plugins/cvs.c:203 +#: ../src/plugins/cvs.c:185 ../src/plugins/cvs.c:205 msgid "Commit" msgstr "" -#: ../src/plugins/cvs.c:192 +#: ../src/plugins/cvs.c:194 msgid "Revision:" msgstr "" -#: ../src/plugins/cvs.c:210 +#: ../src/plugins/cvs.c:212 msgid "Add to CVS" msgstr "" -#: ../src/plugins/cvs.c:213 +#: ../src/plugins/cvs.c:215 msgid "Run make" msgstr "" -#: ../src/plugins/cvs.c:343 ../src/plugins/cvs.c:412 +#: ../src/plugins/cvs.c:345 ../src/plugins/cvs.c:414 msgid "Not a CVS repository" msgstr "" -#: ../src/plugins/cvs.c:435 +#: ../src/plugins/cvs.c:437 msgid "Not managed by CVS" msgstr "" -#: ../src/plugins/cvs.c:557 +#: ../src/plugins/cvs.c:559 msgid "Running command..." msgstr "" -#: ../src/plugins/cvs.c:773 +#: ../src/plugins/cvs.c:775 #, c-format msgid "Command exited with error code %d" msgstr "" -#: ../src/plugins/cvs.c:779 +#: ../src/plugins/cvs.c:781 #, c-format msgid "Command exited with signal %d" msgstr "" diff --git a/src/desktop.c b/src/desktop.c index e681292..c0e96ce 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -1628,9 +1628,7 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook); static void _preferences_theme(Desktop * desktop, GtkWidget * notebook); static void _preferences_set(Desktop * desktop); static gboolean _on_preferences_closex(gpointer data); -#if GTK_CHECK_VERSION(2, 14, 0) static void _on_preferences_monitors_changed(gpointer data); -#endif static void _on_preferences_response(GtkWidget * widget, gint response, gpointer data); static void _on_preferences_ok(gpointer data); @@ -1748,15 +1746,16 @@ static void _preferences_background(Desktop * desktop, GtkWidget * notebook) static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook) { -#if GTK_CHECK_VERSION(2, 14, 0) GtkSizeGroup * group; GtkWidget * vbox2; GtkWidget * hbox; GtkWidget * label; +#if GTK_CHECK_VERSION(2, 14, 0) gint n; gint i; char * name; char buf[32]; +#endif group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); vbox2 = gtk_vbox_new(FALSE, 4); @@ -1768,6 +1767,9 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook) gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); desktop->pr_monitors = gtk_combo_box_new_text(); + gtk_combo_box_append_text(GTK_COMBO_BOX(desktop->pr_monitors), + _("Whole screen")); +#if GTK_CHECK_VERSION(2, 14, 0) n = gdk_screen_get_n_monitors(desktop->screen); for(i = 0; i < n; i++) { @@ -1777,6 +1779,7 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook) (name != NULL) ? name : buf); g_free(name); } +#endif gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_monitors, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); /* geometry */ @@ -1807,7 +1810,6 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook) gtk_combo_box_set_active(GTK_COMBO_BOX(desktop->pr_monitors), 0); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new( _("Monitors"))); -#endif } static void _preferences_theme(Desktop * desktop, GtkWidget * notebook) @@ -1839,7 +1841,6 @@ static gboolean _on_preferences_closex(gpointer data) return TRUE; } -#if GTK_CHECK_VERSION(2, 14, 0) static void _on_preferences_monitors_changed(gpointer data) { Desktop * desktop = data; @@ -1850,9 +1851,23 @@ static void _on_preferences_monitors_changed(gpointer data) char buf[64]; active = gtk_combo_box_get_active(GTK_COMBO_BOX(desktop->pr_monitors)); - gdk_screen_get_monitor_geometry(desktop->screen, active, &geometry); - width = gdk_screen_get_monitor_width_mm(desktop->screen, active); - height = gdk_screen_get_monitor_height_mm(desktop->screen, active); + geometry.x = 0; + geometry.y = 0; + geometry.width = gdk_screen_get_width(desktop->screen); + geometry.height = gdk_screen_get_height(desktop->screen); + width = gdk_screen_get_width_mm(desktop->screen); + height = gdk_screen_get_height_mm(desktop->screen); +#if GTK_CHECK_VERSION(2, 14, 0) + if(active-- > 0) + { + gdk_screen_get_monitor_geometry(desktop->screen, active, + &geometry); + width = gdk_screen_get_monitor_width_mm(desktop->screen, + active); + height = gdk_screen_get_monitor_height_mm(desktop->screen, + active); + } +#endif snprintf(buf, sizeof(buf), _("%dx%d (at %d,%d)"), geometry.width, geometry.height, geometry.x, geometry.y); gtk_label_set_text(GTK_LABEL(desktop->pr_monitors_res), buf); @@ -1861,7 +1876,6 @@ static void _on_preferences_monitors_changed(gpointer data) geometry.height * 25.4 / height); gtk_label_set_text(GTK_LABEL(desktop->pr_monitors_size), buf); } -#endif static void _on_preferences_response(GtkWidget * widget, gint response, gpointer data) diff --git a/src/plugins/cvs.c b/src/plugins/cvs.c index 7cc1681..53f1652 100644 --- a/src/plugins/cvs.c +++ b/src/plugins/cvs.c @@ -12,6 +12,8 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +/* TODO: + * - use the MIME type to add the "-kb" flag to "cvs add" */