diff --git a/ChangeLog b/ChangeLog index 84d75856df292a9ace368623a0b8cf1a1d2950a6..899761cb61f3ae511e032f9d2701c4f8b30c61df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-03-12 Benedikt Meurer <benny@xfce.org> + + * thunar/thunar-text-renderer.c: Don't setup a fixed height if text + wrapping is enabled. + * po/Thunar.pot, po/*.po: Update translations again. + * po/de.po: Fix typo in german translations. + 2006-03-12 Benedikt Meurer <benny@xfce.org> * thunar/thunar-column-editor.c(thunar_column_editor_init): Fix a typo. diff --git a/po/ChangeLog b/po/ChangeLog index 6a48737ee9e5c00323a5860de4b72364c4f93b8e..397a7ab907233c58a970c7a2789d0e4b560869ac 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,8 @@ +2006-03-12 Benedikt Meurer <benny@xfce.org> + + * Thunar.pot, *.po: Update translations again. + * de.po: Fix typo in german translations. + 2006-03-12 Benedikt Meurer <benny@xfce.org> * POTFILES.in: Add new files here. diff --git a/po/Thunar.pot b/po/Thunar.pot index 7157ff202b56434a9192c2da6a4b5d68120e9bb1..73fb094f7cf4bfaa7b5b8c74edfebe4c8c942bfd 100644 --- a/po/Thunar.pot +++ b/po/Thunar.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -573,7 +573,7 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." msgstr "" diff --git a/po/ca.po b/po/ca.po index ac23158a5dc507168d24e19c35cc8c66474c6b42..3d1f39965f002763c0ad503f66652dd310fad76c 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2006-01-29 15:14+0900\n" "Last-Translator: Pau Rul·lan Ferragut <paurullan@bulma.net>\n" "Language-Team: Catalan\n" @@ -596,10 +596,11 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 +#, fuzzy msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." -msgstr "" +msgstr "Pantalla in a llista" #. create the "Move Up" button #: ../thunar/thunar-column-editor.c:218 diff --git a/po/de.po b/po/de.po index 192c0891558c77518ebc4b46eab952bdb40f88f8..728cb7824eef8a89df2327b55d529b4e40c122b9 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.3svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" -"PO-Revision-Date: 2006-03-12 18:56+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" +"PO-Revision-Date: 2006-03-12 19:42+0100\n" "Last-Translator: Benedikt Meurer <benny@xfce.org>\n" "Language-Team: German <de@li.org>\n" "MIME-Version: 1.0\n" @@ -587,7 +587,7 @@ msgstr "" #: ../thunar/thunar-column-editor.c:153 msgid "Configure Columns in the Detailed List View" -msgstr "Die Spalten in der Detailansicht festlegen" +msgstr "Listenspalten in der Detailansicht" #: ../thunar/thunar-column-editor.c:164 msgid "Visible Columns" @@ -596,7 +596,7 @@ msgstr "Anzuzeigende Spalten" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." msgstr "" "Legen Sie die Reihenfolge fest, in der in der Detailansicht\n" diff --git a/po/el.po b/po/el.po index fe3d063e9cee805255c32854dd95852a9da5ba61..eb617cbb779e9a16641eada48818c99819206b20 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2006-03-03 21:38+0200\n" "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n" "Language-Team: Greek <nls@tux.hellug.gr>\n" @@ -592,10 +592,11 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 +#, fuzzy msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." -msgstr "" +msgstr "Εμφάνιση πεÏιεχομÎνων φακÎλου ως λεπτομεÏή λίστα" #. create the "Move Up" button #: ../thunar/thunar-column-editor.c:218 diff --git a/po/es.po b/po/es.po index 2966a9b805b8bbe832cffb08acb06f729bf3e9fe..43a45b169467f8f495495eb8b80a38aa204b1dcd 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2005-10-14 23:57+0900\n" "Last-Translator: Pablo Hernández-M. Saiz <homeless3d@gmail.com>\n" "Language-Team: Spanish <es@li.org>\n" @@ -600,7 +600,7 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." msgstr "" diff --git a/po/eu.po b/po/eu.po index f6d4db9b074ef3481c47fe786ef85d38e2426649..dfa4859f8ce4947ccd477fd5a4fca7bfa6e4b62d 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2006-02-22 12:03+0100\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n" @@ -590,10 +590,11 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 +#, fuzzy msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." -msgstr "" +msgstr "Karpeta edukia zehazturiko zerrenda ikuspegian bistarazi" #. create the "Move Up" button #: ../thunar/thunar-column-editor.c:218 diff --git a/po/fi.po b/po/fi.po index 0366d9bbf2a62e05f45a0a4eb033ff4d55620531..151dd82ccf3a2beb91ac07d22289f21a6614c2f6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2006-03-01 21:36+0200\n" "Last-Translator: jari <jari.rahkonen@pp1.inet.fi>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" @@ -586,10 +586,11 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 +#, fuzzy msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." -msgstr "" +msgstr "Näytä hakemiston sisältö yksityiskohtaisessa listanäkymässä" #. create the "Move Up" button #: ../thunar/thunar-column-editor.c:218 diff --git a/po/fr.po b/po/fr.po index cd2441e86f8e20cd8d73321ed6ec4a393a2f9d62..d71cc272bf80b36bfa911e97a370aa5665ad50fc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2006-03-02 11:55+0100\n" "Last-Translator: Stephane Roy <sroy@j2n.net>\n" "Language-Team: French <traduc@traduc.org>\n" @@ -591,10 +591,11 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 +#, fuzzy msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." -msgstr "" +msgstr "Affiche le contenu du dossier sous forme de liste détaillée" #. create the "Move Up" button #: ../thunar/thunar-column-editor.c:218 diff --git a/po/hu.po b/po/hu.po index bb841afc14106f61f6ce898446b4db0701529427..664b3d45f9652ac5eb5c328b99d1fc86e6f8a731 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2006-03-02 11:43+0100\n" "Last-Translator: SZERVÑC Attila <sas@321.hu>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" @@ -586,10 +586,11 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 +#, fuzzy msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." -msgstr "" +msgstr "Mappa megjelenÃtése részletes lista nézetben" #. create the "Move Up" button #: ../thunar/thunar-column-editor.c:218 diff --git a/po/it.po b/po/it.po index c9ae37d65db5e2c0082e5a0e076b54a04dfb4cc5..1e4ddf739371bbc10aacafb88e990ced196f32aa 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2006-03-04 13:55+0100\n" "Last-Translator: Roberto Pariset <r.pariset@gmail.com>\n" "Language-Team: GUFI <traduzioni@gufi.org>\n" @@ -591,10 +591,13 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 +#, fuzzy msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." msgstr "" +"Mostra il contenuto della directory con una visualizzazione a lista " +"dettagliata" #. create the "Move Up" button #: ../thunar/thunar-column-editor.c:218 diff --git a/po/ja.po b/po/ja.po index f3f7e5580879cdf8c1aacefbdb527b68347d3d43..af600b18a5f08785a3cec0d63fd77ccc7e3d4069 100644 --- a/po/ja.po +++ b/po/ja.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2006-03-12 18:48+0900\n" "Last-Translator: Daichi Kawahata <daichi@xfce.org>\n" "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n" @@ -601,10 +601,11 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 +#, fuzzy msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." -msgstr "" +msgstr "フォルダã®å†…容を詳細ãªãƒªã‚¹ãƒˆã§è¡¨ç¤ºã—ã¾ã™ã€‚" #. create the "Move Up" button #: ../thunar/thunar-column-editor.c:218 diff --git a/po/nl.po b/po/nl.po index eb0274b1bb9127175f728ee93781537860ba734a..a4bb9858851cbdf02fc09cba6e27df44d8af4ff0 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2006-01-31 14:07+0100\n" "Last-Translator: Vincent Tunru <imnotb@gmail.com>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" @@ -603,10 +603,11 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 +#, fuzzy msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." -msgstr "" +msgstr "Mapinhoud weergeven als gedetailleerde lijst" #. create the "Move Up" button #: ../thunar/thunar-column-editor.c:218 diff --git a/po/pl.po b/po/pl.po index 0d96623e53a2e5b2efeb06eb93712b22f3bcd57c..0b8c6ea3deb0b84eced051e3c8df4259c810c6f7 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2006-01-13 14:21+0100\n" "Last-Translator: Tomasz MichaÅ‚ Åukaszewski <T.Lukaszewski@aster.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -597,7 +597,7 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 9db2b5b6b7b2c6cb3b9efa97c337f16e922e9734..631764c586bed2a187ef35eefaf2e55cb4ec7253 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2006-02-10 22:34-0200\n" "Last-Translator: Rodrigo Coacci <rcoacci@gmail.com>\n" "Language-Team: os-cillation <info@os-cillation.com>\n" @@ -592,10 +592,11 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 +#, fuzzy msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." -msgstr "" +msgstr "Mostrar conteúdo de pasta em uma visualização de lista detalhada" #. create the "Move Up" button #: ../thunar/thunar-column-editor.c:218 diff --git a/po/ru.po b/po/ru.po index 230737910827977d55e6afa256063b8599942cd7..c61709263abc4ef1319aa30ad59ea64672fb5a14 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2006-02-24 16:14+0500\n" "Last-Translator: Sergey Fedoseev <fedoseev.sergey@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" @@ -593,10 +593,11 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 +#, fuzzy msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." -msgstr "" +msgstr "Отображает Ñодержимое текущей папки в виде ÑпиÑка" #. create the "Move Up" button #: ../thunar/thunar-column-editor.c:218 diff --git a/po/sv.po b/po/sv.po index 6c80a7ed98e69e3fe65b4a0608a9e1d05045fe0c..7878099cf882f71b405e328243341134262b1d84 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2006-02-22 16:28+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" @@ -588,10 +588,11 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 +#, fuzzy msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." -msgstr "" +msgstr "Visa mappinnehÃ¥ll i en detaljerad listvy" #. create the "Move Up" button #: ../thunar/thunar-column-editor.c:218 diff --git a/po/zh_TW.po b/po/zh_TW.po index 583cbdbde00a3095c4e4b0b32d17c462d28ddf8c..8182fe5fcbebe97608911bff76d92f7cff51e4e2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.2.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-12 18:55+0100\n" +"POT-Creation-Date: 2006-03-12 19:40+0100\n" "PO-Revision-Date: 2006-03-05 21:50+0800\n" "Last-Translator: Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -583,7 +583,7 @@ msgstr "" #. create the top label for the column editor dialog #: ../thunar/thunar-column-editor.c:177 msgid "" -"Chooser the order of information to appear in the\n" +"Choose the order of information to appear in the\n" "detailed list view." msgstr "" diff --git a/thunar/thunar-text-renderer.c b/thunar/thunar-text-renderer.c index d4a01f53871fa205ead71388969c2b6b3f1dddc2..90a51f14fc428b1b38655d99d0f8f34ac4271db8 100644 --- a/thunar/thunar-text-renderer.c +++ b/thunar/thunar-text-renderer.c @@ -389,7 +389,10 @@ thunar_text_renderer_set_property (GObject *object, break; case PROP_WRAP_WIDTH: + /* be sure to reset fixed height if wrapping is requested */ text_renderer->wrap_width = g_value_get_int (value); + if (G_LIKELY (text_renderer->wrap_width >= 0)) + gtk_cell_renderer_set_fixed_size (GTK_CELL_RENDERER (text_renderer), -1, -1); break; default: @@ -723,8 +726,9 @@ thunar_text_renderer_set_widget (ThunarTextRenderer *text_renderer, text_renderer->char_height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) + pango_font_metrics_get_descent (metrics)); pango_font_metrics_unref (metrics); - /* tell the cell renderer about the fixed height */ - gtk_cell_renderer_set_fixed_size (GTK_CELL_RENDERER (text_renderer), -1, text_renderer->char_height); + /* tell the cell renderer about the fixed height if we're not wrapping text */ + if (G_LIKELY (text_renderer->wrap_width < 0)) + gtk_cell_renderer_set_fixed_size (GTK_CELL_RENDERER (text_renderer), -1, text_renderer->char_height); /* determine the focus-padding and focus-line-width style properties from the widget */ gtk_widget_style_get (widget, "focus-padding", &focus_padding, "focus-line-width", &focus_line_width, NULL);