openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/i18n into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/i18n/+merge/73205

Hi,

- I replaced 'Ini' in two strings with '*.config'

I replaced it with '*.config' (and not just 'config') because that highlights that it is a file extension, (I felt that) otherwise one could misunderstand it.
-- 
https://code.launchpad.net/~googol/openlp/i18n/+merge/73205
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/i18n into lp:openlp.

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2011-08-28 13:39:34 +0000
+++ openlp/core/ui/mainwindow.py	2011-08-29 06:35:24 +0000
@@ -289,7 +289,7 @@
         self.settingsImportItem = base_action(mainWindow,
            u'settingsImportItem', category=UiStrings().Settings)
         self.settingsExportItem = base_action(mainWindow,
-           u'settingsExportItem', category=UiStrings().Settings)    
+           u'settingsExportItem', category=UiStrings().Settings)
         action_list.add_category(UiStrings().Help, CategoryOrder.standardMenu)
         self.aboutItem = shortcut_action(mainWindow, u'aboutItem',
             [QtGui.QKeySequence(u'Ctrl+F1')], self.onAboutItemClicked,
@@ -428,11 +428,11 @@
         self.settingsConfigureItem.setText(
             translate('OpenLP.MainWindow', '&Configure OpenLP...'))
         self.settingsExportItem.setStatusTip(translate('OpenLP.MainWindow',
-            'Export OpenLP settings to a specified Ini file'))
+            'Export OpenLP settings to a specified *.config file'))
         self.settingsExportItem.setText(
             translate('OpenLP.MainWindow', 'Settings'))
         self.settingsImportItem.setStatusTip(translate('OpenLP.MainWindow',
-            'Import OpenLP settings from a specified Ini file previously '
+            'Import OpenLP settings from a specified *.config file previously '
             'exported on this or another machine'))
         self.settingsImportItem.setText(
             translate('OpenLP.MainWindow', 'Settings'))
@@ -997,7 +997,7 @@
         # Make sure it's an .ini file.
         if not exportFileName.endswith(u'conf'):
             exportFileName = exportFileName + u'.conf'
-        temp_file = os.path.join(unicode(gettempdir()), 
+        temp_file = os.path.join(unicode(gettempdir()),
             u'openlp', u'exportIni.tmp')
         self.saveSettings()
         settingSections = []