diff options
33 files changed, 1042 insertions, 1015 deletions
@@ -4,7 +4,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 0.0.9 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ @@ -52,7 +52,8 @@ Development libraries and headers for %{name}. Summary: %{name}'s gui Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} -Requires: dbus-python, pygtk2, pygtk2-libglade,gnome-python2-gnomevfs +Requires: dbus-python, pygtk2, pygtk2-libglade, +Requires: gnome-python2-gnomevfs, gnome-python2-gnomekeyring # only if gtk2 version < 2.17 #Requires: python-sexy Provides: abrt-applet = %{version}-%{release} @@ -92,10 +92,10 @@ The key dbus calls served by abrt-process are: Returns job id (uint64). After it returns, when report creation thread has finished, JobDone(client_dbus_ID,UUID) dbus signal is emitted. -[Problem: how to do privilegged plugin specific actions?] + [Problem: how to do privilegged plugin specific actions?] Solution: if plugin needs an access to some root only accessible dir then abrt should be run by root anyway - - debuginfo gets installed using pkg-debug-install, which cares about + - debuginfo gets installed using pk-debuginfo-install, which cares about privileges itself, so no problem here - GetJobResult(UUID): returns map_crash_report_t (map_vector_string_t) - Report(map_crash_report_t (map_vector_string_t)): @@ -106,10 +106,11 @@ The key dbus calls served by abrt-process are: Development plan -Since current code does not match the palnned design, we need to gradually +Since current code does not match the planned design, we need to gradually change the code to "morph" it into the desired shape. Planned steps: -* make kerneloops plugin into separate daemon (convert it to a hook and get rid of "cron plugins" which are wrong idea since the begining) +* make kerneloops plugin into separate daemon (convert it to a hook + and get rid of "cron plugins" which are wrong idea since the begining) * Make abrtd dbus startable * Make abrt-gui start abrtd on demand, so that abrt-gui can be started even if abrtd does not run at the moment. diff --git a/lib/Plugins/Bugzilla.GTKBuilder b/lib/Plugins/Bugzilla.GTKBuilder index 2c2d63c..998dc73 100644 --- a/lib/Plugins/Bugzilla.GTKBuilder +++ b/lib/Plugins/Bugzilla.GTKBuilder @@ -4,6 +4,8 @@ <!-- interface-naming-policy project-wide --> <object class="GtkDialog" id="PluginDialog"> <property name="border_width">5</property> + <property name="modal">True</property> + <property name="window_position">center-on-parent</property> <property name="type_hint">normal</property> <property name="has_separator">False</property> <child internal-child="vbox"> @@ -27,7 +29,7 @@ <child> <object class="GtkTable" id="table1"> <property name="visible">True</property> - <property name="n_rows">3</property> + <property name="n_rows">4</property> <property name="n_columns">2</property> <child> <object class="GtkLabel" id="lBugzillaURL"> @@ -93,6 +95,24 @@ <property name="bottom_attach">3</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="cb_Password"> + <property name="label" translatable="yes">Show password</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">1</property> diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp index a3c70f0..48c5eb5 100644 --- a/lib/Plugins/Bugzilla.cpp +++ b/lib/Plugins/Bugzilla.cpp @@ -147,28 +147,6 @@ bool CReporterBugzilla::CheckCCAndReporter(const std::string& pBugId) return false; } -void CReporterBugzilla::AddPlusOneComment(const std::string& pBugId) -{ - xmlrpc_c::paramList paramList; - map_xmlrpc_params_t addCommentParams; - map_xmlrpc_params_t ret; - - addCommentParams["id"] = xmlrpc_c::value_int(atoi(pBugId.c_str())); - addCommentParams["comment"] = xmlrpc_c::value_string("+1"); - - paramList.add(xmlrpc_c::value_struct(addCommentParams)); - xmlrpc_c::rpcPtr rpc(new xmlrpc_c::rpc("Bug.add_comment", paramList)); - try - { - rpc->call(m_pXmlrpcClient, m_pCarriageParm); - } - catch (std::exception& e) - { - throw CABRTException(EXCEP_PLUGIN, std::string("CReporterBugzilla::AddPlusOneComment(): ") + e.what()); - } - ret = xmlrpc_c::value_struct(rpc->getResult()); -} - void CReporterBugzilla::AddPlusOneCC(const std::string& pBugId) { xmlrpc_c::paramList paramList; @@ -424,10 +402,9 @@ std::string CReporterBugzilla::Report(const map_crash_report_t& pCrashReport, co update_client(_("Logging into bugzilla...")); Login(); m_bLoggedIn = true; - update_client(_("Check CC and add coment +1...")); + update_client(_("Checking CC...")); if (!CheckCCAndReporter(bugId) && m_bLoggedIn) { - AddPlusOneComment(bugId); AddPlusOneCC(bugId); } DeleteXMLRPCClient(); diff --git a/lib/Plugins/Bugzilla.h b/lib/Plugins/Bugzilla.h index c5098b3..f6a8976 100644 --- a/lib/Plugins/Bugzilla.h +++ b/lib/Plugins/Bugzilla.h @@ -18,7 +18,6 @@ class CReporterBugzilla : public CReporter void Login(); void Logout(); bool CheckCCAndReporter(const std::string& pBugId); - void AddPlusOneComment(const std::string& pBugId); void AddPlusOneCC(const std::string& pBugId); std::string CheckUUIDInBugzilla(const std::string& pComponent, const std::string& pUUID); std::string NewBug(const map_crash_report_t& pCrashReport); diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp index c054c78..6b4ed04 100644 --- a/lib/Plugins/CCpp.cpp +++ b/lib/Plugins/CCpp.cpp @@ -107,6 +107,11 @@ static pid_t ExecVP(char** pArgs, uid_t uid, std::string& pOutput) } if (child == 0) { + VERB1 log("Executing: %s %s %s %s", pArgs[0] + ,pArgs[1] ? pArgs[1] : "" + ,pArgs[1] && pArgs[2] ? pArgs[2] : "" + ,pArgs[1] && pArgs[2] && pArgs[3] ? pArgs[3] : "" + ); close(pipeout[0]); /* read side of the pipe */ xmove_fd(pipeout[1], STDOUT_FILENO); /* Make sure stdin is safely open to nothing */ @@ -123,7 +128,9 @@ static pid_t ExecVP(char** pArgs, uid_t uid, std::string& pOutput) setsid(); execvp(pArgs[0], pArgs); - exit(0); + /* VERB1 since sometimes we expect errors here */ + VERB1 perror_msg("Can't execute '%s'", pArgs[0]); + exit(1); } close(pipeout[1]); /* write side of the pipe */ @@ -357,6 +364,7 @@ static void InstallDebugInfos(const std::string& pDebugDumpDir) log("Builting list of missing debuginfos"); // lines look like this: + // 0x400000+0x209000 23c77451cf6adff77fc1f5ee2a01d75de6511dda@0x40024c - - [exe] // 0x400000+0x209000 ab3c8286aac6c043fd1bb1cc2a0b88ec29517d3e@0x40024c /bin/sleep /usr/lib/debug/bin/sleep.debug [exe] // 0x7fff313ff000+0x1000 389c7475e3d5401c55953a425a2042ef62c4c7df@0x7fff313ff2f8 . - linux-vdso.so.1 vector_string_t missing; @@ -374,8 +382,10 @@ static void InstallDebugInfos(const std::string& pDebugDumpDir) char* endsp = strchr(word2, ' '); if (!endsp) continue; + /* endsp points to 2nd space in the line now*/ + /* This filters out linux-vdso.so, among others */ - if (endsp[1] != '/') + if (strstr(endsp, "[exe]") == NULL && endsp[1] != '/') continue; *endsp = '\0'; char* at = strchrnul(word2, '@'); @@ -435,8 +445,34 @@ static void InstallDebugInfos(const std::string& pDebugDumpDir) /*close(STDERR_FILENO);*/ setsid(); +/* Honestly, I do not know what is worse, pk-debuginfo-install or debuginfo-install: + +# pk-debuginfo-install -y -- coreutils-7.2-4.fc11 +1. Getting sources list...OK. Found 16 enabled and 23 disabled sources. +2. Finding debugging sources...OK. Found 0 disabled debuginfo repos. +3. Enabling debugging sources...OK. Enabled 0 debugging sources. +4. Finding debugging packages...Failed to find the package : more than one package found for +Failed to find the package : more than one package found for +FAILED. Found no packages to install. +5. Disabling sources previously enabled...OK. Disabled 0 debugging sources. + +:( FAIL! + +# debuginfo-install -y -- coreutils-7.2-4.fc11 +Loaded plugins: refresh-packagekit +Another application is holding the yum lock, cannot continue + +:( FAIL! + +# debuginfo-install -y -- coreutils-7.2-4.fc11 +(second time in a row - it worked) + +*/ + /* log() goes to stderr/syslog, it's ok to use it here */ + VERB1 log("Executing: %s %s %s %s", "pk-debuginfo-install", "-y", "--", package.c_str()); execlp("pk-debuginfo-install", "pk-debuginfo-install", "-y", "--", package.c_str(), NULL); /* fall back */ + VERB1 log("Executing: %s %s %s %s", "debuginfo-install", "-y", "--", package.c_str()); execlp("debuginfo-install", "debuginfo-install", "-y", "--", package.c_str(), NULL); exit(1); } @@ -578,7 +614,7 @@ static bool DebuginfoCheckPolkit(int uid) } -void CAnalyzerCCpp::CreateReport(const std::string& pDebugDumpDir) +void CAnalyzerCCpp::CreateReport(const std::string& pDebugDumpDir, int force) { update_client(_("Starting report creation...")); @@ -588,18 +624,19 @@ void CAnalyzerCCpp::CreateReport(const std::string& pDebugDumpDir) CDebugDump dd; dd.Open(pDebugDumpDir); - bool bt_exists = dd.Exist(FILENAME_BACKTRACE); - if (bt_exists) + if (!force) { - dd.Close(); /* do not keep dir locked longer than needed */ - return; /* already done */ + bool bt_exists = dd.Exist(FILENAME_BACKTRACE); + if (bt_exists) + { + return; /* backtrace already exists */ + } } dd.LoadText(FILENAME_PACKAGE, package); dd.LoadText(FILENAME_UID, UID); - dd.Close(); - + dd.Close(); /* do not keep dir locked longer than needed */ map_plugin_settings_t settings = GetSettings(); if (settings["InstallDebuginfo"] == "yes" && @@ -609,7 +646,7 @@ void CAnalyzerCCpp::CreateReport(const std::string& pDebugDumpDir) } else { - warn_client(_("Skipping debuginfo installation")); + VERB1 log(_("Skipping debuginfo installation")); } GetBacktrace(pDebugDumpDir, backtrace); diff --git a/lib/Plugins/CCpp.h b/lib/Plugins/CCpp.h index 92b6bab..3fbe0b9 100644 --- a/lib/Plugins/CCpp.h +++ b/lib/Plugins/CCpp.h @@ -38,7 +38,7 @@ class CAnalyzerCCpp : public CAnalyzer CAnalyzerCCpp(); virtual std::string GetLocalUUID(const std::string& pDebugDumpDir); virtual std::string GetGlobalUUID(const std::string& pDebugDumpDir); - virtual void CreateReport(const std::string& pDebugDumpDir); + virtual void CreateReport(const std::string& pDebugDumpDir, int force); virtual void Init(); virtual void DeInit(); virtual void SetSettings(const map_plugin_settings_t& pSettings); diff --git a/lib/Plugins/FileTransfer.cpp b/lib/Plugins/FileTransfer.cpp index 287eb39..3492156 100644 --- a/lib/Plugins/FileTransfer.cpp +++ b/lib/Plugins/FileTransfer.cpp @@ -197,7 +197,7 @@ static void create_tar(const char * archive_name, const char * directory) { return; } - tar_append_tree(tar, (char *)directory, "."); + tar_append_tree(tar, (char *)directory, (char*)"."); tar_close(tar); } diff --git a/lib/Plugins/Kerneloops.h b/lib/Plugins/Kerneloops.h index 1be58fc..13fb009 100644 --- a/lib/Plugins/Kerneloops.h +++ b/lib/Plugins/Kerneloops.h @@ -39,7 +39,7 @@ class CAnalyzerKerneloops : public CAnalyzer public: virtual std::string GetLocalUUID(const std::string& pDebugDumpDir); virtual std::string GetGlobalUUID(const std::string& pDebugDumpDir); - virtual void CreateReport(const std::string& pDebugDumpDir) {} + virtual void CreateReport(const std::string& pDebugDumpDir, int force) {} }; #endif diff --git a/lib/Plugins/Python.h b/lib/Plugins/Python.h index 57eefbf..b54de8d 100644 --- a/lib/Plugins/Python.h +++ b/lib/Plugins/Python.h @@ -10,7 +10,7 @@ class CAnalyzerPython : public CAnalyzer public: virtual std::string GetLocalUUID(const std::string& pDebugDumpDir); virtual std::string GetGlobalUUID(const std::string& pDebugDumpDir); - virtual void CreateReport(const std::string& pDebugDumpDir) {} + virtual void CreateReport(const std::string& pDebugDumpDir, int force) {} virtual void Init(); virtual void DeInit(); virtual std::string CreateHash(const std::string& pInput); diff --git a/lib/Utils/Analyzer.h b/lib/Utils/Analyzer.h index 4fe586b..e5bda57 100644 --- a/lib/Utils/Analyzer.h +++ b/lib/Utils/Analyzer.h @@ -50,7 +50,7 @@ class CAnalyzer : public CPlugin * somewhere afterwards. * @param pDebugDumpPath A debugdump dir containing all necessary data. */ - virtual void CreateReport(const std::string& pDebugDumpPath) = 0; + virtual void CreateReport(const std::string& pDebugDumpPath, int force) = 0; }; #endif /*ANALYZER_H_*/ diff --git a/po/bn_IN.po b/po/bn_IN.po index bed6760..bd9275e 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -1,14 +1,14 @@ -# translation of abrt.master.bn_IN.po to Bengali INDIA +# translation of abrt.master.po to Bengali INDIA # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Runa Bhattacharjee <runab@redhat.com>, 2009. msgid "" msgstr "" -"Project-Id-Version: abrt.master.bn_IN\n" +"Project-Id-Version: abrt.master\n" "Report-Msgid-Bugs-To: jmoskovc@redhat.com\n" -"POT-Creation-Date: 2009-10-06 04:15+0000\n" -"PO-Revision-Date: 2009-10-06 14:43+0530\n" +"POT-Creation-Date: 2009-10-09 09:55+0000\n" +"PO-Revision-Date: 2009-10-09 17:58+0530\n" "Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n" "Language-Team: Bengali INDIA <anubad@lists.ankur.org.in>\n" "MIME-Version: 1.0\n" @@ -25,35 +25,35 @@ msgstr "একটি ভিন্ন ক্লায়েন্ট বর্তম msgid "Got unexpected data from daemon (is the database properly updated?)." msgstr "ডেমন থেকে অপ্রত্যাশিত তথ্য পাওয়া গিয়েছে (ডাটাবেস কি সঠিকভাবে আপডেট করা হয়েছে?)।" -#: ../src/Gui/ABRTPlugin.py:45 +#: ../src/Gui/ABRTPlugin.py:48 msgid "Analyzer plugins" msgstr "বিশ্লেষণের প্লাগ-ইন" -#: ../src/Gui/ABRTPlugin.py:46 +#: ../src/Gui/ABRTPlugin.py:49 msgid "Action plugins" msgstr "কাজের প্লাগ-ইন" -#: ../src/Gui/ABRTPlugin.py:47 +#: ../src/Gui/ABRTPlugin.py:50 msgid "Reporter plugins" msgstr "রিপোর্টার প্লাগ-ইন" -#: ../src/Gui/ABRTPlugin.py:48 +#: ../src/Gui/ABRTPlugin.py:51 msgid "Database plugins" msgstr "ডাটাবেস প্লাগ-ইন" -#: ../src/Gui/ABRTPlugin.py:87 +#: ../src/Gui/ABRTPlugin.py:90 msgid "Plugin name is not set, can't load it's settings" msgstr "প্লাগ-ইনের নাম নির্ধারণ করা হয়নি, এটির বৈশিষ্ট্য লোড করা সম্ভব নয়" -#: ../src/Gui/CCDBusBackend.py:138 -msgid "Can't connect to dbus" -msgstr "dbus-র সাথে সংযোগ স্থাপন করতে ব্যর্থ" +#: ../src/Gui/CCDBusBackend.py:74 ../src/Gui/CCDBusBackend.py:97 +msgid "Can't connect to system dbus" +msgstr "সিস্টেম dbus-র সাথে সংযোগ স্থাপন করতে ব্যর্থ" -#: ../src/Gui/CCDBusBackend.py:148 -msgid "Please check if abrt daemon is running." -msgstr "abrt ডেমন চলছে কি না তা অনুগ্রহ করে পরীক্ষা করুন।" +#: ../src/Gui/CCDBusBackend.py:100 ../src/Gui/CCDBusBackend.py:103 +msgid "Please check if abrt daemon is running" +msgstr "abrt ডেমন চলছে কি না তা অনুগ্রহ করে পরীক্ষা করুন" -#: ../src/Gui/CCDBusBackend.py:158 +#: ../src/Gui/CCDBusBackend.py:155 msgid "" "Daemon did't return valid report info\n" "Debuginfo is missing?" @@ -205,7 +205,7 @@ msgstr "" "রিপোর্ট প্রাপ্ত করতে ব্যর্থ!\n" "Debuginfo কি অনুপস্থিত?" -#: ../src/Gui/CCMainWindow.py:307 +#: ../src/Gui/CCMainWindow.py:308 #, python-format msgid "" "Reporting failed!\n" @@ -214,7 +214,7 @@ msgstr "" "রিপোর্ট করতে ব্যর্থ!\n" "%s" -#: ../src/Gui/CCMainWindow.py:339 +#: ../src/Gui/CCMainWindow.py:340 #, python-format msgid "Error getting the report: %s" msgstr "রিপোর্ট প্রাপ্ত করতে ব্যর্থ: %s" @@ -251,11 +251,11 @@ msgstr "ইউজার ইন্টারফেসের বিবরণের msgid "No UI for plugin %s" msgstr "%s প্লাগ-ইনের কোনো UI উপস্থিত নেই" -#: ../src/Gui/PluginSettingsUI.py:41 ../src/Gui/PluginSettingsUI.py:67 +#: ../src/Gui/PluginSettingsUI.py:55 ../src/Gui/PluginSettingsUI.py:81 msgid "combo box is not implemented" msgstr "কম্বো-বক্স বাস্তবায়িত হয়নি" -#: ../src/Gui/PluginSettingsUI.py:50 +#: ../src/Gui/PluginSettingsUI.py:64 msgid "Nothing to hydrate!" msgstr "প্রদর্শনযোগ্য কোনো বস্তু উপস্থিত নেই!" @@ -279,11 +279,11 @@ msgstr "<b>প্লাগ-ইন নির্বাচন করুন</b>" msgid "<b>Select database backend</b>" msgstr "<b>ডাটাবেস ব্যাক-এন্ড নির্বাচন করুন</b>" -#: ../src/Gui/SettingsDialog.py:165 +#: ../src/Gui/SettingsDialog.py:168 msgid "Remove this job" msgstr "এই কাজটি সরিয়ে ফেলুন" -#: ../src/Gui/SettingsDialog.py:208 +#: ../src/Gui/SettingsDialog.py:211 msgid "Remove this action" msgstr "এই কর্মটি সরিয়ে ফেলুন" @@ -412,42 +412,44 @@ msgstr "সতর্কবার্তা" msgid "" "Report size exceeded the quota. Please check system's MaxCrashReportsSize " "value in abrt.conf." -msgstr "রিপোর্টের মাপ অনুমোদিত মাপের থেকে বড়। অনুগ্রহ করে abrt.conf ফাইলের মধ্যে MaxCrashReportsSize-র মাপ যাচাই করুন।" +msgstr "" +"রিপোর্টের মাপ অনুমোদিত মাপের থেকে বড়। অনুগ্রহ করে abrt.conf ফাইলের মধ্যে " +"MaxCrashReportsSize-র মাপ যাচাই করুন।" #: ../lib/Plugins/Bugzilla.cpp:83 msgid "Empty login and password. Please check Bugzilla.conf" msgstr "লগ-ইন ও পাসওয়ার্ড লেখা হয়নি। অনুগ্রহ করে Bugzilla.conf পরীক্ষা করুন" -#: ../lib/Plugins/Bugzilla.cpp:227 +#: ../lib/Plugins/Bugzilla.cpp:205 msgid "Bug is already reported: " msgstr "বাগ পূর্বেই দায়ের করা হয়েছে: " -#: ../lib/Plugins/Bugzilla.cpp:282 +#: ../lib/Plugins/Bugzilla.cpp:260 #, c-format msgid "Binary file %s will not be reported." msgstr "%s বাইনারি ফাইলের রিপোর্ট দায়ের করা হবে না।" -#: ../lib/Plugins/Bugzilla.cpp:352 +#: ../lib/Plugins/Bugzilla.cpp:330 msgid "New bug id: " msgstr "নতুন বাগ id: " -#: ../lib/Plugins/Bugzilla.cpp:421 +#: ../lib/Plugins/Bugzilla.cpp:399 msgid "Checking for duplicates..." msgstr "প্রতিলিপি পরীক্ষা করা হচ্ছে..." -#: ../lib/Plugins/Bugzilla.cpp:424 ../lib/Plugins/Bugzilla.cpp:436 +#: ../lib/Plugins/Bugzilla.cpp:402 ../lib/Plugins/Bugzilla.cpp:413 msgid "Logging into bugzilla..." msgstr "bugzilla-তে লগ-ইন করা হচ্ছে..." -#: ../lib/Plugins/Bugzilla.cpp:427 -msgid "Check CC and add coment +1..." -msgstr "প্রতিলিপি প্রাপ্ত পরীক্ষা করুন ও মন্তব্য রূপে +1 যোগ করুন ..." +#: ../lib/Plugins/Bugzilla.cpp:405 +msgid "Checking CC..." +msgstr "প্রতিলিপি পরীক্ষা করা হচ্ছে..." -#: ../lib/Plugins/Bugzilla.cpp:448 +#: ../lib/Plugins/Bugzilla.cpp:425 msgid "Creating new bug..." msgstr "নতুন বাগ তৈরি করা হচ্ছে..." -#: ../lib/Plugins/Bugzilla.cpp:453 +#: ../lib/Plugins/Bugzilla.cpp:430 msgid "Logging out..." msgstr "লগ-আউট করা হচ্ছে..." @@ -459,27 +461,27 @@ msgstr "স্থানীয় ইউনিভার্সেল ইউনিক msgid "Getting backtrace..." msgstr "ব্যাক-ট্রেস প্রাপ্ত করা হচ্ছে..." -#: ../lib/Plugins/CCpp.cpp:410 +#: ../lib/Plugins/CCpp.cpp:415 msgid "Searching for debug-info packages..." msgstr "debug-info প্যাকেজ অনুসন্ধান করা হচ্ছে..." -#: ../lib/Plugins/CCpp.cpp:446 +#: ../lib/Plugins/CCpp.cpp:451 msgid "Downloading and installing debug-info packages..." msgstr "debug-info প্যাকেজ ডাউনলোড ও ইনস্টল করা হচ্ছে..." -#: ../lib/Plugins/CCpp.cpp:508 +#: ../lib/Plugins/CCpp.cpp:513 msgid "Getting local universal unique identification..." msgstr "স্থানীয় ইউনিভার্সেল ইউনিক আইডেন্টিফিকেশন প্রাপ্ত করা হচ্ছে..." -#: ../lib/Plugins/CCpp.cpp:527 +#: ../lib/Plugins/CCpp.cpp:532 msgid "Getting global universal unique identification..." msgstr "গ্লোবাল ইউনিভার্সেল ইউনিক আইডেন্টিফিকেশন প্রাপ্ত করা হচ্ছে..." -#: ../lib/Plugins/CCpp.cpp:578 +#: ../lib/Plugins/CCpp.cpp:583 msgid "Starting report creation..." msgstr "রিপোর্ট নির্মাণ আরম্ভ করা হচ্ছে..." -#: ../lib/Plugins/CCpp.cpp:607 +#: ../lib/Plugins/CCpp.cpp:612 msgid "Skipping debuginfo installation" msgstr "debuginfo ইনস্টলেশন উপেক্ষা করা হবে" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: abrt.master.es\n" "Report-Msgid-Bugs-To: jmoskovc@redhat.com\n" -"POT-Creation-Date: 2009-10-06 21:25+0000\n" -"PO-Revision-Date: 2009-10-06 18:41-0300\n" +"POT-Creation-Date: 2009-10-09 16:26+0000\n" +"PO-Revision-Date: 2009-10-09 17:30-0300\n" "Last-Translator: Domingo Becker <domingobecker@gmail.com>\n" "Language-Team: Spanish <fedora-trans-es@redhat.com>\n" "MIME-Version: 1.0\n" @@ -45,15 +45,17 @@ msgstr "Complementos de Bases de Datos" msgid "Plugin name is not set, can't load it's settings" msgstr "No se puso el nombre del complemento, no se puede cargar su configuración" -#: ../src/Gui/CCDBusBackend.py:138 -msgid "Can't connect to dbus" -msgstr "No se puede conectar con DBus" +#: ../src/Gui/CCDBusBackend.py:74 +#: ../src/Gui/CCDBusBackend.py:97 +msgid "Can't connect to system dbus" +msgstr "No es posible conectarse con system dbus" -#: ../src/Gui/CCDBusBackend.py:148 -msgid "Please check if abrt daemon is running." -msgstr "Por favor compruebe si el demonio ABRT está corriendo." +#: ../src/Gui/CCDBusBackend.py:100 +#: ../src/Gui/CCDBusBackend.py:103 +msgid "Please check if abrt daemon is running" +msgstr "Por favor compruebe si el demonio ABRT se está ejecutando." -#: ../src/Gui/CCDBusBackend.py:158 +#: ../src/Gui/CCDBusBackend.py:155 msgid "" "Daemon did't return valid report info\n" "Debuginfo is missing?" @@ -240,12 +242,12 @@ msgstr "No se encuentra el control visual de PluginDialog en la descripción de msgid "No UI for plugin %s" msgstr "No hay interfase del usuario para el complemento %s" -#: ../src/Gui/PluginSettingsUI.py:41 -#: ../src/Gui/PluginSettingsUI.py:67 +#: ../src/Gui/PluginSettingsUI.py:55 +#: ../src/Gui/PluginSettingsUI.py:81 msgid "combo box is not implemented" msgstr "el combo box no está implementado" -#: ../src/Gui/PluginSettingsUI.py:50 +#: ../src/Gui/PluginSettingsUI.py:64 msgid "Nothing to hydrate!" msgstr "¡Nada para hidratar!" @@ -401,7 +403,7 @@ msgstr "El servicio ABRT no se está ejecutando" msgid "Warning" msgstr "Aviso" -#: ../src/Daemon/Daemon.cpp:546 +#: ../src/Daemon/Daemon.cpp:542 msgid "Report size exceeded the quota. Please check system's MaxCrashReportsSize value in abrt.conf." msgstr "El tamaño del informe excede la cuota. Por favor, verifique el valor de MaxCrashReportsSize del sistema en abrt.conf." @@ -409,37 +411,37 @@ msgstr "El tamaño del informe excede la cuota. Por favor, verifique el valor de msgid "Empty login and password. Please check Bugzilla.conf" msgstr "Usuario y contraseña vacios. Por favor compruebe el archivo Bugzilla.conf" -#: ../lib/Plugins/Bugzilla.cpp:227 +#: ../lib/Plugins/Bugzilla.cpp:205 msgid "Bug is already reported: " msgstr "El error ya ha sido informado:" -#: ../lib/Plugins/Bugzilla.cpp:282 +#: ../lib/Plugins/Bugzilla.cpp:260 #, c-format msgid "Binary file %s will not be reported." msgstr "El archivo binario %s no será informado." -#: ../lib/Plugins/Bugzilla.cpp:352 +#: ../lib/Plugins/Bugzilla.cpp:330 msgid "New bug id: " msgstr "Nuevo id del error:" -#: ../lib/Plugins/Bugzilla.cpp:421 +#: ../lib/Plugins/Bugzilla.cpp:399 msgid "Checking for duplicates..." msgstr "Chequeando si hay duplicados..." -#: ../lib/Plugins/Bugzilla.cpp:424 -#: ../lib/Plugins/Bugzilla.cpp:436 +#: ../lib/Plugins/Bugzilla.cpp:402 +#: ../lib/Plugins/Bugzilla.cpp:413 msgid "Logging into bugzilla..." msgstr "Ingresando a bugzilla..." -#: ../lib/Plugins/Bugzilla.cpp:427 -msgid "Check CC and add coment +1..." -msgstr "Compruebe CC y añada un comentario +1" +#: ../lib/Plugins/Bugzilla.cpp:405 +msgid "Checking CC..." +msgstr "Chequeando CC..." -#: ../lib/Plugins/Bugzilla.cpp:448 +#: ../lib/Plugins/Bugzilla.cpp:425 msgid "Creating new bug..." msgstr "Creando un nuevo informe..." -#: ../lib/Plugins/Bugzilla.cpp:453 +#: ../lib/Plugins/Bugzilla.cpp:430 msgid "Logging out..." msgstr "Saliendo..." @@ -447,31 +449,31 @@ msgstr "Saliendo..." msgid "Getting local universal unique identification" msgstr "Obteniendo la identificación única universal local" -#: ../lib/Plugins/CCpp.cpp:146 +#: ../lib/Plugins/CCpp.cpp:153 msgid "Getting backtrace..." msgstr "Obteniendo el backtrace..." -#: ../lib/Plugins/CCpp.cpp:415 +#: ../lib/Plugins/CCpp.cpp:425 msgid "Searching for debug-info packages..." msgstr "Buscando paquetes de información del depurador..." -#: ../lib/Plugins/CCpp.cpp:451 +#: ../lib/Plugins/CCpp.cpp:487 msgid "Downloading and installing debug-info packages..." msgstr "Descargando e instalando paquetes de información del depurador..." -#: ../lib/Plugins/CCpp.cpp:513 +#: ../lib/Plugins/CCpp.cpp:549 msgid "Getting local universal unique identification..." msgstr "Obteniendo la identificación única universal local..." -#: ../lib/Plugins/CCpp.cpp:532 +#: ../lib/Plugins/CCpp.cpp:568 msgid "Getting global universal unique identification..." msgstr "Obteniendo la identificación única universal global..." -#: ../lib/Plugins/CCpp.cpp:583 +#: ../lib/Plugins/CCpp.cpp:619 msgid "Starting report creation..." msgstr "Iniciando la creación del informe..." -#: ../lib/Plugins/CCpp.cpp:612 +#: ../lib/Plugins/CCpp.cpp:649 msgid "Skipping debuginfo installation" msgstr "Omita la instalación de la información de depuración" @@ -527,6 +529,8 @@ msgstr "lanzando.sosreport" msgid "done running sosreport" msgstr "Sosreport.corriendo" +#~ msgid "Check CC and add coment +1..." +#~ msgstr "Compruebe CC y añada un comentario +1" #~ msgid "Pending events: %i" #~ msgstr "Eventos pendientes: %i" #~ msgid "Can't create menu from the description, popup won't be available!\n" @@ -6,49 +6,55 @@ msgid "" msgstr "" "Project-Id-Version: abrt\n" "Report-Msgid-Bugs-To: jmoskovc@redhat.com\n" -"POT-Creation-Date: 2009-09-29 14:46+0200\n" -"PO-Revision-Date: 2009-09-23 17:36+0300\n" +"POT-Creation-Date: 2009-10-09 16:26+0000\n" +"PO-Revision-Date: 2009-10-09 20:52+0300\n" "Last-Translator: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>\n" "Language-Team: Finnish <laatu@lokalisointi.org>\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.4.0\n" -#: src/Gui/ABRTExceptions.py:4 +#: ../src/Gui/ABRTExceptions.py:6 msgid "Another client is already running, trying to wake it." msgstr "Toinen asiakasohjelma on jo käynnissä, yritetään herättää sitä." -#: src/Gui/ABRTExceptions.py:10 +#: ../src/Gui/ABRTExceptions.py:13 msgid "Got unexpected data from daemon (is the database properly updated?)." msgstr "" "Saatiin odottamatonta dataa taustaprosessilta (onko tietokanta päivitetty?)" -#: src/Gui/ABRTPlugin.py:26 +#: ../src/Gui/ABRTPlugin.py:48 msgid "Analyzer plugins" msgstr "Analysaattoriliitännäiset" -#: src/Gui/ABRTPlugin.py:27 +#: ../src/Gui/ABRTPlugin.py:49 msgid "Action plugins" msgstr "Toimintoliitännäiset" -#: src/Gui/ABRTPlugin.py:28 +#: ../src/Gui/ABRTPlugin.py:50 msgid "Reporter plugins" msgstr "Raportointiliitännäiset" -#: src/Gui/ABRTPlugin.py:29 +#: ../src/Gui/ABRTPlugin.py:51 msgid "Database plugins" msgstr "Tietokantaliitännäiset" -#: src/Gui/CCDBusBackend.py:143 -msgid "Can't connect to dbus" -msgstr "DBusiin ei saada yhteyttä" +#: ../src/Gui/ABRTPlugin.py:90 +msgid "Plugin name is not set, can't load it's settings" +msgstr "Liitännäisen nimeä ei ole asetettu, sen asetuksia ei voida ladata" -#: src/Gui/CCDBusBackend.py:169 -msgid "Please check if abrt daemon is running." -msgstr "Tarkista onko abrt-taustaprosessi käynnissä." +#: ../src/Gui/CCDBusBackend.py:74 ../src/Gui/CCDBusBackend.py:97 +msgid "Can't connect to system dbus" +msgstr "Järjestelmäväylään ei saatu yhteyttä" -#: src/Gui/CCDBusBackend.py:187 +#: ../src/Gui/CCDBusBackend.py:100 ../src/Gui/CCDBusBackend.py:103 +msgid "Please check if abrt daemon is running" +msgstr "Tarkista onko abrt-taustaprosessi käynnissä" + +#: ../src/Gui/CCDBusBackend.py:155 msgid "" "Daemon did't return valid report info\n" "Debuginfo is missing?" @@ -56,27 +62,47 @@ msgstr "" "Taustaprosessi ei palauttanut kelvollista raporttitietoa\n" "Puuttuuko debuginfo?" -#: src/Gui/ccgui.glade:6 -msgid "Please wait.." -msgstr "Odota hetki..." - -#: src/Gui/ccgui.glade:16 -msgid "Working..." -msgstr "Työskentelee..." - -#: src/Gui/ccgui.glade:49 +#: ../src/Gui/ccgui.glade.h:1 msgid " " msgstr " " -#: src/Gui/ccgui.glade:68 +#: ../src/Gui/ccgui.glade.h:2 +msgid "(C) 2009 Red Hat, Inc." +msgstr "(C) 2009 Red Hat, Inc." + +#: ../src/Gui/ccgui.glade.h:3 ../src/Gui/CCMainWindow.py:240 +msgid "<b>Not reported!</b>" +msgstr "<b>Ei raportoitu!</b>" + +#: ../src/Gui/ccgui.glade.h:4 +msgid "<span color=\"white\">Description</span>" +msgstr "<span color=\"white\">Kuvaus</span>" + +#: ../src/Gui/ccgui.glade.h:5 msgid "About ABRT" msgstr "Tietoja ABRT:stä" -#: src/Gui/ccgui.glade:74 -msgid "(C) 2009 Red Hat, Inc." -msgstr "(C) 2009 Red Hat, Inc." +#: ../src/Gui/ccgui.glade.h:6 +msgid "Automatic Bug Reporting Tool" +msgstr "Automaattinen ohjelmavikojen raportointiohjelma" + +#: ../src/Gui/ccgui.glade.h:7 +msgid "Delete" +msgstr "Poista" + +#: ../src/Gui/ccgui.glade.h:8 +msgid "Please wait.." +msgstr "Odota hetki..." + +#: ../src/Gui/ccgui.glade.h:9 +msgid "Plugins" +msgstr "Liitännäiset" -#: src/Gui/ccgui.glade:75 +#: ../src/Gui/ccgui.glade.h:10 ../src/Gui/report.glade.h:2 +msgid "Report" +msgstr "Raportti" + +#: ../src/Gui/ccgui.glade.h:11 msgid "" "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 " @@ -103,68 +129,48 @@ msgstr "" "Tämän ohjelman mukana pitäisi tulla kopio GPL-lisenssistä. Jos näin ei ole, " "katso <http://www.gnu.org/licenses/>." -#: src/Gui/ccgui.glade:106 -msgid "Automatic Bug Reporting Tool" -msgstr "Automaattinen ohjelmavikojen raportointiohjelma" - -#: src/Gui/ccgui.glade:118 -msgid "_File" -msgstr "_Tiedosto" +#: ../src/Gui/ccgui.glade.h:16 +msgid "Working..." +msgstr "Työskentelee..." -#: src/Gui/ccgui.glade:138 +#: ../src/Gui/ccgui.glade.h:17 msgid "_Edit" msgstr "_Muokkaa" -#: src/Gui/ccgui.glade:146 -msgid "Plugins" -msgstr "Liitännäiset" +#: ../src/Gui/ccgui.glade.h:18 +msgid "_File" +msgstr "_Tiedosto" -#: src/Gui/ccgui.glade:164 +#: ../src/Gui/ccgui.glade.h:19 msgid "_Help" msgstr "_Ohje" -#: src/Gui/ccgui.glade:194 src/Gui/ccgui.glade:195 -msgid "Delete" -msgstr "Poista" - -#: src/Gui/ccgui.glade:207 src/Gui/ccgui.glade:208 src/Gui/ccgui.glade:335 -#: src/Gui/report.glade:7 src/Gui/report.glade:24 -msgid "Report" -msgstr "Raportti" - -#: src/Gui/ccgui.glade:255 -msgid "<span color=\"white\">Description</span>" -msgstr "<span color=\"white\">Kuvaus</span>" - -#: src/Gui/ccgui.glade:297 src/Gui/CCMainWindow.py:239 -msgid "<b>Not reported!</b>" -msgstr "<b>Ei raportoitu!</b>" - -#: src/Gui/CCMainWindow.py:80 +#. add pixbuff separatelly +#: ../src/Gui/CCMainWindow.py:80 msgid "Icon" msgstr "Kuvake" -#: src/Gui/CCMainWindow.py:88 +#: ../src/Gui/CCMainWindow.py:88 msgid "Package" msgstr "Paketti" -#: src/Gui/CCMainWindow.py:89 +#: ../src/Gui/CCMainWindow.py:89 msgid "Application" msgstr "Ohjelma" -#: src/Gui/CCMainWindow.py:90 +#: ../src/Gui/CCMainWindow.py:90 msgid "Date" msgstr "Päiväys" -#: src/Gui/CCMainWindow.py:91 +#: ../src/Gui/CCMainWindow.py:91 msgid "Crash Rate" msgstr "Kaatumisaste" -#: src/Gui/CCMainWindow.py:93 +#: ../src/Gui/CCMainWindow.py:93 msgid "User" msgstr "Käyttäjä" -#: src/Gui/CCMainWindow.py:177 +#: ../src/Gui/CCMainWindow.py:178 #, python-format msgid "" "Unable to finish current task!\n" @@ -173,7 +179,7 @@ msgstr "" "Nykyistä tehtävää ei saatu valmiiksi!\n" "%s" -#: src/Gui/CCMainWindow.py:194 +#: ../src/Gui/CCMainWindow.py:195 #, python-format msgid "" "Error while loading the dumplist, please check if abrt daemon is running\n" @@ -183,17 +189,17 @@ msgstr "" "käynnissä\n" " %s" -#: src/Gui/CCMainWindow.py:204 +#: ../src/Gui/CCMainWindow.py:205 #, python-format msgid "Can't get username for uid %s" msgstr "Käyttäjänumeron %s käyttäjänimeä ei saatu selville" -#: src/Gui/CCMainWindow.py:231 +#: ../src/Gui/CCMainWindow.py:232 msgid "<b>This crash has been reported, you can find the report(s) at:</b>\n" msgstr "" "<b>Tämä kaatuminen on raportoitu, raportit on nähtävillä osoitteessa:</b>\n" -#: src/Gui/CCMainWindow.py:291 +#: ../src/Gui/CCMainWindow.py:292 msgid "" "Unable to get report!\n" "Debuginfo is missing?" @@ -201,7 +207,7 @@ msgstr "" "Raporttia ei saatu!\n" "Puuttuuko debuginfo?" -#: src/Gui/CCMainWindow.py:306 +#: ../src/Gui/CCMainWindow.py:308 #, python-format msgid "" "Reporting failed!\n" @@ -210,12 +216,12 @@ msgstr "" "Raportin tekeminen epäonnistui!\n" "%s" -#: src/Gui/CCMainWindow.py:338 +#: ../src/Gui/CCMainWindow.py:340 #, python-format msgid "Error getting the report: %s" msgstr "Raportin noutaminen epäonnistui: %s" -#: src/Gui/CCReporterDialog.py:98 +#: ../src/Gui/CCReporterDialog.py:98 #, python-format msgid "" "<b>WARNING</b>, you're about to send data which might contain sensitive " @@ -226,191 +232,187 @@ msgstr "" "yksityisiä tietoja!\n" "Haluatko todella lähettää <b>%s</b>?\n" -#: src/Gui/CCReporterDialog.py:111 +#: ../src/Gui/CCReporterDialog.py:111 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/dialogs.glade:7 +#: ../src/Gui/dialogs.glade.h:1 msgid "Report done" msgstr "Raportti on valmis" -#: src/Gui/dialogs.glade:47 src/Gui/settings.glade:695 -#: src/Gui/settings.glade:785 +#: ../src/Gui/dialogs.glade.h:2 ../src/Gui/settings.glade.h:27 msgid "gtk-ok" msgstr "gtk-ok" -#: src/Gui/PluginSettingsUI.py:17 +#: ../src/Gui/PluginSettingsUI.py:18 msgid "Can't find PluginDialog widget in UI description!" msgstr "PluginDialog-elementtiä ei löydy käyttöliittymäkuvauksesta!" -#: src/Gui/PluginSettingsUI.py:21 +#. we shouldn't get here, but just to be safe +#: ../src/Gui/PluginSettingsUI.py:24 #, python-format msgid "No UI for plugin %s" msgstr "Liitännäisellä %s ei ole käyttöliittymää" -#: src/Gui/PluginSettingsUI.py:38 src/Gui/PluginSettingsUI.py:64 +#: ../src/Gui/PluginSettingsUI.py:55 ../src/Gui/PluginSettingsUI.py:81 msgid "combo box is not implemented" msgstr "alasvetovalikkoa ei ole toteutettu" -#: src/Gui/PluginSettingsUI.py:47 +#: ../src/Gui/PluginSettingsUI.py:64 msgid "Nothing to hydrate!" msgstr "" -#: src/Gui/report.glade:64 +#: ../src/Gui/report.glade.h:1 msgid "Comment" msgstr "Kommentti" -#: src/Gui/report.glade:104 src/Gui/settings.glade:682 -#: src/Gui/settings.glade:797 -msgid "gtk-cancel" -msgstr "gtk-cancel" - -#: src/Gui/report.glade:119 +#: ../src/Gui/report.glade.h:3 msgid "Send" msgstr "Lähetä" -#: src/Gui/SettingsDialog.py:34 src/Gui/SettingsDialog.py:51 +#: ../src/Gui/report.glade.h:4 ../src/Gui/settings.glade.h:25 +msgid "gtk-cancel" +msgstr "gtk-cancel" + +#: ../src/Gui/SettingsDialog.py:34 ../src/Gui/SettingsDialog.py:51 msgid "<b>Select plugin</b>" msgstr "<b>Valitse liitännäinen</b>" -#: src/Gui/SettingsDialog.py:37 +#: ../src/Gui/SettingsDialog.py:37 msgid "<b>Select database backend</b>" msgstr "<b>Valitse tietokannan taustajärjestelmä</b>" -#: src/Gui/SettingsDialog.py:165 +#: ../src/Gui/SettingsDialog.py:168 msgid "Remove this job" msgstr "Poista tämä työ" -#: src/Gui/SettingsDialog.py:208 +#: ../src/Gui/SettingsDialog.py:211 msgid "Remove this action" msgstr "Poista tämä toiminto" -#: src/Gui/settings.glade:6 -msgid "Settings" -msgstr "Asetukset" +#: ../src/Gui/settings.glade.h:1 +msgid "<b>Analyzer plugin</b>" +msgstr "Analysaattoriliitännäinen" -#: src/Gui/settings.glade:46 src/Gui/settings.glade:55 -#: src/Gui/settings.glade:107 src/Gui/settings.glade:120 -#: src/Gui/settings.glade:133 -msgid "Nothing selected" -msgstr "Mitään ei ole valittu" +#: ../src/Gui/settings.glade.h:2 +msgid "<b>Associated action</b>" +msgstr "<b>Yhdistetty toiminto</b>" -#: src/Gui/settings.glade:72 -msgid "Web Site:" -msgstr "Verkkosivu:" +#: ../src/Gui/settings.glade.h:3 +msgid "<b>Plugin</b>" +msgstr "<b>Liitännäinen</b>" + +#: ../src/Gui/settings.glade.h:4 +msgid "<b>Time (or period)</b>" +msgstr "<b>Aika (tai ajanjakso)</b>" -#: src/Gui/settings.glade:84 +#: ../src/Gui/settings.glade.h:5 +msgid "Analyzers, Actions, Reporters" +msgstr "Analysaattorit, toiminnot, raportoijat" + +#: ../src/Gui/settings.glade.h:6 msgid "Author:" msgstr "Tekijä:" -#: src/Gui/settings.glade:97 -msgid "Version:" -msgstr "Versio:" - -#: src/Gui/settings.glade:152 -msgid "Plugin Details" -msgstr "Liitännäisen tiedot" +#: ../src/Gui/settings.glade.h:7 +msgid "Blacklisted packages: " +msgstr "Mustalla listalla olevat paketit:" -#: src/Gui/settings.glade:179 +#: ../src/Gui/settings.glade.h:8 msgid "C_onfigure plugin" msgstr "Liitännäisen asetukset" -#: src/Gui/settings.glade:191 -msgid "gtk-close" -msgstr "gtk-close" - -#: src/Gui/settings.glade:221 -msgid "Global Settings" -msgstr "Yleiset asetukset" - -#: src/Gui/settings.glade:240 +#: ../src/Gui/settings.glade.h:9 msgid "Check package GPG signature" msgstr "Tarkista paketin GPG-allekirjoitus" -#: src/Gui/settings.glade:256 +#: ../src/Gui/settings.glade.h:10 +msgid "Common" +msgstr "Yleinen" + +#: ../src/Gui/settings.glade.h:11 +msgid "Cron" +msgstr "Cron" + +#: ../src/Gui/settings.glade.h:12 msgid "Database backend: " msgstr "Tietokannan taustajärjestelmä:" -#: src/Gui/settings.glade:281 -msgid "Blacklisted packages: " -msgstr "Mustalla listalla olevat paketit:" +#: ../src/Gui/settings.glade.h:13 +msgid "Edit blacklisted packages" +msgstr "Muokkaa mustalla listalla olevia paketteja" -#: src/Gui/settings.glade:294 -msgid "Max coredump storage size(MB):" -msgstr "Muistivedoksen tallennustilan suurin koko (Mt):" +#: ../src/Gui/settings.glade.h:14 +msgid "GPG Keys" +msgstr "GPG-avaimet" -#: src/Gui/settings.glade:307 +#: ../src/Gui/settings.glade.h:15 msgid "GPG keys: " msgstr "GPG-avaimet:" -#: src/Gui/settings.glade:349 -msgid "Edit blacklisted packages" -msgstr "Muokkaa mustalla listalla olevia paketteja" - -#: src/Gui/settings.glade:408 -msgid "Common" -msgstr "Yleinen" +#: ../src/Gui/settings.glade.h:16 +msgid "Global Settings" +msgstr "Yleiset asetukset" -#: src/Gui/settings.glade:438 -msgid "<b>Plugin</b>" -msgstr "<b>Liitännäinen</b>" +#: ../src/Gui/settings.glade.h:17 +msgid "Max coredump storage size(MB):" +msgstr "Muistivedoksen tallennustilan suurin koko (Mt):" -#: src/Gui/settings.glade:448 -msgid "<b>Time (or period)</b>" -msgstr "<b>Aika (tai ajanjakso)</b>" +#: ../src/Gui/settings.glade.h:18 +msgid "Nothing selected" +msgstr "Mitään ei ole valittu" -#: src/Gui/settings.glade:510 src/Gui/settings.glade:624 -#: src/Gui/settings.glade:761 -msgid "gtk-add" -msgstr "gtk-add" +#: ../src/Gui/settings.glade.h:19 +msgid "Plugin Details" +msgstr "Liitännäisen tiedot" -#: src/Gui/settings.glade:534 -msgid "Cron" -msgstr "Cron" +#: ../src/Gui/settings.glade.h:20 +msgid "Settings" +msgstr "Asetukset" -#: src/Gui/settings.glade:551 -msgid "<b>Analyzer plugin</b>" -msgstr "Analysaattoriliitännäinen" +#: ../src/Gui/settings.glade.h:21 +msgid "This function is not implemented yet!" +msgstr "Tätä toimintoa ei ole vielä toteutettu!" -#: src/Gui/settings.glade:561 -msgid "<b>Associated action</b>" -msgstr "<b>Yhdistetty toiminto</b>" +#: ../src/Gui/settings.glade.h:22 +msgid "Version:" +msgstr "Versio:" -#: src/Gui/settings.glade:648 -msgid "Analyzers, Actions, Reporters" -msgstr "Analysaattorit, toiminnot, raportoijat" +#: ../src/Gui/settings.glade.h:23 +msgid "Web Site:" +msgstr "Verkkosivu:" -#: src/Gui/settings.glade:700 -msgid "This function is not implemented yet!" -msgstr "Tätä toimintoa ei ole vielä toteutettu!" +#: ../src/Gui/settings.glade.h:24 +msgid "gtk-add" +msgstr "gtk-add" -#: src/Gui/settings.glade:738 -msgid "GPG Keys" -msgstr "GPG-avaimet" +#: ../src/Gui/settings.glade.h:26 +msgid "gtk-close" +msgstr "gtk-close" -#: src/Gui/settings.glade:773 +#: ../src/Gui/settings.glade.h:28 msgid "gtk-remove" msgstr "gtk-remove" -#: src/Applet/Applet.cpp:71 +#: ../src/Applet/Applet.cpp:71 #, c-format msgid "A crash in package %s has been detected" msgstr "Paketissa %s on huomattu kaatuminen" -#: src/Applet/Applet.cpp:130 +#: ../src/Applet/Applet.cpp:130 msgid "ABRT service has been started" msgstr "ABRT-palvelu on käynnistetty" -#: src/Applet/Applet.cpp:132 src/Applet/Applet.cpp:246 +#: ../src/Applet/Applet.cpp:132 ../src/Applet/Applet.cpp:246 msgid "ABRT service is not running" msgstr "ABRT-palvelu ei ole käytössä" -#: src/Applet/CCApplet.cpp:185 +#: ../src/Applet/CCApplet.cpp:185 msgid "Warning" msgstr "Varoitus" -#: src/Daemon/Daemon.cpp:546 +#: ../src/Daemon/Daemon.cpp:542 msgid "" "Report size exceeded the quota. Please check system's MaxCrashReportsSize " "value in abrt.conf." @@ -418,124 +420,127 @@ msgstr "" "Raportin koko ylitti sille annetun rajan. Tarkista järjestelmän " "MaxCrashReportsSize-arvo abrt.conf-tiedostossa." -#: lib/Plugins/Bugzilla.cpp:83 +#: ../lib/Plugins/Bugzilla.cpp:83 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:227 +#: ../lib/Plugins/Bugzilla.cpp:205 msgid "Bug is already reported: " msgstr "Ohjelmavirheestä on jo tehty ilmoitus:" -#: lib/Plugins/Bugzilla.cpp:282 +#: ../lib/Plugins/Bugzilla.cpp:260 #, c-format msgid "Binary file %s will not be reported." msgstr "Binääritiedostoa %s ei raportoida." -#: lib/Plugins/Bugzilla.cpp:352 +#: ../lib/Plugins/Bugzilla.cpp:330 msgid "New bug id: " msgstr "Uuden ohjelmavirheilmoituksen tunnus:" -#: lib/Plugins/Bugzilla.cpp:421 +#: ../lib/Plugins/Bugzilla.cpp:399 msgid "Checking for duplicates..." msgstr "Etsitään samanlaisia..." -#: lib/Plugins/Bugzilla.cpp:424 lib/Plugins/Bugzilla.cpp:436 +#: ../lib/Plugins/Bugzilla.cpp:402 ../lib/Plugins/Bugzilla.cpp:413 msgid "Logging into bugzilla..." msgstr "Kirjaudutaan bugzillaan..." -#: lib/Plugins/Bugzilla.cpp:427 -msgid "Check CC and add coment +1..." -msgstr "Tarkista CC ja lisää kommentti +1..." +#: ../lib/Plugins/Bugzilla.cpp:405 +msgid "Checking CC..." +msgstr "Tarkistetaan CC..." -#: lib/Plugins/Bugzilla.cpp:448 +#: ../lib/Plugins/Bugzilla.cpp:425 msgid "Creating new bug..." msgstr "Luodaan uusi ohjelmavirheilmoitus..." -#: lib/Plugins/Bugzilla.cpp:453 +#: ../lib/Plugins/Bugzilla.cpp:430 msgid "Logging out..." msgstr "Kirjaudutaan ulos..." -#: lib/Plugins/Kerneloops.cpp:37 +#: ../lib/Plugins/Kerneloops.cpp:37 msgid "Getting local universal unique identification" msgstr "Haetaan paikallinen ainutkertainen tunnus" -#: lib/Plugins/CCpp.cpp:146 +#: ../lib/Plugins/CCpp.cpp:153 msgid "Getting backtrace..." msgstr "Haetaan pinolistausta..." -#: lib/Plugins/CCpp.cpp:410 +#: ../lib/Plugins/CCpp.cpp:425 msgid "Searching for debug-info packages..." msgstr "Etsitään debug-info-paketteja..." -#: lib/Plugins/CCpp.cpp:444 +#: ../lib/Plugins/CCpp.cpp:487 msgid "Downloading and installing debug-info packages..." msgstr "Ladataan ja asennetaan debug-info-paketteja..." -#: lib/Plugins/CCpp.cpp:506 +#: ../lib/Plugins/CCpp.cpp:549 msgid "Getting local universal unique identification..." msgstr "Haetaan paikallinen ainutkertainen tunnus..." -#: lib/Plugins/CCpp.cpp:525 +#: ../lib/Plugins/CCpp.cpp:568 msgid "Getting global universal unique identification..." msgstr "Haetaan yleinen ainutkertainen tunnus..." -#: lib/Plugins/CCpp.cpp:576 +#: ../lib/Plugins/CCpp.cpp:619 msgid "Starting report creation..." msgstr "Aloitetaan ilmoituksen tekeminen..." -#: lib/Plugins/CCpp.cpp:605 +#: ../lib/Plugins/CCpp.cpp:649 msgid "Skipping debuginfo installation" msgstr "Ohitetaan debuginfon asennus" -#: lib/Plugins/KerneloopsReporter.cpp:101 +#: ../lib/Plugins/KerneloopsReporter.cpp:101 msgid "Creating and submitting a report..." msgstr "Luodaan ja lähetetään ilmoitus..." -#: lib/Plugins/Logger.cpp:58 lib/Plugins/Mailx.cpp:123 +#: ../lib/Plugins/Logger.cpp:58 ../lib/Plugins/Mailx.cpp:123 msgid "Creating a report..." msgstr "Luodaan ilmoitus..." -#: lib/Plugins/RunApp.cpp:62 +#: ../lib/Plugins/RunApp.cpp:62 msgid "Executing RunApp plugin..." msgstr "Suoritetaan RunApp-liitännäinen..." -#: lib/Plugins/FileTransfer.cpp:60 lib/Plugins/FileTransfer.cpp:355 +#: ../lib/Plugins/FileTransfer.cpp:63 ../lib/Plugins/FileTransfer.cpp:409 msgid "FileTransfer: URL not specified" msgstr "FileTransfer: URL:ää ei ole määritelty" -#: lib/Plugins/FileTransfer.cpp:77 +#: ../lib/Plugins/FileTransfer.cpp:81 #, c-format msgid "Sending archive %s via %s" msgstr "Lähetetään arkisto %s protokollan %s avulla" -#: lib/Plugins/FileTransfer.cpp:284 +#: ../lib/Plugins/FileTransfer.cpp:336 msgid "File Transfer: Creating a report..." msgstr "Tiedostonsiirto: Luodaan ilmoitusta..." -#: lib/Plugins/FileTransfer.cpp:305 lib/Plugins/FileTransfer.cpp:334 +#: ../lib/Plugins/FileTransfer.cpp:358 ../lib/Plugins/FileTransfer.cpp:386 msgid "CFileTransfer::Run(): Cannot create and send an archive: " msgstr "CFileTransfer::Run(): Ei voitu luoda ja lähettää arkistoa:" -#: lib/Plugins/KerneloopsScanner.cpp:79 +#: ../lib/Plugins/KerneloopsScanner.cpp:79 msgid "Creating kernel oops crash reports..." msgstr "Luodaan kernel oops -kaatumisilmoituksia..." -#: lib/Plugins/Mailx.cpp:109 +#: ../lib/Plugins/Mailx.cpp:109 msgid "Sending an email..." msgstr "Lähetetään sähköpostia..." -#: lib/Plugins/SOSreport.cpp:113 +#: ../lib/Plugins/SOSreport.cpp:113 msgid "Executing SOSreport plugin..." msgstr "Suoritetaan SOSreport-liitännäinen..." -#: lib/Plugins/SOSreport.cpp:135 +#: ../lib/Plugins/SOSreport.cpp:135 msgid "running sosreport: " msgstr "suoritetaan sosreport:" -#: lib/Plugins/SOSreport.cpp:150 +#: ../lib/Plugins/SOSreport.cpp:150 msgid "done running sosreport" msgstr "sosreportin suoritus valmistui" +#~ msgid "Check CC and add coment +1..." +#~ msgstr "Tarkista CC ja lisää kommentti +1..." + #~ msgid "Pending events: %i" #~ msgstr "Tapahtumia jonossa: %i" @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ja\n" "Report-Msgid-Bugs-To: jmoskovc@redhat.com\n" -"POT-Creation-Date: 2009-09-29 14:46+0200\n" -"PO-Revision-Date: 2009-09-23 14:15+0900\n" +"POT-Creation-Date: 2009-10-11 10:16+0000\n" +"PO-Revision-Date: 2009-10-11 20:14+0900\n" "Last-Translator: Hyu_gabaru Ryu_ichi <hyu_gabaru@yahoo.co.jp>\n" "Language-Team: Japanese <jp@li.org>\n" "MIME-Version: 1.0\n" @@ -22,41 +22,45 @@ msgstr "" "\n" "\n" -#: src/Gui/ABRTExceptions.py:4 +#: ../src/Gui/ABRTExceptions.py:6 msgid "Another client is already running, trying to wake it." msgstr "別のクライアントが稼働していますので、それを呼び出しています。" -#: src/Gui/ABRTExceptions.py:10 +#: ../src/Gui/ABRTExceptions.py:13 msgid "Got unexpected data from daemon (is the database properly updated?)." msgstr "" "デーモンから予想外のデータを受け取りました（データベースは正常に更新されてい" "ますか？）。" -#: src/Gui/ABRTPlugin.py:26 +#: ../src/Gui/ABRTPlugin.py:48 msgid "Analyzer plugins" msgstr "アナライザー plugin" -#: src/Gui/ABRTPlugin.py:27 +#: ../src/Gui/ABRTPlugin.py:49 msgid "Action plugins" msgstr "アクション plugin" -#: src/Gui/ABRTPlugin.py:28 +#: ../src/Gui/ABRTPlugin.py:50 msgid "Reporter plugins" msgstr "レポーター plugin" -#: src/Gui/ABRTPlugin.py:29 +#: ../src/Gui/ABRTPlugin.py:51 msgid "Database plugins" msgstr "データベース plugin" -#: src/Gui/CCDBusBackend.py:143 -msgid "Can't connect to dbus" -msgstr "dbus に接続できません。" +#: ../src/Gui/ABRTPlugin.py:90 +msgid "Plugin name is not set, can't load it's settings" +msgstr "プラグイン名が設定されていません、その設定はロードできません" -#: src/Gui/CCDBusBackend.py:169 -msgid "Please check if abrt daemon is running." -msgstr "abrt デーモンが稼働しているかどうかチェックして下さい。" +#: ../src/Gui/CCDBusBackend.py:74 ../src/Gui/CCDBusBackend.py:97 +msgid "Can't connect to system dbus" +msgstr "システム dbus に接続できません。" -#: src/Gui/CCDBusBackend.py:187 +#: ../src/Gui/CCDBusBackend.py:100 ../src/Gui/CCDBusBackend.py:103 +msgid "Please check if abrt daemon is running" +msgstr "abrt デーモンが稼働しているかどうかチェックして下さい" + +#: ../src/Gui/CCDBusBackend.py:155 msgid "" "Daemon did't return valid report info\n" "Debuginfo is missing?" @@ -64,27 +68,47 @@ msgstr "" "デーモンは有効な報告内容を返しませんでした。\n" "Debuginfo が無いですか？" -#: src/Gui/ccgui.glade:6 -msgid "Please wait.." -msgstr "お待ち下さい..." - -#: src/Gui/ccgui.glade:16 -msgid "Working..." -msgstr "作業中..." - -#: src/Gui/ccgui.glade:49 +#: ../src/Gui/ccgui.glade.h:1 msgid " " msgstr " " -#: src/Gui/ccgui.glade:68 +#: ../src/Gui/ccgui.glade.h:2 +msgid "(C) 2009 Red Hat, Inc." +msgstr "(C) 2009 Red Hat, Inc." + +#: ../src/Gui/ccgui.glade.h:3 ../src/Gui/CCMainWindow.py:240 +msgid "<b>Not reported!</b>" +msgstr "<b>報告がありません!</b>" + +#: ../src/Gui/ccgui.glade.h:4 +msgid "<span color=\"white\">Description</span>" +msgstr "<span color=\"white\">記述</span>" + +#: ../src/Gui/ccgui.glade.h:5 msgid "About ABRT" msgstr "ABRT について" -#: src/Gui/ccgui.glade:74 -msgid "(C) 2009 Red Hat, Inc." -msgstr "(C) 2009 Red Hat, Inc." +#: ../src/Gui/ccgui.glade.h:6 +msgid "Automatic Bug Reporting Tool" +msgstr "自動バグ報告ツール（ABRT）" + +#: ../src/Gui/ccgui.glade.h:7 +msgid "Delete" +msgstr "削除" + +#: ../src/Gui/ccgui.glade.h:8 +msgid "Please wait.." +msgstr "お待ち下さい..." + +#: ../src/Gui/ccgui.glade.h:9 +msgid "Plugins" +msgstr "プラグイン" -#: src/Gui/ccgui.glade:75 +#: ../src/Gui/ccgui.glade.h:10 ../src/Gui/report.glade.h:2 +msgid "Report" +msgstr "報告" + +#: ../src/Gui/ccgui.glade.h:11 msgid "" "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 " @@ -112,68 +136,48 @@ msgstr "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see <http://www.gnu.org/licenses/>." -#: src/Gui/ccgui.glade:106 -msgid "Automatic Bug Reporting Tool" -msgstr "自動バグ報告ツール（ABRT）" - -#: src/Gui/ccgui.glade:118 -msgid "_File" -msgstr "ファイル（_F）" +#: ../src/Gui/ccgui.glade.h:16 +msgid "Working..." +msgstr "作業中..." -#: src/Gui/ccgui.glade:138 +#: ../src/Gui/ccgui.glade.h:17 msgid "_Edit" msgstr "編集（_E）" -#: src/Gui/ccgui.glade:146 -msgid "Plugins" -msgstr "プラグイン" +#: ../src/Gui/ccgui.glade.h:18 +msgid "_File" +msgstr "ファイル（_F）" -#: src/Gui/ccgui.glade:164 +#: ../src/Gui/ccgui.glade.h:19 msgid "_Help" msgstr "ヘルプ（_H）" -#: src/Gui/ccgui.glade:194 src/Gui/ccgui.glade:195 -msgid "Delete" -msgstr "削除" - -#: src/Gui/ccgui.glade:207 src/Gui/ccgui.glade:208 src/Gui/ccgui.glade:335 -#: src/Gui/report.glade:7 src/Gui/report.glade:24 -msgid "Report" -msgstr "報告" - -#: src/Gui/ccgui.glade:255 -msgid "<span color=\"white\">Description</span>" -msgstr "<span color=\"white\">記述</span>" - -#: src/Gui/ccgui.glade:297 src/Gui/CCMainWindow.py:239 -msgid "<b>Not reported!</b>" -msgstr "<b>報告がありません!</b>" - -#: src/Gui/CCMainWindow.py:80 +#. add pixbuff separatelly +#: ../src/Gui/CCMainWindow.py:80 msgid "Icon" msgstr "アイコン" -#: src/Gui/CCMainWindow.py:88 +#: ../src/Gui/CCMainWindow.py:88 msgid "Package" msgstr "パッケージ" -#: src/Gui/CCMainWindow.py:89 +#: ../src/Gui/CCMainWindow.py:89 msgid "Application" msgstr "アプリケーション" -#: src/Gui/CCMainWindow.py:90 +#: ../src/Gui/CCMainWindow.py:90 msgid "Date" msgstr "期日" -#: src/Gui/CCMainWindow.py:91 +#: ../src/Gui/CCMainWindow.py:91 msgid "Crash Rate" msgstr "クラッシュレート" -#: src/Gui/CCMainWindow.py:93 +#: ../src/Gui/CCMainWindow.py:93 msgid "User" msgstr "ユーザー" -#: src/Gui/CCMainWindow.py:177 +#: ../src/Gui/CCMainWindow.py:178 #, python-format msgid "" "Unable to finish current task!\n" @@ -182,7 +186,7 @@ msgstr "" "現在のタスクを終了できません! \n" "%s" -#: src/Gui/CCMainWindow.py:194 +#: ../src/Gui/CCMainWindow.py:195 #, python-format msgid "" "Error while loading the dumplist, please check if abrt daemon is running\n" @@ -191,16 +195,16 @@ msgstr "" "dumplist のロード中にエラーが発生。abrt デーモンが稼働しているかチェックして" "下さいn %s" -#: src/Gui/CCMainWindow.py:204 +#: ../src/Gui/CCMainWindow.py:205 #, python-format msgid "Can't get username for uid %s" msgstr "uid %s 用のユーザー名を取得できません" -#: src/Gui/CCMainWindow.py:231 +#: ../src/Gui/CCMainWindow.py:232 msgid "<b>This crash has been reported, you can find the report(s) at:</b>\n" msgstr "<b>このクラッシュは報告済みです。報告は以下で見ることができます:</b>\n" -#: src/Gui/CCMainWindow.py:291 +#: ../src/Gui/CCMainWindow.py:292 msgid "" "Unable to get report!\n" "Debuginfo is missing?" @@ -208,7 +212,7 @@ msgstr "" "報告を取得できません\n" "Debuginfo が無いですか ?" -#: src/Gui/CCMainWindow.py:306 +#: ../src/Gui/CCMainWindow.py:308 #, python-format msgid "" "Reporting failed!\n" @@ -217,12 +221,12 @@ msgstr "" "報告が失敗しました!\n" "%s" -#: src/Gui/CCMainWindow.py:338 +#: ../src/Gui/CCMainWindow.py:340 #, python-format msgid "Error getting the report: %s" msgstr "報告の取得中にエラーです: %s" -#: src/Gui/CCReporterDialog.py:98 +#: ../src/Gui/CCReporterDialog.py:98 #, python-format msgid "" "<b>WARNING</b>, you're about to send data which might contain sensitive " @@ -232,190 +236,186 @@ msgstr "" "<b>警告</b>、機密情報を含む可能性のあるデータを送信 しようとしています。\n" "本当に<b>%s</b>を送信したいですか ?\n" -#: src/Gui/CCReporterDialog.py:111 +#: ../src/Gui/CCReporterDialog.py:111 msgid "Brief description how to reproduce this or what you did..." msgstr "この問題の再現手順、または実行したことの簡単な説明..." -#: src/Gui/dialogs.glade:7 +#: ../src/Gui/dialogs.glade.h:1 msgid "Report done" msgstr "報告完了" -#: src/Gui/dialogs.glade:47 src/Gui/settings.glade:695 -#: src/Gui/settings.glade:785 +#: ../src/Gui/dialogs.glade.h:2 ../src/Gui/settings.glade.h:27 msgid "gtk-ok" msgstr "gtk-ok" -#: src/Gui/PluginSettingsUI.py:17 +#: ../src/Gui/PluginSettingsUI.py:18 msgid "Can't find PluginDialog widget in UI description!" msgstr "UI 説明の中で PluginDialog ウィジェットを見つけることが出来ません!" -#: src/Gui/PluginSettingsUI.py:21 +#. we shouldn't get here, but just to be safe +#: ../src/Gui/PluginSettingsUI.py:24 #, python-format msgid "No UI for plugin %s" msgstr "plugin の UI がありません %s" -#: src/Gui/PluginSettingsUI.py:38 src/Gui/PluginSettingsUI.py:64 +#: ../src/Gui/PluginSettingsUI.py:55 ../src/Gui/PluginSettingsUI.py:81 msgid "combo box is not implemented" msgstr "combo box が実装されていません" -#: src/Gui/PluginSettingsUI.py:47 +#: ../src/Gui/PluginSettingsUI.py:64 msgid "Nothing to hydrate!" msgstr "表示するデータはありません!" -#: src/Gui/report.glade:64 +#: ../src/Gui/report.glade.h:1 msgid "Comment" msgstr "コメント" -#: src/Gui/report.glade:104 src/Gui/settings.glade:682 -#: src/Gui/settings.glade:797 -msgid "gtk-cancel" -msgstr "gtk-cancel" - -#: src/Gui/report.glade:119 +#: ../src/Gui/report.glade.h:3 msgid "Send" msgstr "送信" -#: src/Gui/SettingsDialog.py:34 src/Gui/SettingsDialog.py:51 +#: ../src/Gui/report.glade.h:4 ../src/Gui/settings.glade.h:25 +msgid "gtk-cancel" +msgstr "gtk-cancel" + +#: ../src/Gui/SettingsDialog.py:34 ../src/Gui/SettingsDialog.py:51 msgid "<b>Select plugin</b>" msgstr "<b>plugin を選択</b>" -#: src/Gui/SettingsDialog.py:37 +#: ../src/Gui/SettingsDialog.py:37 msgid "<b>Select database backend</b>" msgstr "<b>データベースバックエンドを選択</b>" -#: src/Gui/SettingsDialog.py:165 +#: ../src/Gui/SettingsDialog.py:168 msgid "Remove this job" msgstr "このジョブを取り除く" -#: src/Gui/SettingsDialog.py:208 +#: ../src/Gui/SettingsDialog.py:211 msgid "Remove this action" msgstr "このアクションを取り除く" -#: src/Gui/settings.glade:6 -msgid "Settings" -msgstr "設定" +#: ../src/Gui/settings.glade.h:1 +msgid "<b>Analyzer plugin</b>" +msgstr "<b>アナライザー plugin</b>" -#: src/Gui/settings.glade:46 src/Gui/settings.glade:55 -#: src/Gui/settings.glade:107 src/Gui/settings.glade:120 -#: src/Gui/settings.glade:133 -msgid "Nothing selected" -msgstr "選択されていません" +#: ../src/Gui/settings.glade.h:2 +msgid "<b>Associated action</b>" +msgstr "<b>関連したアクション</b>" -#: src/Gui/settings.glade:72 -msgid "Web Site:" -msgstr "ウェブサイト:" +#: ../src/Gui/settings.glade.h:3 +msgid "<b>Plugin</b>" +msgstr "<b>Plugin</b>" + +#: ../src/Gui/settings.glade.h:4 +msgid "<b>Time (or period)</b>" +msgstr "<b>時間 (又は、期間)</b>" -#: src/Gui/settings.glade:84 +#: ../src/Gui/settings.glade.h:5 +msgid "Analyzers, Actions, Reporters" +msgstr "アナライザ、アクション、レポーター" + +#: ../src/Gui/settings.glade.h:6 msgid "Author:" msgstr "著者:" -#: src/Gui/settings.glade:97 -msgid "Version:" -msgstr "バージョン:" - -#: src/Gui/settings.glade:152 -msgid "Plugin Details" -msgstr "Plugin の詳細" +#: ../src/Gui/settings.glade.h:7 +msgid "Blacklisted packages: " +msgstr "ブラックリスト内のパッケージ:" -#: src/Gui/settings.glade:179 +#: ../src/Gui/settings.glade.h:8 msgid "C_onfigure plugin" msgstr "plugin を設定（_C）" -#: src/Gui/settings.glade:191 -msgid "gtk-close" -msgstr "gtk-close" - -#: src/Gui/settings.glade:221 -msgid "Global Settings" -msgstr "グローバル設定" - -#: src/Gui/settings.glade:240 +#: ../src/Gui/settings.glade.h:9 msgid "Check package GPG signature" msgstr "パッケージの GPG 署名をチェック" -#: src/Gui/settings.glade:256 +#: ../src/Gui/settings.glade.h:10 +msgid "Common" +msgstr "共通" + +#: ../src/Gui/settings.glade.h:11 +msgid "Cron" +msgstr "Cron" + +#: ../src/Gui/settings.glade.h:12 msgid "Database backend: " msgstr "データベースバックエンド:" -#: src/Gui/settings.glade:281 -msgid "Blacklisted packages: " -msgstr "ブラックリスト内のパッケージ:" +#: ../src/Gui/settings.glade.h:13 +msgid "Edit blacklisted packages" +msgstr "ブラックリスト内のパッケージを編集" -#: src/Gui/settings.glade:294 -msgid "Max coredump storage size(MB):" -msgstr "コアダンプ格納の最大サイズ (MB):" +#: ../src/Gui/settings.glade.h:14 +msgid "GPG Keys" +msgstr "GPG キー" -#: src/Gui/settings.glade:307 +#: ../src/Gui/settings.glade.h:15 msgid "GPG keys: " msgstr "GPG キー: " -#: src/Gui/settings.glade:349 -msgid "Edit blacklisted packages" -msgstr "ブラックリスト内のパッケージを編集" - -#: src/Gui/settings.glade:408 -msgid "Common" -msgstr "共通" +#: ../src/Gui/settings.glade.h:16 +msgid "Global Settings" +msgstr "グローバル設定" -#: src/Gui/settings.glade:438 -msgid "<b>Plugin</b>" -msgstr "<b>Plugin</b>" +#: ../src/Gui/settings.glade.h:17 +msgid "Max coredump storage size(MB):" +msgstr "コアダンプ格納の最大サイズ (MB):" -#: src/Gui/settings.glade:448 -msgid "<b>Time (or period)</b>" -msgstr "<b>時間 (又は、期間)</b>" +#: ../src/Gui/settings.glade.h:18 +msgid "Nothing selected" +msgstr "選択されていません" -#: src/Gui/settings.glade:510 src/Gui/settings.glade:624 -#: src/Gui/settings.glade:761 -msgid "gtk-add" -msgstr "gtk-add" +#: ../src/Gui/settings.glade.h:19 +msgid "Plugin Details" +msgstr "Plugin の詳細" -#: src/Gui/settings.glade:534 -msgid "Cron" -msgstr "Cron" +#: ../src/Gui/settings.glade.h:20 +msgid "Settings" +msgstr "設定" -#: src/Gui/settings.glade:551 -msgid "<b>Analyzer plugin</b>" -msgstr "<b>アナライザー plugin</b>" +#: ../src/Gui/settings.glade.h:21 +msgid "This function is not implemented yet!" +msgstr "この機能はまだ実装されていません!" -#: src/Gui/settings.glade:561 -msgid "<b>Associated action</b>" -msgstr "<b>関連したアクション</b>" +#: ../src/Gui/settings.glade.h:22 +msgid "Version:" +msgstr "バージョン:" -#: src/Gui/settings.glade:648 -msgid "Analyzers, Actions, Reporters" -msgstr "アナライザ、アクション、レポーター" +#: ../src/Gui/settings.glade.h:23 +msgid "Web Site:" +msgstr "ウェブサイト:" -#: src/Gui/settings.glade:700 -msgid "This function is not implemented yet!" -msgstr "この機能はまだ実装されていません!" +#: ../src/Gui/settings.glade.h:24 +msgid "gtk-add" +msgstr "gtk-add" -#: src/Gui/settings.glade:738 -msgid "GPG Keys" -msgstr "GPG キー" +#: ../src/Gui/settings.glade.h:26 +msgid "gtk-close" +msgstr "gtk-close" -#: src/Gui/settings.glade:773 +#: ../src/Gui/settings.glade.h:28 msgid "gtk-remove" msgstr "gtk-remove" -#: src/Applet/Applet.cpp:71 +#: ../src/Applet/Applet.cpp:71 #, c-format msgid "A crash in package %s has been detected" msgstr "パッケージ %s のクラッシュが検出されました" -#: src/Applet/Applet.cpp:130 +#: ../src/Applet/Applet.cpp:130 msgid "ABRT service has been started" msgstr "ABRT サービスは開始しています" -#: src/Applet/Applet.cpp:132 src/Applet/Applet.cpp:246 +#: ../src/Applet/Applet.cpp:132 ../src/Applet/Applet.cpp:246 msgid "ABRT service is not running" msgstr "ABRT サービスは稼働していません。" -#: src/Applet/CCApplet.cpp:185 +#: ../src/Applet/CCApplet.cpp:185 msgid "Warning" msgstr "警告" -#: src/Daemon/Daemon.cpp:546 +#: ../src/Daemon/Daemon.cpp:542 msgid "" "Report size exceeded the quota. Please check system's MaxCrashReportsSize " "value in abrt.conf." @@ -423,124 +423,127 @@ msgstr "" "報告のサイズが割り当て超過です。abrt.conf の中で MaxCrashReportsSize の値を " "チェックして下さい。" -#: lib/Plugins/Bugzilla.cpp:83 +#: ../lib/Plugins/Bugzilla.cpp:83 msgid "Empty login and password. Please check Bugzilla.conf" msgstr "ログインとパスワードが空です。Bugzilla.conf を確認して下さい" -#: lib/Plugins/Bugzilla.cpp:227 +#: ../lib/Plugins/Bugzilla.cpp:205 msgid "Bug is already reported: " msgstr "バグは既に報告済みです:" -#: lib/Plugins/Bugzilla.cpp:282 +#: ../lib/Plugins/Bugzilla.cpp:260 #, c-format msgid "Binary file %s will not be reported." msgstr "バイナリファイル %s は報告されません。" -#: lib/Plugins/Bugzilla.cpp:352 +#: ../lib/Plugins/Bugzilla.cpp:330 msgid "New bug id: " msgstr "新しいバグ id:" -#: lib/Plugins/Bugzilla.cpp:421 +#: ../lib/Plugins/Bugzilla.cpp:399 msgid "Checking for duplicates..." msgstr "重複をチェックしています..." -#: lib/Plugins/Bugzilla.cpp:424 lib/Plugins/Bugzilla.cpp:436 +#: ../lib/Plugins/Bugzilla.cpp:402 ../lib/Plugins/Bugzilla.cpp:413 msgid "Logging into bugzilla..." msgstr "bugzilla にログインしています..." -#: lib/Plugins/Bugzilla.cpp:427 -msgid "Check CC and add coment +1..." -msgstr "CC を確認して、コメント +1 を追加します..." +#: ../lib/Plugins/Bugzilla.cpp:405 +msgid "Checking CC..." +msgstr "CC をチェックしています..." -#: lib/Plugins/Bugzilla.cpp:448 +#: ../lib/Plugins/Bugzilla.cpp:425 msgid "Creating new bug..." msgstr "新しいバグを作成中..." -#: lib/Plugins/Bugzilla.cpp:453 +#: ../lib/Plugins/Bugzilla.cpp:430 msgid "Logging out..." msgstr "ログアウトしています..." -#: lib/Plugins/Kerneloops.cpp:37 +#: ../lib/Plugins/Kerneloops.cpp:37 msgid "Getting local universal unique identification" msgstr "ローカルで普遍的な独特の識別を取得しています" -#: lib/Plugins/CCpp.cpp:146 +#: ../lib/Plugins/CCpp.cpp:153 msgid "Getting backtrace..." msgstr "バックトレース取得中..." -#: lib/Plugins/CCpp.cpp:410 +#: ../lib/Plugins/CCpp.cpp:425 msgid "Searching for debug-info packages..." msgstr "debug-info パッケージを探しています..." -#: lib/Plugins/CCpp.cpp:444 +#: ../lib/Plugins/CCpp.cpp:487 msgid "Downloading and installing debug-info packages..." msgstr "debug-info パッケージをダウンロードしてインストール中..." -#: lib/Plugins/CCpp.cpp:506 +#: ../lib/Plugins/CCpp.cpp:549 msgid "Getting local universal unique identification..." msgstr "ローカルで普遍的な独特の識別を取得しています..." -#: lib/Plugins/CCpp.cpp:525 +#: ../lib/Plugins/CCpp.cpp:568 msgid "Getting global universal unique identification..." msgstr "グローバルで普遍的な独特の識別を取得しています..." -#: lib/Plugins/CCpp.cpp:576 +#: ../lib/Plugins/CCpp.cpp:619 msgid "Starting report creation..." msgstr "報告作成を開始しています..." -#: lib/Plugins/CCpp.cpp:605 +#: ../lib/Plugins/CCpp.cpp:649 msgid "Skipping debuginfo installation" msgstr "debuginfo のインストールをスキップします" -#: lib/Plugins/KerneloopsReporter.cpp:101 +#: ../lib/Plugins/KerneloopsReporter.cpp:101 msgid "Creating and submitting a report..." msgstr "報告の作成と提出をしています..." -#: lib/Plugins/Logger.cpp:58 lib/Plugins/Mailx.cpp:123 +#: ../lib/Plugins/Logger.cpp:58 ../lib/Plugins/Mailx.cpp:123 msgid "Creating a report..." msgstr "報告を作成しています..." -#: lib/Plugins/RunApp.cpp:62 +#: ../lib/Plugins/RunApp.cpp:62 msgid "Executing RunApp plugin..." msgstr "RunApp plugin を実行中..." -#: lib/Plugins/FileTransfer.cpp:60 lib/Plugins/FileTransfer.cpp:355 +#: ../lib/Plugins/FileTransfer.cpp:63 ../lib/Plugins/FileTransfer.cpp:409 msgid "FileTransfer: URL not specified" msgstr "ファイル転送: URL が示されていません" -#: lib/Plugins/FileTransfer.cpp:77 +#: ../lib/Plugins/FileTransfer.cpp:81 #, c-format msgid "Sending archive %s via %s" msgstr "アーカイブ %s を %s 経由で送信中" -#: lib/Plugins/FileTransfer.cpp:284 +#: ../lib/Plugins/FileTransfer.cpp:336 msgid "File Transfer: Creating a report..." msgstr "ファイル転送: 報告を作成中..." -#: lib/Plugins/FileTransfer.cpp:305 lib/Plugins/FileTransfer.cpp:334 +#: ../lib/Plugins/FileTransfer.cpp:358 ../lib/Plugins/FileTransfer.cpp:386 msgid "CFileTransfer::Run(): Cannot create and send an archive: " msgstr "CFileTransfer::Run(): アーカイブを作成して送信できません:" -#: lib/Plugins/KerneloopsScanner.cpp:79 +#: ../lib/Plugins/KerneloopsScanner.cpp:79 msgid "Creating kernel oops crash reports..." msgstr "カーネル oops クラッシュ報告を作成中..." -#: lib/Plugins/Mailx.cpp:109 +#: ../lib/Plugins/Mailx.cpp:109 msgid "Sending an email..." msgstr "電子メールを送信中..." -#: lib/Plugins/SOSreport.cpp:113 +#: ../lib/Plugins/SOSreport.cpp:113 msgid "Executing SOSreport plugin..." msgstr "SOSreport plugin の実行中..." -#: lib/Plugins/SOSreport.cpp:135 +#: ../lib/Plugins/SOSreport.cpp:135 msgid "running sosreport: " msgstr "sosreport を実行しています:" -#: lib/Plugins/SOSreport.cpp:150 +#: ../lib/Plugins/SOSreport.cpp:150 msgid "done running sosreport" msgstr "sosreport の実行完了" +#~ msgid "Check CC and add coment +1..." +#~ msgstr "CC を確認して、コメント +1 を追加します..." + #~ msgid "Pending events: %i" #~ msgstr "保留中のイベント: %i" @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: abrt\n" "Report-Msgid-Bugs-To: jmoskovc@redhat.com\n" -"POT-Creation-Date: 2009-10-06 04:15+0000\n" -"PO-Revision-Date: 2009-10-06 09:29+0200\n" +"POT-Creation-Date: 2009-10-08 17:38+0000\n" +"PO-Revision-Date: 2009-10-08 21:12+0200\n" "Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n" "Language-Team: nl <nl@li.org>\n" "MIME-Version: 1.0\n" @@ -26,35 +26,35 @@ msgid "Got unexpected data from daemon (is the database properly updated?)." msgstr "" "Kreeg niet verwachte data van daemon (is de database correct vernieuwd?)." -#: ../src/Gui/ABRTPlugin.py:45 +#: ../src/Gui/ABRTPlugin.py:48 msgid "Analyzer plugins" msgstr "Analyse plugins" -#: ../src/Gui/ABRTPlugin.py:46 +#: ../src/Gui/ABRTPlugin.py:49 msgid "Action plugins" msgstr "Actie plugins" -#: ../src/Gui/ABRTPlugin.py:47 +#: ../src/Gui/ABRTPlugin.py:50 msgid "Reporter plugins" msgstr "Rapporteer plugins" -#: ../src/Gui/ABRTPlugin.py:48 +#: ../src/Gui/ABRTPlugin.py:51 msgid "Database plugins" msgstr "Databse plugins" -#: ../src/Gui/ABRTPlugin.py:87 +#: ../src/Gui/ABRTPlugin.py:90 msgid "Plugin name is not set, can't load it's settings" msgstr "Plugin naam is niet opgegeven, kan zijn instellingen niet laden" -#: ../src/Gui/CCDBusBackend.py:138 -msgid "Can't connect to dbus" -msgstr "Kan niet verbinden met dbus" +#: ../src/Gui/CCDBusBackend.py:74 ../src/Gui/CCDBusBackend.py:97 +msgid "Can't connect to system dbus" +msgstr "Kan niet verbinden met systeem dbus" -#: ../src/Gui/CCDBusBackend.py:148 -msgid "Please check if abrt daemon is running." -msgstr "Controleer a.u.b. of de abrt daemon draait." +#: ../src/Gui/CCDBusBackend.py:100 ../src/Gui/CCDBusBackend.py:103 +msgid "Please check if abrt daemon is running" +msgstr "Controleer a.u.b. of de abrt daemon draait" -#: ../src/Gui/CCDBusBackend.py:158 +#: ../src/Gui/CCDBusBackend.py:155 msgid "" "Daemon did't return valid report info\n" "Debuginfo is missing?" @@ -207,7 +207,7 @@ msgstr "" "Kan geen rapport krijgen!\n" "Mist debuginfo?" -#: ../src/Gui/CCMainWindow.py:307 +#: ../src/Gui/CCMainWindow.py:308 #, python-format msgid "" "Reporting failed!\n" @@ -216,7 +216,7 @@ msgstr "" "Rapporteren mislukte!\n" "%s" -#: ../src/Gui/CCMainWindow.py:339 +#: ../src/Gui/CCMainWindow.py:340 #, python-format msgid "Error getting the report: %s" msgstr "Fout tijdens het verkrijgen van het rapport: %s" @@ -254,11 +254,11 @@ msgstr "Kan geen PluginDialog widget in UI beschrijving vinden!" msgid "No UI for plugin %s" msgstr "Geen UI voor plugin %s" -#: ../src/Gui/PluginSettingsUI.py:41 ../src/Gui/PluginSettingsUI.py:67 +#: ../src/Gui/PluginSettingsUI.py:55 ../src/Gui/PluginSettingsUI.py:81 msgid "combo box is not implemented" msgstr "combo box is niet geïmplementeertd" -#: ../src/Gui/PluginSettingsUI.py:50 +#: ../src/Gui/PluginSettingsUI.py:64 msgid "Nothing to hydrate!" msgstr "Kan het niet hard maken!" @@ -282,11 +282,11 @@ msgstr "<b>Selecteer een plugin</b>" msgid "<b>Select database backend</b>" msgstr "<b>Selecteer database back-end</b>" -#: ../src/Gui/SettingsDialog.py:165 +#: ../src/Gui/SettingsDialog.py:168 msgid "Remove this job" msgstr "Verwijder deze taak" -#: ../src/Gui/SettingsDialog.py:208 +#: ../src/Gui/SettingsDialog.py:211 msgid "Remove this action" msgstr "Verwijder deze actie" @@ -423,36 +423,36 @@ msgstr "" msgid "Empty login and password. Please check Bugzilla.conf" msgstr "Leeg login en wachtwoord. Check a.u.b. Bugzilla.conf" -#: ../lib/Plugins/Bugzilla.cpp:227 +#: ../lib/Plugins/Bugzilla.cpp:205 msgid "Bug is already reported: " msgstr "Bug is al aangemeld: " -#: ../lib/Plugins/Bugzilla.cpp:282 +#: ../lib/Plugins/Bugzilla.cpp:260 #, c-format msgid "Binary file %s will not be reported." msgstr "Binair bestand %s wordt niet gerapporteerd." -#: ../lib/Plugins/Bugzilla.cpp:352 +#: ../lib/Plugins/Bugzilla.cpp:330 msgid "New bug id: " msgstr "Nieuwe bug id: " -#: ../lib/Plugins/Bugzilla.cpp:421 +#: ../lib/Plugins/Bugzilla.cpp:399 msgid "Checking for duplicates..." msgstr "Controleren voor dubbele..." -#: ../lib/Plugins/Bugzilla.cpp:424 ../lib/Plugins/Bugzilla.cpp:436 +#: ../lib/Plugins/Bugzilla.cpp:402 ../lib/Plugins/Bugzilla.cpp:413 msgid "Logging into bugzilla..." msgstr "Inloggen bij bugzilla..." -#: ../lib/Plugins/Bugzilla.cpp:427 -msgid "Check CC and add coment +1..." -msgstr "Controleer CC en voeg commentaar toe +1..." +#: ../lib/Plugins/Bugzilla.cpp:405 +msgid "Checking CC..." +msgstr "Controleren van CC..." -#: ../lib/Plugins/Bugzilla.cpp:448 +#: ../lib/Plugins/Bugzilla.cpp:425 msgid "Creating new bug..." msgstr "Nieuwe bug aanmaken..." -#: ../lib/Plugins/Bugzilla.cpp:453 +#: ../lib/Plugins/Bugzilla.cpp:430 msgid "Logging out..." msgstr "Uitloggen..." @@ -464,27 +464,27 @@ msgstr "Verkrijgen van locale universele unieke identificatie" msgid "Getting backtrace..." msgstr "Backtrace ophalen..." -#: ../lib/Plugins/CCpp.cpp:410 +#: ../lib/Plugins/CCpp.cpp:415 msgid "Searching for debug-info packages..." msgstr "Zoeken naar debug-info pakketten..." -#: ../lib/Plugins/CCpp.cpp:446 +#: ../lib/Plugins/CCpp.cpp:451 msgid "Downloading and installing debug-info packages..." msgstr "Downloaden en installeren van debug-info pakketten..." -#: ../lib/Plugins/CCpp.cpp:508 +#: ../lib/Plugins/CCpp.cpp:513 msgid "Getting local universal unique identification..." msgstr "Verkrijgen van locale universele unieke identificatie..." -#: ../lib/Plugins/CCpp.cpp:527 +#: ../lib/Plugins/CCpp.cpp:532 msgid "Getting global universal unique identification..." msgstr "Verkrijgen van golbale universele unieke identificatie..." -#: ../lib/Plugins/CCpp.cpp:578 +#: ../lib/Plugins/CCpp.cpp:583 msgid "Starting report creation..." msgstr "Beginnen met rapport aanmaken..." -#: ../lib/Plugins/CCpp.cpp:607 +#: ../lib/Plugins/CCpp.cpp:612 msgid "Skipping debuginfo installation" msgstr "Sla debuginfo installatie over" @@ -537,6 +537,9 @@ msgstr "sosreport draaien: " msgid "done running sosreport" msgstr "klaar met het draaien van sosreport" +#~ msgid "Check CC and add coment +1..." +#~ msgstr "Controleer CC en voeg commentaar toe +1..." + #~ msgid "Creating an archive..." #~ msgstr "Aanmaken van een archief..." @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: jmoskovc@redhat.com\n" -"POT-Creation-Date: 2009-10-06 14:25+0000\n" -"PO-Revision-Date: 2009-10-06 16:30+0200\n" +"POT-Creation-Date: 2009-10-08 17:38+0000\n" +"PO-Revision-Date: 2009-10-08 19:40+0200\n" "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n" "Language-Team: Polish <fedora-trans-pl@redhat.com>\n" "MIME-Version: 1.0\n" @@ -44,15 +44,15 @@ msgstr "Wtyczki baz danych" msgid "Plugin name is not set, can't load it's settings" msgstr "Nie ustawiono nazwy wtyczki, nie można wczytać jej ustawień" -#: ../src/Gui/CCDBusBackend.py:138 -msgid "Can't connect to dbus" -msgstr "Nie można połączyć się z D-Bus" +#: ../src/Gui/CCDBusBackend.py:74 ../src/Gui/CCDBusBackend.py:97 +msgid "Can't connect to system dbus" +msgstr "Nie można połączyć się z systemową magistralą D-Bus" -#: ../src/Gui/CCDBusBackend.py:148 -msgid "Please check if abrt daemon is running." -msgstr "Proszę sprawdzić, czy demon abrt jest uruchomiony." +#: ../src/Gui/CCDBusBackend.py:100 ../src/Gui/CCDBusBackend.py:103 +msgid "Please check if abrt daemon is running" +msgstr "Proszę sprawdzić, czy demon abrt jest uruchomiony" -#: ../src/Gui/CCDBusBackend.py:158 +#: ../src/Gui/CCDBusBackend.py:155 msgid "" "Daemon did't return valid report info\n" "Debuginfo is missing?" @@ -249,7 +249,7 @@ msgstr "gtk-ok" #: ../src/Gui/PluginSettingsUI.py:18 msgid "Can't find PluginDialog widget in UI description!" msgstr "" -"Nie można znaleźć widgetu PluginDialog w opisie interfejsu użytkownika." +"Nie można odnaleźć widgetu PluginDialog w opisie interfejsu użytkownika." #. we shouldn't get here, but just to be safe #: ../src/Gui/PluginSettingsUI.py:24 @@ -257,11 +257,11 @@ msgstr "" msgid "No UI for plugin %s" msgstr "Brak interfejsu użytkownika dla wtyczki %s" -#: ../src/Gui/PluginSettingsUI.py:41 ../src/Gui/PluginSettingsUI.py:67 +#: ../src/Gui/PluginSettingsUI.py:55 ../src/Gui/PluginSettingsUI.py:81 msgid "combo box is not implemented" msgstr "pole kombinowane nie jest zaimplementowane" -#: ../src/Gui/PluginSettingsUI.py:50 +#: ../src/Gui/PluginSettingsUI.py:64 msgid "Nothing to hydrate!" msgstr "Brak danych do wyświetlenia." @@ -426,36 +426,36 @@ msgstr "" msgid "Empty login and password. Please check Bugzilla.conf" msgstr "Pola login i hasło są puste. Proszę sprawdzić plik Bugzilla.conf" -#: ../lib/Plugins/Bugzilla.cpp:227 +#: ../lib/Plugins/Bugzilla.cpp:205 msgid "Bug is already reported: " msgstr "Błąd został już wcześniej zgłoszony: " -#: ../lib/Plugins/Bugzilla.cpp:282 +#: ../lib/Plugins/Bugzilla.cpp:260 #, c-format msgid "Binary file %s will not be reported." msgstr "Plik binarny %s nie zostanie zgłoszony." -#: ../lib/Plugins/Bugzilla.cpp:352 +#: ../lib/Plugins/Bugzilla.cpp:330 msgid "New bug id: " msgstr "Identyfikator nowego błędu: " -#: ../lib/Plugins/Bugzilla.cpp:421 +#: ../lib/Plugins/Bugzilla.cpp:399 msgid "Checking for duplicates..." msgstr "Sprawdzanie duplikatów..." -#: ../lib/Plugins/Bugzilla.cpp:424 ../lib/Plugins/Bugzilla.cpp:436 +#: ../lib/Plugins/Bugzilla.cpp:402 ../lib/Plugins/Bugzilla.cpp:413 msgid "Logging into bugzilla..." msgstr "Logowanie do Bugzilli..." -#: ../lib/Plugins/Bugzilla.cpp:427 -msgid "Check CC and add coment +1..." -msgstr "Powiadamianie o zmianach i wstawienie komentarza \"+1\"..." +#: ../lib/Plugins/Bugzilla.cpp:405 +msgid "Checking CC..." +msgstr "Sprawdzanie listy CC..." -#: ../lib/Plugins/Bugzilla.cpp:448 +#: ../lib/Plugins/Bugzilla.cpp:425 msgid "Creating new bug..." msgstr "Dodawanie nowego błędu..." -#: ../lib/Plugins/Bugzilla.cpp:453 +#: ../lib/Plugins/Bugzilla.cpp:430 msgid "Logging out..." msgstr "Wylogowywanie..." @@ -467,27 +467,27 @@ msgstr "Uzyskiwanie lokalnego uniwersalnego, unikalnego identyfikatora" msgid "Getting backtrace..." msgstr "Uzyskiwanie wyjątku..." -#: ../lib/Plugins/CCpp.cpp:410 +#: ../lib/Plugins/CCpp.cpp:415 msgid "Searching for debug-info packages..." msgstr "Wyszukiwanie pakietów debuginfo..." -#: ../lib/Plugins/CCpp.cpp:446 +#: ../lib/Plugins/CCpp.cpp:451 msgid "Downloading and installing debug-info packages..." msgstr "Pobieranie i instalowanie pakietów debuginfo..." -#: ../lib/Plugins/CCpp.cpp:508 +#: ../lib/Plugins/CCpp.cpp:513 msgid "Getting local universal unique identification..." msgstr "Uzyskiwanie lokalnego uniwersalnego, unikalnego identyfikatora..." -#: ../lib/Plugins/CCpp.cpp:527 +#: ../lib/Plugins/CCpp.cpp:532 msgid "Getting global universal unique identification..." msgstr "Uzyskiwanie globalnego uniwersalnego, unikalnego identyfikatora..." -#: ../lib/Plugins/CCpp.cpp:578 +#: ../lib/Plugins/CCpp.cpp:583 msgid "Starting report creation..." msgstr "Uruchamianie tworzenia raportu..." -#: ../lib/Plugins/CCpp.cpp:607 +#: ../lib/Plugins/CCpp.cpp:612 msgid "Skipping debuginfo installation" msgstr "Pomijanie instalacji pakietu debuginfo" @@ -538,5 +538,4 @@ msgstr "wykonywanie sosreport: " #: ../lib/Plugins/SOSreport.cpp:150 msgid "done running sosreport" -msgstr "zakończono wykonywanie sosreport" - +msgstr "ukończono wykonywanie sosreport" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: abrt\n" "Report-Msgid-Bugs-To: jmoskovc@redhat.com\n" -"POT-Creation-Date: 2009-10-05 21:13+0000\n" +"POT-Creation-Date: 2009-10-08 21:21+0000\n" "PO-Revision-Date: \n" "Last-Translator: Rui Gouveia <rui.gouveia@globaltek.pt>\n" "Language-Team: PT <fedora-trans-pt@redhat.com>\n" @@ -20,35 +20,37 @@ msgstr "Outro cliente já está em execução. A tentar despertá-lo." msgid "Got unexpected data from daemon (is the database properly updated?)." msgstr "Obteve-se dados inesperados do serviço (a base de dados está actualizada?)" -#: ../src/Gui/ABRTPlugin.py:45 +#: ../src/Gui/ABRTPlugin.py:48 msgid "Analyzer plugins" msgstr "Plugins de análise" -#: ../src/Gui/ABRTPlugin.py:46 +#: ../src/Gui/ABRTPlugin.py:49 msgid "Action plugins" msgstr "Plugins de acções" -#: ../src/Gui/ABRTPlugin.py:47 +#: ../src/Gui/ABRTPlugin.py:50 msgid "Reporter plugins" msgstr "Plugins de relatórios" -#: ../src/Gui/ABRTPlugin.py:48 +#: ../src/Gui/ABRTPlugin.py:51 msgid "Database plugins" msgstr "Plugins de bases de dados" -#: ../src/Gui/ABRTPlugin.py:87 +#: ../src/Gui/ABRTPlugin.py:90 msgid "Plugin name is not set, can't load it's settings" msgstr "Nome do plugin não está definido, incapaz de carregar configurações" -#: ../src/Gui/CCDBusBackend.py:138 -msgid "Can't connect to dbus" -msgstr "Incapaz de ligar ao dbus" +#: ../src/Gui/CCDBusBackend.py:74 +#: ../src/Gui/CCDBusBackend.py:97 +msgid "Can't connect to system dbus" +msgstr "Incapaz de ligar ao sistema dbus" -#: ../src/Gui/CCDBusBackend.py:148 -msgid "Please check if abrt daemon is running." -msgstr "Por favor verifique se o serviço abrt está a correr." +#: ../src/Gui/CCDBusBackend.py:100 +#: ../src/Gui/CCDBusBackend.py:103 +msgid "Please check if abrt daemon is running" +msgstr "Por favor verifique se o serviço abrt está a correr" -#: ../src/Gui/CCDBusBackend.py:158 +#: ../src/Gui/CCDBusBackend.py:155 msgid "" "Daemon did't return valid report info\n" "Debuginfo is missing?" @@ -188,7 +190,7 @@ msgstr "" "Não foi possível obter o relatório!\n" "Debuginfo está em falta?" -#: ../src/Gui/CCMainWindow.py:307 +#: ../src/Gui/CCMainWindow.py:308 #, python-format msgid "" "Reporting failed!\n" @@ -197,7 +199,7 @@ msgstr "" "Relatório falhou!\n" "%s" -#: ../src/Gui/CCMainWindow.py:339 +#: ../src/Gui/CCMainWindow.py:340 #, python-format msgid "Error getting the report: %s" msgstr "Erro ao obter o relatório: %s" @@ -234,12 +236,12 @@ msgstr "Não foi possível encontrar na descrição do UI o objecto PluginDialog msgid "No UI for plugin %s" msgstr "Não existe interface de utilizador para o plugin %s" -#: ../src/Gui/PluginSettingsUI.py:41 -#: ../src/Gui/PluginSettingsUI.py:67 +#: ../src/Gui/PluginSettingsUI.py:55 +#: ../src/Gui/PluginSettingsUI.py:81 msgid "combo box is not implemented" msgstr "caixa de combinação não está implementada" -#: ../src/Gui/PluginSettingsUI.py:50 +#: ../src/Gui/PluginSettingsUI.py:64 msgid "Nothing to hydrate!" msgstr "Nada para fazer!" @@ -265,11 +267,11 @@ msgstr "<b>Seleccione plugin</b>" msgid "<b>Select database backend</b>" msgstr "<b>Seleccione base de dados</b>" -#: ../src/Gui/SettingsDialog.py:165 +#: ../src/Gui/SettingsDialog.py:168 msgid "Remove this job" msgstr "Remover esta tarefa" -#: ../src/Gui/SettingsDialog.py:208 +#: ../src/Gui/SettingsDialog.py:211 msgid "Remove this action" msgstr "Remover esta acção" @@ -403,37 +405,37 @@ msgstr "O relatório excedeu a cota. Por favor, verifique o valor MaxCrashReport msgid "Empty login and password. Please check Bugzilla.conf" msgstr "Nome de utilizador e senha vazios. Por favor, verifique Bugzilla.conf" -#: ../lib/Plugins/Bugzilla.cpp:227 +#: ../lib/Plugins/Bugzilla.cpp:205 msgid "Bug is already reported: " msgstr "Erro já foi reportado: " -#: ../lib/Plugins/Bugzilla.cpp:282 +#: ../lib/Plugins/Bugzilla.cpp:260 #, c-format msgid "Binary file %s will not be reported." msgstr "Ficheiro binário %s não será reportado." -#: ../lib/Plugins/Bugzilla.cpp:352 +#: ../lib/Plugins/Bugzilla.cpp:330 msgid "New bug id: " msgstr "Criar novo ID de erro: " -#: ../lib/Plugins/Bugzilla.cpp:421 +#: ../lib/Plugins/Bugzilla.cpp:399 msgid "Checking for duplicates..." msgstr "A procurar por duplicados..." -#: ../lib/Plugins/Bugzilla.cpp:424 -#: ../lib/Plugins/Bugzilla.cpp:436 +#: ../lib/Plugins/Bugzilla.cpp:402 +#: ../lib/Plugins/Bugzilla.cpp:413 msgid "Logging into bugzilla..." msgstr "A iniciar sessão no bugzilla..." -#: ../lib/Plugins/Bugzilla.cpp:427 -msgid "Check CC and add coment +1..." -msgstr "Verifique o campo CC e adicione o comentário +1..." +#: ../lib/Plugins/Bugzilla.cpp:405 +msgid "Checking CC..." +msgstr "A verificar CC..." -#: ../lib/Plugins/Bugzilla.cpp:448 +#: ../lib/Plugins/Bugzilla.cpp:425 msgid "Creating new bug..." msgstr "A criar novo erro..." -#: ../lib/Plugins/Bugzilla.cpp:453 +#: ../lib/Plugins/Bugzilla.cpp:430 msgid "Logging out..." msgstr "A Terminar Sessão..." @@ -445,27 +447,27 @@ msgstr "A obter identificador único universal local" msgid "Getting backtrace..." msgstr "A obter dados do processo..." -#: ../lib/Plugins/CCpp.cpp:410 +#: ../lib/Plugins/CCpp.cpp:415 msgid "Searching for debug-info packages..." msgstr "A pesquisar por pacotes debug-info..." -#: ../lib/Plugins/CCpp.cpp:446 +#: ../lib/Plugins/CCpp.cpp:451 msgid "Downloading and installing debug-info packages..." msgstr "A transferir e instalar pacotes debug-info..." -#: ../lib/Plugins/CCpp.cpp:508 +#: ../lib/Plugins/CCpp.cpp:513 msgid "Getting local universal unique identification..." msgstr "A obter identificador único universal local..." -#: ../lib/Plugins/CCpp.cpp:527 +#: ../lib/Plugins/CCpp.cpp:532 msgid "Getting global universal unique identification..." msgstr "A obter identificador único universal global..." -#: ../lib/Plugins/CCpp.cpp:578 +#: ../lib/Plugins/CCpp.cpp:583 msgid "Starting report creation..." msgstr "A iniciar a criação do relatório..." -#: ../lib/Plugins/CCpp.cpp:607 +#: ../lib/Plugins/CCpp.cpp:612 msgid "Skipping debuginfo installation" msgstr "A passar à frente a instalação do debuginfo" @@ -521,6 +523,8 @@ msgstr "A executar sosreport: " msgid "done running sosreport" msgstr "execução do sosreport terminou" +#~ msgid "Check CC and add coment +1..." +#~ msgstr "Verifique o campo CC e adicione o comentário +1..." #~ msgid "Pending events: %i" #~ msgstr "Eventos pendentes: %i" #~ msgid "Can't create menu from the description, popup won't be available!\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index a3574a2..dee8478 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ABRT\n" "Report-Msgid-Bugs-To: jmoskovc@redhat.com\n" -"POT-Creation-Date: 2009-09-29 14:46+0200\n" -"PO-Revision-Date: 2009-09-22 15:52-0300\n" +"POT-Creation-Date: 2009-10-07 09:58+0000\n" +"PO-Revision-Date: 2009-10-07 12:18-0300\n" "Last-Translator: Igor Pires Soares <igor@projetofedora.org>\n" "Language-Team: Brazilian Portuguese <fedora-trans-pt_br@redhat.com>\n" "MIME-Version: 1.0\n" @@ -18,41 +18,43 @@ msgstr "" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: BRAZIL\n" -#: src/Gui/ABRTExceptions.py:4 +#: ../src/Gui/ABRTExceptions.py:6 msgid "Another client is already running, trying to wake it." msgstr "Outro cliente já está em execução, tentando acordá-lo." -#: src/Gui/ABRTExceptions.py:10 +#: ../src/Gui/ABRTExceptions.py:13 msgid "Got unexpected data from daemon (is the database properly updated?)." -msgstr "" -"Dados inesperados obtidos do daemon (o banco de dados está devidamente " -"atualizado?)." +msgstr "Dados inesperados obtidos do daemon (o banco de dados está devidamente atualizado?)." -#: src/Gui/ABRTPlugin.py:26 +#: ../src/Gui/ABRTPlugin.py:48 msgid "Analyzer plugins" msgstr "Plugins de análise" -#: src/Gui/ABRTPlugin.py:27 +#: ../src/Gui/ABRTPlugin.py:49 msgid "Action plugins" msgstr "Plugins de ação" -#: src/Gui/ABRTPlugin.py:28 +#: ../src/Gui/ABRTPlugin.py:50 msgid "Reporter plugins" msgstr "Plugins de relato" -#: src/Gui/ABRTPlugin.py:29 +#: ../src/Gui/ABRTPlugin.py:51 msgid "Database plugins" msgstr "Plugins de banco de dados" -#: src/Gui/CCDBusBackend.py:143 +#: ../src/Gui/ABRTPlugin.py:90 +msgid "Plugin name is not set, can't load it's settings" +msgstr "O nome do plugin não está definido, não é possível carregar as configurações dele" + +#: ../src/Gui/CCDBusBackend.py:138 msgid "Can't connect to dbus" msgstr "Não foi possível conectar ao dbus" -#: src/Gui/CCDBusBackend.py:169 +#: ../src/Gui/CCDBusBackend.py:148 msgid "Please check if abrt daemon is running." msgstr "Por favor, verifique se o daemon do abrt está em execução." -#: src/Gui/CCDBusBackend.py:187 +#: ../src/Gui/CCDBusBackend.py:158 msgid "" "Daemon did't return valid report info\n" "Debuginfo is missing?" @@ -60,116 +62,104 @@ msgstr "" "O daemon não retornou informações válidas no relatório\n" "O debuginfo está faltando?" -#: src/Gui/ccgui.glade:6 -msgid "Please wait.." -msgstr "Por favor aguarde..." - -#: src/Gui/ccgui.glade:16 -msgid "Working..." -msgstr "Processando..." - -#: src/Gui/ccgui.glade:49 +#: ../src/Gui/ccgui.glade.h:1 msgid " " msgstr " " -#: src/Gui/ccgui.glade:68 +#: ../src/Gui/ccgui.glade.h:2 +msgid "(C) 2009 Red Hat, Inc." +msgstr "(C) 2009 Red Hat, Inc." + +#: ../src/Gui/ccgui.glade.h:3 +#: ../src/Gui/CCMainWindow.py:240 +msgid "<b>Not reported!</b>" +msgstr "<b>Não relatado!</b>" + +#: ../src/Gui/ccgui.glade.h:4 +msgid "<span color=\"white\">Description</span>" +msgstr "<span color=\"white\">Descrição</span>" + +#: ../src/Gui/ccgui.glade.h:5 msgid "About ABRT" msgstr "Sobre o ABRT" -#: src/Gui/ccgui.glade:74 -msgid "(C) 2009 Red Hat, Inc." -msgstr "(C) 2009 Red Hat, Inc." +#: ../src/Gui/ccgui.glade.h:6 +msgid "Automatic Bug Reporting Tool" +msgstr "Ferramenta para o relato automático de erros" -#: src/Gui/ccgui.glade:75 +#: ../src/Gui/ccgui.glade.h:7 +msgid "Delete" +msgstr "Excluir" + +#: ../src/Gui/ccgui.glade.h:8 +msgid "Please wait.." +msgstr "Por favor aguarde..." + +#: ../src/Gui/ccgui.glade.h:9 +msgid "Plugins" +msgstr "Plugins" + +#: ../src/Gui/ccgui.glade.h:10 +#: ../src/Gui/report.glade.h:2 +msgid "Report" +msgstr "Relatar" + +#: ../src/Gui/ccgui.glade.h:11 msgid "" -"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.\n" +"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.\n" "\n" -"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.\n" +"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.\n" "\n" -"You should have received a copy of the GNU General Public License along with " -"this program. If not, see <http://www.gnu.org/licenses/>." +"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>." msgstr "" -"Este programa é um software livre; você pode redistribuí-lo e/ou modificá-lo " -"sob os termos da Licença Pública Geral GNU (GNU GPL) como publicada pela " -"Free Software Foundation; tanto a versão 2 da Licença ou (a sua escolha) " -"qualquer versão posterior.\n" +"Este programa é um software livre; você pode redistribuí-lo e/ou modificá-lo sob os termos da Licença Pública Geral GNU (GNU GPL) como publicada pela Free Software Foundation; tanto a versão 2 da Licença ou (a sua escolha) qualquer versão posterior.\n" "\n" -"Este programa é distribuído na esperança de que será útil, mas SEM NENHUMA " -"GARANTIA; até mesmo sem a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO " -"A UM PROPÓSITO EM PARTICULAR. Veja a Licença Pública Geral GNU (GNU GPL) " -"para mais detalhes.\n" +"Este programa é distribuído na esperança de que será útil, mas SEM NENHUMA GARANTIA; até mesmo sem a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO A UM PROPÓSITO EM PARTICULAR. Veja a Licença Pública Geral GNU (GNU GPL) para mais detalhes.\n" "\n" -"Você deve ter recebido uma cópia da GNU General Public License (GPL) junto " -"com este programa. Se não, acesse <http://www.gnu.org/licenses/>." +"Você deve ter recebido uma cópia da GNU General Public License (GPL) junto com este programa. Se não, acesse <http://www.gnu.org/licenses/>." -#: src/Gui/ccgui.glade:106 -msgid "Automatic Bug Reporting Tool" -msgstr "Ferramenta para o relato automático de erros" - -#: src/Gui/ccgui.glade:118 -msgid "_File" -msgstr "_Arquivo" +#: ../src/Gui/ccgui.glade.h:16 +msgid "Working..." +msgstr "Processando..." -#: src/Gui/ccgui.glade:138 +#: ../src/Gui/ccgui.glade.h:17 msgid "_Edit" msgstr "_Editar" -#: src/Gui/ccgui.glade:146 -msgid "Plugins" -msgstr "Plugins" +#: ../src/Gui/ccgui.glade.h:18 +msgid "_File" +msgstr "_Arquivo" -#: src/Gui/ccgui.glade:164 +#: ../src/Gui/ccgui.glade.h:19 msgid "_Help" msgstr "Aj_uda" -#: src/Gui/ccgui.glade:194 src/Gui/ccgui.glade:195 -msgid "Delete" -msgstr "Excluir" - -#: src/Gui/ccgui.glade:207 src/Gui/ccgui.glade:208 src/Gui/ccgui.glade:335 -#: src/Gui/report.glade:7 src/Gui/report.glade:24 -msgid "Report" -msgstr "Relatar" - -#: src/Gui/ccgui.glade:255 -msgid "<span color=\"white\">Description</span>" -msgstr "<span color=\"white\">Descrição</span>" - -#: src/Gui/ccgui.glade:297 src/Gui/CCMainWindow.py:239 -msgid "<b>Not reported!</b>" -msgstr "<b>Não relatado!</b>" - -#: src/Gui/CCMainWindow.py:80 +#. add pixbuff separatelly +#: ../src/Gui/CCMainWindow.py:80 msgid "Icon" msgstr "Ícone" -#: src/Gui/CCMainWindow.py:88 +#: ../src/Gui/CCMainWindow.py:88 msgid "Package" msgstr "Pacote" -#: src/Gui/CCMainWindow.py:89 +#: ../src/Gui/CCMainWindow.py:89 msgid "Application" msgstr "Aplicativo" -#: src/Gui/CCMainWindow.py:90 +#: ../src/Gui/CCMainWindow.py:90 msgid "Date" msgstr "Data" -#: src/Gui/CCMainWindow.py:91 +#: ../src/Gui/CCMainWindow.py:91 msgid "Crash Rate" msgstr "Taxa de travamento" -#: src/Gui/CCMainWindow.py:93 +#: ../src/Gui/CCMainWindow.py:93 msgid "User" msgstr "Usuário" -#: src/Gui/CCMainWindow.py:177 +#: ../src/Gui/CCMainWindow.py:178 #, python-format msgid "" "Unable to finish current task!\n" @@ -178,28 +168,25 @@ msgstr "" "Não foi possível finalizar a tarefa atual!\n" "%s" -#: src/Gui/CCMainWindow.py:194 +#: ../src/Gui/CCMainWindow.py:195 #, python-format msgid "" "Error while loading the dumplist, please check if abrt daemon is running\n" " %s" msgstr "" -"Erro ao carregar a lista de despejo, por favor, verifique se o daemon do " -"abrt está em execução\n" +"Erro ao carregar a lista de despejo, por favor, verifique se o daemon do abrt está em execução\n" " %s" -#: src/Gui/CCMainWindow.py:204 +#: ../src/Gui/CCMainWindow.py:205 #, python-format msgid "Can't get username for uid %s" msgstr "Não foi possível obter o nome de usuário para o uid %s" -#: src/Gui/CCMainWindow.py:231 +#: ../src/Gui/CCMainWindow.py:232 msgid "<b>This crash has been reported, you can find the report(s) at:</b>\n" -msgstr "" -"<b>Este travamento foi relatado, você pode localizar o(s) relatório(s) em:</" -"b>\n" +msgstr "<b>Este travamento foi relatado, você pode localizar o(s) relatório(s) em:</b>\n" -#: src/Gui/CCMainWindow.py:291 +#: ../src/Gui/CCMainWindow.py:292 msgid "" "Unable to get report!\n" "Debuginfo is missing?" @@ -207,7 +194,7 @@ msgstr "" "Não foi possível obter o relatório!\n" "O debuginfo está faltando?" -#: src/Gui/CCMainWindow.py:306 +#: ../src/Gui/CCMainWindow.py:308 #, python-format msgid "" "Reporting failed!\n" @@ -216,347 +203,340 @@ msgstr "" "Falha no relato!\n" "%s" -#: src/Gui/CCMainWindow.py:338 +#: ../src/Gui/CCMainWindow.py:340 #, python-format msgid "Error getting the report: %s" msgstr "Erro ao obter o relatório: %s" -#: src/Gui/CCReporterDialog.py:98 +#: ../src/Gui/CCReporterDialog.py:98 #, python-format msgid "" -"<b>WARNING</b>, you're about to send data which might contain sensitive " -"information.\n" +"<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>AVISO</b>, você está prestes a enviar dados que podem conter informações " -"delicadas.\n" +"<b>AVISO</b>, você está prestes a enviar dados que podem conter informações delicadas.\n" "Você realmente deseja enviar o <b>%s</b>?\n" -#: src/Gui/CCReporterDialog.py:111 +#: ../src/Gui/CCReporterDialog.py:111 msgid "Brief description how to reproduce this or what you did..." msgstr "Breve descrição sobre como reproduzir isto ou o que você fazia..." -#: src/Gui/dialogs.glade:7 +#: ../src/Gui/dialogs.glade.h:1 msgid "Report done" msgstr "Relato concluído" -#: src/Gui/dialogs.glade:47 src/Gui/settings.glade:695 -#: src/Gui/settings.glade:785 +#: ../src/Gui/dialogs.glade.h:2 +#: ../src/Gui/settings.glade.h:27 msgid "gtk-ok" msgstr "gtk-ok" -#: src/Gui/PluginSettingsUI.py:17 +#: ../src/Gui/PluginSettingsUI.py:18 msgid "Can't find PluginDialog widget in UI description!" -msgstr "" -"Não foi possível localizar o widget PluginDialog na descrição da interface " -"de usuário!" +msgstr "Não foi possível localizar o widget PluginDialog na descrição da interface de usuário!" -#: src/Gui/PluginSettingsUI.py:21 +#. we shouldn't get here, but just to be safe +#: ../src/Gui/PluginSettingsUI.py:24 #, python-format msgid "No UI for plugin %s" msgstr "Nenhuma interface de usuário para o plugin %s" -#: src/Gui/PluginSettingsUI.py:38 src/Gui/PluginSettingsUI.py:64 +#: ../src/Gui/PluginSettingsUI.py:41 +#: ../src/Gui/PluginSettingsUI.py:67 msgid "combo box is not implemented" msgstr "caixa de combinação não implementada" -#: src/Gui/PluginSettingsUI.py:47 +#: ../src/Gui/PluginSettingsUI.py:50 msgid "Nothing to hydrate!" msgstr "Nada a ser hidratado!" -#: src/Gui/report.glade:64 +#: ../src/Gui/report.glade.h:1 msgid "Comment" msgstr "Comentário" -#: src/Gui/report.glade:104 src/Gui/settings.glade:682 -#: src/Gui/settings.glade:797 -msgid "gtk-cancel" -msgstr "gtk-cancel" - -#: src/Gui/report.glade:119 +#: ../src/Gui/report.glade.h:3 msgid "Send" msgstr "Enviar" -#: src/Gui/SettingsDialog.py:34 src/Gui/SettingsDialog.py:51 +#: ../src/Gui/report.glade.h:4 +#: ../src/Gui/settings.glade.h:25 +msgid "gtk-cancel" +msgstr "gtk-cancel" + +#: ../src/Gui/SettingsDialog.py:34 +#: ../src/Gui/SettingsDialog.py:51 msgid "<b>Select plugin</b>" msgstr "<b>Selecionar plugin</b>" -#: src/Gui/SettingsDialog.py:37 +#: ../src/Gui/SettingsDialog.py:37 msgid "<b>Select database backend</b>" msgstr "<b>Selecione o backend de banco de dados</b>" -#: src/Gui/SettingsDialog.py:165 +#: ../src/Gui/SettingsDialog.py:168 msgid "Remove this job" msgstr "Remover este trabalho" -#: src/Gui/SettingsDialog.py:208 +#: ../src/Gui/SettingsDialog.py:211 msgid "Remove this action" msgstr "Remover esta ação" -#: src/Gui/settings.glade:6 -msgid "Settings" -msgstr "Configurações" +#: ../src/Gui/settings.glade.h:1 +msgid "<b>Analyzer plugin</b>" +msgstr "<b>Plugins de análise</b>" -#: src/Gui/settings.glade:46 src/Gui/settings.glade:55 -#: src/Gui/settings.glade:107 src/Gui/settings.glade:120 -#: src/Gui/settings.glade:133 -msgid "Nothing selected" -msgstr "Nada selecionado" +#: ../src/Gui/settings.glade.h:2 +msgid "<b>Associated action</b>" +msgstr "<b>Ação associada</b>" -#: src/Gui/settings.glade:72 -msgid "Web Site:" -msgstr "Web site:" +#: ../src/Gui/settings.glade.h:3 +msgid "<b>Plugin</b>" +msgstr "<b>Plugin</b>" + +#: ../src/Gui/settings.glade.h:4 +msgid "<b>Time (or period)</b>" +msgstr "<b>Tempo (ou período)</b>" + +#: ../src/Gui/settings.glade.h:5 +msgid "Analyzers, Actions, Reporters" +msgstr "Analisadores, ações e relatores" -#: src/Gui/settings.glade:84 +#: ../src/Gui/settings.glade.h:6 msgid "Author:" msgstr "Autor:" -#: src/Gui/settings.glade:97 -msgid "Version:" -msgstr "Versão:" - -#: src/Gui/settings.glade:152 -msgid "Plugin Details" -msgstr "Detalhes do plugin" +#: ../src/Gui/settings.glade.h:7 +msgid "Blacklisted packages: " +msgstr "Pacotes excluídos: " -#: src/Gui/settings.glade:179 +#: ../src/Gui/settings.glade.h:8 msgid "C_onfigure plugin" msgstr "C_onfigurar plugin" -#: src/Gui/settings.glade:191 -msgid "gtk-close" -msgstr "gtk-close" - -#: src/Gui/settings.glade:221 -msgid "Global Settings" -msgstr "Configurações globais" - -#: src/Gui/settings.glade:240 +#: ../src/Gui/settings.glade.h:9 msgid "Check package GPG signature" msgstr "Verificar assinatura GPG do pacote" -#: src/Gui/settings.glade:256 +#: ../src/Gui/settings.glade.h:10 +msgid "Common" +msgstr "Comum" + +#: ../src/Gui/settings.glade.h:11 +msgid "Cron" +msgstr "Cron" + +#: ../src/Gui/settings.glade.h:12 msgid "Database backend: " msgstr "Backend de banco de dados: " -#: src/Gui/settings.glade:281 -msgid "Blacklisted packages: " -msgstr "Pacotes excluídos: " +#: ../src/Gui/settings.glade.h:13 +msgid "Edit blacklisted packages" +msgstr "Editar pacotes excluídos" -#: src/Gui/settings.glade:294 -msgid "Max coredump storage size(MB):" -msgstr "Tamanho máximo (em MB) do despejo do núcleo:" +#: ../src/Gui/settings.glade.h:14 +msgid "GPG Keys" +msgstr "Chaves GPG" -#: src/Gui/settings.glade:307 +#: ../src/Gui/settings.glade.h:15 msgid "GPG keys: " msgstr "Chaves GPG: " -#: src/Gui/settings.glade:349 -msgid "Edit blacklisted packages" -msgstr "Editar pacotes excluídos" - -#: src/Gui/settings.glade:408 -msgid "Common" -msgstr "Comum" +#: ../src/Gui/settings.glade.h:16 +msgid "Global Settings" +msgstr "Configurações globais" -#: src/Gui/settings.glade:438 -msgid "<b>Plugin</b>" -msgstr "<b>Plugin</b>" +#: ../src/Gui/settings.glade.h:17 +msgid "Max coredump storage size(MB):" +msgstr "Tamanho máximo (em MB) do despejo do núcleo:" -#: src/Gui/settings.glade:448 -msgid "<b>Time (or period)</b>" -msgstr "<b>Tempo (ou período)</b>" +#: ../src/Gui/settings.glade.h:18 +msgid "Nothing selected" +msgstr "Nada selecionado" -#: src/Gui/settings.glade:510 src/Gui/settings.glade:624 -#: src/Gui/settings.glade:761 -msgid "gtk-add" -msgstr "gtk-add" +#: ../src/Gui/settings.glade.h:19 +msgid "Plugin Details" +msgstr "Detalhes do plugin" -#: src/Gui/settings.glade:534 -msgid "Cron" -msgstr "Cron" +#: ../src/Gui/settings.glade.h:20 +msgid "Settings" +msgstr "Configurações" -#: src/Gui/settings.glade:551 -msgid "<b>Analyzer plugin</b>" -msgstr "<b>Plugins de análise</b>" +#: ../src/Gui/settings.glade.h:21 +msgid "This function is not implemented yet!" +msgstr "Esta função não foi implementada ainda!" -#: src/Gui/settings.glade:561 -msgid "<b>Associated action</b>" -msgstr "<b>Ação associada</b>" +#: ../src/Gui/settings.glade.h:22 +msgid "Version:" +msgstr "Versão:" -#: src/Gui/settings.glade:648 -msgid "Analyzers, Actions, Reporters" -msgstr "Analisadores, ações e relatores" +#: ../src/Gui/settings.glade.h:23 +msgid "Web Site:" +msgstr "Web site:" -#: src/Gui/settings.glade:700 -msgid "This function is not implemented yet!" -msgstr "Esta função não foi implementada ainda!" +#: ../src/Gui/settings.glade.h:24 +msgid "gtk-add" +msgstr "gtk-add" -#: src/Gui/settings.glade:738 -msgid "GPG Keys" -msgstr "Chaves GPG" +#: ../src/Gui/settings.glade.h:26 +msgid "gtk-close" +msgstr "gtk-close" -#: src/Gui/settings.glade:773 +#: ../src/Gui/settings.glade.h:28 msgid "gtk-remove" msgstr "gtk-remove" -#: src/Applet/Applet.cpp:71 +#: ../src/Applet/Applet.cpp:71 #, c-format msgid "A crash in package %s has been detected" msgstr "Um travamento no pacote %s foi detectado" -#: src/Applet/Applet.cpp:130 +#: ../src/Applet/Applet.cpp:130 msgid "ABRT service has been started" msgstr "O serviço ABRT foi iniciado" -#: src/Applet/Applet.cpp:132 src/Applet/Applet.cpp:246 +#: ../src/Applet/Applet.cpp:132 +#: ../src/Applet/Applet.cpp:246 msgid "ABRT service is not running" msgstr "O serviço do ABRT não está em execução" -#: src/Applet/CCApplet.cpp:185 +#: ../src/Applet/CCApplet.cpp:185 msgid "Warning" msgstr "Aviso" -#: src/Daemon/Daemon.cpp:546 -msgid "" -"Report size exceeded the quota. Please check system's MaxCrashReportsSize " -"value in abrt.conf." -msgstr "" -"O tamanho do relatório excedeu a cota. Por favor, verifique o valor " -"MaxCrashReportsSize do sistema no abrt.conf." +#: ../src/Daemon/Daemon.cpp:546 +msgid "Report size exceeded the quota. Please check system's MaxCrashReportsSize value in abrt.conf." +msgstr "O tamanho do relatório excedeu a cota. Por favor, verifique o valor MaxCrashReportsSize do sistema no abrt.conf." -#: lib/Plugins/Bugzilla.cpp:83 +#: ../lib/Plugins/Bugzilla.cpp:83 msgid "Empty login and password. Please check Bugzilla.conf" msgstr "Nome de usuário e senha vazios. Por favor, verifique o Bugzilla.conf" -#: lib/Plugins/Bugzilla.cpp:227 +#: ../lib/Plugins/Bugzilla.cpp:227 msgid "Bug is already reported: " msgstr "O erro já foi relatado: " -#: lib/Plugins/Bugzilla.cpp:282 +#: ../lib/Plugins/Bugzilla.cpp:282 #, c-format msgid "Binary file %s will not be reported." msgstr "O arquivo binário %s não será relatado." -#: lib/Plugins/Bugzilla.cpp:352 +#: ../lib/Plugins/Bugzilla.cpp:352 msgid "New bug id: " msgstr "Novo id do erro: " -#: lib/Plugins/Bugzilla.cpp:421 +#: ../lib/Plugins/Bugzilla.cpp:421 msgid "Checking for duplicates..." msgstr "Verificando duplicatas..." -#: lib/Plugins/Bugzilla.cpp:424 lib/Plugins/Bugzilla.cpp:436 +#: ../lib/Plugins/Bugzilla.cpp:424 +#: ../lib/Plugins/Bugzilla.cpp:436 msgid "Logging into bugzilla..." msgstr "Autenticando no bugzilla..." -#: lib/Plugins/Bugzilla.cpp:427 +#: ../lib/Plugins/Bugzilla.cpp:427 msgid "Check CC and add coment +1..." msgstr "Verifique o CC e adicione o comentário +1..." -#: lib/Plugins/Bugzilla.cpp:448 +#: ../lib/Plugins/Bugzilla.cpp:448 msgid "Creating new bug..." msgstr "Criando novo erro..." -#: lib/Plugins/Bugzilla.cpp:453 +#: ../lib/Plugins/Bugzilla.cpp:453 msgid "Logging out..." msgstr "Encerrando sessão..." -#: lib/Plugins/Kerneloops.cpp:37 +#: ../lib/Plugins/Kerneloops.cpp:37 msgid "Getting local universal unique identification" msgstr "Obtendo identificação universal local única" -#: lib/Plugins/CCpp.cpp:146 +#: ../lib/Plugins/CCpp.cpp:146 msgid "Getting backtrace..." msgstr "Obtendo backtrace..." -#: lib/Plugins/CCpp.cpp:410 +#: ../lib/Plugins/CCpp.cpp:415 msgid "Searching for debug-info packages..." msgstr "Pesquisando por pacotes debug-info..." -#: lib/Plugins/CCpp.cpp:444 +#: ../lib/Plugins/CCpp.cpp:451 msgid "Downloading and installing debug-info packages..." msgstr "Baixando e instalando pacotes debug-info..." -#: lib/Plugins/CCpp.cpp:506 +#: ../lib/Plugins/CCpp.cpp:513 msgid "Getting local universal unique identification..." msgstr "Obtendo identificação universal local única..." -#: lib/Plugins/CCpp.cpp:525 +#: ../lib/Plugins/CCpp.cpp:532 msgid "Getting global universal unique identification..." msgstr "Obtendo identificação universal global única..." -#: lib/Plugins/CCpp.cpp:576 +#: ../lib/Plugins/CCpp.cpp:583 msgid "Starting report creation..." msgstr "Iniciando a criação do relatório..." -#: lib/Plugins/CCpp.cpp:605 +#: ../lib/Plugins/CCpp.cpp:612 msgid "Skipping debuginfo installation" msgstr "Pulando instalação do debuginfo" -#: lib/Plugins/KerneloopsReporter.cpp:101 +#: ../lib/Plugins/KerneloopsReporter.cpp:101 msgid "Creating and submitting a report..." msgstr "Criando e enviando um relatório..." -#: lib/Plugins/Logger.cpp:58 lib/Plugins/Mailx.cpp:123 +#: ../lib/Plugins/Logger.cpp:58 +#: ../lib/Plugins/Mailx.cpp:123 msgid "Creating a report..." msgstr "Criando um relatório..." -#: lib/Plugins/RunApp.cpp:62 +#: ../lib/Plugins/RunApp.cpp:62 msgid "Executing RunApp plugin..." msgstr "Executando o plugin RunApp..." -#: lib/Plugins/FileTransfer.cpp:60 lib/Plugins/FileTransfer.cpp:355 +#: ../lib/Plugins/FileTransfer.cpp:63 +#: ../lib/Plugins/FileTransfer.cpp:409 msgid "FileTransfer: URL not specified" msgstr "FileTransfer: URL não especificada" -#: lib/Plugins/FileTransfer.cpp:77 +#: ../lib/Plugins/FileTransfer.cpp:81 #, c-format msgid "Sending archive %s via %s" msgstr "Enviando o pacote %s via %s" -#: lib/Plugins/FileTransfer.cpp:284 +#: ../lib/Plugins/FileTransfer.cpp:336 msgid "File Transfer: Creating a report..." msgstr "File Transfer: Criando um relatório..." -#: lib/Plugins/FileTransfer.cpp:305 lib/Plugins/FileTransfer.cpp:334 +#: ../lib/Plugins/FileTransfer.cpp:358 +#: ../lib/Plugins/FileTransfer.cpp:386 msgid "CFileTransfer::Run(): Cannot create and send an archive: " msgstr "CFileTransfer::Run(): Não foi possível criar e enviar o pacote: " -#: lib/Plugins/KerneloopsScanner.cpp:79 +#: ../lib/Plugins/KerneloopsScanner.cpp:79 msgid "Creating kernel oops crash reports..." msgstr "Criando relatórios de oops do kernel no travamento..." -#: lib/Plugins/Mailx.cpp:109 +#: ../lib/Plugins/Mailx.cpp:109 msgid "Sending an email..." msgstr "Enviando email..." -#: lib/Plugins/SOSreport.cpp:113 +#: ../lib/Plugins/SOSreport.cpp:113 msgid "Executing SOSreport plugin..." msgstr "Executando o plugin SOSreport..." -#: lib/Plugins/SOSreport.cpp:135 +#: ../lib/Plugins/SOSreport.cpp:135 msgid "running sosreport: " msgstr "executando o sosreport: " -#: lib/Plugins/SOSreport.cpp:150 +#: ../lib/Plugins/SOSreport.cpp:150 msgid "done running sosreport" msgstr "Execução do sosreport realizada" #~ msgid "Pending events: %i" #~ msgstr "Eventos pendentes: %i" - #~ msgid "Can't create menu from the description, popup won't be available!\n" #~ msgstr "" #~ "Não foi possível criar um menu a partir da descrição, a janela " #~ "instantânea não estará disponível!\n" - #~ msgid "Creating an archive..." #~ msgstr "Criando um pacote..." - #~ msgid "Getting local/global universal unique identification..." #~ msgstr "Obtendo identificação universal local/global única..." - #~ msgid "" #~ "Error while opening plugin settings UI: \n" #~ "\n" @@ -565,20 +545,16 @@ msgstr "Execução do sosreport realizada" #~ "Erro ao abrir a interface de usuário das configurações do plugin: \n" #~ "\n" #~ "%s" - #~ msgid "" #~ "Can't save plugin settings:\n" #~ " %s" #~ msgstr "" #~ "Não foi possível salvar as configurações do plugin:\n" #~ " %s" - #~ msgid "unknown response from settings dialog" #~ msgstr "resposta desconhecida do diálogo de configurações" - #~ msgid "Applet is already running." #~ msgstr "O miniaplicativo já está em execução." - #~ msgid "" #~ "This is default handler, you should register your own with " #~ "ConnectCrashHandler" @@ -593,23 +569,18 @@ msgstr "Execução do sosreport realizada" #~ msgstr "" #~ "Este é o manipulador padrão, você deve registrar o seu próprio com o " #~ "ConnectCrashHandler" - #~ msgid "Out of memory" #~ msgstr "Memória insuficiente" - #~ msgid "Can't load gui description for SettingsDialog!" #~ msgstr "" #~ "Não foi possível carregar a descrição da interface gráfica de usuário " #~ "para o SettingsDialog!" - #~ msgid "Name" #~ msgstr "Nome" - #~ msgid "Enabled" #~ msgstr "Habilitado" - #~ msgid "Can't get plugin description" #~ msgstr "Não foi possível obter a descrição do plugin" - #~ msgid "Daemon is not running." #~ msgstr "O daemon não está em execução." + diff --git a/po/zh_CN.po b/po/zh_CN.po index e63ba5f..be4c685 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,52 +6,56 @@ msgid "" msgstr "" "Project-Id-Version: abrt.master\n" "Report-Msgid-Bugs-To: jmoskovc@redhat.com\n" -"POT-Creation-Date: 2009-10-01 22:53+0000\n" -"PO-Revision-Date: 2009-10-02 13:53+0800\n" +"POT-Creation-Date: 2009-10-08 04:40+0000\n" +"PO-Revision-Date: 2009-10-08 15:08+0800\n" "Last-Translator: cyrushmh <cyrushmh@vip.qq.com;cyrusyzgtt@gmail.com>\n" -"Language-Team: cvsl10n\n" -"Language: zh_CN\n" +"Language-Team: cvsl10n <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Virtaal 0.4.0\n" "X-Poedit-Language: Chinese\n" "X-Poedit-Country: CHINA\n" -#: ../src/Gui/ABRTExceptions.py:5 +#: ../src/Gui/ABRTExceptions.py:6 msgid "Another client is already running, trying to wake it." msgstr "另一用户机已在运行中，尝试唤醒中。" -#: ../src/Gui/ABRTExceptions.py:11 +#: ../src/Gui/ABRTExceptions.py:13 msgid "Got unexpected data from daemon (is the database properly updated?)." msgstr "从Daemon得到非预期的数据（数据库有否正确更新？）" -#: ../src/Gui/ABRTPlugin.py:26 +#: ../src/Gui/ABRTPlugin.py:48 msgid "Analyzer plugins" msgstr "Analyzer 插件 " -#: ../src/Gui/ABRTPlugin.py:27 +#: ../src/Gui/ABRTPlugin.py:49 msgid "Action plugins" msgstr "Action 插件 " -#: ../src/Gui/ABRTPlugin.py:28 +#: ../src/Gui/ABRTPlugin.py:50 msgid "Reporter plugins" msgstr "Reporter 插件 " -#: ../src/Gui/ABRTPlugin.py:29 +#: ../src/Gui/ABRTPlugin.py:51 msgid "Database plugins" msgstr "Database 插件 " -#: ../src/Gui/CCDBusBackend.py:138 -msgid "Can't connect to dbus" -msgstr "未能连结到dbus" +#: ../src/Gui/ABRTPlugin.py:90 +msgid "Plugin name is not set, can't load it's settings" +msgstr "插件名未设定，无法装载其设置。" + +#: ../src/Gui/CCDBusBackend.py:74 ../src/Gui/CCDBusBackend.py:97 +msgid "Can't connect to system dbus" +msgstr "未能连结到系统dbus" -#: ../src/Gui/CCDBusBackend.py:148 -msgid "Please check if abrt daemon is running." -msgstr "请检查abrt daemon是否运行中。" +#: ../src/Gui/CCDBusBackend.py:100 ../src/Gui/CCDBusBackend.py:103 +msgid "Please check if abrt daemon is running" +msgstr "请检查abrt daemon是否运行中" -#: ../src/Gui/CCDBusBackend.py:158 +#: ../src/Gui/CCDBusBackend.py:155 msgid "" "Daemon did't return valid report info\n" "Debuginfo is missing?" @@ -200,7 +204,7 @@ msgstr "" "未能取得报告书！\n" "会是因为调试数据的缺失吗？" -#: ../src/Gui/CCMainWindow.py:307 +#: ../src/Gui/CCMainWindow.py:308 #, python-format msgid "" "Reporting failed!\n" @@ -209,7 +213,7 @@ msgstr "" "报告失败！\n" "%s " -#: ../src/Gui/CCMainWindow.py:339 +#: ../src/Gui/CCMainWindow.py:340 #, python-format msgid "Error getting the report: %s" msgstr "取得报告时出错：%s" @@ -236,21 +240,21 @@ msgstr "报告完成" msgid "gtk-ok" msgstr "gtk-ok" -#: ../src/Gui/PluginSettingsUI.py:17 +#: ../src/Gui/PluginSettingsUI.py:18 msgid "Can't find PluginDialog widget in UI description!" msgstr "找不到 PluginDialog 的用户界面说明！" #. we shouldn't get here, but just to be safe -#: ../src/Gui/PluginSettingsUI.py:21 +#: ../src/Gui/PluginSettingsUI.py:24 #, python-format msgid "No UI for plugin %s" msgstr "插件 %s 并未有用户界面" -#: ../src/Gui/PluginSettingsUI.py:38 ../src/Gui/PluginSettingsUI.py:64 +#: ../src/Gui/PluginSettingsUI.py:41 ../src/Gui/PluginSettingsUI.py:67 msgid "combo box is not implemented" msgstr "combo box还未被建构" -#: ../src/Gui/PluginSettingsUI.py:47 +#: ../src/Gui/PluginSettingsUI.py:50 msgid "Nothing to hydrate!" msgstr "没有需要hydrate的东西！" @@ -274,11 +278,11 @@ msgstr "<b>选择插件</b>" msgid "<b>Select database backend</b>" msgstr "<b>选择数据库的后台</b>" -#: ../src/Gui/SettingsDialog.py:165 +#: ../src/Gui/SettingsDialog.py:168 msgid "Remove this job" msgstr "删除这项工作" -#: ../src/Gui/SettingsDialog.py:208 +#: ../src/Gui/SettingsDialog.py:211 msgid "Remove this action" msgstr "删除这个动作" @@ -291,9 +295,8 @@ msgid "<b>Associated action</b>" msgstr "<b>关联的动作</b>" #: ../src/Gui/settings.glade.h:3 -#, fuzzy msgid "<b>Plugin</b>" -msgstr "<b>选择插件</b>" +msgstr "<b>插件</b>" #: ../src/Gui/settings.glade.h:4 msgid "<b>Time (or period)</b>" @@ -312,27 +315,24 @@ msgid "Blacklisted packages: " msgstr "黑名单中的软件包：" #: ../src/Gui/settings.glade.h:8 -#, fuzzy msgid "C_onfigure plugin" -msgstr "设置Reporter插件 (_O)" +msgstr "设置插件(_O)" #: ../src/Gui/settings.glade.h:9 msgid "Check package GPG signature" msgstr "检查软件包的 GPG 签章" #: ../src/Gui/settings.glade.h:10 -#, fuzzy msgid "Common" -msgstr "一般 " +msgstr "一般" #: ../src/Gui/settings.glade.h:11 msgid "Cron" msgstr "克隆" #: ../src/Gui/settings.glade.h:12 -#, fuzzy msgid "Database backend: " -msgstr "<b>选择数据库的后台</b>" +msgstr "数据库的后台：" #: ../src/Gui/settings.glade.h:13 msgid "Edit blacklisted packages" @@ -347,7 +347,6 @@ msgid "GPG keys: " msgstr "GPG 金钥：" #: ../src/Gui/settings.glade.h:16 -#, fuzzy msgid "Global Settings" msgstr "全局设置" @@ -364,14 +363,12 @@ msgid "Plugin Details" msgstr "插件详情" #: ../src/Gui/settings.glade.h:20 -#, fuzzy msgid "Settings" -msgstr "全局设置" +msgstr "设置" #: ../src/Gui/settings.glade.h:21 -#, fuzzy msgid "This function is not implemented yet!" -msgstr "combo box还未被建构" +msgstr "函数还未被实现！" #: ../src/Gui/settings.glade.h:22 msgid "Version:" @@ -386,7 +383,6 @@ msgid "gtk-add" msgstr "gtk-add" #: ../src/Gui/settings.glade.h:26 -#, fuzzy msgid "gtk-close" msgstr "gtk-close" @@ -395,9 +391,9 @@ msgid "gtk-remove" msgstr "gtk-remove" #: ../src/Applet/Applet.cpp:71 -#, fuzzy, c-format +#, c-format msgid "A crash in package %s has been detected" -msgstr "发现了 %s 软件包的错误纪录！" +msgstr "发现了%s软件包的错误记录！" #: ../src/Applet/Applet.cpp:130 msgid "ABRT service has been started" @@ -455,36 +451,34 @@ msgid "Logging out..." msgstr "正在登出……" #: ../lib/Plugins/Kerneloops.cpp:37 -#, fuzzy msgid "Getting local universal unique identification" -msgstr "正在取得局域的UUID……" +msgstr "正在取得局域的UUID" #: ../lib/Plugins/CCpp.cpp:146 msgid "Getting backtrace..." msgstr "正在取得逆向跟踪数据……" -#: ../lib/Plugins/CCpp.cpp:410 +#: ../lib/Plugins/CCpp.cpp:415 msgid "Searching for debug-info packages..." msgstr "debug-info 软件包寻找中……" -#: ../lib/Plugins/CCpp.cpp:446 +#: ../lib/Plugins/CCpp.cpp:451 msgid "Downloading and installing debug-info packages..." msgstr "debug-info 软件包下载及安装中……" -#: ../lib/Plugins/CCpp.cpp:508 +#: ../lib/Plugins/CCpp.cpp:513 msgid "Getting local universal unique identification..." msgstr "正在取得局域的UUID……" -#: ../lib/Plugins/CCpp.cpp:527 +#: ../lib/Plugins/CCpp.cpp:532 msgid "Getting global universal unique identification..." msgstr "正在取得全局的UUID……" -#: ../lib/Plugins/CCpp.cpp:578 +#: ../lib/Plugins/CCpp.cpp:583 msgid "Starting report creation..." msgstr "报告书生成引导……" -#: ../lib/Plugins/CCpp.cpp:607 -#, fuzzy +#: ../lib/Plugins/CCpp.cpp:612 msgid "Skipping debuginfo installation" msgstr "省略 %s 软件包的调试数据安装" @@ -498,7 +492,7 @@ msgstr "报告书生成中……" #: ../lib/Plugins/RunApp.cpp:62 msgid "Executing RunApp plugin..." -msgstr "RunApp 插件执行中……" +msgstr "RunApp 插件执行中..." #: ../lib/Plugins/FileTransfer.cpp:63 ../lib/Plugins/FileTransfer.cpp:409 msgid "FileTransfer: URL not specified" diff --git a/src/Daemon/CommLayerServer.h b/src/Daemon/CommLayerServer.h index aface8a..6ede581 100644 --- a/src/Daemon/CommLayerServer.h +++ b/src/Daemon/CommLayerServer.h @@ -15,7 +15,6 @@ class CCommLayerServer { /* just stubs to be called when not implemented in specific comm layer */ virtual void Crash(const std::string& progname, const std::string& uid) {} virtual void JobDone(const char* pDest, const char* pUUID) = 0; - virtual void JobStarted(const char* pDest) {}; virtual void QuotaExceed(const char* str) {} virtual void Update(const std::string& pMessage, const char* peer, uint64_t pJobID) {}; diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp index 1085d80..fc28a12 100644 --- a/src/Daemon/CommLayerServerDBus.cpp +++ b/src/Daemon/CommLayerServerDBus.cpp @@ -69,18 +69,6 @@ void CCommLayerServerDBus::QuotaExceed(const char* str) send_flush_and_unref(msg); } -void CCommLayerServerDBus::JobStarted(const char* peer) -{ - DBusMessage* msg = new_signal_msg("JobStarted", peer); - uint64_t nJobID = uint64_t(pthread_self()); - dbus_message_append_args(msg, - DBUS_TYPE_STRING, &peer, /* TODO: redundant parameter, remove from API */ - DBUS_TYPE_UINT64, &nJobID, /* TODO: redundant parameter, remove from API */ - DBUS_TYPE_INVALID); - VERB2 log("Sending signal JobStarted('%s',%llx)", peer, (unsigned long long)nJobID); - send_flush_and_unref(msg); -} - void CCommLayerServerDBus::JobDone(const char* peer, const char* pUUID) { DBusMessage* msg = new_signal_msg("JobDone", peer); @@ -156,6 +144,13 @@ static int handle_CreateReport(DBusMessage* call, DBusMessage* reply) dbus_message_iter_init(call, &in_iter); const char* pUUID; r = load_val(&in_iter, pUUID); + if (r != ABRT_DBUS_MORE_FIELDS) + { + error_msg("dbus call %s: parameter type mismatch", __func__ + 7); + return -1; + } + int32_t force; + r = load_val(&in_iter, force); if (r != ABRT_DBUS_LAST_FIELD) { error_msg("dbus call %s: parameter type mismatch", __func__ + 7); @@ -164,7 +159,7 @@ static int handle_CreateReport(DBusMessage* call, DBusMessage* reply) const char* sender; long unix_uid = get_remote_uid(call, &sender); - if (CreateReportThread(pUUID, to_string(unix_uid).c_str(), sender) != 0) + if (CreateReportThread(pUUID, to_string(unix_uid).c_str(), force, sender) != 0) return -1; /* can't create thread (err msg is already logged) */ dbus_message_append_args(reply, @@ -189,7 +184,7 @@ static int handle_GetJobResult(DBusMessage* call, DBusMessage* reply) } long unix_uid = get_remote_uid(call); - map_crash_report_t report = GetJobResult(pUUID, to_string(unix_uid).c_str()); + map_crash_report_t report = GetJobResult(pUUID, to_string(unix_uid).c_str(), /*force:*/ 0); DBusMessageIter out_iter; dbus_message_iter_init_append(reply, &out_iter); diff --git a/src/Daemon/CommLayerServerDBus.h b/src/Daemon/CommLayerServerDBus.h index 06fb15d..7b2e31d 100644 --- a/src/Daemon/CommLayerServerDBus.h +++ b/src/Daemon/CommLayerServerDBus.h @@ -12,7 +12,6 @@ class CCommLayerServerDBus /* DBus signal senders */ virtual void Crash(const std::string& progname, const std::string& uid); - virtual void JobStarted(const char* pDest); virtual void JobDone(const char* pDest, const char* pUUID); virtual void QuotaExceed(const char* str); diff --git a/src/Daemon/CommLayerServerSocket.h b/src/Daemon/CommLayerServerSocket.h index f598841..baca195 100644 --- a/src/Daemon/CommLayerServerSocket.h +++ b/src/Daemon/CommLayerServerSocket.h @@ -31,5 +31,4 @@ class CCommLayerServerSocket : public CCommLayerServer virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pSender); virtual void Crash(const std::string& arg1); - virtual void JobStarted(const char* pDest) {}; }; diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp index 5cc9dc7..94fb9d7 100644 --- a/src/Daemon/CrashWatcher.cpp +++ b/src/Daemon/CrashWatcher.cpp @@ -109,7 +109,7 @@ vector_crash_infos_t GetCrashInfos(const std::string &pUID) * CreateReport dbus call already did all the processing, and we just retrieve * the result from dump directory, which is fast. */ -map_crash_report_t GetJobResult(const char* pUUID, const char* pUID) +map_crash_report_t GetJobResult(const char* pUUID, const char* pUID, int force) { map_crash_info_t crashReport; @@ -118,7 +118,7 @@ map_crash_report_t GetJobResult(const char* pUUID, const char* pUID) * g_pPluginManager->GetDatabase(g_settings_sDatabase); * which is unsafe wrt concurrent updates to g_pPluginManager state. */ - mw_result_t res = CreateCrashReport(pUUID, pUID, crashReport); + mw_result_t res = CreateCrashReport(pUUID, pUID, force, crashReport); switch (res) { case MW_OK: @@ -144,14 +144,13 @@ typedef struct thread_data_t { pthread_t thread_id; char* UUID; char* UID; + int force; char* peer; } thread_data_t; static void* create_report(void* arg) { thread_data_t *thread_data = (thread_data_t *) arg; - g_pCommLayer->JobStarted(thread_data->peer); - /* Client name is per-thread, need to set it */ set_client_name(thread_data->peer); @@ -159,7 +158,7 @@ static void* create_report(void* arg) { /* "GetJobResult" is a bit of a misnomer */ log("Creating report..."); - map_crash_info_t crashReport = GetJobResult(thread_data->UUID, thread_data->UID); + map_crash_info_t crashReport = GetJobResult(thread_data->UUID, thread_data->UID, thread_data->force); g_pCommLayer->JobDone(thread_data->peer, thread_data->UUID); } catch (CABRTException& e) @@ -187,11 +186,12 @@ static void* create_report(void* arg) /* Bogus value. pthreads require us to return void* */ return NULL; } -int CreateReportThread(const char* pUUID, const char* pUID, const char* pSender) +int CreateReportThread(const char* pUUID, const char* pUID, int force, const char* pSender) { thread_data_t *thread_data = (thread_data_t *)xzalloc(sizeof(thread_data_t)); thread_data->UUID = xstrdup(pUUID); thread_data->UID = xstrdup(pUID); + thread_data->force = force; thread_data->peer = xstrdup(pSender); //TODO: do we need this? //pthread_attr_t attr; diff --git a/src/Daemon/CrashWatcher.h b/src/Daemon/CrashWatcher.h index 00bb4d5..d8c7c28 100644 --- a/src/Daemon/CrashWatcher.h +++ b/src/Daemon/CrashWatcher.h @@ -49,8 +49,8 @@ class CCrashWatcher }; vector_crash_infos_t GetCrashInfos(const std::string &pUID); -int CreateReportThread(const char* pUUID, const char* pUID, const char* pSender); -map_crash_report_t GetJobResult(const char* pUUID, const char* pUID); +int CreateReportThread(const char* pUUID, const char* pUID, int force, const char* pSender); +map_crash_report_t GetJobResult(const char* pUUID, const char* pUID, int force); bool DeleteDebugDump(const std::string& pUUID, const std::string& pUID); #endif /*CRASHWATCHER_H_*/ diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp index cbcf697..d1ab188 100644 --- a/src/Daemon/Daemon.cpp +++ b/src/Daemon/Daemon.cpp @@ -50,10 +50,9 @@ * - GetCrashInfos(): returns a vector_crash_infos_t (vector_map_vector_string_t) * of crashes for given uid * v[N]["executable"/"uid"/"kernel"/"backtrace"][N] = "contents" - * - CreateReport(UUID): starts creating a report for /var/cache/abrt/DIR with this UUID. + * - CreateReport(UUID,force): starts creating a report for /var/cache/abrt/DIR with this UUID. * Returns job id (uint64). - * Emits JobStarted(client_dbus_ID,job_id) dbus signal. - * After it returns, when report creation thread has finished, + * After thread returns, when report creation thread has finished, * JobDone(client_dbus_ID,UUID) dbus signal is emitted. * - GetJobResult(UUID): returns map_crash_report_t (map_vector_string_t) * - Report(map_crash_report_t (map_vector_string_t[, map_map_string_t])): @@ -71,8 +70,6 @@ * * DBus signals we emit: * - Crash(progname,uid) - a new crash occurred (new /var/cache/abrt/DIR is found) - * - JobStarted(client_dbus_ID,job_id) - see CreateReport above. - * Sent as unicast to the client which did CreateReport. * - JobDone(client_dbus_ID,UUID) - see CreateReport above. * Sent as unicast to the client which did CreateReport. * - Warning(msg,job_id) @@ -81,9 +78,8 @@ * If set_client_name(NULL) was done, they are not sent. * * TODO: - * - API does not really need JobStarted dbus signal at all, and JobDone signal - * does not need to pass any parameters - out clients never sent multiple - * CreateReport's. + * - JobDone signal does not need to pass any parameters + * - our clients never send multiple CreateReport's. */ @@ -153,7 +149,7 @@ static double GetDirSize(const std::string &pPath, std::string *worst_dir = NULL if (worst_dir && strcmp(excluded, ep->d_name) != 0) { /* Calculate "weighted" size and age - /* w = sz_kbytes * age_mins */ + * w = sz_kbytes * age_mins */ sz /= 1024; long age = (time(NULL) - stats.st_mtime) / 60; if (age > 0) diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp index b05dbb6..05abc9b 100644 --- a/src/Daemon/MiddleWare.cpp +++ b/src/Daemon/MiddleWare.cpp @@ -163,15 +163,17 @@ static std::string GetGlobalUUID(const std::string& pAnalyzer, * @param pDebugDumpPath A debugdump dir containing all necessary data. */ static void CreateReport(const std::string& pAnalyzer, - const std::string& pDebugDumpDir) + const std::string& pDebugDumpDir, + int force) { CAnalyzer* analyzer = g_pPluginManager->GetAnalyzer(pAnalyzer); - analyzer->CreateReport(pDebugDumpDir); + analyzer->CreateReport(pDebugDumpDir, force); } mw_result_t CreateCrashReport(const std::string& pUUID, - const std::string& pUID, - map_crash_report_t& pCrashReport) + const std::string& pUID, + int force, + map_crash_report_t& pCrashReport) { VERB2 log("CreateCrashReport('%s','%s',result)", pUUID.c_str(), pUID.c_str()); @@ -185,7 +187,7 @@ mw_result_t CreateCrashReport(const std::string& pUUID, } if (pUUID == "" || row.m_sUUID != pUUID) { - warn_client("CreateCrashReport(): UUID '"+pUUID+"' is not in database."); + warn_client("CreateCrashReport(): UUID '"+pUUID+"' is not in database"); return MW_IN_DB_ERROR; } @@ -211,7 +213,7 @@ mw_result_t CreateCrashReport(const std::string& pUUID, dd.Close(); VERB3 log(" CreateReport('%s')", analyzer.c_str()); - CreateReport(analyzer, row.m_sDebugDumpDir); + CreateReport(analyzer, row.m_sDebugDumpDir, force); gUUID = GetGlobalUUID(analyzer, row.m_sDebugDumpDir); VERB3 log(" GetGlobalUUID:'%s'", gUUID.c_str()); diff --git a/src/Daemon/MiddleWare.h b/src/Daemon/MiddleWare.h index bc80952..fab822f 100644 --- a/src/Daemon/MiddleWare.h +++ b/src/Daemon/MiddleWare.h @@ -65,6 +65,7 @@ void LoadOpenGPGPublicKey(const char* key); */ mw_result_t CreateCrashReport(const std::string& pUUID, const std::string& pUID, + int force, map_crash_report_t& pCrashReport); /** * Activates particular action plugin. diff --git a/src/Gui/CCDBusBackend.py b/src/Gui/CCDBusBackend.py index f1ab443..70db9ff 100644 --- a/src/Gui/CCDBusBackend.py +++ b/src/Gui/CCDBusBackend.py @@ -61,7 +61,6 @@ class DBusManager(gobject.GObject): gobject.signal_new("update", self, gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT,)) # signal emited to show gui if user try to run it again gobject.signal_new("show", self, gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ()) - # signal emited to show gui if user try to run it again gobject.signal_new("daemon-state-changed", self, gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT,)) gobject.signal_new("report-done", self, gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT,)) @@ -70,7 +69,9 @@ class DBusManager(gobject.GObject): session.request_name(APP_NAME) iface = DBusInterface(self) - self.connect_to_daemon() + self.bus = dbus.SystemBus() + if not self.bus: + raise Exception(_("Can't connect to system dbus")) self.bus.add_signal_receiver(self.owner_changed_cb, "NameOwnerChanged", dbus_interface="org.freedesktop.DBus") # new crash notification self.bus.add_signal_receiver(self.crash_cb, "Crash", dbus_interface=CC_IFACE) @@ -81,9 +82,30 @@ class DBusManager(gobject.GObject): # watch for job-done signals self.bus.add_signal_receiver(self.jobdone_cb, "JobDone", dbus_interface=CC_IFACE) - # disconnect callback - def disconnected(self, *args): - print "disconnect" + # We use this function instead of caching and reusing of + # dbus.Interface(proxy, dbus_interface=CC_IFACE) because we want + # to restart abrtd in this scenario: + # (1) abrt-gui was run + # (2) user generated the report, then left for coffee break + # (3) abrtd exited on inactivity timeout + # (4) user returned and wants to submit the report + # for (4) to restart abrtd, we must recreate proxy and daemon + def daemon(self): + if not self.bus: + self.bus = dbus.SystemBus() + if not self.bus: + raise Exception(_("Can't connect to system dbus")) + proxy = self.bus.get_object(CC_IFACE, CC_PATH, introspect=False) + if not proxy: + raise Exception(_("Please check if abrt daemon is running")) + daemon = dbus.Interface(proxy, dbus_interface=CC_IFACE) + if not daemon: + raise Exception(_("Please check if abrt daemon is running")) + return daemon + +# # disconnect callback +# def disconnected(self, *args): +# print "disconnect" def error_handler_cb(self,error): self.emit("abrt-error",error) @@ -115,43 +137,18 @@ class DBusManager(gobject.GObject): print "Warning >>%s<<" % message self.emit("warning", message) -# Seems to be not needed at all. Not only that, it is actively harmful -# when abrtd is autostarted by dbus-daemon: connect_to_daemon() would install -# duplicate signal handlers! def owner_changed_cb(self,name, old_owner, new_owner): if name == CC_NAME: - # No need to connect at once, we can do it when we need it - # (and this "connect on demand" mode of operation is needed - # anyway if abrtd is autostarted by dbus: before we call it, - # there is no abrtd to connect to!) if new_owner: - #self.proxy = self.connect_to_daemon() self.emit("daemon-state-changed", "up") else: - #self.proxy = None self.emit("daemon-state-changed", "down") - def connect_to_daemon(self): - if not self.bus: - self.bus = dbus.SystemBus() - if not self.bus: - raise Exception(_("Can't connect to dbus")) - # Can't do this: abrtd may be autostarted by dbus-daemon - #if self.bus.name_has_owner(CC_NAME): - # self.proxy = self.bus.get_object(CC_IFACE, CC_PATH, introspect=False) - #else: - # raise Exception(_("Please check if abrt daemon is running.")) - self.proxy = self.bus.get_object(CC_IFACE, CC_PATH, introspect=False) - if self.proxy: - self.cc = dbus.Interface(self.proxy, dbus_interface=CC_IFACE) - else: - raise Exception(_("Please check if abrt daemon is running.")) - def jobdone_cb(self, dest, uuid): # TODO: check that it is indeed OUR job: # remember uuid in getReport and compare here print "Our job for UUID %s is done." % uuid - dump = self.cc.GetJobResult(uuid) + dump = self.daemon().GetJobResult(uuid) if dump: self.emit("analyze-complete", dump) else: @@ -161,31 +158,21 @@ class DBusManager(gobject.GObject): self.emit("report-done", result) def getReport(self, UUID): - try: - # let's try it async - # even if it's async it timeouts, so let's try to set the timeout to 60sec - #self.cc.CreateReport(UUID, reply_handler=self.addJob, error_handler=self.error_handler, timeout=60) - # we don't need the return value, as the job_id is sent via JobStarted signal - self.cc.CreateReport(UUID, timeout=60) - except dbus.exceptions.DBusException, e: - # One case when it fails is if abrtd exited and needs to be - # autostarted by dbus again. (This is a first stab - # at making it work in this case, I want to find a better way) - self.connect_to_daemon() - self.cc.CreateReport(UUID, timeout=60) + # 2nd param is "force recreating of backtrace etc" + self.daemon().CreateReport(UUID, 0, timeout=60) def Report(self, report, reporters_settings = None): # map < Plguin_name vec <status, message> > - self.cc.Report(report, reporters_settings, reply_handler=self.report_done, error_handler=self.error_handler_cb, timeout=60) + self.daemon().Report(report, reporters_settings, reply_handler=self.report_done, error_handler=self.error_handler_cb, timeout=60) def DeleteDebugDump(self,UUID): - return self.cc.DeleteDebugDump(UUID) + return self.daemon().DeleteDebugDump(UUID) def getDumps(self): row_dict = None rows = [] # FIXME check the arguments - for row in self.cc.GetCrashInfos(): + for row in self.daemon().GetCrashInfos(): row_dict = {} for column in row: row_dict[column] = row[column] @@ -193,28 +180,28 @@ class DBusManager(gobject.GObject): return rows def getPluginsInfo(self): - return self.cc.GetPluginsInfo() + return self.daemon().GetPluginsInfo() def getPluginSettings(self, plugin_name): - settings = self.cc.GetPluginSettings(plugin_name) + settings = self.daemon().GetPluginSettings(plugin_name) #for i in settings.keys(): # print i return settings def registerPlugin(self, plugin_name): - return self.cc.RegisterPlugin(plugin_name) + return self.daemon().RegisterPlugin(plugin_name) def unRegisterPlugin(self, plugin_name): - return self.cc.UnRegisterPlugin(plugin_name) + return self.daemon().UnRegisterPlugin(plugin_name) def setPluginSettings(self, plugin_name, plugin_settings): - return self.cc.SetPluginSettings(plugin_name, plugin_settings) + return self.daemon().SetPluginSettings(plugin_name, plugin_settings) def getSettings(self): - return self.cc.GetSettings() + return self.daemon().GetSettings() def setSettings(self, settings): # FIXME: STUB!!!! print "setSettings stub" - retval = self.cc.SetSettings(self.cc.GetSettings()) + retval = self.daemon().SetSettings(self.daemon().GetSettings()) print ">>>", retval diff --git a/src/Gui/CellRenderers.py b/src/Gui/CellRenderers.py index 5777a7c..0bedf7a 100644 --- a/src/Gui/CellRenderers.py +++ b/src/Gui/CellRenderers.py @@ -29,11 +29,12 @@ class MultilineCellRenderer(gtk.CellRendererText): def __init__(self): gtk.CellRendererText.__init__(self) self._in_editor_menu = False + self.old_text = "" - def _on_editor_focus_out_event(self, editor, *args): + def _on_editor_focus_out_event(self, editor, event): if self._in_editor_menu: return editor.remove_widget() - self.emit("editing-canceled") + self.emit("edited", editor.get_data("path"), editor.get_text()) def _on_editor_key_press_event(self, editor, event): if event.state & (gtk.gdk.SHIFT_MASK | gtk.gdk.CONTROL_MASK): return @@ -41,6 +42,7 @@ class MultilineCellRenderer(gtk.CellRendererText): editor.remove_widget() self.emit("edited", editor.get_data("path"), editor.get_text()) elif event.keyval == gtk.keysyms.Escape: + editor.set_text(self.old_text) editor.remove_widget() self.emit("editing-canceled") @@ -53,6 +55,7 @@ class MultilineCellRenderer(gtk.CellRendererText): def do_start_editing(self, event, widget, path, bg_area, cell_area, flags): editor = CellTextView() editor.modify_font(self.props.font_desc) + self.old_text = self.props.text editor.set_text(self.props.text) editor.set_size_request(cell_area.width, cell_area.height) editor.set_border_width(min(self.props.xpad, self.props.ypad)) diff --git a/src/Gui/ConfBackend.py b/src/Gui/ConfBackend.py index e0f6434..eb94b87 100644 --- a/src/Gui/ConfBackend.py +++ b/src/Gui/ConfBackend.py @@ -33,6 +33,17 @@ class ConfBackendGnomeKeyring(ConfBackend): settings_tmp["AbrtPluginInfo"] = name password = "" + item_list = [] + try: + item_list = gkey.find_items_sync(gkey.ITEM_GENERIC_SECRET, {"AbrtPluginInfo":str(name)}) + except gkey.NoMatchError, ex: + # nothing found + pass + + # delete all items containg "AbrtPluginInfo":<plugin_name>, so we always have only 1 item per plugin + for item in item_list: + gkey.item_delete_sync(self.default_key_ring, item.item_id) + if "Password" in settings_tmp: password = settings_tmp["Password"] del settings_tmp["Password"] @@ -43,6 +54,7 @@ class ConfBackendGnomeKeyring(ConfBackend): password, True) + def load(self, name): item_list = None try: diff --git a/src/Gui/PluginSettingsUI.py b/src/Gui/PluginSettingsUI.py index ae5b64d..a26f87f 100644 --- a/src/Gui/PluginSettingsUI.py +++ b/src/Gui/PluginSettingsUI.py @@ -25,6 +25,13 @@ class PluginSettingsUI(gtk.Dialog): self.add(no_ui_label) no_ui_label.show() + #connect show_pass buttons if present + + + def on_show_pass_toggled(self, button, entry=None): + if entry: + entry.set_visibility(button.get_active()) + def hydrate(self): if self.plugin_gui: if self.pluginfo.Enabled == "yes": @@ -35,6 +42,13 @@ class PluginSettingsUI(gtk.Dialog): widget = self.plugin_gui.get_object("conf_%s" % key) if type(widget) == gtk.Entry: widget.set_text(value) + if widget.get_visibility() == False: + # if we find toggle button called the same name as entry and entry has + # visibility set to False, connect set_visible to it + # coz I guess it's toggle for revealing the password + button = self.plugin_gui.get_object("cb_%s" % key) + if type(button) == gtk.CheckButton: + button.connect("toggled", self.on_show_pass_toggled, widget) elif type(widget) == gtk.CheckButton: widget.set_active(value == "yes") elif type(widget) == gtk.ComboBox: |