rhythmbox r6256 - in trunk: . data/glade plugins/audioscrobbler plugins/cd-recorder plugins/daap plugins/ipod plugins/iradio plugins/jamendo plugins/jamendo/jamendo plugins/magnatune/magnatune rhythmdb sources
- From: jmatthew svn gnome org
- To: svn-commits-list gnome org
- Subject: rhythmbox r6256 - in trunk: . data/glade plugins/audioscrobbler plugins/cd-recorder plugins/daap plugins/ipod plugins/iradio plugins/jamendo plugins/jamendo/jamendo plugins/magnatune/magnatune rhythmdb sources
- Date: Sun, 29 Mar 2009 02:08:19 +0000 (UTC)
Author: jmatthew
Date: Sun Mar 29 02:08:19 2009
New Revision: 6256
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6256&view=rev
Log:
2009-03-29 Jonathan Matthew <jonathan d14n org>
patch by: Bruce Cowan <bugs bcowan fastmail co uk>
* data/glade/create-playlist.glade:
* data/glade/library-prefs.glade:
* data/glade/playback-prefs.glade:
* plugins/audioscrobbler/audioscrobbler.rb-plugin.in:
* plugins/cd-recorder/rb-playlist-source-recorder.c: (burn_cd),
(check_media_length), (rb_playlist_source_recorder_start):
* plugins/daap/rb-daap-mdns-browser-avahi.c:
(rb_daap_mdns_browser_start), (rb_daap_mdns_browser_stop):
* plugins/daap/rb-daap-mdns-publisher-avahi.c:
(rb_daap_mdns_publisher_publish),
(rb_daap_mdns_publisher_withdraw):
* plugins/ipod/ipod-init.glade:
* plugins/ipod/rb-ipod-helpers.c:
(rb_ipod_helpers_show_first_time_dialog):
* plugins/iradio/rb-iradio-source.c:
(rb_iradio_source_constructor):
* plugins/jamendo/jamendo-loading.glade:
* plugins/jamendo/jamendo/JamendoSource.py:
* plugins/magnatune/magnatune/MagnatuneSource.py:
* rhythmdb/rhythmdb-tree.c: (rhythmdb_tree_parser_start_element):
* sources/rb-podcast-source.c: (rb_podcast_source_constructor):
Fix some capitalisation, americanisation, and other stuff in
translatable strings. #576987.
Modified:
trunk/ChangeLog
trunk/data/glade/create-playlist.glade
trunk/data/glade/library-prefs.glade
trunk/data/glade/playback-prefs.glade
trunk/plugins/audioscrobbler/audioscrobbler.rb-plugin.in
trunk/plugins/cd-recorder/rb-playlist-source-recorder.c
trunk/plugins/daap/rb-daap-mdns-browser-avahi.c
trunk/plugins/daap/rb-daap-mdns-publisher-avahi.c
trunk/plugins/ipod/ipod-init.glade
trunk/plugins/ipod/rb-ipod-helpers.c
trunk/plugins/iradio/rb-iradio-source.c
trunk/plugins/jamendo/jamendo-loading.glade
trunk/plugins/jamendo/jamendo/JamendoSource.py
trunk/plugins/magnatune/magnatune/MagnatuneSource.py
trunk/rhythmdb/rhythmdb-tree.c
trunk/sources/rb-podcast-source.c
Modified: trunk/data/glade/create-playlist.glade
==============================================================================
--- trunk/data/glade/create-playlist.glade (original)
+++ trunk/data/glade/create-playlist.glade Sun Mar 29 02:08:19 2009
@@ -163,7 +163,7 @@
<child>
<widget class="GtkComboBox" id="sortMenu">
<property name="visible">True</property>
- <property name="items" translatable="yes"> </property>
+ <property name="items"> </property>
</widget>
<packing>
<property name="position">1</property>
Modified: trunk/data/glade/library-prefs.glade
==============================================================================
--- trunk/data/glade/library-prefs.glade (original)
+++ trunk/data/glade/library-prefs.glade Sun Mar 29 02:08:19 2009
@@ -5,7 +5,7 @@
<widget class="GtkWindow" id="window1">
<property name="visible">True</property>
- <property name="title" translatable="yes"></property>
+ <property name="title"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -78,7 +78,7 @@
<child>
<widget class="GtkLabel" id="label20">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -145,7 +145,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
+ <property name="text"></property>
<property name="has_frame">True</property>
<property name="invisible_char">*</property>
<property name="activates_default">False</property>
@@ -322,7 +322,7 @@
<child>
<widget class="GtkLabel" id="label23">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
Modified: trunk/data/glade/playback-prefs.glade
==============================================================================
--- trunk/data/glade/playback-prefs.glade (original)
+++ trunk/data/glade/playback-prefs.glade Sun Mar 29 02:08:19 2009
@@ -5,7 +5,7 @@
<widget class="GtkWindow" id="window1">
<property name="visible">True</property>
- <property name="title" translatable="yes">window1</property>
+ <property name="title"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -78,7 +78,7 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -173,7 +173,7 @@
<child>
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -267,7 +267,7 @@
<child>
<widget class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -362,7 +362,7 @@
<child>
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
Modified: trunk/plugins/audioscrobbler/audioscrobbler.rb-plugin.in
==============================================================================
--- trunk/plugins/audioscrobbler/audioscrobbler.rb-plugin.in (original)
+++ trunk/plugins/audioscrobbler/audioscrobbler.rb-plugin.in Sun Mar 29 02:08:19 2009
@@ -2,7 +2,7 @@
Module=audioscrobbler
IAge=1
_Name=Last.fm
-_Description=Submits song information to last.fm and plays last.fm radio streams
+_Description=Submits song information to Last.fm and plays Last.fm radio streams
Icon=as-powered.png
Authors=Alex Revo <xiphoidappendix gmail com>;Ruben Vermeersch <ruben Lambda1 be>
Copyright=Copyright  2005-2006 Alex Revo, Ruben Vermeersch
Modified: trunk/plugins/cd-recorder/rb-playlist-source-recorder.c
==============================================================================
--- trunk/plugins/cd-recorder/rb-playlist-source-recorder.c (original)
+++ trunk/plugins/cd-recorder/rb-playlist-source-recorder.c Sun Mar 29 02:08:19 2009
@@ -579,7 +579,7 @@
} else if (res == RB_RECORDER_RESULT_ERROR) {
set_message_text (source, _("Writing failed. Try again?"));
} else {
- set_message_text (source, _("Writing cancelled. Try again?"));
+ set_message_text (source, _("Writing canceled. Try again?"));
}
progress_set_fraction (source->priv->progress, 0);
@@ -1607,7 +1607,7 @@
if ((media_duration < 0) && (duration > 4440)) {
message = g_strdup_printf (_("This playlist is %s minutes long. "
"This exceeds the length of a standard audio CD. "
- "If the destination media is larger than a standard audio CD "
+ "If the destination medium is larger than a standard audio CD "
"please insert it in the drive and try again."),
duration_string);
}
@@ -1657,7 +1657,7 @@
error_dialog (source,
_("Could not find temporary space!"),
- _("Could not find enough temporary space to convert audio tracks. %s MiB required."),
+ _("Could not find enough temporary space to convert audio tracks. %s MB required."),
mib_needed_string);
g_free (mib_needed_string);
Modified: trunk/plugins/daap/rb-daap-mdns-browser-avahi.c
==============================================================================
--- trunk/plugins/daap/rb-daap-mdns-browser-avahi.c (original)
+++ trunk/plugins/daap/rb-daap-mdns-browser-avahi.c Sun Mar 29 02:08:19 2009
@@ -234,7 +234,7 @@
RB_DAAP_MDNS_BROWSER_ERROR,
RB_DAAP_MDNS_BROWSER_ERROR_NOT_RUNNING,
"%s",
- _("MDNS service is not running"));
+ _("mDNS service is not running"));
return FALSE;
}
if (browser->priv->service_browser != NULL) {
@@ -277,7 +277,7 @@
RB_DAAP_MDNS_BROWSER_ERROR,
RB_DAAP_MDNS_BROWSER_ERROR_NOT_RUNNING,
"%s",
- _("MDNS service is not running"));
+ _("mDNS service is not running"));
return FALSE;
}
if (browser->priv->service_browser == NULL) {
Modified: trunk/plugins/daap/rb-daap-mdns-publisher-avahi.c
==============================================================================
--- trunk/plugins/daap/rb-daap-mdns-publisher-avahi.c (original)
+++ trunk/plugins/daap/rb-daap-mdns-publisher-avahi.c Sun Mar 29 02:08:19 2009
@@ -278,7 +278,7 @@
RB_DAAP_MDNS_PUBLISHER_ERROR,
RB_DAAP_MDNS_PUBLISHER_ERROR_NOT_RUNNING,
"%s",
- _("The avahi MDNS service is not running"));
+ _("The avahi mDNS service is not running"));
return FALSE;
}
@@ -298,7 +298,7 @@
RB_DAAP_MDNS_PUBLISHER_ERROR,
RB_DAAP_MDNS_PUBLISHER_ERROR_NOT_RUNNING,
"%s",
- _("The avahi MDNS service is not running"));
+ _("The avahi mDNS service is not running"));
return FALSE;
}
@@ -307,7 +307,7 @@
RB_DAAP_MDNS_PUBLISHER_ERROR,
RB_DAAP_MDNS_PUBLISHER_ERROR_FAILED,
"%s",
- _("The MDNS service is not published"));
+ _("The mDNS service is not published"));
return FALSE;
}
Modified: trunk/plugins/ipod/ipod-init.glade
==============================================================================
--- trunk/plugins/ipod/ipod-init.glade (original)
+++ trunk/plugins/ipod/ipod-init.glade Sun Mar 29 02:08:19 2009
@@ -79,7 +79,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Rhythmbox has detected a device that is probably an uninitialised or corrupted iPod. It must be initialised before Rhythmbox can use it, but this will destroy any song metadata already present. If you wish Rhythmbox to initialise the iPod, please fill in the information below. If the device is not an iPod, or you do not wish to initialise it, please click cancel.</property>
+ <property name="label" translatable="yes">Rhythmbox has detected a device that is probably an uninitialized or corrupted iPod. It must be initialized before Rhythmbox can use it, but this will destroy any song metadata already present. If you wish Rhythmbox to initialize the iPod, please fill in the information below. If the device is not an iPod, or you do not wish to initialize it, please click cancel.</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
</widget>
@@ -128,7 +128,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label" translatable="yes">_Initialise</property>
+ <property name="label" translatable="yes">_Initialize</property>
<property name="use_underline">True</property>
<property name="response_id">-3</property>
</widget>
Modified: trunk/plugins/ipod/rb-ipod-helpers.c
==============================================================================
--- trunk/plugins/ipod/rb-ipod-helpers.c (original)
+++ trunk/plugins/ipod/rb-ipod-helpers.c Sun Mar 29 02:08:19 2009
@@ -296,7 +296,7 @@
rb_debug ("attempting to init ipod on '%s', with model '%s' and name '%s'",
mountpoint, info->model_number, ipod_name);
if (!itdb_init_ipod (mountpoint, info->model_number, ipod_name, &error)) {
- rb_error_dialog (NULL, _("Unable to initialise new iPod"), "%s", error->message);
+ rb_error_dialog (NULL, _("Unable to initialize new iPod"), "%s", error->message);
g_free (mountpoint);
g_free (ipod_name);
Modified: trunk/plugins/iradio/rb-iradio-source.c
==============================================================================
--- trunk/plugins/iradio/rb-iradio-source.c (original)
+++ trunk/plugins/iradio/rb-iradio-source.c Sun Mar 29 02:08:19 2009
@@ -312,9 +312,8 @@
action = gtk_action_group_get_action (source->priv->action_group,
"MusicNewInternetRadioStation");
/* Translators: this is the toolbar button label for
- New Interner Radio Station action.
- Don't include the prefix "radio|" in the translation. */
- g_object_set (action, "short-label", Q_("radio|New"), NULL);
+ New Internet Radio Station action. */
+ g_object_set (action, "short-label", C_("Radio", "New"), NULL);
/* set up stations view */
Modified: trunk/plugins/jamendo/jamendo-loading.glade
==============================================================================
--- trunk/plugins/jamendo/jamendo-loading.glade (original)
+++ trunk/plugins/jamendo/jamendo-loading.glade Sun Mar 29 02:08:19 2009
@@ -84,7 +84,7 @@
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="yes">jamendo is a new model for artists to promote, publish, and be paid for their music.</property>
+ <property name="label" translatable="yes">Jamendo is a new model for artists to promote, publish, and be paid for their music.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -109,7 +109,7 @@
<child>
<widget class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="label" translatable="yes">On jamendo, the artists distribute their music under Creative Commons licenses.
+ <property name="label" translatable="yes">On Jamendo, the artists distribute their music under Creative Commons licenses.
In a nutshell, they allow you to download, remix and share their music freely.
It's a "Some rights reserved" agreement, perfectly suited for the new century.</property>
<property name="use_underline">False</property>
@@ -136,7 +136,7 @@
<child>
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="label" translatable="yes">These new rules make jamendo able to use the new powerful means of digital distribution like
+ <property name="label" translatable="yes">These new rules make Jamendo able to use the new powerful means of digital distribution like
Peer-to-Peer networks such as BitTorrent or eMule to legally distribute albums at near-zero cost.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
@@ -162,7 +162,7 @@
<child>
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="label" translatable="yes">jamendo users can discover and share albums, but also review them or start a discussion on the forums.
+ <property name="label" translatable="yes">Jamendo users can discover and share albums, but also review them or start a discussion on the forums.
Albums are democratically rated based on the visitorsâ reviews.
If they fancy an artist they can support him by making a donation.</property>
<property name="use_underline">False</property>
@@ -189,7 +189,7 @@
<child>
<widget class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="label" translatable="yes">jamendo is the only platform that joins together :</property>
+ <property name="label" translatable="yes">Jamendo is the only platform that joins together :</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
Modified: trunk/plugins/jamendo/jamendo/JamendoSource.py
==============================================================================
--- trunk/plugins/jamendo/jamendo/JamendoSource.py (original)
+++ trunk/plugins/jamendo/jamendo/JamendoSource.py Sun Mar 29 02:08:19 2009
@@ -117,7 +117,7 @@
progress = min (float(self.__load_current_size) / self.__load_total_size, 1.0)
else:
progress = -1.0
- return (_("Loading Jamendo catalogue"), None, progress)
+ return (_("Loading Jamendo catalog"), None, progress)
else:
qm = self.get_property("query-model")
return (qm.compute_status_normal("%d song", "%d songs"), None, 0.0)
Modified: trunk/plugins/magnatune/magnatune/MagnatuneSource.py
==============================================================================
--- trunk/plugins/magnatune/magnatune/MagnatuneSource.py (original)
+++ trunk/plugins/magnatune/magnatune/MagnatuneSource.py Sun Mar 29 02:08:19 2009
@@ -118,7 +118,7 @@
progress = min (float(self.__load_current_size) / self.__load_total_size, 1.0)
else:
progress = -1.0
- return (_("Loading Magnatune catalogue"), None, progress)
+ return (_("Loading Magnatune catalog"), None, progress)
elif self.__downloading:
progress = min (self.__download_progress, 1.0)
return (_("Downloading Magnatune Album(s)"), None, progress)
@@ -354,8 +354,8 @@
out = open(magnatune_song_info, 'w')
filename = self.__find_song_info(catalog)
if filename is None:
- rb.error_dialog(title=_("Unable to load catalogue"),
- message=_("Rhythmbox could not understand the Magnatune catalogue, please file a bug."))
+ rb.error_dialog(title=_("Unable to load catalog"),
+ message=_("Rhythmbox could not understand the Magnatune catalog, please file a bug."))
return
out.write(catalog.read(filename))
out.close()
Modified: trunk/rhythmdb/rhythmdb-tree.c
==============================================================================
--- trunk/rhythmdb/rhythmdb-tree.c (original)
+++ trunk/rhythmdb/rhythmdb-tree.c Sun Mar 29 02:08:19 2009
@@ -404,8 +404,8 @@
g_set_error (ctx->error,
RHYTHMDB_TREE_ERROR,
RHYTHMDB_TREE_ERROR_DATABASE_TOO_NEW,
- _("The database was created by a later version of rhythmbox."
- " This version of rhythmbox cannot read the database."));
+ _("The database was created by a later version of Rhythmbox."
+ " This version of Rhythmbox cannot read the database."));
xmlStopParser (ctx->xmlctx);
}
}
Modified: trunk/sources/rb-podcast-source.c
==============================================================================
--- trunk/sources/rb-podcast-source.c (original)
+++ trunk/sources/rb-podcast-source.c Sun Mar 29 02:08:19 2009
@@ -534,9 +534,8 @@
action = gtk_action_group_get_action (source->priv->action_group,
"MusicNewPodcast");
/* Translators: this is the toolbar button label
- for New Podcast Feed action.
- Don't include the prefix "podcast|" in the translation. */
- g_object_set (G_OBJECT (action), "short-label", Q_("podcast|New"), NULL);
+ for New Podcast Feed action. */
+ g_object_set (G_OBJECT (action), "short-label", C_("Podcast", "New"), NULL);
action = gtk_action_group_get_action (source->priv->action_group,
"PodcastUpdateAllFeeds");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
