diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-29 15:34:07 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-29 15:34:07 +0100 |
| commit | 06c6f9b26676af2c05cea700c2eac145a77bbf9b (patch) | |
| tree | e1cb884a117eddf8fd733ddbfe3039fffe9c3e8c | |
| parent | 37f47955eae6998f61da280f3e4da601e4aea6c0 (diff) | |
| parent | e8641f0bc6a3db34f517477d10a94923b4b3cc7a (diff) | |
| download | abrt-06c6f9b26676af2c05cea700c2eac145a77bbf9b.tar.gz abrt-06c6f9b26676af2c05cea700c2eac145a77bbf9b.tar.xz abrt-06c6f9b26676af2c05cea700c2eac145a77bbf9b.zip | |
Merge branch 'master' into rhel6
| -rw-r--r-- | po/fi.po | 282 | ||||
| -rw-r--r-- | po/he.po | 37 | ||||
| -rw-r--r-- | src/Gui/ABRTPlugin.py | 10 | ||||
| -rw-r--r-- | src/Gui/CCReporterDialog.py | 2 | ||||
| -rw-r--r-- | src/Gui/CC_gui_functions.py | 10 | ||||
| -rw-r--r-- | src/Gui/ConfBackend.py | 63 | ||||
| -rw-r--r-- | src/Gui/report.glade | 10 |
7 files changed, 271 insertions, 143 deletions
@@ -1,14 +1,13 @@ # Finnish translation of abrt. # Copyright (C) 2009 abrt's COPYRIGHT HOLDER # This file is distributed under the same license as the abrt package. -# Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>, 2009. -#: ../src/Gui/CCReporterDialog.py:208 +# Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: abrt\n" "Report-Msgid-Bugs-To: jmoskovc@redhat.com\n" -"POT-Creation-Date: 2009-12-23 17:17+0000\n" -"PO-Revision-Date: 2009-12-23 23:41+0200\n" +"POT-Creation-Date: 2010-01-29 10:00+0000\n" +"PO-Revision-Date: 2010-01-29 14:49+0200\n" "Last-Translator: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>\n" "Language-Team: Finnish <laatu@lokalisointi.org>\n" "MIME-Version: 1.0\n" @@ -25,35 +24,35 @@ msgid "Got unexpected data from daemon (is the database properly updated?)." msgstr "" "Saatiin odottamatonta dataa taustaprosessilta (onko tietokanta päivitetty?)" -#: ../src/Gui/ABRTPlugin.py:55 +#: ../src/Gui/ABRTPlugin.py:56 +msgid "Not loaded plugins" +msgstr "Ei ladattuja liitännäisiä" + +#: ../src/Gui/ABRTPlugin.py:57 msgid "Analyzer plugins" msgstr "Analysaattoriliitännäiset" -#: ../src/Gui/ABRTPlugin.py:56 +#: ../src/Gui/ABRTPlugin.py:58 msgid "Action plugins" msgstr "Toimintoliitännäiset" -#: ../src/Gui/ABRTPlugin.py:57 +#: ../src/Gui/ABRTPlugin.py:59 msgid "Reporter plugins" msgstr "Raportointiliitännäiset" -#: ../src/Gui/ABRTPlugin.py:58 +#: ../src/Gui/ABRTPlugin.py:60 msgid "Database plugins" msgstr "Tietokantaliitännäiset" -#: ../src/Gui/ABRTPlugin.py:97 -msgid "Plugin name is not set, can't load its settings" -msgstr "Liitännäisen nimeä ei ole asetettu, sen asetuksia ei voida ladata" - -#: ../src/Gui/CCDBusBackend.py:74 ../src/Gui/CCDBusBackend.py:97 +#: ../src/Gui/CCDBusBackend.py:75 ../src/Gui/CCDBusBackend.py:98 msgid "Can't connect to system dbus" msgstr "Järjestelmäväylään ei saatu yhteyttä" -#: ../src/Gui/CCDBusBackend.py:104 ../src/Gui/CCDBusBackend.py:107 +#: ../src/Gui/CCDBusBackend.py:121 ../src/Gui/CCDBusBackend.py:124 msgid "Please check if abrt daemon is running" msgstr "Tarkista onko abrt-taustaprosessi käynnissä" -#: ../src/Gui/CCDBusBackend.py:159 +#: ../src/Gui/CCDBusBackend.py:176 msgid "" "Daemon didn't return valid report info\n" "Debuginfo is missing?" @@ -69,7 +68,8 @@ msgstr "(C) 2009 Red Hat, Inc." msgid "About ABRT" msgstr "Tietoja ABRT:stä" -#: ../src/Gui/ccgui.glade.h:3 ../src/Gui/abrt.desktop.in.h:1 +#: ../src/Gui/ccgui.glade.h:3 ../src/Gui/CCMainWindow.py:9 +#: ../src/Gui/report.glade.h:15 ../src/Gui/abrt.desktop.in.h:1 msgid "Automatic Bug Reporting Tool" msgstr "Automaattinen ohjelmavikojen raportointiohjelma" @@ -93,7 +93,7 @@ msgstr "Odota hetki..." msgid "Plugins" msgstr "Liitännäiset" -#: ../src/Gui/ccgui.glade.h:9 ../src/Gui/report.glade.h:6 +#: ../src/Gui/ccgui.glade.h:9 msgid "Report" msgstr "Raportti" @@ -137,31 +137,31 @@ msgid "_Help" msgstr "_Ohje" #. add pixbuff separatelly -#: ../src/Gui/CCMainWindow.py:71 +#: ../src/Gui/CCMainWindow.py:79 msgid "Icon" msgstr "Kuvake" -#: ../src/Gui/CCMainWindow.py:79 +#: ../src/Gui/CCMainWindow.py:87 msgid "Package" msgstr "Paketti" -#: ../src/Gui/CCMainWindow.py:80 +#: ../src/Gui/CCMainWindow.py:88 msgid "Application" msgstr "Ohjelma" -#: ../src/Gui/CCMainWindow.py:81 +#: ../src/Gui/CCMainWindow.py:89 msgid "Date" msgstr "Päiväys" -#: ../src/Gui/CCMainWindow.py:82 +#: ../src/Gui/CCMainWindow.py:90 msgid "Crash count" msgstr "Kaatumisten määrä" -#: ../src/Gui/CCMainWindow.py:83 +#: ../src/Gui/CCMainWindow.py:91 msgid "User" msgstr "Käyttäjä" -#: ../src/Gui/CCMainWindow.py:149 +#: ../src/Gui/CCMainWindow.py:159 #, python-format msgid "" "Can't show the settings dialog\n" @@ -170,7 +170,7 @@ msgstr "" "Asetusikkunaa ei voida näyttää\n" "%s" -#: ../src/Gui/CCMainWindow.py:160 +#: ../src/Gui/CCMainWindow.py:170 #, python-format msgid "" "Unable to finish current task!\n" @@ -180,7 +180,7 @@ msgstr "" "%s" #. there is something wrong with the daemon if we cant get the dumplist -#: ../src/Gui/CCMainWindow.py:187 +#: ../src/Gui/CCMainWindow.py:197 #, python-format msgid "" "Error while loading the dumplist.\n" @@ -189,15 +189,19 @@ msgstr "" "Vedosluetteloa ladattaessa tapahtui virhe.\n" "%s" -#: ../src/Gui/CCMainWindow.py:224 +#: ../src/Gui/CCMainWindow.py:235 +msgid "This crash has been reported:\n" +msgstr "Tämä kaatuminen on raportoitu:\n" + +#: ../src/Gui/CCMainWindow.py:236 msgid "<b>This crash has been reported:</b>\n" msgstr "<b>Tämä kaatuminen on raportoitu:</b>\n" -#: ../src/Gui/CCMainWindow.py:234 +#: ../src/Gui/CCMainWindow.py:255 msgid "<b>Not reported!</b>" msgstr "<b>Ei raportoitu!</b>" -#: ../src/Gui/CCMainWindow.py:283 +#: ../src/Gui/CCMainWindow.py:303 msgid "" "Unable to get report!\n" "Debuginfo is missing?" @@ -205,7 +209,7 @@ msgstr "" "Raporttia ei saatu!\n" "Puuttuuko debuginfo?" -#: ../src/Gui/CCMainWindow.py:302 +#: ../src/Gui/CCMainWindow.py:323 #, python-format msgid "" "Reporting failed!\n" @@ -214,26 +218,22 @@ msgstr "" "Raportin tekeminen epäonnistui!\n" "%s" -#: ../src/Gui/CCMainWindow.py:321 ../src/Gui/CCMainWindow.py:348 +#: ../src/Gui/CCMainWindow.py:342 ../src/Gui/CCMainWindow.py:369 #, python-format msgid "Error getting the report: %s" msgstr "Raportin noutaminen epäonnistui: %s" -#: ../src/Gui/CCReporterDialog.py:136 -#, python-format -msgid "" -"Can't save plugin settings:\n" -" %s" -msgstr "" -"Liitännäisen asetuksia ei voida tallentaa:\n" -" %s" - -#: ../src/Gui/CCReporterDialog.py:194 +#. default texts +#: ../src/Gui/CCReporterDialog.py:24 msgid "Brief description how to reproduce this or what you did..." msgstr "" "Lyhyt kuvaus siitä, miten tämän pystyy toistamaan tai mitä olit tekemässä..." -#: ../src/Gui/CCReporterDialog.py:239 +#: ../src/Gui/CCReporterDialog.py:94 +msgid "You must agree with submitting the backtrace." +msgstr "Pinolistauksen lähettämiseen on annettava suostumus." + +#: ../src/Gui/CCReporterDialog.py:105 #, python-format msgid "" "Reporting disabled because the backtrace is unusable.\n" @@ -243,16 +243,16 @@ msgid "" msgstr "" "Raportointi on poistettu käytöstä, koska virheenjäljitystiedot ovat " "hyödyttömät.\n" -"Yritä asentaa debuginfo manuaalisesti komennolla: <b>debuginfo-install %" -"s</b>\n" +"Yritä asentaa debuginfo manuaalisesti komennolla: <b>debuginfo-install %s</" +"b>\n" "Käytä sitten Päivitä-painiketta virheenjäljitystietojen generoimiseksi " "uudelleen." -#: ../src/Gui/CCReporterDialog.py:241 +#: ../src/Gui/CCReporterDialog.py:107 msgid "The backtrace is unusable, you can't report this!" msgstr "Virheenjäljitystiedot ovat hyödyttömät, tätä ei voi raportoida!" -#: ../src/Gui/CCReporterDialog.py:246 +#: ../src/Gui/CCReporterDialog.py:110 msgid "" "The backtrace is incomplete, please make sure you provide good steps to " "reproduce." @@ -260,18 +260,16 @@ msgstr "" "Virheenjäljitystiedot ovat epätäydelliset, varmista että olet kertonut " "tarkat vaiheet virheen toistamiseen." -#: ../src/Gui/CCReporterDialog.py:296 +#: ../src/Gui/CCReporterDialog.py:152 #, python-format msgid "" -"<b>WARNING</b>, you're about to send data which might contain sensitive " -"information.\n" -"Do you really want to send <b>%s</b>?\n" +"Can't save plugin settings:\n" +" %s" msgstr "" -"<b>VAROITUS</b>, olet lähettämässä dataa, joka saattaa sisältää joitakin " -"yksityisiä tietoja!\n" -"Haluatko todella lähettää <b>%s</b>?\n" +"Liitännäisen asetuksia ei voida tallentaa:\n" +" %s" -#: ../src/Gui/dialogs.glade.h:1 ../src/Gui/report.glade.h:5 +#: ../src/Gui/dialogs.glade.h:1 msgid "Log" msgstr "Loki" @@ -302,20 +300,74 @@ msgid " " msgstr " " #: ../src/Gui/report.glade.h:2 -msgid "<b>Comment</b>" -msgstr "<b>Kommentti</b>" +msgid "<b>Attachments</b>" +msgstr "<b>Liitteet</b>" #: ../src/Gui/report.glade.h:3 -msgid "<b>Following items will be sent</b>" -msgstr "<b>Seuraavat kohdat lähetetään</b>" +msgid "<b>Backtrace</b>" +msgstr "<b>Pinolistaus</b>" #: ../src/Gui/report.glade.h:4 +msgid "<b>Comment</b>" +msgstr "<b>Kommentti</b>" + +#: ../src/Gui/report.glade.h:5 msgid "<b>How to reproduce (in a few simple steps)</b>" msgstr "<b>Kuinka tämän voi toistaa (muutamalla helpolla toimenpiteellä)</b>" +#: ../src/Gui/report.glade.h:6 +msgid "<b>Please fix the following problems</b>" +msgstr "<b>Korjaa seuraavat ongelmat</b>" + #: ../src/Gui/report.glade.h:7 -msgid "Send" -msgstr "Lähetä" +msgid "<span fgcolor=\"blue\">Architecture:</span>" +msgstr "<span fgcolor=\"blue\">Arkkitehtuuri:</span>" + +#: ../src/Gui/report.glade.h:8 +msgid "<span fgcolor=\"blue\">Cmdline:</span>" +msgstr "<span fgcolor=\"blue\">Komentorivi:</span>" + +#: ../src/Gui/report.glade.h:9 +msgid "<span fgcolor=\"blue\">Component:</span>" +msgstr "<span fgcolor=\"blue\">Komponentti:</span>" + +#: ../src/Gui/report.glade.h:10 +msgid "<span fgcolor=\"blue\">Executable:</span>" +msgstr "<span fgcolor=\"blue\">Suoritettava tiedosto:</span>" + +#: ../src/Gui/report.glade.h:11 +msgid "<span fgcolor=\"blue\">Kernel:</span>" +msgstr "<span fgcolor=\"blue\">Ydin:</span>" + +#: ../src/Gui/report.glade.h:12 +msgid "<span fgcolor=\"blue\">Package:</span>" +msgstr "<span fgcolor=\"blue\">Paketti:</span>" + +#: ../src/Gui/report.glade.h:13 +msgid "<span fgcolor=\"blue\">Reason:</span>" +msgstr "<span fgcolor=\"blue\">Syy:</span>" + +#: ../src/Gui/report.glade.h:14 +msgid "<span fgcolor=\"blue\">Release:</span>" +msgstr "<span fgcolor=\"blue\">Julkaisu:</span>" + +#: ../src/Gui/report.glade.h:16 +msgid "I agree to submit this backtrace, which could contain sensitive data" +msgstr "" +"Suostun lähettämään tämän pinolistauksen, joka voi sisältää yksityisiä " +"tietoja" + +#: ../src/Gui/report.glade.h:17 +msgid "N/A" +msgstr "Ei saatavilla" + +#: ../src/Gui/report.glade.h:18 +msgid "Send report" +msgstr "Lähetä raportti" + +#: ../src/Gui/report.glade.h:19 +msgid "Show log" +msgstr "Näytä loki" #: ../src/Gui/SettingsDialog.py:33 ../src/Gui/SettingsDialog.py:50 msgid "<b>Select plugin</b>" @@ -433,20 +485,20 @@ msgstr "gtk-ok" msgid "View and report application crashes" msgstr "Katsele ja raportoi ohjelmien kaatumisia" -#: ../src/Applet/Applet.cpp:79 +#: ../src/Applet/Applet.cpp:78 #, c-format msgid "A crash in package %s has been detected" msgstr "Paketissa %s on huomattu kaatuminen" -#: ../src/Applet/Applet.cpp:254 +#: ../src/Applet/Applet.cpp:253 msgid "ABRT service is not running" msgstr "ABRT-palvelu ei ole käytössä" -#: ../src/Applet/CCApplet.cpp:196 +#: ../src/Applet/CCApplet.cpp:200 msgid "Warning" msgstr "Varoitus" -#: ../src/Daemon/Daemon.cpp:478 +#: ../src/Daemon/Daemon.cpp:473 msgid "" "Report size exceeded the quota. Please check system's MaxCrashReportsSize " "value in abrt.conf." @@ -454,45 +506,61 @@ msgstr "" "Raportin koko ylitti sille annetun rajan. Tarkista järjestelmän " "MaxCrashReportsSize-arvo abrt.conf-tiedostossa." -#: ../lib/Plugins/Bugzilla.cpp:202 +#: ../lib/Plugins/Bugzilla.cpp:124 +msgid "Missing member 'reporter'" +msgstr "Puuttuva osa ”reporter”" + +#: ../lib/Plugins/Bugzilla.cpp:176 +msgid "Missing member 'cc'" +msgstr "Puuttuva osa ”cc”" + +#: ../lib/Plugins/Bugzilla.cpp:262 #, c-format msgid "Bug is already reported: %i" msgstr "Ohjelmavirheestä on jo tehty ilmoitus: %i" -#: ../lib/Plugins/Bugzilla.cpp:264 +#: ../lib/Plugins/Bugzilla.cpp:274 +msgid "Missing member 'bug_id'" +msgstr "Puuttuva osa ”bug_id”" + +#: ../lib/Plugins/Bugzilla.cpp:283 +msgid "Missing member 'bugs'" +msgstr "Puuttuva osa ”bugs”" + +#: ../lib/Plugins/Bugzilla.cpp:346 #, c-format msgid "New bug id: %i" msgstr "Uuden ohjelmavirheilmoituksen tunnus: %i" -#: ../lib/Plugins/Bugzilla.cpp:359 +#: ../lib/Plugins/Bugzilla.cpp:440 msgid "Checking for duplicates..." msgstr "Etsitään samanlaisia..." -#: ../lib/Plugins/Bugzilla.cpp:362 -msgid "Logging into bugzilla..." -msgstr "Kirjaudutaan bugzillaan..." - -#: ../lib/Plugins/Bugzilla.cpp:366 +#: ../lib/Plugins/Bugzilla.cpp:446 msgid "Empty login and password. Please check Bugzilla.conf" msgstr "Käyttäjätunnus ja salasana ovat tyhjiä. Tarkista Bugzilla.conf" -#: ../lib/Plugins/Bugzilla.cpp:372 +#: ../lib/Plugins/Bugzilla.cpp:449 +msgid "Logging into bugzilla..." +msgstr "Kirjaudutaan bugzillaan..." + +#: ../lib/Plugins/Bugzilla.cpp:454 msgid "Checking CC..." msgstr "Tarkistetaan CC..." -#: ../lib/Plugins/Bugzilla.cpp:381 +#: ../lib/Plugins/Bugzilla.cpp:465 msgid "Creating new bug..." msgstr "Luodaan uusi ohjelmavirheilmoitus..." -#: ../lib/Plugins/Bugzilla.cpp:385 +#: ../lib/Plugins/Bugzilla.cpp:469 msgid "Logging out..." msgstr "Kirjaudutaan ulos..." -#: ../lib/Plugins/Kerneloops.cpp:37 +#: ../lib/Plugins/Kerneloops.cpp:35 msgid "Getting local universal unique identification" msgstr "Haetaan paikallinen ainutkertainen tunnus" -#: ../lib/Plugins/CCpp.cpp:257 +#: ../lib/Plugins/CCpp.cpp:253 msgid "Generating backtrace" msgstr "Luodaan pinolistausta" @@ -500,19 +568,19 @@ msgstr "Luodaan pinolistausta" msgid "Starting debuginfo installation" msgstr "Aloitetaan debuginfon asennus" -#: ../lib/Plugins/CCpp.cpp:525 +#: ../lib/Plugins/CCpp.cpp:524 msgid "Getting local universal unique identification..." msgstr "Haetaan paikallinen ainutkertainen tunnus..." -#: ../lib/Plugins/CCpp.cpp:544 +#: ../lib/Plugins/CCpp.cpp:543 msgid "Getting global universal unique identification..." msgstr "Haetaan yleinen ainutkertainen tunnus..." -#: ../lib/Plugins/CCpp.cpp:687 +#: ../lib/Plugins/CCpp.cpp:721 msgid "Skipping debuginfo installation" msgstr "Ohitetaan debuginfon asennus" -#: ../lib/Plugins/KerneloopsReporter.cpp:102 +#: ../lib/Plugins/KerneloopsReporter.cpp:100 msgid "Creating and submitting a report..." msgstr "Luodaan ja lähetetään ilmoitus..." @@ -521,52 +589,66 @@ msgstr "Luodaan ja lähetetään ilmoitus..." msgid "Writing report to '%s'" msgstr "Kirjoitetaan raportti kohteeseen ”%s”" -#: ../lib/Plugins/FileTransfer.cpp:63 ../lib/Plugins/FileTransfer.cpp:381 +#: ../lib/Plugins/FileTransfer.cpp:54 msgid "FileTransfer: URL not specified" msgstr "FileTransfer: URL:ää ei ole määritelty" -#: ../lib/Plugins/FileTransfer.cpp:67 +#: ../lib/Plugins/FileTransfer.cpp:58 #, c-format msgid "Sending archive %s to %s" msgstr "Lähetetään arkisto %s osoitteeseen %s" -#: ../lib/Plugins/FileTransfer.cpp:306 +#: ../lib/Plugins/FileTransfer.cpp:289 msgid "File Transfer: Creating a report..." msgstr "Tiedostonsiirto: Luodaan ilmoitusta..." -#: ../lib/Plugins/FileTransfer.cpp:331 +#: ../lib/Plugins/FileTransfer.cpp:323 #, c-format msgid "Can't create and send an archive: %s" msgstr "Ei voitu luoda ja lähettää arkistoa: %s" -#: ../lib/Plugins/FileTransfer.cpp:356 +#: ../lib/Plugins/FileTransfer.cpp:352 #, c-format msgid "Can't create and send an archive %s" msgstr "Ei voitu luoda ja lähettää arkistoa %s" -#: ../lib/Plugins/KerneloopsScanner.cpp:84 +#: ../lib/Plugins/KerneloopsScanner.cpp:79 msgid "Creating kernel oops crash reports..." msgstr "Luodaan kernel oops -kaatumisilmoituksia..." -#: ../lib/Plugins/Mailx.cpp:164 +#: ../lib/Plugins/Mailx.cpp:137 msgid "Sending an email..." msgstr "Lähetetään sähköpostia..." -#: ../lib/Plugins/SOSreport.cpp:69 -msgid "Executing SOSreport plugin..." -msgstr "Suoritetaan SOSreport-liitännäinen..." - -#: ../lib/Plugins/SOSreport.cpp:91 +#: ../lib/Plugins/SOSreport.cpp:103 #, c-format -msgid "running sosreport: %s" -msgstr "suoritetaan sosreport: %s" +msgid "Running sosreport: %s" +msgstr "Suoritetaan sosreport: %s" + +#: ../lib/Plugins/SOSreport.cpp:109 +msgid "Done running sosreport" +msgstr "Sosreportin suoritus valmistui" + +#~ msgid "Plugin name is not set, can't load its settings" +#~ msgstr "Liitännäisen nimeä ei ole asetettu, sen asetuksia ei voida ladata" + +#~ msgid "" +#~ "<b>WARNING</b>, you're about to send data which might contain sensitive " +#~ "information.\n" +#~ "Do you really want to send <b>%s</b>?\n" +#~ msgstr "" +#~ "<b>VAROITUS</b>, olet lähettämässä dataa, joka saattaa sisältää joitakin " +#~ "yksityisiä tietoja!\n" +#~ "Haluatko todella lähettää <b>%s</b>?\n" + +#~ msgid "<b>Following items will be sent</b>" +#~ msgstr "<b>Seuraavat kohdat lähetetään</b>" -#: ../lib/Plugins/SOSreport.cpp:95 -msgid "done running sosreport" -msgstr "sosreportin suoritus valmistui" +#~ msgid "Send" +#~ msgstr "Lähetä" -#~ msgid "<span color=\"white\">Description</span>" -#~ msgstr "<span color=\"white\">Kuvaus</span>" +#~ msgid "Executing SOSreport plugin..." +#~ msgstr "Suoritetaan SOSreport-liitännäinen..." #~ msgid "Working..." #~ msgstr "Työskentelee..." @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ABRT\n" "Report-Msgid-Bugs-To: jmoskovc@redhat.com\n" -"POT-Creation-Date: 2010-01-28 09:57+0000\n" +"POT-Creation-Date: 2010-01-29 10:00+0000\n" "PO-Revision-Date: \n" "Last-Translator: Elad <el.il@doom.co.il>\n" "Language-Team: Hebrew <fedora-he-list@redhat.com>\n" @@ -484,50 +484,53 @@ msgstr "אזהרה" msgid "Report size exceeded the quota. Please check system's MaxCrashReportsSize value in abrt.conf." msgstr "גודל הדיווח חרג מהמכסה. אנא בדוק את ערך ההגדרה MaxCrashReportsSize בקובץ abrt.conf" -#: ../lib/Plugins/Bugzilla.cpp:132 -#: ../lib/Plugins/Bugzilla.cpp:300 -msgid "Missing member 'bugs'" -msgstr "חסר שדה 'bugs'" +#: ../lib/Plugins/Bugzilla.cpp:124 +msgid "Missing member 'reporter'" +msgstr "חסר שדה 'reporter'" -#: ../lib/Plugins/Bugzilla.cpp:184 +#: ../lib/Plugins/Bugzilla.cpp:176 msgid "Missing member 'cc'" msgstr "חסר שדה 'cc'" -#: ../lib/Plugins/Bugzilla.cpp:279 +#: ../lib/Plugins/Bugzilla.cpp:262 #, c-format msgid "Bug is already reported: %i" msgstr "הבאג דווח בעבר: %i" -#: ../lib/Plugins/Bugzilla.cpp:291 +#: ../lib/Plugins/Bugzilla.cpp:274 msgid "Missing member 'bug_id'" msgstr "חסר שדה 'bug_id'" -#: ../lib/Plugins/Bugzilla.cpp:367 +#: ../lib/Plugins/Bugzilla.cpp:283 +msgid "Missing member 'bugs'" +msgstr "חסר שדה 'bugs'" + +#: ../lib/Plugins/Bugzilla.cpp:346 #, c-format msgid "New bug id: %i" msgstr "מזהה באג חדש: %i" -#: ../lib/Plugins/Bugzilla.cpp:469 +#: ../lib/Plugins/Bugzilla.cpp:440 msgid "Checking for duplicates..." msgstr "מחפש כפילויות..." -#: ../lib/Plugins/Bugzilla.cpp:475 +#: ../lib/Plugins/Bugzilla.cpp:446 msgid "Empty login and password. Please check Bugzilla.conf" msgstr "שם משתמש וסיסמה ריקים. אנא בדוק את הקובץ bugzilla.conf" -#: ../lib/Plugins/Bugzilla.cpp:478 +#: ../lib/Plugins/Bugzilla.cpp:449 msgid "Logging into bugzilla..." msgstr "מתחבר לבאגזילה..." -#: ../lib/Plugins/Bugzilla.cpp:483 +#: ../lib/Plugins/Bugzilla.cpp:454 msgid "Checking CC..." msgstr "בודק שדה CC..." -#: ../lib/Plugins/Bugzilla.cpp:494 +#: ../lib/Plugins/Bugzilla.cpp:465 msgid "Creating new bug..." msgstr "יוצר באג חדש..." -#: ../lib/Plugins/Bugzilla.cpp:498 +#: ../lib/Plugins/Bugzilla.cpp:469 msgid "Logging out..." msgstr "מתנתק..." @@ -595,12 +598,12 @@ msgstr "יוצר דיווחי קריסה של kernel oops..." msgid "Sending an email..." msgstr "שולח דוא\"ל" -#: ../lib/Plugins/SOSreport.cpp:102 +#: ../lib/Plugins/SOSreport.cpp:103 #, c-format msgid "Running sosreport: %s" msgstr "מריץ sosreport: %s" -#: ../lib/Plugins/SOSreport.cpp:108 +#: ../lib/Plugins/SOSreport.cpp:109 msgid "Done running sosreport" msgstr "הרצת sosreport הסתיימה" diff --git a/src/Gui/ABRTPlugin.py b/src/Gui/ABRTPlugin.py index 320c81c..f32a593 100644 --- a/src/Gui/ABRTPlugin.py +++ b/src/Gui/ABRTPlugin.py @@ -39,7 +39,15 @@ class PluginSettings(dict): self[str(key)] = str(daemon_settings[key]) if self.client_side_conf: - settings = self.client_side_conf.load(name) + # FIXME: this fails when gk-authoriaztion fails + # we need to show a dialog to user and let him know + # for now just silently ignore it to avoid rhbz#559342 + settings = {} + try: + settings = self.client_side_conf.load(name) + except Exception, e: + print e + pass # overwrite daemon data with user setting for key in settings.keys(): # only rewrite keys which exist in plugin's keys. diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py index b5f57d7..8e90ef9 100644 --- a/src/Gui/CCReporterDialog.py +++ b/src/Gui/CCReporterDialog.py @@ -96,7 +96,7 @@ class ReporterDialog(): # if an backtrace has rating use it if not SendBacktrace: send = False - error_msgs.append(_("You must agree with submitting the backtrace.")) + error_msgs.append(_("You must check backtrace for sensitive data")) # we have both SendBacktrace and rating if rating: try: diff --git a/src/Gui/CC_gui_functions.py b/src/Gui/CC_gui_functions.py index 708a151..1a23db1 100644 --- a/src/Gui/CC_gui_functions.py +++ b/src/Gui/CC_gui_functions.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- import gtk +import pango import subprocess import sys # url markup is supported from gtk 2.17 so we need to use libsexy @@ -34,7 +35,7 @@ def gui_report_dialog ( report_status_dict, parent_dialog, builderfile = "%s%sdialogs.glade" % (sys.path[0],"/") builder.add_from_file(builderfile) dialog = builder.get_object("ReportDialog") - dialog.set_default_size(200, 50) + dialog.set_default_size(360, 50) dialog.set_resizable(False) main_hbox = builder.get_object("main_hbox") @@ -50,11 +51,13 @@ def gui_report_dialog ( report_status_dict, parent_dialog, plugin_label.set_alignment(0, 0) status_label = gtk.Label() status_label.set_max_width_chars(MAX_WIDTH) + status_label.set_size_request(360,-1) status_label.set_selectable(True) status_label.set_line_wrap(True) + status_label.set_line_wrap_mode(pango.WRAP_CHAR) status_label.set_alignment(0, 0) plugin_status_vbox.pack_start(plugin_label, expand=False) - plugin_status_vbox.pack_start(status_label, expand=False) + plugin_status_vbox.pack_start(status_label, fill=True, expand=True) # 0 means not succesfull #if report_status_dict[plugin][0] == '0': # this first one is actually a fallback to set at least @@ -72,8 +75,9 @@ def gui_report_dialog ( report_status_dict, parent_dialog, else: status_label.set_text("%s" % report_status_dict[plugin][1]) if len(report_status_dict[plugin][1]) > MAX_WIDTH: + print "setting tooltip for %s" % report_status_dict[plugin][1] status_label.set_tooltip_text(report_status_dict[plugin][1]) - status_vbox.pack_start(plugin_status_vbox, expand=False) + status_vbox.pack_start(plugin_status_vbox, fill=True, expand=False) main_hbox.pack_start(status_vbox) if widget != None: diff --git a/src/Gui/ConfBackend.py b/src/Gui/ConfBackend.py index 0d47760..741f200 100644 --- a/src/Gui/ConfBackend.py +++ b/src/Gui/ConfBackend.py @@ -26,6 +26,14 @@ class ConfBackendSaveError(Exception): def __str__(self): return self.what +class ConfBackendLoadError(Exception): + def __init__(self, msg): + Exception.__init__(self) + self.what = msg + + def __str__(self): + return self.what + class ConfBackend(object): def __init__(self): @@ -111,26 +119,41 @@ class ConfBackendGnomeKeyring(ConfBackend): def load(self, name): item_list = None - try: - log2("looking for keyring items with 'AbrtPluginInfo:%s' attr", str(name)) - item_list = gkey.find_items_sync(gkey.ITEM_GENERIC_SECRET, {"AbrtPluginInfo":str(name)}) - for item in item_list: - # gnome keyring is weeeeird. why display_name, type, mtime, ctime - # aren't available in find_items_sync() results? why we need to - # get them via additional call, item_get_info_sync()? - # internally, item has GNOME_KEYRING_TYPE_FOUND type, - # and info has GNOME_KEYRING_TYPE_ITEM_INFO type. - # why not use the same type for both? - # - # and worst of all, this information took four hours of googling... - # - #info = gkey.item_get_info_sync(item.keyring, item.item_id) - log2("found keyring item: ring:'%s' item_id:%s attrs:%s", # "secret:'%s' display_name:'%s'" - item.keyring, item.item_id, str(item.attributes) #, item.secret, info.get_display_name() - ) - except gkey.NoMatchError: - # nothing found - pass + #FIXME: make this configurable + # this actually makes GUI to ask twice per every plugin + # which have it's settings stored in keyring + attempts = 2 + while attempts: + try: + log2("looking for keyring items with 'AbrtPluginInfo:%s' attr", str(name)) + item_list = gkey.find_items_sync(gkey.ITEM_GENERIC_SECRET, {"AbrtPluginInfo":str(name)}) + for item in item_list: + # gnome keyring is weeeeird. why display_name, type, mtime, ctime + # aren't available in find_items_sync() results? why we need to + # get them via additional call, item_get_info_sync()? + # internally, item has GNOME_KEYRING_TYPE_FOUND type, + # and info has GNOME_KEYRING_TYPE_ITEM_INFO type. + # why not use the same type for both? + # + # and worst of all, this information took four hours of googling... + # + #info = gkey.item_get_info_sync(item.keyring, item.item_id) + log2("found keyring item: ring:'%s' item_id:%s attrs:%s", # "secret:'%s' display_name:'%s'" + item.keyring, item.item_id, str(item.attributes) #, item.secret, info.get_display_name() + ) + except gkey.NoMatchError: + # nothing found + pass + except gkey.DeniedError, e: + attempts -= 1 + log2("gk-authorization has failed %i time(s)", 2-attempts) + if attempts == 0: + # we tried 2 times, so giving up the authorization + print "raising exception" + raise ConfBackendLoadError(_("Access to gnome-keyring has been denied, can't load the settings for %s!" % name)) + continue + break + if item_list: retval = item_list[0].attributes.copy() retval["Password"] = item_list[0].secret diff --git a/src/Gui/report.glade b/src/Gui/report.glade index 9927c18..13e4c14 100644 --- a/src/Gui/report.glade +++ b/src/Gui/report.glade @@ -96,6 +96,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="selectable">True</property> <property name="max_width_chars">40</property> </object> <packing> @@ -108,6 +109,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="selectable">True</property> <property name="max_width_chars">40</property> </object> <packing> @@ -120,6 +122,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="selectable">True</property> <property name="max_width_chars">40</property> </object> <packing> @@ -132,6 +135,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="selectable">True</property> <property name="max_width_chars">40</property> </object> <packing> @@ -209,6 +213,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="selectable">True</property> <property name="max_width_chars">40</property> </object> <packing> @@ -221,6 +226,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="selectable">True</property> <property name="max_width_chars">40</property> </object> <packing> @@ -233,6 +239,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="selectable">True</property> <property name="max_width_chars">40</property> </object> <packing> @@ -245,6 +252,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="selectable">True</property> <property name="max_width_chars">40</property> </object> <packing> @@ -304,7 +312,7 @@ </child> <child> <object class="GtkCheckButton" id="cbSendBacktrace"> - <property name="label" translatable="yes">I agree to submit this backtrace, which could contain sensitive data</property> + <property name="label" translatable="yes">I checked backtrace and removed sensitive data (passwords, etc)</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> |
