diff options
Diffstat (limited to 'translations/client_nb_NO.ts')
| -rw-r--r-- | translations/client_nb_NO.ts | 1179 |
1 files changed, 609 insertions, 570 deletions
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index d885e3ce5..16c59dab8 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -13,7 +13,7 @@ <translation>Kunne ikke flytte '%1' til '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="445"/> + <location filename="../src/common/filesystembase.cpp" line="442"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Flytting til søppelbøtten er ikke støttet på denne plattformen</translation> </message> @@ -87,22 +87,45 @@ <translation>Skjema</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="58"/> + <location filename="../src/gui/notificationwidget.ui" line="73"/> <source>Lorem ipsum dolor sit amet</source> <translation>Lorem ipsum dolor sit amet</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="71"/> + <location filename="../src/gui/notificationwidget.ui" line="86"/> <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source> <translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="91"/> + <location filename="../src/gui/notificationwidget.ui" line="106"/> <source>TextLabel</source> <translation>Tekst-etikett</translation> </message> </context> <context> + <name>OCC::AboutDialog</name> + <message> + <location filename="../src/gui/aboutdialog.ui" line="24"/> + <source>About</source> + <translation>Om</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.ui" line="88"/> + <source>TextLabel</source> + <translation>Tekst-etikett</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.ui" line="96"/> + <source>Versions</source> + <translation>Versjoner</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.cpp" line="28"/> + <source>About %1</source> + <translation>Om %1</translation> + </message> +</context> +<context> <name>OCC::AbstractNetworkJob</name> <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> @@ -121,6 +144,14 @@ </message> </context> <context> + <name>OCC::Account</name> + <message> + <location filename="../src/libsync/account.cpp" line="121"/> + <source>%1@%2</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::AccountSettings</name> <message> <location filename="../src/gui/accountsettings.ui" line="14"/> @@ -163,15 +194,15 @@ <translation>Bruk manuelle endringer</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="267"/> + <location filename="../src/gui/accountsettings.ui" line="282"/> <source>Apply</source> <translation>Bruk</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="254"/> - <location filename="../src/gui/accountsettings.cpp" line="512"/> - <location filename="../src/gui/accountsettings.cpp" line="624"/> - <location filename="../src/gui/accountsettings.cpp" line="1083"/> + <location filename="../src/gui/accountsettings.ui" line="269"/> + <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="611"/> + <location filename="../src/gui/accountsettings.cpp" line="1048"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -181,87 +212,67 @@ <translation>Tilkoblet <server> som <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="180"/> <source>No account configured.</source> <translation>Ingen konto konfigurert.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="200"/> - <source>Add new</source> - <translation>Legg til ny</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="209"/> + <location filename="../src/gui/accountsettings.cpp" line="203"/> <source>Remove</source> <translation>Fjern</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="213"/> + <location filename="../src/gui/accountsettings.cpp" line="207"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="297"/> <source>Choose what to sync</source> <translation>Velg hva som synkroniseres</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Force sync now</source> <translation>Tving synkronisering nå</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="305"/> <source>Restart sync</source> <translation>Prøv synkronisering igjen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="327"/> + <location filename="../src/gui/accountsettings.cpp" line="314"/> <source>Remove folder sync connection</source> <translation>Fjern tilkobling for mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>Enable virtual file support %1...</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>(tech preview)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>(experimental)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="445"/> + <location filename="../src/gui/accountsettings.cpp" line="433"/> <source>Folder creation failed</source> <translation>Oppretting av mappe feilet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="434"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Klarte ikke å opprette lokal mappe <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="504"/> + <location filename="../src/gui/accountsettings.cpp" line="491"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Bekreft fjerning av tilkobling for mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="511"/> + <location filename="../src/gui/accountsettings.cpp" line="499"/> <source>Remove Folder Sync Connection</source> <translation>Fjern tilkobling for mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="615"/> + <location filename="../src/gui/accountsettings.cpp" line="602"/> <source>Disable virtual file support?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="616"/> + <location filename="../src/gui/accountsettings.cpp" line="603"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -270,173 +281,183 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="623"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Disable support</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="733"/> + <location filename="../src/gui/accountsettings.cpp" line="712"/> <source>Sync Running</source> <translation>Synkroniserer...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="734"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Synkronisering kjører.<br/>Vil du avbryte den?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="829"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>%1 in use</source> <translation>%1 i bruk</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="856"/> + <location filename="../src/gui/accountsettings.cpp" line="836"/> <source>%1 as <i>%2</i></source> <translation>%1 som <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="845"/> <source>Connected to %1.</source> <translation>Tilkoblet %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="870"/> + <location filename="../src/gui/accountsettings.cpp" line="850"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 er midlertidig utilgjengelig.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 er for øyeblikket i vedlikeholdsmodus.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="876"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Signed out from %1.</source> <translation>Logget ut fra %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="886"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Connecting to %1...</source> <translation>Kobler til %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="871"/> <source>No connection to %1 at %2.</source> <translation>Ingen tilkobling til %1 på %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="930"/> + <location filename="../src/gui/accountsettings.cpp" line="910"/> <source>Log in</source> <translation>Logg inn</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1026"/> + <location filename="../src/gui/accountsettings.cpp" line="1005"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Noen mapper ble ikke synkronisert fordi de er for store</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1028"/> + <location filename="../src/gui/accountsettings.cpp" line="1007"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Noen mapper ble ikke synkronisert fordi de er eksterne lagringsplasser:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1029"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Noen mapper ble ikke synkronisert fordi de er for store eller de er eksterne lagringsplasser:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1075"/> + <location filename="../src/gui/accountsettings.cpp" line="1041"/> <source>Confirm Account Removal</source> <translation>Bekreft fjerning av konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1076"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Vil du virkelig fjerne tilkoblingen til kontoen <i>%1</i>?</p><p><b>Merk:</b> Dette vil <b>ikke</b> slette noen filer.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1082"/> + <location filename="../src/gui/accountsettings.cpp" line="1047"/> <source>Remove connection</source> <translation>Fjern tilkobling</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="306"/> + <location filename="../src/gui/accountsettings.cpp" line="293"/> <source>Open folder</source> <translation>Åpne mappe</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="205"/> - <location filename="../src/gui/accountsettings.cpp" line="932"/> + <location filename="../src/gui/accountsettings.cpp" line="199"/> + <location filename="../src/gui/accountsettings.cpp" line="912"/> <source>Log out</source> <translation>Logg ut</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="265"/> + <location filename="../src/gui/accountsettings.cpp" line="252"/> <source>Open local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="273"/> + <location filename="../src/gui/accountsettings.cpp" line="260"/> <source>Open folder in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Resume sync</source> <translation>Fortsett synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Pause sync</source> <translation>Sett synkronisering på pause</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="331"/> + <location filename="../src/gui/accountsettings.cpp" line="318"/> <source>Availability</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="348"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source>Disable virtual file support...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="505"/> + <location filename="../src/gui/accountsettings.cpp" line="343"/> + <source>Enable virtual file support%1...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="343"/> + <source> (experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="492"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Vil du virkelig stoppe synkronisering av mappen <i>%1</i>?</p><p><b>Merk:</b> Dette vil <b>ikke</b> slette noen filer.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="816"/> + <location filename="../src/gui/accountsettings.cpp" line="796"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) av %2 i bruk. Noen mapper, inkludert nettverkstilkoblede eller delte mapper, kan ha andre begrensninger.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="817"/> + <location filename="../src/gui/accountsettings.cpp" line="797"/> <source>%1 of %2 in use</source> <translation>%1 av %2 i bruk</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="826"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Currently there is no storage usage information available.</source> <translation>Ingen informasjon om bruk av lagringsplass tilgjengelig for øyeblikket.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="863"/> + <location filename="../src/gui/accountsettings.cpp" line="843"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="883"/> + <location filename="../src/gui/accountsettings.cpp" line="863"/> <source>Obtaining authorization from the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="896"/> + <location filename="../src/gui/accountsettings.cpp" line="876"/> <source>Server configuration error: %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="907"/> + <location filename="../src/gui/accountsettings.cpp" line="887"/> <source>No %1 connection configured.</source> <translation>Ingen %1-forbindelse konfigurert.</translation> </message> @@ -492,12 +513,12 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 på %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 på %2 (frakoblet)</translation> </message> @@ -513,44 +534,44 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="515"/> - <location filename="../src/gui/activitywidget.cpp" line="563"/> + <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="570"/> <source>Server Activity</source> <translation>Server-aktivitet</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Synkroniseringsprotokoll</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Ikke synkronisert</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="574"/> + <location filename="../src/gui/activitywidget.cpp" line="581"/> <source>Not Synced (%1)</source> <extracomment>%1 is the number of not synced files.</extracomment> <translation>Ikke synkronisert (%1)</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="606"/> + <location filename="../src/gui/activitywidget.cpp" line="613"/> <source>The server activity list has been copied to the clipboard.</source> <translation>Server-aktivitetslisten er kopiert til utklippstavlen.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="610"/> + <location filename="../src/gui/activitywidget.cpp" line="617"/> <source>The sync activity list has been copied to the clipboard.</source> <translation>Synkroniserings-aktivitetslisten er kopiert til utklippstavlen.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> + <location filename="../src/gui/activitywidget.cpp" line="620"/> <source>The list of unsynced items has been copied to the clipboard.</source> <translation>Listen med usynkroniserte elementer ble kopiert til utklippstavlen.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="618"/> + <location filename="../src/gui/activitywidget.cpp" line="625"/> <source>Copied to clipboard</source> <translation>Kopiert til utklippstavlen</translation> </message> @@ -570,47 +591,47 @@ This action will abort any currently running synchronization.</source> <translation>Tekst-etikett</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Server-aktiviteter</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Kopier</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="93"/> + <location filename="../src/gui/activitywidget.cpp" line="100"/> <source>Copy the activity list to the clipboard.</source> <translation>Kopier aktivitetslisten til utklippstavlen.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Varsler</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="351"/> + <location filename="../src/gui/activitywidget.cpp" line="358"/> <source>%n notifications(s) for %1.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="357"/> + <location filename="../src/gui/activitywidget.cpp" line="364"/> <source>%n notifications(s) for %1 and %2.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="359"/> + <location filename="../src/gui/activitywidget.cpp" line="366"/> <source>New notifications for %1, %2 and other accounts.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="362"/> + <location filename="../src/gui/activitywidget.cpp" line="369"/> <source>Open the activity view for details.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="145"/> + <location filename="../src/gui/activitywidget.cpp" line="152"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Konto %1 har ikke aktiviteter aktivert.</translation> </message> @@ -661,42 +682,42 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="134"/> + <location filename="../src/gui/application.cpp" line="136"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Å fortsette vil<b> slette disse innstillingene </b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="138"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Å fortsette vil <b> ignorere disse innstillingene </b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="142"/> + <location filename="../src/gui/application.cpp" line="144"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="149"/> + <location filename="../src/gui/application.cpp" line="151"/> <source>Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="150"/> + <location filename="../src/gui/application.cpp" line="152"/> <source>Continue</source> <translation>Fortsett</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="299"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Error accessing the configuration file</source> <translation>Feil ved lesing av konfigurasjonsfil</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="300"/> + <location filename="../src/gui/application.cpp" line="310"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>En feil oppstod ved aksessering av konfigurasjonsfilen på %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="303"/> + <location filename="../src/gui/application.cpp" line="313"/> <source>Quit ownCloud</source> <translation>Avslutt ownCloud</translation> </message> @@ -727,7 +748,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1135"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1140"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> @@ -769,7 +790,7 @@ This action will abort any currently running synchronization.</source> <name>OCC::DiscoverySingleDirectoryJob</name> <message> <location filename="../src/libsync/discoveryphase.cpp" line="480"/> - <location filename="../src/libsync/discoveryphase.cpp" line="502"/> + <location filename="../src/libsync/discoveryphase.cpp" line="501"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"/> </message> @@ -805,134 +826,134 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="172"/> + <location filename="../src/gui/folder.cpp" line="173"/> <source>Local folder %1 does not exist.</source> <translation>Lokal mappe %1 eksisterer ikke.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="175"/> + <location filename="../src/gui/folder.cpp" line="176"/> <source>%1 should be a folder but is not.</source> <translation>%1 skal være en mappe men er ikke det.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="178"/> + <location filename="../src/gui/folder.cpp" line="179"/> <source>%1 is not readable.</source> <translation>%1 kan ikke leses.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 har blitt fjernet.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 har blitt oppdatert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 har blitt omdøpt til %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2.</source> <translation>%1 har blitt flyttet til %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="414"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 og %n annen fil har blitt fjernet.</numerusform><numerusform>%1 og %n andre filer har blitt fjernet.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="420"/> + <location filename="../src/gui/folder.cpp" line="421"/> <source>%1 and %n other file(s) have been added.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="427"/> + <location filename="../src/gui/folder.cpp" line="428"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 og %n annen fil har blitt oppdatert.</numerusform><numerusform>%1 og %n andre filer har blitt oppdatert.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="434"/> + <location filename="../src/gui/folder.cpp" line="435"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 er blitt omdøpt til %2 og %n annen fil har blitt omdøpt.</numerusform><numerusform>%1 er blitt omdøpt til %2 og %n andre filer har blitt omdøpt.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="441"/> + <location filename="../src/gui/folder.cpp" line="442"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 er blitt flyttet til %2 og %n annen fil har blitt flyttet.</numerusform><numerusform>%1 er blitt flyttet til %2 og %n andre filer har blitt flyttet.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="448"/> + <location filename="../src/gui/folder.cpp" line="449"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 og %n andre filer har synkroniseringskonflikter.</numerusform><numerusform>%1 og %n andre filer har synkroniseringskonflikter.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 har en synkroniseringskonflikt. Sjekk konflikt-filen.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="455"/> + <location filename="../src/gui/folder.cpp" line="456"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 og %n andre filer kunne ikke synkroniseres pga. feil. Se loggen for detaljer.</numerusform><numerusform>%1 og %n andre filer kunne ikke synkroniseres pga. feil. Se loggen for detaljer.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 kunne ikke synkroniseres pga. en feil. Se loggen for detaljer.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="463"/> + <location filename="../src/gui/folder.cpp" line="464"/> <source>Sync Activity</source> <translation>Synkroniseringsaktivitet</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="800"/> <source>Could not read system exclude file</source> <translation>Klarte ikke å lese systemets ekskluderingsfil</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1045"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>En ny mappe større enn %1 MB er blitt lagt til: %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>A folder from an external storage has been added. </source> <translation>En mappe fra et eksternt lager er blitt lagt til. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1049"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Gå til Innstillinger og velg den hvis du ønsker å laste den ned.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1109"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Mappen %1 var laget, men har tidligere blitt ekskludert fra synkronisering. Data i mappen vil derfor ikke bli synkronisert. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1112"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Filen %1 ble opprettet men har tidligere blitt ekskludert fra synkronisering. Den vil ikke bli synkronisert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <source>Changes in synchronized folders could not be tracked reliably. This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default). @@ -941,7 +962,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1208"/> + <location filename="../src/gui/folder.cpp" line="1197"/> <source>All files in the sync folder '%1' folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to keep the files, they will be re-synced with the server if you have rights to do so. @@ -952,7 +973,7 @@ Hvis du velger å beholde filene, vil de bli synkronisert tilbake til serveren h Hvis du velger å slette filene, blir de utilgjengelige for deg hvis du ikke er eieren av filen.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1202"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -961,17 +982,17 @@ Er du sikker på at du ønsker å synkronisere denne handlingen med serveren? Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert tilbake fra serveren.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1217"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>Fjerne alle filer?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Fjern alle filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Behold filer</translation> </message> @@ -979,107 +1000,107 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="357"/> <source>Could not reset folder state</source> <translation>Klarte ikke å tilbakestille mappetilstand</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="356"/> + <location filename="../src/gui/folderman.cpp" line="358"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>En gammel synkroniseringsjournal '%1' ble funnet men kunne ikke fjernes. Pass på at ingen applikasjoner bruker den.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation> (sikkerhetskopi)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation> (sikkerhetskopi %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Undefined State.</source> <translation>Udefinert tilstand.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1332"/> <source>Waiting to start syncing.</source> <translation>Venter på å starte synkronisering.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>Preparing for sync.</source> <translation>Forbereder synkronisering.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1336"/> + <location filename="../src/gui/folderman.cpp" line="1338"/> <source>Sync is running.</source> <translation>Synkronisering kjører.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synkronisering var vellykket, uløste konflikter.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1343"/> + <location filename="../src/gui/folderman.cpp" line="1345"/> <source>Last Sync was successful.</source> <translation>Siste synkronisering var vellykket.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Feil med oppsett.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Brukeravbrudd.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>Sync is paused.</source> <translation>Synkronisering er satt på pause.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1361"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synkronisering er satt på pause)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1369"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>No valid folder selected!</source> <translation>Ingen gyldig mappe valgt!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path does not exist!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>The selected path is not a folder!</source> <translation>Den valgte stien er ikke en mappe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1391"/> <source>You have no permission to write to the selected folder!</source> <translation>Du har ikke skrivetilgang til den valgte mappen!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1456"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Det er allerede en synkronisering fra serveren til denne lokale mappen. Velg en annen mappe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1436"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>Den lokale mappen %1 inneholder allerede en mappe brukt i en mappe-synkronisering. Velg en annen!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1442"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>Den lokale mappen %1 er allerede en undermappe av en mappe brukt i en mappe-synkronisering. Velg en annen!</translation> </message> @@ -1087,16 +1108,11 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <context> <name>OCC::FolderStatusDelegate</name> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="47"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="46"/> <source>Add Folder Sync Connection</source> <translation>Legg til mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="248"/> - <source>Synchronizing with local folder</source> - <translation>Synkroniserer med lokal mappe</translation> - </message> - <message> <location filename="../src/gui/folderstatusdelegate.cpp" line="299"/> <source>File</source> <translation>Fil</translation> @@ -1147,107 +1163,117 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <translation>Det er uløste konflikter. Klikk for detaljer.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <source>Synchronizing VirtualFiles with local folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <source>Synchronizing with local folder</source> + <translation>Synkroniserer med lokal mappe</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in remote '%1'</source> <translation>Sjekker for endringer i ekstern '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> <source>Checking for changes in local '%1'</source> <translation>Sjekker for endringer i lokal '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> <source>Reconciling changes</source> <translation>Sammenslår endringer</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synkroniserer %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>nedlasting %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>opplasting %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 av %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 igjen, %1 av %2, fil %3 of %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 av %2, fil %3 av %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> <source>file %1 of %2</source> <translation>fil %1 av %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> <source>Waiting...</source> <translation>Venter..</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Venter på %n annen mappe...</numerusform><numerusform>Venter på %n andre mappe(r)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> <source>Preparing to sync...</source> <translation>Forbereder synkronisering...</translation> </message> @@ -1271,12 +1297,12 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Folder Sync Connection</source> <translation>Legg til mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="576"/> + <location filename="../src/gui/folderwizard.cpp" line="578"/> <source>Add Sync Connection</source> <translation>Legg til tilkobling for synkronisering</translation> </message> @@ -1284,17 +1310,17 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="68"/> + <location filename="../src/gui/folderwizard.cpp" line="69"/> <source>Click to select a local folder to sync.</source> <translation>Klikk for å velge en lokal mappe å synkronisere.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="75"/> + <location filename="../src/gui/folderwizard.cpp" line="76"/> <source>Enter the path to the local folder.</source> <translation>Legg inn stien til den lokale mappen.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="136"/> + <location filename="../src/gui/folderwizard.cpp" line="137"/> <source>Select the source folder</source> <translation>Velg kildemappe</translation> </message> @@ -1302,52 +1328,52 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="184"/> + <location filename="../src/gui/folderwizard.cpp" line="185"/> <source>Create Remote Folder</source> <translation>Opprett ekstern mappe</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="185"/> + <location filename="../src/gui/folderwizard.cpp" line="186"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Oppgi navnet på den nye mappen som skal opprettes under '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="215"/> + <location filename="../src/gui/folderwizard.cpp" line="216"/> <source>Folder was successfully created on %1.</source> <translation>Mappen ble opprettet på %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="226"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Authentication failed accessing %1</source> <translation>Autentisering feilet ved tilgang til %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="228"/> + <location filename="../src/gui/folderwizard.cpp" line="229"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Klarte ikke å opprette mappen på %1. Sjekk manuelt.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="247"/> <source>Failed to list a folder. Error: %1</source> <translation>Klarte ikke å liste en mappe. Feil: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="328"/> <source>Choose this to sync the entire account</source> <translation>Velg dette for å synkronisere en hel konto</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="440"/> <source>This folder is already being synced.</source> <translation>Denne mappen synkroniseres allerede.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="442"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Du synkroniserer allerede <i>%1</i>, som er foreldremappe for <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="444"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1355,30 +1381,30 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> - <source>Use virtual files instead of downloading content immediately %1</source> + <location filename="../src/gui/folderwizard.cpp" line="485"/> + <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="489"/> - <source>(tech preview)</source> + <location filename="../src/gui/folderwizard.cpp" line="485"/> + <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="489"/> - <source>(experimental)</source> + <location filename="../src/gui/folderwizard.cpp" line="519"/> + <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="49"/> + <location filename="../src/gui/folderwizard.cpp" line="50"/> <source><b>Warning:</b> %1</source> <translation><b>Advarsel:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="51"/> + <location filename="../src/gui/folderwizard.cpp" line="52"/> <source><b>Warning:</b></source> <translation><b>Advarsel:</b></translation> </message> @@ -1388,12 +1414,12 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <message> <location filename="../src/libsync/propagatedownload.cpp" line="180"/> <source>No E-Tag received from server, check Proxy/Gateway</source> - <translation type="unfinished"/> + <translation>Ingen E-Tag mottatt fra server. Sjekk proxy/gateway.</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="187"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> - <translation type="unfinished"/> + <translation>Vi mottok en forskjellig E-Tag for å fortsette. Prøver igjen neste gang.</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="197"/> @@ -1403,7 +1429,7 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <message> <location filename="../src/libsync/propagatedownload.cpp" line="224"/> <source>Server returned wrong content-range</source> - <translation type="unfinished"/> + <translation>Serveren returnerte feil content-range</translation> </message> </context> <context> @@ -1427,48 +1453,73 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <translation>Vanlige innstillinger</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="55"/> - <source>For System Tray</source> - <translation>For systemkurven</translation> + <location filename="../src/gui/generalsettings.ui" line="80"/> + <source>Sync hidden files</source> + <translation>Synkroniser skjulte filer</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="184"/> - <source>Network</source> + <location filename="../src/gui/generalsettings.ui" line="109"/> + <source>Log Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="257"/> + <location filename="../src/gui/generalsettings.ui" line="136"/> + <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="196"/> + <source>Network</source> + <translation>Nettverk</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="208"/> + <source>Updates</source> + <translation>Oppdateringer</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="237"/> <source>stable</source> <translation>Stabil</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="262"/> + <location filename="../src/gui/generalsettings.ui" line="242"/> <source>beta</source> <translation>beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="68"/> + <location filename="../src/gui/generalsettings.ui" line="337"/> + <source>About</source> + <translation>Om</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="65"/> <source>Advanced</source> <translation>Avansert</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="100"/> + <location filename="../src/gui/generalsettings.ui" line="41"/> + <source>Use &Monochrome Icons in the system tray</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="144"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Be om bekreftelse før synkronisering av mapper større enn</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="120"/> + <location filename="../src/gui/generalsettings.ui" line="164"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="186"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Be om bekreftelse før synkronisering av eksterne lagre</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="41"/> + <location filename="../src/gui/generalsettings.ui" line="55"/> <source>&Launch on System Startup</source> <translation>&Start når maskinen starter</translation> </message> @@ -1478,57 +1529,42 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <translation>Vis &påminnelser på skrivebordet</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="58"/> - <source>Use &Monochrome Icons</source> - <translation>Bruk svart/&hvite ikoner</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="213"/> - <source>Version</source> - <translation>Versjon</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="240"/> + <location filename="../src/gui/generalsettings.ui" line="220"/> <source>&Update Channel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="346"/> - <source>•</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="76"/> + <location filename="../src/gui/generalsettings.ui" line="102"/> <source>Edit &Ignored Files</source> <translation>Rediger &ignorerte filer</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="155"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="172"/> + <location filename="../src/gui/generalsettings.ui" line="93"/> <source>S&how crash reporter</source> <translation>Vis &krasj-rapportering</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="289"/> + <location filename="../src/gui/generalsettings.ui" line="269"/> <source>&Restart && Update</source> <translation>&Omstart && Oppdater</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="266"/> + <location filename="../src/gui/generalsettings.cpp" line="280"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="176"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>Change update channel?</source> <translation>Bytt oppdateringskanal? </translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="177"/> + <location filename="../src/gui/generalsettings.cpp" line="191"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1537,12 +1573,12 @@ Note that this selects only what pool upgrades are taken from, and that there ar Vær oppmerksom på at dette bare velger hvor oppgraderinger kommer ifra, og at nedgraderinger ikke er mulig. Så å gå tilbake fra beta-kanalen til den stabile kanalen, kan ikke gjøres umiddelbart og betyr å vente på en stabil versjon som er nyere enn den nåværende installerte betaen versjon.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="190"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Change update channel</source> <translation>Bytt oppdateringskanal</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="205"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -1579,63 +1615,53 @@ Vær oppmerksom på at dette bare velger hvor oppgraderinger kommer ifra, og at </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="20"/> - <source>Global Ignore Settings</source> - <translation>Globale ignorerings-innstillinger</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.ui" line="26"/> - <source>Sync hidden files</source> - <translation>Synkroniser skjulte filer</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.ui" line="36"/> <source>Files Ignored by Patterns</source> <translation>Filer som ignorerers av mønstre</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="75"/> + <location filename="../src/gui/ignorelisteditor.ui" line="59"/> <source>Add</source> <translation>Legg til</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="57"/> + <location filename="../src/gui/ignorelisteditor.ui" line="41"/> <source>Pattern</source> <translation>Mønster</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="62"/> + <location filename="../src/gui/ignorelisteditor.ui" line="46"/> <source>Allow Deletion</source> <translation>Tillat sletting</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="85"/> + <location filename="../src/gui/ignorelisteditor.ui" line="69"/> <source>Remove</source> <translation>Fjern</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="121"/> + <location filename="../src/gui/ignorelisteditor.ui" line="105"/> <source>Files or folders matching a pattern will not be synchronized. Changes take effect the next time folders are synchronized. Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="119"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="112"/> <source>Could not open file</source> <translation>Klarte ikke å åpne fil</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="120"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="113"/> <source>Cannot write changes to '%1'.</source> <translation>Kan ikke skrive endringer til '%1'.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="146"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="132"/> <source>Add Ignore Pattern</source> <translation>Nytt mønster</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="147"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> <source>Add a new ignore pattern:</source> <translation>Legg til ignoreringsmønster:</translation> </message> @@ -1737,35 +1763,54 @@ Items where deletion is allowed will be deleted if they prevent a directory from <context> <name>OCC::LogBrowser</name> <message> - <location filename="../src/gui/logbrowser.cpp" line="46"/> + <location filename="../src/gui/logbrowser.ui" line="14"/> <source>Log Output</source> <translation>Logg</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="52"/> + <location filename="../src/gui/logbrowser.ui" line="116"/> + <source>Enable logging to temporary folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="61"/> + <source>Delete logs older than %1 hours</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="53"/> + <source><html><head/><body><p><span style=" font-weight:600; color:#ff0000;">The logs contain sensitive information which you should not make publicly available</span></p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="71"/> <source>The client can write debug logs to a temporary folder. These logs are very helpful for diagnosing problems. -Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space. -If enabled, logs will be written to %1</source> +Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="66"/> - <source>Enable logging to temporary folder</source> + <location filename="../src/gui/logbrowser.ui" line="84"/> + <source>If enabled, logs will be written to:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> - <source>Delete logs older than %1 hours</source> + <location filename="../src/gui/logbrowser.ui" line="91"/> + <source>C:/log</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.ui" line="123"/> + <source>Log Http traffic </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="143"/> <source>These settings persist across client restarts. Note that using any logging command line options will override the settings.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="85"/> + <location filename="../src/gui/logbrowser.ui" line="154"/> <source>Open folder</source> <translation>Åpne mappe</translation> </message> @@ -1773,12 +1818,12 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="186"/> + <location filename="../src/libsync/logger.cpp" line="177"/> <source>Error</source> <translation>Feil</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="187"/> + <location filename="../src/libsync/logger.cpp" line="178"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Fil '%1'<br/>kan ikke åpnes for skriving.<br/><br/>Loggen kan <b>ikke</b> lagres!</nobr></translation> </message> @@ -1953,23 +1998,23 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NotificationWidget</name> <message> - <location filename="../src/gui/notificationwidget.cpp" line="65"/> + <location filename="../src/gui/notificationwidget.cpp" line="59"/> <source>Created at %1</source> <translation>Opprettet %1</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="78"/> + <location filename="../src/gui/notificationwidget.cpp" line="72"/> <source>Closing in a few seconds...</source> <translation>Lukkes om noen sekunder...</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="125"/> + <location filename="../src/gui/notificationwidget.cpp" line="119"/> <source>%1 request failed at %2</source> <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment> <translation>%1 forespørsel feilet %2</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="131"/> + <location filename="../src/gui/notificationwidget.cpp" line="125"/> <source>'%1' selected at %2</source> <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment> <translation>'%1' valgt %2</translation> @@ -1978,68 +2023,73 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> + <location filename="../src/libsync/creds/oauth.cpp" line="127"/> <source>Error returned from the server: <em>%1</em></source> <translation>Feil returnert fra serveren: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="130"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>Det oppsto en feil med tilgang til "token" endepunktet: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="134"/> <source>Empty JSON from OAuth2 redirect</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="139"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Kunne ikke prosessere JSON returnert fra serveren:<br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="142"/> <source>Unsupported token type: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="151"/> + <location filename="../src/libsync/creds/oauth.cpp" line="144"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="153"/> + <location filename="../src/libsync/creds/oauth.cpp" line="146"/> <source>Unknown Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="291"/> + <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="157"/> + <location filename="../src/libsync/creds/oauth.cpp" line="150"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Innloggingsfeil</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="202"/> - <location filename="../src/libsync/creds/oauth.cpp" line="205"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="214"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="235"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>Feil bruker</h1><p>Du logget inn med bruker <em>%1</em>, men må logge inn med bruker <em>%2</em>.<br>Logg ut av %3 i en annen tab, <a href='%4'>klikk deretter her</a> og logg inn som bruker %2</p></translation> </message> @@ -2107,58 +2157,58 @@ kan be om flere rettigheter underveis.</translation> <context> <name>OCC::OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="50"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> <source>Connect to %1</source> <translation>Koble til %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="52"/> <source>Setup local folder options</source> <translation>Sett opp valg for lokal mappe</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="60"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="61"/> <source>Connect...</source> <translation>Koble til...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/> - <source>Use &virtual files instead of downloading content immediately %1</source> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="84"/> - <source>(tech preview)</source> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <source>Use &virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="84"/> - <source>(experimental)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="177"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 mappe '%2' er synkronisert til lokal mappe '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="180"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <source>Sync the folder '%1'</source> <translation>Synkroniser mappen '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="185"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="202"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Advarsel:</strong> Den lokale mappen er ikke tom. Velg en løsning!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="283"/> + <source>Virtual files are not available for the selected folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="343"/> <source>Local Sync Folder</source> <translation>Lokal synkroniseringsmappe</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="352"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="387"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="377"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="412"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2217,17 +2267,17 @@ kan be om flere rettigheter underveis.</translation> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="44"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> <source>Connect to %1</source> <translation>Koble til %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> <source>Login in your browser</source> <translation>Logg inn i nettleseren din</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="55"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> <source>Copy link to clipboard</source> <translation>Kopier link til utklippstavlen</translation> </message> @@ -2235,39 +2285,39 @@ kan be om flere rettigheter underveis.</translation> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> <source>Connect to %1</source> <translation>Koble til %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> <source>Setup %1 server</source> <translation>Sett opp %1 server</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="132"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>Denne url er IKKE sikker fordi den ikke er kryptert. Det er ikke tilrådelig å bruke den.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="136"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> <source>This url is secure. You can use it.</source> <translation>Denne url-en er sikker. Du kan bruke den.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="175"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> <source>&Next ></source> <translation>&Neste ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> <source>Invalid URL</source> <translation>Ugyldig URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Kunne ikke laste inn sertifikat. Kanskje feil passord?</translation> </message> @@ -2275,144 +2325,144 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="251"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="226"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Vellykket oppkobling mot %1: %2 versjon %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Klarte ikke å koble til %1 på %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Tidsavbrudd ved oppkobling mot %1 på %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="291"/> <source>Trying to connect to %1 at %2...</source> <translation>Prøver å koble til %1 på %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>Autentisert forespørsel til serveren ble omdirigert til '%1'. URL-en er ugyldig, serveren er feilkonfigurert.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Det kom et uventet svar fra en autentisert webdav-forespørsel.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Tilgang forbudt av serveren. For å sjekke om du har gyldig tilgang, <a href="%1">klikk her</a> for å aksessere tjenesten med nettleseren din.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/> <source>Invalid URL</source> <translation>Ugyldig URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="434"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Lokal synkroniseringsmappe %1 finnes allerede. Setter den opp for synkronisering.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Oppretter lokal synkroniseringsmappe %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="443"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>feilet.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Klarte ikke å opprette lokal mappe %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="471"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Ingen ekstern mappe spesifisert!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="477"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Feil: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>oppretter mappe på ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="506"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>Ekstern mappe %1 ble opprettet.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Ekstern mappe %1 finnes allerede. Kobler den til for synkronisering.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Oppretting av mappe resulterte i HTTP-feilkode %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Oppretting av ekstern mappe feilet fordi påloggingsinformasjonen er feil!<br/>Gå tilbake og sjekk brukernavnet og passordet ditt.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Oppretting av ekstern mappe feilet, sannsynligvis fordi oppgitt påloggingsinformasjon er feil.</font><br/>Vennligst gå tilbake og sjekk ditt brukernavn og passord.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Oppretting av ekstern mappe %1 feilet med feil <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>En synkroniseringsforbindelse fra %1 til ekstern mappe %2 ble satt opp.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Forbindelse til %1 opprettet!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Klarte ikke å etablere forbindelse til %1. Sjekk igjen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="567"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Omdøping av mappe feilet</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="568"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Kan ikke fjerne og sikkerhetskopiere mappen fordi mappen eller en fil i mappen er åpen i et annet program. Lukk mappen eller filen og prøv igjen, eller avbryt oppsettet.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Oppretting av lokal synkroniseringsmappe %1 vellykket!</b></font></translation> </message> @@ -2420,44 +2470,22 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="78"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>%1 Veiviser for tilkobling</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="251"/> - <source>Enable technical preview feature?</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/> - <source>When the "virtual files" mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu. - -The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/> - <source>Enable virtual files</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/> - <source>Continue to use selective sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="266"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>Aktiver eksperimentelle funksjoner?</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="280"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="271"/> <source>Enable experimental placeholder mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="267"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/> <source>When the "virtual files" mode is enabled no files will be downloaded initially. Instead, a tiny "%1" file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu. The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset. @@ -2468,7 +2496,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation>Hold deg trygg</translation> </message> @@ -2597,12 +2625,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1246"/> + <location filename="../src/libsync/discovery.cpp" line="1244"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1259"/> + <location filename="../src/libsync/discovery.cpp" line="1257"/> <source>Not allowed to remove, restoring</source> <translation>Ikke tillatt å fjerne, gjenoppretter</translation> </message> @@ -2622,17 +2650,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ikke tillatt fordi du ikke har lov til å opprette filer i den mappen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1223"/> + <location filename="../src/libsync/discovery.cpp" line="1222"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Ikke tillatt å laste opp denne filenfordi den er skrivebeskyttet på serveren, gjenoppretter</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1368"/> + <location filename="../src/libsync/discovery.cpp" line="1367"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1428"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation type="unfinished"/> </message> @@ -2640,7 +2668,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1001"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1006"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> @@ -2710,22 +2738,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="147"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="146"/> <source>could not delete file %1, error: %2</source> <translation>klarte ikke å slette fil %1, feil: %2</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="162"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Merk! mulig sammenfall med %1 pga. sensitivitet for store/små bokstaver</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="168"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> <source>could not create folder %1</source> <translation>klarte ikke å opprette mappe %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> @@ -2733,7 +2761,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="100"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Kunne ikke fjerne %1 på grunn av lokalt sammenfall av filnavn</translation> </message> @@ -2741,18 +2769,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="218"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Fil %1 kan ikke omdøpes til %2 på grunn av lokalt sammenfall av filnavn</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="249"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="255"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="248"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="254"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="261"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> <source>Error setting pin state</source> <translation type="unfinished"/> </message> @@ -2831,7 +2859,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Opplasting av %1 overstiger kvoten for mappen</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="663"/> + <location filename="../src/libsync/propagateupload.cpp" line="677"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> @@ -2872,14 +2900,14 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileTUS</name> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="202"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> - <translation type="unfinished"/> + <translation>Den lokale filen ble fjernet under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="213"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> - <translation type="unfinished"/> + <translation>Lokal fil endret under synkronisering.</translation> </message> </context> <context> @@ -3049,28 +3077,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SettingsDialog</name> <message> - <location filename="../src/gui/settingsdialog.cpp" line="117"/> + <location filename="../src/gui/settingsdialog.cpp" line="196"/> <source>Settings</source> <translation>Innstillinger</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="108"/> + <location filename="../src/gui/settingsdialog.cpp" line="187"/> <source>Activity</source> <translation>Aktivitet</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="128"/> - <location filename="../src/gui/settingsdialog.cpp" line="131"/> + <location filename="../src/gui/settingsdialog.cpp" line="176"/> + <source>Add account</source> + <translation>Legg til en konto</translation> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="207"/> + <location filename="../src/gui/settingsdialog.cpp" line="210"/> <source>Quit %1</source> <translation>Avslutt %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="132"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="254"/> + <location filename="../src/gui/settingsdialog.cpp" line="342"/> <source>Account</source> <translation>Konto</translation> </message> @@ -3082,12 +3115,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/settingsdialog.ui" line="39"/> <source>Hide</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/settingsdialog.ui" line="49"/> - <source>toolBar</source> - <translation type="unfinished"/> + <translation>Skjul</translation> </message> </context> <context> @@ -3113,42 +3141,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud-sti:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="108"/> + <location filename="../src/gui/sharedialog.cpp" line="110"/> <source>%1 Sharing</source> <translation>%1-deling</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="86"/> + <location filename="../src/gui/sharedialog.cpp" line="88"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="105"/> + <location filename="../src/gui/sharedialog.cpp" line="107"/> <source>Folder: %2</source> <translation>Mappe: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="111"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>The server does not allow sharing</source> <translation>Serveren tillater ikke deling</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="127"/> + <location filename="../src/gui/sharedialog.cpp" line="129"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Henter maksimalt mulige delerettigheter fra serveren...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="197"/> + <location filename="../src/gui/sharedialog.cpp" line="202"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Filen kan ikke deles fordi den ble delt uten adgang til å dele.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="211"/> + <location filename="../src/gui/sharedialog.cpp" line="216"/> <source>Users and Groups</source> <translation>Brukere og grupper</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="218"/> + <location filename="../src/gui/sharedialog.cpp" line="223"/> <source>Public Links</source> <translation>Offentlige lenker</translation> </message> @@ -3343,32 +3371,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="210"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> <source>The item is not shared with any users or groups</source> <translation>Elementet deles ikke med noen brukere eller grupper</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="241"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> <source>Open link in browser</source> <translation>Åpne lenke i nettleser</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> <source>Copy link to clipboard</source> <translation>Kopier URL til utklippstavlen</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> <source>Send link by email</source> <translation>Send link i e-post</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="255"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> <source>No results for '%1'</source> <translation>Ingen resultater for '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> <source>I shared something with you</source> <translation>Jeg delte noe med deg</translation> </message> @@ -3402,17 +3430,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> <source>create</source> <translation>opprette</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> <source>change</source> <translation>endre</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> <source>delete</source> <translation>slett</translation> </message> @@ -3779,17 +3807,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Bare %1 er tilgjengelig, trenger minst %2 for å begynne</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="482"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation>Kan ikke åpne eller opprette den lokale synkroniseringsdatabasen. Kontroller at du har skrivetilgang i synkroniseringsmappen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1035"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Diskplass er lav: Nedlastinger som ville redusere ledig plass under% 1 ble hoppet over.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1042"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Det er ikke nok ledig plass på serveren for noen av opplastingene.</translation> </message> @@ -3804,27 +3832,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="498"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>Unable to read the blacklist from the local database</source> <translation>Kan ikke lese svartelisten fra den lokale databasen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="541"/> <source>Unable to read from the sync journal.</source> <translation>Kan ikke lese fra synkroniseringsjournalen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="625"/> <source>Cannot open the sync journal</source> <translation>Kan ikke åpne synkroniseringsjournalen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1018"/> <source>Aborted</source> <translation type="unfinished"/> </message> @@ -3840,279 +3868,276 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="341"/> - <source><p>Version %2. For more information visit <a href="%3">https://%4</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Hannah von Reth, and others.</small></p></source> + <location filename="../src/libsync/theme.cpp" line="382"/> + <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/libsync/theme.cpp" line="348"/> - <source><p>Copyright ownCloud GmbH</p></source> - <translation><p>Copyright ownCloud GmbH</p></translation> - </message> - <message> - <location filename="../src/libsync/theme.cpp" line="349"/> - <source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source> - <translation><p>Distribuert av %1 og lisensiert under GNU General Public License (GPL) Version 2.0.<br/>%2 og %2-logoet er registrerte varemerker for %1 i USA, i andre land eller begge deler.</p></translation> - </message> </context> <context> <name>OCC::ValidateChecksumHeader</name> <message> - <location filename="../src/common/checksums.cpp" line="335"/> + <location filename="../src/common/checksums.cpp" line="330"/> <source>The checksum header is malformed.</source> <translation>Sjekksum-headeren har feil format.</translation> </message> <message> - <location filename="../src/common/checksums.cpp" line="362"/> + <location filename="../src/common/checksums.cpp" line="357"/> <source>The checksum header contained an unknown checksum type '%1'</source> <translation>Sjekksum-header inneholdt ukjent sjekksum-type '%1'</translation> </message> <message> - <location filename="../src/common/checksums.cpp" line="366"/> - <source>The downloaded file does not match the checksum, it will be resumed.</source> - <translation>Den nedlastede filen passer ikke med sjekksummen, den vil bli gjenopptatt.</translation> + <location filename="../src/common/checksums.cpp" line="361"/> + <source>The downloaded file does not match the checksum, it will be resumed. '%1' != '%2'</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Vfs</name> + <message> + <location filename="../src/common/vfs.cpp" line="72"/> + <source>The Virtual filesystem feature requires a NTFS file system, %1 is using %2</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="267"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Please sign in</source> <translation>Vennligst logg inn</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="313"/> + <location filename="../src/gui/owncloudgui.cpp" line="304"/> <source>Folder %1: %2</source> <translation>Mappe %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Ingen synkroniseringsmapper er konfigurert.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="340"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Åpne i nettleser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="389"/> - <location filename="../src/gui/owncloudgui.cpp" line="712"/> - <location filename="../src/gui/owncloudgui.cpp" line="806"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Log in...</source> <translation>Logg inn..</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="393"/> - <location filename="../src/gui/owncloudgui.cpp" line="704"/> - <location filename="../src/gui/owncloudgui.cpp" line="808"/> + <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Log out</source> <translation>Logg ut</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="499"/> + <location filename="../src/gui/owncloudgui.cpp" line="490"/> <source>Recent Changes</source> <translation>Siste endringer</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="358"/> <source>Managed Folders:</source> <translation>Administrerte mapper:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="361"/> <source>Open folder '%1'</source> <translation>Åpne mappe '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="342"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Åpne %1 i nettleser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="190"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="789"/> + <location filename="../src/gui/owncloudgui.cpp" line="780"/> <source>Unknown status</source> <translation>Ukjent status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Settings...</source> <translation>Innstillinger...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>Details...</source> <translation>Detaljer...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="799"/> + <location filename="../src/gui/owncloudgui.cpp" line="790"/> <source>Help</source> <translation>Hjelp</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="803"/> + <location filename="../src/gui/owncloudgui.cpp" line="794"/> <source>Quit %1</source> <translation>Avslutt %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="248"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Disconnected from %1</source> <translation>Koble fra %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="198"/> + <location filename="../src/gui/owncloudgui.cpp" line="189"/> <source>Unsupported Server Version</source> <translation>Server-versjonen støttes ikke</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="238"/> + <location filename="../src/gui/owncloudgui.cpp" line="229"/> <source>Disconnected</source> <translation>Frakoblet</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="240"/> + <location filename="../src/gui/owncloudgui.cpp" line="231"/> <source>Disconnected from some accounts</source> <translation>Frakoblet noen kontoer</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from accounts:</source> <translation>Koblet fra kontoer:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="253"/> + <location filename="../src/gui/owncloudgui.cpp" line="244"/> <source>Account %1: %2</source> <translation>Konto %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> <source>Signed out</source> <translation>Logget ut</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="272"/> + <location filename="../src/gui/owncloudgui.cpp" line="263"/> <source>Account synchronization is disabled</source> <translation>Kontosynkronisering er deaktivert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="264"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Synkronisering er satt på pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="321"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>Unresolved conflicts</source> <translation>Uløste konflikter</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="328"/> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Feil under synkronisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Ingen synkronisering-mapper konfigurert.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="378"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Unpause all folders</source> <translation>Fortsett alle mapper</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="383"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> <source>Pause all folders</source> <translation>Sett alle mapper på pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="683"/> + <location filename="../src/gui/owncloudgui.cpp" line="674"/> <source>Unpause all synchronization</source> <translation>Fortsett all synkronisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="685"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause synchronization</source> <translation>Fortsett synkronisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="693"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Pause all synchronization</source> <translation>Sett all synkronisering på pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause synchronization</source> <translation>Sett synkronisering på pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="702"/> + <location filename="../src/gui/owncloudgui.cpp" line="693"/> <source>Log out of all accounts</source> <translation>Logg ut av alle kontoer</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="710"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> <source>Log in to all accounts...</source> <translation>Logg inn på alle kontoer...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>New account...</source> <translation>Ny konto...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="801"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>About %1</source> <translation>Om %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="834"/> + <location filename="../src/gui/owncloudgui.cpp" line="825"/> <source>No items synced recently</source> <translation>Ingenting synkronisert nylig</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="856"/> + <location filename="../src/gui/owncloudgui.cpp" line="847"/> <source>Checking for changes in remote '%1'</source> <translation>Sjekker for endringer i ekstern '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in local '%1'</source> <translation>Sjekker for endringer i lokal '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="874"/> + <location filename="../src/gui/owncloudgui.cpp" line="865"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synkroniserer %1 av %2 (%3 gjenstår)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="879"/> + <location filename="../src/gui/owncloudgui.cpp" line="870"/> <source>Syncing %1 of %2</source> <translation>Synkroniserer %1 av %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="888"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 (%2 left)</source> <translation>Synkroniserer %1 (%2 gjenstår)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="891"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1</source> <translation>Synkroniserer %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="909"/> + <location filename="../src/gui/owncloudgui.cpp" line="899"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> <source>Up to date</source> <translation>Oppdatert</translation> </message> @@ -4126,84 +4151,82 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="52"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="108"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="214"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="317"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="490"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="501"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="135"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="234"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="553"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="564"/> <source>TextLabel</source> <translation>Tekst-etikett</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="62"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="86"/> <source>Server</source> <translation>Server</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="415"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="477"/> <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source> <translation><html><head/><body><p>Hvis det settes kryss i denne boksen, vil eksisterende innhold i den lokale mappen bli slettet for å starte en ren synkronisering fra serveren.</p><p>Ikke sett kryss for dette hvis det lokale innholdet skal lastes opp til mappen på serveren.</p></body></html></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="418"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="480"/> <source>Start a &clean sync (Erases the local folder!)</source> <translation>Start en &ren synkronisering (sletter den lokale mappen!)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="152"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="192"/> <source>Ask for confirmation before synchroni&zing folders larger than</source> <translation>Be om bekreftelse før synkronisering av mapper større enn</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="169"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="209"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="178"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="218"/> <source>Ask for confirmation before synchronizing e&xternal storages</source> <translation>Be om bekreftelse før synkronisering av e&ksterne lagre</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="207"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="227"/> <source>Choose what to sync</source> <translation>Velg hva som synkroniseres</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="272"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="275"/> <source><html><head/><body><p>When this option is selected, the wizard will close without synchronizing anything. You can use the &quot;Add Folder Sync Connection&quot; button from the account settings to choose which pair of local and remote folder you wish to synchronize</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="253"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/> <source>Manually create folder sync connections </source> <translation>Manuelt opprett mappesynk koblinger. </translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="333"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> <source>&Local Folder</source> <translation>&Lokal mappe</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="374"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="436"/> <source>pbSelectLocalFolder</source> <translation>pbSelectLocalFolder</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="405"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="467"/> <source>&Keep local data</source> <translation>&Behold lokale data</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="125"/> <source>S&ynchronize everything from server (recommended)</source> <translation>Synkroniser alt fra serveren (anbefalt)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="435"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="498"/> <source>Status message</source> <translation>Statusmelding</translation> </message> @@ -4258,7 +4281,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="196"/> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> <source>TextLabel</source> <translation>Tekst-etikett</translation> </message> @@ -4273,7 +4296,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="160"/> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> <source>Error Label</source> <translation>Feiletikett</translation> </message> @@ -4305,37 +4328,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>fram i tid</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="444"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>i går</numerusform><numerusform>for %n dager siden</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>for %n time siden</numerusform><numerusform>for %n timer siden</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="457"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>nå</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="459"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>For mindre enn et minutt siden</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="462"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>for %n minutt siden</numerusform><numerusform>for %n minutter siden</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>For en stund siden</translation> </message> @@ -4369,37 +4392,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="316"/> + <location filename="../src/common/utility.cpp" line="317"/> <source>%n year(s)</source> <translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="317"/> + <location filename="../src/common/utility.cpp" line="318"/> <source>%n month(s)</source> <translation><numerusform>%n måned</numerusform><numerusform>%n måneder</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="319"/> <source>%n day(s)</source> <translation><numerusform>%n dag</numerusform><numerusform>%n dager</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n hour(s)</source> <translation><numerusform>%n time</numerusform><numerusform>%n timer</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n minute(s)</source> <translation><numerusform>%n minutt</numerusform><numerusform>%n minutter</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n second(s)</source> <translation><numerusform>%n sekund</numerusform><numerusform>%n sekunder</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="345"/> + <location filename="../src/common/utility.cpp" line="346"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4418,11 +4441,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>ownCloudTheme::about()</name> + <name>ownCloudTheme::aboutVersions()</name> + <message> + <location filename="../src/libsync/theme.cpp" line="360"/> + <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ownCloudTheme::qtVer</name> + <message> + <location filename="../src/libsync/theme.cpp" line="350"/> + <source>%1 (Built against Qt %1)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="320"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> - <translation><p><small>Bygget fra Git-revisjon <a href="%1">%2</a> %3, %4 med Qt %5, %6</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="355"/> + <source>%1 %2</source> + <translation>%1 %2</translation> </message> </context> <context> @@ -4528,52 +4567,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Status udefinert</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>Venter på å starte synkronisering</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Synkronisering pågår</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Synkronisering vellykket</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Vellykket synkronisering. Noen filer ble ignorert.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Synkroniseringsfeil</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Feil i oppsett</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Forbereder synkronisering</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Avbryter...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>Synkronisering er satt på pause</translation> </message> @@ -4581,53 +4620,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>utility</name> <message> - <location filename="../src/gui/guiutility.cpp" line="38"/> + <location filename="../src/gui/guiutility.cpp" line="39"/> <source>Could not open browser</source> <translation>Kunne ikke åpne nettleseren</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="39"/> + <location filename="../src/gui/guiutility.cpp" line="40"/> <source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source> <translation>Det oppstod en feil ved start av nettleseren for å gå til URL %1. Kanskje ingen standard nettleser er konfigurert?</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="62"/> + <location filename="../src/gui/guiutility.cpp" line="63"/> <source>Could not open email client</source> <translation>Klarte ikke å åpne epost-klient</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="63"/> + <location filename="../src/gui/guiutility.cpp" line="64"/> <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source> <translation>Det oppstod en feil ved oppstart av epost-klienten for å lage en ny melding. Kanskje ingen standard epost-klient er konfigurert?</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="78"/> + <location filename="../src/gui/guiutility.cpp" line="79"/> <source>Always available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="82"/> + <location filename="../src/gui/guiutility.cpp" line="83"/> <source>Some available online only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="84"/> - <location filename="../src/gui/guiutility.cpp" line="86"/> + <location filename="../src/gui/guiutility.cpp" line="85"/> + <location filename="../src/gui/guiutility.cpp" line="87"/> <source>Available online only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="80"/> + <location filename="../src/gui/guiutility.cpp" line="81"/> <source>Currently available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="93"/> + <location filename="../src/gui/guiutility.cpp" line="94"/> <source>Make always available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="98"/> + <location filename="../src/gui/guiutility.cpp" line="99"/> <source>Free up local space</source> <translation type="unfinished"/> </message> |