SVN commit 1124548 by binner:
SVN_SILENT i18n style guide fixes
M +1 -1 apps/plasma/applets/folderview/folderviewDisplayConfig.ui
M +2 -2 runtime/solid-device-automounter/kcm/DeviceModel.cpp
M +2 -2 workspace/klipper/generalconfig.ui
M +2 -2 workspace/klipper/klipper.cpp
M +6 -6 workspace/kwin/useractions.cpp
M +1 -1 workspace/libs/ksysguard/processui/ksysguardprocesslist.cpp
M +1 -1 workspace/libs/ksysguard/scripts/smaps/smaps.desktop
M +1 -1 workspace/libs/plasmaclock/calendarConfig.ui
M +1 -1 workspace/libs/plasmaclock/clockapplet.cpp
M +2 -2 workspace/plasma/generic/applets/systemtray/ui/applet.cpp
M +1 -1 workspace/plasma/generic/applets/systemtray/ui/autohide.ui
M +1 -1 workspace/plasma/generic/applets/systemtray/ui/visibleitems.ui
M +3 -3 workspace/plasma/generic/wallpapers/color/config.ui
M +1 -1 workspace/plasma/netbook/containments/newspaper/plasma-containment-newspaper.desktop
M +7 -7 workspace/solid/solid-actions-kcm/ActionEditor.ui
M +1 -1 workspace/solid/solid-actions-kcm/SolidActions.cpp
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/folderviewDisplayConfig.ui #1124547:1124548
@@ -55,7 +55,7 @@
- Custom Title:
+ Custom title:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
--- trunk/KDE/kdebase/runtime/solid-device-automounter/kcm/DeviceModel.cpp #1124547:1124548
@@ -48,9 +48,9 @@
case 0:
return i18n("Device");
case 1:
- return i18n("Automount on login");
+ return i18n("Automount on Login");
case 2:
- return i18n("Automount on attach");
+ return i18n("Automount on Attach");
}
}
return QVariant();
--- trunk/KDE/kdebase/workspace/klipper/generalconfig.ui #1124547:1124548
@@ -56,13 +56,13 @@
-
- Selection and clipboard
+ Selection and Clipboard
-
- Ignore Selection
+ Ignore selection
--- trunk/KDE/kdebase/workspace/klipper/klipper.cpp #1124547:1124548
@@ -210,11 +210,11 @@
// Cycle through history
m_cycleNextAction = m_collection->addAction("cycleNextAction");
- m_cycleNextAction->setText(i18n("Next history item"));
+ m_cycleNextAction->setText(i18n("Next History Item"));
m_cycleNextAction->setGlobalShortcut(KShortcut(Qt::ALT+Qt::CTRL+Qt::Key_Down), KAction::DefaultShortcut);
connect(m_cycleNextAction, SIGNAL(triggered(bool)), SLOT(slotCycleNext()));
m_cyclePrevAction = m_collection->addAction("cyclePrevAction");
- m_cyclePrevAction->setText(i18n("Previous history item"));
+ m_cyclePrevAction->setText(i18n("Previous History Item"));
m_cyclePrevAction->setGlobalShortcut(KShortcut(Qt::ALT+Qt::CTRL+Qt::Key_Up), KAction::DefaultShortcut);
connect(m_cyclePrevAction, SIGNAL(triggered(bool)), SLOT(slotCyclePrev()));
--- trunk/KDE/kdebase/workspace/kwin/useractions.cpp #1124547:1124548
@@ -176,13 +176,13 @@
// Actions for window tabbing
if( decorationSupportsClientGrouping() )
{
- mRemoveTabGroup = popup->addAction( i18n("Remove &from group") );
+ mRemoveTabGroup = popup->addAction( i18n("Remove &From Group") );
kaction = qobject_cast( keys->action("Remove TabGroup") );
if( kaction!=0 )
mRemoveTabGroup->setShortcut( kaction->globalShortcut().primary() );
mRemoveTabGroup->setData( Options::RemoveClientFromGroupOp );
- mCloseGroup = popup->addAction( i18n("Close entire &group") );
+ mCloseGroup = popup->addAction( i18n("Close Entire &Group") );
mCloseGroup->setIcon( KIcon( "window-close" ) );
kaction = qobject_cast( keys->action("Close TabGroup") );
if( kaction!=0 )
@@ -337,7 +337,7 @@
QAction* action = switch_to_tab_popup->menuAction();
popup->insertAction( mRemoveTabGroup, action );
- action->setText( i18n("Switch to window tab") );
+ action->setText( i18n("Switch to Window Tab") );
}
void Workspace::slotSwitchToTab( QAction* action )
@@ -378,9 +378,9 @@
if( !switch_to_tab_popup )
return;
switch_to_tab_popup->clear();
- QAction* action = switch_to_tab_popup->addAction( i18n( "To the left" ));
+ QAction* action = switch_to_tab_popup->addAction( i18n( "To the Left" ));
action->setData( 0 );
- action = switch_to_tab_popup->addAction( i18n( "To the right" ));
+ action = switch_to_tab_popup->addAction( i18n( "To the Right" ));
action->setData( 1 );
switch_to_tab_popup->addSeparator();
int index = 2;
@@ -409,7 +409,7 @@
QAction* action = add_tabs_popup->menuAction();
popup->insertAction( mRemoveTabGroup, action );
- action->setText( i18n("Move window to group") );
+ action->setText( i18n("Move Window to Group") );
}
void Workspace::slotAddToTabGroup( QAction* action )
--- trunk/KDE/kdebase/workspace/libs/ksysguard/processui/ksysguardprocesslist.cpp #1124547:1124548
@@ -1246,7 +1246,7 @@
count);
int res = KMessageBox::warningContinueCancelList(this, msg, selectedAsStrings,
- i18np("End process", "End %1 processes", count),
+ i18np("End Process", "End %1 Processes", count),
KGuiItem(i18n("End"), "process-stop"),
KStandardGuiItem::cancel(),
"endconfirmation");
--- trunk/KDE/kdebase/workspace/libs/ksysguard/scripts/smaps/smaps.desktop #1124547:1124548
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Detailed memory information
+Name=Detailed Memory Information
Name[de]=Detaillierte Speicherinformationen
Name[el]=Λεπτομερείς πληροφορίες για τη Μνήμη
Name[en_GB]=Detailed memory information
--- trunk/KDE/kdebase/workspace/libs/plasmaclock/calendarConfig.ui #1124547:1124548
@@ -64,7 +64,7 @@
-
- Calendar System:
+ Calendar system:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
--- trunk/KDE/kdebase/workspace/libs/plasmaclock/clockapplet.cpp #1124547:1124548
@@ -464,7 +464,7 @@
KService::List offers = KServiceTypeTrader::self()->query("KCModule", "Library == 'kcm_clock'");
if (!offers.isEmpty() && hasAuthorization("LaunchApp")) {
d->adjustSystemTimeAction = new QAction(this);
- d->adjustSystemTimeAction->setText(i18n("Adjust Date and Time"));
+ d->adjustSystemTimeAction->setText(i18n("Adjust Date and Time..."));
d->adjustSystemTimeAction->setIcon(KIcon(icon()));
connect(d->adjustSystemTimeAction, SIGNAL(triggered()), this, SLOT(launchTimeControlPanel()));
}
--- trunk/KDE/kdebase/workspace/plasma/generic/applets/systemtray/ui/applet.cpp #1124547:1124548
@@ -492,7 +492,7 @@
}
- const QString itemCategories = i18nc("Categories of items in the systemtray that will be shown or hidden", "Shown item categories");
+ const QString itemCategories = i18nc("Categories of items in the systemtray that will be shown or hidden", "Shown Item Categories");
QStandardItem *applicationStatusItem = new QStandardItem();
applicationStatusItem->setText(i18nc("Systemtray items that describe the status of a generic application", "Application status"));
@@ -554,7 +554,7 @@
item->setIcon(KIcon(service->icon()));
item->setCheckable(true);
item->setCheckState(ownApplets.contains(info.pluginName()) ? Qt::Checked : Qt::Unchecked);
- item->setData(i18nc("Extra items to be manually added in the systray, such as little Plasma widgets", "Extra items"), KCategorizedSortFilterProxyModel::CategoryDisplayRole);
+ item->setData(i18nc("Extra items to be manually added in the systray, such as little Plasma widgets", "Extra Items"), KCategorizedSortFilterProxyModel::CategoryDisplayRole);
item->setData(info.pluginName(), Qt::UserRole+2);
m_visibleItemsSourceModel.data()->appendRow(item);
}
--- trunk/KDE/kdebase/workspace/plasma/generic/applets/systemtray/ui/autohide.ui #1124547:1124548
@@ -46,7 +46,7 @@
- Keyboard shortcut
+ Keyboard Shortcut
--- trunk/KDE/kdebase/workspace/plasma/generic/applets/systemtray/ui/visibleitems.ui #1124547:1124548
@@ -27,7 +27,7 @@
-
- Unlock widgets
+ Unlock Widgets
--- trunk/KDE/kdebase/workspace/plasma/generic/wallpapers/color/config.ui #1124547:1124548
@@ -62,7 +62,7 @@
- &First Color:
+ &First color:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -118,7 +118,7 @@
- &Second Color:
+ &Second color:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -171,7 +171,7 @@
-
- &Background Mode
+ &Background mode:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
--- trunk/KDE/kdebase/workspace/plasma/netbook/containments/newspaper/plasma-containment-newspaper.desktop #1124547:1124548
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Newspaper activity
+Name=Newspaper Activity
Name[ca]=Activitat de diaris
Name[ca@valencia]=Activitat de diaris
Name[cs]=Aktivita Novin
--- trunk/KDE/kdebase/workspace/solid/solid-actions-kcm/ActionEditor.ui #1124547:1124548
@@ -99,7 +99,7 @@
-
- Edit parameter
+ Edit Parameter
-
@@ -133,22 +133,22 @@
-
- Property match
+ Property Match
-
- Content conjunction
+ Content Conjunction
-
- Content disjunction
+ Content Disjunction
-
- Device interface match
+ Device Interface Match
@@ -290,14 +290,14 @@
-
- Reset parameter
+ Reset Parameter
-
- Save parameter changes
+ Save Parameter Changes
--- trunk/KDE/kdebase/workspace/solid/solid-actions-kcm/SolidActions.cpp #1124547:1124548
@@ -152,7 +152,7 @@
// We should error out here if we have to
if( !selectedItem->predicate().isValid() ) {
- KMessageBox::error(this, i18n("It appears that the predicate for this action is not valid."), i18n("Error parsing device conditions"));
+ KMessageBox::error(this, i18n("It appears that the predicate for this action is not valid."), i18n("Error Parsing Device Conditions"));
return;
}