diff --git a/feedindicator b/feedindicator index 486a0f0..8acce3c 100755 --- a/feedindicator +++ b/feedindicator @@ -470,7 +470,7 @@ class AddFeedDialog: self.window = gtk.Window(gtk.WINDOW_TOPLEVEL) self.window.set_size_request(450, 120) self.window.set_position(gtk.WIN_POS_CENTER) - self.window.set_title(language_properties['add_feed'] + ' ' + app_name) + self.window.set_title(language_properties['add_feed'] + ' | ' + app_name) self.window.connect('delete_event', self.cancel_dialog) self.window.connect('key-press-event', self.keypress) @@ -580,7 +580,7 @@ class ConfigureDialog: self.window.set_size_request(900, 550) self.window.set_border_width(10) self.window.set_position(gtk.WIN_POS_CENTER) - self.window.set_title(language_properties['configure'] + ' ' + app_name) + self.window.set_title(str(language_properties['configure'] % app_name)) self.window.connect('delete_event', self.cancel_dialog) self.window.connect('key-press-event', self.keypress) @@ -681,7 +681,7 @@ class ConfigureDialog: vbox.pack_start(hbox2sl, False, True, 0) hbox2sl.show() - self.scaletimerlabel = gtk.Label(language_properties['update_feed_every'] + '...') + self.scaletimerlabel = gtk.Label('') hbox2sl.pack_start(self.scaletimerlabel, False, False, 0) self.scaletimerlabel.show() @@ -702,7 +702,7 @@ class ConfigureDialog: vbox.pack_start(hbox2il, False, True, 0) hbox2il.show() - self.scaleitemslabel = gtk.Label(language_properties['label_items_per_feed']) + self.scaleitemslabel = gtk.Label('') hbox2il.pack_start(self.scaleitemslabel, False, False, 0) self.scaleitemslabel.show() @@ -891,7 +891,7 @@ class ConfigureDialog: self.scaletimerlabel.set_text(language_properties['update_feed_every_m']) else: self.refreshtimeset = int(value)*60 - self.scaletimerlabel.set_text(language_properties['update_feed_every'] + ' ' + str(self.refreshtimeset/60) + ' ' + language_properties['minutes']) + self.scaletimerlabel.set_text(str(language_properties['update_feed_every'] % str(self.refreshtimeset/60))) def items_scale(self, widget): """scaleitems slider interaction""" @@ -901,7 +901,7 @@ class ConfigureDialog: self.scaleitemslabel.set_text(language_properties['menu_shows_one_item_per_feed']) else: self.itemsperfeedset = int(value) - self.scaleitemslabel.set_text(language_properties['menu_shows'] + ' ' + str(self.itemsperfeedset) + ' ' + language_properties['items_per_feed']) + self.scaleitemslabel.set_text(str(language_properties['menu_shows'] % str(self.itemsperfeedset))) def autostart_toggle(self, widget): """check toggle status""" @@ -1190,7 +1190,7 @@ class AppIndicator: stoptimer = False gconf['stoptimer'] = False if shownotifications: - self.send_notification(app_name + ' - ' + language_properties['started'], language_properties['feed_update_time_notification'] + ' ' + str(refreshtime/60) + ' ' + language_properties['minutes'], app_logo) + self.send_notification(app_name + ' - ' + language_properties['started'], str(language_properties['feed_update_time_notification'] % str(refreshtime/60)), app_logo) self.update_feeds(None, True, True) else: stoptimer = True @@ -1329,7 +1329,7 @@ class AppIndicator: if refreshtime/60 == 1: menu_updatecheck = gtk.CheckMenuItem(language_properties['update_feed_every_m']) else: - menu_updatecheck = gtk.CheckMenuItem(language_properties['update_feed_every'] + ' ' + str(refreshtime/60) + ' ' + language_properties['minutes']) + menu_updatecheck = gtk.CheckMenuItem(str(language_properties['update_feed_every'] % str(refreshtime/60))) if stoptimer == True: menu_updatecheck.set_active(False) else: @@ -1345,7 +1345,7 @@ class AppIndicator: menu_add = gtk.MenuItem(language_properties['add_feed']) self.menu.append(menu_add) menu_add.connect('activate', AddFeedDialog) - menu_configure = gtk.MenuItem(language_properties['configure'] + ' ' + app_name) + menu_configure = gtk.MenuItem(str(language_properties['configure'] % app_name)) self.menu.append(menu_configure) menu_configure.connect('activate', ConfigureDialog) menu_quit = gtk.MenuItem(language_properties['quit']) diff --git a/languages/english.properties b/languages/english.properties index 39c5f57..7d678dc 100644 --- a/languages/english.properties +++ b/languages/english.properties @@ -9,9 +9,7 @@ feed_list=Feed List feed_options=Feed Options global_options=Global Options configure_dialog_label=Configure feeds to show in the menu. -menu_shows=Menu shows -items_per_feed=items per feed -label_items_per_feed=Items per feed... +menu_shows=Menu shows %s items per feed menu_shows_one_item_per_feed=Menu shows 1 item per feed signal_command=Command for signal tone for new posts (or any other command you want to run after finishing updating the feeds): feeds_top_menu=Show feeds at top of menu @@ -33,7 +31,7 @@ add=Add add_new=Add New # notifications -feed_update_time_notification=Feeds will update every +feed_update_time_notification=Feeds will update every %s minutes feed_update_stop_notification=Feeds will not update automatically feed_update_start_notification=Feeds will be updated shortly feed_update_finish_notification=Finished updating feeds @@ -42,7 +40,7 @@ feed_update_finish_notification=Finished updating feeds quit=Quit add_feed=Add feed no_feeds_defined=No feeds defined! -update_feed_every=Update feeds every +update_feed_every=Update feeds every %s minutes update_feed_every_m=Update feeds every minute reload_all_feeds=Reload all feeds open_website=Open Website @@ -56,7 +54,6 @@ mark_displayed_as_read=Mark displayed posts as read loading=Loading ... # other -configure=Configure -minutes=minutes +configure=Configure %s stopped=Stopped started=Started \ No newline at end of file diff --git a/languages/german.properties b/languages/german.properties index 59204d8..b65c888 100644 --- a/languages/german.properties +++ b/languages/german.properties @@ -9,9 +9,7 @@ feed_list=Feed Liste feed_options=Feed Optionen global_options=Globale Optionen configure_dialog_label=Bearbeiten der Feeds. -menu_shows=Menü zeigt -items_per_feed=Einträge pro Feed an -label_items_per_feed=Einträge pro Feed... +menu_shows=Menü zeigt %s Einträge pro Feed an menu_shows_one_item_per_feed=Menü zeigt 1 Eintrag pro Feed an signal_command=Befehl für Signalton bei neuen Posts (oder andere Befehle zum starten am ende der Aktualisierung): feeds_top_menu=Zeige Feeds am Anfang des Menüs @@ -33,7 +31,7 @@ add=Hinzufügen add_new=Hinzufügen # notifications -feed_update_time_notification=Feeds werden aktualisiert alle +feed_update_time_notification=Feeds werden alle %s Minuten aktualisiert feed_update_stop_notification=Feeds werden nicht automatisch aktualisiert feed_update_start_notification=Feeds werden in kürze aktualisiert sein feed_update_finish_notification=Feeds sind aktualisiert @@ -42,7 +40,7 @@ feed_update_finish_notification=Feeds sind aktualisiert quit=Beenden add_feed=Feed hinzufüegen no_feeds_defined=Keine Feeds vorhanden! -update_feed_every=Aktualisiere Feeds alle +update_feed_every=Aktualisiere Feeds alle %s Minuten update_feed_every_m=Aktualisiere Feeds jede Minute reload_all_feeds=Feeds neuladen open_website=Öffne Webseite @@ -56,7 +54,6 @@ mark_displayed_as_read=Markiere angezeigte Posts als gelesen loading=Lädt ... # other -configure=Konfiguriere -minutes=Minuten +configure=Konfiguriere %s stopped=Gestoppt started=Gestartet \ No newline at end of file