[Xfce4-commits] l10n: Updated Hungarian (hu) translation to 89%
Updating branch refs/heads/master to 0b1c2da51ce14962bca36bff174d332c29148e43 (commit) from 4bf8117821f6c8ff431206b984ddea4766e48898 (commit) commit 0b1c2da51ce14962bca36bff174d332c29148e43 Author: Imre Benedek Date: Mon Mar 18 00:15:20 2013 +0100 l10n: Updated Hungarian (hu) translation to 89% New status: 289 messages complete with 0 fuzzies and 35 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hu.po |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/hu.po b/po/hu.po index b1b732f..ecd4877 100644 --- a/po/hu.po +++ b/po/hu.po @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-07-23 16:44+\n" "Language: hu\n" -"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 1.4\n" #. TRANSLATORS: Keep in sync with labeloptions in weather-config.c #: ../panel-plugin/weather.c:116 @@ -647,7 +647,7 @@ msgstr "Betűkészlet kiválasztása" #. TRANSLATORS: Fallback value, usually never shown. #: ../panel-plugin/weather-config.c:1442 msgid "Choose the value to add to the list below. Values can be added more than once." -msgstr "Válassza ki az értéket az alábbi listához adandó értéket. Az értékek többször is hozzáadhatók." +msgstr "Válassza ki az alábbi listához adandó értéket. Az értékek többször is hozzáadhatók." #: ../panel-plugin/weather-config.c:1452 msgid "Air temperature, sometimes referred to as dry-bulb temperature. Measured by a thermometer that is freely exposed to the air, yet shielded from radiation and moisture." ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Swedish (sv) translation to 96%
Updating branch refs/heads/master to 8410fd2cd9211b60a0c2df41da863a805e7b1bad (commit) from 26657b61db34860c51759260ad6152a5f429c01b (commit) commit 8410fd2cd9211b60a0c2df41da863a805e7b1bad Author: Rickard Larsson Date: Sun Mar 17 22:47:38 2013 +0100 l10n: Updated Swedish (sv) translation to 96% New status: 271 messages complete with 1 fuzzy and 10 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sv.po | 360 - 1 files changed, 189 insertions(+), 171 deletions(-) diff --git a/po/sv.po b/po/sv.po index bc95197..30a34cb 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2,19 +2,19 @@ # Copyright (c) 2006, 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the xfburn package. # Daniel Nylander , 2006, 2008, 2009. -# +# msgid "" msgstr "" "Project-Id-Version: xfburn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-15 16:12-0600\n" +"POT-Creation-Date: 2013-03-17 18:24+\n" "PO-Revision-Date: 2009-12-16 18:20+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" -"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" #: ../xfburn/xfburn-adding-progress.c:111 msgid "Adding files to the composition" @@ -58,32 +58,32 @@ msgstr "Töm skiva" #: ../xfburn/xfburn-blank-dialog.c:209 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:195 -#: ../xfburn/xfburn-burn-image-dialog.c:191 +#: ../xfburn/xfburn-burn-image-dialog.c:200 #: ../xfburn/xfburn-copy-cd-dialog.c:131 #: ../xfburn/xfburn-copy-dvd-dialog.c:131 -#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:159 +#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:160 msgid "Burning device" msgstr "Brännarenhet" -#: ../xfburn/xfburn-blank-dialog.c:222 ../xfburn/xfburn-device-box.c:185 +#: ../xfburn/xfburn-blank-dialog.c:222 ../xfburn/xfburn-device-box.c:187 msgid "Blank mode" msgstr "Tömningsläge" #: ../xfburn/xfburn-blank-dialog.c:230 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:227 -#: ../xfburn/xfburn-burn-image-dialog.c:199 +#: ../xfburn/xfburn-burn-image-dialog.c:208 #: ../xfburn/xfburn-copy-cd-dialog.c:139 #: ../xfburn/xfburn-copy-dvd-dialog.c:139 -#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:193 +#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:194 msgid "Options" msgstr "Alternativ" #: ../xfburn/xfburn-blank-dialog.c:234 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:231 -#: ../xfburn/xfburn-burn-image-dialog.c:203 +#: ../xfburn/xfburn-burn-image-dialog.c:212 #: ../xfburn/xfburn-copy-cd-dialog.c:143 #: ../xfburn/xfburn-copy-dvd-dialog.c:143 -#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:197 +#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:198 msgid "E_ject disk" msgstr "M_ata ut skiva" @@ -91,7 +91,8 @@ msgstr "M_ata ut skiva" msgid "_Blank" msgstr "_Radera" -#. blanking can only be performed on blank discs, format and deformat are allowed to be blank ones +#. blanking can only be performed on blank discs, format and deformat are +#. allowed to be blank ones #: ../xfburn/xfburn-blank-dialog.c:356 msgid "The inserted disc is already blank." msgstr "Den inmatade skivan är redan tom." @@ -121,15 +122,15 @@ msgid "Done" msgstr "Färdig" #: ../xfburn/xfburn-blank-dialog.c:444 ../xfburn/xfburn-perform-burn.c:372 -#: ../xfburn/xfburn-progress-dialog.c:603 +#: ../xfburn/xfburn-progress-dialog.c:637 msgid "Failure" msgstr "Fel" #: ../xfburn/xfburn-blank-dialog.c:461 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:610 -#: ../xfburn/xfburn-burn-image-dialog.c:388 -#: ../xfburn/xfburn-burn-image-dialog.c:556 -#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:396 +#: ../xfburn/xfburn-burn-image-dialog.c:402 +#: ../xfburn/xfburn-burn-image-dialog.c:578 +#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:397 msgid "Unable to grab the drive." msgstr "Kunde inte fånga enheten." @@ -159,16 +160,16 @@ msgid "Would you like to change the default composition name?" msgstr "Vill du ändra standardkompileringsnamnet?" #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:236 -#: ../xfburn/xfburn-burn-image-dialog.c:208 +#: ../xfburn/xfburn-burn-image-dialog.c:217 #: ../xfburn/xfburn-copy-cd-dialog.c:148 #: ../xfburn/xfburn-copy-dvd-dialog.c:148 -#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:202 +#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:203 msgid "_Dummy write" msgstr "_Testskriv" #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:240 -#: ../xfburn/xfburn-burn-image-dialog.c:212 -#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:206 +#: ../xfburn/xfburn-burn-image-dialog.c:221 +#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:207 msgid "Burn_Free" msgstr "Burn_Free" @@ -180,7 +181,7 @@ msgid "Only create _ISO" msgstr "
[Xfce4-commits] l10n: Updated Swedish (sv) translation to 94%
Updating branch refs/heads/master to dab0126bc65701f353a4b27aee7e1a6ec04c4dc7 (commit) from a8463fe41a3862721c0d4980503853d23791f649 (commit) commit dab0126bc65701f353a4b27aee7e1a6ec04c4dc7 Author: Rickard Larsson Date: Sun Mar 17 22:45:09 2013 +0100 l10n: Updated Swedish (sv) translation to 94% New status: 760 messages complete with 12 fuzzies and 29 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sv.po | 29 + 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/po/sv.po b/po/sv.po index 1de78bb..3a56dd0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,7 +4,7 @@ # Johan Hammar , 2003. # Alexander Toresson , 2006. # Daniel Nylander , 2008. -# +# msgid "" msgstr "" "Project-Id-Version: xfcalendar\n" @@ -326,12 +326,12 @@ msgstr "framåt" #: ../globaltime/timezone_selection.c:194 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206 msgid "not changed" -msgstr "" +msgstr "inte ändrad" #: ../globaltime/timezone_selection.c:195 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207 msgid "not changing" -msgstr "" +msgstr "ändras inte" #. location #: ../globaltime/timezone_selection.c:247 @@ -350,7 +350,7 @@ msgstr "" #: ../globaltime/timezone_selection.c:264 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276 msgid "Previous/Next Change" -msgstr "" +msgstr "Föregående/Nästa Ändring" #: ../globaltime/timezone_selection.c:269 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281 @@ -410,7 +410,7 @@ msgstr "Orage - Kalender" #: ../globaltime/globaltime.desktop.in.h:3 msgid "Show clocks from different countries" -msgstr "" +msgstr "Visa klockor från olika länder" #: ../panel-plugin/oc_config.c:224 msgid "Appearance" @@ -438,7 +438,7 @@ msgstr "ange _höjd:" #: ../panel-plugin/oc_config.c:277 msgid "Note that you can not change the height of horizontal panels" -msgstr "" +msgstr "Notera att du inte kan ändra höjden på horisontala paneler" #: ../panel-plugin/oc_config.c:282 msgid "set _width:" @@ -446,7 +446,7 @@ msgstr "ange _bredd:" #: ../panel-plugin/oc_config.c:293 msgid "Note that you can not change the width of vertical panels" -msgstr "" +msgstr "Notera att du inte kan ändra bredden på vertikala paneler" #: ../panel-plugin/oc_config.c:316 msgid "Clock Options" @@ -460,7 +460,7 @@ msgstr "ange tidszon till:" #: ../panel-plugin/oc_config.c:347 #, c-format msgid "Line %d:" -msgstr "" +msgstr "Rad %d:" #: ../panel-plugin/oc_config.c:357 msgid "Enter any valid strftime function parameter." @@ -511,7 +511,6 @@ msgstr "" "\t%X = lokal tid\t\t\t%x = lokalt datum" #: ../panel-plugin/oc_config.c:457 -#, fuzzy msgid "Orage clock Preferences" msgstr "Inställningar för Orage" @@ -524,7 +523,7 @@ msgstr "Inställningar för Orage" #. * %B : full month name #. * %Y : four digit year #. * %V : ISO week number -#. +#. #: ../panel-plugin/xfce4-orageclock-plugin.c:627 msgid "%A %d %B %Y/%V" msgstr "%A %d %B %Y/%V" @@ -534,9 +533,8 @@ msgid "Maintainer" msgstr "Ansvarig" #: ../src/about-xfcalendar.c:47 -#, fuzzy msgid "Manage your time with Orage" -msgstr "Planera din tid med Xfce4" +msgstr "Planera din tid med Orage" #. if (gtk_toggle_button_get_active( #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb))) @@ -966,7 +964,7 @@ msgstr "Årligen" #: ../src/appointment.c:3176 msgid "Hourly" -msgstr "" +msgstr "Varje timme" #: ../src/appointment.c:3178 msgid "Mon" @@ -1842,9 +1840,8 @@ msgstr "" "alarm." #: ../src/parameters.c:605 -#, fuzzy msgid "Display settings" -msgstr "Vsa" +msgstr "Visa inställningar" #: ../src/parameters.c:613 msgid "Calendar main window" @@ -2016,7 +2013,7 @@ msgstr "Påminnelse - Orage" #: ../src/reminder.c:808 msgid "Remind me again after the specified time" -msgstr "" +msgstr "Påminn mig efter den angivna tiden" #. Note that this goes to the main area. Temporary for the version #: ../src/reminder.c:811 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Swedish (sv) translation to 89%
Updating branch refs/heads/xfce-4.10 to c419029bcd421dd28cb937f51dbe575255d9681d (commit) from e4f5a0b9a1972b5607ae1f634b5f3314f197ded7 (commit) commit c419029bcd421dd28cb937f51dbe575255d9681d Author: Rickard Larsson Date: Sun Mar 17 22:39:27 2013 +0100 l10n: Updated Swedish (sv) translation to 89% New status: 61 messages complete with 2 fuzzies and 5 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sv.po | 10 -- 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/sv.po b/po/sv.po index 42e1335..0061b19 100644 --- a/po/sv.po +++ b/po/sv.po @@ -66,7 +66,7 @@ msgstr "Är du säker att du vill rensa din kommando historia?" #: ../src/appfinder-preferences.c:333 msgid "The custom action will be deleted permanently." -msgstr "" +msgstr "Den anpassade åtgärden kommer raderas permanent." #: ../src/appfinder-preferences.c:334 #, c-format @@ -84,7 +84,6 @@ msgid "Toggle view mode" msgstr "Växla vy" #: ../src/appfinder-window.c:364 -#, fuzzy msgid "La_unch" msgstr "Starta" @@ -176,7 +175,7 @@ msgstr "" #: ../src/appfinder-preferences.glade.h:1 msgid "Add a new custom action." -msgstr "" +msgstr "Lägg till en ny anpassad åtgärd." #: ../src/appfinder-preferences.glade.h:2 msgid "Always c_enter the window" @@ -195,9 +194,8 @@ msgid "C_lear Custom Command History" msgstr "Rensa kommando historia" #: ../src/appfinder-preferences.glade.h:7 -#, fuzzy msgid "Categ_ory icon size:" -msgstr "Kategorier" +msgstr "Ik_onstorlek för kategori:" #: ../src/appfinder-preferences.glade.h:8 msgid "Center the window on startup." @@ -209,7 +207,7 @@ msgstr "Ko_mmando" #: ../src/appfinder-preferences.glade.h:10 msgid "Custom _Actions" -msgstr "" +msgstr "_Anpassade Åtgärder" #: ../src/appfinder-preferences.glade.h:11 msgid "History" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Swedish (sv) translation to 65%
Updating branch refs/heads/xfce-4.10 to 71d702a2329b1182b606db7fed0ef262dfcdc0ea (commit) from 88805dfa82169991f58d034980e355fbf0ba427e (commit) commit 71d702a2329b1182b606db7fed0ef262dfcdc0ea Author: larsson Date: Sun Mar 17 22:01:36 2013 +0100 l10n: Updated Swedish (sv) translation to 65% New status: 59 messages complete with 0 fuzzies and 31 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sv.po | 331 +- 1 files changed, 308 insertions(+), 23 deletions(-) diff --git a/po/sv.po b/po/sv.po index 0289d93..977092a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2,69 +2,100 @@ # Copyright (C) 2008, 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the libxfce4ui package. # Daniel Nylander , 2008, 2009. -# +# msgid "" msgstr "" "Project-Id-Version: libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" +"POT-Creation-Date: 2013-03-17 17:00+\n" "PO-Revision-Date: 2010-10-16 16:24+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" -"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:80 +msgid "Failed to open web browser for online documentation" +msgstr "Misslyckades att öppa webläsare för online-dokumentation" + +#: ../libxfce4ui/xfce-dialogs.c:195 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Vill du läsa %s manualen online?" + +#: ../libxfce4ui/xfce-dialogs.c:197 +msgid "Do you want to read the manual online?" +msgstr "Vill du läsa manualen online?" + +#: ../libxfce4ui/xfce-dialogs.c:200 +msgid "Online Documentation" +msgstr "Online-dokumentation" + +#: ../libxfce4ui/xfce-dialogs.c:203 +msgid "" +"You will be redirected to the documentation website where the help pages are " +"maintained and translated." +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:207 +msgid "_Read Online" +msgstr "_Läs Online" + +#: ../libxfce4ui/xfce-dialogs.c:219 +msgid "_Always go directly to the online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:263 msgid "Information" msgstr "Information" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:296 msgid "Warning" msgstr "Varning" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:330 msgid "Error" msgstr "Fel" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:381 msgid "Question" msgstr "Fråga" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1402 msgid "Session management client ID" msgstr "Klient-id för sessionshantering" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1402 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1403 msgid "Disable session management" msgstr "Inaktivera sessionshantering" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1413 msgid "Session management options" msgstr "Flaggor för sessionshantering" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1414 msgid "Show session management options" msgstr "Visa flaggor för sessionshantering" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1590 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Misslyckades med att ansluta till sessionshanteraren: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1597 #, c-format msgid "Session manager did not return a valid client id" msgstr "Sessionshanteraren returnerade inte ett giltigt klient-id" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:406 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning \"%s" @@ -130,32 +161,32 @@ msgstr "Åtgärder i konflikt för %s" msgid "This shortcut is already being used for something else." msgstr "Denna genväg används redan för någonting annat." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:204 msgid "Window Manager Action Shortcut" msgstr "Åtgärdsgenväg för fönsterhanterare" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:205 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:215 msgid "Action:" msgstr "Åtgärd:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Command Shortcut" msgstr "Kommandogenväg" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:210 msgid
[Xfce4-commits] l10n: Updated Swedish (sv) translation to 82%
Updating branch refs/heads/xfce-4.10 to e4f5a0b9a1972b5607ae1f634b5f3314f197ded7 (commit) from 3ac34bdd003c3400f175e83827df585cc2bf6ecb (commit) commit e4f5a0b9a1972b5607ae1f634b5f3314f197ded7 Author: larsson Date: Sun Mar 17 21:51:04 2013 +0100 l10n: Updated Swedish (sv) translation to 82% New status: 56 messages complete with 4 fuzzies and 8 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sv.po | 57 - 1 files changed, 28 insertions(+), 29 deletions(-) diff --git a/po/sv.po b/po/sv.po index e82679a..42e1335 100644 --- a/po/sv.po +++ b/po/sv.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-appfinder\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-24 19:15+\n" +"POT-Creation-Date: 2013-03-17 18:30+\n" "PO-Revision-Date: 2010-10-17 17:10+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -21,9 +21,8 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/appfinder-category-model.c:146 -#, fuzzy msgid "All Applications" -msgstr "Programlista" +msgstr "Alla Program" #: ../src/appfinder-model.c:545 msgid "Name" @@ -42,16 +41,14 @@ msgid "Categories" msgstr "Kategorier" #: ../src/appfinder-model.c:549 -#, fuzzy msgid "Filename" -msgstr "Filhanterare" +msgstr "Filnamn" -#: ../src/appfinder-model.c:1825 -#, fuzzy +#: ../src/appfinder-model.c:1829 msgid "Application has no command" -msgstr "Programlista" +msgstr "Programet har inget kommando" -#: ../src/appfinder-model.c:2149 +#: ../src/appfinder-model.c:2153 msgid "Commands History" msgstr "Kommando historia" @@ -76,49 +73,57 @@ msgstr "" msgid "Are you sure you want to delete pattern \"%s\"?" msgstr "Är du säker att du vill radera mönster \"%s\"?" -#: ../src/appfinder-window.c:216 ../src/main.c:446 +#: ../src/appfinder-window.c:220 ../src/main.c:446 #: ../src/appfinder-preferences.glade.h:4 #: ../data/xfce4-appfinder.desktop.in.h:1 msgid "Application Finder" msgstr "Programlista" -#: ../src/appfinder-window.c:268 +#: ../src/appfinder-window.c:272 msgid "Toggle view mode" msgstr "Växla vy" -#: ../src/appfinder-window.c:763 +#: ../src/appfinder-window.c:364 +#, fuzzy +msgid "La_unch" +msgstr "Starta" + +#: ../src/appfinder-window.c:805 msgid "Failed to launch desktop item editor" msgstr "Misslyckades med att starta skrivbords objekt redigerare" -#: ../src/appfinder-window.c:789 +#: ../src/appfinder-window.c:831 msgid "" "This will permanently remove the custom desktop file from your home " "directory." -msgstr "Detta kommer att permanent radera din skrivbords fil från din hem mapp." +msgstr "" +"Detta kommer att permanent radera din skrivbords fil från din hem mapp." -#: ../src/appfinder-window.c:790 +#: ../src/appfinder-window.c:832 #, c-format msgid "Are you sure you want to revert \"%s\"?" msgstr "Är du säker att du vill återställa \"%s\"?" -#: ../src/appfinder-window.c:800 +#: ../src/appfinder-window.c:842 msgid "Failed to remove desktop file" msgstr "Misslyckades med att radera skrivbords fil" #. I18N: the first %s will be replace with users' applications directory, the #. * second with Hidden=true -#: ../src/appfinder-window.c:833 +#: ../src/appfinder-window.c:875 #, c-format msgid "" "To unhide the item you have to manually remove the desktop file from \"%s\" " "or open the file in the same directory and remove the line \"%s\"." -msgstr "För att åter visa objektet måste du manuellt radera skrivbords filen från \"%s\" eller öppna filen i samma mapp och radera linjen \"%s\"." +msgstr "" +"För att åter visa objektet måste du manuellt radera skrivbords filen från " +"\"%s\" eller öppna filen i samma mapp och radera linjen \"%s\"." -#: ../src/appfinder-window.c:838 ../src/appfinder-window.c:923 +#: ../src/appfinder-window.c:880 ../src/appfinder-window.c:972 msgid "_Hide" msgstr "dölj" -#: ../src/appfinder-window.c:839 +#: ../src/appfinder-window.c:881 #, c-format msgid "Are you sure you want to hide \"%s\"?" msgstr "Är du säker på att du vill dölja \"%s\"?" @@ -128,9 +133,8 @@ msgid "Start in collapsed mode" msgstr "Starta i kollapsat läge" #: ../src/main.c:76 -#, fuzzy msgid "Print version information and exit" -msgstr "Versionsinformation" +msgstr "Visa versionsinformation och avsluta" #: ../src/main.c:77 msgid "Replace the existing service" @@ -312,14 +316,12 @@ msgid "Find and launch applications installed on your system" msgstr "Sök och starta program som är installerade på din dator" #: ../data/xfce4-run.desktop.in.h:1 -#, fuzzy msgid "Run Program..." -msgstr "Kör programmet" +msgstr "Kör program..." #: ../data/xfce4-run.desktop.in.h:2 -#, fuzzy msgid "Run a program" -msgstr "Kör programmet" +msgstr "Kör ett program" #~ msgid "[MENUFILE]" #~ msgstr "[MENYFIL]" @@ -339,9 +341,6 @@ msgstr "Kör programmet" #~ msgid "C_lose after launch" #~ msgstr "S_täng efter
[Xfce4-commits] l10n: Updated Swedish (sv) translation to 91%
Updating branch refs/heads/xfce-4.10 to 15d71d30135b36d0bc9928e94f853ca33dd4cf4d (commit) from 4fe05a1332afb2afdfb72a59a8dab4de23dc65fa (commit) commit 15d71d30135b36d0bc9928e94f853ca33dd4cf4d Author: larsson Date: Sun Mar 17 21:48:50 2013 +0100 l10n: Updated Swedish (sv) translation to 91% New status: 195 messages complete with 7 fuzzies and 11 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sv.po | 433 +- 1 files changed, 232 insertions(+), 201 deletions(-) diff --git a/po/sv.po b/po/sv.po index 6cc1b2a..396159b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2,18 +2,19 @@ # Copyright (C) 2008, 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the xfce4-power-manager package. # Daniel Nylander , 2008, 2009. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-power-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-28 11:05+\n" +"POT-Creation-Date: 2013-03-17 19:54+\n" "PO-Revision-Date: 2011-02-28 16:45+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/interfaces/xfpm-settings.ui.h:1 @@ -45,14 +46,10 @@ msgid "Consider the computer on low power at:" msgstr "Anse att datorn har låg strömnivå vid:" #. Hibernate menu option -#: ../data/interfaces/xfpm-settings.ui.h:8 -#: ../settings/xfpm-settings.c:817 -#: ../settings/xfpm-settings.c:885 -#: ../settings/xfpm-settings.c:1032 -#: ../settings/xfpm-settings.c:1206 -#: ../settings/xfpm-settings.c:1263 -#: ../settings/xfpm-settings.c:1315 -#: ../src/xfpm-power.c:484 +#: ../data/interfaces/xfpm-settings.ui.h:8 ../settings/xfpm-settings.c:820 +#: ../settings/xfpm-settings.c:888 ../settings/xfpm-settings.c:1037 +#: ../settings/xfpm-settings.c:1214 ../settings/xfpm-settings.c:1271 +#: ../settings/xfpm-settings.c:1323 ../src/xfpm-power.c:484 #: ../src/xfpm-power.c:779 msgid "Hibernate" msgstr "Viloläge" @@ -65,8 +62,7 @@ msgstr "Nivå:" msgid "Lock screen when going for suspend/hibernate" msgstr "Lås skärmen när datorn försätts i vänteläge/viloläge" -#: ../data/interfaces/xfpm-settings.ui.h:11 -#: ../src/xfpm-power-common.c:132 +#: ../data/interfaces/xfpm-settings.ui.h:11 ../src/xfpm-power-common.c:132 msgid "Monitor" msgstr "Skärm" @@ -74,13 +70,10 @@ msgstr "Skärm" msgid "Monitor power management control" msgstr "Övervaka strömhantering" -#: ../data/interfaces/xfpm-settings.ui.h:13 -#: ../settings/xfpm-settings.c:806 -#: ../settings/xfpm-settings.c:874 -#: ../settings/xfpm-settings.c:1021 -#: ../settings/xfpm-settings.c:1195 -#: ../settings/xfpm-settings.c:1252 -#: ../settings/xfpm-settings.c:1304 +#: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:809 +#: ../settings/xfpm-settings.c:877 ../settings/xfpm-settings.c:1026 +#: ../settings/xfpm-settings.c:1203 ../settings/xfpm-settings.c:1260 +#: ../settings/xfpm-settings.c:1312 msgid "Nothing" msgstr "Ingenting" @@ -125,14 +118,10 @@ msgid "Standby" msgstr "Viloläge" #. Suspend menu option -#: ../data/interfaces/xfpm-settings.ui.h:24 -#: ../settings/xfpm-settings.c:811 -#: ../settings/xfpm-settings.c:879 -#: ../settings/xfpm-settings.c:1026 -#: ../settings/xfpm-settings.c:1200 -#: ../settings/xfpm-settings.c:1257 -#: ../settings/xfpm-settings.c:1309 -#: ../src/xfpm-power.c:499 +#: ../data/interfaces/xfpm-settings.ui.h:24 ../settings/xfpm-settings.c:814 +#: ../settings/xfpm-settings.c:882 ../settings/xfpm-settings.c:1031 +#: ../settings/xfpm-settings.c:1208 ../settings/xfpm-settings.c:1265 +#: ../settings/xfpm-settings.c:1317 ../src/xfpm-power.c:499 #: ../src/xfpm-power.c:792 msgid "Suspend" msgstr "Vänteläge" @@ -166,13 +155,11 @@ msgid "When sleep button is pressed:" msgstr "När sovknappen trycks ned:" #: ../data/interfaces/xfpm-settings.ui.h:32 -#: ../settings/xfpm-settings-main.c:121 -#: ../src/xfpm-main.c:410 +#: ../settings/xfpm-settings-main.c:121 ../src/xfpm-main.c:413 msgid "Xfce Power Manager" msgstr "Strömhanterare för Xfce" -#: ../settings/xfpm-settings.c:567 -#: ../settings/xfpm-settings.c:582 +#: ../settings/xfpm-settings.c:567 ../settings/xfpm-settings.c:582 #: ../settings/xfpm-settings.c:609 msgid "Never" msgstr "Aldrig" @@ -181,30 +168,24 @@ msgstr "Aldrig" msgid "One minute" msgstr "En minut" -#: ../settings/xfpm-settings.c:572 -#: ../settings/xfpm-settings.c:584 +#: ../settings/xfpm-settings.c:572 ../settings/xfpm-settings.c:584 msgid "Minutes" msgstr "minuter" -#: ../settings/xfpm-settings.c:586 -#: ../settings/xfpm-settings.c:593 -#: ../settings/xfpm-settings.c:594 -#: ../settings/xfpm-settings.c:595 +#: ../settings/xfpm-settings.c:586 ../settings/xfpm-settings.c:593 +#: ../settings/xfpm-settings.c:594 ../settings/xfpm-settings.c:595
[Xfce4-commits] l10n: Updated Swedish (sv) translation to 100%
Updating branch refs/heads/xfce-4.10 to 986fd99b5fc4293d1d0ebfe4166e5fae2ee6bbd8 (commit) from 540b0e8726bcaea02896b3ef80beaea85d99a421 (commit) commit 986fd99b5fc4293d1d0ebfe4166e5fae2ee6bbd8 Author: larsson Date: Sun Mar 17 21:46:59 2013 +0100 l10n: Updated Swedish (sv) translation to 100% New status: 31 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sv.po | 19 +-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/po/sv.po b/po/sv.po index af8f4f5..7f6d4fe 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: garcon\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-30 11:03+\n" +"POT-Creation-Date: 2013-03-17 16:51+\n" "PO-Revision-Date: 2010-10-17 17:21+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -57,6 +57,14 @@ msgstr "Grafik" msgid "Graphics creation and manipulation applications" msgstr "Program för att skapa och ändra grafik och bilder" +#: ../data/xfce/xfce-hardware.directory.in.h:1 +msgid "Hardware" +msgstr "Hårdvara" + +#: ../data/xfce/xfce-hardware.directory.in.h:2 +msgid "Settings for several hardware devices" +msgstr "Inställningar för flera hårdvaruenheter" + #: ../data/xfce/xfce-multimedia.directory.in.h:1 msgid "Audio and video players and editors" msgstr "Ljud- och videospelare samt redigerare" @@ -70,7 +78,6 @@ msgid "Applications for Internet access" msgstr "Program för Internet-åtkomst" #: ../data/xfce/xfce-network.directory.in.h:2 -#, fuzzy msgid "Internet" msgstr "Internet" @@ -90,6 +97,14 @@ msgstr "Program som inte passar in i andra kategorier" msgid "Other" msgstr "Övrigt" +#: ../data/xfce/xfce-personal.directory.in.h:1 +msgid "Personal" +msgstr "Personligt" + +#: ../data/xfce/xfce-personal.directory.in.h:2 +msgid "Personal settings" +msgstr "Personliga inställningar" + #: ../data/xfce/xfce-screensavers.directory.in.h:1 msgid "Screensaver applets" msgstr "Skärmsläckarprogram" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Swedish (sv) translation to 97%
Updating branch refs/heads/xfce-4.10 to 78b46b449461c2b0f320a57b04bbd160bdcfd437 (commit) from 017ff7c3685b30cddff4c6139b1a630f5d1ea3fc (commit) commit 78b46b449461c2b0f320a57b04bbd160bdcfd437 Author: larsson Date: Sun Mar 17 21:39:09 2013 +0100 l10n: Updated Swedish (sv) translation to 97% New status: 229 messages complete with 5 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sv.po | 528 +++--- 1 files changed, 262 insertions(+), 266 deletions(-) diff --git a/po/sv.po b/po/sv.po index 4ff6cd7..7ea7f4c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,19 +5,19 @@ # Jens Hagerman , 2006. # Alexander Toresson , 2006. # Daniel Nylander , 2008, 2009. -# +# msgid "" msgstr "" "Project-Id-Version: xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-09 18:54+0200\n" +"POT-Creation-Date: 2013-03-17 16:36+\n" "PO-Revision-Date: 2010-10-17 17:08+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" -"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: ../helper-dialog/helper-dialog.c:84 @@ -86,238 +86,237 @@ msgid "Settings manager socket" msgstr "Uttag för inställningshanterare" #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1 -#: ../settings-dialogs/xfwm4-dialog.glade.h:1 -msgid "Window Manager" -msgstr "Fönsterhanterare" - -#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2 -#: ../settings-dialogs/xfwm4-dialog.glade.h:2 +#: ../settings-dialogs/xfwm4-dialog.glade.h:29 msgid "Configure window behavior and shortcuts" msgstr "Konfigurera fönsterbeteende och genvägar" -#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1 -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1 -msgid "Window Manager Tweaks" -msgstr "Justeringar för fönsterhanterare" +#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2 +#: ../settings-dialogs/xfwm4-dialog.glade.h:48 +msgid "Window Manager" +msgstr "Fönsterhanterare" -#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2 -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2 +#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16 msgid "Fine-tune window behaviour and effects" msgstr "Finjustera fönsterbeteende och effekter" +#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36 +msgid "Window Manager Tweaks" +msgstr "Justeringar för fönsterhanterare" + #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1 +msgid "Configure layout, names and margins" +msgstr "Konfigurera layout, namn och marginaler" + +#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2 +#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5 msgid "Workspaces" msgstr "Arbetsytor" -#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2 -#: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2 -msgid "Configure layout, names and margins" -msgstr "" +#: ../settings-dialogs/xfwm4-dialog.glade.h:1 +msgid "Box move and resize" +msgstr "Flyttning och storleksändring" + +#: ../settings-dialogs/xfwm4-dialog.glade.h:2 +msgid "Button layout" +msgstr "Knapplayout" #: ../settings-dialogs/xfwm4-dialog.glade.h:3 -msgid "_Theme" -msgstr "_Tema" +msgid "Double click _action" +msgstr "Dubbelklicksåt_gärd" #: ../settings-dialogs/xfwm4-dialog.glade.h:4 -msgid "Title fon_t" -msgstr "Typsnitt för tite_l" +msgid "Focus model" +msgstr "Fokusmodell" #: ../settings-dialogs/xfwm4-dialog.glade.h:5 -msgid "Title _alignment" -msgstr "Titel_justering" +msgid "New window focus" +msgstr "Fokus för nya fönster" #: ../settings-dialogs/xfwm4-dialog.glade.h:6 -msgid "Click and drag the buttons to change the layout" -msgstr "Klicka och dra knapparna för att ändra layouten" +msgid "Raise on click" +msgstr "Höj vid klick" #: ../settings-dialogs/xfwm4-dialog.glade.h:7 -msgid "Title" -msgstr "Titel" +msgid "Raise on focus" +msgstr "Höj vid fokus" #: ../settings-dialogs/xfwm4-dialog.glade.h:8 -msgid "The window title cannot be removed" -msgstr "Fönstrets titel kan inte tas bort" +msgid "Title _alignment" +msgstr "Titel_justering" #: ../settings-dialogs/xfwm4-dialog.glade.h:9 -msgid "Active" -msgstr "Aktiva" +msgid "Title fon_t" +msgstr "Typsnitt för tite_l" #: ../settings-dialogs/xfwm4-dialog.glade.h:10 -msgid "Menu" -msgstr "Meny" +msgid "Window _shortcuts" +msgstr "Fönstergenv_ägar" #: ../settings-dialogs/xfwm4-dialog.glade.h:11 -msgid "Stick" -msgstr "Klistra fast" +msgid "Windows snapping" +msgstr "Fönsterattraktion" #: ../settings-dialogs/xfwm4-dialog.glade.h:12 -msgid "Shade" -msgstr "Rulla upp" +msgid "Wrap workspaces" +msgstr "Byt arbetsyta" #: ../settings-dialog
[Xfce4-commits] Remove custom OSD brightness popup, use libnotify instead
Updating branch refs/heads/master
to 5ac47c842bb53ba7ae9240ccd2af7c93fe7eecaf (commit)
from 7418aabd54ba0e5aa6f9fe0f4af209fb7069f523 (commit)
commit 5ac47c842bb53ba7ae9240ccd2af7c93fe7eecaf
Author: Jannis Pohlmann
Date: Sun Feb 3 00:30:48 2013 +0100
Remove custom OSD brightness popup, use libnotify instead
The custom rendered OSD popup to indicate the current brightness
state whenever it changed looked nice but it is better handled in
the notification daemon. E.g. we could include an extension hint
in the notification to have xfce4-notifyd render certain
notifications (e.g. brightness, volume changes) in a different style
than regular notifications.
This commit simplifies the whole brightness notification logic
quite a bit.
Signed-off-by: Jannis Pohlmann
src/Makefile.am |4 +-
src/gsd-media-keys-window.c | 1078 ---
src/gsd-media-keys-window.h | 71 ---
src/xfpm-backlight.c| 128 +-
src/xfpm-notify.c |2 +-
5 files changed, 19 insertions(+), 1264 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index eaca181..0435bed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,9 +37,7 @@ xfce4_power_manager_SOURCES = \
xfpm-polkit.c \
xfpm-polkit.h \
xfpm-errors.c \
- xfpm-errors.h \
- gsd-media-keys-window.c \
- gsd-media-keys-window.h
+ xfpm-errors.h
xfce4_power_manager_CFLAGS =\
-I$(top_srcdir) \
diff --git a/src/gsd-media-keys-window.c b/src/gsd-media-keys-window.c
deleted file mode 100644
index b2664e2..000
--- a/src/gsd-media-keys-window.c
+++ /dev/null
@@ -1,1078 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2006-2007 William Jon McCann
- *
- * 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 2 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include "config.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "gsd-media-keys-window.h"
-
-#include "data/interfaces/acme_ui.h"
-
-#define DIALOG_TIMEOUT 2000 /* dialog timeout in ms */
-#define DIALOG_FADE_TIMEOUT 1500 /* timeout before fade starts */
-#define FADE_TIMEOUT 10/* timeout in ms between each frame of the fade
*/
-
-#define BG_ALPHA 0.75
-#define FG_ALPHA 1.00
-
-#define GSD_MEDIA_KEYS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE
((o), GSD_TYPE_MEDIA_KEYS_WINDOW, GsdMediaKeysWindowPrivate))
-
-struct GsdMediaKeysWindowPrivate
-{
-guintis_composited : 1;
-guinthide_timeout_id;
-guintfade_timeout_id;
-double fade_out_alpha;
-GsdMediaKeysWindowAction action;
-char*icon_name;
-gboolean show_level;
-
-guintvolume_muted : 1;
-int volume_level;
-
-GtkImage*image;
-GtkWidget *progress;
-};
-
-G_DEFINE_TYPE (GsdMediaKeysWindow, gsd_media_keys_window, GTK_TYPE_WINDOW)
-
-static gboolean
-fade_timeout (GsdMediaKeysWindow *window)
-{
-if (window->priv->fade_out_alpha <= 0.0) {
-gtk_widget_hide (GTK_WIDGET (window));
-
-/* Reset it for the next time */
-window->priv->fade_out_alpha = 1.0;
-window->priv->fade_timeout_id = 0;
-
-return FALSE;
-} else {
-GdkRectangle rect;
-GtkWidget *win = GTK_WIDGET (window);
-GtkAllocation allocation;
-
-window->priv->fade_out_alpha -= 0.10;
-
-rect.x = 0;
-rect.y = 0;
-gtk_widget_get_allocation (win, &allocation);
-rect.width = allocation.width;
-rect.height = allocation.height;
-
-gtk_widget_realize (win);
-gdk_window_invalidate_rect (gtk_widget_get_window (win),
&rect, FALSE);
-}
-
-return TRUE;
-}
-
-static gboolean
-hide_t
[Xfce4-commits] l10n: Updated Swedish (sv) translation to 100%
Updating branch refs/heads/xfce-4.10 to 19aad2e027cdcc28f10b5e310e39946918fb91e4 (commit) from 8d293d185fc268763e6be7f7aa75be7e89158df0 (commit) commit 19aad2e027cdcc28f10b5e310e39946918fb91e4 Author: larsson Date: Sun Mar 17 21:35:47 2013 +0100 l10n: Updated Swedish (sv) translation to 100% New status: 275 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sv.po | 179 ++ 1 files changed, 98 insertions(+), 81 deletions(-) diff --git a/po/sv.po b/po/sv.po index 37fbe47..77f20d4 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3,19 +3,19 @@ # This file is distributed under the same license as exo. # Alexander Toresson , 2005. # Daniel Nylander , 2007, 2008, 2009. -# +# msgid "" msgstr "" "Project-Id-Version: libexo\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:35+0100\n" +"POT-Creation-Date: 2013-03-17 16:45+\n" "PO-Revision-Date: 2010-10-17 17:09+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" -"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: ../exo/exo-cell-renderer-ellipsized-text.c:131 @@ -534,8 +534,8 @@ msgstr " --strip-comments Ta bort kommentarer från XML-filer\n" msgid " --strip-content Remove node contents from XML files\n" msgstr " --strip-content Ta bort nodinnehåll från XML-filer\n" -#: ../exo-csource/main.c:304 ../exo-desktop-item-edit/main.c:177 -#: ../exo-open/main.c:471 +#: ../exo-csource/main.c:304 ../exo-desktop-item-edit/main.c:193 +#: ../exo-open/main.c:496 #, c-format msgid "" "Copyright (c) %s\n" @@ -550,8 +550,8 @@ msgstr "" "Skrivet av Benedikt Meurer .\n" "\n" -#: ../exo-csource/main.c:308 ../exo-desktop-item-edit/main.c:181 -#: ../exo-open/main.c:475 +#: ../exo-csource/main.c:308 ../exo-desktop-item-edit/main.c:197 +#: ../exo-open/main.c:500 #, c-format msgid "" "%s comes with ABSOLUTELY NO WARRANTY,\n" @@ -566,8 +566,8 @@ msgstr "" "källkodspaketet för %s.\n" "\n" -#: ../exo-csource/main.c:312 ../exo-desktop-item-edit/main.c:185 -#: ../exo-open/main.c:479 +#: ../exo-csource/main.c:312 ../exo-desktop-item-edit/main.c:201 +#: ../exo-open/main.c:504 #, c-format msgid "Please report bugs to <%s>.\n" msgstr "Rapportera fel till <%s>.\n" @@ -612,37 +612,44 @@ msgstr "Skalskript" msgid "Create Launcher %s" msgstr "Skapa programstartare %s" -#. TRANSLATORS: Label in "Create Launcher"/"Create Link" dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in "Create Launcher"/"Create Link" dialog, make sure to +#. avoid mnemonic conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:297 msgid "_Name:" msgstr "_Namn:" -#. TRANSLATORS: Label in "Create Launcher"/"Create Link" dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in "Create Launcher"/"Create Link" dialog, make sure to +#. avoid mnemonic conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:313 msgid "C_omment:" msgstr "K_ommentar:" -#. TRANSLATORS: Label in "Create Launcher" dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in "Create Launcher" dialog, make sure to avoid mnemonic +#. conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:329 msgid "Comm_and:" msgstr "Komm_ando:" -#. TRANSLATORS: Label in "Create Link" dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in "Create Link" dialog, make sure to avoid mnemonic +#. conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:344 msgid "_URL:" msgstr "_URL:" -#. TRANSLATORS: Label in "Create Launcher" dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in "Create Launcher" dialog, make sure to avoid mnemonic +#. conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:360 msgid "Working _Directory:" msgstr "Arbets_katalog:" -#. TRANSLATORS: Label in "Create Launcher"/"Create Link" dialog, make sure to avoid mnemonic conflicts +#. TRANSLATORS: Label in "Create Launcher"/"Create Link" dialog, make sure to +#. avoid mnemonic conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:389 msgid "_Icon:" msgstr "_Ikon:" -#. TRANSLATORS: Label for the icon button in "Create Launcher"/"Create Link" dialog if no icon selected +#. TRANSLATORS: Label for the icon button in "Create Launcher"/"Create Link" +#. dialog if no icon selected #. setup a label to tell that no icon was selected #: ../exo-desktop-item-edit/exo-die-editor.c:406 #: ../exo-desktop-item-edit/exo-die-editor.c:1233 @@ -653,9 +660,11 @@ msgstr "Ingen ikon" msgid "Options:" msgstr "Alternativ:" -#. TRANSLATORS: Check button label in "Create Launcher" dialog, make sure to avoid mnemonic conflicts -#. * and sync your translations with the translations in Thunar and xfce4-panel. -#. +#. TRANSLATORS: Check bu
[Xfce4-commits] l10n: Updated Swedish (sv) translation to 96%
Updating branch refs/heads/xfce-4.10 to fe4e53c01ae6abf5ade75cd9089965d32afa104b (commit) from 777690c3469ff468326968422feaca78613c8712 (commit) commit fe4e53c01ae6abf5ade75cd9089965d32afa104b Author: larsson Date: Sun Mar 17 21:33:14 2013 +0100 l10n: Updated Swedish (sv) translation to 96% New status: 319 messages complete with 6 fuzzies and 5 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sv.po | 32 +--- 1 files changed, 9 insertions(+), 23 deletions(-) diff --git a/po/sv.po b/po/sv.po index 2514bbe..a97fb17 100644 --- a/po/sv.po +++ b/po/sv.po @@ -932,14 +932,12 @@ msgid "Warning" msgstr "Varning" #: ../dialogs/mime-settings/xfce-mime-chooser.c:128 -#, fuzzy msgid "Select Application" -msgstr "Välj kommando" +msgstr "Välj Program" #: ../dialogs/mime-settings/xfce-mime-chooser.c:204 -#, fuzzy msgid "Use a c_ustom command:" -msgstr "Välj kommando" +msgstr "Använd ett anpassat kommando:" #: ../dialogs/mime-settings/xfce-mime-chooser.c:205 msgid "" @@ -1086,9 +1084,8 @@ msgid "B_uttons and Feedback" msgstr "Knappar och Feedback" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:2 -#, fuzzy msgid "Buttons" -msgstr "Knappordning" +msgstr "Knappar" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:3 msgid "Clockwise" @@ -1140,9 +1137,8 @@ msgid "Enable hori_zontal scrolling" msgstr "Aktivera hori_sontell rullning" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16 -#, fuzzy msgid "Half (left-handed)" -msgstr "_Vänsterhänt" +msgstr "Halv (vänsterhänt)" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:17 #, fuzzy @@ -1155,9 +1151,8 @@ msgid "Mouse and Touchpad" msgstr "Mus och pekplatta" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:19 -#, fuzzy msgid "None (right-handed)" -msgstr "_Högerhänt" +msgstr "Ingen (högerhänt)" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:20 msgid "Pen (absolute)" @@ -1172,17 +1167,14 @@ msgid "Preview" msgstr "Förhandsgranska" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:23 -#, fuzzy msgid "Reset to De_faults" msgstr "Återställ till standardvärden" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:24 -#, fuzzy msgid "Reverse scroll d_irection" -msgstr "Motsatt r_ullningsriktning" +msgstr "Motsatt rullningsriktning" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:25 -#, fuzzy msgid "Scrolling" msgstr "Skrollning" @@ -1264,14 +1256,13 @@ msgstr "" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:40 msgid "Two-_finger scrolling" -msgstr "" +msgstr "Två-fingers skrollning" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:41 msgid "When selected, the scroll wheel will work in the opposite direction" msgstr "När vald kommer rullhjulet att fungera i motsatt riktning" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:42 -#, fuzzy msgid "" "When selected, the touchpad will be disabled when the keyboard is being used" msgstr "" @@ -1294,7 +1285,6 @@ msgid "_Enable this device" msgstr "Aktivera denna _enhet" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:47 -#, fuzzy msgid "_Left-handed" msgstr "_Vänsterhänt" @@ -1304,7 +1294,6 @@ msgid "_Right-handed" msgstr "_Högerhänt" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:49 -#, fuzzy msgid "_Rotation:" msgstr "Ro_tation:" @@ -1346,7 +1335,6 @@ msgid "New property" msgstr "Ny egenskap" #: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313 -#, fuzzy msgid "Edit selected property" msgstr "Redigera egenskap" @@ -1369,7 +1357,6 @@ msgid "Empty" msgstr "Tom" #: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451 -#, fuzzy msgid "Array" msgstr "Fält" @@ -1414,9 +1401,9 @@ msgid "reset" msgstr "Återställ" #: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938 -#, fuzzy, c-format +#, c-format msgid "Monitor %s" -msgstr "Monitor" +msgstr "Monitor %s" #: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946 msgid "Watch an Xfconf channel for property changes" @@ -1459,7 +1446,6 @@ msgid "Unsigned Int64" msgstr "Unsigned Int64" #: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:141 -#, fuzzy msgid "New Property" msgstr "Ny egenskap" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Swedish (sv) translation to 88%
Updating branch refs/heads/master to dc373390209d46163af3a5896627bfcf43d59835 (commit) from a9e717c1b2f3490661a6188488ff34e6fbb50443 (commit) commit dc373390209d46163af3a5896627bfcf43d59835 Author: larsson Date: Sun Mar 17 21:27:27 2013 +0100 l10n: Updated Swedish (sv) translation to 88% New status: 38 messages complete with 2 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sv.po | 177 - 1 files changed, 104 insertions(+), 73 deletions(-) diff --git a/po/sv.po b/po/sv.po index b3872f6..e9ee8d4 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tumbler\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-28 05:05+\n" +"POT-Creation-Date: 2013-03-17 18:15+\n" "PO-Revision-Date: 2010-10-17 18:03+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -17,97 +17,105 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../tumblerd/tumbler-cache-service.c:416 +#: ../tumblerd/tumbler-cache-service.c:413 #, c-format msgid "Another thumbnail cache service is already running" msgstr "En annan cachetjänst för miniatyrbilder är redan igång" -#: ../tumblerd/tumbler-group-scheduler.c:485 -#: ../tumblerd/tumbler-lifo-scheduler.c:421 +#: ../tumblerd/tumbler-group-scheduler.c:486 +#: ../tumblerd/tumbler-lifo-scheduler.c:422 #, c-format msgid "No thumbnailer available for \"%s\"" msgstr "Ingen miniatyrbildsskapare tillgänglig för \"%s\"" -#: ../tumblerd/tumbler-lifecycle-manager.c:207 +#: ../tumblerd/tumbler-lifecycle-manager.c:208 msgid "The thumbnailer service is shutting down" msgstr "Miniatyrbildstjänsten stängs av" -#: ../tumblerd/tumbler-service.c:760 +#: ../tumblerd/tumbler-service.c:758 #, c-format msgid "Another generic thumbnailer is already running" msgstr "En allmän miniatyrbildstjänst är redan igång" -#: ../tumblerd/tumbler-service.c:878 +#: ../tumblerd/tumbler-service.c:867 msgid "Unsupported thumbnail flavor requested" msgstr "Ej stödd variant av miniatyrbildstjänst begärd" -#: ../tumblerd/tumbler-specialized-thumbnailer.c:461 +#: ../tumblerd/tumbler-specialized-thumbnailer.c:485 msgid "Failed to call the specialized thumbnailer: timeout" -msgstr "Misslyckades med att anropa specialiserad miniatyrbildstjänst: tidsgräns överstigen" +msgstr "" +"Misslyckades med att anropa specialiserad miniatyrbildstjänst: tidsgräns " +"överstigen" -#: ../tumblerd/tumbler-specialized-thumbnailer.c:470 +#: ../tumblerd/tumbler-specialized-thumbnailer.c:494 #, c-format msgid "Failed to call the specialized thumbnailer: %s" msgstr "Misslyckades med att anropa specialiserad miniatyrbildstjänst: %s" -#: ../tumblerd/tumbler-manager.c:468 ../tumblerd/tumbler-manager.c:874 +#: ../tumblerd/tumbler-manager.c:489 ../tumblerd/tumbler-manager.c:895 #, c-format msgid "Failed to load the file \"%s\": %s" msgstr "Misslyckades med att läsa in filen \"%s\": %s" -#: ../tumblerd/tumbler-manager.c:486 ../tumblerd/tumbler-manager.c:500 -#: ../tumblerd/tumbler-manager.c:514 +#: ../tumblerd/tumbler-manager.c:507 ../tumblerd/tumbler-manager.c:521 +#: ../tumblerd/tumbler-manager.c:535 #, c-format msgid "Malformed section \"%s\" in file \"%s\": %s" msgstr "Felformulerat avsnitt \"%s\" i filen \"%s\": %s" -#: ../tumblerd/tumbler-manager.c:527 +#: ../tumblerd/tumbler-manager.c:548 #, c-format -msgid "Malformed section \"%s\" in file \"%s\": Mismatch between section name and UriScheme/MimeType" -msgstr "Felformaterat avsnitt \"%s\" i filen \"%s\": Avsnittsnamn och UriScheme/MimeType stämmer inte" +msgid "" +"Malformed section \"%s\" in file \"%s\": Mismatch between section name and " +"UriScheme/MimeType" +msgstr "" +"Felformaterat avsnitt \"%s\" i filen \"%s\": Avsnittsnamn och UriScheme/" +"MimeType stämmer inte" -#: ../tumblerd/tumbler-manager.c:887 ../tumblerd/tumbler-manager.c:901 -#: ../tumblerd/tumbler-manager.c:915 +#: ../tumblerd/tumbler-manager.c:908 ../tumblerd/tumbler-manager.c:922 +#: ../tumblerd/tumbler-manager.c:936 #, c-format msgid "Malformed file \"%s\": %s" msgstr "Felformulerad fil \"%s\": %s" -#: ../tumblerd/tumbler-manager.c:941 +#: ../tumblerd/tumbler-manager.c:962 #, c-format msgid "Failed to determine last modified time of \"%s\"" msgstr "Misslyckades med att fastställa tid för senaste ändringen för \"%s\"" -#: ../tumblerd/tumbler-manager.c:1854 +#: ../tumblerd/tumbler-manager.c:1868 #, c-format msgid "Another thumbnailer manager is already running" msgstr "En annan miniatyrbildshanterare är igång" #. set the application name. Translators: Don't translate "Tumbler". -#: ../tumblerd/main.c:78 +#: ../tumblerd/main.c:250 msgid "Tumbler Thumbnailing Service" msgstr "Miniatyrbildstjänsten Tumbler" -#: ../tumblerd/main.c:93 +#: ../tumblerd/main.c:270 #, c-format msgid "Failed to connect to the D-Bus session bus: %s"
[Xfce4-commits] l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to dd8945b84b5a5501cead909b44ec5cdd87cd7edd (commit) from c1dd0059edc959242552379815d0b0056c95c823 (commit) commit dd8945b84b5a5501cead909b44ec5cdd87cd7edd Author: Sergey Alyoshin Date: Sun Mar 17 21:26:21 2013 +0100 l10n: Updated Russian (ru) translation to 100% New status: 54 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 29 +++-- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/po/ru.po b/po/ru.po index 12fd649..63f3914 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-mount-plugin 0.6.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-16 23:11+0400\n" -"PO-Revision-Date: 2013-03-16 23:11+0400\n" +"POT-Creation-Date: 2013-03-17 11:53+0400\n" +"PO-Revision-Date: 2013-03-17 11:54+0400\n" "Last-Translator: Sergey Alyoshin \n" "Language-Team: Russian \n" "Language: ru\n" @@ -114,6 +114,15 @@ msgstr "Теперь устройство «%s» можно безопасно msgid "An error occurred. The device \"%s\" should not be removed!" msgstr "Произошла ошибка. Не удаляйте устройство «%s»!" +#: ../panel-plugin/mount-plugin.c:171 +msgid " -> " +msgstr " → " + +#: ../panel-plugin/mount-plugin.c:223 +#, c-format +msgid "[%s/%s] %s free" +msgstr "[%s / %s] свободно %s" + #: ../panel-plugin/mount-plugin.c:242 msgid "not mounted" msgstr "не смонтировано" @@ -157,7 +166,7 @@ msgstr "Выберите значок" #: ../panel-plugin/mount-plugin.c:780 msgid "_General" -msgstr "_Главная" +msgstr "_Основные" #: ../panel-plugin/mount-plugin.c:795 #, c-format @@ -202,11 +211,11 @@ msgstr "" #: ../panel-plugin/mount-plugin.c:861 msgid "_Mount command:" -msgstr "_Команда монтирования:" +msgstr "Команда _монтирования:" #: ../panel-plugin/mount-plugin.c:867 msgid "_Unmount command:" -msgstr "_Команда размонтирования:" +msgstr "Команда _размонтирования:" #: ../panel-plugin/mount-plugin.c:893 msgid "_Commands" @@ -234,11 +243,11 @@ msgstr "" #: ../panel-plugin/mount-plugin.c:931 msgid "_Eject CD-drives" -msgstr "Выдвигать CD-диск" +msgstr "_Извлекать CD-диск" #: ../panel-plugin/mount-plugin.c:944 msgid "Activate this option to only have the mount points be displayed." -msgstr "Отображать эту опцию только для отображения точки монтирования." +msgstr "Включите для отображения только точек монтирования." #: ../panel-plugin/mount-plugin.c:948 msgid "Display _mount points only" @@ -249,11 +258,11 @@ msgid "" "Trim the device names to the number of characters specified in the spin " "button." msgstr "" -"Обрезать имена устройств по количеству символов, указанных на spin button." +"Обрезать имена устройств по указанному количеству символов." #: ../panel-plugin/mount-plugin.c:970 msgid "Trim device names: " -msgstr "Обрезать имена устройств: " +msgstr "Об_резать имена устройств: " #: ../panel-plugin/mount-plugin.c:979 msgid " characters" @@ -271,7 +280,7 @@ msgstr "" #: ../panel-plugin/mount-plugin.c:1006 msgid "E_xclude specified file systems" -msgstr "Исключать указанные файловые системы" +msgstr "Иск_лючать указанные файловые системы" #: ../panel-plugin/mount-plugin.c:1021 msgid "_File systems" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Swedish (sv) translation to 64%
Updating branch refs/heads/master to ae966f2b0096a28e381de12eb4ed15181bb4e300 (commit) from c6755d7a256b2c597716d323601c9e1c70606900 (commit) commit ae966f2b0096a28e381de12eb4ed15181bb4e300 Author: larsson Date: Sun Mar 17 21:06:05 2013 +0100 l10n: Updated Swedish (sv) translation to 64% New status: 444 messages complete with 79 fuzzies and 165 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sv.po | 198 +- 1 files changed, 67 insertions(+), 131 deletions(-) diff --git a/po/sv.po b/po/sv.po index 6a98c5a..f7d302d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -20,9 +20,8 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/midori.desktop.in.h:1 -#, fuzzy msgid "Browse the Web" -msgstr "_Sök på webben" +msgstr "Surfa på webben" #: ../data/midori.desktop.in.h:2 #, fuzzy @@ -36,24 +35,20 @@ msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:4 -#, fuzzy msgid "Midori Web Browser" -msgstr "Webbläsare" +msgstr "Webbläsaren Midori" #: ../data/midori.desktop.in.h:5 -#, fuzzy msgid "New Private Browsing Window" -msgstr "P_rivat läge" +msgstr "Nytt Privat Fönster" #: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1287 -#, fuzzy msgid "New Tab" -msgstr "Ny fli_k" +msgstr "Ny Flik" #: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1284 -#, fuzzy msgid "New Window" -msgstr "Nytt _fönster" +msgstr "Nytt Fönster" #: ../data/midori.desktop.in.h:8 msgid "Web Browser" @@ -65,9 +60,8 @@ msgid "Midori Private Browsing" msgstr "P_rivat läge" #: ../data/midori-private.desktop.in.h:2 -#, fuzzy msgid "Open a new private browsing window" -msgstr "Öppna i nytt fönster" +msgstr "Öppna ett nytt privat fönster" #: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4175 #, fuzzy @@ -171,7 +165,6 @@ msgid "Check for new versions at:" msgstr "Leta efter nya verioner på:" #: ../midori/main.c:339 -#, fuzzy msgid "An unknown error occured" msgstr "Ett okänt fel inträffade." @@ -269,9 +262,9 @@ msgid "Stop loading the current page" msgstr "Stoppa inläsning av sidan" #: ../midori/midori-browser.c:525 -#, fuzzy, c-format +#, c-format msgid "Failed to update title: %s\n" -msgstr "Misslyckades med att öppna databasen: %s\n" +msgstr "Misslyckades att uppdatera titel: %s\n" #: ../midori/midori-browser.c:616 #, fuzzy, c-format @@ -332,23 +325,20 @@ msgid "A new window has been opened" msgstr "Ett nytt fönster har öppnats" #: ../midori/midori-browser.c:1287 -#, fuzzy msgid "A new tab has been opened" -msgstr "Underrätta när en överföring är klar" +msgstr "En ny flik har öppnats" #: ../midori/midori-browser.c:1305 msgid "Error opening the image!" msgstr "Fel när bilden försökte öppnas!" #: ../midori/midori-browser.c:1306 -#, fuzzy msgid "Can not open selected image in a default viewer." msgstr "Kan inte öppna den valda bilden i standardbildläsaren." #: ../midori/midori-browser.c:1312 -#, fuzzy msgid "Error downloading the image!" -msgstr "Fel vid laddning av flödet '%s'" +msgstr "Fel vid nerladdning av bilden!" #: ../midori/midori-browser.c:1313 msgid "Can not download selected image." @@ -429,39 +419,33 @@ msgid "Kazehakase" msgstr "Kazehakase" #: ../midori/midori-browser.c:4256 -#, fuzzy msgid "Opera" msgstr "Opera" #: ../midori/midori-browser.c:4257 -#, fuzzy msgid "Konqueror" msgstr "Konqueror" #: ../midori/midori-browser.c:4258 -#, fuzzy msgid "Epiphany" msgstr "Epiphany" #: ../midori/midori-browser.c:4259 -#, fuzzy, c-format +#, c-format msgid "Firefox (%s)" -msgstr "Firefox" +msgstr "Firefox (%s)" #: ../midori/midori-browser.c:4260 -#, fuzzy msgid "Midori 0.2.6" -msgstr "Midori" +msgstr "Midori 0.2.6" #: ../midori/midori-browser.c:4278 -#, fuzzy msgid "Import bookmarks…" -msgstr "Redigera bokmärke" +msgstr "Importera bokmärken..." #: ../midori/midori-browser.c:4281 ../midori/midori-browser.c:5345 -#, fuzzy msgid "_Import bookmarks" -msgstr "Redigera bokmärke" +msgstr "_Importera bokmärken" #: ../midori/midori-browser.c:4292 #, fuzzy @@ -477,14 +461,12 @@ msgid "Import from a file" msgstr "Importera från en fil" #: ../midori/midori-browser.c:4397 -#, fuzzy msgid "Failed to import bookmarks" -msgstr "Redigera bokmärke" +msgstr "Misslyckades att importera bokmärken" #: ../midori/midori-browser.c:4428 -#, fuzzy msgid "XBEL Bookmarks" -msgstr "Bokmärken" +msgstr "XBEL Bokmärken" #: ../midori/midori-browser.c:4433 #, fuzzy @@ -589,9 +571,8 @@ msgid "Print the current page" msgstr "Skriv ut denna sida" #: ../midori/midori-browser.c:5223 -#, fuzzy msgid "Close a_ll Windows" -msgstr "S_täng fönster" +msgstr "Stäng a_lla Fönster" #: ../midori/midori-browser.c:5226 msgid "_Edit" @@ -709,9 +690,8 @@ msgid "Add a new _folder" msgstr "Lägg till en ny _mapp" #: ../midori/midori-browser.c:5348 -#, fuzzy msgid "_Export bookmarks" -msgstr "Redi
[Xfce4-commits] l10n: Updates to Croatian (hr) translation
Updating branch refs/heads/master to e15fad766536b83f9b7e0271c326596f750d7e5a (commit) from 84653ea5358d37e9314813d076a5887927edd844 (commit) commit e15fad766536b83f9b7e0271c326596f750d7e5a Author: Ivica Kolić Date: Sun Mar 17 18:51:13 2013 +0100 l10n: Updates to Croatian (hr) translation New status: 60 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 117 +++-- 1 files changed, 37 insertions(+), 80 deletions(-) diff --git a/po/hr.po b/po/hr.po index f88b2e2..677548a 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-clipman-plugin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-17 13:21+\n" +"POT-Creation-Date: 2011-10-28 15:59+0200\n" "PO-Revision-Date: 2011-10-31 17:46+0100\n" "Last-Translator: Denis Štogl \n" "Language-Team: Croatian \n" @@ -30,9 +30,9 @@ msgstr "Upravitelj međuspremnika" #: ../panel-plugin/xfce4-clipman.desktop.in.h:2 #: ../panel-plugin/xfce4-clipman-plugin.desktop.in.h:2 #: ../panel-plugin/xfce4-clipman-plugin-autostart.desktop.in.h:2 -#: ../panel-plugin/main-panel-plugin.c:72 +#: ../panel-plugin/main-panel-plugin.c:70 #: ../panel-plugin/main-status-icon.c:61 ../panel-plugin/main-status-icon.c:94 -#: ../panel-plugin/plugin.c:336 +#: ../panel-plugin/plugin.c:335 msgid "Clipman" msgstr "Clipman" @@ -84,17 +84,15 @@ msgstr "Shift+Insert" #: ../panel-plugin/xfce4-clipman-settings.c:517 msgid "Reset actions" -msgstr "Resetirajte akcije" +msgstr "Resetirajte radnje" #: ../panel-plugin/xfce4-clipman-settings.c:519 -msgid "" -"Are you sure you want to reset the actions to the system default values?" -msgstr "" -"Jeste li sigurni da želite resetirati akcije na sustavom zadane vrijednosti?" +msgid "Are you sure you want to reset the actions to the system default values?" +msgstr "Jeste li sigurni da želite resetirati radnje na sustavom zadane vrijednosti?" #: ../panel-plugin/settings-dialog.ui.h:1 msgid "Action" -msgstr "b>Akcija" +msgstr "b>Radnja" #: ../panel-plugin/settings-dialog.ui.h:2 msgid "Behavior" @@ -110,7 +108,7 @@ msgstr "Povijest" #: ../panel-plugin/settings-dialog.ui.h:5 msgid "Actions" -msgstr "Akcije" +msgstr "Radnje" #: ../panel-plugin/settings-dialog.ui.h:6 msgid "Activate only on manual copy" @@ -121,12 +119,8 @@ msgid "Automatically paste a selected item from the history" msgstr "Automatski zalijepi odabranu stavku iz povijesti" #: ../panel-plugin/settings-dialog.ui.h:8 -msgid "" -"By default the action is triggerred by a selection, check this option to " -"trigger the action only when you make a manual copy" -msgstr "" -"Zadano će se akcija pokrenuti pri označavanju teksta, označi ovu opciju ako " -"želiš da se akcija pokrene samo pri ručnom kopiranju" +msgid "By default the action is triggerred by a selection, check this option to trigger the action only when you make a manual copy" +msgstr "Zadano će se radnja pokrenuti pri označavanju, označi ovu opciju ako želiš da se radnja pokrene samo pri ručnom kopiranju" #: ../panel-plugin/settings-dialog.ui.h:9 msgid "Command:" @@ -134,39 +128,30 @@ msgstr "Naredba:" #: ../panel-plugin/settings-dialog.ui.h:10 msgid "Configure the plugin" -msgstr "Konfiguriraj dodatak" +msgstr "Konfiguriraj priključak" #: ../panel-plugin/settings-dialog.ui.h:11 msgid "Edit Action" -msgstr "Uredi akciju" +msgstr "Uredi radnju" #: ../panel-plugin/settings-dialog.ui.h:12 msgid "Enable _actions" -msgstr "Omogući _akcije" +msgstr "Omogući _radnje" #: ../panel-plugin/settings-dialog.ui.h:13 msgid "General" msgstr "Osnovno" #: ../panel-plugin/settings-dialog.ui.h:14 -msgid "" -"If checked, the clipboard texts will be matched against regular expressions " -"and a menu will display possible actions" -msgstr "" -"Ako je označeno, tekst u međusremniku će biti uspoređen s regularnim izrazon " -"i prikazat će se moguće akcije u meniju" +msgid "If checked, the clipboard texts will be matched against regular expressions and a menu will display possible actions" +msgstr "Ako je označen, tekst u međusremniku će biti uspoređen s regularnim izrazom i izbornik će prikazati moguće radnje" #: ../panel-plugin/settings-dialog.ui.h:15 -msgid "" -"If checked, the selections will be synced with the default clipboard in a " -"way that you can paste what you select" -msgstr "" -"Ako je označeno, označeni tekst će biti sinkroniziran sa zadanim " -"međuspremnikom na način da će se moći zaljepiti tekst koji je označen" +msgid "If checked, the selections will be synced with the default clipboard in a way that you can paste what you select" +msgstr "Ako je označen, odabir će biti sinkroniziran sa zadanim međuspremnikom na način da će se moći zalijepiti tekst koji ste odabrali" #: ../panel-plugin/settings-dialog.ui.h:16 -msgid "" -"If checked, the selections won't affect t
[Xfce4-commits] l10n: Updated Croatian (hr) translation to 100%
Updating branch refs/heads/master to 84653ea5358d37e9314813d076a5887927edd844 (commit) from 2817a1a3a0b116541d8e036cd5df51ba7791 (commit) commit 84653ea5358d37e9314813d076a5887927edd844 Author: Ivica Kolić Date: Sun Mar 17 18:50:11 2013 +0100 l10n: Updated Croatian (hr) translation to 100% New status: 62 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 99 - 1 files changed, 71 insertions(+), 28 deletions(-) diff --git a/po/hr.po b/po/hr.po index 336cf57..f88b2e2 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-clipman-plugin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-28 15:59+0200\n" +"POT-Creation-Date: 2013-03-17 13:21+\n" "PO-Revision-Date: 2011-10-31 17:46+0100\n" "Last-Translator: Denis Štogl \n" "Language-Team: Croatian \n" @@ -30,9 +30,9 @@ msgstr "Upravitelj međuspremnika" #: ../panel-plugin/xfce4-clipman.desktop.in.h:2 #: ../panel-plugin/xfce4-clipman-plugin.desktop.in.h:2 #: ../panel-plugin/xfce4-clipman-plugin-autostart.desktop.in.h:2 -#: ../panel-plugin/main-panel-plugin.c:70 +#: ../panel-plugin/main-panel-plugin.c:72 #: ../panel-plugin/main-status-icon.c:61 ../panel-plugin/main-status-icon.c:94 -#: ../panel-plugin/plugin.c:335 +#: ../panel-plugin/plugin.c:336 msgid "Clipman" msgstr "Clipman" @@ -87,8 +87,10 @@ msgid "Reset actions" msgstr "Resetirajte akcije" #: ../panel-plugin/xfce4-clipman-settings.c:519 -msgid "Are you sure you want to reset the actions to the system default values?" -msgstr "Jeste li sigurni da želite resetirati akcije na sustavom zadane vrijednosti?" +msgid "" +"Are you sure you want to reset the actions to the system default values?" +msgstr "" +"Jeste li sigurni da želite resetirati akcije na sustavom zadane vrijednosti?" #: ../panel-plugin/settings-dialog.ui.h:1 msgid "Action" @@ -119,8 +121,12 @@ msgid "Automatically paste a selected item from the history" msgstr "Automatski zalijepi odabranu stavku iz povijesti" #: ../panel-plugin/settings-dialog.ui.h:8 -msgid "By default the action is triggerred by a selection, check this option to trigger the action only when you make a manual copy" -msgstr "Zadano će se akcija pokrenuti pri označavanju teksta, označi ovu opciju ako želiš da se akcija pokrene samo pri ručnom kopiranju" +msgid "" +"By default the action is triggerred by a selection, check this option to " +"trigger the action only when you make a manual copy" +msgstr "" +"Zadano će se akcija pokrenuti pri označavanju teksta, označi ovu opciju ako " +"želiš da se akcija pokrene samo pri ručnom kopiranju" #: ../panel-plugin/settings-dialog.ui.h:9 msgid "Command:" @@ -143,15 +149,24 @@ msgid "General" msgstr "Osnovno" #: ../panel-plugin/settings-dialog.ui.h:14 -msgid "If checked, the clipboard texts will be matched against regular expressions and a menu will display possible actions" -msgstr "Ako je označeno, tekst u međusremniku će biti uspoređen s regularnim izrazon i prikazat će se moguće akcije u meniju" +msgid "" +"If checked, the clipboard texts will be matched against regular expressions " +"and a menu will display possible actions" +msgstr "" +"Ako je označeno, tekst u međusremniku će biti uspoređen s regularnim izrazon " +"i prikazat će se moguće akcije u meniju" #: ../panel-plugin/settings-dialog.ui.h:15 -msgid "If checked, the selections will be synced with the default clipboard in a way that you can paste what you select" -msgstr "Ako je označeno, označeni tekst će biti sinkroniziran sa zadanim međuspremnikom na način da će se moći zaljepiti tekst koji je označen" +msgid "" +"If checked, the selections will be synced with the default clipboard in a " +"way that you can paste what you select" +msgstr "" +"Ako je označeno, označeni tekst će biti sinkroniziran sa zadanim " +"međuspremnikom na način da će se moći zaljepiti tekst koji je označen" #: ../panel-plugin/settings-dialog.ui.h:16 -msgid "If checked, the selections won't affect the history except the manual copies" +msgid "" +"If checked, the selections won't affect the history except the manual copies" msgstr "Ako je označeno,odabiri neće utjecati na povijest osim ručnih kopija" #: ../panel-plugin/settings-dialog.ui.h:17 @@ -159,8 +174,11 @@ msgid "If checked, this option allows to store one image inside the history" msgstr "Ako je označeno, dopušteno je spremanje jedne slike unutar povijesti" #: ../panel-plugin/settings-dialog.ui.h:18 -msgid "If checked, this option will restore the history on every new Xfce session" -msgstr "Ako je označeno, povijest međuspremnika će biti vraćena pri start nove Xfce sesije" +msgid "" +"If checked, this option will restore the history on every new Xfce session" +msgstr "" +"Ako je označeno, povijest međuspremnika će biti vraćena pri start nove Xfce " +"sesije"
[Xfce4-commits] l10n: Updated Croatian (hr) translation to 77%
Updating branch refs/heads/master to da8b657c5cc14f0dcdb33fa8df3f7b849978b651 (commit) from 8d597bb9b61c37065cdb160e621adf70b6ef822b (commit) commit da8b657c5cc14f0dcdb33fa8df3f7b849978b651 Author: Ivica Kolić Date: Sun Mar 17 18:46:47 2013 +0100 l10n: Updated Croatian (hr) translation to 77% New status: 536 messages complete with 0 fuzzies and 152 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 236 -- 1 files changed, 122 insertions(+), 114 deletions(-) diff --git a/po/hr.po b/po/hr.po index e9a61ca..e6f7a9f 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-15 06:18+\n" +"POT-Creation-Date: 2013-03-17 17:09+\n" "PO-Revision-Date: 2010-12-22 21:45+0100\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" @@ -27,8 +27,8 @@ msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorer" #: ../data/midori.desktop.in.h:3 ../midori/main.c:162 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:222 -#: ../midori/midori-view.c:3849 ../midori/sokoke.c:561 +#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3855 ../midori/sokoke.c:561 msgid "Midori" msgstr "Midori" @@ -60,7 +60,7 @@ msgstr "Midori privatno pretraživanje" msgid "Open a new private browsing window" msgstr "Novi prozor privatnog pretraživanja" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4169 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4175 msgid "Private Browsing" msgstr " (Privatno pretraživanje)" @@ -392,8 +392,8 @@ msgstr "Otvori sve u _karticama" msgid "Open in New _Tab" msgstr "Otvori u novoj _kartici" -#: ../midori/midori-browser.c:4165 ../midori/midori-view.c:2765 -#: ../midori/midori-view.c:4647 ../panels/midori-bookmarks.c:843 +#: ../midori/midori-browser.c:4165 ../midori/midori-view.c:2771 +#: ../midori/midori-view.c:4653 ../panels/midori-bookmarks.c:843 #: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Otvori u novom _prozoru" @@ -773,15 +773,15 @@ msgstr "_Traka zabilješki" msgid "_Statusbar" msgstr "_Statusna traka" -#: ../midori/midori-browser.c:5435 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5435 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "_Automatski" -#: ../midori/midori-browser.c:5438 ../midori/midori-websettings.c:145 +#: ../midori/midori-browser.c:5438 ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "Tradicionalni kineski (BIG5)" -#: ../midori/midori-browser.c:5441 ../midori/midori-websettings.c:146 +#: ../midori/midori-browser.c:5441 ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "Pojednostavljeni kineski (GB18030)" @@ -790,19 +790,19 @@ msgstr "Pojednostavljeni kineski (GB18030)" msgid "Japanese (SHIFT__JIS)" msgstr "Japanski (SHIFT__JIS)" -#: ../midori/midori-browser.c:5448 ../midori/midori-websettings.c:148 +#: ../midori/midori-browser.c:5448 ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "Korejski (EUC-KR)" -#: ../midori/midori-browser.c:5451 ../midori/midori-websettings.c:149 +#: ../midori/midori-browser.c:5451 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "Ruski (KOI8-R)" -#: ../midori/midori-browser.c:5454 ../midori/midori-websettings.c:150 +#: ../midori/midori-browser.c:5454 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5457 ../midori/midori-websettings.c:151 +#: ../midori/midori-browser.c:5457 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "Zapadni (ISO-8859-1)" @@ -947,134 +947,134 @@ msgstr "Zatvori panel" msgid "Align sidepanel to the left" msgstr "Poravnaj bočni stupac lijevo" -#: ../midori/midori-websettings.c:108 ../midori/midori-websettings.c:129 +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "Pokaži brzo biranje" -#: ../midori/midori-websettings.c:109 ../midori/midori-websettings.c:127 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" msgstr "Pokaži početnu stranicu" -#: ../midori/midori-websettings.c:110 ../midori/midori-frontend.c:344 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:344 msgid "Show last open tabs" msgstr "Pokaži zadnje otvorene kartice" -#: ../midori/midori-websettings.c:111 ../midori/midori-frontend.c:343 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:343 msgid "Show last tabs without loading" msgstr "Pokaži zadnje kartice bez učitavanja" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 msg
[Xfce4-commits] l10n: Updated Croatian (hr) translation to 86%
Updating branch refs/heads/master to fcef0e1a27773d0e5c3d6f0b5a75bb6db1a1990f (commit) from 98e19133acf63807e4f9408339fc2b4a6ce8d9a1 (commit) commit fcef0e1a27773d0e5c3d6f0b5a75bb6db1a1990f Author: Ivica Kolić Date: Sun Mar 17 18:45:34 2013 +0100 l10n: Updated Croatian (hr) translation to 86% New status: 339 messages complete with 0 fuzzies and 52 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 42 -- 1 files changed, 16 insertions(+), 26 deletions(-) diff --git a/po/hr.po b/po/hr.po index 19239ff..2e2a242 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-panel 4.7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-05 02:45+\n" +"POT-Creation-Date: 2013-03-17 14:21+\n" "PO-Revision-Date: 2012-05-11 20:53+0100\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" @@ -922,7 +922,7 @@ msgstr "Odaberi ikonu" #: ../plugins/applicationsmenu/applicationsmenu.c:603 #: ../plugins/applicationsmenu/applicationsmenu.c:844 -#: ../plugins/clock/clock.c:852 ../plugins/launcher/launcher.c:2308 +#: ../plugins/clock/clock.c:855 ../plugins/launcher/launcher.c:2308 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Neuspjeh u izvršenju naredbe \"%s\"." @@ -969,15 +969,15 @@ msgstr "" msgid "Show help options" msgstr "Pokaži opcije pomoći" -#: ../plugins/clock/clock.c:167 +#: ../plugins/clock/clock.c:169 msgid "Week %V" msgstr "Tjedan %V" -#: ../plugins/clock/clock.c:450 +#: ../plugins/clock/clock.c:452 msgid "Failed to execute clock command" msgstr "Neuspjeh u izvršenju naredbe sata" -#: ../plugins/clock/clock.c:797 +#: ../plugins/clock/clock.c:802 msgid "Custom Format" msgstr "Prilagođeni format" @@ -1034,8 +1034,8 @@ msgstr "LCD" #: ../plugins/clock/clock-dialog.glade.h:15 msgid "" -"Name of the timezone matching the system's timezone database. Leave empty to " -"revert to the local time." +"Name of a timezone corresponding a file in the zoneinfo database, for " +"example \"America/New_York\". Leave empty to use the localtime." msgstr "" #: ../plugins/clock/clock-dialog.glade.h:16 @@ -1050,13 +1050,7 @@ msgstr "Prikaži _neaktivne točkice" msgid "Show gri_d" msgstr "" -#: ../plugins/clock/clock-dialog.glade.h:19 -msgid "" -"Start a tool for setting the system time and date. If the button is grayed " -"out, check the \"Help\" page to see how to configure it correctly." -msgstr "" - -#: ../plugins/clock/clock-dialog.glade.h:21 +#: ../plugins/clock/clock-dialog.glade.h:20 #, no-c-format msgid "" "The format describes the date and time parts to insert into the panel. For " @@ -1065,31 +1059,27 @@ msgid "" "page for additional information." msgstr "" -#: ../plugins/clock/clock-dialog.glade.h:22 +#: ../plugins/clock/clock-dialog.glade.h:21 msgid "Time Settings" msgstr "" -#: ../plugins/clock/clock-dialog.glade.h:23 -msgid "Time:" -msgstr "" +#: ../plugins/clock/clock-dialog.glade.h:22 +msgid "Time and Date _Settings..." +msgstr "Postavke datuma i _vremena..." -#: ../plugins/clock/clock-dialog.glade.h:24 +#: ../plugins/clock/clock-dialog.glade.h:23 msgid "Time_zone:" msgstr "" -#: ../plugins/clock/clock-dialog.glade.h:25 +#: ../plugins/clock/clock-dialog.glade.h:24 msgid "True _binary clock" msgstr "Pravi _binarni sat" -#: ../plugins/clock/clock-dialog.glade.h:26 +#: ../plugins/clock/clock-dialog.glade.h:25 msgid "_Layout:" msgstr "_Raspored:" -#: ../plugins/clock/clock-dialog.glade.h:27 -msgid "_Set" -msgstr "" - -#: ../plugins/clock/clock-dialog.glade.h:28 +#: ../plugins/clock/clock-dialog.glade.h:26 msgid "_Tooltip format:" msgstr "" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make touchpad type delay configurable (bug #8948).
Updating branch refs/heads/master
to 1e5662d9c5b5a50de011c5324902824ca905ba23 (commit)
from c1ed2d22da004f475f1e240803859ab0ac7335ca (commit)
commit 1e5662d9c5b5a50de011c5324902824ca905ba23
Author: Philipp Matthias Schafer
Date: Sun Mar 17 17:54:51 2013 +0100
Make touchpad type delay configurable (bug #8948).
dialogs/mouse-settings/main.c | 32 +++-
dialogs/mouse-settings/mouse-dialog.glade | 121 +
xfsettingsd/pointers.c| 38 +
3 files changed, 139 insertions(+), 52 deletions(-)
diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
index f4b475b..46168e7 100644
--- a/dialogs/mouse-settings/main.c
+++ b/dialogs/mouse-settings/main.c
@@ -136,6 +136,18 @@ mouse_settings_format_value_ms (GtkScale *scale,
+#ifdef DEVICE_PROPERTIES
+static gchar *
+mouse_settings_format_value_s (GtkScale *scale,
+ gdouble value)
+{
+ /* seconds value for some of the scales in the dialog */
+ return g_strdup_printf (_("%.1f s"), value);
+}
+#endif
+
+
+
#ifdef HAVE_XCURSOR
static GdkPixbuf *
@@ -1582,6 +1594,8 @@ main (gint argc, gchar **argv)
XExtensionVersion *version = NULL;
#ifdef DEVICE_PROPERTIES
gchar *syndaemon;
+GObject *synaptics_disable_while_type;
+GObject *synaptics_disable_duration_table;
#endif
/* setup translation domain */
@@ -1703,12 +1717,26 @@ main (gint argc, gchar **argv)
G_CALLBACK (mouse_settings_device_reset),
builder);
#ifdef DEVICE_PROPERTIES
-object = gtk_builder_get_object (builder,
"synaptics-disable-while-type");
+synaptics_disable_while_type = gtk_builder_get_object (builder,
"synaptics-disable-while-type");
syndaemon = g_find_program_in_path ("syndaemon");
gtk_widget_set_sensitive (GTK_WIDGET (object), syndaemon != NULL);
g_free (syndaemon);
xfconf_g_property_bind (pointers_channel,
"/DisableTouchpadWhileTyping",
-G_TYPE_BOOLEAN, G_OBJECT (object),
"active");
+G_TYPE_BOOLEAN, G_OBJECT
(synaptics_disable_while_type), "active");
+
+synaptics_disable_duration_table = gtk_builder_get_object
(builder, "synaptics-disable-duration-box");
+
+g_object_bind_property (G_OBJECT (synaptics_disable_while_type),
"active",
+G_OBJECT
(synaptics_disable_duration_table), "sensitive",
+G_BINDING_SYNC_CREATE);
+
+object = gtk_builder_get_object (builder,
"synaptics-disable-duration-scale");
+g_signal_connect (G_OBJECT (object), "format-value",
+ G_CALLBACK (mouse_settings_format_value_s),
NULL);
+
+object = gtk_builder_get_object (builder,
"synaptics-disable-duration");
+xfconf_g_property_bind (pointers_channel,
"/DisableTouchpadDuration",
+G_TYPE_DOUBLE, G_OBJECT (object), "value");
object = gtk_builder_get_object (builder,
"synaptics-tap-to-click");
g_signal_connect_swapped (G_OBJECT (object), "toggled",
diff --git a/dialogs/mouse-settings/mouse-dialog.glade
b/dialogs/mouse-settings/mouse-dialog.glade
index d3aab0d..dc1f208 100644
--- a/dialogs/mouse-settings/mouse-dialog.glade
+++ b/dialogs/mouse-settings/mouse-dialog.glade
@@ -42,6 +42,13 @@
False
gtk-revert-to-saved
+
+0.10001
+4
+2
+0.10001
+1
+
@@ -75,6 +82,32 @@
1
11
+
+
+
+
+
+
+
+
+
+0
+None (right-handed)
+
+
+3
+Half (left-handed)
+
+
+1
+Clockwise
+
+
+2
+Counterclockwise
+
+
+
False
Mouse and Touchpad
@@ -93,8 +126,8 @@
False
end
-
-gtk-help
+
+gtk-close
False
True
True
@@ -105,12 +138,11 @@
False
False
0
-True
-
-gtk-close
+
+gtk-help
False
True
True
@@ -121,6 +153,7 @@
False
False
0
+True
@@ -490,6 +523,54 @@
+
+True
+False
+
[Xfce4-commits] l10n: Updated Korean (ko) translation to 100%
Updating branch refs/heads/master to a8463fe41a3862721c0d4980503853d23791f649 (commit) from 553a0f017e18488ab2dd6a92f6812dd7428e4d30 (commit) commit a8463fe41a3862721c0d4980503853d23791f649 Author: Seong-ho Cho Date: Sun Mar 17 16:55:26 2013 +0100 l10n: Updated Korean (ko) translation to 100% New status: 801 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ko.po | 60 ++-- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/po/ko.po b/po/ko.po index 6eb3b00..0a0846e 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2,7 +2,7 @@ # Copyright (C) 2003-2012 The Xfce development team # This file is distributed under the same license as the orage package. # ByungHyun Choi , 2005. -# Seong-ho Cho , 2011-2012. +# Seong-ho, Cho , 2011, 2012, 2013. # msgid "" msgstr "" @@ -34,7 +34,7 @@ msgid "" "click to modify clock" msgstr "" "%s\n" -"시계를 조정하려면 누릅니다" +"시계를 조정하려면 누르십시오" #: ../globaltime/globaltime.c:386 msgid "Localtime" @@ -144,7 +144,7 @@ msgstr "배경색:" #: ../globaltime/gt_prefs.c:656 msgid "Click to change background colour for clock" -msgstr "시계의 배경색을 바꾸려면 누릅니다" +msgstr "시계의 배경색을 바꾸려면 누르십시오" #: ../globaltime/gt_prefs.c:665 #: ../globaltime/gt_prefs.c:697 @@ -166,7 +166,7 @@ msgstr "기본값 사용" #: ../globaltime/gt_prefs.c:802 #: ../globaltime/gt_prefs.c:832 msgid "Cross this to use default instead of selected value" -msgstr "선택한 값 대신 기본값을 사용하기 위해 이것을 표시합니다" +msgstr "선택한 값 대신 기본값을 사용하려면 표시하십시오" #. foreground- #: ../globaltime/gt_prefs.c:681 @@ -176,7 +176,7 @@ msgstr "전경 (=글자) 색:" #: ../globaltime/gt_prefs.c:688 msgid "Click to change foreground colour for clock" -msgstr "시계 글자색을 바꾸려면 누릅니다" +msgstr "시계 글자색을 바꾸려면 누르십시오" #. name font- #: ../globaltime/gt_prefs.c:713 @@ -186,7 +186,7 @@ msgstr "시계 이름 글꼴:" #: ../globaltime/gt_prefs.c:720 msgid "Click to change font for clock name" -msgstr "시계 이름의 글꼴을 바꾸려면 누릅니다" +msgstr "시계 이름의 글꼴을 바꾸려면 누르십시오" #. time font- #: ../globaltime/gt_prefs.c:746 @@ -196,7 +196,7 @@ msgstr "시계 시간 글꼴:" #: ../globaltime/gt_prefs.c:753 msgid "Click to change font for clock time" -msgstr "시계 시간의 글꼴을 바꾸려면 누릅니다" +msgstr "시계 시간의 글꼴을 바꾸려면 누르십시오" #. underline name #: ../globaltime/gt_prefs.c:780 @@ -214,29 +214,29 @@ msgstr "글자 기본 형식" #: ../globaltime/gt_prefs.c:863 msgid "Click to change default background colour for clocks" -msgstr "시계 기본 배경색을 바꾸려면 누릅니다" +msgstr "시계 기본 배경색을 바꾸려면 누르십시오" #: ../globaltime/gt_prefs.c:877 #: ../globaltime/gt_prefs.c:910 msgid "Cross this to use system default instead of selected color" -msgstr "선택한 색 대신 시스템 기본값을 사용하기 위해 이것을 표시합니다" +msgstr "선택한 색 대신 시스템 기본값을 사용하려면 표시하십시오" #: ../globaltime/gt_prefs.c:896 msgid "Click to change default text colour for clocks" -msgstr "시계의 기본 글자색을 바꾸려면 누릅니다" +msgstr "시계의 기본 글자색을 바꾸려면 누르십시오" #: ../globaltime/gt_prefs.c:929 msgid "Click to change default font for clock name" -msgstr "시계 이름의 기본 글꼴을 바꾸려면 누릅니다" +msgstr "시계 이름의 기본 글꼴을 바꾸려면 누르십시오" #: ../globaltime/gt_prefs.c:944 #: ../globaltime/gt_prefs.c:978 msgid "Cross this to use system default font instead of selected font" -msgstr "선택한 글꼴 대신 시스틈 기본 글꼴을 사용하려면 이것을 표시합니다" +msgstr "선택한 글꼴 대신 시스틈 기본 글꼴을 사용하려면 표시하십시오" #: ../globaltime/gt_prefs.c:963 msgid "Click to change default font for clock time" -msgstr "시계 시간의 기본 글꼴을 바꾸려면 누릅니다" +msgstr "시계 시간의 기본 글꼴을 바꾸려면 누르십시오" #. underline name #: ../globaltime/gt_prefs.c:990 @@ -524,9 +524,9 @@ msgstr "" "이 프로그램은 strftime()함수를 이용하여 시간을 나타냅니다.\n" "시간표시 코드를 이용하여 원하는 형식으로 시간을 표시하십시오.\n" "다음은 자주 사용하는 코드입니다:\n" -"\t%A = 요일\t\t\t%B = 월\n" +"\t%A = 요일\t\t\t\t%B = 월\n" "\t%c = 날짜와 시간\t\t%R = 시분\n" -"\t%V = 연중 주차\t\t%Z = 현재 시간대\n" +"\t%V = 연중 주차\t\t\t%Z = 현재 시간대\n" "\t%H = 시 \t\t\t\t%M = 분\n" "\t%X = 현지 시간\t\t\t%x = 현지 날짜" @@ -603,7 +603,7 @@ msgstr "계속 진행하시렵니까?" #: ../src/appointment.c:767 msgid "The end of this appointment is earlier than the beginning." -msgstr "일정 말일이 시작보다 빠릅니다." +msgstr "일정 말일이 시작보다 빠르십시오." #: ../src/appointment.c:1034 #: ../src/appointment.c:1812 @@ -612,7 +612,7 @@ msgstr "설정 안함" #: ../src/appointment.c:1193 msgid "This appointment will be permanently removed." -msgstr "이 약속을 완전히 제거할 것입니다." +msgstr "이 약속을 완전히 제거합니다." #: ../src/appointment.c:1692 msgid "This appointment does not exist." @@ -620,7 +620,7 @@ msgstr "이 약속은 없습니다." #: ../src/appointment.c:1693 msgid "It was probably removed, please refresh your screen." -msgstr "아마도 지워진 것 같습니다. 화면을 새로 고쳐주시기 바랍니다." +msgstr "아마도 지워진 것 같습니다. 화면을 새로 고침 하십시오." #: ../src/appointment.c:1995 msgid "Current categories" @@ -835,13 +835,13 @@ msgid "" "<&Y> is translated to current year minus .\n"
[Xfce4-commits] l10n: Updated Korean (ko) translation to 100%
Updating branch refs/heads/master to 98e19133acf63807e4f9408339fc2b4a6ce8d9a1 (commit) from df13f26e5442134ab3c4c2a9ed8e9e41bdf3148e (commit) commit 98e19133acf63807e4f9408339fc2b4a6ce8d9a1 Author: Seong-ho Cho Date: Sun Mar 17 16:32:43 2013 +0100 l10n: Updated Korean (ko) translation to 100% New status: 391 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ko.po | 120 - 1 files changed, 55 insertions(+), 65 deletions(-) diff --git a/po/ko.po b/po/ko.po index 8834ec0..28ddf08 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2,27 +2,28 @@ # Copyright(C) 2002-2006 The Xfce development team. # This file is distributed under the same license as the xfce4-panel package. # ByungHyun Choi, 2005. -# Seong-ho Cho , 2011, 2012. -# +# Seong-ho Cho , 2011-2013. +# # Please write your name and e-mail into "translator-credits" if you update this translation script. -# +# # ex ) msgstr "" # "Gil-dong Hong \n" # "YourName Kim " -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-panel 4.7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-05 13:27+\n" -"PO-Revision-Date: 2012-04-18 23:14+0900\n" +"POT-Creation-Date: 2013-03-17 14:21+\n" +"PO-Revision-Date: 2013-03-18 00:22+0900\n" "Last-Translator: Seong-ho Cho \n" "Language-Team: xfce-i18n \n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 1.5.5\n" #: ../panel-desktop-handler.desktop.in.h:1 msgid "" @@ -101,7 +102,7 @@ msgstr "패널에 새로운 항목 추가" #: ../panel/main.c:82 msgid "PLUGIN-NAME" -msgstr "PLUGIN-NAME" +msgstr "플러그인 이름" #: ../panel/main.c:83 msgid "Restart the running panel instance" @@ -125,12 +126,12 @@ msgstr "버전 정보를 출력하고 끝내기" #. parse context options #: ../panel/main.c:235 msgid "[ARGUMENTS...]" -msgstr "[ARGUMENTS...]" +msgstr "<인자...>" #: ../panel/main.c:242 #, c-format msgid "Type \"%s --help\" for usage." -msgstr "사용방법을 보려면 \"%s --help\"를 입력합니다." +msgstr "사용방법을 보려면 \"%s --help\"를 입력하십시오." #: ../panel/main.c:261 msgid "The Xfce development team. All rights reserved." @@ -184,7 +185,7 @@ msgid "" "logout, so the panel is automatically started the next time you login." msgstr "" "패널을 시작하시렵니까? 패널을 시작 하면, 로그아웃시 세션을 저장하는지 확인하" -"여 다음번 로그인시 패널이 자동으로 시작하도록 합니다." +"여 다음 로그인시 패널이 자동으로 시작하도록 합니다." #: ../panel/main.c:403 ../panel/main.c:417 #, c-format @@ -458,8 +459,7 @@ msgstr "길이(%)(_E):" msgid "M_ode:" msgstr "모드(_O):" -#. I18N: name of the section (frame) in the panel preferences where the user -#. can define the length and size of the panel +#. I18N: name of the section (frame) in the panel preferences where the user can define the length and size of the panel #: ../panel/panel-preferences-dialog.glade.h:22 msgid "Measurements" msgstr "측정기" @@ -640,7 +640,7 @@ msgid "" "load a fresh initial configuration." msgstr "" "설정을 저장하기 위한 새로운 시스템으로 패널을 이동했기 때문에, 처음 초기 환경" -"설정을 로드했습니다." +"설정을 불러왔습니다." #: ../migrate/main.c:127 ../migrate/main.c:136 msgid "Choose below which setup you want for the first startup." @@ -660,7 +660,7 @@ msgstr "기본 환경설정 사용하기" #: ../migrate/main.c:142 msgid "Load the default configuration" -msgstr "기본 환경설정 로드하기" +msgstr "기본 환경설정 불러오기" #: ../migrate/main.c:148 msgid "One empty panel" @@ -676,7 +676,7 @@ msgstr "이전 패널 환경설정을 가져오는데 실패했습니다" #: ../migrate/main.c:172 msgid "Failed to load the default configuration" -msgstr "기본 환경설정을 로드하는데 실패했습니다" +msgstr "기본 환경설정을 불러오는데 실패했습니다" #: ../migrate/main.c:185 msgid "Panel config needs migration..." @@ -899,7 +899,7 @@ msgid "" "Select this option to show the generic application name in the menu, for " "example \"File Manager\" instead of \"Thunar\"" msgstr "" -"메뉴에서 일반적 프로그램 이름을 보이려면 이 옵션을 선택, 예: \"Thunar\" 대신 " +"메뉴에서 일반적 프로그램 이름을 보이려면 이 옵션을 선택하십시오. 예: \"Thunar\" 대신 " "\"File Manager\"" #: ../plugins/applicationsmenu/applicationsmenu-dialog.glade.h:9 @@ -938,7 +938,7 @@ msgstr "아이콘 선택" #: ../plugins/applicationsmenu/applicationsmenu.c:603 #: ../plugins/applicationsmenu/applicationsmenu.c:844 -#: ../plugins/clock/clock.c:852 ../plugins/launcher/launcher.c:2308 +#: ../plugins/clock/clock.c:855 ../plugins/launcher/launcher.c:2308 #, c-format msgid "Failed to execute command \"%s\"." msgstr "\"%s\" 명령을 실행하는데 실패했습니다." @@ -949,7 +949,7 @@ msgstr "프로그램이 없습니다" #: ../plugins/applicationsmenu/applicationsmenu.c:1136 msgid "Failed to load the applications menu" -msgstr "프로그램 메뉴를 로드하는데 실패했습니다." +msgstr "프로그램 메뉴를 불러오는데 실패했습니다." #: ../plugins/applicationsmenu/applicationsmenu.desktop.in.h:2 msgid "Show a menu containing categories of installed applications" @@ -985,21 +985,21 @@ msgstr "현재 마우스 포지션에 메뉴 띄우기" msgid "Show help options" msgstr "도움말 옵션 표시" -#: ../plugins/clock/clock.c:167 +#: .
[Xfce4-commits] l10n: Updated Slovenian (sl) translation to 100%
Updating branch refs/heads/master to 45b7379256fb5cd001756f15448c9e58182e9076 (commit) from 235081719f0aeec4970f0a4943ffc0a9805e8472 (commit) commit 45b7379256fb5cd001756f15448c9e58182e9076 Author: Nenad Latinović Date: Sun Mar 17 15:11:44 2013 +0100 l10n: Updated Slovenian (sl) translation to 100% New status: 66 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sl.po |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 698cda1..523122b 100644 --- a/po/sl.po +++ b/po/sl.po @@ -202,14 +202,14 @@ msgid "" "If the type is set to prefix, %s will be replaced with the string after the " "pattern, %S with the complete entry text. For regular expressions you can " "use \\0 and \\." -msgstr "" +msgstr "Če je tip nastavljen na prednastavitev bo %s zamenjan z nizom za vzorcem, %S s celotnim vnešenim tekstom. Za regularni izraz lahko uporabite \\0 in \\." #: ../src/appfinder-preferences.glade.h:14 msgid "" "Instead of quitting the application when the last window is closed, keep a " "running instance to speed up opening new windows. You might want to disable " "this to reduce memory usage." -msgstr "" +msgstr "Namesto, da bi prekinili aplikacijo ko je zadnje okno zaprto, obdrži primerek teči v ozdaju, s čimer se bo pospešilo odpiranje novih oken. Morda boste želeli to funkcijo prekiniti, da bi s tem zmanjšali porabo spomina." #: ../src/appfinder-preferences.glade.h:15 msgid "Ite_m icon size:" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Slovenian (sl) translation to 96%
Updating branch refs/heads/master to 235081719f0aeec4970f0a4943ffc0a9805e8472 (commit) from a4dcd36157ff64ec790a55dbee3ded0eb645590e (commit) commit 235081719f0aeec4970f0a4943ffc0a9805e8472 Author: Nenad Latinović Date: Sun Mar 17 14:52:33 2013 +0100 l10n: Updated Slovenian (sl) translation to 96% New status: 64 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sl.po | 42 +- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/po/sl.po b/po/sl.po index e4b7b95..698cda1 100644 --- a/po/sl.po +++ b/po/sl.po @@ -221,84 +221,84 @@ msgstr "Pusti primerek teči _v ozadju" #: ../src/appfinder-preferences.glade.h:17 msgid "Large" -msgstr "" +msgstr "Velik" #: ../src/appfinder-preferences.glade.h:18 msgid "Larger" -msgstr "" +msgstr "Večji" #: ../src/appfinder-preferences.glade.h:19 msgid "Normal" -msgstr "" +msgstr "Normalen" #: ../src/appfinder-preferences.glade.h:20 msgid "Patte_rn:" -msgstr "" +msgstr "Vzo_rec" #: ../src/appfinder-preferences.glade.h:21 msgid "Pattern" -msgstr "" +msgstr "Vzorec" #: ../src/appfinder-preferences.glade.h:22 msgid "Prefix" -msgstr "" +msgstr "Predpona" #: ../src/appfinder-preferences.glade.h:23 msgid "Regular Expression" -msgstr "" +msgstr "Regularni izraz" #: ../src/appfinder-preferences.glade.h:24 msgid "Remember last _selected category" -msgstr "" +msgstr "Zapomni na_zadnje izbrano kategorijo" #: ../src/appfinder-preferences.glade.h:25 msgid "Remove the currently selected action." -msgstr "" +msgstr "Odstrani trenutno izbrano dejanje" #: ../src/appfinder-preferences.glade.h:26 msgid "Small" -msgstr "" +msgstr "Majhno" #: ../src/appfinder-preferences.glade.h:27 msgid "Smaller" -msgstr "" +msgstr "Manjše" #: ../src/appfinder-preferences.glade.h:28 msgid "Text besi_de icons" -msgstr "" +msgstr "Besedilo o_b ikonah" #: ../src/appfinder-preferences.glade.h:29 msgid "Very Large" -msgstr "" +msgstr "Zelo veliko" #: ../src/appfinder-preferences.glade.h:30 msgid "Very Small" -msgstr "" +msgstr "Zelo majhni" #: ../src/appfinder-preferences.glade.h:31 msgid "_General" -msgstr "" +msgstr "Splo_šno" #: ../src/appfinder-preferences.glade.h:32 msgid "_Save match in command history" -msgstr "" +msgstr "_Shrani zadetek v zgodovino ukazov" #: ../src/appfinder-preferences.glade.h:33 msgid "_Type:" -msgstr "" +msgstr "_Tip:" #: ../src/appfinder-preferences.glade.h:34 msgid "_View items as icons" -msgstr "" +msgstr "_Poglej predmete kot ikone" #: ../data/xfce4-appfinder.desktop.in.h:2 msgid "Find and launch applications installed on your system" -msgstr "" +msgstr "Najdi in zaženi aplikacije nameščene na vaš sistem" #: ../data/xfce4-run.desktop.in.h:1 msgid "Run Program..." -msgstr "" +msgstr "Zaženi program..." #: ../data/xfce4-run.desktop.in.h:2 msgid "Run a program" -msgstr "" +msgstr "Zaženi program" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Slovenian (sl) translation to 65%
Updating branch refs/heads/master to a4dcd36157ff64ec790a55dbee3ded0eb645590e (commit) from 8f30de60b18ac43604563a6e83483e0ad7285a00 (commit) commit a4dcd36157ff64ec790a55dbee3ded0eb645590e Author: Nenad Latinović Date: Sun Mar 17 14:36:14 2013 +0100 l10n: Updated Slovenian (sl) translation to 65% New status: 43 messages complete with 0 fuzzies and 23 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sl.po | 50 +- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/po/sl.po b/po/sl.po index 81ace26..e4b7b95 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Nenad Latinovic \n" "Language-Team: Slovenian \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" #: ../src/appfinder-category-model.c:146 msgid "All Applications" @@ -111,90 +111,90 @@ msgstr "Napaka pri odstranjevanju namizne datoteke" msgid "" "To unhide the item you have to manually remove the desktop file from \"%s\" " "or open the file in the same directory and remove the line \"%s\"." -msgstr "" +msgstr "Da bi odkrili predmet morate ročno odstraniti namizno datoteko iz \"%s\" ali odpreti datoteko v enakem imeniku in odstraniti vrstico \"%s\"." #: ../src/appfinder-window.c:912 ../src/appfinder-window.c:1010 msgid "_Hide" -msgstr "" +msgstr "_Skrij" #: ../src/appfinder-window.c:913 #, c-format msgid "Are you sure you want to hide \"%s\"?" -msgstr "" +msgstr "Ste prepričani, da želite skriti \"%s\"?" #: ../src/main.c:64 msgid "Start in collapsed mode" -msgstr "" +msgstr "Zaženi v stisnjeni obliki" #: ../src/main.c:65 msgid "Print version information and exit" -msgstr "" +msgstr "Natisni podatke o različici in končaj" #: ../src/main.c:66 msgid "Replace the existing service" -msgstr "" +msgstr "Zamenjaj obstoječo storitev" #: ../src/main.c:67 msgid "Quit all instances" -msgstr "" +msgstr "Končaj vse primerke" #: ../src/main.c:68 msgid "Do not try to use or become a D-Bus service" -msgstr "" +msgstr "Ne poskušajte uporabiti ali postati D-Bus storitev" #: ../src/main.c:224 #, c-format msgid "Type \"%s --help\" for usage." -msgstr "" +msgstr "Natipkajte \"%s --help\" za porabo. " #: ../src/main.c:235 msgid "The Xfce development team. All rights reserved." -msgstr "" +msgstr "Xfce razvojna ekipa. Vse pravice pridržane." #: ../src/main.c:236 #, c-format msgid "Please report bugs to <%s>." -msgstr "" +msgstr "Prosim, poročajte napake na <%s>." #: ../src/appfinder-preferences.glade.h:1 msgid "Add a new custom action." -msgstr "" +msgstr "Dodajto novo prirejeno dejanje." #: ../src/appfinder-preferences.glade.h:2 msgid "Always c_enter the window" -msgstr "" +msgstr "Vendo središčno _poravnaj okno" #: ../src/appfinder-preferences.glade.h:3 msgid "Appearance" -msgstr "" +msgstr "Izgled" #: ../src/appfinder-preferences.glade.h:5 msgid "Behaviour" -msgstr "" +msgstr "Obnašanje" #: ../src/appfinder-preferences.glade.h:6 msgid "C_lear Custom Command History" -msgstr "" +msgstr "Po_čisti prirejeno zgodovino ukazov" #: ../src/appfinder-preferences.glade.h:7 msgid "Categ_ory icon size:" -msgstr "" +msgstr "Velikost ikon _kategorije:" #: ../src/appfinder-preferences.glade.h:8 msgid "Center the window on startup." -msgstr "" +msgstr "Središčno poravnaj okno pri zagonu." #: ../src/appfinder-preferences.glade.h:9 msgid "Co_mmand:" -msgstr "" +msgstr "Uka_z:" #: ../src/appfinder-preferences.glade.h:10 msgid "Custom _Actions" -msgstr "" +msgstr "Prirejena _dejanja" #: ../src/appfinder-preferences.glade.h:11 msgid "History" -msgstr "" +msgstr "Zgodovina" #: ../src/appfinder-preferences.glade.h:13 #, no-c-format @@ -213,11 +213,11 @@ msgstr "" #: ../src/appfinder-preferences.glade.h:15 msgid "Ite_m icon size:" -msgstr "" +msgstr "Velikost ikon _predmetov:" #: ../src/appfinder-preferences.glade.h:16 msgid "Keep running _instance in the background" -msgstr "" +msgstr "Pusti primerek teči _v ozadju" #: ../src/appfinder-preferences.glade.h:17 msgid "Large" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Slovenian translation
Updating branch refs/heads/master
to 8f30de60b18ac43604563a6e83483e0ad7285a00 (commit)
from eb46f5acd4b0b985a94bee6942d6527f9f620b84 (commit)
commit 8f30de60b18ac43604563a6e83483e0ad7285a00
Author: Nenad Latinović
Date: Sun Mar 17 14:27:45 2013 +0100
l10n: Slovenian translation
New status: 20 messages complete with 0 fuzzies and 46 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{am.po => sl.po} | 228 +--
1 files changed, 77 insertions(+), 151 deletions(-)
diff --git a/po/am.po b/po/sl.po
similarity index 58%
copy from po/am.po
copy to po/sl.po
index 1e935dc..81ace26 100644
--- a/po/am.po
+++ b/po/sl.po
@@ -1,164 +1,157 @@
-# Amharic translation to xfce4-appfinder.
-# Copyright (C) 2002-2007 The Xfce development team.
-# This file is distributed under the same license as the xfce4-appfinder
package.
-# Tegegne Tefera , 2007.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: xfce4-appfinder 4.4.1\n"
+"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-19 02:21+\n"
-"PO-Revision-Date: 2007-07-01 11:31+0100\n"
-"Last-Translator: tegegne tefera \n"
-"Language-Team: Amharic \n"
+"POT-Creation-Date: 2013-03-16 15:42+\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Nenad Latinovic \n"
+"Language-Team: Slovenian \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: am\n"
#: ../src/appfinder-category-model.c:146
msgid "All Applications"
-msgstr "ሁሉም ፕሮግራሞች"
+msgstr "Vse aplikacije"
-#: ../src/appfinder-model.c:545
+#: ../src/appfinder-model.c:549
msgid "Name"
-msgstr "ስም"
+msgstr "Ime"
-#: ../src/appfinder-model.c:546
+#: ../src/appfinder-model.c:550
msgid "Comment"
-msgstr "አስተያየት"
+msgstr "Komentar"
-#: ../src/appfinder-model.c:547
+#: ../src/appfinder-model.c:551
msgid "Command"
-msgstr "ትዕዛዝ"
+msgstr "Ukaz"
-#: ../src/appfinder-model.c:548
+#: ../src/appfinder-model.c:552
msgid "Categories"
-msgstr "ክፍሎች"
+msgstr "Kategorije"
-#: ../src/appfinder-model.c:549
+#: ../src/appfinder-model.c:553
msgid "Filename"
-msgstr "የፋይል ስም"
+msgstr "Datotečno ime"
-#: ../src/appfinder-model.c:1829
+#: ../src/appfinder-model.c:1833
msgid "Application has no command"
-msgstr "ፕሮግራሙ ትዕዛዝ የለውም"
+msgstr "Aplikacija nima ukaza"
-#: ../src/appfinder-model.c:2153
+#: ../src/appfinder-model.c:2157
msgid "Commands History"
-msgstr "የትዕዛዝ ታሪክ"
+msgstr "Zgodovina ukazov"
-#: ../src/appfinder-preferences.c:221
+#: ../src/appfinder-preferences.c:219
msgid "C_lear"
-msgstr ""
+msgstr "_Počisti"
-#: ../src/appfinder-preferences.c:222
+#: ../src/appfinder-preferences.c:220
msgid "This will permanently clear the custom command history."
-msgstr ""
+msgstr "To bo stalno izbrisalo prilagojeno zgodovino ukazov."
-#: ../src/appfinder-preferences.c:223
+#: ../src/appfinder-preferences.c:221
msgid "Are you sure you want to clear the command history?"
-msgstr ""
+msgstr "Ali ste prepričani, da želite izbrisati zgodovino ukazov?"
-#: ../src/appfinder-preferences.c:333
+#: ../src/appfinder-preferences.c:331
msgid "The custom action will be deleted permanently."
-msgstr ""
+msgstr "Prilagojeno dejanje bo stalno izbrisano."
-#: ../src/appfinder-preferences.c:334
+#: ../src/appfinder-preferences.c:332
#, c-format
msgid "Are you sure you want to delete pattern \"%s\"?"
-msgstr ""
+msgstr "Ste prepričani, da želite izbrisati vzorec \"%s\"?"
-#: ../src/appfinder-window.c:219 ../src/main.c:446
-#: ../src/appfinder-preferences.glade.h:4
+#: ../src/appfinder-window.c:221 ../src/appfinder-preferences.glade.h:4
#: ../data/xfce4-appfinder.desktop.in.h:1
msgid "Application Finder"
-msgstr "ፕሮግራም ፈላጊ"
+msgstr "Iskalec aplikacije"
-#: ../src/appfinder-window.c:271
+#: ../src/appfinder-window.c:288
msgid "Toggle view mode"
-msgstr ""
+msgstr "Preklapljaj način pogleda"
-#: ../src/appfinder-window.c:363
+#: ../src/appfinder-window.c:393
msgid "La_unch"
-msgstr ""
+msgstr "Za_ženi"
-#: ../src/appfinder-window.c:798
+#: ../src/appfinder-window.c:837
msgid "Failed to launch desktop item editor"
-msgstr ""
+msgstr "Neuspešno zaganjanje urejevalnika predmetov na namizju"
-#: ../src/appfinder-window.c:824
+#: ../src/appfinder-window.c:863
msgid ""
"This will permanently remove the custom desktop file from your home "
"directory."
msgstr ""
+"To bo za vedno izbrisalo prilagojen predmet namizja iz vašega domačega "
+"imenika."
-#: ../src/appfinder-window.c:825
+#: ../src/appfinder-window.c:864
#, c-format
msgid "Are you sure you want to revert \"%s\"?"
-msgstr ""
+msgstr "Ste prepričani, da želite vrniti \"%s\"?"
-#: ../src/appfinder-window.c:835
+#: ../src/ap
[Xfce4-commits] Clock: Improve tooltips, plug leaks and fix glade layout.
Updating branch refs/heads/master to df13f26e5442134ab3c4c2a9ed8e9e41bdf3148e (commit) from b513b93b7b047a9f46074b79fd1d85f743178751 (commit) commit df13f26e5442134ab3c4c2a9ed8e9e41bdf3148e Author: Nick Schermer Date: Sun Mar 17 14:22:53 2013 +0100 Clock: Improve tooltips, plug leaks and fix glade layout. plugins/clock/clock-dialog.glade | 103 -- plugins/clock/clock.c| 23 + 2 files changed, 67 insertions(+), 59 deletions(-) diff --git a/plugins/clock/clock-dialog.glade b/plugins/clock/clock-dialog.glade index ac35769..1b48528 100644 --- a/plugins/clock/clock-dialog.glade +++ b/plugins/clock/clock-dialog.glade @@ -1,6 +1,6 @@ - + @@ -21,10 +21,10 @@ gtk-close +False True True True -False True @@ -36,10 +36,10 @@ gtk-help +False True True True -False True @@ -84,24 +84,11 @@ 12 6 - -True -False -0 -Time_zone: -True -timezone-name - - -1 -2 - - - True True -Name of the timezone matching the system's timezone database. Leave empty to revert to the local time. +Name of a timezone corresponding a file in the zoneinfo database, for example "America/New_York". Leave empty to use the localtime. +● False False True @@ -110,31 +97,44 @@ 1 2 -1 -2 - + True False 0 -Time: +Time_zone: +True +timezone-name + +GTK_FILL + - -_Set + True -True -True -Start a tool for setting the system time and date. If the button is grayed out, check the "Help" page to see how to configure it correctly. -False -True +False +0 +0 + + +Time and Date _Settings... +False +True +True +True +image1 +True + + -1 2 +1 +2 +GTK_FILL @@ -179,6 +179,15 @@ 12 6 + + + + + + + + + True False @@ -257,15 +266,6 @@ 3 - - - - - - -
[Xfce4-commits] Some porting to gtk3.
Updating branch refs/heads/nick/gtk3
to 12c8c133f9a08d350987f01ef3ada7824708a254 (commit)
from 5fbae9e7610c038015d0bbb2bed50b5493c700a2 (commit)
commit 12c8c133f9a08d350987f01ef3ada7824708a254
Author: Nick Schermer
Date: Tue Feb 5 19:06:10 2013 +0100
Some porting to gtk3.
common/panel-utils.c |5 +
libxfce4panel/xfce-arrow-button.c | 61 --
libxfce4panel/xfce-panel-convenience.c |6 +-
libxfce4panel/xfce-panel-image.c | 144 +--
libxfce4panel/xfce-panel-macros-46.h |6 +-
libxfce4panel/xfce-panel-plugin.c | 23 +++--
panel/panel-dialogs.c |4 +
panel/panel-itembar.c |2 +-
plugins/systray/systray-box.c |2 +-
plugins/tasklist/tasklist-widget.c |2 +-
10 files changed, 146 insertions(+), 109 deletions(-)
diff --git a/common/panel-utils.c b/common/panel-utils.c
index be76c9b..3f596cc 100644
--- a/common/panel-utils.c
+++ b/common/panel-utils.c
@@ -121,6 +121,10 @@ panel_utils_show_help (GtkWindow *parent,
gboolean
panel_utils_grab_available (void)
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ /* TODO fix for gtk3 */
+ return TRUE;
+#else
GdkScreen *screen;
GdkWindow *root;
GdkGrabStatus grab_pointer = GDK_GRAB_FROZEN;
@@ -165,6 +169,7 @@ panel_utils_grab_available (void)
}
return grab_succeed;
+#endif
}
diff --git a/libxfce4panel/xfce-arrow-button.c
b/libxfce4panel/xfce-arrow-button.c
index a85fb17..c4162ca 100644
--- a/libxfce4panel/xfce-arrow-button.c
+++ b/libxfce4panel/xfce-arrow-button.c
@@ -181,8 +181,9 @@ xfce_arrow_button_init (XfceArrowButton *button)
button->priv->last_relief = GTK_RELIEF_NORMAL;
/* set some widget properties */
- GTK_WIDGET_SET_FLAGS (GTK_WIDGET (button), GTK_NO_WINDOW);
- GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_DEFAULT | GTK_CAN_FOCUS);
+ gtk_widget_set_has_window (GTK_WIDGET (button), FALSE);
+ gtk_widget_set_can_default (GTK_WIDGET (button), FALSE);
+ gtk_widget_set_can_focus (GTK_WIDGET (button), FALSE);
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
}
@@ -252,45 +253,56 @@ xfce_arrow_button_draw (GtkWidget *widget,
XfceArrowButton *button = XFCE_ARROW_BUTTON (widget);
GtkWidget *child;
gint x, y, width;
+ GtkAllocationalloc;
+ gdouble angle;
+ GtkStyleContext *context;
/* draw the button */
(*GTK_WIDGET_CLASS (xfce_arrow_button_parent_class)->draw) (widget, cr);
if (button->priv->arrow_type != GTK_ARROW_NONE
- && GTK_WIDGET_DRAWABLE (widget))
+ && gtk_widget_is_drawable (widget))
{
child = gtk_bin_get_child (GTK_BIN (widget));
- if (child != NULL && GTK_WIDGET_VISIBLE (child))
+ if (child != NULL
+ && gtk_widget_get_visible (child))
{
+ gtk_widget_get_allocation (widget, &alloc);
+
if (button->priv->arrow_type == GTK_ARROW_UP
|| button->priv->arrow_type == GTK_ARROW_DOWN)
{
width = ARROW_WIDTH;
- x = widget->allocation.x + widget->style->xthickness;
- y = widget->allocation.y + (widget->allocation.height - width) /
2;
+ x = alloc.x + 1 /* widget->style->xthickness */;
+ y = alloc.y + (alloc.height - width) / 2;
}
else
{
width = ARROW_WIDTH;
- x = widget->allocation.x + (widget->allocation.width - width) /
2;
- y = widget->allocation.y + widget->style->ythickness;
+ x = alloc.x + (alloc.width - width) / 2;
+ y = alloc.y + 1 /* widget->style->ythickness */;
}
}
else
{
- width = MIN (widget->allocation.height - 2 *
widget->style->ythickness,
- widget->allocation.width - 2 *
widget->style->xthickness);
+ width = MIN (alloc.height - 2 * 1 /* widget->style->ythickness */,
+ alloc.width - 2 * 1 /* widget->style->xthickness */);
width = CLAMP (width, 1, ARROW_WIDTH);
- x = widget->allocation.x + (widget->allocation.width - width) / 2;
- y = widget->allocation.y + (widget->allocation.height - width) / 2;
+ x = alloc.x + (alloc.width - width) / 2;
+ y = alloc.y + (alloc.height - width) / 2;
}
- gtk_paint_arrow (widget->style, widget->window,
- GTK_WIDGET_STATE (widget), GTK_SHADOW_NONE,
- &(event->area), widget, "xfce_arrow_button",
- button->priv->arrow_type, FALSE,
- x, y, width, width);
+ switch (button->priv->arrow_type)
+{
+case GTK_ARROW_DOWN: angle = G_PI;
+case GTK_ARROW_LEFT: angle = G_PI / 2.0 + G_PI;
+case GTK_ARROW_RIGHT: angle = G_PI / 2.0;
+default: angle = 0;
+}
+
+ context
[Xfce4-commits] Remove the XfceHvBox.
Updating branch refs/heads/nick/gtk3 to 4bc82a149c8adb6de61f0e9b76e8a684c6fbd7da (commit) from 5241c9a488b94b4a3f9bfa734c4229037a0f51b3 (commit) commit 4bc82a149c8adb6de61f0e9b76e8a684c6fbd7da Author: Nick Schermer Date: Sun May 6 13:20:32 2012 +0200 Remove the XfceHvBox. GtkBox is capable of all this and was internally already used. docs/references/libxfce4panel-docs.xml |1 - docs/references/libxfce4panel-sections.txt | 18 -- docs/references/libxfce4panel.types |1 - libxfce4panel/Makefile.am |2 - libxfce4panel/libxfce4panel.h |1 - libxfce4panel/libxfce4panel.symbols | 10 - libxfce4panel/xfce-hvbox.c | 306 --- libxfce4panel/xfce-hvbox.h | 77 --- libxfce4panel/xfce-panel-plugin.c |4 - plugins/actions/actions.c |2 +- plugins/applicationsmenu/applicationsmenu.c |2 +- plugins/launcher/launcher.c |6 +- plugins/systray/systray.c |4 +- plugins/tasklist/tasklist-widget.c |6 +- plugins/tasklist/tasklist.c |2 +- po/POTFILES.in |1 - 16 files changed, 11 insertions(+), 432 deletions(-) diff --git a/docs/references/libxfce4panel-docs.xml b/docs/references/libxfce4panel-docs.xml index 16ff243..c6cec30 100644 --- a/docs/references/libxfce4panel-docs.xml +++ b/docs/references/libxfce4panel-docs.xml @@ -146,7 +146,6 @@ This section describes the additional widgets provided by the xfce4-panel library. - diff --git a/docs/references/libxfce4panel-sections.txt b/docs/references/libxfce4panel-sections.txt index f58be39..2bfc3fa 100644 --- a/docs/references/libxfce4panel-sections.txt +++ b/docs/references/libxfce4panel-sections.txt @@ -34,24 +34,6 @@ xfce_arrow_button_get_type -xfce-hvbox -XfceHVBox -xfce_hvbox_new -xfce_hvbox_set_orientation -xfce_hvbox_get_orientation - -XfceHVBoxClass -XFCE_TYPE_HVBOX -XFCE_HVBOX -XFCE_HVBOX_CLASS -XFCE_IS_HVBOX -XFCE_IS_HVBOX_CLASS -XFCE_HVBOX_GET_CLASS - -xfce_hvbox_get_type - - - convenience xfce_panel_create_button xfce_panel_create_toggle_button diff --git a/docs/references/libxfce4panel.types b/docs/references/libxfce4panel.types index bfdbd2f..c676220 100644 --- a/docs/references/libxfce4panel.types +++ b/docs/references/libxfce4panel.types @@ -1,6 +1,5 @@ #include xfce_arrow_button_get_type -xfce_hvbox_get_type xfce_panel_image_get_type xfce_panel_plugin_get_type diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am index cba5083..0da0b1d 100644 --- a/libxfce4panel/Makefile.am +++ b/libxfce4panel/Makefile.am @@ -25,7 +25,6 @@ libxfce4panel_headers = \ libxfce4panel-config.h \ libxfce4panel-enums.h \ xfce-arrow-button.h \ - xfce-hvbox.h \ xfce-panel-convenience.h \ xfce-panel-macros.h \ xfce-panel-macros-46.h \ @@ -45,7 +44,6 @@ libxfce4panel_1_0_la_SOURCES = \ $(libxfce4panel_headers) \ libxfce4panel-config.c \ xfce-arrow-button.c \ - xfce-hvbox.c \ xfce-panel-convenience.c \ xfce-panel-plugin.c \ xfce-panel-plugin-provider.c \ diff --git a/libxfce4panel/libxfce4panel.h b/libxfce4panel/libxfce4panel.h index 5db33c3..a64907b 100644 --- a/libxfce4panel/libxfce4panel.h +++ b/libxfce4panel/libxfce4panel.h @@ -29,7 +29,6 @@ G_BEGIN_DECLS #include #include #include -#include #include #include #include diff --git a/libxfce4panel/libxfce4panel.symbols b/libxfce4panel/libxfce4panel.symbols index 34f1f97..0e45685 100644 --- a/libxfce4panel/libxfce4panel.symbols +++ b/libxfce4panel/libxfce4panel.symbols @@ -61,16 +61,6 @@ xfce_arrow_button_set_blinking #endif #endif -/* xfce-hvbox.h */ -#if IN_HEADER(__XFCE_HVBOX_H__) -#if IN_SOURCE(__XFCE_HVBOX_C__) -xfce_hvbox_get_type G_GNUC_CONST -xfce_hvbox_new G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT -xfce_hvbox_set_orientation -xfce_hvbox_get_orientation -#endif -#endif - /* xfce-panel-convenience.h */ #if IN_HEADER(__XFCE_PANEL_CONVENIENCE_H__) #if IN_SOURCE(__XFCE_PANEL_CONVENIENCE_C__) diff --git a/libxfce4panel/xfce-hvbox.c b/libxfce4panel/xfce-hvbox.c deleted file mode 100644 index 33f482b..000 --- a/libxfce4panel/xfce-hvbox.c +++ /dev/null @@ -1,306 +0,0 @@ -/* - * This file is partly based on OBox - * Copyright (C) 2002 Red Hat Inc. based on GtkHBox - * - * Copyright (C) 2006-2007 Jasper Huijsmans - * Copyright (C) 2006 Jani Monoses - * Copyright (C) 2007-2010 Nick Schermer - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, -
[Xfce4-commits] Port the arrow button.
Updating branch refs/heads/nick/gtk3
to 5fbae9e7610c038015d0bbb2bed50b5493c700a2 (commit)
from 4bc82a149c8adb6de61f0e9b76e8a684c6fbd7da (commit)
commit 5fbae9e7610c038015d0bbb2bed50b5493c700a2
Author: Nick Schermer
Date: Mon May 7 18:20:29 2012 +0200
Port the arrow button.
libxfce4panel/xfce-arrow-button.c | 108 +
1 files changed, 74 insertions(+), 34 deletions(-)
diff --git a/libxfce4panel/xfce-arrow-button.c
b/libxfce4panel/xfce-arrow-button.c
index 01eb2d2..a85fb17 100644
--- a/libxfce4panel/xfce-arrow-button.c
+++ b/libxfce4panel/xfce-arrow-button.c
@@ -66,21 +66,25 @@ enum
PROP_ARROW_TYPE
};
-static void xfce_arrow_button_set_property (GObject *object,
- guint
prop_id,
- const GValue *value,
- GParamSpec*pspec);
-static void xfce_arrow_button_get_property (GObject *object,
- guint
prop_id,
- GValue*value,
- GParamSpec*pspec);
-static void xfce_arrow_button_finalize (GObject
*object);
-static gboolean xfce_arrow_button_expose_event (GtkWidget *widget,
- GdkEventExpose*event);
-static void xfce_arrow_button_size_request (GtkWidget *widget,
- GtkRequisition
*requisition);
-static void xfce_arrow_button_size_allocate (GtkWidget *widget,
- GtkAllocation
*allocation);
+static void xfce_arrow_button_set_property (GObject
*object,
+guint
prop_id,
+const GValue
*value,
+GParamSpec
*pspec);
+static void xfce_arrow_button_get_property (GObject
*object,
+guint
prop_id,
+GValue
*value,
+GParamSpec
*pspec);
+static void xfce_arrow_button_finalize (GObject
*object);
+static gboolean xfce_arrow_button_draw (GtkWidget
*widget,
+cairo_t
*cr);
+static void xfce_arrow_button_get_preferred_width (GtkWidget
*widget,
+gint
*minimal_width,
+gint
*natural_width);
+static void xfce_arrow_button_get_preferred_height (GtkWidget
*widget,
+gint
*minimal_height,
+gint
*natural_height);
+static void xfce_arrow_button_size_allocate(GtkWidget
*widget,
+GtkAllocation
*allocation);
@@ -124,8 +128,9 @@ xfce_arrow_button_class_init (XfceArrowButtonClass * klass)
gobject_class->finalize = xfce_arrow_button_finalize;
gtkwidget_class = GTK_WIDGET_CLASS (klass);
- gtkwidget_class->expose_event = xfce_arrow_button_expose_event;
- gtkwidget_class->size_request = xfce_arrow_button_size_request;
+ gtkwidget_class->draw = xfce_arrow_button_draw;
+ gtkwidget_class->get_preferred_width = xfce_arrow_button_get_preferred_width;
+ gtkwidget_class->get_preferred_height =
xfce_arrow_button_get_preferred_height;
gtkwidget_class->size_allocate = xfce_arrow_button_size_allocate;
/**
@@ -241,15 +246,15 @@ xfce_arrow_button_finalize (GObject *object)
static gboolean
-xfce_arrow_button_expose_event (GtkWidget *widget,
-GdkEventExpose *event)
+xfce_arrow_button_draw (GtkWidget *widget,
+cairo_t *cr)
{
XfceArrowButton *button = XFCE_ARROW_BUTTON (widget);
GtkWidget *child;
gint x, y, width;
/* draw the button */
- (*GTK_WIDGET_CLASS (xfce_arrow_button_parent_class)->expose_event) (widget,
event);
+ (*GTK_WIDGET_CLASS (xfce_arrow_button_parent_class)->draw) (widget, cr);
if (button->priv->arrow_type != GTK_ARROW_NONE
&& GTK_WIDGET_DRAWABLE (widget))
@@ -293,30 +298,65 @@ xfce_arrow_button_expose_event (Gt
[Xfce4-commits] Depend on gtk3 libraries.
Updating branch refs/heads/nick/gtk3 to 5241c9a488b94b4a3f9bfa734c4229037a0f51b3 (commit) from 9067b1bf63311dd892414e6df5d33944873fcced (commit) commit 5241c9a488b94b4a3f9bfa734c4229037a0f51b3 Author: Nick Schermer Date: Mon Feb 4 16:50:54 2013 +0100 Depend on gtk3 libraries. configure.ac.in |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 27943c1..b8cecd0 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -128,15 +128,15 @@ dnl *** Check for required packages *** dnl *** XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0]) XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.1.5]) -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.9.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.9.0]) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.6.0]) XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0]) XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0]) XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.24.0]) XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [0.73]) XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.0.0]) -XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.30]) +XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-3.0], [3.0]) dnl ** dnl *** Optional GIO UNIX features *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Some porting to gtk3.
Updating branch refs/heads/nick/gtk3
to 12c8c133f9a08d350987f01ef3ada7824708a254 (commit)
from 5fbae9e7610c038015d0bbb2bed50b5493c700a2 (commit)
commit 12c8c133f9a08d350987f01ef3ada7824708a254
Author: Nick Schermer
Date: Tue Feb 5 19:06:10 2013 +0100
Some porting to gtk3.
common/panel-utils.c |5 +
libxfce4panel/xfce-arrow-button.c | 61 --
libxfce4panel/xfce-panel-convenience.c |6 +-
libxfce4panel/xfce-panel-image.c | 144 +--
libxfce4panel/xfce-panel-macros-46.h |6 +-
libxfce4panel/xfce-panel-plugin.c | 23 +++--
panel/panel-dialogs.c |4 +
panel/panel-itembar.c |2 +-
plugins/systray/systray-box.c |2 +-
plugins/tasklist/tasklist-widget.c |2 +-
10 files changed, 146 insertions(+), 109 deletions(-)
diff --git a/common/panel-utils.c b/common/panel-utils.c
index be76c9b..3f596cc 100644
--- a/common/panel-utils.c
+++ b/common/panel-utils.c
@@ -121,6 +121,10 @@ panel_utils_show_help (GtkWindow *parent,
gboolean
panel_utils_grab_available (void)
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ /* TODO fix for gtk3 */
+ return TRUE;
+#else
GdkScreen *screen;
GdkWindow *root;
GdkGrabStatus grab_pointer = GDK_GRAB_FROZEN;
@@ -165,6 +169,7 @@ panel_utils_grab_available (void)
}
return grab_succeed;
+#endif
}
diff --git a/libxfce4panel/xfce-arrow-button.c
b/libxfce4panel/xfce-arrow-button.c
index a85fb17..c4162ca 100644
--- a/libxfce4panel/xfce-arrow-button.c
+++ b/libxfce4panel/xfce-arrow-button.c
@@ -181,8 +181,9 @@ xfce_arrow_button_init (XfceArrowButton *button)
button->priv->last_relief = GTK_RELIEF_NORMAL;
/* set some widget properties */
- GTK_WIDGET_SET_FLAGS (GTK_WIDGET (button), GTK_NO_WINDOW);
- GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_DEFAULT | GTK_CAN_FOCUS);
+ gtk_widget_set_has_window (GTK_WIDGET (button), FALSE);
+ gtk_widget_set_can_default (GTK_WIDGET (button), FALSE);
+ gtk_widget_set_can_focus (GTK_WIDGET (button), FALSE);
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
}
@@ -252,45 +253,56 @@ xfce_arrow_button_draw (GtkWidget *widget,
XfceArrowButton *button = XFCE_ARROW_BUTTON (widget);
GtkWidget *child;
gint x, y, width;
+ GtkAllocationalloc;
+ gdouble angle;
+ GtkStyleContext *context;
/* draw the button */
(*GTK_WIDGET_CLASS (xfce_arrow_button_parent_class)->draw) (widget, cr);
if (button->priv->arrow_type != GTK_ARROW_NONE
- && GTK_WIDGET_DRAWABLE (widget))
+ && gtk_widget_is_drawable (widget))
{
child = gtk_bin_get_child (GTK_BIN (widget));
- if (child != NULL && GTK_WIDGET_VISIBLE (child))
+ if (child != NULL
+ && gtk_widget_get_visible (child))
{
+ gtk_widget_get_allocation (widget, &alloc);
+
if (button->priv->arrow_type == GTK_ARROW_UP
|| button->priv->arrow_type == GTK_ARROW_DOWN)
{
width = ARROW_WIDTH;
- x = widget->allocation.x + widget->style->xthickness;
- y = widget->allocation.y + (widget->allocation.height - width) /
2;
+ x = alloc.x + 1 /* widget->style->xthickness */;
+ y = alloc.y + (alloc.height - width) / 2;
}
else
{
width = ARROW_WIDTH;
- x = widget->allocation.x + (widget->allocation.width - width) /
2;
- y = widget->allocation.y + widget->style->ythickness;
+ x = alloc.x + (alloc.width - width) / 2;
+ y = alloc.y + 1 /* widget->style->ythickness */;
}
}
else
{
- width = MIN (widget->allocation.height - 2 *
widget->style->ythickness,
- widget->allocation.width - 2 *
widget->style->xthickness);
+ width = MIN (alloc.height - 2 * 1 /* widget->style->ythickness */,
+ alloc.width - 2 * 1 /* widget->style->xthickness */);
width = CLAMP (width, 1, ARROW_WIDTH);
- x = widget->allocation.x + (widget->allocation.width - width) / 2;
- y = widget->allocation.y + (widget->allocation.height - width) / 2;
+ x = alloc.x + (alloc.width - width) / 2;
+ y = alloc.y + (alloc.height - width) / 2;
}
- gtk_paint_arrow (widget->style, widget->window,
- GTK_WIDGET_STATE (widget), GTK_SHADOW_NONE,
- &(event->area), widget, "xfce_arrow_button",
- button->priv->arrow_type, FALSE,
- x, y, width, width);
+ switch (button->priv->arrow_type)
+{
+case GTK_ARROW_DOWN: angle = G_PI;
+case GTK_ARROW_LEFT: angle = G_PI / 2.0 + G_PI;
+case GTK_ARROW_RIGHT: angle = G_PI / 2.0;
+default: angle = 0;
+}
+
+ context
[Xfce4-commits] Creating branch nick/gtk3
Updating branch refs/heads/nick/gtk3 as new branch to 12c8c133f9a08d350987f01ef3ada7824708a254 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/nick/gtk3 for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Deleting branch nick/gtk3
Deleting branch refs/heads/nick/gtk3 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove the XfceHvBox.
Updating branch refs/heads/nick/gtk3 to 4bc82a149c8adb6de61f0e9b76e8a684c6fbd7da (commit) from 5241c9a488b94b4a3f9bfa734c4229037a0f51b3 (commit) commit 4bc82a149c8adb6de61f0e9b76e8a684c6fbd7da Author: Nick Schermer Date: Sun May 6 13:20:32 2012 +0200 Remove the XfceHvBox. GtkBox is capable of all this and was internally already used. docs/references/libxfce4panel-docs.xml |1 - docs/references/libxfce4panel-sections.txt | 18 -- docs/references/libxfce4panel.types |1 - libxfce4panel/Makefile.am |2 - libxfce4panel/libxfce4panel.h |1 - libxfce4panel/libxfce4panel.symbols | 10 - libxfce4panel/xfce-hvbox.c | 306 --- libxfce4panel/xfce-hvbox.h | 77 --- libxfce4panel/xfce-panel-plugin.c |4 - plugins/actions/actions.c |2 +- plugins/applicationsmenu/applicationsmenu.c |2 +- plugins/launcher/launcher.c |6 +- plugins/systray/systray.c |4 +- plugins/tasklist/tasklist-widget.c |6 +- plugins/tasklist/tasklist.c |2 +- po/POTFILES.in |1 - 16 files changed, 11 insertions(+), 432 deletions(-) diff --git a/docs/references/libxfce4panel-docs.xml b/docs/references/libxfce4panel-docs.xml index 16ff243..c6cec30 100644 --- a/docs/references/libxfce4panel-docs.xml +++ b/docs/references/libxfce4panel-docs.xml @@ -146,7 +146,6 @@ This section describes the additional widgets provided by the xfce4-panel library. - diff --git a/docs/references/libxfce4panel-sections.txt b/docs/references/libxfce4panel-sections.txt index f58be39..2bfc3fa 100644 --- a/docs/references/libxfce4panel-sections.txt +++ b/docs/references/libxfce4panel-sections.txt @@ -34,24 +34,6 @@ xfce_arrow_button_get_type -xfce-hvbox -XfceHVBox -xfce_hvbox_new -xfce_hvbox_set_orientation -xfce_hvbox_get_orientation - -XfceHVBoxClass -XFCE_TYPE_HVBOX -XFCE_HVBOX -XFCE_HVBOX_CLASS -XFCE_IS_HVBOX -XFCE_IS_HVBOX_CLASS -XFCE_HVBOX_GET_CLASS - -xfce_hvbox_get_type - - - convenience xfce_panel_create_button xfce_panel_create_toggle_button diff --git a/docs/references/libxfce4panel.types b/docs/references/libxfce4panel.types index bfdbd2f..c676220 100644 --- a/docs/references/libxfce4panel.types +++ b/docs/references/libxfce4panel.types @@ -1,6 +1,5 @@ #include xfce_arrow_button_get_type -xfce_hvbox_get_type xfce_panel_image_get_type xfce_panel_plugin_get_type diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am index cba5083..0da0b1d 100644 --- a/libxfce4panel/Makefile.am +++ b/libxfce4panel/Makefile.am @@ -25,7 +25,6 @@ libxfce4panel_headers = \ libxfce4panel-config.h \ libxfce4panel-enums.h \ xfce-arrow-button.h \ - xfce-hvbox.h \ xfce-panel-convenience.h \ xfce-panel-macros.h \ xfce-panel-macros-46.h \ @@ -45,7 +44,6 @@ libxfce4panel_1_0_la_SOURCES = \ $(libxfce4panel_headers) \ libxfce4panel-config.c \ xfce-arrow-button.c \ - xfce-hvbox.c \ xfce-panel-convenience.c \ xfce-panel-plugin.c \ xfce-panel-plugin-provider.c \ diff --git a/libxfce4panel/libxfce4panel.h b/libxfce4panel/libxfce4panel.h index 5db33c3..a64907b 100644 --- a/libxfce4panel/libxfce4panel.h +++ b/libxfce4panel/libxfce4panel.h @@ -29,7 +29,6 @@ G_BEGIN_DECLS #include #include #include -#include #include #include #include diff --git a/libxfce4panel/libxfce4panel.symbols b/libxfce4panel/libxfce4panel.symbols index 34f1f97..0e45685 100644 --- a/libxfce4panel/libxfce4panel.symbols +++ b/libxfce4panel/libxfce4panel.symbols @@ -61,16 +61,6 @@ xfce_arrow_button_set_blinking #endif #endif -/* xfce-hvbox.h */ -#if IN_HEADER(__XFCE_HVBOX_H__) -#if IN_SOURCE(__XFCE_HVBOX_C__) -xfce_hvbox_get_type G_GNUC_CONST -xfce_hvbox_new G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT -xfce_hvbox_set_orientation -xfce_hvbox_get_orientation -#endif -#endif - /* xfce-panel-convenience.h */ #if IN_HEADER(__XFCE_PANEL_CONVENIENCE_H__) #if IN_SOURCE(__XFCE_PANEL_CONVENIENCE_C__) diff --git a/libxfce4panel/xfce-hvbox.c b/libxfce4panel/xfce-hvbox.c deleted file mode 100644 index 33f482b..000 --- a/libxfce4panel/xfce-hvbox.c +++ /dev/null @@ -1,306 +0,0 @@ -/* - * This file is partly based on OBox - * Copyright (C) 2002 Red Hat Inc. based on GtkHBox - * - * Copyright (C) 2006-2007 Jasper Huijsmans - * Copyright (C) 2006 Jani Monoses - * Copyright (C) 2007-2010 Nick Schermer - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, -
[Xfce4-commits] Port the arrow button.
Updating branch refs/heads/nick/gtk3
to 5fbae9e7610c038015d0bbb2bed50b5493c700a2 (commit)
from 4bc82a149c8adb6de61f0e9b76e8a684c6fbd7da (commit)
commit 5fbae9e7610c038015d0bbb2bed50b5493c700a2
Author: Nick Schermer
Date: Mon May 7 18:20:29 2012 +0200
Port the arrow button.
libxfce4panel/xfce-arrow-button.c | 108 +
1 files changed, 74 insertions(+), 34 deletions(-)
diff --git a/libxfce4panel/xfce-arrow-button.c
b/libxfce4panel/xfce-arrow-button.c
index 01eb2d2..a85fb17 100644
--- a/libxfce4panel/xfce-arrow-button.c
+++ b/libxfce4panel/xfce-arrow-button.c
@@ -66,21 +66,25 @@ enum
PROP_ARROW_TYPE
};
-static void xfce_arrow_button_set_property (GObject *object,
- guint
prop_id,
- const GValue *value,
- GParamSpec*pspec);
-static void xfce_arrow_button_get_property (GObject *object,
- guint
prop_id,
- GValue*value,
- GParamSpec*pspec);
-static void xfce_arrow_button_finalize (GObject
*object);
-static gboolean xfce_arrow_button_expose_event (GtkWidget *widget,
- GdkEventExpose*event);
-static void xfce_arrow_button_size_request (GtkWidget *widget,
- GtkRequisition
*requisition);
-static void xfce_arrow_button_size_allocate (GtkWidget *widget,
- GtkAllocation
*allocation);
+static void xfce_arrow_button_set_property (GObject
*object,
+guint
prop_id,
+const GValue
*value,
+GParamSpec
*pspec);
+static void xfce_arrow_button_get_property (GObject
*object,
+guint
prop_id,
+GValue
*value,
+GParamSpec
*pspec);
+static void xfce_arrow_button_finalize (GObject
*object);
+static gboolean xfce_arrow_button_draw (GtkWidget
*widget,
+cairo_t
*cr);
+static void xfce_arrow_button_get_preferred_width (GtkWidget
*widget,
+gint
*minimal_width,
+gint
*natural_width);
+static void xfce_arrow_button_get_preferred_height (GtkWidget
*widget,
+gint
*minimal_height,
+gint
*natural_height);
+static void xfce_arrow_button_size_allocate(GtkWidget
*widget,
+GtkAllocation
*allocation);
@@ -124,8 +128,9 @@ xfce_arrow_button_class_init (XfceArrowButtonClass * klass)
gobject_class->finalize = xfce_arrow_button_finalize;
gtkwidget_class = GTK_WIDGET_CLASS (klass);
- gtkwidget_class->expose_event = xfce_arrow_button_expose_event;
- gtkwidget_class->size_request = xfce_arrow_button_size_request;
+ gtkwidget_class->draw = xfce_arrow_button_draw;
+ gtkwidget_class->get_preferred_width = xfce_arrow_button_get_preferred_width;
+ gtkwidget_class->get_preferred_height =
xfce_arrow_button_get_preferred_height;
gtkwidget_class->size_allocate = xfce_arrow_button_size_allocate;
/**
@@ -241,15 +246,15 @@ xfce_arrow_button_finalize (GObject *object)
static gboolean
-xfce_arrow_button_expose_event (GtkWidget *widget,
-GdkEventExpose *event)
+xfce_arrow_button_draw (GtkWidget *widget,
+cairo_t *cr)
{
XfceArrowButton *button = XFCE_ARROW_BUTTON (widget);
GtkWidget *child;
gint x, y, width;
/* draw the button */
- (*GTK_WIDGET_CLASS (xfce_arrow_button_parent_class)->expose_event) (widget,
event);
+ (*GTK_WIDGET_CLASS (xfce_arrow_button_parent_class)->draw) (widget, cr);
if (button->priv->arrow_type != GTK_ARROW_NONE
&& GTK_WIDGET_DRAWABLE (widget))
@@ -293,30 +298,65 @@ xfce_arrow_button_expose_event (Gt
[Xfce4-commits] Depend on gtk3 libraries.
Updating branch refs/heads/nick/gtk3 to 5241c9a488b94b4a3f9bfa734c4229037a0f51b3 (commit) from 9067b1bf63311dd892414e6df5d33944873fcced (commit) commit 5241c9a488b94b4a3f9bfa734c4229037a0f51b3 Author: Nick Schermer Date: Mon Feb 4 16:50:54 2013 +0100 Depend on gtk3 libraries. configure.ac.in |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 27943c1..b8cecd0 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -128,15 +128,15 @@ dnl *** Check for required packages *** dnl *** XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0]) XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.1.5]) -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.9.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.9.0]) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.6.0]) XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0]) XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0]) XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.24.0]) XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [0.73]) XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.0.0]) -XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.30]) +XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-3.0], [3.0]) dnl ** dnl *** Optional GIO UNIX features *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating branch nick/gtk3
Updating branch refs/heads/nick/gtk3 as new branch to 12c8c133f9a08d350987f01ef3ada7824708a254 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/nick/gtk3 for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Deleting branch nick/gtk3
Deleting branch refs/heads/nick/gtk3 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Clip overlapping backdrops (Bug #9052)
Updating branch refs/heads/eric/wallpaper-and-settings-improvements
to 963d829f123b7cd4da36c25fa03cf5754897e195 (commit)
from 594ea3b79117c866b8d2358dc2b44303572e0578 (commit)
commit 963d829f123b7cd4da36c25fa03cf5754897e195
Author: Eric Koegel
Date: Sun Mar 17 14:45:27 2013 +0300
Clip overlapping backdrops (Bug #9052)
In a multi-monitor setup each successive wallpaper drawn has the
previous area subtracted from it so that the wallpapers aren't
drawn over each other.
src/xfce-desktop.c | 89 ++---
src/xfce-workspace.c |1 -
2 files changed, 69 insertions(+), 21 deletions(-)
diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c
index 09f2e53..2623547 100644
--- a/src/xfce-desktop.c
+++ b/src/xfce-desktop.c
@@ -321,6 +321,7 @@ backdrop_changed_cb(XfceBackdrop *backdrop, gpointer
user_data)
cairo_t *cr;
GdkPixbuf *pix;
GdkRectangle rect;
+GdkRegion *clip_region = NULL;
gint i, monitor = -1, current_workspace;
TRACE("entering");
@@ -376,27 +377,75 @@ backdrop_changed_cb(XfceBackdrop *backdrop, gpointer
user_data)
xfce_backdrop_set_size(backdrop, rect.width, rect.height);
-/* create/get the composited backdrop pixmap */
-pix = xfce_backdrop_get_pixbuf(backdrop);
-if(!pix)
-return;
+if(monitor > 0
+ &&
!xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace]))
{
+clip_region = gdk_region_rectangle(&rect);
-cr = gdk_cairo_create(GDK_DRAWABLE(pmap));
-gdk_cairo_set_source_pixbuf(cr, pix, rect.x, rect.y);
-cairo_paint(cr);
-g_object_unref(G_OBJECT(pix));
-cairo_destroy(cr);
-
-/* tell gtk to redraw the repainted area */
-gtk_widget_queue_draw_area(GTK_WIDGET(desktop), rect.x, rect.y,
- rect.width, rect.height);
-
-set_imgfile_root_property(desktop,
- xfce_backdrop_get_image_filename(backdrop),
- monitor);
-
-/* do this again so apps watching the root win notice the update */
-set_real_root_window_pixmap(gscreen, pmap);
+DBG("clip_region: x: %d, y: %d, w: %d, h: %d",
+rect.x, rect.y, rect.width, rect.height);
+
+/* If we are not monitor 0 on a multi-monitor setup we need to subtract
+ * all the previous monitor regions so we don't draw over them. This
+ * should prevent the overlap and double backdrop drawing bugs.
+ */
+for(i = 0; i < monitor; i++) {
+GdkRectangle previous_monitor;
+GdkRegion *previous_region;
+gdk_screen_get_monitor_geometry(gscreen, i, &previous_monitor);
+
+DBG("previous_monitor: x: %d, y: %d, w: %d, h: %d",
+previous_monitor.x, previous_monitor.y,
+previous_monitor.width, previous_monitor.height);
+
+previous_region = gdk_region_rectangle(&previous_monitor);
+
+gdk_region_subtract(clip_region, previous_region);
+
+gdk_region_destroy(previous_region);
+}
+}
+
+if(clip_region != NULL) {
+/* Update the area to redraw to limit the icons/area painted */
+gdk_region_get_clipbox(clip_region, &rect);
+DBG("area to update: x: %d, y: %d, w: %d, h: %d",
+rect.x, rect.y, rect.width, rect.height);
+}
+
+if(rect.width != 0 && rect.height != 0) {
+/* create/get the composited backdrop pixmap */
+pix = xfce_backdrop_get_pixbuf(backdrop);
+if(!pix)
+return;
+
+cr = gdk_cairo_create(GDK_DRAWABLE(pmap));
+gdk_cairo_set_source_pixbuf(cr, pix, rect.x, rect.y);
+
+/* clip the area so we don't draw over a previous wallpaper */
+if(clip_region != NULL) {
+gdk_cairo_region(cr, clip_region);
+cairo_clip(cr);
+}
+
+cairo_paint(cr);
+g_object_unref(G_OBJECT(pix));
+
+cairo_destroy(cr);
+
+/* tell gtk to redraw the repainted area */
+gtk_widget_queue_draw_area(GTK_WIDGET(desktop), rect.x, rect.y,
+ rect.width, rect.height);
+
+set_imgfile_root_property(desktop,
+ xfce_backdrop_get_image_filename(backdrop),
+ monitor);
+
+/* do this again so apps watching the root win notice the update */
+set_real_root_window_pixmap(gscreen, pmap);
+}
+
+if(clip_region != NULL)
+gdk_region_destroy(clip_region);
}
static void
diff --git a/src/xfce-workspace.c b/src/xfce-workspace.c
index eeb131b..cdcae08 100644
--- a/src/xfce-workspace.c
+++ b/src/xfce-workspace.c
@@ -149,7 +149,6 @@ backdrop_cycle_cb(XfceBackdrop *backdrop, gpointer
user_data)
if(g_strcmp0(backdrop_file, new_backdrop) != 0) {
xfce_backdrop_set_image_filename(backdrop, new_backdrop);
g_free(new_back
[Xfce4-commits] l10n: Updated Slovenian (sl) translation to 100%
Updating branch refs/heads/master to a0ce276cc89723ae5f218e64f6d52441ae6d828f (commit) from 0bbaef2df958c479458ef3260f2ea33692a0c16d (commit) commit a0ce276cc89723ae5f218e64f6d52441ae6d828f Author: Nenad Latinović Date: Sun Mar 17 13:12:19 2013 +0100 l10n: Updated Slovenian (sl) translation to 100% New status: 279 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sl.po | 43 ++- 1 files changed, 30 insertions(+), 13 deletions(-) diff --git a/po/sl.po b/po/sl.po index 893af54..c3d1f62 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1292,24 +1292,27 @@ msgstr "Xfce brskalnik datotek" #: ../exo-helper/helpers/xterm.desktop.in.in.h:1 msgid "X Terminal" -msgstr "" +msgstr "X terminal" #: ../exo-open/main.c:109 msgid "Usage: exo-open [URLs...]" -msgstr "" +msgstr "Poraba: exo-open [URLs...]" #: ../exo-open/main.c:110 msgid " exo-open --launch TYPE [PARAMETERs...]" -msgstr "" +msgstr "exo-open --launch TIP [PARAMETERs...]" #: ../exo-open/main.c:112 msgid " -?, --help Print this help message and exit" msgstr "" +" \t\r\n" +"\r\n" +"-?, --help Natisni sporočilo pomoči in izstopi" #: ../exo-open/main.c:113 msgid "" " -V, --version Print version information and exit" -msgstr "" +msgstr "-V, --version Natisni informacije o različici in izstopi" #: ../exo-open/main.c:115 msgid "" @@ -1318,6 +1321,9 @@ msgid "" "where\n" " TYPE is one of the following values." msgstr "" +"--launch TIP [PARAMETERs...] Zaženi želeno aplikacijo\n" +" TIP z izbranimi PARAMETERs, kjer je\n" +" TIP ena izmed sledečih vrednosti." #: ../exo-open/main.c:119 msgid "" @@ -1325,10 +1331,12 @@ msgid "" "applications\n" " when using the --launch option." msgstr "" +"--working-directory DIRECTORY Privzeti delovni imenik za aplikacije\n" +" ob uporabi --launch opcije." #: ../exo-open/main.c:122 msgid "The following TYPEs are supported for the --launch command:" -msgstr "" +msgstr "Naslednji TIPi so podprti za --launch ukaz:" #. Note to Translators: Do not translate the TYPEs (WebBrowser, MailReader, #. TerminalEmulator), @@ -1341,6 +1349,10 @@ msgid "" " FileManager - The preferred File Manager.\n" " TerminalEmulator - The preferred Terminal Emulator." msgstr "" +"WebBrowser - želeni spletni brskalnik.\n" +" MailReader - želeni bralnik pošte.\n" +" FileManager - želeni upravljalnik datotek.\n" +" TerminalEmulator - želeni terminalski emulator." #: ../exo-open/main.c:133 msgid "" @@ -1350,41 +1362,46 @@ msgid "" "pass additional parameters to the application (i.e. for TerminalEmulator\n" "you can pass the command line that should be run in the terminal)." msgstr "" +"Če ne navedete --launch opcije, bo exo-open odprl vse navedene\n" +"URLje v njihovih izbranih URL upravljalcih. Če pa navedete --launch\n" +"opcijo, lahko izberete zaželeno aplikacijo za zagon in\n" +"dodate parametre v aplikacijo (npr. za TerminalEmulator\n" +"lahko dodate ukazno vrstico, ki se naj zažene v terminalu)." #: ../exo-open/main.c:195 #, c-format msgid "" "Launching desktop files is not supported when %s is compiled without GIO-" "Unix features." -msgstr "" +msgstr "Zaganjanje namiznih datotek ni podprto, ko je %s kompiliran brez GIO-Unix funkcij." #: ../exo-open/main.c:260 #, c-format msgid "Failed to launch preferred application for category \"%s\"." -msgstr "" +msgstr "Napaka pri zaganjanju želene aplikacije za \"%s\" kategorijo." #: ../exo-open/main.c:577 #, c-format msgid "Unable to detect the URI-scheme of \"%s\"." -msgstr "" +msgstr "Napaka pri zaznavanju URI-sheme za \"%s\"." #: ../exo-open/main.c:591 #, c-format msgid "Failed to open URI \"%s\"." -msgstr "" +msgstr "Napaka pri odpiranju URI \"%s\"." #: ../exo-open/exo-file-manager.desktop.in.h:1 msgid "Browse the file system" -msgstr "" +msgstr "Brskajte po datotečnem sistemu" #: ../exo-open/exo-mail-reader.desktop.in.h:2 msgid "Read your email" -msgstr "" +msgstr "Preberite svojo pošto" #: ../exo-open/exo-terminal-emulator.desktop.in.h:2 msgid "Use the command line" -msgstr "" +msgstr "Izberi ukazno vrstico" #: ../exo-open/exo-web-browser.desktop.in.h:1 msgid "Browse the web" -msgstr "" +msgstr "Brskaj po spletu" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Hungarian (hu) translation to 89%
Updating branch refs/heads/master to 24131de89377474ed0bdc989a3f70d2f4b4896ff (commit) from 61e1f1b36d2dd902da0957cab9c40b32a5550374 (commit) commit 24131de89377474ed0bdc989a3f70d2f4b4896ff Author: Gabor Kelemen Date: Sun Mar 17 13:09:41 2013 +0100 l10n: Updated Hungarian (hu) translation to 89% New status: 289 messages complete with 0 fuzzies and 35 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hu.po | 170 +++--- 1 files changed, 74 insertions(+), 96 deletions(-) diff --git a/po/hu.po b/po/hu.po index 4e9da4a..b1b732f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,7 +1,7 @@ # Hungarian translation of xfce4-weather-plugin # Copyright 2006, 2009. Free Software Foundation, Inc. # This file is distributed under the same license as the xfce4-weather-plugin package. -# +# # SZERVÁC Attila , 2007. # Gabor Kelemen , 2006, 2009, 2012. # Benedek Imre , 2013. @@ -13,13 +13,13 @@ msgstr "" "PO-Revision-Date: 2013-03-13 01:37+0100\n" "Last-Translator: Imre Benedek \n" "Language-Team: Hungarian \n" -"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-07-23 16:44+\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: hu\n" "X-Generator: Lokalize 1.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. TRANSLATORS: Keep in sync with labeloptions in weather-config.c #: ../panel-plugin/weather.c:116 @@ -38,8 +38,7 @@ msgstr "SzS" msgid "WB" msgstr "SzB" -#: ../panel-plugin/weather.c:128 -#: ../panel-plugin/weather.c:131 +#: ../panel-plugin/weather.c:128 ../panel-plugin/weather.c:131 msgid "WD" msgstr "SzI" @@ -79,8 +78,7 @@ msgstr "Kd" msgid "R" msgstr "Cs" -#: ../panel-plugin/weather.c:357 -#: ../panel-plugin/weather.c:359 +#: ../panel-plugin/weather.c:357 ../panel-plugin/weather.c:359 msgid "No Data" msgstr "Nincs adat" @@ -111,26 +109,23 @@ msgid "Download of weather data failed with HTTP Status Code %d, Reason phrase: msgstr "Az időjárási adatok letöltése meghiúsult. HTTP állapotkód: %d, oka: %s" #. start receive thread -#: ../panel-plugin/weather.c:606 -#: ../panel-plugin/weather.c:624 -#: ../panel-plugin/weather-search.c:169 -#: ../panel-plugin/weather-search.c:435 +#: ../panel-plugin/weather.c:606 ../panel-plugin/weather.c:624 +#: ../panel-plugin/weather-search.c:169 ../panel-plugin/weather-search.c:435 #, c-format msgid "getting %s" -msgstr "kérés %s" +msgstr "%s lekérése" #: ../panel-plugin/weather.c:1085 #, c-format msgid "Error writing cache file %s!" -msgstr "Hiba a gyorsítótárfájl írásakor %s!" +msgstr "Hiba a gyorsítótárfájl (%s) írásakor!" #: ../panel-plugin/weather.c:1448 #, c-format msgid "Unable to open the following url: %s" msgstr "A következő URL megnyitása meghiúsult: %s" -#: ../panel-plugin/weather.c:1479 -#: ../panel-plugin/weather.desktop.in.h:1 +#: ../panel-plugin/weather.c:1479 ../panel-plugin/weather.desktop.in.h:1 msgid "Weather Update" msgstr "Időjárási adatok frissítése" @@ -151,10 +146,9 @@ msgstr "Ma a Nap nem nyugszik le." msgid "The sun rises at %s and sets at %s." msgstr "Napkelte időpontja: %s, napnyugta időpontja: %s." -#. #. * TRANSLATORS: This is the simple tooltip. For a bigger challenge, #. * look at the verbose tooltip style further below ;-) -#. +#. #: ../panel-plugin/weather.c:1563 #, c-format msgid "" @@ -174,7 +168,6 @@ msgstr "" "Légnyomás: %s\n" "Páratartalom: %s\n" -#. #. * TRANSLATORS: Re-arrange and align at will, optionally using #. * abbreviations for labels if desired or necessary. Just take #. * into account the possible size constraints, the centered @@ -182,7 +175,7 @@ msgstr "" #. * be changed easily - and try to make it compact and look #. * good! The missing space after "%son the ..." is intentional, #. * it is included in the %s. -#. +#. #: ../panel-plugin/weather.c:1587 #, c-format msgid "" @@ -224,7 +217,6 @@ msgstr "Az időjárási helyzet és az előrejelzés megjelenítése" msgid "Copyright (c) 2003-2013\n" msgstr "Copyright (c) 2003-2013\n" -#. #. * TRANSLATORS: The abbreviations in parentheses will be shown in #. * the scrollbox together with the values. Keep them in sync with #. * those in make_label() in weather.c. Some of them may be @@ -232,7 +224,7 @@ msgstr "Copyright (c) 2003-2013\n" #. * read that up somewhere and decide whether you want to use them #. * or not. In general, though, you should just try to choose #. * letter(s) that make sense and don't use up too much space. -#. +#. #: ../panel-plugin/weather-config.c:96 msgid "Temperature (T)" msgstr "Hőmérséklet (H)" @@ -293,8 +285,7 @@ msgstr "Köd (Kd)" msgid "Precipitations (R)" msgstr "Csapadék (Cs)" -#: ../panel-plugin/weather-config.c:222 -#: ../panel-plugin/weather-config.c:324 +#: ../panel-plugin/weather-config.c:222 ../panel-plugin/weather-config.c:324 #: ../pane
[Xfce4-commits] l10n: Updated Slovenian (sl) translation to 93%
Updating branch refs/heads/master to 0bbaef2df958c479458ef3260f2ea33692a0c16d (commit) from 12e3a94b3e75b3e672894c9c9b037e542c1967e3 (commit) commit 0bbaef2df958c479458ef3260f2ea33692a0c16d Author: Nenad Latinović Date: Sun Mar 17 13:00:49 2013 +0100 l10n: Updated Slovenian (sl) translation to 93% New status: 261 messages complete with 0 fuzzies and 18 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sl.po | 50 +- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/po/sl.po b/po/sl.po index ad2deb7..893af54 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1192,103 +1192,103 @@ msgstr "Jumanji" #: ../exo-helper/helpers/kmail.desktop.in.in.h:1 msgid "KMail" -msgstr "" +msgstr "Kmail" #: ../exo-helper/helpers/konqueror.desktop.in.in.h:1 msgid "Konqueror Web Browser" -msgstr "" +msgstr "Konqueror spletni brskalnik" #: ../exo-helper/helpers/links.desktop.in.in.h:1 msgid "Links Text Browser" -msgstr "" +msgstr "Links besedilni brskalnik" #: ../exo-helper/helpers/lynx.desktop.in.in.h:1 msgid "Lynx Text Browser" -msgstr "" +msgstr "Lynx besedilni brskalnik" #: ../exo-helper/helpers/midori.desktop.in.in.h:1 msgid "Midori" -msgstr "" +msgstr "Midori" #: ../exo-helper/helpers/mozilla-browser.desktop.in.in.h:1 msgid "Mozilla Browser" -msgstr "" +msgstr "Mozillin brskalnik" #: ../exo-helper/helpers/mozilla-mailer.desktop.in.in.h:1 msgid "Mozilla Mail" -msgstr "" +msgstr "Mozillina pošta" #: ../exo-helper/helpers/mutt.desktop.in.in.h:1 msgid "Mutt" -msgstr "" +msgstr "Mutt" #: ../exo-helper/helpers/nautilus.desktop.in.in.h:1 msgid "Nautilus" -msgstr "" +msgstr "Nautilus" #: ../exo-helper/helpers/netscape-navigator.desktop.in.in.h:1 msgid "Netscape Navigator" -msgstr "" +msgstr "Netscape Navigator" #: ../exo-helper/helpers/nxterm.desktop.in.in.h:1 msgid "NXterm" -msgstr "" +msgstr "NXterm" #: ../exo-helper/helpers/opera-browser.desktop.in.in.h:1 msgid "Opera Browser" -msgstr "" +msgstr "Opera brskalnik" #: ../exo-helper/helpers/opera-mailer.desktop.in.in.h:1 msgid "Opera Mail" -msgstr "" +msgstr "Opera pošta" #: ../exo-helper/helpers/pcmanfm.desktop.in.in.h:1 msgid "PCMan File Manager" -msgstr "" +msgstr "PCMan brskalnik datotek" #: ../exo-helper/helpers/rodent.desktop.in.in.h:1 msgid "Rodent File Manager" -msgstr "" +msgstr "Rodent brskalnik datotek" #: ../exo-helper/helpers/rox-filer.desktop.in.in.h:1 msgid "ROX-Filer" -msgstr "" +msgstr "ROX-filer" #: ../exo-helper/helpers/sakura.desktop.in.in.h:1 msgid "Sakura" -msgstr "" +msgstr "Sakura" #: ../exo-helper/helpers/sylpheed.desktop.in.in.h:1 msgid "Sylpheed" -msgstr "" +msgstr "Sylpheed" #: ../exo-helper/helpers/sylpheed-claws.desktop.in.in.h:1 msgid "Claws Mail" -msgstr "" +msgstr "Claws Mail" #: ../exo-helper/helpers/Thunar.desktop.in.in.h:1 msgid "Thunar" -msgstr "" +msgstr "Thunar" #: ../exo-helper/helpers/thunderbird.desktop.in.in.h:1 msgid "Mozilla Thunderbird" -msgstr "" +msgstr "Mozilla Thunderbird" #: ../exo-helper/helpers/urxvt.desktop.in.in.h:1 msgid "RXVT Unicode" -msgstr "" +msgstr "RXVT Unicode" #: ../exo-helper/helpers/w3m.desktop.in.in.h:1 msgid "W3M Text Browser" -msgstr "" +msgstr "W3M besedilni brskalnik" #: ../exo-helper/helpers/xfce4-terminal.desktop.in.in.h:1 msgid "Xfce Terminal" -msgstr "" +msgstr "Xfce terminal" #: ../exo-helper/helpers/xfe.desktop.in.in.h:1 msgid "Xfe File Manager" -msgstr "" +msgstr "Xfce brskalnik datotek" #: ../exo-helper/helpers/xterm.desktop.in.in.h:1 msgid "X Terminal" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Slovenian (sl) translation to 84%
Updating branch refs/heads/master to 12e3a94b3e75b3e672894c9c9b037e542c1967e3 (commit) from bf78324bac6a6d7492f85f09dca15517457073d8 (commit) commit 12e3a94b3e75b3e672894c9c9b037e542c1967e3 Author: Nenad Latinović Date: Sun Mar 17 12:57:49 2013 +0100 l10n: Updated Slovenian (sl) translation to 84% New status: 236 messages complete with 0 fuzzies and 43 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sl.po | 62 +++--- 1 files changed, 39 insertions(+), 23 deletions(-) diff --git a/po/sl.po b/po/sl.po index d131d21..ad2deb7 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1055,17 +1055,17 @@ msgstr "Priključek upravljalca nastavitev" #: ../exo-helper/main.c:72 msgid "SOCKET ID" -msgstr "" +msgstr "ID PRIKLJUČKA" #: ../exo-helper/main.c:73 msgid "" "Launch the default helper of TYPE with the optional PARAMETER, where TYPE is " "one of the following values." -msgstr "" +msgstr "Zaženi privzeti pomočnik TIP z iz izbirnim PARAMETER, kjer je TIP ena od sledečih vrednosti." #: ../exo-helper/main.c:73 msgid "TYPE [PARAMETER]" -msgstr "" +msgstr "TIP [PARAMETER]" #: ../exo-helper/main.c:102 msgid "" @@ -1076,16 +1076,22 @@ msgid "" " FileManager - The preferred File Manager.\n" " TerminalEmulator - The preferred Terminal Emulator." msgstr "" +"Naslednji TIPi so podprti za --launch command:\n" +"\n" +" WebBrowser - želeni spletni brskalnik.\n" +" MailReader - želeni bralnik pošte.\n" +" FileManager - želeni upravljalnik datotek.\n" +" TerminalEmulator - želeni terminalski emulator." #: ../exo-helper/main.c:112 #, c-format msgid "Type '%s --help' for usage." -msgstr "" +msgstr "Natipkajte '%s --help' za uporabo." #: ../exo-helper/main.c:165 #, c-format msgid "Invalid helper type \"%s\"" -msgstr "" +msgstr "Nepravilen pomočnik tipa \"%s\"" #: ../exo-helper/main.c:213 #, c-format @@ -1101,78 +1107,88 @@ msgid "" "\n" "Please report bugs to <%s>.\n" msgstr "" +"%s (Xfce %s)\n" +"\n" +"Copyright (c) 2003-2006\n" +" os-cillation e.K. Vse pravice pridržane.\n" +"\n" +"Napisal Benedikt Meurer .\n" +"\n" +"Zgrajeno z Gtk+-%d.%d.%d, teče na Gtk+-%d.%d.%d.\n" +"\n" +"Prosim, prijavite hroše na <%s>.\n" #: ../exo-helper/helpers/aterm.desktop.in.in.h:1 msgid "aterm" -msgstr "" +msgstr "aterm" #: ../exo-helper/helpers/balsa.desktop.in.in.h:1 msgid "Balsa" -msgstr "" +msgstr "Balsa" #: ../exo-helper/helpers/caja.desktop.in.in.h:1 msgid "Caja File Manager" -msgstr "" +msgstr "Caja upravljalnik datotek" #: ../exo-helper/helpers/chromium.desktop.in.in.h:1 msgid "Chromium" -msgstr "" +msgstr "Chromium" #: ../exo-helper/helpers/debian-sensible-browser.desktop.in.in.h:1 msgid "Debian Sensible Browser" -msgstr "" +msgstr "Debian Sensible brskalnik" #: ../exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in.h:1 msgid "Debian X Terminal Emulator" -msgstr "" +msgstr "Debianov X terminalski emulator" #: ../exo-helper/helpers/dillo.desktop.in.in.h:1 msgid "Dillo" -msgstr "" +msgstr "Dillo" #: ../exo-helper/helpers/encompass.desktop.in.in.h:1 msgid "Encompass" -msgstr "" +msgstr "Encompass" #: ../exo-helper/helpers/epiphany.desktop.in.in.h:1 msgid "Epiphany Web Browser" -msgstr "" +msgstr "Epiphany spletni brskalnik" #: ../exo-helper/helpers/eterm.desktop.in.in.h:1 msgid "Enlightened Terminal Emulator" -msgstr "" +msgstr "Enlightened terminalski emulator" #: ../exo-helper/helpers/evolution.desktop.in.in.h:1 msgid "Evolution" -msgstr "" +msgstr "Evolution" #: ../exo-helper/helpers/firefox.desktop.in.in.h:1 msgid "Mozilla Firefox" -msgstr "" +msgstr "Mozilla Firefox" #: ../exo-helper/helpers/galeon.desktop.in.in.h:1 msgid "Galeon Web Browser" -msgstr "" +msgstr "Galeon spletni brskalnik" #: ../exo-helper/helpers/gnome-terminal.desktop.in.in.h:1 msgid "GNOME Terminal" -msgstr "" +msgstr "GNOME terminal" #: ../exo-helper/helpers/icecat.desktop.in.in.h:1 msgid "Icecat" -msgstr "" +msgstr "Icecat" #: ../exo-helper/helpers/icedove.desktop.in.in.h:1 msgid "Icedove" -msgstr "" +msgstr "Icedove" #: ../exo-helper/helpers/iceweasel.desktop.in.in.h:1 msgid "Iceweasel" -msgstr "" +msgstr "Iceweasel" #: ../exo-helper/helpers/jumanji.desktop.in.in.h:1 msgid "Jumanji" -msgstr "" +msgstr "Jumanji" #: ../exo-helper/helpers/kmail.desktop.in.in.h:1 msgid "KMail" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Slovenian (sl) translation to 75%
Updating branch refs/heads/master to bf78324bac6a6d7492f85f09dca15517457073d8 (commit) from e0a3d5740c7e24f00f3ee773d15bd686715718c4 (commit) commit bf78324bac6a6d7492f85f09dca15517457073d8 Author: Nenad Latinović Date: Sun Mar 17 12:49:54 2013 +0100 l10n: Updated Slovenian (sl) translation to 75% New status: 211 messages complete with 0 fuzzies and 68 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sl.po | 50 ++ 1 files changed, 34 insertions(+), 16 deletions(-) diff --git a/po/sl.po b/po/sl.po index 6f08b3a..d131d21 100644 --- a/po/sl.po +++ b/po/sl.po @@ -917,123 +917,141 @@ msgstr "Izberi aplikacijo" #: ../exo-helper/exo-helper-chooser.c:501 msgid "Choose a custom Web Browser" -msgstr "" +msgstr "Izberi prilagojeni spletni brskalnik" #: ../exo-helper/exo-helper-chooser.c:502 msgid "Choose a custom Mail Reader" -msgstr "" +msgstr "Izberi prilagojeni bralnik pošte" #: ../exo-helper/exo-helper-chooser.c:503 msgid "Choose a custom File Manager" -msgstr "" +msgstr "Izberi prilagojeni upravljalnik datotek" #: ../exo-helper/exo-helper-chooser.c:504 msgid "Choose a custom Terminal Emulator" -msgstr "" +msgstr "Izberi prilagojeni terminalski emulator" #: ../exo-helper/exo-helper-chooser.c:509 msgid "" "Specify the application you want to use\n" "as default Web Browser for Xfce:" msgstr "" +"Navedite aplikacijo, ki jo želite uporabiti\n" +"kot privzeti spletni brskalnik v Xfce-ju:" #: ../exo-helper/exo-helper-chooser.c:510 msgid "" "Specify the application you want to use\n" "as default Mail Reader for Xfce:" msgstr "" +"Navedite aplikacijo, ki jo želite uporabiti\n" +"kot privzeti bralnik pošte v Xfce-ju:" #: ../exo-helper/exo-helper-chooser.c:511 msgid "" "Specify the application you want to use\n" "as default File Manager for Xfce:" msgstr "" +"Navedite aplikacijo, ki jo želite uporabiti\n" +"kot privzeti upravljalnik datotek v Xfce-ju:" #: ../exo-helper/exo-helper-chooser.c:512 msgid "" "Specify the application you want to use\n" "as default Terminal Emulator for Xfce:" msgstr "" +"Navedite aplikacijo, ki jo želite uporabiti\n" +"kot privzeti terminalski emulator v Xfce-ju:" #: ../exo-helper/exo-helper-chooser.c:579 msgid "Browse the file system to choose a custom command." -msgstr "" +msgstr "Prebrskajte datotečni sistem za izbor prilagojenega ukaza." #: ../exo-helper/exo-helper-chooser.c:762 msgid "_Other..." -msgstr "" +msgstr "_Ostalo..." #: ../exo-helper/exo-helper-chooser.c:763 msgid "Use a custom application which is not included in the above list." -msgstr "" +msgstr "Uporabi prirejeno aplikacijo, ki ni navedena na seznamu." #: ../exo-helper/exo-helper-launcher-dialog.c:113 msgid "Choose Preferred Application" -msgstr "" +msgstr "Izberite želeno aplikacijo" #: ../exo-helper/exo-helper-launcher-dialog.c:256 msgid "" "Please choose your preferred Web\n" "Browser now and click OK to proceed." msgstr "" +"Prosim, izberite želen spletni\n" +"brskalnik in kliknite OK za nadaljevanje." #: ../exo-helper/exo-helper-launcher-dialog.c:258 msgid "" "Please choose your preferred Mail Reader\n" "now and click OK to proceed." msgstr "" +"Prosim, izberite želen brskalnik pošte\n" +"in kliknite OK za nadaljevanje." #: ../exo-helper/exo-helper-launcher-dialog.c:260 msgid "" "Please choose your preferred File Manager\n" "now and click OK to proceed." msgstr "" +"Prosim, izberite želen upravljalnik datotek\n" +"in kliknite OK za nadaljevanje." #: ../exo-helper/exo-helper-launcher-dialog.c:262 msgid "" "Please choose your preferred Terminal\n" "Emulator now and click OK to proceed." msgstr "" +"Prosim, izberite želen terminalski\n" +"emulator in kliknite OK za nadaljevanje." #: ../exo-helper/exo-helper.c:382 #, c-format msgid "No command specified" -msgstr "" +msgstr "Ni določenega ukaza" #: ../exo-helper/exo-helper.c:688 ../exo-helper/exo-helper.c:722 #, c-format msgid "Failed to open %s for writing" -msgstr "" +msgstr "Napaka pri odpiranju %s za zapisovanje" #: ../exo-helper/exo-preferred-applications.desktop.in.h:2 msgid "Preferred Applications (Web Browser, Mail Reader and Terminal Emulator)" -msgstr "" +msgstr "Želene aplikacije (spletni brskalnik, bralnik pošte in terminalski emulator)" #: ../exo-helper/main.c:41 msgid "Failed to execute default Web Browser" -msgstr "" +msgstr "Napaka pri izvajanju želenega spletnega brskalnika" #: ../exo-helper/main.c:42 msgid "Failed to execute default Mail Reader" -msgstr "" +msgstr "Napaka pri izvajanju želenega bralnika pošte" #: ../exo-helper/main.c:43 msgid "Failed to execute default File Manager" -msgstr "" +msgstr "Napaka pri izvajanju želenega upravljalnika datotek" #: ../exo-helper/main.c:44 msgid "Failed to execute default Terminal Emulator" -msgstr "" +msgstr "Napaka pri izvajanju želenega terminalskega emulatorja" #: ../exo-helper/m
[Xfce4-commits] l10n: Updated Slovenian (sl) translation to 66%
Updating branch refs/heads/master to e0a3d5740c7e24f00f3ee773d15bd686715718c4 (commit) from ec13abb21af35548cd52ae8143e315b6fce6257f (commit) commit e0a3d5740c7e24f00f3ee773d15bd686715718c4 Author: Nenad Latinović Date: Sun Mar 17 12:37:46 2013 +0100 l10n: Updated Slovenian (sl) translation to 66% New status: 186 messages complete with 0 fuzzies and 93 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sl.po | 50 +- 1 files changed, 29 insertions(+), 21 deletions(-) diff --git a/po/sl.po b/po/sl.po index 9ce0e72..6f08b3a 100644 --- a/po/sl.po +++ b/po/sl.po @@ -786,126 +786,134 @@ msgstr "Datoteka \"%s\" nima vrste ključa" #: ../exo-desktop-item-edit/main.c:316 #, c-format msgid "Unsupported desktop file type \"%s\"" -msgstr "" +msgstr "Nepodprta vrsta datoteke namizja \"%s\"" #. add the "Create"/"Save" button (as default) #: ../exo-desktop-item-edit/main.c:340 msgid "C_reate" -msgstr "" +msgstr "U_stvari" #. create failed, ask the user to specify a file name #: ../exo-desktop-item-edit/main.c:513 msgid "Choose filename" -msgstr "" +msgstr "Izberi ime datoteke" #: ../exo-desktop-item-edit/main.c:620 #, c-format msgid "Failed to create \"%s\"." -msgstr "" +msgstr "Napaka pri ustvarjanju \"%s\"." #: ../exo-desktop-item-edit/main.c:620 #, c-format msgid "Failed to save \"%s\"." -msgstr "" +msgstr "Napaka pri shranjevanju \"%s\"." #: ../exo-helper/exo-helper-chooser-dialog.c:102 #: ../exo-helper/exo-preferred-applications.desktop.in.h:1 msgid "Preferred Applications" -msgstr "" +msgstr "Priljubljene aplikacije" #: ../exo-helper/exo-helper-chooser-dialog.c:103 msgid "Select default applications for various services" -msgstr "" +msgstr "Izberite privzete aplikacije za različne storitve" #. Internet #. #: ../exo-helper/exo-helper-chooser-dialog.c:132 msgid "_Internet" -msgstr "" +msgstr "_Splet" #: ../exo-helper/exo-helper-chooser-dialog.c:145 #: ../exo-open/exo-web-browser.desktop.in.h:2 msgid "Web Browser" -msgstr "" +msgstr "Spletni brskalnik" #: ../exo-helper/exo-helper-chooser-dialog.c:153 msgid "" "The preferred Web Browser will be used to open\n" "hyperlinks and display help contents." msgstr "" +"Priljubljeni spletni brskalnik, uporabljen za odpiranje\n" +"hiperpovezav in za predvajanje vsebine pomoči." #: ../exo-helper/exo-helper-chooser-dialog.c:177 #: ../exo-open/exo-mail-reader.desktop.in.h:1 msgid "Mail Reader" -msgstr "" +msgstr "Bralnik pošte" #: ../exo-helper/exo-helper-chooser-dialog.c:185 msgid "" "The preferred Mail Reader will be used to compose\n" "emails when you click on email addresses." msgstr "" +"Izbrani bralnik pošte bo uporabljen za pisanje\n" +"elektronske pošte, ko kliknete na naslov elektronske pošte." #. Utilities #. #: ../exo-helper/exo-helper-chooser-dialog.c:205 msgid "_Utilities" -msgstr "" +msgstr "_Pripomočki" #: ../exo-helper/exo-helper-chooser-dialog.c:218 #: ../exo-open/exo-file-manager.desktop.in.h:2 msgid "File Manager" -msgstr "" +msgstr "Brskalnik datotek" #: ../exo-helper/exo-helper-chooser-dialog.c:226 msgid "" "The preferred File Manager will be used to\n" "browse the contents of folders." msgstr "" +"Izbrani brskalnik datotek bo uporabljen za\n" +"brskanje po vsebini map." #: ../exo-helper/exo-helper-chooser-dialog.c:250 #: ../exo-open/exo-terminal-emulator.desktop.in.h:1 msgid "Terminal Emulator" -msgstr "" +msgstr "Terminalski emulator" #: ../exo-helper/exo-helper-chooser-dialog.c:258 msgid "" "The preferred Terminal Emulator will be used to\n" "run commands that require a CLI environment." msgstr "" +"Izbrani terminalski emulator bo uporabljen za\n" +"zagon ukazov, ki potrebujejo znakovni uporabniški vmesnik." #: ../exo-helper/exo-helper-chooser.c:149 #: ../exo-helper/exo-helper-chooser.c:156 msgid "Press left mouse button to change the selected application." -msgstr "" +msgstr "Pritisnite na levi gumb miške za spreminjanje izbrane aplikacije." #: ../exo-helper/exo-helper-chooser.c:155 msgid "Application Chooser Button" -msgstr "" +msgstr "Gumb za izbiranje aplikacij" #: ../exo-helper/exo-helper-chooser.c:299 msgid "No application selected" -msgstr "" +msgstr "Ni izbrane aplikacije" #: ../exo-helper/exo-helper-chooser.c:315 msgid "Failed to set default Web Browser" -msgstr "" +msgstr "Napaka pri nastavljanju privzetega spletnega brskalnika" #: ../exo-helper/exo-helper-chooser.c:316 msgid "Failed to set default Mail Reader" -msgstr "" +msgstr "Napaka pri nastavljanju privzetega bralnika pošte" #: ../exo-helper/exo-helper-chooser.c:317 msgid "Failed to set default File Manager" -msgstr "" +msgstr "Napaka pri nastavljanju privzetega brskalnika datotek" #: ../exo-helper/exo-helper-chooser.c:318 msgid "Failed to set default Terminal Emulator" -msgstr "" +msgstr "Napaka pri nastavljanju privzetega terminalskega emulatorja" #. all
[Xfce4-commits] l10n: Updated Slovenian (sl) translation to 57%
Updating branch refs/heads/master to ec13abb21af35548cd52ae8143e315b6fce6257f (commit) from 94142bd002f0a246eab5553dbed591b76dd6761f (commit) commit ec13abb21af35548cd52ae8143e315b6fce6257f Author: Nenad Latinović Date: Sun Mar 17 12:29:45 2013 +0100 l10n: Updated Slovenian (sl) translation to 57% New status: 161 messages complete with 0 fuzzies and 118 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sl.po | 54 +++--- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/po/sl.po b/po/sl.po index 954549f..9ce0e72 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-17 06:00+\n" +"POT-Creation-Date: 2013-03-17 11:21+\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Nenad Latinovi \n" "Language-Team: Slovenian \n" @@ -660,7 +660,7 @@ msgid "" "Select this option to enable startup notification when the command is run " "from the file manager or the menu. Not every application supports startup " "notification." -msgstr "" +msgstr "Izberite to opcijo za omogočanje zagonskega obvestila ob zagonu ukaza v upravljalniku datotek ali meniju. Zagonskega obvestila ne podpira vsaka aplikacija." #. TRANSLATORS: Check button label in "Create Launcher" dialog, make sure to #. avoid mnemonic conflicts @@ -669,11 +669,11 @@ msgstr "" #. #: ../exo-desktop-item-edit/exo-die-editor.c:434 msgid "Run in _terminal" -msgstr "Zaženi v terminalu" +msgstr "Zaeni v terminalu" #: ../exo-desktop-item-edit/exo-die-editor.c:435 msgid "Select this option to run the command in a terminal window." -msgstr "" +msgstr "Izberite to opcijo za zagon ukaza v oknu terminala" #. allocate the icon chooser dialog #: ../exo-desktop-item-edit/exo-die-editor.c:590 @@ -683,104 +683,104 @@ msgstr "Izberite ikono" #. allocate the file chooser dialog #: ../exo-desktop-item-edit/exo-die-editor.c:637 msgid "Select a working directory" -msgstr "" +msgstr "Izberite delovni imenik" #: ../exo-desktop-item-edit/exo-die-utils.c:169 msgid "File location is not a regular file or directory" -msgstr "" +msgstr "Lokacija datoteke ni običajna datoteka ali imenik" #. --- constants --- #: ../exo-desktop-item-edit/main.c:52 msgid "Create Launcher" -msgstr "" +msgstr "Ustvarite zaganjalec" #: ../exo-desktop-item-edit/main.c:52 msgid "Create Link" -msgstr "" +msgstr "Ustvarite povezavo" #: ../exo-desktop-item-edit/main.c:52 msgid "Create Directory" -msgstr "" +msgstr "Ustvarite imenik" #: ../exo-desktop-item-edit/main.c:53 msgid "Edit Launcher" -msgstr "" +msgstr "Uredite zaganjalec" #: ../exo-desktop-item-edit/main.c:53 msgid "Edit Link" -msgstr "" +msgstr "Uredite povezavo" #: ../exo-desktop-item-edit/main.c:53 msgid "Edit Directory" -msgstr "" +msgstr "Uredite imenik" #: ../exo-desktop-item-edit/main.c:78 msgid "Create a new desktop file in the given directory" -msgstr "" +msgstr "Ustvarite novo namizno datoteko v izbranem imeniku" #: ../exo-desktop-item-edit/main.c:79 msgid "Type of desktop file to create (Application or Link)" -msgstr "" +msgstr "Tip namizne datoteke, ki jo želite ustvariti (aplikacija ali povezava)" #: ../exo-desktop-item-edit/main.c:80 msgid "Preset name when creating a desktop file" -msgstr "" +msgstr "Prednastavljeno ime ob ustvarjanju datoteke namizja" #: ../exo-desktop-item-edit/main.c:81 msgid "Preset comment when creating a desktop file" -msgstr "" +msgstr "Prednastavljen komentar ob ustvarjanju datoteke namizja" #: ../exo-desktop-item-edit/main.c:82 msgid "Preset command when creating a launcher" -msgstr "" +msgstr "Prednastavljen ukaz ob ustvarjanju zaganjalca" #: ../exo-desktop-item-edit/main.c:83 msgid "Preset URL when creating a link" -msgstr "" +msgstr "Prednastavljen URL ob ustvarjanju povezave" #: ../exo-desktop-item-edit/main.c:84 msgid "Preset icon when creating a desktop file" -msgstr "" +msgstr "Prednastavljena ikona ob ustvarjanju datoteke namizja" #: ../exo-desktop-item-edit/main.c:85 ../exo-helper/main.c:70 msgid "Print version information and exit" -msgstr "" +msgstr "Natisni različico in končaj" #. initialize Gtk+ #: ../exo-desktop-item-edit/main.c:171 msgid "[FILE|FOLDER]" -msgstr "" +msgstr "[DATOTEKA|MAPA]" #. no error message, the GUI initialization failed #: ../exo-desktop-item-edit/main.c:183 msgid "Failed to open display" -msgstr "" +msgstr "Napaka pri odpiranju prikazovalnika" #: ../exo-desktop-item-edit/main.c:210 msgid "No file/folder specified" -msgstr "" +msgstr "Ni navedene datoteke/mape" #: ../exo-desktop-item-edit/main.c:276 #, c-format msgid "Failed to load contents from \"%s\": %s" -msgstr "" +msgstr "Napaka pri nalaganju vsebine \"%s\": %s" #: ../exo-desktop-item-edit/main.c:281 #, c-format msgid "The file \"%s\" contains no data" -msgstr
[Xfce4-commits] l10n: Updated Slovenian (sl) translation to 48%
Updating branch refs/heads/master to 94142bd002f0a246eab5553dbed591b76dd6761f (commit) from fc5e4d5d8d28a99e6de21cbd0cf975a7f6d32a51 (commit) commit 94142bd002f0a246eab5553dbed591b76dd6761f Author: Nenad Latinović Date: Sun Mar 17 12:18:46 2013 +0100 l10n: Updated Slovenian (sl) translation to 48% New status: 136 messages complete with 0 fuzzies and 143 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sl.po | 145 ++ 1 files changed, 80 insertions(+), 65 deletions(-) diff --git a/po/sl.po b/po/sl.po index 147966c..954549f 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2,20 +2,20 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-14 13:48+\n" +"POT-Creation-Date: 2013-03-17 06:00+\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Nenad Latinović \n" +"Last-Translator: Nenad Latinovi \n" "Language-Team: Slovenian \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" #: ../exo/exo-cell-renderer-ellipsized-text.c:131 #: ../exo/exo-cell-renderer-icon.c:144 @@ -25,7 +25,7 @@ msgstr "Sledi stanju" #: ../exo/exo-cell-renderer-ellipsized-text.c:132 #: ../exo/exo-cell-renderer-icon.c:145 msgid "Render differently based on the selection state." -msgstr "Upodobi različno, glede na stanje izbora." +msgstr "Upodobi razlino, glede na stanje izbora." #: ../exo/exo-cell-renderer-icon.c:166 msgid "Icon" @@ -65,7 +65,9 @@ msgstr "Napaka pri branju datoteke \"%s\": %s" #, c-format msgid "" "Failed to load image \"%s\": Unknown reason, probably a corrupt image file" -msgstr "Napaka pri nalaganju slike \"%s\": Razlog neznan, najverjetneje okvara slikovne datoteke" +msgstr "" +"Napaka pri nalaganju slike \"%s\": Razlog neznan, najverjetneje okvara " +"slikovne datoteke" #: ../exo/exo-gtk-extensions.c:227 #, c-format @@ -169,7 +171,7 @@ msgstr "Simboli" #. EXO_ICON_CHOOSER_CONTEXT_EMOTES #: ../exo/exo-icon-chooser-dialog.c:121 msgid "Emoticons" -msgstr "Čustveni simboli" +msgstr "ustveni simboli" #. EXO_ICON_CHOOSER_CONTEXT_INTERNATIONAL #: ../exo/exo-icon-chooser-dialog.c:123 @@ -194,7 +196,7 @@ msgstr "Ikone statusa" #. EXO_ICON_CHOOSER_CONTEXT_OTHER #: ../exo/exo-icon-chooser-dialog.c:131 msgid "Uncategorized Icons" -msgstr "Nerazvrščene ikone" +msgstr "Nerazvrene ikone" #. EXO_ICON_CHOOSER_CONTEXT_ALL #: ../exo/exo-icon-chooser-dialog.c:135 @@ -214,11 +216,11 @@ msgstr "Izberi _ikono iz:" #. search filter #: ../exo/exo-icon-chooser-dialog.c:225 msgid "_Search icon:" -msgstr "_Poišči ikono:" +msgstr "_Poii ikono:" #: ../exo/exo-icon-chooser-dialog.c:236 msgid "Clear search field" -msgstr "Počisti iskalno polje" +msgstr "Poisti iskalno polje" #: ../exo/exo-icon-view.c:674 msgid "Column Spacing" @@ -226,19 +228,19 @@ msgstr "Razmik stolpca" #: ../exo/exo-icon-view.c:675 msgid "Space which is inserted between grid column" -msgstr "Razmik, vstavljen med mreže stolpca" +msgstr "Razmik, vstavljen med mree stolpca" #: ../exo/exo-icon-view.c:691 msgid "Number of columns" -msgstr "Število stolpcev" +msgstr "tevilo stolpcev" #: ../exo/exo-icon-view.c:692 msgid "Number of columns to display" -msgstr "Število stolpcev za prikaz" +msgstr "tevilo stolpcev za prikaz" #: ../exo/exo-icon-view.c:706 msgid "Enable Search" -msgstr "Omogoči iskanje" +msgstr "Omogoi iskanje" #: ../exo/exo-icon-view.c:707 msgid "View allows user to search through columns interactively" @@ -246,19 +248,19 @@ msgstr "Pogled dovoljuje uporabniku interaktivno iskanje med stolpci" #: ../exo/exo-icon-view.c:724 msgid "Width for each item" -msgstr "Širina za vsak predmet" +msgstr "irina za vsak predmet" #: ../exo/exo-icon-view.c:725 msgid "The width used for each item" -msgstr "Širina uporabljena za vsak predmet" +msgstr "irina uporabljena za vsak predmet" #: ../exo/exo-icon-view.c:743 msgid "Layout mode" -msgstr "Način postavitve" +msgstr "Nain postavitve" #: ../exo/exo-icon-view.c:744 msgid "The layout mode" -msgstr "Način postavitve" +msgstr "Nain postavitve" #: ../exo/exo-icon-view.c:760 msgid "Margin" @@ -270,11 +272,13 @@ msgstr "Razmik, vstavljen na robove ikonskega pogleda" #: ../exo/exo-icon-view.c:777 msgid "Markup column" -msgstr "Označevalni stolpec" +msgstr "Oznaevalni stolpec" #: ../exo/exo-icon-view.c:778 msgid "Model column used to retrieve the text if using Pango markup" -msgstr "Vzorec stolpca, uporabljenega za pridobitev besedila, če ta uporablja Pango označevanje" +msgstr "" +"Vzorec stolpca, uporabljenega za pridobitev besedila, e ta uporablja Pango " +"oznaevanje" #: ../exo/exo-icon-view.c
[Xfce4-commits] Fix memory leaks
Updating branch refs/heads/eric/wallpaper-and-settings-improvements
to 594ea3b79117c866b8d2358dc2b44303572e0578 (commit)
from 95542b215411106f404e21a443ddd1e7059fff1c (commit)
commit 594ea3b79117c866b8d2358dc2b44303572e0578
Author: Eric Koegel
Date: Sun Mar 17 13:36:54 2013 +0300
Fix memory leaks
settings/main.c |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/settings/main.c b/settings/main.c
index 71f917f..3f00439 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -670,6 +670,7 @@ cb_image_selection_changed(GtkIconView *icon_view,
xfconf_channel_set_string(panel->channel, buf, filename);
}
+g_list_foreach (selected_items, (GFunc)gtk_tree_path_free, NULL);
g_list_free(selected_items);
g_free(current_filename);
g_free(buf);
@@ -819,10 +820,13 @@ cb_folder_selection_changed(GtkWidget *button,
TRACE("entering");
/* Check to see if the folder actually did change */
-if(g_strcmp0(filename, previous_filename) == 0)
+if(g_strcmp0(filename, previous_filename) == 0) {
+g_free(filename);
return;
+}
TRACE("folder changed to: %s", filename);
+g_free(previous_filename);
previous_filename = filename;
xfdesktop_settings_stop_image_loading(panel);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add more border style properties.
Updating branch refs/heads/master
to 41847681d21e0cfa9534bfda13646fa9838b9e7a (commit)
from 0c3b3034a66fa7d2cea0d82379771277f3979283 (commit)
commit 41847681d21e0cfa9534bfda13646fa9838b9e7a
Author: Jérôme Guelfucci
Date: Sun Mar 17 11:33:23 2013 +0100
Add more border style properties.
It is now possible to tweak the border in normal and in hovered state
with different widths and colors.
xfce4-notifyd/xfce-notify-window.c | 56 +--
1 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/xfce4-notifyd/xfce-notify-window.c
b/xfce4-notifyd/xfce-notify-window.c
index 4aedc5c..4a79d2d 100644
--- a/xfce4-notifyd/xfce-notify-window.c
+++ b/xfce4-notifyd/xfce-notify-window.c
@@ -163,6 +163,13 @@ xfce_notify_window_class_init(XfceNotifyWindowClass *klass)
G_PARAM_READABLE));
gtk_widget_class_install_style_property(widget_class,
+
g_param_spec_boxed("border-color-hover",
+ "border color
hover",
+ "the color of
the border when hovering the notification",
+ GDK_TYPE_COLOR,
+
G_PARAM_READABLE));
+
+gtk_widget_class_install_style_property(widget_class,
g_param_spec_double("border-radius",
"border
radius",
"the radius of
the window border's curved corners",
@@ -177,6 +184,13 @@ xfce_notify_window_class_init(XfceNotifyWindowClass *klass)
DEFAULT_BORDER_WIDTH,
G_PARAM_READABLE));
gtk_widget_class_install_style_property(widget_class,
+
g_param_spec_double("border-width-hover",
+"border width
hover",
+"the width of
the border when hovering the notification",
+0.0, 8.0,
+
DEFAULT_BORDER_WIDTH,
+
G_PARAM_READABLE));
+gtk_widget_class_install_style_property(widget_class,
g_param_spec_double("padding",
"padding",
"the padding
of the text/icon to the notification's border",
@@ -411,10 +425,17 @@ xfce_notify_window_ensure_bg_path(XfceNotifyWindow
*window,
gtk_widget_size_request(GTK_WIDGET(window), &req);
-gtk_widget_style_get(widget,
- "border-radius", &radius,
- "border-width", &border_width,
- NULL);
+if (!window->mouse_hover) {
+gtk_widget_style_get(widget,
+ "border-radius", &radius,
+ "border-width", &border_width,
+ NULL);
+} else {
+gtk_widget_style_get(widget,
+ "border-radius", &radius,
+ "border-width-hover", &border_width,
+ NULL);
+}
border_padding = border_width / 2.0;
@@ -477,6 +498,8 @@ xfce_notify_window_expose(GtkWidget *widget,
cairo_t *cr;
GList *children, *l;
cairo_path_t *bg_path;
+GdkColor *border_color = NULL;
+gdouble border_width = DEFAULT_BORDER_WIDTH;
if(evt->count != 0)
return FALSE;
@@ -512,24 +535,25 @@ xfce_notify_window_expose(GtkWidget *widget,
}
if(window->mouse_hover) {
-GdkColor *border_color = NULL;
-gdouble border_width = DEFAULT_BORDER_WIDTH;
-
+gtk_widget_style_get(widget,
+ "border-color-hover", &border_color,
+ "border-width-hover", &border_width,
+ NULL);
+} else {
gtk_widget_style_get(widget,
"border-color", &border_color,
"border-width", &border_width,
NULL);
-
-cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
-if(border_color)
-gdk_cairo_set_source_color(cr, border_color);
-else
-cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
-cairo_set_line_width(cr, border_width);
-
-cairo_stroke(cr);
}
+
[Xfce4-commits] Detatch from icon theme to avoid segfault (bug #9730).
Updating branch refs/heads/xfce-4.10
to 3ac34bdd003c3400f175e83827df585cc2bf6ecb (commit)
from 5809bb278e79874e691d1598eb3d789d2f1a5780 (commit)
commit 3ac34bdd003c3400f175e83827df585cc2bf6ecb
Author: Nick Schermer
Date: Sat Mar 16 19:03:01 2013 +0100
Detatch from icon theme to avoid segfault (bug #9730).
(cherry picked from commit eb46f5acd4b0b985a94bee6942d6527f9f620b84)
src/appfinder-window.c | 15 ---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/appfinder-window.c b/src/appfinder-window.c
index 4f99c6a..2ff8d50 100644
--- a/src/appfinder-window.c
+++ b/src/appfinder-window.c
@@ -127,6 +127,8 @@ struct _XfceAppfinderWindow
XfceAppfinderActions *actions;
+ GtkIconTheme *icon_theme;
+
GtkEntryCompletion *completion;
XfconfChannel *channel;
@@ -202,7 +204,6 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window)
GtkWidget *bbox;
GtkWidget *button;
GtkEntryCompletion *completion;
- GtkIconTheme *icon_theme;
gintinteger;
window->channel = xfconf_channel_get ("xfce4-appfinder");
@@ -370,9 +371,10 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window)
image = gtk_image_new_from_stock (GTK_STOCK_EXECUTE, GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (button), image);
- icon_theme = gtk_icon_theme_get_for_screen (gtk_window_get_screen
(GTK_WINDOW (window)));
- g_signal_connect_swapped (G_OBJECT (icon_theme), "changed",
+ window->icon_theme = gtk_icon_theme_get_for_screen (gtk_window_get_screen
(GTK_WINDOW (window)));
+ g_signal_connect_swapped (G_OBJECT (window->icon_theme), "changed",
G_CALLBACK (xfce_appfinder_window_icon_theme_changed), window);
+ g_object_ref (G_OBJECT (window->icon_theme));
/* load categories in the model */
xfce_appfinder_window_category_set_categories (NULL, window);
@@ -402,6 +404,11 @@ xfce_appfinder_window_finalize (GObject *object)
g_signal_handler_disconnect (window->channel, window->property_watch_id);
g_signal_handler_disconnect (window->model, window->categories_changed_id);
+ /* release our reference on the icon theme */
+ g_signal_handlers_disconnect_by_func (G_OBJECT (window->icon_theme),
+ xfce_appfinder_window_icon_theme_changed, window);
+ g_object_unref (G_OBJECT (window->icon_theme));
+
g_object_unref (G_OBJECT (window->model));
g_object_unref (G_OBJECT (window->category_model));
g_object_unref (G_OBJECT (window->completion));
@@ -1448,6 +1455,8 @@ xfce_appfinder_window_row_activated (XfceAppfinderWindow
*window)
static void
xfce_appfinder_window_icon_theme_changed (XfceAppfinderWindow *window)
{
+ appfinder_return_if_fail (XFCE_IS_APPFINDER_WINDOW (window));
+
if (window->icon_find != NULL)
g_object_unref (G_OBJECT (window->icon_find));
window->icon_find = xfce_appfinder_model_load_pixbuf (GTK_STOCK_FIND,
XFCE_APPFINDER_ICON_SIZE_48);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] List supported proxy types in preferences
Updating branch refs/heads/master
to 65d6c151ca0b41bdc3a87c800aa7ae3f78bb9d53 (commit)
from 83d0281240b941cfe94a5b49487ba8a55be591a9 (commit)
commit 65d6c151ca0b41bdc3a87c800aa7ae3f78bb9d53
Author: Christian Dywan
Date: Sun Mar 17 11:14:04 2013 +0100
List supported proxy types in preferences
midori/midori-preferences.c | 21 +
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 6958e95..371cb23 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -490,6 +490,27 @@ midori_preferences_set_settings (MidoriPreferences*
preferences,
g_signal_connect (settings, "notify::proxy-type",
G_CALLBACK (midori_preferences_notify_proxy_type_cb), entry);
midori_preferences_notify_proxy_type_cb (settings, NULL, entry);
+#if GLIB_CHECK_VERSION (2, 26, 0)
+INDENTED_ADD (gtk_event_box_new ());
+label = gtk_label_new (NULL);
+GString* proxy_types = g_string_new (NULL);
+g_string_append (proxy_types, "");
+g_string_append (proxy_types, _("Supported proxy types:"));
+g_string_append_c (proxy_types, ' ');
+/* http is not implemented as a GIO extension */
+g_string_append (proxy_types, "http:// https://";);
+GIOExtensionPoint* proxy_extension = g_io_extension_point_lookup
("gio-proxy");
+GList* proxies = g_io_extension_point_get_extensions (proxy_extension);
+for (; proxies; proxies = g_list_next (proxies))
+g_string_append_printf (proxy_types, " %s://", g_io_extension_get_name
(proxies->data));
+g_string_append (proxy_types, "");
+gtk_label_set_markup (GTK_LABEL (label), proxy_types->str);
+g_string_free (proxy_types, TRUE);
+SPANNED_ADD (label);
+g_signal_connect (settings, "notify::proxy-type",
+G_CALLBACK (midori_preferences_notify_proxy_type_cb), label);
+midori_preferences_notify_proxy_type_cb (settings, NULL, label);
+#endif
#if WEBKIT_CHECK_VERSION (1, 3, 11)
#ifndef HAVE_WEBKIT2
if (soup_session_get_feature (webkit_get_default_session (),
SOUP_TYPE_CACHE))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix broken po file.
Updating branch refs/heads/master to 7418aabd54ba0e5aa6f9fe0f4af209fb7069f523 (commit) from 395d4cb7b61a30911de6b04458eb87dce9f54c8a (commit) commit 7418aabd54ba0e5aa6f9fe0f4af209fb7069f523 Author: Nick Schermer Date: Sun Mar 17 10:50:10 2013 +0100 Fix broken po file. po/sl.po |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/po/sl.po b/po/sl.po index 0f3fbd6..3e9c44b 100644 --- a/po/sl.po +++ b/po/sl.po @@ -16,8 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" -"%100==4 ? 3 : 0);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" "X-Poedit-Language: Slovenian\n" "X-Poedit-Country: SLOVENIA\n" "X-Generator: Lokalize 1.4\n" @@ -740,7 +739,7 @@ msgstr "S policykit podporo\n" #: ../src/xfpm-main.c:115 #, c-format msgid "Without policykit support\n" -msgstr "Brez policykit podporeQn" +msgstr "Brez policykit podporo\n" #: ../src/xfpm-main.c:118 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Respect Open new pages: window for Web Search and Open Image
Updating branch refs/heads/master
to 83d0281240b941cfe94a5b49487ba8a55be591a9 (commit)
from 710fa9410b9b8e26a74ca94a2509b6faf9e83a91 (commit)
commit 83d0281240b941cfe94a5b49487ba8a55be591a9
Author: Christian Dywan
Date: Sun Mar 17 10:27:41 2013 +0100
Respect Open new pages: window for Web Search and Open Image
Fixes: https://bugs.launchpad.net/midori/+bug/1125384
midori/midori-view.c | 34 --
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 214d635..716a4e4 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2132,8 +2132,11 @@ midori_web_view_menu_image_new_tab_activate_cb
(GtkWidget* widget,
MidoriView* view)
{
gchar* uri = katze_object_get_string (view->hit_test, "image-uri");
-g_signal_emit (view, signals[NEW_TAB], 0, uri,
- view->open_tabs_in_the_background);
+if (view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW)
+g_signal_emit (view, signals[NEW_WINDOW], 0, uri);
+else
+g_signal_emit (view, signals[NEW_TAB], 0, uri,
+view->open_tabs_in_the_background);
g_free (uri);
}
@@ -2302,19 +2305,19 @@ static void
midori_web_view_menu_search_web_activate_cb (GtkWidget* widget,
MidoriView* view)
{
-gchar* search;
-gchar* uri;
+const gchar* search = g_object_get_data (G_OBJECT (widget), "search");
+if (search == NULL)
+search = midori_settings_get_location_entry_search (MIDORI_SETTINGS
(view->settings));
+gchar* uri = midori_uri_for_search (search, view->selected_text);
-if ((search = g_object_get_data (G_OBJECT (widget), "search")))
-search = g_strdup (search);
+if (view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW)
+g_signal_emit (view, signals[NEW_WINDOW], 0, uri);
+/* FIXME: need a way to override behavior (middle click)
+else if (view->open_new_pages_in == MIDORI_NEW_PAGE_CURRENT)
+midori_view_set_uri (view, uri); */
else
-g_object_get (view->settings, "location-entry-search",
- &search, NULL);
-uri = midori_uri_for_search (search, view->selected_text);
-g_free (search);
-
-g_signal_emit (view, signals[NEW_TAB], 0, uri,
-view->open_tabs_in_the_background);
+g_signal_emit (view, signals[NEW_TAB], 0, uri,
+view->open_tabs_in_the_background);
g_free (uri);
}
@@ -2617,7 +2620,10 @@ midori_view_populate_popup (MidoriView* view,
if (view->link_uri)
gtk_menu_shell_append (menu_shell, gtk_separator_menu_item_new ());
midori_view_insert_menu_item (menu_shell, -1,
-_("Open _Image in New Tab"), STOCK_TAB_NEW,
+view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW
+? _("Open _Image in New Window")
+: _("Open _Image in New Tab")
+, STOCK_TAB_NEW,
G_CALLBACK (midori_web_view_menu_image_new_tab_activate_cb),
widget);
midori_view_insert_menu_item (menu_shell, -1,
_("Copy Im_age"), NULL,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use enable-javascript in both WebKit1 and WebKit2
Updating branch refs/heads/master
to 710fa9410b9b8e26a74ca94a2509b6faf9e83a91 (commit)
from 93944622d29c065014e188108a11ec373bce3d89 (commit)
commit 710fa9410b9b8e26a74ca94a2509b6faf9e83a91
Author: Christian Dywan
Date: Sun Mar 17 09:51:29 2013 +0100
Use enable-javascript in both WebKit1 and WebKit2
extensions/statusbar-features.c |6 +++---
midori/midori-preferences.c |2 +-
midori/midori-settings.vala |6 ++
midori/midori-speeddial.vala|2 +-
midori/midori-view.c|2 +-
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c
index 4cb65c0..6be3ff2 100644
--- a/extensions/statusbar-features.c
+++ b/extensions/statusbar-features.c
@@ -116,7 +116,7 @@ statusbar_features_property_proxy (MidoriWebSettings*
settings,
GtkWidget* button;
GtkWidget* image;
if (!strcmp (property, "auto-load-images")
- || !strcmp (property, "enable-scripts")
+ || !strcmp (property, "enable-javascript")
|| !strcmp (property, "enable-plugins"))
kind = "toggle";
else if (!strcmp (property, "identify-as"))
@@ -157,7 +157,7 @@ statusbar_features_property_proxy (MidoriWebSettings*
settings,
g_signal_connect (toolbar, "notify::toolbar-style",
G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb),
button);
}
-if (!strcmp (property, "enable-scripts"))
+if (!strcmp (property, "enable-javascript"))
{
g_object_set_data (G_OBJECT (button), "feature-label", _("Scripts"));
image = gtk_image_new_from_stock (STOCK_SCRIPT, GTK_ICON_SIZE_MENU);
@@ -218,7 +218,7 @@ statusbar_features_app_add_browser_cb (MidoriApp* app,
{
button = statusbar_features_property_proxy (settings,
"auto-load-images", toolbar);
gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
-button = statusbar_features_property_proxy (settings,
"enable-scripts", toolbar);
+button = statusbar_features_property_proxy (settings,
"enable-javascript", toolbar);
gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
button = statusbar_features_property_proxy (settings,
"enable-plugins", toolbar);
gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index f8c318e..6958e95 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -378,7 +378,7 @@ midori_preferences_set_settings (MidoriPreferences*
preferences,
else
g_free (enchant_path);
}
-button = katze_property_proxy (settings, "enable-scripts", NULL);
+button = katze_property_proxy (settings, "enable-javascript", NULL);
gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts"));
INDENTED_ADD (button);
#if WEBKIT_CHECK_VERSION (1, 3, 8)
diff --git a/midori/midori-settings.vala b/midori/midori-settings.vala
index 18ffe79..6976e98 100644
--- a/midori/midori-settings.vala
+++ b/midori/midori-settings.vala
@@ -21,6 +21,12 @@ namespace Midori {
/* Since: 0.1.3 */
#if !HAVE_WEBKIT2
public class Settings : WebKit.WebSettings {
+/* Since: 0.5.0 */
+public bool enable_javascript { get {
+return enable_scripts;
+} set {
+enable_scripts = value;
+} default = true; }
#else
public class Settings : WebKit.Settings {
#endif
diff --git a/midori/midori-speeddial.vala b/midori/midori-speeddial.vala
index 899e3f2..d8dc29a 100644
--- a/midori/midori-speeddial.vala
+++ b/midori/midori-speeddial.vala
@@ -365,7 +365,7 @@ namespace Midori {
if (thumb_view == null) {
thumb_view = new WebKit.WebView ();
var settings = new WebKit.WebSettings ();
-settings. set ("enable-scripts", false,
+settings. set ("enable-javascript", false,
"enable-plugins", false,
"auto-load-images", true,
"enable-html5-database", false,
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 18991ac..214d635 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3488,7 +3488,7 @@ midori_view_settings_notify_cb (MidoriWebSettings*
settings,
view->middle_click_opens_selection = g_value_get_boolean (&value);
else if (name == g_intern_string ("open-tabs-in-the-background"))
view->open_tabs_in_the_background = g_value_get_boolean (&value);
-else if (name == g_intern_string ("enable-scripts"))
+else if (name == g_intern_string ("enable-javascript"))
{
/* Speed dial is only editable with scripts, so regenerate it */
if (midori_view_is_blank (view))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfc
[Xfce4-commits] Use macro for (Web)Settings property overrides
Updating branch refs/heads/master
to 93944622d29c065014e188108a11ec373bce3d89 (commit)
from 675ad347863c3e2bef8d9d2b745086acfb22c5cc (commit)
commit 93944622d29c065014e188108a11ec373bce3d89
Author: Paweł Forysiuk
Date: Sun Mar 17 09:43:16 2013 +0100
Use macro for (Web)Settings property overrides
midori/midori-websettings.c | 24 +++-
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index f24ccc0..3446f07 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -33,6 +33,12 @@
#include
#endif
+#ifdef HAVE_WEBKIT2
+#define WEB_SETTINGS_STRING(x) "WebKitSettings::"x""
+#else
+#define WEB_SETTINGS_STRING(x) "WebKitWebSettings::"x""
+#endif
+
struct _MidoriWebSettings
{
MidoriSettings parent_instance;
@@ -989,7 +995,7 @@ midori_web_settings_set_property (GObject* object,
case PROP_ENABLE_PLUGINS:
g_object_set (web_settings,
-"WebKitWebSettings::enable-plugins", g_value_get_boolean (value),
+ WEB_SETTINGS_STRING ("enable-plugins"), g_value_get_boolean (value),
#if WEBKIT_CHECK_VERSION (1, 1, 22)
"enable-java-applet", g_value_get_boolean (value),
#endif
@@ -997,7 +1003,7 @@ midori_web_settings_set_property (GObject* object,
break;
#if WEBKIT_CHECK_VERSION (1, 1, 18)
case PROP_ENABLE_PAGE_CACHE:
-g_object_set (web_settings, "WebKitWebSettings::enable-page-cache",
+g_object_set (web_settings, WEB_SETTINGS_STRING ("enable-page-cache"),
g_value_get_boolean (value), NULL);
break;
#endif
@@ -1017,7 +1023,7 @@ midori_web_settings_set_property (GObject* object,
case PROP_USER_AGENT:
if (web_settings->identify_as == MIDORI_IDENT_CUSTOM)
katze_assign (web_settings->ident_string, g_value_dup_string
(value));
-g_object_set (web_settings, "WebKitWebSettings::user-agent",
+g_object_set (web_settings, WEB_SETTINGS_STRING ("user-agent"),
web_settings->ident_string, NULL);
break;
case PROP_NEW_TAB:
@@ -1059,7 +1065,7 @@ midori_web_settings_set_property (GObject* object,
midori_web_settings_remove_style (web_settings,
"enforce-font-family");
break;
case PROP_ENABLE_FULLSCREEN:
-g_object_set (web_settings, "WebKitWebSettings::enable-fullscreen",
+g_object_set (web_settings, WEB_SETTINGS_STRING ("enable-fullscreen"),
g_value_get_boolean (value), NULL);
break;
case PROP_USER_STYLESHEET_URI:
@@ -1154,12 +1160,12 @@ midori_web_settings_get_property (GObject*object,
case PROP_ENABLE_PLUGINS:
g_value_set_boolean (value, katze_object_get_boolean (web_settings,
- "WebKitWebSettings::enable-plugins"));
+ WEB_SETTINGS_STRING ("enable-plugins")));
break;
#if WEBKIT_CHECK_VERSION (1, 1, 18)
case PROP_ENABLE_PAGE_CACHE:
g_value_set_boolean (value, katze_object_get_boolean (web_settings,
- "WebKitWebSettings::enable-page-cache"));
+ WEB_SETTINGS_STRING ("enable-page-cache")));
break;
#endif
@@ -1196,11 +1202,11 @@ midori_web_settings_get_property (GObject*object,
break;
case PROP_ENABLE_FULLSCREEN:
g_value_set_boolean (value, katze_object_get_boolean (web_settings,
-"WebKitWebSettings::enable-fullscreen"));
+WEB_SETTINGS_STRING ("enable-fullscreen")));
break;
case PROP_USER_STYLESHEET_URI:
g_value_take_string (value, katze_object_get_string (web_settings,
-"WebKitWebSettings::user-stylesheet-uri"));
+WEB_SETTINGS_STRING ("user-stylesheet-uri")));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1255,7 +1261,7 @@ midori_web_settings_process_stylesheets
(MidoriWebSettings* settings,
/* data: uri prefix from Source/WebCore/page/Page.cpp:700 in WebKit */
encoded = g_strconcat ("data:text/css;charset=utf-8;base64,", css->str,
NULL);
-g_object_set (G_OBJECT (settings),
"WebKitWebSettings::user-stylesheet-uri", encoded, NULL);
+g_object_set (settings, WEB_SETTINGS_STRING ("user-stylesheet-uri"),
encoded, NULL);
g_free (encoded);
g_string_free (css, TRUE);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix MIDORI_*_VERSION to be integers
Updating branch refs/heads/master
to 675ad347863c3e2bef8d9d2b745086acfb22c5cc (commit)
from 300a1e901fcb7b66521681f18e54866a26d57500 (commit)
commit 675ad347863c3e2bef8d9d2b745086acfb22c5cc
Author: Christian Dywan
Date: Sun Mar 17 09:20:17 2013 +0100
Fix MIDORI_*_VERSION to be integers
wscript |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/wscript b/wscript
index 47502dc..fa4264e 100644
--- a/wscript
+++ b/wscript
@@ -338,9 +338,9 @@ def configure (conf):
conf.define ('MIDORI_VERSION', VERSION)
major, minor, micro = VERSION.split ('.', 2)
-conf.define ('MIDORI_MAJOR_VERSION', major)
-conf.define ('MIDORI_MINOR_VERSION', minor)
-conf.define ('MIDORI_MICRO_VERSION', micro)
+conf.define ('MIDORI_MAJOR_VERSION', int (major))
+conf.define ('MIDORI_MINOR_VERSION', int (minor))
+conf.define ('MIDORI_MICRO_VERSION', int (micro))
conf.env.append_value ('CCFLAGS', '-DHAVE_CONFIG_H -include
config.h'.split ())
debug_level = Options.options.debug_level
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
