diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-06-01 16:07:07 +0200 | 
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-06-01 16:07:07 +0200 | 
| commit | c863d6bce54087649c05fdec39e99a3009fba4b9 (patch) | |
| tree | b92e6a3554e28618710e5540762b9f9f541ccc19 /src | |
| parent | Fixed mainwindow conflicts (diff) | |
| parent | Revert "Changed the description of rekonq a bit and added a German translatio... (diff) | |
| download | rekonq-c863d6bce54087649c05fdec39e99a3009fba4b9.tar.xz | |
Merge branch 'review/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/settings.cpp | 4 | ||||
| -rw-r--r-- | src/settings_fonts.ui | 6 | ||||
| -rw-r--r-- | src/settings_general.ui | 4 | ||||
| -rw-r--r-- | src/settings_privacy.ui | 2 | ||||
| -rw-r--r-- | src/settings_webkit.ui | 16 | 
6 files changed, 17 insertions, 17 deletions
diff --git a/src/main.cpp b/src/main.cpp index 38c30b53..4a87ae53 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,7 +26,7 @@  static const char description[] = -    I18N_NOOP("Webkit Based Browser for KDE"); +    I18N_NOOP("WebKit-based Web Browser for KDE");  static const char version[] = "0.1.1"; diff --git a/src/settings.cpp b/src/settings.cpp index 198ab3e0..fb68fb64 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -102,7 +102,7 @@ Private::Private(SettingsDialog *parent)      widget = new QWidget;      webkitUi.setupUi(widget);      widget->layout()->setMargin(0); -    pageItem = parent->addPage(widget , i18n("Webkit")); +    pageItem = parent->addPage(widget , i18n("WebKit"));      QString webkitIconPath = KStandardDirs::locate("appdata", "pics/webkit-icon.png");      kWarning() << webkitIconPath;      KIcon webkitIcon = KIcon(QIcon(webkitIconPath)); @@ -120,7 +120,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)      setFaceType(KPageDialog::List);      showButtonSeparator(true); -    setWindowTitle(i18n("rekonfig..")); +    setWindowTitle(i18n("rekonfig..."));      setModal(true);      readConfig(); diff --git a/src/settings_fonts.ui b/src/settings_fonts.ui index de258cad..3a00358d 100644 --- a/src/settings_fonts.ui +++ b/src/settings_fonts.ui @@ -25,14 +25,14 @@          <item row="0" column="0">           <widget class="QLabel" name="label">            <property name="text"> -           <string>Standard Font</string> +           <string>Standard font</string>            </property>           </widget>          </item>          <item row="1" column="0">           <widget class="QLabel" name="label_2">            <property name="text"> -           <string>Fixed Font</string> +           <string>Fixed font</string>            </property>           </widget>          </item> @@ -58,7 +58,7 @@          <item>           <widget class="QLabel" name="label_3">            <property name="text"> -           <string>Font Size</string> +           <string>Font size</string>            </property>           </widget>          </item> diff --git a/src/settings_general.ui b/src/settings_general.ui index f9d272c6..95723e78 100644 --- a/src/settings_general.ui +++ b/src/settings_general.ui @@ -45,7 +45,7 @@          <item>           <widget class="QPushButton" name="setHomeToCurrentPageButton">            <property name="text"> -           <string>Set to current page</string> +           <string>Set to Current Page</string>            </property>           </widget>          </item> @@ -80,7 +80,7 @@        <item row="3" column="1">         <widget class="QCheckBox" name="kcfg_downloadToDefaultDir">          <property name="text"> -         <string>ask where to save downloads</string> +         <string>Ask where to save downloads</string>          </property>         </widget>        </item> diff --git a/src/settings_privacy.ui b/src/settings_privacy.ui index 78202688..114743dd 100644 --- a/src/settings_privacy.ui +++ b/src/settings_privacy.ui @@ -76,7 +76,7 @@        <item row="0" column="0">         <widget class="QLabel" name="label_2">          <property name="text"> -         <string>Accept Cookies:</string> +         <string>Accept cookies:</string>          </property>          <property name="alignment">           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> diff --git a/src/settings_webkit.ui b/src/settings_webkit.ui index 32a9c0c9..a28ce915 100644 --- a/src/settings_webkit.ui +++ b/src/settings_webkit.ui @@ -20,7 +20,7 @@        <item row="0" column="0">         <widget class="QCheckBox" name="kcfg_autoLoadImages">          <property name="text"> -         <string>Autoload Images</string> +         <string>Autoload images</string>          </property>         </widget>        </item> @@ -41,14 +41,14 @@        <item row="1" column="0">         <widget class="QCheckBox" name="kcfg_javascriptEnabled">          <property name="text"> -         <string>Javascript support</string> +         <string>JavaScript support</string>          </property>         </widget>        </item>        <item row="1" column="2">         <widget class="QCheckBox" name="kcfg_zoomTextOnly">          <property name="text"> -         <string>Zoom Text Only</string> +         <string>Zoom text only</string>          </property>         </widget>        </item> @@ -62,7 +62,7 @@        <item row="2" column="2">         <widget class="QCheckBox" name="kcfg_printElementBackgrounds">          <property name="text"> -         <string>Print element Backgrounds</string> +         <string>Print element backgrounds</string>          </property>         </widget>        </item> @@ -76,28 +76,28 @@        <item row="3" column="2">         <widget class="QCheckBox" name="kcfg_offlineStorageDatabaseEnabled">          <property name="text"> -         <string>Offline storage Database</string> +         <string>Offline storage database</string>          </property>         </widget>        </item>        <item row="4" column="0">         <widget class="QCheckBox" name="kcfg_javascriptCanOpenWindows">          <property name="text"> -         <string>Javascript can open windows</string> +         <string>JavaScript can open windows</string>          </property>         </widget>        </item>        <item row="4" column="2">         <widget class="QCheckBox" name="kcfg_offlineWebApplicationCacheEnabled">          <property name="text"> -         <string>Offline Web Application Cache </string> +         <string>Offline web application cache</string>          </property>         </widget>        </item>        <item row="5" column="0">         <widget class="QCheckBox" name="kcfg_javascriptCanAccessClipboard">          <property name="text"> -         <string>Javascript can access clipboard</string> +         <string>JavaScript can access clipboard</string>          </property>         </widget>        </item>  | 
