[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-i18n-doc
Subject: extragear/multimedia/amarok
From: Andrew Turner <andrewturner512+kdebugs () googlemail ! com>
Date: 2006-09-29 11:12:09
Message-ID: 1159528329.155908.31386.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 590140 by aturner:
Revert some overly fussy spelling fixes, but leave some still in place.
The final result is two changes:
mediabrowser.cpp - Add a space after "Disconnect" in string about possible data
loss.
mediadevice/mtp/mtpmediadevice.cpp - in "/ is used a folder separator." "a"->"as".
CCMAIL:kde-i18n-doc@kde.org
M +2 -1 ChangeLog
M +1 -1 src/coverfetcher.cpp
M +1 -1 src/covermanager.cpp
M +13 -13 src/engine/helix/helix-errors.cpp
M +1 -1 src/engine/xine/xine-engine.cpp
M +1 -1 src/mediadevice/ifp/ifpmediadevice.cpp
--- trunk/extragear/multimedia/amarok/ChangeLog #590139:590140
@@ -36,7 +36,8 @@
* Show a proper tag dialog when viewing information for DAAP music shares.
BUGFIXES:
- * Fix some spellings. Patch by Malcolm Parsons <malcolm.parsons@gmail.com>.
+ * Fix some spelling and layout issues. Part of a patch by Malcolm Parsons
+ <malcolm.parsons@gmail.com>.
* Correctly handle horizontal wheel events in position slider. (BR 119254)
* Don't rescan collection while transcoding. (BR 133423)
* Don't try to copy to collection from urls without kio slaves.
--- trunk/extragear/multimedia/amarok/src/coverfetcher.cpp #590139:590140
@@ -42,7 +42,7 @@
menu.insertTitle( i18n( "Cover Image" ) );
menu.insertItem( SmallIconSet( Amarok::icon( "zoom" ) ), i18n( "&Show \
Fullsize" ), SHOW );
- menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch \
From Amazon.%1" ).arg(CoverManager::amazonTld()), FETCH ); + menu.insertItem( \
SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" \
).arg(CoverManager::amazonTld()), FETCH );
menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "Set &Custom \
Cover" ), CUSTOM ); menu.insertSeparator();
--- trunk/extragear/multimedia/amarok/src/covermanager.cpp #590139:590140
@@ -483,7 +483,7 @@
menu.insertItem( SmallIconSet( Amarok::icon( "search" ) ), i18n("&Show \
Fullsize"), SHOW );
#ifdef AMAZON_SUPPORT
- menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n("&Fetch \
From Amazon.%1").arg( CoverManager::amazonTld() ), FETCH ); + menu.insertItem( \
SmallIconSet( Amarok::icon( "download" ) ), i18n("&Fetch From amazon.%1").arg( \
CoverManager::amazonTld() ), FETCH ); menu.insertSeparator();
menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n("Set &Custom \
Image"), CUSTOM ); #else
--- trunk/extragear/multimedia/amarok/src/engine/helix/helix-errors.cpp \
#590139:590140 @@ -74,7 +74,7 @@
{0x80040047, i18n("Invalid Host")},
{0x80040048, i18n("Net Read")},
{0x80040049, i18n("Net Write")},
- {0x8004004a, i18n("Net UDP")},
+ {0x8004004a, i18n("Net Udp")},
{0x8004004b, i18n("Retry")},
{0x8004004c, i18n("Server Timeout")},
{0x8004004d, i18n("Server Disconnected")},
@@ -83,21 +83,21 @@
{0x80040050, i18n("Block Canceled")},
{0x80040051, i18n("Multicast Join")},
{0x80040052, i18n("General Multicast")},
- {0x80040053, i18n("Multicast UDP")},
+ {0x80040053, i18n("Multicast Udp")},
{0x80040054, i18n("At Interrupt")},
{0x80040055, i18n("Msg Toolarge")},
- {0x80040056, i18n("Net TCP")},
+ {0x80040056, i18n("Net Tcp")},
{0x80040057, i18n("Try Autoconfig")},
{0x80040058, i18n("Notenough Bandwidth")},
- {0x80040059, i18n("HTTP Connect")},
+ {0x80040059, i18n("Http Connect")},
{0x8004005a, i18n("Port In Use")},
{0x8004005b, i18n("Loadtest Not Supported")},
- {0x00040060, i18n("TCP Connect")},
- {0x00040061, i18n("TCP Reconnect")},
- {0x80040062, i18n("TCP Failed")},
+ {0x00040060, i18n("Tcp Connect")},
+ {0x00040061, i18n("Tcp Reconnect")},
+ {0x80040062, i18n("Tcp Failed")},
{0x80040063, i18n("Authentication Socket Create Failure")},
- {0x80040064, i18n("Authentication TCP Connect Failure")},
- {0x80040065, i18n("Authentication TCP Connect Timeout")},
+ {0x80040064, i18n("Authentication Tcp Connect Failure")},
+ {0x80040065, i18n("Authentication Tcp Connect Timeout")},
{0x80040066, i18n("Authentication Failure")},
{0x80040067, i18n("Authentication Required Parameter Missing")},
{0x80040068, i18n("Dns Resolve Failure")},
@@ -105,7 +105,7 @@
{0x80040069, i18n("Pull Authentication Failed")},
{0x8004006a, i18n("Bind Error")},
{0x8004006b, i18n("Pull Ping Timeout")},
- {0x8004006c, i18n("Authentication TCP Failed")},
+ {0x8004006c, i18n("Authentication Tcp Failed")},
{0x8004006d, i18n("Unexpected Stream End")},
{0x8004006e, i18n("Authentication Read Timeout")},
{0x8004006f, i18n("Authentication Connection Failure")},
@@ -144,7 +144,7 @@
{0x800400ca, i18n("Invalid Url Option")},
{0x800400cb, i18n("Invalid Url Host")},
{0x800400cc, i18n("Invalid Url Path")},
- {0x800400cd, i18n("HTTP Content Not Found")},
+ {0x800400cd, i18n("Http Content Not Found")},
{0x800400ce, i18n("Not Authorized")},
{0x800400cf, i18n("Unexpected Msg")},
{0x800400d0, i18n("Bad Transport")},
@@ -280,11 +280,11 @@
{0x800401c5, i18n("No Codecs")},
{0x800401c6, i18n("Slow Machine")},
{0x800401c7, i18n("Force Perfectplay")},
- {0x800401c8, i18n("Invalid HTTP Proxy Host")},
+ {0x800401c8, i18n("Invalid Http Proxy Host")},
{0x800401c9, i18n("Invalid Metafile")},
{0x800401ca, i18n("Browser Launch")},
{0x800401cb, i18n("View Source Noclip")},
- {0x800401cc, i18n("View Source Disabled")},
+ {0x800401cc, i18n("View Source Dissabled")},
{0x800401ce, i18n("Timeline Suspended")},
{0x800401cf, i18n("Buffer Not Available")},
{0x800401d0, i18n("Could Not Display")},
--- trunk/extragear/multimedia/amarok/src/engine/xine/xine-engine.cpp #590139:590140
@@ -303,7 +303,7 @@
debug() << "xine_get_error()\n";
switch (xine_get_error( m_stream )) {
case XINE_ERROR_NO_INPUT_PLUGIN:
- body = i18n("No suitable input plugin. This often means that the URL's \
protocol is not supported. Network failures are other possible causes."); + \
body = i18n("No suitable input plugin. This often means that the url's protocol is \
not supported. Network failures are other possible causes."); break;
case XINE_ERROR_NO_DEMUX_PLUGIN:
--- trunk/extragear/multimedia/amarok/src/mediadevice/ifp/ifpmediadevice.cpp \
#590139:590140 @@ -178,7 +178,7 @@
{
error() << "Could not get usb_device()" << endl;
Amarok::StatusBar::instance()->shortLongMessage( genericError,
- i18n("iFP: Could not get a USB device \
handle"), KDE::StatusBar::Error ); + \
i18n("iFP: Could not get a usb device handle"), KDE::StatusBar::Error ); if( \
ifp_release_device( m_dh ) ) error() << "warning: release_device failed." << endl;
return false;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic