diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-06-19 17:10:53 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-06-19 17:10:53 +0200 |
| commit | 95ea7e563182087fa98d1df236d9713e55998f4b (patch) | |
| tree | 65d362a7f15a18411f4832f59ff2494e980c34c7 | |
| parent | After a brief discussion with Lionel it seemed clear this is not (diff) | |
| parent | string freeze means, that no string should be added at all (diff) | |
| download | rekonq-95ea7e563182087fa98d1df236d9713e55998f4b.tar.xz | |
Merge commit 'refs/merge-requests/141' of git://gitorious.org/rekonq/mainline into m141
| -rw-r--r-- | src/mainwindow.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 2aa67868..3e7c13b0 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1320,10 +1320,10 @@ void MainWindow::populateEncodingMenu() m_encodingMenu->clear(); KMenu *isoMenu = new KMenu( QL1S("ISO"), m_encodingMenu); - KMenu *winMenu = new KMenu( QL1S("windows"), m_encodingMenu); - KMenu *isciiMenu = new KMenu( QL1S("Iscii"), m_encodingMenu); - KMenu *uniMenu = new KMenu( QL1S("UNICODE"), m_encodingMenu); - KMenu *otherMenu = new KMenu( QL1S("Other"), m_encodingMenu); + KMenu *winMenu = new KMenu( QL1S("Windows"), m_encodingMenu); + KMenu *isciiMenu = new KMenu( QL1S("ISCII"), m_encodingMenu); + KMenu *uniMenu = new KMenu( QL1S("Unicode"), m_encodingMenu); + KMenu *otherMenu = new KMenu( i18n("Other"), m_encodingMenu); QAction *a; bool isDefaultCodecUsed = true; @@ -1350,7 +1350,7 @@ void MainWindow::populateEncodingMenu() } } - a = new QAction( QL1S("Default"), this); + a = new QAction( i18nc("Default website encoding", "Default"), this); a->setCheckable(true); a->setChecked(isDefaultCodecUsed); |