banshee r4305 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Query src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Banshee.Gui.Widgets src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp src/Extensions/Banshee.Daap/Banshee.Daap src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager
- From: gburt svn gnome org
- To: svn-commits-list gnome org
- Subject: banshee r4305 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Query src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Banshee.Gui.Widgets src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp src/Extensions/Banshee.Daap/Banshee.Daap src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager
- Date: Thu, 31 Jul 2008 00:23:43 +0000 (UTC)
Author: gburt
Date: Thu Jul 31 00:23:43 2008
New Revision: 4305
URL: http://svn.gnome.org/viewvc/banshee?rev=4305&view=rev
Log:
2008-07-30 Gabriel Burt <gabriel burt gmail com>
Fix a bunch of translatability issues (BGO #545239).
* src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs: Fix plural
string issue.
* src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:
* src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:
* src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:
* src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:
* src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs: Add
and clarify translator comments.
* src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:
Avoid contraction.
* src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs: Avoid 'toggle'.
Modified:
trunk/banshee/ChangeLog
trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs
trunk/banshee/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs
trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs
trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs Thu Jul 31 00:23:43 2008
@@ -62,6 +62,7 @@
RandomOrder,
CreateQueryOrder ("Album", asc, Catalog.GetString ("Album"), AlbumField),
CreateQueryOrder ("Artist", asc, Catalog.GetString ("Artist"), ArtistField),
+ // Translators: noun
CreateQueryOrder ("Title", asc, Catalog.GetString ("Title"), TitleField),
CreateQueryOrder ("Genre", asc, Catalog.GetString ("Genre"), GenreField),
null,
@@ -91,7 +92,7 @@
public static QueryField ArtistField = new QueryField (
"artist", "ArtistName",
Catalog.GetString ("Artist"), "CoreArtists.NameLowered", true,
- // Translators: These are unique search fields. Please, no spaces. Blank ok.
+ // Translators: These are unique search aliases for "artist". Please, no spaces. Blank ok.
Catalog.GetString ("artist"), Catalog.GetString ("by"), Catalog.GetString ("artists"),
"by", "artist", "artists"
);
@@ -99,7 +100,7 @@
public static QueryField AlbumField = new QueryField (
"album", "AlbumTitle",
Catalog.GetString ("Album"), "CoreAlbums.TitleLowered", true,
- // Translators: These are unique search fields. Please, no spaces. Blank ok.
+ // Translators: These are unique search aliases for "album". Please, no spaces. Blank ok.
Catalog.GetString ("album"), Catalog.GetString ("on"), Catalog.GetString ("from"),
"on", "album", "from", "albumtitle"
);
@@ -107,13 +108,14 @@
public static QueryField DiscField = new QueryField (
"disc", "Disc",
Catalog.GetString ("Disc"), "CoreTracks.Disc", typeof(NaturalIntegerQueryValue),
- // Translators: These are unique search fields. Please, no spaces. Blank ok.
+ // Translators: These are unique search fields (and nouns). Please, no spaces. Blank ok.
Catalog.GetString ("disc"), Catalog.GetString ("cd"), Catalog.GetString ("discnum"),
"disc", "cd", "discnum"
);
public static QueryField TrackNumberField = new QueryField (
"track", "TrackNumber",
+ // Translators: noun
Catalog.GetString ("Track"), "CoreTracks.TrackNumber", typeof(NaturalIntegerQueryValue),
// Translators: These are unique search fields. Please, no spaces. Blank ok.
"#", Catalog.GetString ("track"), Catalog.GetString ("trackno"), Catalog.GetString ("tracknum"),
@@ -152,8 +154,9 @@
public static QueryField CommentField = new QueryField (
"comment", "Comment",
+ // Translators: noun
Catalog.GetString ("Comment"), "CoreTracks.Comment", false,
- // Translators: These are unique search fields. Please, no spaces. Blank ok.
+ // Translators: These are unique search fields (and nouns). Please, no spaces. Blank ok.
Catalog.GetString ("comment"), "comment"
);
@@ -168,7 +171,7 @@
public static QueryField PlayCountField = new QueryField (
"playcount", "PlayCount",
Catalog.GetString ("Play Count"), "CoreTracks.PlayCount", typeof(NaturalIntegerQueryValue),
- // Translators: These are unique search fields. Please, no spaces. Blank ok.
+ // Translators: These are unique search fields (and nouns). Please, no spaces. Blank ok.
Catalog.GetString ("plays"), Catalog.GetString ("playcount"), Catalog.GetString ("listens"),
"plays", "playcount", "numberofplays", "listens"
);
@@ -176,7 +179,7 @@
public static QueryField SkipCountField = new QueryField (
"skipcount", "SkipCount",
Catalog.GetString ("Skip Count"), "CoreTracks.SkipCount", typeof(NaturalIntegerQueryValue),
- // Translators: These are unique search fields. Please, no spaces. Blank ok.
+ // Translators: These are unique search fields (and nouns). Please, no spaces. Blank ok.
Catalog.GetString ("skips"), Catalog.GetString ("skipcount"),
"skips", "skipcount"
);
@@ -184,7 +187,7 @@
public static QueryField FileSizeField = new QueryField (
"filesize", "FileSize",
Catalog.GetString ("File Size"), "CoreTracks.FileSize", typeof(FileSizeQueryValue),
- // Translators: These are unique search fields. Please, no spaces. Blank ok.
+ // Translators: These are unique search fields (and nouns). Please, no spaces. Blank ok.
Catalog.GetString ("size"), Catalog.GetString ("filesize"),
"size", "filesize"
);
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs Thu Jul 31 00:23:43 2008
@@ -360,7 +360,7 @@
Banshee.Streaming.RadioTrackInfo radio_track = track as Banshee.Streaming.RadioTrackInfo;
if ((track.MediaAttributes & TrackMediaAttributes.Podcast) != 0) {
- // Translators: {0} and {1} are for markup, {2} and {3}
+ // Translators: {0} and {1} are for markup so ignore them, {2} and {3}
// are Podcast Name and Published Date, respectively;
// e.g. 'from BBtv published 7/26/2007'
markup = MarkupFormat (Catalog.GetString ("{0}from{1} {2} {0}published{1} {3}"),
@@ -378,7 +378,7 @@
// simply: "Chicago Public Radio" or whatever the artist name is
markup = GLib.Markup.EscapeText (radio_track.ParentTrack.ArtistName ?? Catalog.GetString ("Unknown Stream"));
} else {
- // Translators: {0} and {1} are markup, {2} is the name of the radio station
+ // Translators: {0} and {1} are markup so ignore them, {2} is the name of the radio station
string on = MarkupFormat (Catalog.GetString ("{0}on{1} {2}"), radio_track.ParentTrack.TrackTitle);
// Translators: {0} is the "from {album} by {artist}" type string, and {1} is the "on {radio station name}" string
@@ -387,7 +387,6 @@
} else {
markup = GetByFrom (track.ArtistName, track.DisplayArtistName, track.AlbumTitle, track.DisplayAlbumTitle, true);
}
-
return String.Format ("<span color=\"{0}\">{1}</span>",
CairoExtensions.ColorGetHex (text_color, false),
@@ -416,16 +415,16 @@
string markup = null;
if (has_artist && has_album) {
- // Translators: {0} and {1} are for markup, {2} and {3}
+ // Translators: {0} and {1} are for markup so ignore them, {2} and {3}
// are Artist Name and Album Title, respectively;
// e.g. 'by Parkway Drive from Killing with a Smile'
markup = MarkupFormat (Catalog.GetString ("{0}by{1} {2} {0}from{1} {3}"), display_artist, display_album);
} else if (has_album) {
- // Translators: {0} and {1} are for markup, {2} is for Album Title;
+ // Translators: {0} and {1} are for markup so ignore them, {2} is for Album Title;
// e.g. 'from Killing with a Smile'
markup = MarkupFormat (Catalog.GetString ("{0}from{1} {2}"), display_album);
} else if (has_artist || unknown_ok) {
- // Translators: {0} and {1} are for markup, {2} is for Artist Name;
+ // Translators: {0} and {1} are for markup so ignore them, {2} is for Artist Name;
// e.g. 'by Parkway Drive'
markup = MarkupFormat (Catalog.GetString ("{0}by{1} {2}"), display_artist);
}
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs Thu Jul 31 00:23:43 2008
@@ -182,6 +182,7 @@
} catch {}
chooser.AddButton (Stock.Cancel, ResponseType.Cancel);
+ // Translators: verb
chooser.AddButton (Catalog.GetString("Import"), ResponseType.Ok);
int response = chooser.Run();
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs Thu Jul 31 00:23:43 2008
@@ -69,7 +69,7 @@
AddImportant (new ToggleActionEntry [] {
new ToggleActionEntry ("FullScreenAction", "gtk-fullscreen",
Catalog.GetString ("_Fullscreen"), "F",
- Catalog.GetString ("Toggle Fullscreen Mode"), OnFullScreen, false),
+ Catalog.GetString ("Enter or leave fullscreen mode"), OnFullScreen, false),
});
/*Add (new ToggleActionEntry [] {
Modified: trunk/banshee/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs (original)
+++ trunk/banshee/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs Thu Jul 31 00:23:43 2008
@@ -146,6 +146,8 @@
try {
List<Track> files = mtp_device.GetAllTracks (delegate (ulong current, ulong total, IntPtr data) {
//user_event.Progress = (double)current / total;
+ // Translators: {0} is the name of the MTP audio device (eg Gabe's Zen Player), {1} is the
+ // current track being loaded, and {2} is the total # of tracks that will be loaded.
SetStatus (String.Format (Catalog.GetString ("Loading {0} - {1} of {2}"), Name, current, total), false);
return 0;
});
Modified: trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs (original)
+++ trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs Thu Jul 31 00:23:43 2008
@@ -231,7 +231,10 @@
database.TrackAdded += OnDatabaseTrackAdded;
database.TrackRemoved += OnDatabaseTrackRemoved;
- SetStatus (String.Format (Catalog.GetString ("Loading {0} tracks."), database.Tracks.Count), false);
+ SetStatus (String.Format (Catalog.GetPluralString (
+ "Loading {0} track.", "Loading {0} tracks.", database.Tracks.Count),
+ database.Tracks.Count), false
+ );
// Notify (eg reload the source before sync is done) at most 5 times
int notify_every = Math.Max (250, (database.Tracks.Count / 4));
Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs (original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs Thu Jul 31 00:23:43 2008
@@ -81,7 +81,9 @@
)
});
+ // Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to".
string listen_to = Catalog.GetString ("Listen to {0} Station");
+ // Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to".
string listen_to_long = Catalog.GetString ("Listen to the Last.fm {0} station for this artist");
// Artist actions
Modified: trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs (original)
+++ trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs Thu Jul 31 00:23:43 2008
@@ -49,7 +49,7 @@
Title = Catalog.GetString ("Downloading Podcast(s)");
Status = Catalog.GetString ("Initializing...");
- CancelMessage = Catalog.GetString ("Are you sure that you'd like to cancel all podcast downloads?");
+ CancelMessage = Catalog.GetString ("Cancel all podcast downloads?");
this.IconNames = new string[1] {
Stock.Network
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
