From 855532ed7ffd3415150c73574eb8e9038f1075eb Mon Sep 17 00:00:00 2001 From: Alan Fitton Date: Fri, 1 Jun 2012 20:04:08 +0100 Subject: issue 197 - fix GTK3 unique application support by using g_application_command_line_get_is_remote instead of g_application_get_remote, swedish translation update, translation credits update, add gtk3 eclipse include path settings file. --- extra/eclipse-paths-gtk3.xml | 34 ++++++++++++++++++++++++++++++++++ extra/eclipse-paths.xml | 33 --------------------------------- po/sv.po | 36 ++++++++++++++++++------------------ src/trg-about-window.c | 7 +++++-- src/trg-gtk-app.c | 2 +- src/trg-main-window.c | 4 ++-- 6 files changed, 60 insertions(+), 56 deletions(-) create mode 100644 extra/eclipse-paths-gtk3.xml delete mode 100644 extra/eclipse-paths.xml diff --git a/extra/eclipse-paths-gtk3.xml b/extra/eclipse-paths-gtk3.xml new file mode 100644 index 0000000..e4a827d --- /dev/null +++ b/extra/eclipse-paths-gtk3.xml @@ -0,0 +1,34 @@ + + +
+ +/usr/include/glib-2.0 +/usr/lib64/glib-2.0/include +/usr/include/json-glib-1.0 +/usr/include/atk-1.0 +/usr/include/pango-1.0 +/usr/include/cairo +/usr/include/libnotify +/usr/include/gtk-3.0 +/usr/lib64/gtk-3.0/include + + + + + + + + +
+
+ + + + + + + + + +
+ diff --git a/extra/eclipse-paths.xml b/extra/eclipse-paths.xml deleted file mode 100644 index 4ca5c9b..0000000 --- a/extra/eclipse-paths.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -
- -/usr/include/gtk-2.0 -/usr/lib64/gtk-2.0/include -/usr/include/glib-2.0 -/usr/lib64/glib-2.0/include -/usr/include/json-glib-1.0 -/usr/include/atk-1.0 -/usr/include/pango-1.0 -/usr/include/cairo - - - - - - - - -
-
- - - - - - - - - -
- diff --git a/po/sv.po b/po/sv.po index 40bab8b..0c469f1 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-03-01 22:09+0000\n" -"PO-Revision-Date: 2012-05-21 08:26+0100\n" +"PO-Revision-Date: 2012-05-28 10:23+0100\n" "Last-Translator: swanson \n" "Language-Team: LANGUAGE \n" "Language: Swedish\n" @@ -30,13 +30,13 @@ msgstr "Köad nedladdning" #: src/torrent.c:331 #: src/torrent.c:355 msgid "Waiting To Check" -msgstr "Väntar på kontroll" +msgstr "Väntar på verifiering" #: src/torrent.c:333 #: src/torrent.c:353 #: src/trg-state-selector.c:684 msgid "Checking" -msgstr "Kontrollerar" +msgstr "Verifierar" #: src/torrent.c:335 msgid "Queued seed" @@ -48,13 +48,13 @@ msgstr "Köad seed" #: src/trg-state-selector.c:665 #: src/trg-torrent-props-dialog.c:208 msgid "Seeding" -msgstr "Seedar" +msgstr "Seedning" #: src/torrent.c:339 #: src/torrent.c:349 #: src/trg-state-selector.c:672 msgid "Paused" -msgstr "Pausad" +msgstr "Pausade" #: src/torrent.c:359 msgid "Unknown" @@ -148,7 +148,7 @@ msgstr "Kollapsa alla" #: src/trg-general-panel.c:153 #: src/trg-general-panel.c:219 msgid "N/A" -msgstr "Inget alternativ" +msgstr "N/A" #: src/trg-general-panel.c:168 msgid "(Private)" @@ -455,7 +455,7 @@ msgstr "_Visa" #: src/trg-menu-bar.c:398 #: src/trg-preferences-dialog.c:669 msgid "State selector" -msgstr "Tillståndsväljare" +msgstr "Statusfönster" #: src/trg-menu-bar.c:404 #: src/trg-preferences-dialog.c:676 @@ -490,7 +490,7 @@ msgstr "_Server inställningar" #: src/trg-menu-bar.c:521 msgid "_File" -msgstr "_Fil" +msgstr "_Arkiv" #: src/trg-menu-bar.c:534 msgid "_Disconnect" @@ -601,7 +601,7 @@ msgstr "Uppdateringsintervall:" #: src/trg-preferences-dialog.c:427 msgid "Minimised update interval:" -msgstr "Minimerad uppdateringsintervall:" +msgstr "Uppdateringsintervall minimerat:" #: src/trg-preferences-dialog.c:430 msgid "Torrents" @@ -618,7 +618,7 @@ msgstr "Alternativdialog vid tillägg" #: src/trg-preferences-dialog.c:441 #: src/trg-torrent-add-dialog.c:687 msgid "Delete local .torrent file after adding" -msgstr "Radara lokal .torrentfil efter tillagd" +msgstr "Radera lokal .torrentfil efter tillagd" #: src/trg-preferences-dialog.c:594 msgid "Commands" @@ -746,7 +746,7 @@ msgstr "Alternativa begränsningar" #: src/trg-remote-prefs-dialog.c:326 msgid "Alternate speed limits active" -msgstr "Alterantiva begränsningar aktiverade" +msgstr "Alternativa begränsningar aktiverade" #: src/trg-remote-prefs-dialog.c:333 msgid "Alternate time range" @@ -803,7 +803,7 @@ msgstr "Porten är stängd" #: src/trg-remote-prefs-dialog.c:453 #: src/trg-remote-prefs-dialog.c:522 msgid "Port test" -msgstr "Test av port" +msgstr "Testa port" #: src/trg-remote-prefs-dialog.c:454 msgid "Testing..." @@ -948,15 +948,15 @@ msgstr "Kö ned" #: src/trg-state-selector.c:675 msgid "Complete" -msgstr "Komplett" +msgstr "Kompletta" #: src/trg-state-selector.c:678 msgid "Incomplete" -msgstr "Pågående" +msgstr "Ej kompletta" #: src/trg-state-selector.c:681 msgid "Active" -msgstr "Aktiv" +msgstr "Aktiva" #: src/trg-stats-dialog.c:275 msgid "Statistics" @@ -1164,7 +1164,7 @@ msgstr "Seeda oavsett ratio" #: src/trg-torrent-props-dialog.c:216 msgid "Seed ratio mode:" -msgstr "Seed ratio sätt:" +msgstr "Alternativ för ratio:" #: src/trg-torrent-props-dialog.c:224 msgid "Seed ratio limit:" @@ -1172,7 +1172,7 @@ msgstr "Seed ratio max:" #: src/trg-torrent-props-dialog.c:230 msgid "Peer limit:" -msgstr "Peer max antal:" +msgstr "Max antal peers:" #: src/trg-torrent-props-dialog.c:264 #, c-format @@ -1253,7 +1253,7 @@ msgstr "Senast aktiv" #: src/trg-trackers-tree-view.c:168 msgid "Tier" -msgstr "Segment" +msgstr "#" #: src/trg-trackers-tree-view.c:174 msgid "Announce URL" diff --git a/src/trg-about-window.c b/src/trg-about-window.c index f92e7ca..03dc490 100644 --- a/src/trg-about-window.c +++ b/src/trg-about-window.c @@ -85,12 +85,15 @@ GtkWidget *trg_about_window_new(GtkWindow * parent) /*gtk_about_dialog_set_documenters(GTK_ABOUT_DIALOG(dialog), documenters); */ gtk_about_dialog_set_translator_credits(GTK_ABOUT_DIALOG(dialog), "translations kindly contributed by\n\n" + "* Pierre Rudloff (French)\n" "* Julian Held (German)\n" + "* Algimantas Margevičius (Lithuanian)\n" "* Youn sok Choi (Korean)\n" "* Piotr (Polish)\n" "* Y3AVD (Russian)\n" - "* ROR191 (Ukranian)\n" - "* aspidzent (Spanish)"); + "* aspidzent (Spanish)\n" + "* Åke Svensson (Swedish)\n" + "* ROR191 (Ukranian)\n"); g_free(licenseFile); g_free(licenseText); diff --git a/src/trg-gtk-app.c b/src/trg-gtk-app.c index 02858ce..afc07be 100644 --- a/src/trg-gtk-app.c +++ b/src/trg-gtk-app.c @@ -102,7 +102,7 @@ trg_gtk_app_command_line(GApplication * application, TrgMainWindow *window = TRG_MAIN_WINDOW(windows->data); gchar **argv = g_application_command_line_get_arguments(cmdline, NULL); - if (g_application_get_is_remote(application)) { + if (g_application_command_line_get_is_remote(cmdline)) { if (!argv[0]) { gtk_window_present(GTK_WINDOW(window)); g_strfreev(argv); diff --git a/src/trg-main-window.c b/src/trg-main-window.c index 15dc72c..0f21430 100644 --- a/src/trg-main-window.c +++ b/src/trg-main-window.c @@ -1176,14 +1176,14 @@ update_whatever_statusicon(TrgMainWindow * win, gchar *seedingLabel; gchar buf[32]; - trg_strlspeed(buf, stats->downRateTotal/1024); + trg_strlspeed(buf, stats->downRateTotal/disk_K); downloadingLabel = g_strdup_printf(_("%d Downloading @ %s"), stats->down, buf); gtk_menu_item_set_label(GTK_MENU_ITEM(priv->iconDownloadingItem), downloadingLabel); g_free(downloadingLabel); - trg_strlspeed(buf, stats->upRateTotal/1024); + trg_strlspeed(buf, stats->upRateTotal/disk_K); seedingLabel = g_strdup_printf(_("%d Seeding @ %s"), stats->seeding, buf); gtk_menu_item_set_label(GTK_MENU_ITEM(priv->iconSeedingItem), -- cgit v1.2.3