Changeset 1764


Ignore:
Timestamp:
2/8/2010 6:05:23 AM (3 years ago)
Author:
lowjoel
Message:

Forward port from Eraser 6.0: Fixed a typo in the order of function calls (nested string translations) and updated the translations.

Location:
trunk/eraser6
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/eraser6

  • trunk/eraser6/Eraser/Program.cs

    r1716 r1764  
    422422                { 
    423423                    MessageBox.Show(S._("Another instance of Eraser is already running but " + 
    424                         "cannot be connected to.\n\nThe error returned was: {0}", ex.Message, 
     424                        "cannot be connected to.\n\nThe error returned was: {0}", ex.Message), 
    425425                        S._("Eraser"), MessageBoxButtons.OK, MessageBoxIcon.Error, 
    426426                        MessageBoxDefaultButton.Button1, 
    427                         S.IsRightToLeft(null) ? MessageBoxOptions.RtlReading : 0)); 
     427                        S.IsRightToLeft(null) ? MessageBoxOptions.RtlReading : 0); 
    428428                } 
    429429                catch (TimeoutException) 

  • trunk/eraser6/Eraser/Strings.NL.resx

    r1678 r1764  
    169169    <value>(Untranslated)</value> 
    170170  </data> 
     171  <data name="The task list could not be imported. The error returned was: {0}" xml:space="preserve"> 
     172    <value>(Untranslated)</value> 
     173  </data> 
    171174  <data name="The Eraser documentation file could not be opened. Check that Adobe Reader installed and that your Eraser install is not corrupt.\n\nThe error returned was: {0}" xml:space="preserve"> 
    172175    <value>(Untranslated)</value> 
    … …  
    179182  </data> 
    180183  <data name="Another instance of Eraser is already running but it is running with higher privileges than this instance of Eraser.\n\nEraser will now exit." xml:space="preserve"> 
     184    <value>(Untranslated)</value> 
     185  </data> 
     186  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}" xml:space="preserve"> 
    181187    <value>(Untranslated)</value> 
    182188  </data> 

  • trunk/eraser6/Eraser/Strings.en.resx

    r1678 r1764  
    169169    <value>Session: {0:F}</value> 
    170170  </data> 
     171  <data name="The task list could not be imported. The error returned was: {0}" xml:space="preserve"> 
     172    <value>The task list could not be imported. The error returned was: {0}</value> 
     173  </data> 
    171174  <data name="The Eraser documentation file could not be opened. Check that Adobe Reader installed and that your Eraser install is not corrupt.\n\nThe error returned was: {0}" xml:space="preserve"> 
    172175    <value>The Eraser documentation file could not be opened. Check that Adobe Reader installed and that your Eraser install is not corrupt.\n\nThe error returned was: {0}</value> 
    … …  
    181184    <value>Another instance of Eraser is already running but it is running with higher privileges than this instance of Eraser.\n\nEraser will now exit.</value> 
    182185  </data> 
     186  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}" xml:space="preserve"> 
     187    <value>Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}</value> 
     188  </data> 
    183189  <data name="Total: {0,2:#0.00%}" xml:space="preserve"> 
    184190    <value>Total: {0,2:#0.00%}</value> 

  • trunk/eraser6/Eraser/Strings.it.resx

    r1678 r1764  
    169169    <value>Sessione: {0:F}</value> 
    170170  </data> 
     171  <data name="The task list could not be imported. The error returned was: {0}" xml:space="preserve"> 
     172    <value>(Untranslated)</value> 
     173  </data> 
    171174  <data name="The Eraser documentation file could not be opened. Check that Adobe Reader installed and that your Eraser install is not corrupt.\n\nThe error returned was: {0}" xml:space="preserve"> 
    172175    <value>La documentazione di Eraser non può essere aperta. Verificare che Adobe Acrobat Reader sia installato e che la vostra installazione di Eraser non sia corrotta.\n\nL'errore è stato: {0}</value> 
    … …  
    181184    <value>Un'altra occorrenza di Eraser è già in esecuzione, ma con privilegi più elevati di questa.\n\nEraser adesso si chiuderà.</value> 
    182185  </data> 
     186  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}" xml:space="preserve"> 
     187    <value>(Untranslated)</value> 
     188  </data> 
    183189  <data name="Total: {0,2:#0.00%}" xml:space="preserve"> 
    184190    <value>Totale: {0,2:#0.00%}</value> 

  • trunk/eraser6/Eraser/Strings.resx

    r1678 r1764  
    169169    <value>Session: {0:F}</value> 
    170170  </data> 
     171  <data name="The task list could not be imported. The error returned was: {0}" xml:space="preserve"> 
     172    <value>The task list could not be imported. The error returned was: {0}</value> 
     173  </data> 
    171174  <data name="The Eraser documentation file could not be opened. Check that Adobe Reader installed and that your Eraser install is not corrupt.\n\nThe error returned was: {0}" xml:space="preserve"> 
    172175    <value>The Eraser documentation file could not be opened. Check that Adobe Reader installed and that your Eraser install is not corrupt.\n\nThe error returned was: {0}</value> 
    … …  
    181184    <value>Another instance of Eraser is already running but it is running with higher privileges than this instance of Eraser.\n\nEraser will now exit.</value> 
    182185  </data> 
     186  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}" xml:space="preserve"> 
     187    <value>Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}</value> 
     188  </data> 
    183189  <data name="Total: {0,2:#0.00%}" xml:space="preserve"> 
    184190    <value>Total: {0,2:#0.00%}</value> 
Note: See TracChangeset for help on using the changeset viewer.