diff options
Diffstat (limited to 'translations/mirall_nb_NO.ts')
-rw-r--r-- | translations/mirall_nb_NO.ts | 133 |
1 files changed, 76 insertions, 57 deletions
diff --git a/translations/mirall_nb_NO.ts b/translations/mirall_nb_NO.ts index 8b5dc72b1..d008e300e 100644 --- a/translations/mirall_nb_NO.ts +++ b/translations/mirall_nb_NO.ts @@ -265,12 +265,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="236"/> + <location filename="../src/mirall/application.cpp" line="241"/> <source><p>The detailed error message is<br/><tt>%1</tt></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="238"/> + <location filename="../src/mirall/application.cpp" line="243"/> <source><p>Please check your configuration by clicking on the tray icon.</p></source> <translation type="unfinished"/> </message> @@ -295,7 +295,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="290"/> + <location filename="../src/mirall/application.cpp" line="295"/> <source>Sync started for %1 configured sync folder(s).</source> <translation type="unfinished"/> </message> @@ -304,27 +304,27 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="307"/> + <location filename="../src/mirall/application.cpp" line="348"/> <source>Open status...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="309"/> + <location filename="../src/mirall/application.cpp" line="350"/> <source>Add folder...</source> <translation>Legg til mappe...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="311"/> + <location filename="../src/mirall/application.cpp" line="352"/> <source>Configure...</source> <translation>Konfigurer...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="313"/> + <location filename="../src/mirall/application.cpp" line="354"/> <source>Configure proxy...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="317"/> + <location filename="../src/mirall/application.cpp" line="358"/> <source>Quit</source> <translation>Lukk</translation> </message> @@ -333,83 +333,83 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="192"/> + <location filename="../src/mirall/application.cpp" line="197"/> <source>No %1 Configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="193"/> + <location filename="../src/mirall/application.cpp" line="198"/> <source><p>No server connection has been configured for this %1 client.</p><p>Please right click on the %1 system tray icon and select <i>Configure</i> to connect this client to an %1 server.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="219"/> + <location filename="../src/mirall/application.cpp" line="224"/> <source>%1 Server Mismatch</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="220"/> + <location filename="../src/mirall/application.cpp" line="225"/> <source><p>The configured server for this client is too old.</p><p>Please update to the latest %1 server and restart the client.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="235"/> + <location filename="../src/mirall/application.cpp" line="240"/> <source><p>The %1 at %2 could not be reached.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="240"/> + <location filename="../src/mirall/application.cpp" line="245"/> <source>%1 Connection Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="268"/> - <location filename="../src/mirall/application.cpp" line="276"/> + <location filename="../src/mirall/application.cpp" line="273"/> + <location filename="../src/mirall/application.cpp" line="281"/> <source>No %1 Connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="269"/> + <location filename="../src/mirall/application.cpp" line="274"/> <source><p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="277"/> + <location filename="../src/mirall/application.cpp" line="282"/> <source><p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="289"/> + <location filename="../src/mirall/application.cpp" line="294"/> <source>%1 Sync Started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="305"/> + <location filename="../src/mirall/application.cpp" line="346"/> <source>Open %1 in browser...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="315"/> + <location filename="../src/mirall/application.cpp" line="356"/> <source>About...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="362"/> + <location filename="../src/mirall/application.cpp" line="403"/> <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="375"/> + <location filename="../src/mirall/application.cpp" line="416"/> <source>Managed Folders:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="607"/> + <location filename="../src/mirall/application.cpp" line="648"/> <source>About %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="608"/> + <location filename="../src/mirall/application.cpp" line="649"/> <source>%1 client, version %2 Copyright 2012, the ownCloud developers @@ -420,110 +420,110 @@ The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRAN <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="621"/> + <location filename="../src/mirall/application.cpp" line="662"/> <source>Confirm Folder Remove</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="622"/> + <location filename="../src/mirall/application.cpp" line="663"/> <source>Do you really want to remove upload folder <i>%1</i>?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="656"/> + <location filename="../src/mirall/application.cpp" line="697"/> <source>Undefined Folder State</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="659"/> + <location filename="../src/mirall/application.cpp" line="700"/> <source>The folder waits to start syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="662"/> - <location filename="../src/mirall/application.cpp" line="796"/> + <location filename="../src/mirall/application.cpp" line="703"/> + <location filename="../src/mirall/application.cpp" line="837"/> <source>Sync is running.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="665"/> - <location filename="../src/mirall/application.cpp" line="801"/> + <location filename="../src/mirall/application.cpp" line="706"/> + <location filename="../src/mirall/application.cpp" line="842"/> <source>Last Sync was successful.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="668"/> - <location filename="../src/mirall/application.cpp" line="807"/> + <location filename="../src/mirall/application.cpp" line="709"/> + <location filename="../src/mirall/application.cpp" line="848"/> <source>Syncing Error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="671"/> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="712"/> + <location filename="../src/mirall/application.cpp" line="854"/> <source>Setup Error.</source> <translation>Feil med oppsett.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="674"/> - <location filename="../src/mirall/application.cpp" line="816"/> + <location filename="../src/mirall/application.cpp" line="715"/> + <location filename="../src/mirall/application.cpp" line="857"/> <source>Undefined Error State.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="678"/> + <location filename="../src/mirall/application.cpp" line="719"/> <source>Folder information</source> <translation>Mappeinformasjon</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="693"/> + <location filename="../src/mirall/application.cpp" line="734"/> <source>Unknown</source> <translation>Ukjent</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="695"/> + <location filename="../src/mirall/application.cpp" line="736"/> <source>Changed files: </source> <translation>Filer endret: \n:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="697"/> + <location filename="../src/mirall/application.cpp" line="738"/> <source>Added files: </source> <translation>Filer lagt til: \n</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="699"/> + <location filename="../src/mirall/application.cpp" line="740"/> <source>New files in the server, or files deleted locally: </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="726"/> + <location filename="../src/mirall/application.cpp" line="767"/> <source>Sync Running</source> <translation>Synkroniserer...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="727"/> + <location filename="../src/mirall/application.cpp" line="768"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="789"/> + <location filename="../src/mirall/application.cpp" line="830"/> <source>Undefined State.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="792"/> + <location filename="../src/mirall/application.cpp" line="833"/> <source>Waits to start syncing.</source> <translation>Venter på å starte synkronisering.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="821"/> + <location filename="../src/mirall/application.cpp" line="862"/> <source>Sync is paused.</source> <translation>Synkroniseringen er pauset.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="837"/> + <location filename="../src/mirall/application.cpp" line="878"/> <source>No sync folders configured.</source> <translation type="unfinished"/> </message> @@ -1246,7 +1246,7 @@ Setup can not be done.</source> <context> <name>Mirall::ownCloudFolder</name> <message> - <location filename="../src/mirall/owncloudfolder.cpp" line="288"/> + <location filename="../src/mirall/owncloudfolder.cpp" line="310"/> <source>The CSync thread terminated.</source> <translation type="unfinished"/> </message> @@ -1254,15 +1254,23 @@ Setup can not be done.</source> <context> <name>MirallConfigFile</name> <message> - <location filename="../src/mirall/mirallconfigfile.cpp" line="331"/> <source>ownCloud Password Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/mirallconfigfile.cpp" line="332"/> <source>Please enter your ownCloud password:</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/mirallconfigfile.cpp" line="331"/> + <source>Password Required</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/mirallconfigfile.cpp" line="332"/> + <source>Please enter your %1 password:</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudCredentialsPage</name> @@ -1659,23 +1667,34 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>sslErrorsDialog</name> + <name>sslErrorDialog</name> <message> - <location filename="../src/mirall/sslerrorsdialog.ui" line="14"/> + <location filename="../src/mirall/sslerrordialog.ui" line="14"/> <source>Form</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/sslerrorsdialog.ui" line="25"/> + <location filename="../src/mirall/sslerrordialog.ui" line="25"/> <source>Check if you want to continue via SSL and trust the shown certificates.</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/mirall/sslerrordialog.ui" line="44"/> + <source>SSL Connection</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>sslErrorsDialog</name> + <message> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> <source>Check if you want t continue via SSL and trust the shown certificates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/sslerrorsdialog.ui" line="44"/> <source>SSL Connection</source> <translation type="unfinished"/> </message> |