rendered paste bodyIndex: src/krecipes.cpp
===================================================================
--- src/krecipes.cpp (revision 1043652)
+++ src/krecipes.cpp (working copy)
@@ -187,7 +187,7 @@
printAction = KStandardAction::print( this, SLOT( filePrint() ), actionCollection() );
reloadAction = new KAction( this );
- reloadAction->setText( i18n( "Reloa&d" ) );
+ reloadAction->setText( i18nc("@action:inmenu Reload Recipe", "Reloa&d" ) );
reloadAction->setIcon( KIcon( "view-refresh" ) );
reloadAction->setShortcut( Qt::Key_F5 );
actionCollection()->addAction( "reload_action" , reloadAction );
@@ -340,7 +340,7 @@
//Note that createAction is intended to create anything except a new recipe.
createAction = new KAction( this );
- createAction->setText( i18n( "Create New" ) );
+ createAction->setText( i18nc("@action:button Create new data item", "Create New" ) );
createAction->setIcon( KIcon( "document-new" ) );
createAction->setShortcut( Qt::CTRL + Qt::ALT + Qt::Key_N );
actionCollection()->addAction( "create_new_action", createAction );
@@ -564,7 +564,7 @@
if ( !importer->getMessages().isEmpty() ) {
KTextEdit * warningEdit = new KTextEdit( this );
- warningEdit->setText( i18n( "NOTE: We recommend that all recipes generating warnings be checked to ensure that they were properly imported, and no loss of recipe data has occurred.<br><br>" ) + importer->getMessages() );
+ warningEdit->setText( i18n("<p>NOTE: We recommend that all recipes generating warnings be checked to ensure that they were properly imported, and no loss of recipe data has occurred.</p>" ) + importer->getMessages() );
warningEdit->setReadOnly( true );
//FIXME: This dialog should allow cancel the import.
Index: src/exporters/recipemlexporter.cpp
===================================================================
--- src/exporters/recipemlexporter.cpp (revision 1043652)
+++ src/exporters/recipemlexporter.cpp (working copy)
@@ -138,7 +138,7 @@
if ( !( *recipe_it ).prepTime.isNull() ) {
QDomElement preptime_tag = doc.createElement( "preptime" );
head_tag.appendChild( preptime_tag );
- preptime_tag.setAttribute( "type", i18n( "Total" ) );
+ preptime_tag.setAttribute( "type", i18nc( "Total prep time", "Total" ) );
QDomElement preptime_time_tag = doc.createElement( "time" );
preptime_tag.appendChild( preptime_time_tag );
Index: src/setupassistant.cpp
===================================================================
--- src/setupassistant.cpp (revision 1043652)
+++ src/setupassistant.cpp (working copy)
@@ -150,7 +150,7 @@
layout->addItem( spacer_from_image, 1, 2 );
welcomeText = new QLabel( this );
- welcomeText->setText( i18n( "<b><font size=\"+1\">Thank you very much for choosing Krecipes.</font></b><br>It looks like this is the first time you are using it. This wizard will help you with the initial setup so that you can start using it quickly.<br><br>Welcome, and enjoy cooking!" ) );
+ welcomeText->setText( i18n( "<p><b><font size=\"+1\">Thank you very much for choosing Krecipes.</font></b></p><p>It looks like this is the first time you are using it. This wizard will help you with the initial setup so that you can start using it quickly.</p><p>Welcome, and enjoy cooking!</p>" ) );
welcomeText->setWordWrap(true);
welcomeText->setAlignment( Qt::AlignTop );
layout->addWidget( welcomeText, 1, 3 );
@@ -183,7 +183,7 @@
// Explanation Text
permissionsText = new QLabel( this );
- permissionsText->setText( i18n( "This dialog will allow you to specify a MySQL account that has the necessary permissions to access the Krecipes MySQL database.<br><br><b><font size=\"+1\">Most users that use Krecipes and MySQL for the first time can just leave the default parameters and press \'Next\'.</font></b> <br><br>If you set a MySQL root password before, or you have already permissions as normal user, click on the appropriate option. Otherwise the account 'root' will be used, with no password.<br><br>[For security reasons, we strongly encourage you to setup a MySQL root password if you have not done so yet. Just type as root: mysqladmin password <i>your_password</i>]" ) );
+ permissionsText->setText( i18n( "<p>This dialog will allow you to specify a MySQL account that has the necessary permissions to access the Krecipes MySQL database.</p><p><b><font size=\"+1\">Most users that use Krecipes and MySQL for the first time can just leave the default parameters and press \'Next\'.</font></b></p> <p>If you set a MySQL root password before, or you have already permissions as normal user, click on the appropriate option. Otherwise the account 'root' will be used, with no password.</p><p>[For security reasons, we strongly encourage you to setup a MySQL root password if you have not done so yet. Just type as root: mysqladmin password <i>your_password</i>]</p>" ) );
permissionsText->setWordWrap(true);
permissionsText->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Minimum );
permissionsText->setAlignment( Qt::AlignTop );
@@ -217,7 +217,7 @@
rootInfoGBox->setEnabled( false ); // Disable by default
// User Entry
QLabel *userLabel = new QLabel( rootInfoGBox );
- userLabel->setText( i18n( "Username:" ) );
+ userLabel->setText( i18nc("@label:textbox Database Username", "Username:" ) );
rootInfoLayout->addWidget( userLabel, 0, 0 );
userEdit = new KLineEdit( rootInfoGBox );
userEdit->setText( "root" );
@@ -298,7 +298,7 @@
// Explanation Text
permissionsText = new QLabel( this );
- permissionsText->setText( i18n( "This dialog will allow you to specify a PostgreSQL account that has the necessary permissions to access the Krecipes PostgreSQL database. This account may either be a <b>PostgreSQL superuser</b> or have the ability to both <b>create new PostgreSQL users and databases</b>.<br><br>If no superuser or privileged account is given, the account 'postgres' will be attempted, with no password. If this is insufficient for your PostgreSQL setup, you <b>must</b> select the appropriate option below to enter the information of a privileged PostgreSQL account." ) );
+ permissionsText->setText( i18n( "<p>This dialog will allow you to specify a PostgreSQL account that has the necessary permissions to access the Krecipes PostgreSQL database. This account may either be a <b>PostgreSQL superuser</b> or have the ability to both <b>create new PostgreSQL users and databases</b>.</p><p>If no superuser or privileged account is given, the account 'postgres' will be attempted, with no password. If this is insufficient for your PostgreSQL setup, you <b>must</b> select the appropriate option below to enter the information of a privileged PostgreSQL account.</p>" ) );
permissionsText->setWordWrap(true);
permissionsText->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Minimum );
permissionsText->setAlignment( Qt::AlignTop );
@@ -332,7 +332,7 @@
rootInfoGBox->setEnabled( false ); // Disable by default
// User Entry
QLabel *userLabel = new QLabel( rootInfoGBox );
- userLabel->setText( i18n( "Username:" ) );
+ userLabel->setText( i18nc("@label:textbox Database Username", "Username:" ) );
rootInfoLayout->addWidget( userLabel, 0, 0 );
userEdit = new KLineEdit( rootInfoGBox );
userEdit->setText( "postgres" );
@@ -413,7 +413,7 @@
// Explanation text
serverSetupText = new QLabel( this );
- serverSetupText->setText( i18n( "In this dialog you can adjust the database server settings.<br><br><b>Warning: Passwords are stored in plain text and could potentially be compromised. We recommend that you create a username and password combination solely for use by Krecipes.</b>" ) );
+ serverSetupText->setText( i18n( "<p>In this dialog you can adjust the database server settings.</p><p><b>Warning: Passwords are stored in plain text and could potentially be compromised. We recommend that you create a username and password combination solely for use by Krecipes.</b></p>" ) );
serverSetupText->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Minimum );
serverSetupText->setAlignment( Qt::AlignTop );
serverSetupText->setWordWrap(true);
@@ -433,7 +433,7 @@
// Username Input
- QLabel* usernameText = new QLabel( i18n( "Username:" ), inputGBox );
+ QLabel* usernameText = new QLabel( i18nc( "@label:textbox Database Username", "Username:" ), inputGBox );
inputLayout->addWidget( usernameText, 0, 0 );
usernameEdit = new KLineEdit( inputGBox );
@@ -511,7 +511,7 @@
serverSettingsLayout->addWidget( portText, 2, 0 );
portEdit = new KIntNumInput( serverSettingsGBox );
portEdit->setMinimum(0);
- portEdit->setSpecialValueText( i18n("Default") );
+ portEdit->setSpecialValueText( i18nc("@label:textbox Default Port", "Default") );
serverSettingsLayout->addWidget( portEdit, 2, 1 );
// Bottom Spacers
@@ -760,7 +760,7 @@
//KLineEdit *passwordEdit;
//KLineEdit *dbNameEdit;
initializeText = new QLabel( this );
- initializeText->setText( i18n( "Krecipes comes with some delicious default recipes and useful data. <br><br>Would you like to initialize your database with those? Note that this will erase all your previous recipes if you have any. " ) );
+ initializeText->setText( i18n( "<p>Krecipes comes with some delicious default recipes and useful data.</p><p>Would you like to initialize your database with those? Note that this will erase all your previous recipes if you have any.</p>" ) );
initializeText->setAlignment( Qt::AlignTop );
initializeText->setWordWrap(true);
@@ -786,7 +786,7 @@
QSpacerItem *textInfoSpacer = new QSpacerItem( 0, 50, QSizePolicy::Minimum, QSizePolicy::Fixed );
layout->addItem( textInfoSpacer, 4, 3 );
- USDAImportText = new QLabel( i18n( "Krecipes can import nutrient data from the USDA's nutrient database for over 400 foods. A total of 43 food properties are included for each food, such as energy, fat, vitamin C, etc.<br><br>Would you like to import this data now? Note that this operation is safe to use on an existing database, and no data loss will occur. This operation may take several minutes." ), this );
+ USDAImportText = new QLabel( i18n( "<p>Krecipes can import nutrient data from the USDA's nutrient database for over 400 foods. A total of 43 food properties are included for each food, such as energy, fat, vitamin C, etc.</p><p>Would you like to import this data now? Note that this operation is safe to use on an existing database, and no data loss will occur. This operation may take several minutes.</p>" ), this );
USDAImportText->setWordWrap(true);
layout->addWidget( USDAImportText, 5, 3 );
Index: src/krecipesview.cpp
===================================================================
--- src/krecipesview.cpp (revision 1043652)
+++ src/krecipesview.cpp (working copy)
@@ -342,7 +342,7 @@
ConvertSQLite3 converter;
converter.convert();
} else {
- kError() << errormsg << ". " << i18n( "Exiting" ) ;
+ kError() << errormsg << ". " << i18nc("Exiting krecipes", "Exiting" ) ;
kapp->exit( 1 ); exit ( 1 ); //FIXME: why doesn't kapp->exit(1) do anything?
return false;
}
@@ -357,7 +357,7 @@
if ( answer == KMessageBox::Yes )
wizard( true );
else {
- kError() << errormsg << ". " << i18n( "Exiting" ) ;
+ kError() << errormsg << ". " << i18nc("Exiting Krecipes", "Exiting" ) ;
kapp->exit( 1 ); exit ( 1 ); //FIXME: why doesn't kapp->exit(1) do anything?
return false;
}
Index: src/dialogs/dietwizarddialog.cpp
===================================================================
--- src/dialogs/dietwizarddialog.cpp (revision 1043652)
+++ src/dialogs/dietwizarddialog.cpp (working copy)
@@ -107,7 +107,7 @@
KPushButton *clearButton = new KPushButton( bottom_layout );
clearButton->setIcon( KIcon( "edit-clear" ) );
- clearButton->setText( i18n( "Clear" ) );
+ clearButton->setText( i18nc( "@action:button Clear Diet","Clear" ) );
// Create Tabs
//don't use newTab, it'll load data and we don't want it to do that at startup
Index: src/dialogs/refineshoppinglistdialog.cpp
===================================================================
--- src/dialogs/refineshoppinglistdialog.cpp (revision 1043652)
+++ src/dialogs/refineshoppinglistdialog.cpp (working copy)
@@ -42,7 +42,7 @@
KVBox *page = new KVBox( this );
setMainWidget( page );
- setButtonText( KDialog::Ok, i18n( "&Done" ) );
+ setButtonText( KDialog::Ok, i18nc( "action:button Finished refining shopping list", "&Done" ) );
helpLabel = new QLabel( page );
Index: src/dialogs/advancedsearchdialog.cpp
===================================================================
--- src/dialogs/advancedsearchdialog.cpp (revision 1043652)
+++ src/dialogs/advancedsearchdialog.cpp (working copy)
@@ -408,7 +408,7 @@
metaDataFrameLayout->setMargin( 5 );
metaDataFrameLayout->setSpacing( 3 );
- QLabel *createdLabel = new QLabel( i18n("Created:"), metaDataFrame );
+ QLabel *createdLabel = new QLabel( i18nc("@label Recipe created date", "Created:"), metaDataFrame );
metaDataFrameLayout->addWidget( createdLabel );
KHBox *createdHBox = new KHBox(metaDataFrame);
@@ -419,7 +419,7 @@
createdEndDateEdit->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred );
metaDataFrameLayout->addWidget( createdHBox );
- QLabel *modifiedLabel = new QLabel( i18n("Modified:"), metaDataFrame );
+ QLabel *modifiedLabel = new QLabel( i18nc("@label Recipe modified date", "Modified:"), metaDataFrame );
metaDataFrameLayout->addWidget( modifiedLabel );
KHBox *modifiedHBox = new KHBox(metaDataFrame);
@@ -430,7 +430,7 @@
modifiedEndDateEdit->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred );
metaDataFrameLayout->addWidget( modifiedHBox );
- QLabel *accessedLabel = new QLabel( i18n("Last Accessed:"), metaDataFrame );
+ QLabel *accessedLabel = new QLabel( i18nc("@label Recipe last accessed date", "Last Accessed:"), metaDataFrame );
metaDataFrameLayout->addWidget( accessedLabel );
KHBox *accessedHBox = new KHBox(metaDataFrame);
@@ -577,8 +577,8 @@
KConfigGroup config = KGlobal::config()->group( "Advanced" );
bool show_id = config.readEntry( "ShowID", false );
- resultsListView->addColumn( i18n( "Title" ) );
- resultsListView->addColumn( i18n( "Id" ), show_id ? -1 : 0 );
+ resultsListView->addColumn( i18nc("@title:column Recipe title", "Title" ) );
+ resultsListView->addColumn( i18nc("@title:column Recipe ID", "Id" ), show_id ? -1 : 0 );
actionHandler = new RecipeActionsHandler( resultsListView, database );
@@ -652,7 +652,7 @@
void AdvancedSearchDialog::languageChange()
{
- titleButton->setText( QString("%1 >>").arg(i18n("Title")) );
+ titleButton->setText( QString("%1 >>").arg(i18nc("@action:button Recipe title", "Title")) );
textLabel1_4->setText( i18n( "Search using the following criteria:" ) );
ingredientButton->setText( QString("%1 >>").arg(i18n("Ingredients")) );
textLabel1_2->setText( i18n( "Uses any of:" ) );
@@ -679,9 +679,9 @@
prepTimeComboBox->insertItem( prepTimeComboBox->count(), i18n( "Ready in about:" ) );
instructionsButton->setText( QString("%1 >>").arg(i18n("Instructions")) );
metaDataButton->setText( QString("%1 >>").arg(i18n("Meta Data")) );
- clearButton->setText( i18n( "C&lear" ) );
+ clearButton->setText( i18nc( "action:button Clear search criteria", "C&lear" ) );
clearButton->setShortcut( QKeySequence( i18n( "Alt+L" ) ) );
- findButton->setText( i18n( "&Search" ) );
+ findButton->setText( i18nc( "@action:button Search recipes", "&Search" ) );
ratingAvgRadioButton->setText( i18n( "By average:" ) );
avgStarsLabel->setText( i18n( "stars" ) );
criterionRadioButton->setText( i18n( "By criteria:" ) );
Index: src/dialogs/ingredientmatcherdialog.cpp
===================================================================
--- src/dialogs/ingredientmatcherdialog.cpp (revision 1043652)
+++ src/dialogs/ingredientmatcherdialog.cpp (working copy)
@@ -97,13 +97,13 @@
missingNumberLabel->setText( i18n( "Missing ingredients allowed:" ) );
missingNumberSpinBox = new KIntSpinBox( missingBox );
missingNumberSpinBox->setMinimum( -1 );
- missingNumberSpinBox->setSpecialValueText( i18n( "Any" ) );
+ missingNumberSpinBox->setSpecialValueText( i18nc( "Any amount of ingredients missing", "Any" ) );
// Found recipe list
recipeListView = new KreListView( this, i18n( "Matching Recipes" ), false, 1, missingBox );
recipeListView->listView() ->setAllColumnsShowFocus( true );
- recipeListView->listView() ->addColumn( i18n( "Title" ) );
+ recipeListView->listView() ->addColumn( i18nc( "@title:column Recipe Title", "Title" ) );
KConfigGroup config( KGlobal::config(), "Advanced" );
bool show_id = config.readEntry( "ShowID", false );
@@ -126,7 +126,7 @@
clearButton = new KPushButton( buttonBox );
clearButton->setIcon( KIcon( "edit-clear" ) );
- clearButton->setText( i18n( "Clear" ) );
+ clearButton->setText( i18nc( "@action:button Clear search criteria", "Clear" ) );
dialogLayout->addWidget(buttonBox);
// Connect signals & slots
Index: src/dialogs/recipeimportdialog.cpp
===================================================================
--- src/dialogs/recipeimportdialog.cpp (revision 1043652)
+++ src/dialogs/recipeimportdialog.cpp (working copy)
@@ -64,7 +64,7 @@
void RecipeImportDialog::loadListView()
{
- CustomCheckListItem * head_item = new CustomCheckListItem( kListView, i18n( "All (%1)", list_copy.count() ), Q3CheckListItem::CheckBox );
+ CustomCheckListItem * head_item = new CustomCheckListItem( kListView, i18nc( "@item:inlistbox All items", "All (%1)", list_copy.count() ), Q3CheckListItem::CheckBox );
head_item->setOpen( true );
//get all categories
Index: src/dialogs/setupdisplay.cpp
===================================================================
--- src/dialogs/setupdisplay.cpp (revision 1043652)
+++ src/dialogs/setupdisplay.cpp (working copy)
@@ -114,8 +114,8 @@
loadHTMLView();
show();
- createItem( "background", i18n("Background"), Font | BackgroundColor | TextColor );
- createItem( "title", i18n("Title"), Font | BackgroundColor | TextColor | Visibility | Alignment | Border );
+ createItem( "background", i18nc("Background color", "Background"), Font | BackgroundColor | TextColor );
+ createItem( "title", i18nc("Recipe title", "Title"), Font | BackgroundColor | TextColor | Visibility | Alignment | Border );
createItem( "instructions", i18n("Instructions"), Font | BackgroundColor | TextColor | Visibility | Alignment | Border );
createItem( "prep_time", i18n("Preparation Time"), Font | BackgroundColor | TextColor | Visibility | Alignment | Border );
createItem( "photo", i18n("Photo"), Visibility | Border );
@@ -448,11 +448,11 @@
QActionGroup *alignment_actions = new QActionGroup( this );
- QAction *c_action = new QAction( i18n( "Center" ), this );
+ QAction *c_action = new QAction( i18nc( "Align center", "Center" ), this );
alignment_actions->addAction( c_action );
- QAction *l_action = new QAction( i18n( "Left" ),this );
+ QAction *l_action = new QAction( i18nc( "Align left", "Left" ),this );
alignment_actions->addAction( l_action );
- QAction *r_action = new QAction( i18n( "Right" ), this );
+ QAction *r_action = new QAction( i18nc( "Align right", "Right" ), this );
alignment_actions->addAction( r_action );
int align = item->alignment;
@@ -581,11 +581,11 @@
if ( item->alignment & Qt::AlignLeft )
item->alignment ^= Qt::AlignLeft;
- if ( action->text() == i18n( "Center" ) )
+ if ( action->text() == i18nc( "Align center", "Center" ) )
item->alignment |= Qt::AlignHCenter;
- else if ( action->text() == i18n( "Left" ) )
+ else if ( action->text() == i18nc( "Align left", "Left" ) )
item->alignment |= Qt::AlignLeft;
- else if ( action->text() == i18n( "Right" ) )
+ else if ( action->text() == i18nc( "Align right", "Right" ) )
item->alignment |= Qt::AlignRight;
m_currentItem = item;
Index: src/dialogs/selectrecipedialog.cpp
===================================================================
--- src/dialogs/selectrecipedialog.cpp (revision 1043652)
+++ src/dialogs/selectrecipedialog.cpp (working copy)
@@ -71,8 +71,8 @@
searchLabel = new QLabel( searchBar );
- searchLabel->setText( i18n( "Search:" ) );
- searchLabel->setFixedWidth( searchLabel->fontMetrics().width( i18n( "Search:" ) ) + 5 );
+ searchLabel->setText( i18nc( "Search recipes", "Search:" ) );
+ searchLabel->setFixedWidth( searchLabel->fontMetrics().width( i18nc( "Search recipes", "Search:" ) ) + 5 );
searchBox = new KLineEdit( searchBar );
searchBox->setClearButtonShown( true );
connect( searchBox, SIGNAL(clearButtonClicked() ),this,SLOT( clearSearch() ) );
@@ -110,10 +110,10 @@
removeButton->setMaximumWidth( 100 );
removeButton->setIcon( KIcon("edit-delete-shred" ) );
- tabWidget->insertTab( -1, basicSearchTab, i18n( "Basic" ) );
+ tabWidget->insertTab( -1, basicSearchTab, i18nc( "Basic search", "Basic" ) );
advancedSearch = new AdvancedSearchDialog( this, database );
- tabWidget->insertTab( -1, advancedSearch, i18n( "Advanced" ) );
+ tabWidget->insertTab( -1, advancedSearch, i18nc( "Advanced search", "Advanced" ) );
//Takes care of all recipe actions and provides a popup menu to 'recipeListView'
actionHandler = new RecipeActionsHandler( recipeListView, database );
Index: src/dialogs/borderdialog.cpp
===================================================================
--- src/dialogs/borderdialog.cpp (revision 1043652)
+++ src/dialogs/borderdialog.cpp (working copy)
@@ -129,9 +129,9 @@
void BorderDialog::languageChange()
{
borderGroupBox->setTitle( i18n( "Requested Border" ) );
- styleLabel->setText( i18n( "Style:" ) );
- colorLabel->setText( i18n( "Color:" ) );
- widthLabel->setText( i18n( "Width:" ) );
+ styleLabel->setText( i18nc( "@label Border style", "Style:" ) );
+ colorLabel->setText( i18nc( "@label Border color", "Color:" ) );
+ widthLabel->setText( i18nc( "@label Border width", "Width:" ) );
}
KreBorder BorderDialog::border() const
@@ -203,7 +203,7 @@
void BorderDialog::initListBoxs()
{
- styleListBox->insertItem( i18n( "None" ) );
+ styleListBox->insertItem( i18nc( "Border type none", "None" ) );
styleListBox->insertItem( i18nc( "See http://krecipes.sourceforge.net/bordertypes.png for an example", "Dotted" ) );
styleListBox->insertItem( i18nc( "See http://krecipes.sourceforge.net/bordertypes.png for an example", "Dashed" ) );
styleListBox->insertItem( i18nc( "See http://krecipes.sourceforge.net/bordertypes.png for an example", "Solid" ) );
Index: src/dialogs/recipeinputdialog.cpp
===================================================================
--- src/dialogs/recipeinputdialog.cpp (revision 1043652)
+++ src/dialogs/recipeinputdialog.cpp (working copy)
@@ -376,7 +376,7 @@
propertyStatusLayout->addItem( propertySpacerRight );
KGuiItem updateGuiItem;
- updateGuiItem.setText( i18n("Update") );
+ updateGuiItem.setText( i18nc("Update properties", "Update") );
updateGuiItem.setIcon( KIcon( "view-refresh" ) );
propertyStatusDialog = new KDialog( this );
@@ -1611,18 +1611,18 @@
if ( propertyStatusMapRed.count() == 0 ) {
if ( propertyStatusMapYellow.count() == 0 ) {
propertyStatusLed->setColor( Qt::green );
- propertyStatusLabel->setText( i18n("Complete") );
+ propertyStatusLabel->setText( i18nc("@label Properties complete", "Complete") );
propertyStatusButton->setEnabled(false);
}
else {
propertyStatusLed->setColor( Qt::yellow );
- propertyStatusLabel->setText( i18n("Complete, but approximations made") );
+ propertyStatusLabel->setText( i18nc("@label Properties complete but approximate", "Complete, but approximations made") );
propertyStatusButton->setEnabled(true);
}
}
else {
propertyStatusLed->setColor( Qt::red );
- propertyStatusLabel->setText( i18n("Incomplete") );
+ propertyStatusLabel->setText( i18nc("@label Properties incomplete", "Incomplete") );
propertyStatusButton->setEnabled(true);
}
Index: src/dialogs/createunitdialog.cpp
===================================================================
--- src/dialogs/createunitdialog.cpp (revision 1043652)
+++ src/dialogs/createunitdialog.cpp (working copy)
@@ -39,25 +39,25 @@
box->setTitle( (newUnit)?i18n( "New Unit" ):i18n("Unit") );
- QLabel *nameLabel = new QLabel( i18n( "Singular:" ), box );
+ QLabel *nameLabel = new QLabel( i18nc("@label:textbox Single unit name", "Singular:" ), box );
nameEdit = new KLineEdit( name, box );
gridLayout->addWidget( nameLabel, 0, 0 );
gridLayout->addWidget( nameEdit, 0, 1 );
- QLabel *nameAbbrevLabel = new QLabel( i18n( "Abbreviation:" ), box );
+ QLabel *nameAbbrevLabel = new QLabel( i18nc( "@label:textbox Single unit abbreviation", "Abbreviation:" ), box );
nameAbbrevEdit = new KLineEdit( name_abbrev, box );
gridLayout->addWidget( nameAbbrevLabel, 0, 2 );
gridLayout->addWidget( nameAbbrevEdit, 0, 3 );
- QLabel *pluralLabel = new QLabel( i18n( "Plural:" ), box );
+ QLabel *pluralLabel = new QLabel( i18nc("@label:textbox Plural unit name", "Plural:" ), box );
pluralEdit = new KLineEdit( plural, box );
gridLayout->addWidget( pluralLabel, 1, 0 );
gridLayout->addWidget( pluralEdit, 1, 1 );
- QLabel *pluralAbbrevLabel = new QLabel( i18n( "Abbreviation:" ), box );
+ QLabel *pluralAbbrevLabel = new QLabel( i18nc( "@label:textbox Plural unit abbreviation", "Abbreviation:" ), box );
pluralAbbrevEdit = new KLineEdit( plural_abbrev, box );
gridLayout->addWidget( pluralAbbrevLabel, 1, 2 );
@@ -65,9 +65,9 @@
QLabel *typeLabel = new QLabel( i18n( "Type:" ), box );
typeComboBox = new KComboBox( false, box );
- typeComboBox->insertItem( typeComboBox->count(), i18n("Other") );
- typeComboBox->insertItem( typeComboBox->count(), i18n("Mass") );
- typeComboBox->insertItem( typeComboBox->count(), i18n("Volume") );
+ typeComboBox->insertItem( typeComboBox->count(), i18nc("@item:inlistbox Unit type other", "Other") );
+ typeComboBox->insertItem( typeComboBox->count(), i18nc("@item:inlistbox Unit type mass", "Mass") );
+ typeComboBox->insertItem( typeComboBox->count(), i18nc("@item:inlistbox Unit type volume", "Volume") );
gridLayout->addWidget( typeLabel, 2, 0 );
gridLayout->addWidget( typeComboBox, 2, 1, 1, 3, 0 );
Index: src/dialogs/dbimportdialog.cpp
===================================================================
--- src/dialogs/dbimportdialog.cpp (revision 1043652)
+++ src/dialogs/dbimportdialog.cpp (working copy)
@@ -182,11 +182,11 @@
mysqlRadioButton->setText( "MySQL" );
psqlRadioButton->setText( "PostgreSQL" );
hostLabel->setText( i18n( "Server:" ) );
- userLabel->setText( i18n( "Username:" ) );
+ userLabel->setText( i18nc( "Database username", "Username:" ) );
passwordLabel->setText( i18n( "Password:" ) );
nameLabel->setText( i18n( "Database name:" ) );
portLabel->setText( i18n( "Port:" ) );
- portEdit->setSpecialValueText( i18n("Default") );
+ portEdit->setSpecialValueText( i18nc("Default port", "Default") );
//set defaults
hostEdit->setText( "localhost" );
Index: src/dialogs/shoppinglistdialog.cpp
===================================================================
--- src/dialogs/shoppinglistdialog.cpp (revision 1043652)
+++ src/dialogs/shoppinglistdialog.cpp (working copy)
@@ -136,7 +136,7 @@
clearButton = new KPushButton( buttonBar );
clearButton->setObjectName( "clearButton" );
- clearButton->setText( i18n( "Clear" ) );
+ clearButton->setText( i18nc( "@action:button Clear list", "Clear" ) );
clearButton->setIcon( KIcon( "edit-clear" ) );
//Takes care of all recipe actions and provides a popup menu to 'recipeListView'
Index: src/dialogs/conversiondialog.cpp
===================================================================
--- src/dialogs/conversiondialog.cpp (revision 1043652)
+++ src/dialogs/conversiondialog.cpp (working copy)
@@ -95,7 +95,7 @@
void ConversionDialog::languageChange()
{
convertLabel->setText( i18n( "Convert" ) );
- toLabel->setText( i18n( "To" ) );
+ toLabel->setText( i18nc( "Convert to", "To" ) );
resultLabel->setText( i18n( "<b>Result:</b>" ) );
resultText->setText( QString::null );
}
Index: src/dialogs/createcategorydialog.cpp
===================================================================
--- src/dialogs/createcategorydialog.cpp (revision 1043652)
+++ src/dialogs/createcategorydialog.cpp (working copy)
@@ -60,7 +60,7 @@
void CreateCategoryDialog::loadCategories( const ElementList& categories )
{
- categoryComboBox->insertItem( categoryComboBox->count(), i18n( "**NONE**" ) );
+ categoryComboBox->insertItem( categoryComboBox->count(), i18nc("@item:inlistbox No category", "**NONE**" ) );
for ( ElementList::const_iterator it = categories.begin(); it != categories.end(); ++it ) {
categoryComboBox->insertItem( categoryComboBox->count(), ( *it ).name );
idMap.insert( ( *it ).name, ( *it ).id );
Index: src/dialogs/editpropertiesdialog.cpp
===================================================================
--- src/dialogs/editpropertiesdialog.cpp (revision 1043652)
+++ src/dialogs/editpropertiesdialog.cpp (working copy)
@@ -239,7 +239,7 @@
infoLabel->setText( i18n( "Property Information for <b>%1</b>" , ingredientName) );
usdaListView->listView()->header()->setLabel( 0, i18n( "USDA Ingredient" ) );
usdaListView->listView()->header()->setLabel( 1, i18n( "Id" ) );
- loadButton->setText( i18n( "Load ->" ) );
+ loadButton->setText( i18nc( "@action:button Load USDA property", "Load ->" ) );
propertyLabel->setText( i18n( "Properties" ) );
propertyAddButton->setText( i18n( "Add" ) );
propertyRemoveButton->setText( i18n( "Remove" ) );
Index: src/dialogs/ingredientparserdialog.cpp
===================================================================
--- src/dialogs/ingredientparserdialog.cpp (revision 1043652)
+++ src/dialogs/ingredientparserdialog.cpp (working copy)
@@ -105,7 +105,7 @@
void IngredientParserDialog::languageChange()
{
- textLabel1->setText( i18n( "To use: Paste a list of ingredient below, click \"Parse Text\", and then you may correct any incorrectly parsed ingredients.<br><b>Caution: Fields will be truncated if longer than the database allows</b>" ) );
+ textLabel1->setText( i18n( "<p>To use: Paste a list of ingredient below, click \"Parse Text\", and then you may correct any incorrectly parsed ingredients.</p><p><b>Caution: Fields will be truncated if longer than the database allows</b></p>" ) );
previewLabel->setText( i18n("Ingredients as understood by Krecipes:") );
textLabel1->setWordWrap(true);
parseButton->setText( i18n( "Parse Text" ) );
Index: src/widgets/recipelistview.cpp
===================================================================
--- src/widgets/recipelistview.cpp (revision 1043652)
+++ src/widgets/recipelistview.cpp (working copy)
@@ -150,9 +150,9 @@
KLocale *locale = KGlobal::locale();
return QString("<center><b>%7</b></center><center>__________</center>%1 %2<br />%3 %4<br />%5 %6")
- .arg(i18n("Created:")).arg(locale->formatDateTime(r.ctime))
- .arg(i18n("Modified:")).arg(locale->formatDateTime(r.mtime))
- .arg(i18n("Last Accessed:")).arg(locale->formatDateTime(r.atime))
+ .arg(i18nc("Recipe created", "Created:")).arg(locale->formatDateTime(r.ctime))
+ .arg(i18nc("Recipe modified", "Modified:")).arg(locale->formatDateTime(r.mtime))
+ .arg(i18nc("Recipe last accessed", "Last Accessed:")).arg(locale->formatDateTime(r.atime))
.arg(recipe_it->title());
}/* Maybe this would be handy
else if ( item->rtti() == CATEGORYLISTITEM_RTTI ) {
Index: src/widgets/kremenu.cpp
===================================================================
--- src/widgets/kremenu.cpp (revision 1043652)
+++ src/widgets/kremenu.cpp (working copy)
@@ -127,7 +127,7 @@
KreMenuButton *newSubMenuButton = new KreMenuButton( this );
newSubMenuButton->menuId = id;
newSubMenuButton->subMenuId = mainMenuId;
- newSubMenuButton->setTitle( i18n( "Up..." ) );
+ newSubMenuButton->setTitle( i18nc("@action:button Up to top menu", "Up..." ) );
newSubMenuButton->setIconSet( KIcon( "arrow-up" ) );
connect( newMenuButton, SIGNAL( clicked( MenuId ) ), this, SLOT( showMenu( MenuId ) ) );
Index: src/widgets/unitlistview.h
===================================================================
--- src/widgets/unitlistview.h (revision 1043652)
+++ src/widgets/unitlistview.h (working copy)
@@ -103,9 +103,9 @@
private:
void updateType( Unit::Type t ) {
switch ( t ) {
- case Unit::Other: m_type = i18n("Other"); break;
- case Unit::Mass: m_type = i18n("Mass"); break;
- case Unit::Volume: m_type = i18n("Volume"); break;
+ case Unit::Other: m_type = i18nc("Unit type other", "Other"); break;
+ case Unit::Mass: m_type = i18nc("Unit type mass", "Mass"); break;
+ case Unit::Volume: m_type = i18nc("Unit type volume", "Volume"); break;
default: break;
}
}
Index: src/widgets/unitlistview.cpp
===================================================================
--- src/widgets/unitlistview.cpp (revision 1043652)
+++ src/widgets/unitlistview.cpp (working copy)
@@ -63,11 +63,11 @@
StdUnitListView::StdUnitListView( QWidget *parent, RecipeDB *db, bool editable ) : UnitListView( parent, db )
{
- addColumn( i18n( "Unit" ) );
- addColumn( i18n( "Abbreviation" ) );
- addColumn( i18n( "Plural" ) );
- addColumn( i18n( "Abbreviation" ) );
- addColumn( i18n( "Type" ) );
+ addColumn( i18nc( "Unit name", "Unit" ) );
+ addColumn( i18nc( "Unit abbreviation", "Abbreviation" ) );
+ addColumn( i18nc( "Unit plural", "Plural" ) );
+ addColumn( i18nc( "unit plural abbreviation", "Abbreviation" ) );
+ addColumn( i18nc( "Unit type", "Type" ) );
KConfigGroup config = KGlobal::config()->group( "Advanced" );
bool show_id = config.readEntry( "ShowID", false );
@@ -81,9 +81,9 @@
setRenameable( 4, true );
typeComboBox = new KComboBox( viewport() );
- typeComboBox->insertItem( typeComboBox->count(), i18n("Other"));
- typeComboBox->insertItem( typeComboBox->count(), i18n("Mass"));
- typeComboBox->insertItem( typeComboBox->count(), i18n("Volume"));
+ typeComboBox->insertItem( typeComboBox->count(), i18nc("@item:inlistbox Unit type other", "Other"));
+ typeComboBox->insertItem( typeComboBox->count(), i18nc("@item:inlistbox Unit type mass", "Mass"));
+ typeComboBox->insertItem( typeComboBox->count(), i18nc("@item:inlistbox Unit type volume", "Volume"));
addChild( typeComboBox );
typeComboBox->hide();
Index: src/widgets/dblistviewbase.cpp
===================================================================
--- src/widgets/dblistviewbase.cpp (revision 1043652)
+++ src/widgets/dblistviewbase.cpp (working copy)
@@ -30,7 +30,7 @@
QString text( int c ) const {
if ( c == 0 ) {
- return QString("<< %1").arg(i18n("Previous"));
+ return QString("<< %1").arg(i18nc("Previous item", "Previous"));
}
else
return QString::null;
@@ -46,7 +46,7 @@
QString text( int c ) const {
if ( c == 0 ) {
- return QString("%1 >>").arg(i18n("Next"));
+ return QString("%1 >>").arg(i18nc("Next item", "Next"));
}
else
return QString::null;
Index: src/widgets/krelistview.cpp
===================================================================
--- src/widgets/krelistview.cpp (revision 1043652)
+++ src/widgets/krelistview.cpp (working copy)
@@ -51,7 +51,7 @@
filterBox->setMargin( 2 );
filterLabel = new QLabel( filterBox );
- filterLabel->setText( " " + i18n( "Search:" ) );
+ filterLabel->setText( " " + i18nc( "@label:textbox Search recipes", "Search:" ) );
filterEdit = new KLineEdit( filterBox );
filterEdit->setClearButtonShown( true );
connect( filterEdit, SIGNAL( clearButtonClicked() ), filterEdit, SLOT( clear() ) );
Index: src/backends/qsqlrecipedb.cpp
===================================================================
--- src/backends/qsqlrecipedb.cpp (revision 1043652)
+++ src/backends/qsqlrecipedb.cpp (working copy)
@@ -1996,7 +1996,7 @@
kDebug() << "version found... " << version << " \n";
kDebug() << "latest version... " << latestDBVersion() ;
if ( int( qRound( databaseVersion() * 1e5 ) ) < int( qRound( latestDBVersion() * 1e5 ) ) ) { //correct for float's imprecision
- switch ( KMessageBox::questionYesNo( 0, i18n( "<!doc>The database was created with a previous version of Krecipes. Would you like Krecipes to update this database to work with this version of Krecipes? Depending on the number of recipes and amount of data, this could take some time.<br><br><b>Warning: After updating, this database will no longer be compatible with previous versions of Krecipes.<br><br>Cancelling this operation may result in corrupting the database.</b>" ) ) ) {
+ switch ( KMessageBox::questionYesNo( 0, i18n( "<!doc><p>The database was created with a previous version of Krecipes. Would you like Krecipes to update this database to work with this version of Krecipes? Depending on the number of recipes and amount of data, this could take some time.</p><p><b>Warning: After updating, this database will no longer be compatible with previous versions of Krecipes.<br><br>Cancelling this operation may result in corrupting the database.</b></p>" ) ) ) {
case KMessageBox::Yes:
emit progressBegin(0,QString::null,i18n("Porting database structure..."),50);
portOldDatabases( version );
Index: src/backends/SQLite/literecipedb.cpp
===================================================================
--- src/backends/SQLite/literecipedb.cpp (revision 1043652)
+++ src/backends/SQLite/literecipedb.cpp (working copy)
@@ -747,7 +747,7 @@
if ( qRound(version*100) < 87 ) {
//Load this default data so the user knows what rating criteria is
- database->exec( QString("INSERT INTO rating_criteria VALUES (1,'%1')").arg(i18n("Overall")) );
+ database->exec( QString("INSERT INTO rating_criteria VALUES (1,'%1')").arg(i18nc("Overall rating", "Overall")) );
database->exec( QString("INSERT INTO rating_criteria VALUES (2,'%1')").arg(i18n("Taste") ) );
database->exec( QString("INSERT INTO rating_criteria VALUES (3,'%1')").arg(i18n("Appearance") ) );
database->exec( QString("INSERT INTO rating_criteria VALUES (4,'%1')").arg(i18n("Originality") ) );
Index: src/backends/PostgreSQL/psqlrecipedb.cpp
===================================================================
--- src/backends/PostgreSQL/psqlrecipedb.cpp (revision 1043652)
+++ src/backends/PostgreSQL/psqlrecipedb.cpp (working copy)
@@ -387,7 +387,7 @@
if ( qRound(version*100) < 87 ) {
//Load this default data so the user knows what rating criteria is
- database->exec( QString("INSERT INTO rating_criteria VALUES (1,'%1')").arg(i18n("Overall")) );
+ database->exec( QString("INSERT INTO rating_criteria VALUES (1,'%1')").arg(i18nc("Overall Rating", "Overall")) );
database->exec( QString("INSERT INTO rating_criteria VALUES (2,'%1')").arg(i18n("Taste") ) );
database->exec( QString("INSERT INTO rating_criteria VALUES (3,'%1')").arg(i18n("Appearance") ) );
database->exec( QString("INSERT INTO rating_criteria VALUES (4,'%1')").arg(i18n("Originality") ) );
Index: src/backends/MySQL/mysqlrecipedb.cpp
===================================================================
--- src/backends/MySQL/mysqlrecipedb.cpp (revision 1043652)
+++ src/backends/MySQL/mysqlrecipedb.cpp (working copy)
@@ -468,7 +468,7 @@
if ( qRound(version*100) < 87 ) {
//Load this default data so the user knows what rating criteria is
- database->exec( QString("INSERT INTO rating_criteria VALUES (1,'%1')").arg(i18n("Overall")) );
+ database->exec( QString("INSERT INTO rating_criteria VALUES (1,'%1')").arg(i18nc("Overall rating", "Overall")) );
database->exec( QString("INSERT INTO rating_criteria VALUES (2,'%1')").arg(i18n("Taste") ) );
database->exec( QString("INSERT INTO rating_criteria VALUES (3,'%1')").arg(i18n("Appearance") ) );
database->exec( QString("INSERT INTO rating_criteria VALUES (4,'%1')").arg(i18n("Originality") ) );
Index: src/pref.cpp
===================================================================
--- src/pref.cpp (revision 1043652)
+++ src/pref.cpp (working copy)
@@ -148,7 +148,7 @@
QSpacerItem* spacerRow1 = new QSpacerItem( 10, 10, QSizePolicy::Minimum, QSizePolicy::Fixed );
layout->addItem( spacerRow1, 2, 1 );
- QLabel* usernameText = new QLabel( i18n( "Username:" ), this );
+ QLabel* usernameText = new QLabel( i18nc( "@label:textbox Database Username", "Username:" ), this );
layout->addWidget( usernameText, 3, 1 );
usernameEdit = new KLineEdit( this );
@@ -172,7 +172,7 @@
portEdit = new KIntNumInput( this );
portEdit->setMinimum(0);
- portEdit->setSpecialValueText( i18n("Default") );
+ portEdit->setSpecialValueText( i18nc("Default Port", "Default") );
layout->addWidget( portEdit, 7, 2 );
QSpacerItem* spacerRow4 = new QSpacerItem( 10, 10, QSizePolicy::Minimum, QSizePolicy::Fixed );
@@ -263,7 +263,7 @@
QSpacerItem* spacerRow1 = new QSpacerItem( 10, 10, QSizePolicy::Minimum, QSizePolicy::Fixed );
layout->addItem( spacerRow1, 2, 1 );
- QLabel* usernameText = new QLabel( i18n( "Username:" ), this );
+ QLabel* usernameText = new QLabel( i18nc("@label:textbox Database Username", "Username:" ), this );
layout->addWidget( usernameText, 3, 1 );
usernameEdit = new KLineEdit( this );
@@ -287,7 +287,7 @@
portEdit = new KIntNumInput( this );
portEdit->setMinimum(0);
- portEdit->setSpecialValueText( i18n("Default") );
+ portEdit->setSpecialValueText( i18nc("Default Port", "Default") );
layout->addWidget( portEdit, 7, 2 );
QSpacerItem* spacerRow4 = new QSpacerItem( 10, 10, QSizePolicy::Minimum, QSizePolicy::Fixed );
@@ -549,8 +549,8 @@
void NumbersPrefs::languageChange()
{
numberButtonGroup->setTitle( i18n( "Number Format" ) );
- fractionRadioButton->setText( i18n( "Fraction" ) );
- decimalRadioButton->setText( i18n( "Decimal" ) );
+ fractionRadioButton->setText( i18nc("@option:radio Display fraction", "Fraction" ) );
+ decimalRadioButton->setText( i18nc("@option:radio Display decimal", "Decimal" ) );
}
//=============Import/Export Preferences Dialog================//
@@ -663,7 +663,7 @@
catLimitInput->setLabel( i18n( "Number of categories to display at once:" ) );
catLimitInput->setRange(0,5000,20);
catLimitInput->setSliderEnabled( true );
- catLimitInput->setSpecialValueText( i18n("Unlimited") );
+ catLimitInput->setSpecialValueText( i18nc("Unlimited categories", "Unlimited") );
if ( cat_limit > 0 )
catLimitInput->setValue( cat_limit );
@@ -673,7 +673,7 @@
limitInput->setLabel( i18n( "Number of elements to display at once:" ) );
limitInput->setRange(0,100000,1000);
limitInput->setSliderEnabled( true );
- limitInput->setSpecialValueText( i18n("Unlimited") );
+ limitInput->setSpecialValueText( i18nc("Unlimited elements", "Unlimited") );
if ( limit > 0 )
limitInput->setValue( limit );