From a6735d2f012ce772c0065b09db5d1e7359cf5dd3 Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Mon, 15 Apr 2013 01:53:43 -0400 Subject: [PATCH] i18n: Updated templates; ide: Fixed warning in obsolete property get --- compiler/libec/locale/ec.pot | 14 ++--- documentor/locale/documentor.pot | 38 ++++++------- .../sqliteCipher/locale/EDASQLiteCipher.pot | 24 ++++---- epj2make/locale/epj2make.pot | 12 ++-- ide/locale/ide.pot | 66 +++++++++++----------- ide/src/IDESettings.ec | 2 +- 6 files changed, 78 insertions(+), 78 deletions(-) diff --git a/compiler/libec/locale/ec.pot b/compiler/libec/locale/ec.pot index 35a10f1..4724a6f 100644 --- a/compiler/libec/locale/ec.pot +++ b/compiler/libec/locale/ec.pot @@ -299,13 +299,13 @@ msgid "redefinition of destructor for class %s\n" msgstr "redefinition of destructor for class %s\n" #: ./src/ecdefs.ec:1323 -#: ./src/grammar.ec:3265 -#: ./src/grammar.ec:3266 -#: ./src/grammar.ec:3267 -#: ./src/grammar.ec:3268 -#: ./src/grammar.ec:3269 -#: ./src/grammar.ec:3270 -#: ./src/grammar.ec:3271 +#: ./src/grammar.ec:3128 +#: ./src/grammar.ec:3129 +#: ./src/grammar.ec:3130 +#: ./src/grammar.ec:3131 +#: ./src/grammar.ec:3132 +#: ./src/grammar.ec:3133 +#: ./src/grammar.ec:3134 msgid "syntax error\n" msgstr "syntax error\n" diff --git a/documentor/locale/documentor.pot b/documentor/locale/documentor.pot index 03e6341..4630444 100644 --- a/documentor/locale/documentor.pot +++ b/documentor/locale/documentor.pot @@ -130,7 +130,7 @@ msgstr "Basic Data Type" msgid "Bit Collection" msgstr "Bit Collection" -#: ./src/Documentor.ec:2194 +#: ./src/Documentor.ec:2195 #: ./src/SettingsDialog.ec:52 msgid "Cancel" msgstr "Cancel" @@ -175,7 +175,7 @@ msgstr "Enumeration Values" msgid "Events" msgstr "Events" -#: ./src/Documentor.ec:2035 +#: ./src/Documentor.ec:2036 msgid "Exit" msgstr "Exit" @@ -187,7 +187,7 @@ msgstr "File" msgid "Functions" msgstr "Functions" -#: ./../ide/src/IDESettings.ec:627 +#: ./../ide/src/IDESettings.ec:628 msgid "GNU Compiler Collection (GCC) / GNU Make" msgstr "GNU Compiler Collection (GCC) / GNU Make" @@ -195,15 +195,15 @@ msgstr "GNU Compiler Collection (GCC) / GNU Make" msgid "Methods" msgstr "Methods" -#: ./../ide/src/IDESettings.ec:630 +#: ./../ide/src/IDESettings.ec:631 msgid "Microsoft Visual Studio 2005 (8.0) Compiler" msgstr "Microsoft Visual Studio 2005 (8.0) Compiler" -#: ./../ide/src/IDESettings.ec:631 +#: ./../ide/src/IDESettings.ec:632 msgid "Microsoft Visual Studio 2008 (9.0) Compiler" msgstr "Microsoft Visual Studio 2008 (9.0) Compiler" -#: ./../ide/src/IDESettings.ec:633 +#: ./../ide/src/IDESettings.ec:634 msgid "Microsoft Visual Studio 2010 (10.0) Compiler" msgstr "Microsoft Visual Studio 2010 (10.0) Compiler" @@ -211,14 +211,14 @@ msgstr "Microsoft Visual Studio 2010 (10.0) Compiler" #: ./src/Documentor.ec:808 #: ./src/Documentor.ec:1259 #: ./src/Documentor.ec:1481 -msgid "Module: %s
\n" -msgstr "Module: %s
\n" +msgid "Module: %s
\n" +msgstr "Module: %s
\n" #: ./src/Documentor.ec:810 #: ./src/Documentor.ec:1261 #: ./src/Documentor.ec:1484 -msgid "Namespace: %s
\n" -msgstr "Namespace: %s
\n" +msgid "Namespace: %s
\n" +msgstr "Namespace: %s
\n" #: ./src/Documentor.ec:846 msgid "None" @@ -229,10 +229,10 @@ msgid "Open..." msgstr "Open..." #: ./src/Documentor.ec:607 -msgid "Parent namespace: %s
\n" -msgstr "Parent namespace: %s
\n" +msgid "Parent namespace: %s
\n" +msgstr "Parent namespace: %s
\n" -#: ./../ide/src/IDESettings.ec:629 +#: ./../ide/src/IDESettings.ec:630 msgid "Portable C Compiler / GNU Make" msgstr "Portable C Compiler / GNU Make" @@ -244,7 +244,7 @@ msgstr "Properties" msgid "Save" msgstr "Save" -#: ./src/Documentor.ec:2190 +#: ./src/Documentor.ec:2191 msgid "Save Changes" msgstr "Save Changes" @@ -268,7 +268,7 @@ msgstr "Structure" msgid "Tahoma" msgstr "Tahoma" -#: ./../ide/src/IDESettings.ec:628 +#: ./../ide/src/IDESettings.ec:629 msgid "Tiny C Compiler / GNU Make" msgstr "Tiny C Compiler / GNU Make" @@ -285,8 +285,8 @@ msgid "Virtual Methods" msgstr "Virtual Methods" #: ./src/Documentor.ec:555 -#: ./src/Documentor.ec:2280 -#: ./src/Documentor.ec:2688 +#: ./src/Documentor.ec:2281 +#: ./src/Documentor.ec:2689 msgid "[Add Text]" msgstr "[Add Text]" @@ -300,8 +300,8 @@ msgstr "eC Symbol files (*.sym)" #: ./src/Documentor.ec:1269 #: ./src/Documentor.ec:1491 -msgid "this pointer class: %s
\n" -msgstr "this pointer class: %s
\n" +msgid "this pointer class: %s
\n" +msgstr "this pointer class: %s
\n" #: ./src/Documentor.ec:1265 msgid "this pointer class: None
\n" diff --git a/eda/drivers/sqliteCipher/locale/EDASQLiteCipher.pot b/eda/drivers/sqliteCipher/locale/EDASQLiteCipher.pot index 48c738f..8d97515 100644 --- a/eda/drivers/sqliteCipher/locale/EDASQLiteCipher.pot +++ b/eda/drivers/sqliteCipher/locale/EDASQLiteCipher.pot @@ -10,15 +10,19 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Basepath: ../\n" -#: ./../sqlite/EDASQLite.ec:457 +#: ./../sqlite/EDASQLite.ec:474 msgid "BEGIN FAILED!" msgstr "BEGIN FAILED!" -#: ./../sqlite/EDASQLite.ec:468 +#: ./../sqlite/EDASQLite.ec:485 msgid "COMMIT FAILED!" msgstr "COMMIT FAILED!" -#: ./EDASQLiteCipher.ec:45 +#: ./EDASQLiteCipher.ec:68 +msgid "Can't open database (%s): %s -- password may be incorrect\n" +msgstr "Can't open database (%s): %s -- password may be incorrect\n" + +#: ./EDASQLiteCipher.ec:44 msgid "Can't open database (%s): %s\n" msgstr "Can't open database (%s): %s\n" @@ -26,19 +30,15 @@ msgstr "Can't open database (%s): %s\n" msgid "EDASQLite: Can't open database (%s): %s\n" msgstr "EDASQLite: Can't open database (%s): %s\n" -#: ./EDASQLiteCipher.ec:61 -msgid "EDASQLiteCipher: incorrect password!" -msgstr "EDASQLiteCipher: incorrect password!" - -#: ./EDASQLiteCipher.ec:57 -msgid "EDASQLiteCipher: password is correct, database has been initialized" -msgstr "EDASQLiteCipher: password is correct, database has been initialized" +#: ./EDASQLiteCipher.ec:56 +msgid "EDASQLiteCipher: database (%s) format not recognized, disabling cipher_use_hmac to support version 1.1.x databases\n" +msgstr "EDASQLiteCipher: database (%s) format not recognized, disabling cipher_use_hmac to support version 1.1.x databases\n" -#: ./../sqlite/EDASQLite.ec:933 +#: ./../sqlite/EDASQLite.ec:971 msgid "WARNING: ALTER TABLE DOESN'T WORK WITH PRIMARY KEY FOR " msgstr "WARNING: ALTER TABLE DOESN'T WORK WITH PRIMARY KEY FOR " -#: ./../sqlite/EDASQLite.ec:894 +#: ./../sqlite/EDASQLite.ec:932 msgid "WARNING: Table not yet created for class " msgstr "WARNING: Table not yet created for class " diff --git a/epj2make/locale/epj2make.pot b/epj2make/locale/epj2make.pot index f3f4cc5..fc3991a 100644 --- a/epj2make/locale/epj2make.pot +++ b/epj2make/locale/epj2make.pot @@ -90,19 +90,19 @@ msgstr "Error: Project configuration (%s) was not found.\n" msgid "Error: Unable to open project file (%s) due to unknown error.\n" msgstr "Error: Unable to open project file (%s) due to unknown error.\n" -#: ./../ide/src/IDESettings.ec:627 +#: ./../ide/src/IDESettings.ec:628 msgid "GNU Compiler Collection (GCC) / GNU Make" msgstr "GNU Compiler Collection (GCC) / GNU Make" -#: ./../ide/src/IDESettings.ec:630 +#: ./../ide/src/IDESettings.ec:631 msgid "Microsoft Visual Studio 2005 (8.0) Compiler" msgstr "Microsoft Visual Studio 2005 (8.0) Compiler" -#: ./../ide/src/IDESettings.ec:631 +#: ./../ide/src/IDESettings.ec:632 msgid "Microsoft Visual Studio 2008 (9.0) Compiler" msgstr "Microsoft Visual Studio 2008 (9.0) Compiler" -#: ./../ide/src/IDESettings.ec:633 +#: ./../ide/src/IDESettings.ec:634 msgid "Microsoft Visual Studio 2010 (10.0) Compiler" msgstr "Microsoft Visual Studio 2010 (10.0) Compiler" @@ -110,7 +110,7 @@ msgstr "Microsoft Visual Studio 2010 (10.0) Compiler" msgid "Notice: Project configuration (%s) will be used.\n" msgstr "Notice: Project configuration (%s) will be used.\n" -#: ./../ide/src/IDESettings.ec:629 +#: ./../ide/src/IDESettings.ec:630 msgid "Portable C Compiler / GNU Make" msgstr "Portable C Compiler / GNU Make" @@ -118,7 +118,7 @@ msgstr "Portable C Compiler / GNU Make" msgid "Syntax:\n" msgstr "Syntax:\n" -#: ./../ide/src/IDESettings.ec:628 +#: ./../ide/src/IDESettings.ec:629 msgid "Tiny C Compiler / GNU Make" msgstr "Tiny C Compiler / GNU Make" diff --git a/ide/locale/ide.pot b/ide/locale/ide.pot index deee03d..3b89dbf 100644 --- a/ide/locale/ide.pot +++ b/ide/locale/ide.pot @@ -50,7 +50,7 @@ msgstr " compiler configuration?" msgid " configuration?" msgstr " configuration?" -#: ./src/designer/CodeEditor.ec:1381 +#: ./src/designer/CodeEditor.ec:1398 msgid " file is not part of any project.\n" msgstr " file is not part of any project.\n" @@ -282,8 +282,8 @@ msgstr "Arrange Icons" msgid "Attach" msgstr "Attach" -#: ./src/designer/CodeEditor.ec:5167 -#: ./src/designer/CodeEditor.ec:5208 +#: ./src/designer/CodeEditor.ec:5184 +#: ./src/designer/CodeEditor.ec:5225 msgid "Attach %s" msgstr "Attach %s" @@ -387,7 +387,7 @@ msgstr "Call Stack" #: ./src/dialogs/GlobalSettingsDialog.ec:55 #: ./src/dialogs/NewProjectDialog.ec:214 #: ./src/dialogs/NewProjectDialog.ec:560 -#: ./src/designer/CodeEditor.ec:5239 +#: ./src/designer/CodeEditor.ec:5256 #: ./src/ProjectSettings.ec:172 msgid "Cancel" msgstr "Cancel" @@ -541,7 +541,7 @@ msgstr "Create Form" msgid "Create directory?" msgstr "Create directory?" -#: ./src/designer/CodeEditor.ec:1887 +#: ./src/designer/CodeEditor.ec:1904 #: ./src/ide.ec:1072 msgid "Debug" msgstr "Debug" @@ -688,7 +688,7 @@ msgstr "Do you want to quickly create a temporary project?" msgid "Do you want to terminate the debugging session in progress?" msgstr "Do you want to terminate the debugging session in progress?" -#: ./src/designer/CodeEditor.ec:2196 +#: ./src/designer/CodeEditor.ec:2213 #: ./src/ide.ec:1614 msgid "Document has been modified" msgstr "Document has been modified" @@ -810,7 +810,7 @@ msgid "Fatal Error: child process terminated unexpectedly\n" msgstr "Fatal Error: child process terminated unexpectedly\n" #: ./src/project/ProjectView.ec:463 -#: ./src/designer/CodeEditor.ec:1883 +#: ./src/designer/CodeEditor.ec:1900 #: ./src/designer/Designer.ec:150 #: ./src/documents/PictureEdit.ec:53 #: ./src/ide.ec:678 @@ -838,7 +838,7 @@ msgstr "File doesn't exist. Create?" msgid "File name:" msgstr "File name:" -#: ./src/designer/CodeEditor.ec:1383 +#: ./src/designer/CodeEditor.ec:1400 msgid "File not in project error" msgstr "File not in project error" @@ -921,7 +921,7 @@ msgstr "GDB Command" msgid "GIF Image" msgstr "GIF Image" -#: ./src/IDESettings.ec:627 +#: ./src/IDESettings.ec:628 msgid "GNU Compiler Collection (GCC) / GNU Make" msgstr "GNU Compiler Collection (GCC) / GNU Make" @@ -1069,7 +1069,7 @@ msgstr "Invalid Unicode Keypoint (0x%08X)" msgid "Invalid expression: \"%s\"" msgstr "Invalid expression: \"%s\"" -#: ./src/designer/CodeEditor.ec:1382 +#: ./src/designer/CodeEditor.ec:1399 msgid "It can't be compiled." msgstr "It can't be compiled." @@ -1117,8 +1117,8 @@ msgstr "Linker Options" msgid "Linking...\n" msgstr "Linking...\n" -#: ./src/designer/CodeEditor.ec:677 -#: ./src/designer/CodeEditor.ec:714 +#: ./src/designer/CodeEditor.ec:694 +#: ./src/designer/CodeEditor.ec:731 msgid "Ln %d, Col %d" msgstr "Ln %d, Col %d" @@ -1152,8 +1152,8 @@ msgstr "Memory can't be read at %s" msgid "MemoryGuard" msgstr "MemoryGuard" -#: ./src/designer/CodeEditor.ec:5168 -#: ./src/designer/CodeEditor.ec:5210 +#: ./src/designer/CodeEditor.ec:5185 +#: ./src/designer/CodeEditor.ec:5227 msgid "Method is unused. Move method inside instance?" msgstr "Method is unused. Move method inside instance?" @@ -1166,15 +1166,15 @@ msgstr "Method still contains code. Are you sure you want to delete it?" msgid "Methods" msgstr "Methods" -#: ./src/IDESettings.ec:630 +#: ./src/IDESettings.ec:631 msgid "Microsoft Visual Studio 2005 (8.0) Compiler" msgstr "Microsoft Visual Studio 2005 (8.0) Compiler" -#: ./src/IDESettings.ec:631 +#: ./src/IDESettings.ec:632 msgid "Microsoft Visual Studio 2008 (9.0) Compiler" msgstr "Microsoft Visual Studio 2008 (9.0) Compiler" -#: ./src/IDESettings.ec:633 +#: ./src/IDESettings.ec:634 msgid "Microsoft Visual Studio 2010 (10.0) Compiler" msgstr "Microsoft Visual Studio 2010 (10.0) Compiler" @@ -1217,7 +1217,7 @@ msgstr "Name" msgid "Name Conflict" msgstr "Name Conflict" -#: ./src/designer/CodeEditor.ec:5235 +#: ./src/designer/CodeEditor.ec:5252 msgid "Name detached method" msgstr "Name detached method" @@ -1299,7 +1299,7 @@ msgstr "Number of parallel build jobs" #: ./src/dialogs/GlobalSettingsDialog.ec:63 #: ./src/dialogs/NewProjectDialog.ec:34 #: ./src/dialogs/NewProjectDialog.ec:351 -#: ./src/designer/CodeEditor.ec:5244 +#: ./src/designer/CodeEditor.ec:5261 #: ./src/about.ec:40 #: ./src/ProjectSettings.ec:211 msgid "OK" @@ -1396,7 +1396,7 @@ msgstr "Please select files from a single project.\n" msgid "Pointer" msgstr "Pointer" -#: ./src/IDESettings.ec:629 +#: ./src/IDESettings.ec:630 msgid "Portable C Compiler / GNU Make" msgstr "Portable C Compiler / GNU Make" @@ -1644,12 +1644,12 @@ msgstr "Resume" msgid "Run" msgstr "Run" -#: ./src/designer/CodeEditor.ec:1890 +#: ./src/designer/CodeEditor.ec:1907 #: ./src/ide.ec:1164 msgid "Run To Cursor" msgstr "Run To Cursor" -#: ./src/designer/CodeEditor.ec:1911 +#: ./src/designer/CodeEditor.ec:1928 #: ./src/ide.ec:1186 msgid "Run To Cursor Skipping Breakpoints" msgstr "Run To Cursor Skipping Breakpoints" @@ -1664,7 +1664,7 @@ msgstr "Same Project" #: ./src/project/ProjectView.ec:247 #: ./src/project/ProjectView.ec:464 -#: ./src/designer/CodeEditor.ec:1884 +#: ./src/designer/CodeEditor.ec:1901 #: ./src/designer/Designer.ec:153 #: ./src/documents/PictureEdit.ec:54 #: ./src/ide.ec:731 @@ -1675,7 +1675,7 @@ msgstr "Save" msgid "Save All" msgstr "Save All" -#: ./src/designer/CodeEditor.ec:1885 +#: ./src/designer/CodeEditor.ec:1902 #: ./src/designer/Designer.ec:161 #: ./src/documents/PictureEdit.ec:55 #: ./src/ide.ec:742 @@ -1694,7 +1694,7 @@ msgstr "Save changes to project options?" msgid "Save changes to project settings?" msgstr "Save changes to project settings?" -#: ./src/dialogs/WorkspaceSettings.ec:91 +#: ./src/dialogs/WorkspaceSettings.ec:95 msgid "Save changes to workspace options?" msgstr "Save changes to workspace options?" @@ -1847,8 +1847,8 @@ msgstr "Strict Name Spaces" msgid "Symbol \"%s\" not found" msgstr "Symbol \"%s\" not found" -#: ./src/designer/CodeEditor.ec:655 -#: ./src/designer/CodeEditor.ec:656 +#: ./src/designer/CodeEditor.ec:672 +#: ./src/designer/CodeEditor.ec:673 #: ./src/designer/Sheet.ec:398 #: ./src/designer/Sheet.ec:427 #: ./src/designer/Sheet.ec:597 @@ -1909,11 +1909,11 @@ msgstr "Text files (*.txt)" msgid "Text files (*.txt, *.text, *.nfo, *.info)" msgstr "Text files (*.txt, *.text, *.nfo, *.info)" -#: ./src/designer/CodeEditor.ec:1381 +#: ./src/designer/CodeEditor.ec:1398 msgid "The " msgstr "The " -#: ./src/designer/CodeEditor.ec:2195 +#: ./src/designer/CodeEditor.ec:2212 #: ./src/ide.ec:1612 msgid "The document %s was modified by another application.\nWould you like to reload it and lose your changes?" msgstr "The document %s was modified by another application.\nWould you like to reload it and lose your changes?" @@ -1971,11 +1971,11 @@ msgstr "Tile Horizontally" msgid "Tile Vertically" msgstr "Tile Vertically" -#: ./src/IDESettings.ec:628 +#: ./src/IDESettings.ec:629 msgid "Tiny C Compiler / GNU Make" msgstr "Tiny C Compiler / GNU Make" -#: ./src/designer/CodeEditor.ec:1930 +#: ./src/designer/CodeEditor.ec:1947 msgid "Toggle Breakpoint" msgstr "Toggle Breakpoint" @@ -2026,7 +2026,7 @@ msgid "Unknown prompt" msgstr "Unknown prompt" #: ./src/project/ProjectView.ec:1185 -#: ./src/designer/CodeEditor.ec:2420 +#: ./src/designer/CodeEditor.ec:2437 msgid "Untitled %d" msgstr "Untitled %d" @@ -2132,7 +2132,7 @@ msgstr "Would you like to save changes made to the build options?" msgid "Would you like to save changes made to the project options?" msgstr "Would you like to save changes made to the project options?" -#: ./src/dialogs/WorkspaceSettings.ec:93 +#: ./src/dialogs/WorkspaceSettings.ec:97 msgid "Would you like to save changes made to the workspace options?" msgstr "Would you like to save changes made to the workspace options?" diff --git a/ide/src/IDESettings.ec b/ide/src/IDESettings.ec index 5637556..b23398d 100644 --- a/ide/src/IDESettings.ec +++ b/ide/src/IDESettings.ec @@ -765,7 +765,7 @@ public: bool ccacheEnabled; bool distccEnabled; // deprecated - property bool supportsBitDepth { set { } get { } isset { return false; } } + property bool supportsBitDepth { set { } get { return true; } isset { return false; } } property char * distccHosts { -- 1.8.3.1